BUG修复:

基础数据->业务伙伴->客户管理，在新增时，点击取消不生效。

xjrsoft-vue3/src/views/jcsj/khgl/components/KhglModal.vue

-
 <template>
 <template>
-
-
   <BasicModal
   <BasicModal
     :height="500"
     :height="500"
-     v-bind="$attrs" @register="registerModal" :title="getTitle"
-      @ok="handleSubmit" @cancel="handleClose"  >
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+    @cancel="handleClose"
+  >
     <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
     <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
-      <template #footer v-if=" !state.isView">
+    <template #footer v-if="!state.isView">
       <template v-for="(item, index) in sortBy(formButtons, 'index')" :key="item.key">
       <template v-for="(item, index) in sortBy(formButtons, 'index')" :key="item.key">
         <template v-if="item.isShow">
         <template v-if="item.isShow">
           <CustomButtonModal v-if="item.type == CustomButtonModalType.Modal" :info="item" />
           <CustomButtonModal v-if="item.type == CustomButtonModalType.Modal" :info="item" />
@@ -23,7 +24,6 @@
       </template>
       </template>
     </template>
     </template>
   </BasicModal>
   </BasicModal>
-  
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ref, computed, reactive, provide, Ref } from 'vue';
   import { ref, computed, reactive, provide, Ref } from 'vue';
@@ -33,7 +33,7 @@
   import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
   import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { formProps ,formButtons } from './config';
+  import { formProps, formButtons } from './config';
   import ModalForm from './Form.vue';
   import ModalForm from './Form.vue';
   import { FromPageType } from '/@/enums/workflowEnum';
   import { FromPageType } from '/@/enums/workflowEnum';
 
 
@@ -44,7 +44,7 @@
 
 
   const { notification } = useMessage();
   const { notification } = useMessage();
   const formRef = ref();
   const formRef = ref();
-  const isCopy = ref<boolean>(false)
+  const isCopy = ref<boolean>(false);
   const state = reactive({
   const state = reactive({
     formModel: {},
     formModel: {},
     isUpdate: true,
     isUpdate: true,
@@ -58,10 +58,11 @@
     await handleInner(data);
     await handleInner(data);
   });
   });
 
 
-  const getTitle = computed(() => (state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增'));
-
+  const getTitle = computed(() =>
+    state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增',
+  );
 
 
-  async function handleInner(data){
+  async function handleInner(data) {
     state.isUpdate = !!data?.isUpdate;
     state.isUpdate = !!data?.isUpdate;
     state.isView = !!data?.isView;
     state.isView = !!data?.isView;
     isCopy.value = !!data?.isCopy;
     isCopy.value = !!data?.isCopy;
@@ -73,7 +74,8 @@
       showOkBtn: false,
       showOkBtn: false,
       canFullscreen: true,
       canFullscreen: true,
       width: 900,
       width: 900,
-      footer: state.isView ? null : undefined,defaultFullscreen:true,
+      footer: state.isView ? null : undefined,
+      defaultFullscreen: true,
     });
     });
 
 
     if (state.isUpdate || state.isView || isCopy.value) {
     if (state.isUpdate || state.isView || isCopy.value) {
@@ -85,10 +87,9 @@
       await formRef.value.setFormDataFromId(state.rowId);
       await formRef.value.setFormDataFromId(state.rowId);
     } else {
     } else {
       formRef.value.resetFields();
       formRef.value.resetFields();
-     
     }
     }
-    
   }
   }
+
   async function saveModal() {
   async function saveModal() {
     let saveSuccess = false;
     let saveSuccess = false;
     try {
     try {
@@ -140,15 +141,14 @@
         emit('success');
         emit('success');
       }
       }
     } finally {
     } finally {
-      
       setModalProps({ confirmLoading: false });
       setModalProps({ confirmLoading: false });
-      
     }
     }
   }
   }
+
   function customClick(item) {
   function customClick(item) {
     if (item.key == 'confirm') {
     if (item.key == 'confirm') {
       handleSubmit();
       handleSubmit();
-    } else if (item.key == 'cancel' && props.formType !== 'normal') {
+    } else if (item.key == 'cancel') {
       handleClose();
       handleClose();
       closeModal();
       closeModal();
     } else if (item.key == 'reset') {
     } else if (item.key == 'reset') {
@@ -157,10 +157,8 @@
       executeCurFormEvent(item.event, state.formModel, true);
       executeCurFormEvent(item.event, state.formModel, true);
     }
     }
   }
   }
+
   function handleClose() {
   function handleClose() {
     formRef.value.resetFields();
     formRef.value.resetFields();
   }
   }
-  
 </script>
 </script>
-
-  
\ No newline at end of file

xjrsoft-vue3/src/views/jcsj/khgl/components/config.ts

@@ -760,6 +760,7 @@ export const formProps: FormProps = {
   showResetButton: false,
   showResetButton: false,
   showSubmitButton: false,
   showSubmitButton: false,
   hiddenComponent: [],
   hiddenComponent: [],
+  buttonList: [],
 };
 };
 
 
 export const formButtons = [
 export const formButtons = [