From c9383c13936b06f799ca49baecda13f6e52d3a0b Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Mon, 28 Aug 2023 17:13:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B7=B2=E4=BF=AE=E6=94=B9=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=B9=E5=BA=94=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A2=AB=E9=87=8D=E7=BD=AE=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/ComponentDialog/index.vue | 32 +++++++++----------
 .../packages/js/mixins/commonMixins.js        |  8 ++---
 data-room-ui/vue.config.example.js            |  2 +-
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
index f77d9231..001ca89b 100644
--- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
@@ -345,6 +345,7 @@
   </el-dialog>
 </template>
 <script>
+import { displayOption } from 'data-room-ui/js/config'
 import { pageMixins } from 'data-room-ui/js/mixins/page'
 // import _ from 'lodash'
 import isEmpty from 'lodash/isEmpty'
@@ -425,20 +426,22 @@ export default {
         }
         this.$emit('setRemoteComponent', this.focus)
       } if (['bizComponent'].includes(this.activeName)) {
-        let config = {}
+        let config = {
+          setting: [],
+          option: {}
+        }
         if (isEmpty(this.focus)) {
           return
         }
         config.code = this.focus.code
         config.name = this.focus.name
-
-        this.$nextTick(() => {
-          config = cloneDeep(getRemoteComponentConfig(this.focus.code, this.focus.name))
-          config.setting = this.resolveStrSetting(this.focus.settingContent).setting
-          this.$emit('setRemoteComponent', config)
-        })
-        // config = getRemoteComponentConfig(this.focus.code, this.focus.name)
+        config = cloneDeep(getRemoteComponentConfig(this.focus.code, this.focus.name))
+        const settingContent = cloneDeep(this.resolveStrSetting(this.focus.settingContent))
+        config.setting = settingContent.setting
+        config.option = settingContent.option
         this.$emit('setRemoteComponent', config)
+        // config = getRemoteComponentConfig(this.focus.code, this.focus.name)
+        // this.$emit('setRemoteComponent', config)
       }
     },
     getDataList () {
@@ -495,16 +498,11 @@ export default {
       // 去掉 export default及后面代码
       settingContent = settingContent.replace(/export default[\s\S]*/, '')
       eval(settingContent)
-      if (this.config?.option) {
-        this.config.option = {
-          ...this.config.option,
-          ...option
-        }
-      }
-      if (this.config?.setting) {
-        this.config.setting = setting
+      option = {
+        data,
+        displayOption,
+        ...option
       }
-      console.log('resolveStrSetting', option, setting)
       return {
         option,
         setting
diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js
index 6a2c6bd8..66b5d3f9 100644
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@@ -4,13 +4,13 @@
  * @Author: xing.heng
  */
 // import _ from 'lodash'
-import cloneDeep from 'lodash/cloneDeep'
 import { mapMutations, mapState } from 'vuex'
 import { EventBus } from 'data-room-ui/js/utils/eventBus'
 import { getChatInfo, getUpdateChartInfo } from '../api/bigScreenApi'
 import axiosFormatting from '../../js/utils/httpParamsFormatting'
-import {settingToTheme} from "data-room-ui/js/utils/themeFormatting";
-import _ from "lodash";
+import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
+import cloneDeep from 'lodash/cloneDeep'
+
 export default {
   data () {
     return {
@@ -191,7 +191,7 @@ export default {
     changeStyle (config) {
       config = { ...this.config, ...config }
       // 样式改变时更新主题配置
-      config.theme = settingToTheme(_.cloneDeep(config), this.customTheme)
+      config.theme = settingToTheme(cloneDeep(config), this.customTheme)
       this.changeChartConfig(config)
       if (config.code === this.activeCode) {
         this.changeActiveItemConfig(config)
diff --git a/data-room-ui/vue.config.example.js b/data-room-ui/vue.config.example.js
index e99b730b..28da78cf 100644
--- a/data-room-ui/vue.config.example.js
+++ b/data-room-ui/vue.config.example.js
@@ -45,7 +45,7 @@ module.exports = {
   outputDir: 'dataRoomUi',
   assetsDir: 'static',
   lintOnSave: false,
-  productionSourceMap: false,
+  productionSourceMap: true,
   runtimeCompiler: true,
   devServer: {
     hot: true,