Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zendata
提交
362aba58
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 搜索 >>
提交
362aba58
编写于
11月 19, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix tree node display issue
上级
6a558d5f
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
57 addition
and
23 deletion
+57
-23
src/model/model.go
src/model/model.go
+1
-0
src/server/repo/instances.go
src/server/repo/instances.go
+36
-1
src/server/service/def.go
src/server/service/def.go
+5
-4
src/server/service/instances.go
src/server/service/instances.go
+8
-11
tmp/cache/.data.db
tmp/cache/.data.db
+0
-0
ui/src/components/Design.vue
ui/src/components/Design.vue
+6
-6
users/test/_test-instacnes.yaml
users/test/_test-instacnes.yaml
+1
-1
未找到文件。
src/model/model.go
浏览文件 @
362aba58
...
...
@@ -174,6 +174,7 @@ type ZdInstancesItem struct {
ParentID
uint
`gorm:"column:parentID" json:"parentID"`
Field
string
`gorm:"column:field" json:"field"`
Note
string
`gorm:"column:note" json:"note"`
Instance
string
`gorm:"column:instance" json:"instance"`
Range
string
`gorm:"column:range" json:"range"`
Exp
string
`gorm:"column:exp" json:"exp"`
...
...
src/server/repo/instances.go
浏览文件 @
362aba58
...
...
@@ -35,7 +35,7 @@ func (r *InstancesRepo) Remove(id uint) (err error) {
}
func
(
r
*
InstancesRepo
)
GetItems
(
instancesId
int
)
(
items
[]
*
model
.
ZdInstancesItem
,
err
error
)
{
err
=
r
.
db
.
Where
(
"instancesId=?"
,
instancesId
)
.
Find
(
&
items
)
.
Error
err
=
r
.
db
.
Where
(
"instancesId=?"
,
instancesId
)
.
Order
(
"parentID ASC, ord ASC"
)
.
Find
(
&
items
)
.
Error
return
}
func
(
r
*
InstancesRepo
)
GetItem
(
itemId
uint
)
(
item
model
.
ZdInstancesItem
,
err
error
)
{
...
...
@@ -67,6 +67,41 @@ func (r *InstancesRepo) GetMaxOrder(instancesId int) (ord int) {
return
}
func
(
r
*
InstancesRepo
)
GetItemTree
(
instancesId
int
)
(
root
model
.
ZdInstancesItem
)
{
items
,
_
:=
r
.
GetItems
(
instancesId
)
root
.
ID
=
0
root
.
Field
=
"实例"
r
.
makeTree
(
items
,
&
root
)
return
}
func
(
r
*
InstancesRepo
)
makeTree
(
Data
[]
*
model
.
ZdInstancesItem
,
node
*
model
.
ZdInstancesItem
)
{
children
,
_
:=
r
.
haveChild
(
Data
,
node
)
if
children
!=
nil
{
node
.
Fields
=
append
(
node
.
Fields
,
children
[
0
:
]
...
)
for
_
,
v
:=
range
children
{
_
,
has
:=
r
.
haveChild
(
Data
,
v
)
if
has
{
r
.
makeTree
(
Data
,
v
)
}
}
}
}
func
(
r
*
InstancesRepo
)
haveChild
(
Data
[]
*
model
.
ZdInstancesItem
,
node
*
model
.
ZdInstancesItem
)
(
child
[]
*
model
.
ZdInstancesItem
,
yes
bool
)
{
for
_
,
v
:=
range
Data
{
if
v
.
ParentID
==
node
.
ID
{
child
=
append
(
child
,
v
)
}
}
if
child
!=
nil
{
yes
=
true
}
return
}
func
NewInstancesRepo
(
db
*
gorm
.
DB
)
*
InstancesRepo
{
return
&
InstancesRepo
{
db
:
db
}
}
src/server/service/def.go
浏览文件 @
362aba58
...
...
@@ -144,7 +144,6 @@ func (s *DefService) saveDataToDB(defs []model.ResFile, list []*model.ZdDef) (er
for
_
,
def
:=
range
defs
{
if
!
stringUtils
.
FindInArrBool
(
def
.
Path
,
names
)
{
//if strings.Contains(inst.Path, "_test") {
content
,
_
:=
ioutil
.
ReadFile
(
def
.
Path
)
yamlContent
:=
stringUtils
.
ReplaceSpecialChars
(
content
)
defPo
:=
model
.
ZdDef
{}
...
...
@@ -157,10 +156,12 @@ func (s *DefService) saveDataToDB(defs []model.ResFile, list []*model.ZdDef) (er
s
.
defRepo
.
Create
(
&
defPo
)
for
_
,
field
:=
range
defPo
.
Fields
{
s
.
saveFieldToDB
(
&
field
,
0
,
defPo
.
ID
)
rootField
,
_
:=
s
.
fieldRepo
.
CreateTreeNode
(
defPo
.
ID
,
0
,
"字段"
,
"root"
)
s
.
referRepo
.
CreateDefault
(
rootField
.
ID
,
constant
.
ResTypeDef
)
for
i
,
field
:=
range
defPo
.
Fields
{
field
.
Ord
=
i
+
1
s
.
saveFieldToDB
(
&
field
,
rootField
.
ID
,
defPo
.
ID
)
}
//}
}
}
...
...
src/server/service/instances.go
浏览文件 @
362aba58
...
...
@@ -51,16 +51,8 @@ func (s *InstancesService) Remove(id int) (err error) {
return
}
func
(
s
*
InstancesService
)
GetItemTree
(
rangesId
int
)
(
root
model
.
ZdInstancesItem
)
{
items
,
_
:=
s
.
instancesRepo
.
GetItems
(
rangesId
)
root
.
ID
=
0
root
.
Field
=
"实例"
for
_
,
item
:=
range
items
{
item
.
ParentID
=
root
.
ID
root
.
Fields
=
append
(
root
.
Fields
,
item
)
}
func
(
s
*
InstancesService
)
GetItemTree
(
instancesId
int
)
(
root
model
.
ZdInstancesItem
)
{
root
=
s
.
instancesRepo
.
GetItemTree
(
instancesId
)
return
}
func
(
s
*
InstancesService
)
GetItem
(
id
int
)
(
item
model
.
ZdInstancesItem
)
{
...
...
@@ -119,11 +111,16 @@ func (s *InstancesService) saveResToDB(instances []model.ResFile, list []*model.
return
}
func
(
s
*
InstancesService
)
saveItemToDB
(
item
*
model
.
ZdInstancesItem
,
parentID
,
instancesID
uint
)
{
if
item
.
Instance
!=
""
{
// instance node
item
.
Field
=
item
.
Instance
}
item
.
InstancesID
=
instancesID
item
.
ParentID
=
parentID
s
.
instancesRepo
.
SaveItem
(
item
)
for
_
,
child
:=
range
item
.
Fields
{
for
i
,
child
:=
range
item
.
Fields
{
child
.
Ord
=
i
+
1
s
.
saveItemToDB
(
child
,
item
.
ID
,
instancesID
)
}
}
...
...
tmp/cache/.data.db
浏览文件 @
362aba58
无法预览此类型文件
ui/src/components/Design.vue
浏览文件 @
362aba58
...
...
@@ -139,7 +139,7 @@ export default {
selectedKeys
:
[],
targetModel
:
0
,
treeNode
:
null
,
fieldMap
:
{
key
:
'
id
'
,
value
:
'
id
'
},
fieldMap
:
{
key
:
'
id
'
,
value
:
'
id
'
,
children
:
'
fields
'
},
};
},
props
:
{
...
...
@@ -236,12 +236,12 @@ export default {
this
.
rightVisible
=
false
}
},
getOpenKeys
(
def
)
{
if
(
!
def
)
return
getOpenKeys
(
field
)
{
if
(
!
field
)
return
this
.
openKeys
.
push
(
def
.
id
)
if
(
def
.
children
)
{
def
.
children
.
forEach
((
item
)
=>
{
this
.
openKeys
.
push
(
field
.
id
)
if
(
field
.
fields
)
{
field
.
fields
.
forEach
((
item
)
=>
{
this
.
getOpenKeys
(
item
)
})
}
...
...
users/test/_test-instacnes.yaml
浏览文件 @
362aba58
title
:
国家数据
title
:
测试实例
desc
:
author
:
zentao
version
:
1.0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录