From f04671ee7a930aa4b9eab2241c5949dc5da93370 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 14 Nov 2023 16:30:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=9C=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=9C=80=E8=A6=81=E9=85=8D=E7=BD=AE=E6=97=B6?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=8D=B3=E5=8A=A0=E8=BD=BD=E5=AF=BC=E8=87=B4=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=97=B6=E9=97=B4=E8=BF=87=E9=95=BF=20#6638?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/customComponent/UserView.vue       | 103 ++++++++----------
 .../components/shapeAttr/ColorSelector.vue    |  15 +++
 2 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 2b07d4daba..bd09268065 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -205,34 +205,34 @@
 </template>
 
 <script>
-import { viewData } from '@/api/panel/panel'
-import { viewInfo } from '@/api/link'
+import {viewData} from '@/api/panel/panel'
+import {viewInfo} from '@/api/link'
 import ChartComponent from '@/views/chart/components/ChartComponent.vue'
 import TableNormal from '@/views/chart/components/table/TableNormal'
 import LabelNormal from '../../../views/chart/components/normal/LabelNormal'
-import { uuid } from 'vue-uuid'
+import {uuid} from 'vue-uuid'
 import bus from '@/utils/bus'
-import { mapState } from 'vuex'
-import { isChange } from '@/utils/conditionUtil'
-import { BASE_CHART_STRING } from '@/views/chart/chart/chart'
-import { deepCopy } from '@/components/canvas/utils/utils'
-import { getLinkToken, getToken } from '@/utils/auth'
+import {mapState} from 'vuex'
+import {isChange} from '@/utils/conditionUtil'
+import {BASE_CHART_STRING} from '@/views/chart/chart/chart'
+import {deepCopy} from '@/components/canvas/utils/utils'
+import {getLinkToken, getToken} from '@/utils/auth'
 import DrillPath from '@/views/chart/view/DrillPath'
-import { areaMapping } from '@/api/map/map'
+import {areaMapping} from '@/api/map/map'
 import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
 import EditBarView from '@/components/canvas/components/editor/EditBarView'
-import { adaptCurTheme, customAttrTrans, customStyleTrans, recursionTransObj } from '@/components/canvas/utils/style'
+import {adaptCurTheme, customAttrTrans, customStyleTrans, recursionTransObj} from '@/components/canvas/utils/style'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
 import PluginCom from '@/views/system/plugin/PluginCom'
 import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
-import { viewEditSave, viewPropsSave } from '@/api/chart/chart'
-import { checkAddHttp } from '@/utils/urlUtils'
+import {viewEditSave, viewPropsSave} from '@/api/chart/chart'
+import {checkAddHttp} from '@/utils/urlUtils'
 import DeRichTextView from '@/components/canvas/customComponent/DeRichTextView'
 import Vue from 'vue'
-import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
+import {formatterItem, valueFormatter} from '@/views/chart/chart/formatter'
 import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
 import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog'
