Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
zendata
提交
3c66d54b
Z
zendata
项目概览
LinuxSuRen
/
zendata
与 Fork 源项目一致
Fork自
易企天创 / zendata
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zendata
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3c66d54b
编写于
5月 09, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
convert refer to nested fields
上级
4be84104
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
6 deletion
+26
-6
src/gen/generator.go
src/gen/generator.go
+20
-4
src/gen/list.go
src/gen/list.go
+6
-2
未找到文件。
src/gen/generator.go
浏览文件 @
3c66d54b
package
gen
import
(
"fmt"
"github.com/easysoft/zendata/src/model"
constant
"github.com/easysoft/zendata/src/utils/const"
stringUtils
"github.com/easysoft/zendata/src/utils/string"
...
...
@@ -189,13 +188,21 @@ func convertFieldReferToNestedIfNeeded(field *model.Field) {
// ${user_name}_${numb}@${domain}
regx
:=
regexp
.
MustCompile
(
`\$\{([a-zA-z0-9_]+)\}`
)
arrOfName
:=
regx
.
FindAllStringSubmatch
(
field
.
Range
,
-
1
)
fmt
.
Println
(
arrOfName
)
if
len
(
arrOfName
)
>
0
{
for
_
,
a
:=
range
arrOfName
{
nameWapper
:=
a
[
0
]
strLeft
:=
field
.
Range
for
index
,
a
:=
range
arrOfName
{
found
:=
a
[
0
]
name
:=
a
[
1
]
arr
:=
strings
.
Split
(
strLeft
,
found
)
// add string constant
if
arr
[
0
]
!=
""
{
strChild
:=
model
.
Field
{
Name
:
"child-"
+
strconv
.
Itoa
(
index
),
Type
:
"list"
,
Range
:
arr
[
0
]}
field
.
Fields
=
append
(
field
.
Fields
,
strChild
)
}
child
:=
model
.
Field
{}
if
constant
.
LoadedFields
[
name
]
.
Name
!=
""
{
child
=
constant
.
LoadedFields
[
name
]
...
...
@@ -205,6 +212,15 @@ func convertFieldReferToNestedIfNeeded(field *model.Field) {
}
field
.
Fields
=
append
(
field
.
Fields
,
child
)
arr
=
arr
[
1
:
]
strLeft
=
strings
.
Join
(
arr
,
""
)
if
index
==
len
(
arrOfName
)
-
1
&&
strLeft
!=
""
{
// add string constant
strChild
:=
model
.
Field
{
Name
:
"child-"
+
strconv
.
Itoa
(
index
),
Type
:
"list"
,
Range
:
strLeft
}
field
.
Fields
=
append
(
field
.
Fields
,
strChild
)
}
}
}
}
\ No newline at end of file
src/gen/list.go
浏览文件 @
3c66d54b
...
...
@@ -111,16 +111,20 @@ func GenerateFieldValuesFromText(field *model.Field, fieldValue *model.FieldValu
relaPath
:=
constant
.
ResDir
+
file
content
,
err
:=
ioutil
.
ReadFile
(
relaPath
)
if
err
!=
nil
{
logUtils
.
Screen
(
"fail to read "
+
relaPath
)
logUtils
.
Screen
(
"fail to read "
+
relaPath
+
", try to use global config"
)
relaPath
=
"conf"
+
string
(
os
.
PathSeparator
)
+
file
content
,
err
=
ioutil
.
ReadFile
(
relaPath
)
if
err
!=
nil
{
logUtils
.
Screen
(
"fail to read "
+
relaPath
)
logUtils
.
Screen
(
"fail to read "
+
relaPath
+
", will return"
)
fieldValue
.
Values
=
append
(
fieldValue
.
Values
,
"N/A"
)
return
}
else
{
logUtils
.
Screen
(
"success to read "
+
relaPath
)
}
}
else
{
logUtils
.
Screen
(
"success to read "
+
relaPath
)
}
str
:=
string
(
content
)
str
=
strings
.
Replace
(
str
,
"
\\
r
\\
n"
,
"
\\
n"
,
-
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录