center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11742 from dataease/pr@dev-v2@style-refactor

Browse Source 
style: 样式调整
This commit is contained in:
王嘉豪 2024-08-26 13:23:01 +08:00 committed by GitHub
commit 62c1260529
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/icon-custom/src/Icon.vue
View File

@ -245,6 +245,7 @@ import filterHLeft from '@/assets/svg/filter-h-left.svg'
import filterHRight from '@/assets/svg/filter-h-right.svg'
import filterTop from '@/assets/svg/filter-top.svg'
import filter from '@/assets/svg/filter.svg'
import filterParams from '@/assets/svg/filter-params.svg'
import flowMapDark from '@/assets/svg/flow-map-dark.svg'
import flowMapOrigin from '@/assets/svg/flow-map-origin.svg'
import flowMap from '@/assets/svg/flow-map.svg'
@ -923,6 +924,7 @@ const iconMap = {
'filter-h-left': filterHLeft,
'filter-h-right': filterHRight,
'filter-top': filterTop,
'filter-params': filterParams,
filter: filter,
'flow-map-dark': flowMapDark,
'flow-map-origin': flowMapOrigin,

18
core/core-frontend/src/components/visualization/OuterParamsSet.vue
View File

@ -73,7 +73,7 @@
<el-row class="new-params-title"> 选择参数关联组件 </el-row>
<el-row class="new-params-filter" v-if="state.outerParamsInfo?.filterInfo?.length">
<div style="display: flex" class="inner-content">
<div style="width: 16px; margin-top: 2px">
<div style="width: 16px; margin-top: 2px" class="expand-custom-outer">
<div class="expand-custom">
<el-icon @click="() => (state.filterExpand = !state.filterExpand)"
><CaretBottom v-show="state.filterExpand" />
@ -94,7 +94,11 @@
>
<div style="width: 16px"></div>
<div style="flex: 1; line-height: 32px">
<Icon style="margin-top: 4px" class-name="view-type-icon" name="filter" />
<Icon
style="margin-top: 4px"
class-name="view-type-icon"
name="filter-params"
/>
<span>{{ findFilterName(baseFilter.id) }}</span>
</div>
<div style="flex: 1">
@ -120,7 +124,7 @@
</el-row>
<el-row class="new-params-ds" v-if="state.outerParamsInfo?.datasetInfo?.length">
<div style="display: flex" class="inner-content">
<div style="width: 16px; margin-top: 2px">
<div style="width: 16px; margin-top: 2px" class="expand-custom-outer">
<div class="expand-custom">
<el-icon @click="() => (state.datasetExpand = !state.datasetExpand)"
><CaretBottom v-show="state.datasetExpand" />
@ -139,7 +143,7 @@
:key="index"
>
<div style="display: flex; width: 100%">
<div style="width: 16px; margin-top: 7px">
<div style="width: 16px; margin-top: 7px" class="expand-custom-outer">
<div class="expand-custom">
<el-icon
@click="
@ -909,7 +913,7 @@ defineExpose({
.custom-view-diver {
width: 1px;
margin: 4px 4px;
margin: 4px 8px;
height: 14px;
background: rgba(31, 35, 41, 0.15);
}
@ -936,4 +940,8 @@ defineExpose({
}
}
}
.expand-custom-outer {
margin-right: 4px;
}
</style>