diff --git a/src/views/modules/labelSetting/components/DataSourceDialog.vue b/src/views/modules/labelSetting/components/DataSourceDialog.vue index bc9e60c..5c0da5b 100644 --- a/src/views/modules/labelSetting/components/DataSourceDialog.vue +++ b/src/views/modules/labelSetting/components/DataSourceDialog.vue @@ -3,30 +3,65 @@ title="数据源选择" :visible="visible" :close-on-click-modal="false" - width="800px" + width="880px" top="5vh" + append-to-body custom-class="data-source-dialog" @close="handleClose" > -
- - - - - {{ key.fieldName+(key.fieldDescription?('('+key.fieldDescription +')'):'')}} - - - - - + +
+ + + + +
+
取消 确定 @@ -43,14 +78,13 @@ export default { type: Array, default: () => [] }, - // 当前文本内容，用于分析应该勾选哪些数据字段 currentText: { type: String, default: '' }, sourceType: { type: String, - default: 'text' // 默认是文本类型 + default: 'text' } }, emits: ['update:visible', 'confirm'], @@ -59,41 +93,56 @@ export default { selectedKeys: [] } }, - + computed: { + hasViewGroups() { + return this.dataKeys && this.dataKeys.some(k => k.viewSource) + }, + viewGroups() { + if (!this.hasViewGroups) return [] + const groups = {} + this.dataKeys.forEach(key => { + const vs = key.viewSource || '未知视图' + if (!groups[vs]) groups[vs] = {viewSource: vs, fields: []} + groups[vs].fields.push(key) + }) + return Object.values(groups) + } + }, watch: { visible(newVal) { - if (newVal) { - this.initializeSelection() - } + if (newVal) this.initializeSelection() + }, + dataKeys() { + // 当字段更新时，重新初始化选中（如果对话框是可见的） + if (this.visible) this.initializeSelection() } }, methods: { - // 根据当前文本内容初始化选择状态 + getFieldDisplayName(key) { + const name = key.displayName || key.fieldName + return name + (key.fieldDescription ? `(${key.fieldDescription})` : '') + }, initializeSelection() { - if (!this.currentText || !this.dataKeys.length) { + if (!this.currentText || !this.dataKeys || !this.dataKeys.length) { this.selectedKeys = [] return } - - // 分析文本内容，找出其中包含的数据字段 - const foundKeys = [] - this.dataKeys.forEach(key => { - // 检查文本中是否包含 #{key} 格式的数据字段 - const pattern = new RegExp(`#\\{${key.fieldName}\\}`, 'g') - - if (pattern.test(this.currentText)) { - foundKeys.push(key.fieldName) - } + const found = [] + this.dataKeys.forEach(k => { + const pat = new RegExp(`#\\{${k.fieldName}\\}`, 'g') + if (pat.test(this.currentText)) found.push(k.fieldName) }) - this.selectedKeys = foundKeys + this.selectedKeys = found }, - handleClose() { this.$emit('update:visible', false) }, - handleConfirm() { - this.$emit('confirm', this.selectedKeys, this.sourceType) + const processed = this.selectedKeys.map(s => { + const f = this.dataKeys.find(k => k.fieldName === s) + return f && f.originalFieldName ? f.originalFieldName : s + }) + this.$emit('confirm', processed, this.sourceType) this.handleClose() } } @@ -101,214 +150,147 @@ export default {