-import { equalsAny } from '@/utils/StringUtils'
+import {equalsAny} from '@/utils/StringUtils'
 
 export default {
   name: 'UserView',
@@ -267,7 +267,7 @@ export default {
     outStyle: {
       type: Object,
       required: false,
-      default: function() {
+      default: function () {
         return {}
       }
     },
@@ -306,7 +306,7 @@ export default {
     canvasStyleData: {
       type: Object,
       required: false,
-      default: function() {
+      default: function () {
         return {}
       }
     },
@@ -508,7 +508,7 @@ export default {
 
   watch: {
     'innerPadding': {
-      handler: function(val1, val2) {
+      handler: function (val1, val2) {
         if (val1 !== val2) {
           this.resizeChart()
         }
@@ -516,7 +516,7 @@ export default {
       deep: true
     },
     'cfilters': {
-      handler: function(val1, val2) {
+      handler: function (val1, val2) {
         if (isChange(val1, val2) && !this.isFirstLoad) {
           this.getData(this.element.propValue.viewId)
           this.getDataLoading = true
@@ -532,13 +532,13 @@ export default {
       },
       deep: true
     },
-    resultCount: function() {
+    resultCount: function () {
       this.getData(this.element.propValue.viewId, false)
     },
-    resultMode: function() {
+    resultMode: function () {
       this.getData(this.element.propValue.viewId, false)
     },
-    gap: function() {
+    gap: function () {
       this.resizeChart()
     },
     // 监听外部的样式变化 （非实时性要求）
@@ -557,13 +557,13 @@ export default {
       deep: true
     },
     // 监听外部计时器变化
-    searchCount: function(val1) {
+    searchCount: function (val1) {
       // 内部计时器启动 忽略外部计时器
       if (val1 > 0 && this.requestStatus !== 'waiting' && !this.innerRefreshTimer) {
         this.getData(this.element.propValue.viewId)
       }
     },
-    'chartType': function(newVal, oldVal) {
+    'chartType': function (newVal, oldVal) {
       if ((newVal === 'map' || newVal === 'buddle-map') && newVal !== oldVal) {
         this.initAreas()
       }
@@ -577,10 +577,10 @@ export default {
       },
       deep: true
     },
-    'chart.yaxis': function(newVal, oldVal) {
+    'chart.yaxis': function (newVal, oldVal) {
       this.$emit('fill-chart-2-parent', this.chart)
     },
-    'chart.title': function(newVal, oldVal) {
+    'chart.title': function (newVal, oldVal) {
       this.$emit('fill-chart-2-parent', this.chart)
     }
   },
@@ -691,7 +691,7 @@ export default {
       })
     },
     pluginEditHandler(e) {
-      this.$emit('trigger-plugin-edit', { e, id: this.element.id })
+      this.$emit('trigger-plugin-edit', {e, id: this.element.id})
     },
     batchOptChange(param) {
       if (this.curBatchOptComponents.includes(this.element.propValue.viewId)) {
@@ -700,7 +700,7 @@ export default {
     },
     optFromBatchSingleProp(param) {
       this.$store.commit('canvasChange')
-      const updateParams = { 'id': this.chart.id }
+      const updateParams = {'id': this.chart.id}
       if (param.custom === 'customAttr') {
         const sourceCustomAttr = JSON.parse(this.sourceCustomAttrStr)
         if (!sourceCustomAttr[param.property]) {
@@ -733,11 +733,11 @@ export default {
       viewPropsSave(this.panelInfo.id, updateParams).then(rsp => {
         this.active && bus.$emit('current-component-change')
       })
-      this.$store.commit('recordViewEdit', { viewId: this.chart.id, hasEdit: true })
+      this.$store.commit('recordViewEdit', {viewId: this.chart.id, hasEdit: true})
       this.mergeScale()
     },
     optFromBatchThemeChange() {
-      const updateParams = { 'id': this.chart.id }
+      const updateParams = {'id': this.chart.id}
       const sourceCustomAttr = JSON.parse(this.sourceCustomAttrStr)
       const sourceCustomStyle = JSON.parse(this.sourceCustomStyleStr)
       adaptCurTheme(sourceCustomStyle, sourceCustomAttr, this.chart.type)
@@ -750,7 +750,7 @@ export default {
       viewPropsSave(this.panelInfo.id, updateParams).then(rsp => {
         this.active && bus.$emit('current-component-change')
       })
-      this.$store.commit('recordViewEdit', { viewId: this.chart.id, hasEdit: true })
+      this.$store.commit('recordViewEdit', {viewId: this.chart.id, hasEdit: true})
       this.mergeScale()
     },
     resizeChart() {
@@ -760,7 +760,7 @@ export default {
         this.chartResize(this.changeIndex)
       } else if (this.$refs[this.element.propValue.id]) {
         this.chart.isPlugin
-          ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
+          ? this.$refs[this.element.propValue.id].callPluginInner({methodName: 'chartResize'})
           : this.$refs[this.element.propValue.id].chartResize()
       }
     },
@@ -860,7 +860,7 @@ export default {
         }
         if (this.panelInfo.proxy) {
           // method = viewInfo
-          requestInfo.proxy = { userId: this.panelInfo.proxy }
+          requestInfo.proxy = {userId: this.panelInfo.proxy}
         }
         // table-info明细表增加分页
         if (this.view && this.view.customAttr) {
@@ -879,7 +879,7 @@ export default {
             this.chart = response.data
             this.view = response.data
             if (this.chart.type.includes('table')) {
-              this.$store.commit('setLastViewRequestInfo', { viewId: id, requestInfo: requestInfo })
+              this.$store.commit('setLastViewRequestInfo', {viewId: id, requestInfo: requestInfo})
             }
             this.buildInnerRefreshTimer(this.chart.refreshViewEnable, this.chart.refreshUnit, this.chart.refreshTime)
             this.$emit('fill-chart-2-parent', this.chart)
@@ -1048,7 +1048,7 @@ export default {
     chartClick(param) {
       if (this.drillClickDimensionList.length < this.chart.drillFields.length - 1) {
         (this.chart.type === 'map' || this.chart.type === 'buddle-map') && this.sendToChildren(param)
-        this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
+        this.drillClickDimensionList.push({dimensionList: param.data.dimensionList})
         this.getData(this.element.propValue.viewId)
       } else if (this.chart.drillFields.length > 0) {
         this.$message({
@@ -1308,7 +1308,7 @@ export default {
         this.timeMachine = setTimeout(() => {
           if (index === this.changeIndex) {
             this.chart.isPlugin
-              ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
+              ? this.$refs[this.element.propValue.id].callPluginInner({methodName: 'chartResize'})
               : this.$refs[this.element.propValue.id].chartResize()
           }
           this.destroyTimeMachine()
@@ -1354,27 +1354,20 @@ export default {
     },
     getDataOnly(sourceResponseData, dataBroadcast) {
       if (this.isEdit) {
-        if ((this.filter.filter && this.filter.filter.length) || (this.filter.linkageFilters && this.filter.linkageFilters.length)) {
-          const requestInfo = {
-            filter: [],
-            drill: [],
-            queryFrom: 'panel'
+        if (((this.filter.filter && this.filter.filter.length) || (this.filter.linkageFilters && this.filter.linkageFilters.length)) &&
+          this.chart.render &&
+          this.chart.render === 'antv' &&
+          (this.chart.type.includes('bar') ||
+            this.chart.type.includes('line') ||
+            this.chart.type.includes('area') ||
+            this.chart.type.includes('pie') ||
+            this.chart.type === 'funnel' ||
+            this.chart.type === 'radar' ||
+            this.chart.type === 'scatter')) {
+          delete this.componentViewsData[this.chart.id]
+          if (dataBroadcast) {
+            bus.$emit('prop-change-data')
           }
-          // table-info明细表增加分页
-          if (this.view && this.view.customAttr) {
-            const attrSize = JSON.parse(this.view.customAttr).size
-            if (this.chart.type === 'table-info' && this.view.datasetMode === 0 && (!attrSize.tablePageMode || attrSize.tablePageMode === 'page')) {
-              requestInfo.goPage = this.currentPage.page
-              requestInfo.pageSize = this.currentPage.pageSize
-            }
-          }
-          viewData(this.chart.id, this.panelInfo.id, requestInfo).then(response => {
-            this.componentViewsData[this.chart.id] = response.data
-            this.view = response.data
-            if (dataBroadcast) {
-              bus.$emit('prop-change-data')
-            }
-          })
         } else {
           this.componentViewsData[this.chart.id] = sourceResponseData
           if (dataBroadcast) {
diff --git a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
index d67d0dfa8f..b30480601b 100644
--- a/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
+++ b/core/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
@@ -349,6 +349,7 @@ import { mapState } from 'vuex'
 import GradientColorSelector from '@/components/gradientColorSelector'
 import bus from '@/utils/bus'
 import { equalsAny } from '@/utils/StringUtils'
+import { viewData } from '@/api/panel/panel'
 
 export default {
   name: 'ColorSelector',
@@ -479,6 +480,9 @@ export default {
     }
   },
   computed: {
+    panelInfo() {
+      return this.$store.state.panel.panelInfo
+    },
     checkMapLineGradient() {
       const chart = this.chart
       if (chart.type === 'flow-map') {
@@ -614,6 +618,17 @@ export default {
         if (this.componentViewsData[this.chart.id]) {
           const chart = JSON.parse(JSON.stringify(this.componentViewsData[this.chart.id]))
           this.colorForm.seriesColors = getColors(chart, this.colorForm.colors, reset)
+        } else {
+          const requestInfo = {
+            filter: [],
+            drill: [],
+            queryFrom: 'panel'
+          }
+          viewData(this.chart.id, this.panelInfo.id, requestInfo).then(response => {
+            this.componentViewsData[this.chart.id] = response.data
+            const chart = JSON.parse(JSON.stringify(this.componentViewsData[this.chart.id]))
+            this.colorForm.seriesColors = getColors(chart, this.colorForm.colors, reset)
+          })
         }
       }
     }