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

package/dist/tmagic-form.js

@@ -215,9 +215,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
         return component;
       return "m-fields-text";
     });
-    const disabled = computed(
-      () => typeof props.disabled === "undefined" ? filterFunction(mForm, props.config.disabled, props) : props.disabled
-    );
+    const disabled = computed(() => props.disabled || filterFunction(mForm, props.config.disabled, props));
     const tooltip = computed(() => filterFunction(mForm, props.config.tooltip, props));
     const extra = computed(() => filterFunction(mForm, props.config.extra, props));
     const rule = computed(() => getRules(mForm, props.config.rules, props));
@@ -3117,30 +3115,32 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       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, {
@@ -3160,9 +3160,13 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
           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) {
@@ -3211,6 +3215,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         return [];
       const { config } = props;
       const { option } = config;
+      const { root = "", initRoot = "" } = option;
+      let { initBody = {} } = option;
       let options2 = [];
       let url = option.initUrl;
       if (!url) {
@@ -3219,22 +3225,45 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       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];