From ad93b55224f63ab874607876a8db046671f8ea84 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 5 Sep 2022 21:55:57 +0800
Subject: [PATCH] =?UTF-8?q?:rotating=5Flight:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/src/components/MapTaskModal.vue           | 2 +-
 src/components/Table/src/components/editable/EditableCell.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AMap/src/components/MapTaskModal.vue b/src/components/AMap/src/components/MapTaskModal.vue
index 7ef6025..0ec406b 100644
--- a/src/components/AMap/src/components/MapTaskModal.vue
+++ b/src/components/AMap/src/components/MapTaskModal.vue
@@ -58,7 +58,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { reactive, toRaw } from 'vue';
+  import { reactive, toRaw, unref } from 'vue';
   import {BasicModal, ModalProps, useModal, useModalInner} from '/@/components/Modal';
   import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table';
   import { MapPointType, taskOrdinaryColumns, taskPresetColumns } from '../amap.data';
diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue
index 90e5f9a..0fdc1d3 100644
--- a/src/components/Table/src/components/editable/EditableCell.vue
+++ b/src/components/Table/src/components/editable/EditableCell.vue
@@ -88,9 +88,9 @@
           getPopupContainer: () => unref(table?.wrapRef.value) ?? document.body,
           placeholder: createPlaceholderMessage(unref(getComponent)),
           ...apiSelectProps,
-          ...compProps,
-          [valueField]: value,
           disabled: unref(getDisable),
+          ...compProps,
+          [valueField]: value
         } as any;
       });
       function upEditDynamicDisabled(record, column, value) {