From e2d30a5234202185c1f1dfea8aa0844336969c6d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 21 Jul 2022 14:40:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=B8=96?=
 =?UTF-8?q?=E7=95=8C=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=AD=E5=9B=BD=E5=9C=B0=E5=9B=BE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                             |  4 +++-
 .../system/SysParam/MapSetting/MapSettingLeft.vue      | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 209a5a99b1..633ee572e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,9 @@ ARG IMAGE_TAG
 
 RUN mkdir -p /opt/apps /opt/dataease/data/feature/full /opt/dataease/drivers
 
-ADD mapFiles/* /opt/dataease/data/feature/full/
+RUN cp -r -f mapFiles/* /opt/dataease/data/feature/full/
+
+# ADD mapFiles/* /opt/dataease/data/feature/full/
 
 ADD drivers/* /opt/dataease/drivers/
 
diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
index dc66a97c72..a98d018b98 100644
--- a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
+++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
@@ -34,7 +34,7 @@
 
                 <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" :title="data.name">{{ node.data.name }}</span>
               </span>
-              <span v-if="!data.code.startWith('156')" class="child">
+              <span v-if="!isChina(data.code)" class="child">
                 <span @click.stop>
                   <span class="el-dropdown-link">
                     <el-button
@@ -45,7 +45,7 @@
                     />
                   </span>
                 </span>
-                <span v-if="!data.code.startWith('000')" style="margin-left: 12px;" @click.stop>
+                <span v-if="!isGlobal(data.code)" style="margin-left: 12px;" @click.stop>
                   <span class="el-dropdown-link">
                     <el-button
                       icon="el-icon-delete"
@@ -164,6 +164,12 @@ export default {
     },
     showNewNode(code) {
       this.$refs.tree.setCurrentKey(code)
+    },
+    isChina(code) {
+      return code && code.startsWith('156')
+    },
+    isGlobal(code) {
+      return code && code.startsWith('000')
     }
   }
 }