From d1b5811ccc68e4cf96df5b4d3666f88e860d0dcb Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Sat, 15 Jun 2024 16:21:01 +0800
Subject: [PATCH] merge

---
 .../VFormDesign/components/FormItemProps.vue  |  2 +-
 .../demo/form-design/core/formItemConfig.ts   |  2 +-
 .../demo/onlineform/formCall/MapForm.vue      | 11 ++++++-----
 .../formCall/ShowFormModal/index.vue          |  1 -
 src/views/demo/onlineform/formCall/index.vue  | 19 ++++++++++++-------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
index 37485b83..2b7f8796 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
@@ -6,7 +6,7 @@
     <div class="properties-body" v-if="formConfig.currentItem?.itemProps">
       <Empty class="hint-box" v-if="!formConfig.currentItem.key" description="未选择控件" />
       <Form
-        v-else-if="formConfig.currentItem.field == 'MapGeom'"
+        v-else-if="formConfig.currentItem.field == 'mapgeom'"
         label-align="left"
         layout="vertical"
         description="图斑控件"
diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts
index 739fcad3..6f213735 100644
--- a/src/views/demo/form-design/core/formItemConfig.ts
+++ b/src/views/demo/form-design/core/formItemConfig.ts
@@ -159,7 +159,7 @@ export const customComponents: IVFormComponent[] = [
     component: 'MapGeom',
     label: '图斑',
     icon: 'bi:box-arrow-in-up-left',
-    field: 'mapGeom',
+    field: 'mapgeom',
     colProps: { span: 24 },
     componentProps: {},
   },
diff --git a/src/views/demo/onlineform/formCall/MapForm.vue b/src/views/demo/onlineform/formCall/MapForm.vue
index f39fbf94..b3f84532 100644
--- a/src/views/demo/onlineform/formCall/MapForm.vue
+++ b/src/views/demo/onlineform/formCall/MapForm.vue
@@ -118,6 +118,10 @@
         </template>
       </a-table>
       <!-- todo  创建/修改  人/时间 -->
+      <div class="footer-button" v-if="!isDetail">
+        <a-button style="margin-right: 20px" @click="handlerCloseForm">取消</a-button>
+        <a-button type="primary" @click="ModalSureClick">确认</a-button>
+      </div>
     </div>
   </template>
   <script lang="ts" setup>
@@ -604,7 +608,6 @@
           values = { ...values, ...item };
         });
         codeClickFunction('afterValidateForm', afterValidateForm.value);
-        console.log('values', values);
         let query = values;
         let saveSubTableList = [];
         subTableList.value.forEach((item) => {
@@ -638,11 +641,9 @@
         }
         query = { ...query, ...subTableDataStore.getGroupData };
         params.data = JSON.stringify(query);
-        console.log('query222', query);
-        console.log('params222', params);
         const data = await saveFormsData(params);
         if (data) {
-          setModalProps({ confirmLoading: true });
+        //   setModalProps({ confirmLoading: true });
           emit('success');
           if (flowCode.value == '') {
             closeModal();
@@ -654,7 +655,7 @@
           return createMessage.error('操作失败');
         }
       } finally {
-        setModalProps({ confirmLoading: false });
+        // setModalProps({ confirmLoading: false });
         // 添加保存后脚本
         codeClickFunction('afterSaveEvent', afterSaveEvent.value);
         closeFunc();
diff --git a/src/views/demo/onlineform/formCall/ShowFormModal/index.vue b/src/views/demo/onlineform/formCall/ShowFormModal/index.vue
index a0b8e2f5..422dbe2e 100644
--- a/src/views/demo/onlineform/formCall/ShowFormModal/index.vue
+++ b/src/views/demo/onlineform/formCall/ShowFormModal/index.vue
@@ -189,7 +189,6 @@
       getTitle.value = '新增';
       data.btnList.forEach((element) => {
         if (element.prop === 'Add' && element.isWFlow) {
-          alert("Add");
           flowCode.value = element.wFlowCode;
         }
       });
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index 7bc11633..c77d62cd 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -492,16 +492,21 @@
             // showFormModalData.value = toProps;
             // openShowFormModal.value = true;
             // openMapFormModal(true,toProps);
-            mapFormShow.value = true;
-            mapFormData.value = toProps;
-            MapboxComponent.value.handlerDraw(
-              status,
-              mapgemoList.value,
-              mapSetData.value?.isAllowEditPolygon,
-            );
+            // mapFormShow.value = true;
+            // mapFormData.value = toProps;
+            // MapboxComponent.value.handlerDraw(
+            //   status,
+            //   mapgemoList.value,
+            //   mapSetData.value?.isAllowEditPolygon,
+            // );
+            // openModal(true, toProps);
+            previewOpen.value = true;
+            flowFormData.value = rows[0];
+            isUpdate.value = true;
           } else {
             openModal(true, toProps);
           }
+          
         } else {
           previewOpen.value = true;
           flowFormData.value = rows[0];