From 9781e2c78368056edcd6ea8058400e435dde50df Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 16 Aug 2023 15:49:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=97=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=87=BA=E7=8E=B0'TypeError:=20=5Fthis99220refs.custo?=
 =?UTF-8?q?mStyle=20is=20not=20a=20function'=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remoteComponents/tabTable/index.vue       |  3 +-
 .../innerComponents/IndicatorCard/index.vue   | 10 ++++--
 .../innerComponents/aMap/index.vue            | 31 ++++++++++++-------
 .../innerComponents/card/index.vue            |  1 +
 .../innerComponents/diagonalBorder/config.js  | 11 +++++--
 .../innerComponents/diagonalBorder/index.vue  |  4 ++-
 .../innerComponents/indexCard/index.vue       |  8 +++--
 7 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/data-room-ui/example/remoteComponents/tabTable/index.vue b/data-room-ui/example/remoteComponents/tabTable/index.vue
index 070d1810..f944ef67 100644
--- a/data-room-ui/example/remoteComponents/tabTable/index.vue
+++ b/data-room-ui/example/remoteComponents/tabTable/index.vue
@@ -90,7 +90,8 @@ export default {
     },
     linkage (row) {
       this.$emit('linkage', row)
-    }
+    },
+    customStyle () {}
   }
 }
 </script>
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/IndicatorCard/index.vue b/data-room-ui/packages/RemoteComponents/innerComponents/IndicatorCard/index.vue
index 85934ee9..4a7afe63 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/IndicatorCard/index.vue
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/IndicatorCard/index.vue
@@ -20,7 +20,9 @@
           'font-weight':customize.firstWeight,
           'margin-bottom':customize.lineDistance +'px'
         }"
-      >{{tableData?tableData:'' }}</div>
+      >
+        {{ tableData?tableData:'' }}
+      </div>
       <div
         :style="{
           'font-size': customize.secondSize + 'px',
@@ -28,7 +30,8 @@
           color:customize.secondColor,
           'font-weight':customize.secondWeight,
         }"
-        class="content-right-second">
+        class="content-right-second"
+      >
         {{ customize.secondLine }}
       </div>
     </div>
@@ -49,7 +52,7 @@ export default {
       default: () => ({})
     }
   },
