Merge branch 'optimize' of github.com:gcpaas/DataRoom into optimize

data-room-ui/packages/BasicComponents/ScreenScrollBoard/index.vue

@@ -7,6 +7,7 @@
       :key="updateKey"
       :class="{'light-theme':customTheme === 'light','auto-theme':customTheme =='auto','dark-theme':customTheme =='dark'}"
       :config="option"
+      @click="rowClick"
     />
   </div>
 </template>
@@ -48,6 +49,11 @@ export default {
     this.chartInit()
   },
   methods: {
+    // 表格点击事件
+    rowClick (row) {
+      console.log('点击')
+      this.linkage(row)
+    },
     dataFormatting (config, data) {
       const header = []
       const dataList = []

data-room-ui/packages/BasicComponents/ScreenScrollRanking/index.vue

@@ -8,6 +8,7 @@
       class="ranking-box"
       :class="{'light-theme':customTheme === 'light','auto-theme':customTheme =='auto','dark-theme':customTheme =='dark'}"
       :config="option"
+      @click="rowClick"
     />
   </div>
 </template>
@@ -49,6 +50,11 @@ export default {
   mounted () {
   },
   methods: {
+    // 点击事件
+    rowClick (row) {
+      console.log(row)
+      this.linkage(row)
+    },
     dataFormatting (config, data) {
       const dataSourseList = []
       data.data.forEach(item => {

data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue

@@ -359,6 +359,9 @@ export default {
       'changeRefreshConfig'
     ]),
     init () {
+      if (!this.pageInfo.pageConfig.refreshConfig) {
+        this.pageInfo.pageConfig.refreshConfig = []
+      }
       this.form = { ...this.pageInfo.pageConfig }
       this.drawerVisible = true
       if (this.pageInfo.chartList.length === 0) {
@@ -374,7 +377,7 @@ export default {
               disabled: false
             })
           } else {
-            this.pageInfo.pageConfig.refreshConfig = this.pageInfo.pageConfig.refreshConfig.filter(item => item.code !== chart.code)
+            this.pageInfo.pageConfig.refreshConfig = this.pageInfo?.pageConfig?.refreshConfig?.filter(item => item.code !== chart.code) || []
           }
         })
       }

data-room-ui/packages/BigScreenRun/index.vue

@@ -206,7 +206,7 @@ export default {
             that.chartList.forEach((chart, index) => {
               if (item.code === chart.code && item.time === time) {
                 item.time = item.time + item.originTime
-                that.$refs.RenderCardRef[index].$refs[chart.code].updateData()
+                that.$refs.RenderCardRef[index].$refs[chart.code].changeData(chart)
               }
             })
           }

data-room-ui/packages/PlotRender/index.vue

@@ -134,7 +134,7 @@ export default {
           })
         }
       })
-      config.option = option
+      config.option = { ...config.option, ...option }
       return config
     },
     dataFormatting (config, data) {

data-room-ui/packages/js/mixins/linkageMixins.js

@@ -27,35 +27,8 @@ export default {
       filterList = this.combineFilterList(isInner).filter(
         field => ![undefined, ''].includes(field.value)
       )
-      this.dataLinkageHandle(this.config, this.pageInfo.code, filterList)
-    },
-    // 数据联动时改变数据（与点击设置面板的更新按钮及初始化时的数据处理做区分）
-    async dataLinkageHandle (config, pageCode, filterList) {
-      const params = {
-        chart: {
-          ...config,
-          option: undefined
-        },
-        current: 1,
-        pageCode,
-        type: config.type,
-        filterList,
-        treeParentId: this.treeParentId || '0'
-      }
-      this.dataLoading = true
-      return getUpdateChartInfo(params)
-        .then(res => {
-          console.log(2, res)
-          config = this.buildOption(config, res)
-          this.changeChartConfig(config)
-          this.changeChartKey(config.code)
-        })
-        .catch(error => {
-          console.error(error)
-        })
-        .finally(() => {
-          this.dataLoading = false
-        })
+      // this.dataLinkageHandle(this.config, this.pageInfo.code, filterList)
+      this.changeData(this.config, filterList)
     },
     /**
      * 联动数据