Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
c48e2ef9
提交
c48e2ef9
authored
11月 29, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 条件组件弹框样式
上级
b44f152c
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
142 行增加
和
42 行删除
+142
-42
index.scss
frontend/src/styles/index.scss
+7
-1
filterDialog.vue
frontend/src/views/panel/filter/filterDialog.vue
+135
-41
没有找到文件。
frontend/src/styles/index.scss
浏览文件 @
c48e2ef9
...
@@ -744,6 +744,12 @@ div:focus {
...
@@ -744,6 +744,12 @@ div:focus {
border
:
1px
solid
#999999
!
important
;
border
:
1px
solid
#999999
!
important
;
margin
:
0
0
6px
6px
!
important
;
margin
:
0
0
6px
6px
!
important
;
}
}
.de-checkbox
{
width
:
100%
;
margin-left
:
0px
!
important
;
.el-checkbox__input
{
padding
:
0
0
8px
0
!
important
;
}
}
frontend/src/views/panel/filter/filterDialog.vue
浏览文件 @
c48e2ef9
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
<div
class=
"component-header filter-common"
>
<div
class=
"component-header filter-common"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
v-for=
"bread in dataSetBreads"
:key=
"bread.label"
>
<el-breadcrumb-item
v-for=
"bread in dataSetBreads"
:key=
"bread.label"
>
<a
v-if=
"bread.link"
:class=
"
{'link-text' : bread.link}" @click="backToLink(bread)">
{{
bread
.
label
}}
</a>
<a
v-if=
"bread.link"
:class=
"
{'link-text' : bread.link}" @click="backToLink(bread)">
{{
bread
.
label
}}
</a>
<span
v-else
>
{{
bread
.
label
}}
</span>
<span
v-else
>
{{
bread
.
label
}}
</span>
</el-breadcrumb-item>
</el-breadcrumb-item>
</el-breadcrumb>
</el-breadcrumb>
...
@@ -66,7 +67,12 @@
...
@@ -66,7 +67,12 @@
@start="start1"
@start="start1"
>
>
<transition-group>
<transition-group>
<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"
>
<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"
/>
<i
class=
"el-icon-s-data"
/>
<span>
{{
item
.
name
}}
</span>
<span>
{{
item
.
name
}}
</span>
</div>
</div>
...
@@ -81,7 +87,8 @@
...
@@ -81,7 +87,8 @@
<div
class=
"component-header filter-common"
>
<div
class=
"component-header filter-common"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
v-for=
"bread in componentSetBreads"
:key=
"bread.label"
>
<el-breadcrumb-item
v-for=
"bread in componentSetBreads"
:key=
"bread.label"
>
<a
v-if=
"bread.link"
:class=
"
{'link-text' : bread.link}" @click="comBackLink(bread)">
{{
bread
.
label
}}
</a>
<a
v-if=
"bread.link"
:class=
"
{'link-text' : bread.link}" @click="comBackLink(bread)">
{{
bread
.
label
}}
</a>
<span
v-else
>
{{
bread
.
label
}}
</span>
<span
v-else
>
{{
bread
.
label
}}
</span>
</el-breadcrumb-item>
</el-breadcrumb-item>
</el-breadcrumb>
</el-breadcrumb>
...
@@ -135,7 +142,12 @@
...
@@ -135,7 +142,12 @@
@
start=
"start1"
@
start=
"start1"
>
>
<transition-group>
<transition-group>
<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"
>
<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"
/>
<i
class=
"el-icon-s-data"
/>
<span>
{{ item.name }}
</span>
<span>
{{ item.name }}
</span>
</div>
</div>
...
@@ -171,7 +183,13 @@
...
@@ -171,7 +183,13 @@
@
end=
"end2"
@
end=
"end2"
>
>
<transition-group
class=
"list-group"
:data-value=
"$t('panel.drag_here')"
>
<transition-group
class=
"list-group"
:data-value=
"$t('panel.drag_here')"
>
<drag-item
v-for=
"(item,index) in selectField"
:key=
"item.id"
:item=
"item"
:index=
"index"
@
closeItem=
"closeItem"
/>
<drag-item
v-for=
"(item,index) in selectField"
:key=
"item.id"
:item=
"item"
:index=
"index"
@
closeItem=
"closeItem"
/>
</transition-group>
</transition-group>
</draggable>
</draggable>
</el-row>
</el-row>
...
@@ -192,24 +210,39 @@
...
@@ -192,24 +210,39 @@
/>
/>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"16"
><div
class=
"filter-options-right"
>
<el-col
:span=
"16"
>
<div
class=
"filter-options-right"
>
<span
style=
"padding-right: 10px;"
>
<span
style=
"padding-right: 10px;"
>
<el-checkbox
v-model=
"componentInfo.options.attrs.showTitle"
@
change=
"showTitleChange"
>
显示标题
</el-checkbox>
<el-checkbox
v-model=
"componentInfo.options.attrs.showTitle"
@
change=
"showTitleChange"
>
显示标题
</el-checkbox>
<el-popover
<el-popover
v-model=
"titlePopovervisible"
v-model=
"titlePopovervisible"
placement=
"bottom-end"
placement=
"bottom-end"
:disabled=
"!componentInfo.options.attrs.showTitle"
:disabled=
"!componentInfo.options.attrs.showTitle"
width=
"200"
width=
"200"
>
>
<div
style=
"width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;"
>
<div
<el-input
v-model=
"componentInfo.options.attrs.title"
placeholder=
"请输入标题"
type=
"textarea"
maxlength=
"15"
show-word-limit
/>
style=
"width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;"
>
<el-input
v-model=
"componentInfo.options.attrs.title"
placeholder=
"请输入标题"
type=
"textarea"
maxlength=
"15"
show-word-limit
/>
</div>
</div>
<i
slot=
"reference"
:class=
"{'i-filter-active': componentInfo.options.attrs.showTitle, 'i-filter-inactive': !componentInfo.options.attrs.showTitle}"
class=
"el-icon-setting i-filter"
/>
<i
slot=
"reference"
:class=
"{'i-filter-active': componentInfo.options.attrs.showTitle, 'i-filter-inactive': !componentInfo.options.attrs.showTitle}"
class=
"el-icon-setting i-filter"
/>
</el-popover>
</el-popover>
</span>
</span>
<span
style=
"padding-left: 10px;"
>
<span
style=
"padding-left: 10px;"
>
<el-checkbox
v-model=
"componentInfo.options.attrs.enableRange"
@
change=
"enableRangeChange"
><span>
{{ $t('panel.custom_scope') }}
</span>
</el-checkbox>
<el-checkbox
v-model=
"componentInfo.options.attrs.enableRange"
@
change=
"enableRangeChange"
><span>
{{ $t('panel.custom_scope') }}
</span>
</el-checkbox>
<el-popover
<el-popover
v-model=
"popovervisible"
v-model=
"popovervisible"
...
@@ -219,16 +252,27 @@
...
@@ -219,16 +252,27 @@
>
>
<div
class=
"view-container-class"
>
<div
class=
"view-container-class"
>
<el-checkbox-group
v-model=
"componentInfo.options.attrs.viewIds"
@
change=
"checkedViewsChange"
>
<el-checkbox-group
v-model=
"componentInfo.options.attrs.viewIds"
@
change=
"checkedViewsChange"
>
<el-checkbox
v-for=
"(item ) in viewInfos"
:key=
"item.id"
:label=
"item.id
"
>
<el-checkbox
v-for=
"(item ) in viewInfos"
:key=
"item.id"
:label=
"item.id"
class=
"de-checkbox
"
>
<span
>
<div
class=
"span-div"
>
<svg-icon
:icon-class=
"item.type"
class=
"chart-icon"
/>
<svg-icon
:icon-class=
"item.type"
class=
"chart-icon"
/>
<span
v-if=
"item.name && item.name.length <= 7"
style=
"margin-left: 6px"
>
{{ item.name }}
</span>
<el-tooltip
v-else
class=
"item"
effect=
"dark"
:content=
"item.name"
placement=
"left"
>
<span
style=
"margin-left: 6px"
>
{{ item.name }}
</span>
<span
style=
"margin-left: 6px"
>
{{ item.name }}
</span>
</span>
</el-tooltip>
</div>
</el-checkbox>
</el-checkbox>
</el-checkbox-group>
</el-checkbox-group>
</div>
</div>
<i
slot=
"reference"
:class=
"{'i-filter-active': componentInfo.options.attrs.enableRange, 'i-filter-inactive': !componentInfo.options.attrs.enableRange}"
class=
"el-icon-setting i-filter"
/>
<i
slot=
"reference"
:class=
"{'i-filter-active': componentInfo.options.attrs.enableRange, 'i-filter-inactive': !componentInfo.options.attrs.enableRange}"
class=
"el-icon-setting i-filter"
/>
</el-popover>
</el-popover>
</span>
</span>
</div>
</div>
...
@@ -261,11 +305,22 @@ import DeContainer from '@/components/dataease/DeContainer'
...
@@ -261,11 +305,22 @@ import DeContainer from '@/components/dataease/DeContainer'
import
DeAsideContainer
from
'@/components/dataease/DeAsideContainer'
import
DeAsideContainer
from
'@/components/dataease/DeAsideContainer'
import
draggable
from
'vuedraggable'
import
draggable
from
'vuedraggable'
import
DragItem
from
'@/components/DragItem'
import
DragItem
from
'@/components/DragItem'
import
{
mapState
}
from
'vuex'
import
{
// import { ApplicationContext } from '@/utils/ApplicationContext'
mapState
import
{
groupTree
,
fieldList
,
fieldValues
,
post
}
from
'@/api/dataset/dataset'
}
from
'vuex'
import
{
viewsWithIds
}
from
'@/api/panel/view'
// import { ApplicationContext } from '@/utils/ApplicationContext'
import
{
authModel
}
from
'@/api/system/sysAuth'
import
{
groupTree
,
fieldList
,
fieldValues
,
post
}
from
'@/api/dataset/dataset'
import
{
viewsWithIds
}
from
'@/api/panel/view'
import
{
authModel
}
from
'@/api/system/sysAuth'
export
default
{
export
default
{
name
:
'FilterDialog'
,
name
:
'FilterDialog'
,
components
:
{
components
:
{
...
@@ -292,12 +347,16 @@ export default {
...
@@ -292,12 +347,16 @@ export default {
activeName
:
'dataset'
,
activeName
:
'dataset'
,
showDomType
:
'tree'
,
showDomType
:
'tree'
,
comShowDomType
:
'view'
,
comShowDomType
:
'view'
,
dataSetBreads
:
[
dataSetBreads
:
[{
{
label
:
this
.
$t
(
'panel.data_list'
),
link
:
false
,
type
:
'root'
}
label
:
this
.
$t
(
'panel.data_list'
),
],
link
:
false
,
componentSetBreads
:
[
type
:
'root'
{
label
:
this
.
$t
(
'panel.component_list'
),
link
:
false
,
type
:
'root'
}
}],
],
componentSetBreads
:
[{
label
:
this
.
$t
(
'panel.component_list'
),
link
:
false
,
type
:
'root'
}],
datas
:
[],
datas
:
[],
sceneDatas
:
[],
sceneDatas
:
[],
// viewDatas: [],
// viewDatas: [],
...
@@ -441,7 +500,8 @@ export default {
...
@@ -441,7 +500,8 @@ export default {
// 判断根节点 ###
// 判断根节点 ###
el
.
type
=
el
.
modelInnerType
el
.
type
=
el
.
modelInnerType
el
.
isLeaf
=
el
.
leaf
el
.
isLeaf
=
el
.
leaf
if
(
el
[
this
.
defaultProps
.
parentId
]
===
null
||
el
[
this
.
defaultProps
.
parentId
]
===
0
||
el
[
this
.
defaultProps
.
parentId
]
===
'0'
)
{
if
(
el
[
this
.
defaultProps
.
parentId
]
===
null
||
el
[
this
.
defaultProps
.
parentId
]
===
0
||
el
[
this
.
defaultProps
.
parentId
]
===
'0'
)
{
roots
.
push
(
el
)
roots
.
push
(
el
)
return
return
}
}
...
@@ -512,11 +572,19 @@ export default {
...
@@ -512,11 +572,19 @@ export default {
tail
.
link
=
true
tail
.
link
=
true
},
},
addTail
(
node
)
{
addTail
(
node
)
{
const
tail
=
{
link
:
false
,
label
:
node
.
label
||
node
.
name
,
type
:
node
.
type
}
const
tail
=
{
link
:
false
,
label
:
node
.
label
||
node
.
name
,
type
:
node
.
type
}
this
.
dataSetBreads
.
push
(
tail
)
this
.
dataSetBreads
.
push
(
tail
)
},
},
comAddTail
(
node
)
{
comAddTail
(
node
)
{
const
tail
=
{
link
:
false
,
label
:
node
.
label
||
node
.
name
,
type
:
node
.
type
}
const
tail
=
{
link
:
false
,
label
:
node
.
label
||
node
.
name
,
type
:
node
.
type
}
this
.
componentSetBreads
.
push
(
tail
)
this
.
componentSetBreads
.
push
(
tail
)
},
},
...
@@ -668,16 +736,19 @@ export default {
...
@@ -668,16 +736,19 @@ export default {
}
}
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.my-form-item
{
.my-form-item
{
cursor
:
text
;
cursor
:
text
;
}
}
.de-dialog-container
{
.de-dialog-container
{
height
:
50vh
!
important
;
height
:
50vh
!
important
;
}
}
.ms-aside-container
{
.ms-aside-container
{
width
:
40%
!
important
;
width
:
40%
!
important
;
min-width
:
230px
!
important
;
min-width
:
230px
!
important
;
...
@@ -699,6 +770,7 @@ export default {
...
@@ -699,6 +770,7 @@ export default {
// background: #99a9bf;
// background: #99a9bf;
border-radius
:
4px
;
border-radius
:
4px
;
height
:
45px
;
height
:
45px
;
.field-content
{
.field-content
{
position
:
relative
;
position
:
relative
;
display
:
table
;
display
:
table
;
...
@@ -716,7 +788,9 @@ export default {
...
@@ -716,7 +788,9 @@ export default {
padding
:
8px
;
padding
:
8px
;
height
:
100%
;
height
:
100%
;
border-right
:
none
;
border-right
:
none
;
border
:
1px
solid
var
(
--
TableBorderColor
,
#E6E6E6
);;
border
:
1px
solid
var
(
--
TableBorderColor
,
#E6E6E6
);
;
.field-content-text
{
.field-content-text
{
box-sizing
:
border-box
;
box-sizing
:
border-box
;
overflow
:
hidden
;
overflow
:
hidden
;
...
@@ -725,6 +799,7 @@ export default {
...
@@ -725,6 +799,7 @@ export default {
word-break
:
break-all
;
word-break
:
break-all
;
}
}
}
}
.field-content-right
{
.field-content-right
{
border-left
:
none
;
border-left
:
none
;
color
:
#9ea6b2
;
color
:
#9ea6b2
;
...
@@ -741,6 +816,7 @@ export default {
...
@@ -741,6 +816,7 @@ export default {
}
}
}
}
.filter-options-left
{
.filter-options-left
{
align-items
:
center
;
align-items
:
center
;
display
:
flex
;
display
:
flex
;
...
@@ -749,6 +825,7 @@ export default {
...
@@ -749,6 +825,7 @@ export default {
flex-wrap
:
nowrap
;
flex-wrap
:
nowrap
;
height
:
50px
;
height
:
50px
;
}
}
.filter-options-right
{
.filter-options-right
{
align-items
:
center
;
align-items
:
center
;
display
:
flex
;
display
:
flex
;
...
@@ -768,7 +845,8 @@ export default {
...
@@ -768,7 +845,8 @@ export default {
border
:
1px
solid
var
(
--
TableBorderColor
,
#E6E6E6
);
border
:
1px
solid
var
(
--
TableBorderColor
,
#E6E6E6
);
padding
:
10px
;
padding
:
10px
;
height
:
100%
;
height
:
100%
;
>>>
div
.el-tabs__content
{
>>>
div
.el-tabs__content
{
height
:
calc
(
100%
-
55px
);
height
:
calc
(
100%
-
55px
);
}
}
}
}
...
@@ -791,54 +869,66 @@ export default {
...
@@ -791,54 +869,66 @@ export default {
font-weight
:
450
!
important
;
font-weight
:
450
!
important
;
color
:
#409EFF
;
color
:
#409EFF
;
}
}
.filter-db-row
{
.filter-db-row
{
i
{
i
{
color
:
#3685f2
;
color
:
#3685f2
;
}
}
// background-color: #3685f2;
// background-color: #3685f2;
// color: #fff;
// color: #fff;
}
}
.filter-db-row
:hover
{
.filter-db-row
:hover
{
background-color
:
var
(
--
background-color-base
,
#f5f7fa
)
!
important
;
background-color
:
var
(
--
background-color-base
,
#f5f7fa
)
!
important
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.filter-db-row-checked
:hover
{
.filter-db-row-checked
:hover
{
background-color
:
var
(
--
background-color-base
,
#f5f7fa
)
!
important
;
background-color
:
var
(
--
background-color-base
,
#f5f7fa
)
!
important
;
color
:
inherit
;
color
:
inherit
;
cursor
:
pointer
;
cursor
:
pointer
;
i
{
i
{
background-color
:
inherit
;
background-color
:
inherit
;
color
:
#3685f2
;
color
:
#3685f2
;
}
}
}
}
.filter-db-row-checked
{
.filter-db-row-checked
{
background-color
:
#3685f2
!
important
;
background-color
:
#3685f2
!
important
;
color
:
#fff
;
color
:
#fff
;
i
{
i
{
background-color
:
#3685f2
;
background-color
:
#3685f2
;
color
:
#fff
;
color
:
#fff
;
}
}
}
}
.draggable-group
{
.draggable-group
{
display
:
inline-block
;
display
:
inline-block
;
width
:
100%
;
width
:
100%
;
height
:
calc
(
100%
-
6px
);
height
:
calc
(
100%
-
6px
);
}
}
.box-card
{
.box-card
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
.i-filter
{
.i-filter
{
text-align
:
center
;
text-align
:
center
;
margin-left
:
5px
;
margin-left
:
5px
;
margin-top
:
1px
;
margin-top
:
1px
;
}
}
.i-filter-inactive
{
.i-filter-inactive
{
color
:
#9ea6b2
!
important
;
color
:
#9ea6b2
!
important
;
cursor
:
not
-
allowed
!
important
;
cursor
:
not
-
allowed
!
important
;
}
}
.i-filter-active
{
.i-filter-active
{
cursor
:
pointer
!
important
;
cursor
:
pointer
!
important
;
}
}
.view-container-class
{
.view-container-class
{
...
@@ -848,23 +938,20 @@ export default {
...
@@ -848,23 +938,20 @@ export default {
width
:
100%
;
width
:
100%
;
overflow-y
:
auto
;
overflow-y
:
auto
;
overflow-x
:
hidden
;
overflow-x
:
hidden
;
word-break
:
break-all
;
word-break
:
break-all
;
position
:
relative
;
position
:
relative
;
>>>
label
{
width
:
100%
;
margin-left
:
0px
!
important
;
}
}
}
.list-group
:empty
,
.list-group
:empty
,
.list-group
>
div
:empty
{
.list-group
>
div
:empty
{
display
:
inline-block
;
display
:
inline-block
;
width
:
100%
;
width
:
100%
;
height
:
calc
(
100%
-
13px
);
height
:
calc
(
100%
-
13px
);
}
}
.list-group
:empty:before
,
.list-group
:empty:before
,
.list-group
>
div
:empty:before
{
.list-group
>
div
:empty:before
{
content
:
attr
(
data-value
);
content
:
attr
(
data-value
);
}
}
...
@@ -872,4 +959,11 @@ export default {
...
@@ -872,4 +959,11 @@ export default {
background-color
:
var
(
--
MainBG
,
#fff
);
background-color
:
var
(
--
MainBG
,
#fff
);
}
}
.span-div
{
width
:
135px
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
}
</
style
>
</
style
>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论