dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8552 from dataease/pr@dev_color_tree

Browse Source 
fix(过滤组件): 过滤组件全选颜色没有发生变更
This commit is contained in:
dataeaseShu 2024-03-18 09:55:53 +08:00 committed by GitHub
commit d70e8eb750
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/frontend/src/components/dataease/DeOutWidget.vue
View File

@ -205,7 +205,7 @@ export default {
styleEle.id = `style${this.element.id}` styleEle.id = `style${this.element.id}`
document.querySelector('head').appendChild(styleEle) document.querySelector('head').appendChild(styleEle)
} }
styleEle.innerHTML = `#component${this.element.id} .el-input__inner::placeholder {\n color: ${this.element.style.wordColor} \n }` styleEle.innerHTML = `#component${this.element.id}.component-custom .el-input__inner::placeholder {\n color: ${this.element.style.wordColor}b3 \n }`
}, },
filterLoaded(p) { filterLoaded(p) {
this.$emit('filter-loaded', p) this.$emit('filter-loaded', p)

14
core/frontend/src/components/elTreeSelect/index.vue
View File

@ -52,7 +52,6 @@
class="tree-select-all" class="tree-select-all"
><el-checkbox ><el-checkbox
v-model="selectAll" v-model="selectAll"
v-customStyle="customStyle"
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
@change="selectAllChange" @change="selectAllChange"
>{{ $t('dataset.check_all') }}</el-checkbox></p> >{{ $t('dataset.check_all') }}</el-checkbox></p>
@ -590,15 +589,14 @@ export default {
</script> </script>
<style> <style>
.el-tree-select .de-select-option { .el-tree-select .de-select-option {
display: none !important; display: none !important;
} }
.tree-select-all { .tree-select-all {
padding: 10px 20px 0 24px; padding: 10px 20px 0 24px;
}
} .tree-select-all .el-checkbox__label {
.tree-select-all .el-checkbox__label { color: var(--SelectTreeColor, #606266);
color: var(--SelectTreeColor, #606266); }
}
[aria-disabled='true'] > .el-tree-node__content { [aria-disabled='true'] > .el-tree-node__content {
color: inherit !important; color: inherit !important;
background: transparent !important; background: transparent !important;

2
core/frontend/src/components/elVisualSelect/index.vue
View File

@ -23,7 +23,7 @@
:indeterminate="isIndeterminate" :indeterminate="isIndeterminate"
@change="selectAllChange" @change="selectAllChange"
> >
<span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor} !important`}">{{ $t('dataset.check_all') }}</span> <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor}`}">{{ $t('dataset.check_all') }}</span>
</el-checkbox> </el-checkbox>
</p> </p>
<el-option <el-option

7
core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
View File

@ -70,7 +70,12 @@
<el-col :span="16"> <el-col :span="16">
<div class="filter-options-right"> <div class="filter-options-right">
<span style="padding-right: 10px;"> <span style="padding-right: 10px;">
<span v-if="widget.name && ['textSelectWidget', 'textSelectGridWidget'].includes(widget.name)" style="padding-right: 10px;">
<el-checkbox
v-model="attrs.showEmpty"
>{{ $t('panel.show_empty') }}
</el-checkbox>
</span>
<el-checkbox <el-checkbox
v-model="attrs.showTitle" v-model="attrs.showTitle"
@change="showTitleChange" @change="showTitleChange"