-  data() {
+  data () {
     return {
       customClass: {}
     }
@@ -81,6 +84,7 @@ export default {
     }
   },
   methods: {
+    customStyle () {}
   }
 }
 </script>
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/aMap/index.vue b/data-room-ui/packages/RemoteComponents/innerComponents/aMap/index.vue
index f04d7332..71bf4abb 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/aMap/index.vue
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/aMap/index.vue
@@ -14,6 +14,7 @@
 
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader'
+import cloneDeep from 'lodash/cloneDeep'
 export default {
   name: 'RemoteMap',
   props: {
@@ -44,13 +45,14 @@ export default {
   },
 
   mounted () {
-    this.initMap()
+    this.initMap(this.customize)
   },
   methods: {
-    initMap () {
+    initMap (customize) {
       this.loading = true
+      this.updateKey = 0
       AMapLoader.load({
-        key: this.customize.mapKey || '1b0a1423b70bbcbc20c9c87327e5e94e', // 申请好的Web端开发者Key，首次调用 load 时必填
+        key: customize.mapKey || '1b0a1423b70bbcbc20c9c87327e5e94e', // 申请好的Web端开发者Key，首次调用 load 时必填
         version: '1.4.15', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: [
           'AMap.ToolBar',
@@ -64,12 +66,12 @@ export default {
         // eslint-disable-next-line no-undef
         this.map = new AMap.Map(`map-${this.config.code}`, {
           resizeEnable: true, // 是否监控地图容器尺寸变化
-          lang: this.customize.lang,
-          mapStyle: `amap://styles/${this.customize.mapStyle}`,
-          center: [this.customize.lng, this.customize.lat],
-          features: this.customize.features,
-          zoom: this.customize.zoom,
-          viewMode: this.customize.viewMode,
+          lang: customize.lang,
+          mapStyle: `amap://styles/${customize.mapStyle}`,
+          center: [customize.lng, customize.lat],
+          features: customize.features,
+          zoom: customize.zoom,
+          viewMode: customize.viewMode,
           plugins: ['AMap.ToolBar', 'AMap.Scale', 'AMap.MapType', 'AMap.Geolocation']
         })
         this.loading = false
@@ -85,7 +87,7 @@ export default {
         // eslint-disable-next-line no-undef
         this.map.addControl(new AMap.Geolocation())
         let marker = null // 用于存储标记对象的变量
-        if (this.customize.markerSpan) {
+        if (customize.markerSpan) {
           // 创建自定义标记内容
           const markerContent = document.createElement('div')
           markerContent.style.position = 'absolute'
@@ -102,7 +104,7 @@ export default {
           // 创建标记文本
           const markerSpan = document.createElement('span')
           markerSpan.className = 'marker'
-          markerSpan.innerHTML = this.customize.markerSpan
+          markerSpan.innerHTML = customize.markerSpan
           markerContent.appendChild(markerSpan)
           // 删除之前的标记（如果存在）
           if (marker) {
@@ -111,7 +113,7 @@ export default {
           // 创建自定义标记
           // eslint-disable-next-line no-undef
           marker = new AMap.Marker({
-            position: [this.customize.markerLng, this.customize.markerLat],
+            position: [customize.markerLng, customize.markerLat],
             content: markerContent,
             // eslint-disable-next-line no-undef
             offset: new AMap.Pixel(0, 0) // 设置标记偏移，使其指向标记位置
@@ -130,6 +132,11 @@ export default {
           }
         }
       })
+    },
+    customStyle (config) {
+      if (config && config.option && config.option.customize) {
+        this.initMap(config.option.customize)
+      }
     }
   }
 }
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/card/index.vue b/data-room-ui/packages/RemoteComponents/innerComponents/card/index.vue
index 0d20fa62..4c506aba 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/card/index.vue
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/card/index.vue
@@ -71,6 +71,7 @@ export default {
     }
   },
   methods: {
+    customStyle () {}
   }
 }
 </script>
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/config.js b/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/config.js
index 546b08d2..71c79aeb 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/config.js
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/config.js
@@ -116,6 +116,13 @@ const option = {
 
 export default {
   title,
-  option,
-  setting
+  setting,
+  option: {
+    ...option,
+    displayOption: {
+      dataAllocation: {
+        enable: false
+      }
+    }
+  }
 }
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/index.vue b/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/index.vue
index 2b2e2fb9..5092b906 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/index.vue
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/diagonalBorder/index.vue
@@ -141,7 +141,9 @@ export default {
       rightDiagonal.style.top = `${this.customize.borderWidth / 2}px`
     }
   },
-  methods: {}
+  methods: {
+    customStyle () {}
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/data-room-ui/packages/RemoteComponents/innerComponents/indexCard/index.vue b/data-room-ui/packages/RemoteComponents/innerComponents/indexCard/index.vue
index 973953c4..fdb2fdec 100644
--- a/data-room-ui/packages/RemoteComponents/innerComponents/indexCard/index.vue
+++ b/data-room-ui/packages/RemoteComponents/innerComponents/indexCard/index.vue
@@ -36,7 +36,7 @@
             'font-weight':customize.firstWeight,
             'margin-bottom':customize.lineDistance +'px'
           }"
-        >{{tableData?tableData:'' }}</span>
+        >{{ tableData?tableData:'' }}</span>
         <span
           :style="{
             'font-size': customize.secondSize + 'px',
@@ -44,7 +44,8 @@
             color:customize.secondColor,
             'font-weight':customize.secondWeight,
           }"
-          class="content-right-second">
+          class="content-right-second"
+        >
           {{ customize.secondLine }}
         </span>
       </div>
@@ -63,7 +64,7 @@ export default {
       default: () => ({})
     }
   },
-  data() {
+  data () {
     return {
       customClass: {}
     }
@@ -94,6 +95,7 @@ export default {
     }
   },
   methods: {
+    customStyle () {}
   }
 }
 </script>