Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
4e6f2f94
Unverified
提交
4e6f2f94
authored
11月 29, 2021
作者:
XiaJunjie2020
提交者:
GitHub
11月 29, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1314 from dataease/pr@dev@feat_union_ds
feat(数据集): 关联数据集
上级
b28c8431
b2dc8523
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
53 行增加
和
14 行删除
+53
-14
NodeItem.vue
frontend/src/views/dataset/add/union/NodeItem.vue
+24
-6
UnionFieldEdit.vue
frontend/src/views/dataset/add/union/UnionFieldEdit.vue
+24
-3
Group.vue
frontend/src/views/dataset/group/Group.vue
+5
-5
没有找到文件。
frontend/src/views/dataset/add/union/NodeItem.vue
浏览文件 @
4e6f2f94
<
template
>
<
template
>
<div>
<div>
<div
class=
"ds-node"
@
click=
"nodeClick"
>
<div
class=
"ds-node"
@
click=
"nodeClick"
>
<svg-icon
v-if=
"currentNode.currentDs.
t
ype === 'db'"
icon-class=
"ds-db"
class=
"ds-icon-db"
/>
<svg-icon
v-if=
"currentNode.currentDs.
modelInnerT
ype === 'db'"
icon-class=
"ds-db"
class=
"ds-icon-db"
/>
<svg-icon
v-else-if=
"currentNode.currentDs.
t
ype === 'sql'"
icon-class=
"ds-sql"
class=
"ds-icon-sql"
/>
<svg-icon
v-else-if=
"currentNode.currentDs.
modelInnerT
ype === 'sql'"
icon-class=
"ds-sql"
class=
"ds-icon-sql"
/>
<svg-icon
v-else-if=
"currentNode.currentDs.
t
ype === 'excel'"
icon-class=
"ds-excel"
class=
"ds-icon-excel"
/>
<svg-icon
v-else-if=
"currentNode.currentDs.
modelInnerT
ype === 'excel'"
icon-class=
"ds-excel"
class=
"ds-icon-excel"
/>
<span
class=
"node-name"
:title=
"currentNode.currentDs.name"
>
{{
currentNode
.
currentDs
.
name
}}
</span>
<span
class=
"node-name"
:title=
"currentNode.currentDs.name"
>
{{
currentNode
.
currentDs
.
name
}}
</span>
...
@@ -35,14 +35,24 @@
...
@@ -35,14 +35,24 @@
<el-button
:disabled=
"!tempDs.id"
type=
"primary"
size=
"mini"
@
click=
"confirmSelectDs()"
>
{{
$t
(
'dataset.confirm'
)
}}
</el-button>
<el-button
:disabled=
"!tempDs.id"
type=
"primary"
size=
"mini"
@
click=
"confirmSelectDs()"
>
{{
$t
(
'dataset.confirm'
)
}}
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<!--编辑单个数据集字段-->
<el-dialog
v-if=
"editField"
v-dialogDrag
:title=
"$t('dataset.field_select')"
:visible=
"editField"
:show-close=
"false"
width=
"360px"
class=
"dialog-css"
destroy-on-close
>
<union-field-edit
:node=
"currentNode"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"mini"
@
click=
"closeEditField()"
>
{{
$t
(
'dataset.cancel'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"confirmEditField()"
>
{{
$t
(
'dataset.confirm'
)
}}
</el-button>
</div>
</el-dialog>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
DatasetGroupSelectorTree
from
'@/views/dataset/common/DatasetGroupSelectorTree'
import
DatasetGroupSelectorTree
from
'@/views/dataset/common/DatasetGroupSelectorTree'
import
UnionFieldEdit
from
'@/views/dataset/add/union/UnionFieldEdit'
export
default
{
export
default
{
name
:
'NodeItem'
,
name
:
'NodeItem'
,
components
:
{
DatasetGroupSelectorTree
},
components
:
{
UnionFieldEdit
,
DatasetGroupSelectorTree
},
props
:
{
props
:
{
currentNode
:
{
currentNode
:
{
type
:
Object
,
type
:
Object
,
...
@@ -70,12 +80,13 @@ export default {
...
@@ -70,12 +80,13 @@ export default {
// 弹框临时选中的数据集
// 弹框临时选中的数据集
tempDs
:
{},
tempDs
:
{},
// 父级数据集
// 父级数据集
tempParentDs
:
{}
tempParentDs
:
{},
editField
:
false
}
}
},
},
methods
:
{
methods
:
{
nodeClick
()
{
nodeClick
()
{
console
.
log
(
'node click to edit'
)
this
.
editField
=
true
},
},
nodeMenuClick
(
param
)
{
nodeMenuClick
(
param
)
{
switch
(
param
.
type
)
{
switch
(
param
.
type
)
{
...
@@ -102,6 +113,7 @@ export default {
...
@@ -102,6 +113,7 @@ export default {
this
.
selectDs
()
this
.
selectDs
()
},
},
editNode
(
param
)
{
editNode
(
param
)
{
this
.
nodeClick
()
},
},
deleteNode
(
param
)
{
deleteNode
(
param
)
{
this
.
$emit
(
'deleteNode'
,
this
.
nodeIndex
)
this
.
$emit
(
'deleteNode'
,
this
.
nodeIndex
)
...
@@ -138,6 +150,12 @@ export default {
...
@@ -138,6 +150,12 @@ export default {
// 增加与删除事件向父级传递
// 增加与删除事件向父级传递
notifyFirstParent
(
type
)
{
notifyFirstParent
(
type
)
{
this
.
$emit
(
'notifyParent'
,
{
type
:
type
,
grandParentAdd
:
true
,
grandParentSub
:
true
,
subCount
:
this
.
currentNode
.
allChildCount
})
this
.
$emit
(
'notifyParent'
,
{
type
:
type
,
grandParentAdd
:
true
,
grandParentSub
:
true
,
subCount
:
this
.
currentNode
.
allChildCount
})
},
closeEditField
()
{
this
.
editField
=
false
},
confirmEditField
()
{
this
.
editField
=
false
}
}
}
}
}
}
...
...
frontend/src/views/dataset/add/union/UnionFieldEdit.vue
浏览文件 @
4e6f2f94
<
template
>
<
template
>
<div>
123
</div>
<div>
<p>
{{
node
.
currentDs
.
name
}}
</p>
<union-field-list
:field-list=
"fieldList"
:node=
"node"
@
checkedFields=
"changeFields"
/>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
post
}
from
'@/api/dataset/dataset'
import
UnionFieldList
from
'@/views/dataset/add/union/UnionFieldList'
export
default
{
export
default
{
name
:
'UnionFieldEdit'
,
name
:
'UnionFieldEdit'
,
components
:
{
UnionFieldList
},
props
:
{
node
:
{
type
:
Object
,
required
:
true
}
},
data
()
{
data
()
{
return
{
return
{
fieldList
:
[]
}
}
},
},
mounted
()
{
mounted
()
{
this
.
getFieldList
()
},
},
methods
:
{
methods
:
{
getFieldList
()
{
post
(
'/dataset/field/list/'
+
this
.
node
.
currentDs
.
id
,
null
,
true
).
then
(
response
=>
{
this
.
fieldList
=
JSON
.
parse
(
JSON
.
stringify
(
response
.
data
)).
filter
(
ele
=>
ele
.
extField
===
0
)
})
},
changeFields
(
val
)
{
this
.
node
.
currentDsField
=
val
}
}
}
}
}
</
script
>
</
script
>
...
...
frontend/src/views/dataset/group/Group.vue
浏览文件 @
4e6f2f94
...
@@ -130,11 +130,11 @@
...
@@ -130,11 +130,11 @@
<span
v-else
slot-scope=
"
{ node, data }" class="custom-tree-node-list father">
<span
v-else
slot-scope=
"
{ node, data }" class="custom-tree-node-list father">
<span
style=
"display: flex;flex: 1;width: 0;"
>
<span
style=
"display: flex;flex: 1;width: 0;"
>
<span>
<span>
<svg-icon
v-if=
"data.
t
ype === 'db'"
icon-class=
"ds-db"
class=
"ds-icon-db"
/>
<svg-icon
v-if=
"data.
modelInnerT
ype === 'db'"
icon-class=
"ds-db"
class=
"ds-icon-db"
/>
<svg-icon
v-if=
"data.
t
ype === 'sql'"
icon-class=
"ds-sql"
class=
"ds-icon-sql"
/>
<svg-icon
v-if=
"data.
modelInnerT
ype === 'sql'"
icon-class=
"ds-sql"
class=
"ds-icon-sql"
/>
<svg-icon
v-if=
"data.
t
ype === 'excel'"
icon-class=
"ds-excel"
class=
"ds-icon-excel"
/>
<svg-icon
v-if=
"data.
modelInnerT
ype === 'excel'"
icon-class=
"ds-excel"
class=
"ds-icon-excel"
/>
<svg-icon
v-if=
"data.
t
ype === 'custom'"
icon-class=
"ds-custom"
class=
"ds-icon-custom"
/>
<svg-icon
v-if=
"data.
modelInnerT
ype === 'custom'"
icon-class=
"ds-custom"
class=
"ds-icon-custom"
/>
<svg-icon
v-if=
"data.
t
ype === 'union'"
icon-class=
"ds-union"
class=
"ds-icon-union"
/>
<svg-icon
v-if=
"data.
modelInnerT
ype === 'union'"
icon-class=
"ds-union"
class=
"ds-icon-union"
/>
</span>
</span>
<span
v-if=
"data.modelInnerType === 'db' || data.modelInnerType === 'sql'"
>
<span
v-if=
"data.modelInnerType === 'db' || data.modelInnerType === 'sql'"
>
<span
v-if=
"data.mode === 0"
style=
"margin-left: 6px"
><i
class=
"el-icon-s-operation"
/></span>
<span
v-if=
"data.mode === 0"
style=
"margin-left: 6px"
><i
class=
"el-icon-s-operation"
/></span>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论