Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
aa7f3eb9
Unverified
提交
aa7f3eb9
authored
7月 27, 2021
作者:
fit2cloud-chenyw
提交者:
GitHub
7月 27, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #350 from dataease/pr@v1.1@fix_仪表板过滤组件弹框回显问题
fix: 过滤组件弹框回显问题
上级
e5bb1e08
9d1e41b1
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
52 行增加
和
11 行删除
+52
-11
index.vue
frontend/src/views/panel/edit/index.vue
+4
-2
filterDialog.vue
frontend/src/views/panel/filter/filterDialog.vue
+48
-9
没有找到文件。
frontend/src/views/panel/edit/index.vue
浏览文件 @
aa7f3eb9
...
...
@@ -535,8 +535,10 @@ export default {
this
.
$forceUpdate
()
},
editDialog
()
{
const
serviceName
=
this
.
curComponent
.
serviceName
this
.
currentWidget
=
ApplicationContext
.
getService
(
serviceName
)
if
(
this
.
curComponent
&&
this
.
curComponent
.
serviceName
)
{
const
serviceName
=
this
.
curComponent
.
serviceName
this
.
currentWidget
=
ApplicationContext
.
getService
(
serviceName
)
}
this
.
currentFilterCom
=
this
.
curComponent
this
.
openFilterDialog
()
},
...
...
frontend/src/views/panel/filter/filterDialog.vue
浏览文件 @
aa7f3eb9
...
...
@@ -3,7 +3,7 @@
<de-container
v-loading=
"$store.getters.loadingMap[$store.getters.currentPath]"
class=
"de-dialog-container"
>
<de-aside-container
:show-drag-bar=
"false"
class=
"ms-aside-container"
>
<el-tabs
v-model=
"activeName"
class=
"filter-dialog-tabs"
>
<el-tab-pane
:lazy=
"true"
class=
"de-tab"
:label=
"$t('panel.select_by_table')"
name=
"dataset"
>
<el-tab-pane
class=
"de-tab"
:label=
"$t('panel.select_by_table')"
name=
"dataset"
>
<div
class=
"component-header filter-common"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
v-for=
"bread in dataSetBreads"
:key=
"bread.label"
>
...
...
@@ -56,7 +56,7 @@
@start="start1"
>
<transition-group>
<div
v-for=
"item in fieldDatas.filter(item => !keyWord || (item.name && item.name.toLocaleLowerCase().includes(keyWord)))"
:key=
"item.id"
class=
"filter-db-row"
>
<div
v-for=
"item in fieldDatas.filter(item => !keyWord || (item.name && item.name.toLocaleLowerCase().includes(keyWord)))"
:key=
"item.id"
:class=
"componentInfo && componentInfo.options.attrs.fieldId === item.id ? 'filter-db-row-checked' : 'filter-db-row'"
class=
"filter-db-row"
>
<i
class=
"el-icon-s-data"
/>
<span>
{{
item
.
name
}}
</span>
</div>
...
...
@@ -67,7 +67,7 @@
</el-col>
</div>
</el-tab-pane>
<el-tab-pane
:lazy=
"true"
class=
"de-tab"
:label=
"$t('panel.select_by_module')"
name=
"assembly"
>
<el-tab-pane
class=
"de-tab"
:label=
"$t('panel.select_by_module')"
name=
"assembly"
>
<div
class=
"component-header filter-common"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
v-for=
"bread in componentSetBreads"
:key=
"bread.label"
>
...
...
@@ -125,7 +125,7 @@
@
start=
"start1"
>
<transition-group>
<div
v-for=
"item in comFieldDatas.filter(item => !viewKeyWord || item.name.toLocaleLowerCase().includes(viewKeyWord))"
:key=
"item.id"
class=
"filter-db-row"
>
<div
v-for=
"item in comFieldDatas.filter(item => !viewKeyWord || item.name.toLocaleLowerCase().includes(viewKeyWord))"
:key=
"item.id"
:class=
"componentInfo && componentInfo.options.attrs.fieldId === item.id ? 'filter-db-row-checked' : 'filter-db-row'"
class=
"filter-db-row"
>
<i
class=
"el-icon-s-data"
/>
<span>
{{ item.name }}
</span>
</div>
...
...
@@ -318,7 +318,8 @@ export default {
timer
:
null
,
expandedArray
:
[],
viewKeyWord
:
''
,
titlePopovervisible
:
false
titlePopovervisible
:
false
,
fieldsParent
:
null
}
},
computed
:
{
...
...
@@ -344,15 +345,20 @@ export default {
this
.
componentInfo
.
options
.
attrs
.
datas
=
this
.
widget
.
optionDatas
(
res
.
data
)
this
.
componentInfo
.
options
.
attrs
.
fieldId
=
fieldId
this
.
componentInfo
.
options
.
attrs
.
dragItems
=
values
this
.
componentInfo
.
options
.
attrs
.
activeName
=
this
.
activeName
this
.
componentInfo
.
options
.
attrs
.
fieldsParent
=
this
.
fieldsParent
this
.
$emit
(
're-fresh-component'
,
this
.
componentInfo
)
})
}
else
{
this
.
componentInfo
.
options
.
attrs
.
fieldId
=
fieldId
this
.
componentInfo
.
options
.
attrs
.
dragItems
=
values
this
.
componentInfo
.
options
.
attrs
.
activeName
=
this
.
activeName
this
.
componentInfo
.
options
.
attrs
.
fieldsParent
=
this
.
fieldsParent
this
.
$emit
(
're-fresh-component'
,
this
.
componentInfo
)
}
}
else
if
(
this
.
componentInfo
&&
this
.
componentInfo
.
options
.
attrs
.
fieldId
)
{
this
.
componentInfo
.
options
.
attrs
.
fieldId
=
null
this
.
componentInfo
.
options
.
attrs
.
activeName
=
null
this
.
$emit
(
're-fresh-component'
,
this
.
componentInfo
)
}
},
...
...
@@ -377,10 +383,23 @@ export default {
if
(
this
.
componentInfo
&&
this
.
componentInfo
.
options
.
attrs
.
dragItems
)
{
this
.
selectField
=
this
.
componentInfo
.
options
.
attrs
.
dragItems
}
this
.
initWithField
()
this
.
loadViews
()
},
methods
:
{
initWithField
()
{
if
(
this
.
componentInfo
&&
this
.
componentInfo
.
options
.
attrs
.
activeName
)
{
this
.
activeName
=
this
.
componentInfo
.
options
.
attrs
.
activeName
if
(
this
.
componentInfo
.
options
.
attrs
.
fieldsParent
)
{
this
.
fieldsParent
=
this
.
componentInfo
.
options
.
attrs
.
fieldsParent
this
.
$nextTick
(()
=>
{
this
.
activeName
===
'dataset'
&&
this
.
showFieldDatas
(
this
.
fieldsParent
)
this
.
activeName
!==
'dataset'
&&
this
.
comShowFieldDatas
(
this
.
fieldsParent
)
})
}
}
},
getTreeData
(
val
)
{
if
(
val
)
{
this
.
isTreeSearch
=
true
...
...
@@ -559,6 +578,7 @@ export default {
this
.
showDomType
=
'field'
this
.
setTailLink
(
row
)
this
.
addTail
(
row
)
this
.
fieldsParent
=
row
this
.
loadField
(
row
.
id
)
},
comShowFieldDatas
(
row
)
{
...
...
@@ -566,6 +586,7 @@ export default {
this
.
comShowDomType
=
'field'
this
.
comSetTailLink
(
row
)
this
.
comAddTail
(
row
)
this
.
fieldsParent
=
row
this
.
comLoadField
(
row
.
tableId
)
},
onMove
(
e
,
originalEvent
)
{
...
...
@@ -760,15 +781,33 @@ export default {
color
:
#409EFF
;
}
.filter-db-row
{
:hover
{
cursor
:
pointer
;
}
i
{
color
:
#
409EFF
;
color
:
#
3685f2
;
}
// background-color: #3685f2;
// color: #fff;
}
.filter-db-row
:hover
{
background-color
:
#f5f7fa
!
important
;
cursor
:
pointer
;
}
.filter-db-row-checked
:hover
{
background-color
:
#f5f7fa
!
important
;
color
:
inherit
;
cursor
:
pointer
;
i
{
background-color
:
inherit
;
color
:
#3685f2
;
}
}
.filter-db-row-checked
{
background-color
:
#3685f2
!
important
;
color
:
#fff
;
i
{
background-color
:
#3685f2
;
color
:
#fff
;
}
}
.draggable-group
{
display
:
inline-block
;
width
:
100%
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论