Merge branch 'master' of github.com:gcpaas/DataRoom

main
wu.jian2 2 years ago
commit 4103749d1b

@ -71,6 +71,7 @@
数据配置 数据配置
</div> </div>
</div> </div>
<!-- 基础组件数据配置 -->
<template v-if="!['customComponent', 'remoteComponent'].includes(config.type)"> <template v-if="!['customComponent', 'remoteComponent'].includes(config.type)">
<!--维度多选--> <!--维度多选-->
<el-form-item <el-form-item
@ -160,6 +161,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
<!-- g2plot和远程组件数据配置 -->
<template v-else> <template v-else>
<template <template
v-for="(setting, index) in config.setting.filter(set => set.tabName === 'data')" v-for="(setting, index) in config.setting.filter(set => set.tabName === 'data')"
@ -177,7 +179,7 @@
clearable clearable
:multiple="setting.multiple" :multiple="setting.multiple"
:placeholder="`请选择${setting.label}`" :placeholder="`请选择${setting.label}`"
@change="changeCustomProps(...arguments, index)" @change="changeCustomProps(...arguments, setting)"
> >
<el-option <el-option
v-for="(field, fieldIndex) in dataSourceDataList" v-for="(field, fieldIndex) in dataSourceDataList"
@ -199,7 +201,7 @@
v-else v-else
:value="setting.value" :value="setting.value"
:placeholder="`请输入${setting.label}`" :placeholder="`请输入${setting.label}`"
@change="changeCustomProps(...arguments, index)" @change="changeCustomProps(...arguments, setting)"
/> />
</el-form-item> </el-form-item>
</template> </template>
@ -801,8 +803,13 @@ export default {
this.config.customize.columnConfig = cloneDeep(this.headerList) this.config.customize.columnConfig = cloneDeep(this.headerList)
this.$store.commit('bigScreen/changeActiveItemConfig', this.config) this.$store.commit('bigScreen/changeActiveItemConfig', this.config)
}, },
changeCustomProps (value, index) { changeCustomProps (value, setting) {
this.$set(this.config.setting[index], 'value', value) this.config.setting = this.config.setting.map(item => {
if (item.field === setting.field) {
item.value = value
}
return item
})
} }
// key // key
// changeCacheBusinessKey (id) { // changeCacheBusinessKey (id) {

Loading…
Cancel
Save