From f6f5152338e38f266106b37cf10655050ab082fe Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 7 Sep 2022 10:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=85=B0=20=E4=BF=AE=E5=A4=8DAmap=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=B8=8A=E4=B8=8B=E6=96=87=E5=89=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=BB=96=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/src/AMapDesigner/index.vue    |  4 ++--
 src/views/common/mapLogistic/MapLogisticModal.vue | 10 ++++++----
 src/views/common/mapLogistic/index.vue            |  8 +++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 3930f8f..7cda39e 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -504,7 +504,7 @@
     if (!mapProps.toolbarControl) mapState.toggleOperatePanelClass.toolbarHeight = 0;
   });
   watch(toRefs(mapProps).options, (newValue: MapLogistic) => {
-    setMapDataJson(newValue);
+    nextTick(() => setMapDataJson(newValue));
   }, {
     immediate: true,
     deep: true
@@ -547,7 +547,7 @@
         mapState.mapData.mapTask = [...taskOrdinaryData, ...taskPresetData];
       }
     }
-    handleMapPointGenerate();
+    nextTick(() => handleMapPointGenerate());
   });
 
   /** 处理切换操作面板 */
diff --git a/src/views/common/mapLogistic/MapLogisticModal.vue b/src/views/common/mapLogistic/MapLogisticModal.vue
index 4b3b195..1733dd5 100644
--- a/src/views/common/mapLogistic/MapLogisticModal.vue
+++ b/src/views/common/mapLogistic/MapLogisticModal.vue
@@ -5,7 +5,7 @@
               :showCancelBtn="false"
               @register="registerModal"
   >
-    <AMapDesigner @success="handleSubmit"/>
+    <AMapDesigner :options="state.mapData" :isEdit="state.isEdit" @success="handleSubmit"/>
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -25,12 +25,14 @@
   interface WindowState {
     tag: string;
     mapData: Nullable<MapLogistic>;
+    isEdit: boolean;
   }
 
   /** 通用变量统一声明区域 */
   const state = reactive<WindowState>({
     tag: '',
-    mapData: null
+    mapData: null,
+    isEdit: false
   });
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
@@ -43,10 +45,11 @@
     // 采用tag标签区分操作
     switch (state.tag) {
       case 'add':
-        props.title = '新增科室';
+        state.isEdit = false;
         break;
       case 'edit':
         props.title = '编辑科室';
+        state.isEdit = true;
         state.mapData = await getMapDataByCourierUserId(courierUserId);
         break;
     }
@@ -54,7 +57,6 @@
     setModalProps(props);
   });
 
-
   /** 处理弹出框提交 */
   async function handleSubmit() {
     closeModal();
diff --git a/src/views/common/mapLogistic/index.vue b/src/views/common/mapLogistic/index.vue
index 25b44e6..c2de535 100644
--- a/src/views/common/mapLogistic/index.vue
+++ b/src/views/common/mapLogistic/index.vue
@@ -6,7 +6,7 @@
                   @click="() => {}"
         >预览</a-button>
         <a-button type="primary"
-                  @click="handleAdd()"
+                  @click="handleAdd"
         >新增</a-button>
       </template>
       <template #action="{ record }">
@@ -43,7 +43,7 @@
 
   const { createConfirm, createMessage } = useMessage();
   const [registerModal, { openModal }] = useModal();
-  const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
+  const [registerTable, { reload }] = useTable({
     title: '地图任务列表',
     api: listMapLogistic,
     rowKey: 'id',
@@ -73,13 +73,12 @@
 
   /** 编辑按钮操作,行内编辑 */
   function handleEdit(record?: Recordable) {
-    record = record || { id: getSelectRowKeys() };
     openModal(true, { _tag: 'edit', record });
   }
 
   /** 删除按钮操作,行内删除 */
   async function handleDel(record?: Recordable) {
-    const id = record?.id || getSelectRowKeys();
+    const id = record?.id;
     createConfirm({
       iconType: 'warning',
       title: '警告',
@@ -94,7 +93,6 @@
 
   /** 处理表格刷新 */
   function handleRefreshTable() {
-    clearSelectedRowKeys();
     reload();
   }
 </script>