Merge pull request #113 from cshaptx4869/patch-72

watch函数增加配置项参数返回

src/components/PageModal/Form.vue

@@ -106,46 +106,45 @@ const formRef = ref<FormInstance>();
 const formItems = reactive(props.formItems);
 const formData = reactive<IObject>({});
 const formRules: FormRules = {};
-const watchArr = [];
+const prepareFuncs = [];
-const computedArr = [];
-const watchEffectArr = [];
 // 初始化
 for (const item of formItems) {
   item.initFn && item.initFn(item);
   formData[item.prop] = item.initialValue ?? "";
   formRules[item.prop] = item.rules ?? [];
+
   if (item.watch !== undefined) {
-    watchArr.push({ field: item.prop, func: item.watch });
+    prepareFuncs.push(() => {
-  }
-  if (item.computed !== undefined) {
-    computedArr.push({ field: item.prop, func: item.computed });
-  }
-  if (item.watchEffect !== undefined) {
-    watchEffectArr.push(item.watchEffect);
-  }
-}
-watchArr.forEach(({ field, func }) => {
       watch(
-    () => formData[field],
+        () => formData[item.prop],
         (newValue, oldValue) => {
-      func(newValue, oldValue, formData);
+          item.watch && item.watch(newValue, oldValue, formData, formItems);
         }
       );
-});
+    });
-computedArr.forEach(({ field, func }) => {
+  }
-  formData[field] = computed({
+
+  if (item.computed !== undefined) {
+    prepareFuncs.push(() => {
+      formData[item.prop] = computed({
         get() {
-      return func(formData);
+          return item.computed ? item.computed(formData) : undefined;
         },
         // TODO
         set() {},
       });
-});
-watchEffectArr.forEach((func) => {
-  watchEffect(() => {
-    func(formData);
     });
-});
+  }
+
+  if (item.watchEffect !== undefined) {
+    prepareFuncs.push(() => {
+      watchEffect(() => {
+        item.watchEffect && item.watchEffect(formData);
+      });
+    });
+  }
+}
+prepareFuncs.forEach((func) => func());
 // 获取表单数据
 function getFormData(key?: string) {
   return key === undefined ? formData : formData[key] ?? undefined;

src/components/PageModal/index.vue

@@ -113,11 +113,11 @@ const handleSubmit = useThrottleFn(() => {
         let msg = "操作成功";
         if (props.modalConfig.component === "drawer") {
           if (props.modalConfig.drawer?.title) {
-            msg = props.modalConfig.drawer?.title;
+            msg = `${props.modalConfig.drawer?.title}成功`;
           }
         } else {
           if (props.modalConfig.dialog?.title) {
-            msg = props.modalConfig.dialog?.title;
+            msg = `${props.modalConfig.dialog?.title}成功`;
           }
         }
         ElMessage.success(msg);

src/components/PageModal/types.ts

@@ -54,11 +54,11 @@ export type IFormItems<T = any> = Array<{
   // 是否隐藏
   hidden?: boolean;
   // 监听函数
-  watch?: (newValue: any, oldValue: any, data: T) => void;
+  watch?: (newValue: any, oldValue: any, data: T, items: IObject[]) => void;
   // 计算属性函数
   computed?: (data: T) => any;
   // 监听收集函数
   watchEffect?: (data: T) => void;
   // 初始化数据函数扩展
-  initFn?: (formItem: IObject) => void;
+  initFn?: (item: IObject) => void;
 }>;