From 51016a2214f412bff222d81d4ee4711f49029ee9 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 4 Dec 2024 18:15:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=8C=BA=E5=9F=9F=E7=BC=96=E8=BE=91=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/parameter/map/Geometry.vue   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/system/parameter/map/Geometry.vue b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
index 64a3daaf4c..386db155ff 100644
--- a/core/core-frontend/src/views/system/parameter/map/Geometry.vue
+++ b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
@@ -157,7 +157,7 @@
                 <span>自定义区域</span>
                 <span>(仅对中国的省份、直辖市，支持自定义地理区域)</span>
               </span>
-              <span class="add-btn" @click="editCustomSubArea">
+              <span class="add-btn" @click="editCustomSubArea()">
                 <el-icon>
                   <Icon name="icon_add_outlined"><icon_add_outlined /></Icon>
                 </el-icon>
@@ -202,6 +202,7 @@
     v-model="customAreaDialog"
     :title="`${editedCustomArea.id ? '编辑' : '新建'}自定义地理区域`"
     width="500"
+    destroy-on-close
   >
     <el-form
       ref="areaFormRef"
@@ -225,6 +226,7 @@
     v-model="customSubAreaDialog"
     :title="`${customSubArea.id ? '编辑' : '新建'}自定义区域`"
     width="500"
+    destroy-on-close
   >
     <el-form
       ref="subAreaFormRef"
@@ -233,10 +235,10 @@
       label-width="auto"
       :rules="areaRules"
     >
-      <el-form-item label="区域名称" label-position="top" required prop="name">
+      <el-form-item label="区域名称" label-position="top" prop="name">
         <el-input v-model="customSubArea.name" :minlenegth="1" :maxlength="50" />
       </el-form-item>
-      <el-form-item label="请选择省份或直辖市" label-position="top" required prop="scopeArr">
+      <el-form-item label="请选择省份或直辖市" label-position="top" prop="scopeArr">
         <el-select v-model="customSubArea.scopeArr" multiple style="width: 100%" filterable>
           <el-option
             v-for="item in subAreaOptions"
@@ -504,10 +506,17 @@ const subAreaList = ref([])
 const subAreaFormRef = ref()
 const areaRules = reactive<FormRules>({
   name: [
-    { required: true, message: '请输入名称', trigger: 'blur' },
+    { type: 'string', required: true, message: '请输入名称', trigger: 'change' },
     { min: 1, max: 50, message: '名称长度为 1~50 格字符', trigger: 'blur' }
   ],
-  scopeArr: [{ type: 'array', required: true, message: '请选择区域', trigger: 'change' }]
+  scopeArr: [
+    {
+      type: 'array',
+      required: true,
+      message: '请选择区域',
+      trigger: 'change'
+    }
+  ]
 })
 const editCustomSubArea = (subArea?) => {
   customSubArea.geoAreaId = curCustomGeoArea.id