From c3e294ff76aff4654c7218645c7a13b539f66a36 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 18 六月 2024 20:08:43 +0800
Subject: [PATCH] internal

---
 src/views/components/CustModal.vue |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/components/CustModal.vue b/src/views/components/CustModal.vue
index ac65729..c95f031 100644
--- a/src/views/components/CustModal.vue
+++ b/src/views/components/CustModal.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Description: 鑷畾涔夊脊鍑烘锛屽彲浠ヨ嚜瀹氫箟澶氫釜琛ㄥ崟
+ * @Author: Ben Lin
+ * @version: 
+ * @Date: 2024-06-05 15:46:07
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-06-13 09:28:27
+-->
 <template>
   <BasicModal
     v-bind="$attrs"
@@ -42,6 +50,7 @@
   const title = ref('');
   const width = ref('');
   const FnName = ref({});
+  const mValues = ref<Recordable>({});
   const initFnName = ref({});
   const dtlSlots = ref([] as any[]);
   const formSchema = ref([] as FormSchema[]);
@@ -71,13 +80,14 @@
     formElName.value = data?.formElName; //寮规涓〃鍗曞悕瀛楁暟缁�
     useFormData.value = data?.formEl; //寮规涓〃鍗曞疄渚嬫暟缁�
     FnName.value = data?.fnName; //淇濆瓨鏁版嵁鏂规硶
+    mValues.value = data?.values; //涓昏〃鍗曚紶杩囨潵鐨勬暟鎹�
     //寰幆琛ㄥ崟鍚嶆暟缁勶紝鎿嶄綔鍚勮〃鍗曞瓧娈�
     formElName.value.forEach((name) => {
       if (!isNullOrUnDef(useFormData.value[name])) {
         useFormData.value[name][1].resetFields();
         if (unref(isUpdate)) {
           useFormData.value[name][1].setFieldsValue({
-            ...data,
+            ...mValues.value,
           });
         }
       }
@@ -85,7 +95,13 @@
     //鍒濆鍖栨柟娉曡嚜瀹氫箟
     if (!isNullOrEmpty(data?.initFnName)) {
       initFnName.value = data?.initFnName;
-      custFunction(unref(isUpdate.value), initFnName.value[cType.value], cType.value);
+      custFunction(
+        unref(isUpdate.value),
+        initFnName.value[cType.value],
+        cType.value,
+        mValues.value,
+        data?.others,
+      );
     }
   });
 
@@ -97,7 +113,10 @@
   //   { deep: true },
   // );
 
-  /* 寮规纭畾鎸夐挳鏂规硶 */
+  /**
+   * @description: 寮规纭畾鎸夐挳鏂规硶
+   * @return {*}
+   */  
   async function handleSuccess() {
     try {
       var values = {} as any;
@@ -109,6 +128,7 @@
       }
       setModalProps({ confirmLoading: true });
       //璋冪敤鑷畾涔変繚瀛樻柟娉曚繚瀛樻暟鎹�
+      values['mValues'] = mValues.value;
       const action = await custFunction(values, FnName.value[cType.value], cType.value);
       if (action as boolean) {
         closeModal();

--
Gitblit v1.9.3