Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zendata
提交
b89db667
Z
zendata
项目概览
易企天创
/
zendata
11 个月 前同步成功
通知
17
Star
2
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zendata
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b89db667
编写于
5月 15, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
new definition format
上级
0de36299
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
20 deletion
+22
-20
src/action/generator.go
src/action/generator.go
+2
-2
src/gen/definition.go
src/gen/definition.go
+15
-13
src/gen/generator.go
src/gen/generator.go
+3
-3
src/utils/const/const.go
src/utils/const/const.go
+2
-2
未找到文件。
src/action/generator.go
浏览文件 @
b89db667
...
...
@@ -23,8 +23,8 @@ func Generate(def string, total int, fieldsToExportStr string, out string, forma
constant
.
InputDir
=
filepath
.
Dir
(
def
)
+
string
(
os
.
PathSeparator
)
referRangeFields
,
referInstFields
:=
gen
.
LoadDefinitionFromFile
(
def
,
fieldsToExport
)
gen
.
LoadReferRes
(
referRangeFields
,
referInstFields
)
referRangeFields
,
referInstFields
:=
gen
.
LoadDefinitionFromFile
(
def
,
fieldsToExport
)
// init constant.RootDef
gen
.
LoadReferRes
(
referRangeFields
,
referInstFields
)
// init const.ResMap
rows
,
colTypes
:=
gen
.
GenerateForDefinition
(
total
,
fieldsToExport
)
content
:=
Print
(
rows
,
format
,
table
,
colTypes
,
fieldsToExport
)
...
...
src/gen/definition.go
浏览文件 @
b89db667
...
...
@@ -4,6 +4,7 @@ import (
"github.com/easysoft/zendata/src/model"
constant
"github.com/easysoft/zendata/src/utils/const"
logUtils
"github.com/easysoft/zendata/src/utils/log"
stringUtils
"github.com/easysoft/zendata/src/utils/string"
"gopkg.in/yaml.v2"
"io/ioutil"
"strings"
...
...
@@ -26,26 +27,27 @@ func LoadDefinitionFromFile(file string, fieldsToExport []string) ([]model.ClsRa
return
referRangeFields
,
referInstFields
}
if
strings
.
Index
(
file
,
"def"
)
!=
0
&&
constant
.
Definition
.
Title
==
""
{
// only add the fields in first level yaml file
constant
.
Definition
=
def
if
strings
.
Index
(
file
,
"def"
)
!=
0
&&
constant
.
RootDef
.
Title
==
""
{
// only add the fields in first level yaml file
constant
.
RootDef
=
def
}
for
_
,
field
:=
range
def
.
Fields
{
_
=
field
// TODO: dealwith referRangeFields and referInstFields for constant.LoadedResValues
}
if
!
stringUtils
.
FindInArr
(
field
.
Field
,
fieldsToExport
)
{
continue
}
//for _, field := range def.Fields {
// fieldValue := model.FieldValue{}
// // TODO: 生成fieldValue
// constant.LoadedResValues[field.Field] = fieldValue // add to a map
//}
// TODO: dealwith referRangeFields and referInstFields for constant.ResMap
}
return
referRangeFields
,
referInstFields
}
func
LoadReferRes
([]
model
.
ClsRange
,
[]
model
.
ClsInst
)
{
//fieldValueMap := map[string]model.FieldValue{}
//
//LoadDefinitionFromFile(constant.ResBuildIn) // load buildin resource
// init const.ResMap
//for _, field := range def.Fields {
// fieldValue := model.FieldValue{}
// // TODO: 生成fieldValue
// constant.ResMap[field.Field] = fieldValue // add to a map
//}
}
src/gen/generator.go
浏览文件 @
b89db667
...
...
@@ -10,7 +10,7 @@ import (
)
func
GenerateForDefinition
(
total
int
,
fieldsToExport
[]
string
)
([][]
string
,
[]
bool
)
{
def
:=
constant
.
Definition
def
:=
constant
.
RootDef
fieldNameToValues
:=
map
[
string
][]
string
{}
...
...
@@ -70,7 +70,7 @@ func GenerateForField(field *model.DefField, total int) []string {
}
else
if
field
.
From
!=
""
&&
field
.
Select
!=
""
{
// refer to excel
arr
:=
strings
.
Split
(
field
.
From
,
"."
)
referField
:=
constant
.
LoadedResValues
[
arr
[
0
]]
referField
:=
constant
.
ResMap
[
arr
[
0
]]
referField
.
From
=
field
.
From
referField
.
Select
=
field
.
Select
...
...
@@ -89,7 +89,7 @@ func GenerateForField(field *model.DefField, total int) []string {
//LoadDefinitionFromFile(constant.InputDir + field.Range)
}
//referField := constant.
LoadedResValues
[field.Field]
//referField := constant.
ResMap
[field.Field]
//values = GenerateForField(&referField, total)
// TODO: 需要处理range: small,large等逻辑
...
...
src/utils/const/const.go
浏览文件 @
b89db667
...
...
@@ -30,8 +30,8 @@ var (
WorkDir
string
=
""
InputDir
string
=
""
Definition
model
.
DefData
=
model
.
DefData
{}
LoadedResValues
map
[
string
]
model
.
FieldValue
=
map
[
string
]
model
.
FieldValue
{}
RootDef
model
.
DefData
=
model
.
DefData
{}
ResMap
map
[
string
]
model
.
FieldValue
=
map
[
string
]
model
.
FieldValue
{}
ResDir
string
=
"data/"
ResBuildIn
string
=
ResDir
+
"system/buildin.yaml"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录