@tmagic/form 1.2.0-beta.22 → 1.2.0-beta.24

package/dist/tmagic-form.umd.cjs

@@ -218,9 +218,7 @@
           return component;
         return "m-fields-text";
       });
-      const disabled = vue.computed(
-        () => typeof props.disabled === "undefined" ? filterFunction(mForm, props.config.disabled, props) : props.disabled
-      );
+      const disabled = vue.computed(() => props.disabled || filterFunction(mForm, props.config.disabled, props));
       const tooltip = vue.computed(() => filterFunction(mForm, props.config.tooltip, props));
       const extra = vue.computed(() => filterFunction(mForm, props.config.extra, props));
       const rule = vue.computed(() => getRules(mForm, props.config.rules, props));
@@ -3120,30 +3118,32 @@
         let items = [];
         const { config } = props;
         const { option } = config;
-        let { body } = option;
+        const { root = "", totalKey = "total" } = option;
+        let { body = {}, url } = option;
+        if (typeof url === "function") {
+          url = await url(mForm, { model: props.model, formValue: mForm?.values });
+        }
         let postOptions = {
           method: option.method || "POST",
-          url: option.url,
+          url,
           cache: option.cache,
           timeout: option.timeout,
           mode: option.mode,
           headers: option.headers || {},
           json: option.json || false
         };
-        if (body) {
-          if (typeof body === "function") {
-            body = body(mForm, {
-              model: props.model,
-              formValue: mForm?.values,
-              formValues: mForm?.values,
-              config: props.config
-            });
-          }
-          body.query = query.value;
-          body.pgSize = pgSize.value;
-          body.pgIndex = pgIndex.value;
-          postOptions.data = body;
+        if (typeof body === "function") {
+          body = body(mForm, {
+            model: props.model,
+            formValue: mForm?.values,
+            formValues: mForm?.values,
+            config: props.config
+          });
         }
+        body.query = query.value;
+        body.pgSize = pgSize.value;
+        body.pgIndex = pgIndex.value;
+        postOptions.data = body;
         const requestFuc = getConfig("request");
         if (typeof option.beforeRequest === "function") {
           postOptions = option.beforeRequest(mForm, postOptions, {
@@ -3163,9 +3163,13 @@
             config: props.config
           });
         }
-        const optionsData = res[option.root];
-        if (res.total > 0) {
-          total.value = res.total;
+        const optionsData = root.split(".").reduce((accumulator, currentValue) => accumulator[currentValue], res);
+        const resTotal = globalThis.parseInt(
+          totalKey.split(".").reduce((accumulator, currentValue) => accumulator[currentValue], res),
+          10
+        );
+        if (resTotal > 0) {
+          total.value = resTotal;
         }
         remoteData.value = remoteData.value.concat(optionsData);
         if (optionsData) {
@@ -3214,6 +3218,8 @@
           return [];
         const { config } = props;
         const { option } = config;
+        const { root = "", initRoot = "" } = option;
+        let { initBody = {} } = option;
         let options2 = [];
         let url = option.initUrl;
         if (!url) {
@@ -3222,22 +3228,45 @@
         if (typeof url === "function") {
           url = await url(mForm, { model: props.model, formValue: mForm?.values });
         }
-        const postOptions = {
+        if (typeof initBody === "function") {
+          initBody = initBody(mForm, {
+            model: props.model,
+            formValue: mForm?.values,
+            formValues: mForm?.values,
+            config: props.config
+          });
+        }
+        let postOptions = {
           method: option.method || "POST",
           url,
           data: {
-            id: props.model[props.name]
+            id: props.model[props.name],
+            ...initBody
           },
           mode: option.mode,
           headers: option.headers || {},
           json: option.json || false
         };
+        if (typeof option.beforeInitRequest === "function") {
+          postOptions = option.beforeInitRequest(mForm, postOptions, {
+            model: props.model,
+            formValue: mForm?.values
+          });
+        }
         if (option.method?.toLocaleLowerCase() === "jsonp") {
           postOptions.jsonpCallback = option.jsonpCallback || "callback";
         }
         const requestFuc = getConfig("request");
-        const res = await requestFuc(postOptions);
-        let initData = res[option.root];
+        let res = await requestFuc(postOptions);
+        if (typeof option.afterRequest === "function") {
+          res = option.afterRequest(mForm, res, {
+            model: props.model,
+            formValue: mForm?.values,
+            formValues: mForm?.values,
+            config: props.config
+          });
+        }
+        let initData = (initRoot || root).split(".").reduce((accumulator, currentValue) => accumulator[currentValue], res);
         if (initData) {
           if (!Array.isArray(initData)) {
             initData = [initData];