From 874ab066b0a4c3c956fcb81a812b13727b90854e Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 21 Sep 2023 17:57:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8placeholder=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=8E=BB=E9=99=A4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E4=BF=9D=E5=AD=98data=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/Select/index.vue | 45 +------------------
 .../BasicComponents/Select/settingConfig.js   |  1 +
 .../RightSetting/DataSetting.vue              |  9 +++-
 3 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Select/index.vue b/data-room-ui/packages/BasicComponents/Select/index.vue
index 8282d454..7391856d 100644
--- a/data-room-ui/packages/BasicComponents/Select/index.vue
+++ b/data-room-ui/packages/BasicComponents/Select/index.vue
@@ -4,7 +4,7 @@
     v-model="value"
     :popper-class="'basic-component-select select-popper-' + config.code"
     :class="['basic-component-select', `select-${config.code}`]"
-    :placeholder="`请选择${placeholder || newPlaceholder}`"
+    :placeholder="config.customize.placeholder"
     clearable
     :filterable="filterable"
     @visible-change="visibleChange"
@@ -21,10 +21,8 @@
 </template>
 
 <script>
-import { EventBus } from 'data-room-ui/js/utils/eventBus'
 import commonMixins from 'data-room-ui/js/mixins/commonMixins'
 import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
-import { getDataSetDetails } from 'data-room-ui/js/api/bigScreenApi'
 import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
 import cloneDeep from 'lodash/cloneDeep'
 window.dataSetFields = []
@@ -44,53 +42,26 @@ export default {
       value: '',
       innerConfig: {},
       optionData: [],
-      newPlaceholder: '',
       filterable: false
     }
   },
   computed: {
     isPreview () {
       return (this.$route.path === window?.BS_CONFIG?.routers?.previewUrl) || (this.$route.path === '/big-screen/preview')
-    },
-    placeholder: {
-      get () {
-        return window.dataSetFields.find(field => field.value === this.config.dataSource.dimensionField)?.label || ''
-      },
-      set (val) {
-        this.newPlaceholder = val
-      }
     }
   },
   watch: { },
   created () {
   },
   mounted () {
-    window.dataSetFields = []
     this.changeStyle(this.config)
-    EventBus.$on('changeBusinessKey', () => {
-      window.dataSetFields = []
-    })
     if (this.isPreview) {
       this.filterable = true
-      document.querySelector(`.select-${this.config.code}`).style.pointerEvents = 'all'
-      if (this.config.dataSource.businessKey && window.dataSetFields.length === 0) {
-        getDataSetDetails(this.config.dataSource.businessKey).then(res => {
-          window.dataSetFields = res.fields.map(field => {
-            return {
-              label: field.comment || field.fieldDesc,
-              value: field.name || field.fieldName
-            }
-          })
-          this.placeholder = window.dataSetFields.find(field => field.value === this.config.dataSource.dimensionField)?.label || ''
-        })
-      }
     } else {
       document.querySelector(`.select-${this.config.code}`).style.pointerEvents = 'none'
     }
   },
-  beforeDestroy () {
-    EventBus.$off('changeBusinessKey')
-  },
+  beforeDestroy () { },
   methods: {
     dataFormatting (config, data) {
       // 数据返回成功则赋值
@@ -105,20 +76,8 @@ export default {
             console.info(e)
           }
         }
-        config.option.data = data
         this.optionData = data
         config.customize.title = config.option.data[config.dataSource.dimensionField] || config.customize.title
-        if (window.dataSetFields.length === 0) {
-          getDataSetDetails(this.config.dataSource.businessKey).then(res => {
-            window.dataSetFields = res.fields.map(field => {
-              return {
-                label: field.comment || field.fieldDesc,
-                value: field.name || field.fieldName
-              }
-            })
-            this.placeholder = window.dataSetFields.find(field => field.value === this.config.dataSource.dimensionField)?.label || ''
-          })
-        }
         // 语音播报
       } else {
         // 数据返回失败则赋前端的模拟数据
diff --git a/data-room-ui/packages/BasicComponents/Select/settingConfig.js b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
index 2bb90a23..9f99f779 100644
--- a/data-room-ui/packages/BasicComponents/Select/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Select/settingConfig.js
@@ -30,6 +30,7 @@ const customConfig = {
   },
   // 自定义属性
   customize: {
+    placeholder: '请选择',
     // 输入框背景颜色
     backgroundColor: '#35393F',
     // 输入框字体大小
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index a80f95fb..f0d544b5 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -578,7 +578,6 @@
 </template>
 <script>
 import ElDragSelect from './ElDragSelect.vue'
-import { EventBus } from 'data-room-ui/js/utils/eventBus'
 // import { isEmpty, cloneDeep } from 'lodash'
 import isEmpty from 'lodash/isEmpty'
 import cloneDeep from 'lodash/cloneDeep'
@@ -703,6 +702,13 @@ export default {
         }
       },
       deep: true
+    },
+    'config.dataSource.dimensionField' (val) {
+      if (['select'].includes(this.config.type)) {
+        if (this.config.customize?.placeholder) {
+          this.config.customize.placeholder = '请选择' + this.dataSourceDataList.find(item => item.fieldName === val).comment
+        }
+      }
     }
   },
   mounted () {
@@ -738,7 +744,6 @@ export default {
       if (id) {
         this.config.dataSource.businessKey = id
         getDataSetDetails(id).then(res => {
-          EventBus.$emit('changeBusinessKey')
           this.fieldsList = res.fields
           // 初始化时以组件本来的参数设置为主
           if (type === 'initial') {