@tmagic/form 1.5.20 → 1.5.21

package/dist/tmagic-form.js

@@ -4018,7 +4018,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     lastValues: {}
   },
   emits: ["change"],
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const optionComponent = getDesignConfig("components")?.option;
@@ -4094,7 +4094,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       postOptions.data = body;
       const requestFuc = getConfig("request");
       if (typeof option.beforeRequest === "function") {
-        postOptions = option.beforeRequest(mForm, postOptions, {
+        postOptions = await option.beforeRequest(mForm, postOptions, {
           model: props.model,
           formValue: mForm?.values,
           formValues: mForm?.values,
@@ -4107,7 +4107,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       }
       let res = await requestFuc(postOptions);
       if (typeof option.afterRequest === "function") {
-        res = option.afterRequest(mForm, res, {
+        res = await option.afterRequest(mForm, res, {
           model: props.model,
           formValue: mForm?.values,
           formValues: mForm?.values,
@@ -4196,7 +4196,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         json: option.json || false
       };
       if (typeof option.beforeInitRequest === "function") {
-        postOptions = option.beforeInitRequest(mForm, postOptions, {
+        postOptions = await option.beforeInitRequest(mForm, postOptions, {
           model: props.model,
           formValue: mForm?.values,
           formValues: mForm?.values,
@@ -4210,7 +4210,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       const requestFuc = getConfig("request");
       let res = await requestFuc(postOptions);
       if (typeof option.afterRequest === "function") {
-        res = option.afterRequest(mForm, res, {
+        res = await option.afterRequest(mForm, res, {
           model: props.model,
           formValue: mForm?.values,
           formValues: mForm?.values,
@@ -4232,6 +4232,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       }
       return options2;
     };
+    const setOptions = (data) => {
+      options.value = data;
+    };
     if (typeof props.config.options === "function") {
       watchEffect(() => {
         typeof props.config.options === "function" && Promise.resolve(
@@ -4243,12 +4246,12 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
             config: props.config
           })
         ).then((data) => {
-          options.value = data;
+          setOptions(data);
         });
       });
     } else if (Array.isArray(props.config.options)) {
       watchEffect(() => {
-        options.value = props.config.options;
+        setOptions(props.config.options);
       });
     } else if (props.config.option) {
       onBeforeMount(() => {
@@ -4256,7 +4259,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         const v = props.model[props.name];
         if (Array.isArray(v) ? v.length : typeof v !== "undefined") {
           getInitOption().then((data) => {
-            options.value = data;
+            setOptions(data);
           });
         }
       });
@@ -4282,7 +4285,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
             }
             moreLoadingVisible.value = true;
             pgIndex.value += 1;
-            options.value = await getOptions();
+            setOptions(await getOptions());
             moreLoadingVisible.value = false;
           });
         },
@@ -4303,20 +4306,24 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         tMagicSelect.value.setPreviousQuery(query.value);
         tMagicSelect.value.setSelectedLabel(query.value);
       } else if (options.value.length <= (props.config.multiple ? props.model?.[props.name].length : 1)) {
-        options.value = await getOptions();
+        setOptions(await getOptions());
       }
     };
     const remoteMethod = async (q) => {
       if (!localOptions.value.length) {
         query.value = q;
         pgIndex.value = 0;
-        options.value = await getOptions();
+        setOptions(await getOptions());
         if (props.config.multiple)
           setTimeout(() => {
             tMagicSelect.value?.setSelected();
           }, 0);
       }
     };
+    __expose({
+      options,
+      setOptions
+    });
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
       return _ctx.model ? withDirectives((openBlock(), createBlock(unref(TMagicSelect), {

package/dist/tmagic-form.umd.cjs

@@ -6948,7 +6948,7 @@
       lastValues: {}
     },
     emits: ["change"],
-    setup(__props, { emit: __emit }) {
+    setup(__props, { expose: __expose, emit: __emit }) {
       const props = __props;
       const emit = __emit;
       const optionComponent = design.getDesignConfig("components")?.option;
@@ -7024,7 +7024,7 @@
         postOptions.data = body;
         const requestFuc = getConfig("request");
         if (typeof option.beforeRequest === "function") {
-          postOptions = option.beforeRequest(mForm, postOptions, {
+          postOptions = await option.beforeRequest(mForm, postOptions, {
             model: props.model,
             formValue: mForm?.values,
             formValues: mForm?.values,
@@ -7037,7 +7037,7 @@
         }
         let res = await requestFuc(postOptions);
         if (typeof option.afterRequest === "function") {
-          res = option.afterRequest(mForm, res, {
+          res = await option.afterRequest(mForm, res, {
             model: props.model,
             formValue: mForm?.values,
             formValues: mForm?.values,
@@ -7126,7 +7126,7 @@
           json: option.json || false
         };
         if (typeof option.beforeInitRequest === "function") {
-          postOptions = option.beforeInitRequest(mForm, postOptions, {
+          postOptions = await option.beforeInitRequest(mForm, postOptions, {
             model: props.model,
             formValue: mForm?.values,
             formValues: mForm?.values,
@@ -7140,7 +7140,7 @@
         const requestFuc = getConfig("request");
         let res = await requestFuc(postOptions);
         if (typeof option.afterRequest === "function") {
-          res = option.afterRequest(mForm, res, {
+          res = await option.afterRequest(mForm, res, {
             model: props.model,
             formValue: mForm?.values,
             formValues: mForm?.values,
@@ -7162,6 +7162,9 @@
         }
         return options2;
       };
+      const setOptions = (data) => {
+        options.value = data;
+      };
       if (typeof props.config.options === "function") {
         vue.watchEffect(() => {
           typeof props.config.options === "function" && Promise.resolve(
@@ -7173,12 +7176,12 @@
               config: props.config
             })
           ).then((data) => {
-            options.value = data;
+            setOptions(data);
           });
         });
       } else if (Array.isArray(props.config.options)) {
         vue.watchEffect(() => {
-          options.value = props.config.options;
+          setOptions(props.config.options);
         });
       } else if (props.config.option) {
         vue.onBeforeMount(() => {
@@ -7186,7 +7189,7 @@
           const v = props.model[props.name];
           if (Array.isArray(v) ? v.length : typeof v !== "undefined") {
             getInitOption().then((data) => {
-              options.value = data;
+              setOptions(data);
             });
           }
         });
@@ -7212,7 +7215,7 @@
               }
               moreLoadingVisible.value = true;
               pgIndex.value += 1;
-              options.value = await getOptions();
+              setOptions(await getOptions());
               moreLoadingVisible.value = false;
             });
           },
@@ -7233,20 +7236,24 @@
           tMagicSelect.value.setPreviousQuery(query.value);
           tMagicSelect.value.setSelectedLabel(query.value);
         } else if (options.value.length <= (props.config.multiple ? props.model?.[props.name].length : 1)) {
-          options.value = await getOptions();
+          setOptions(await getOptions());
         }
       };
       const remoteMethod = async (q) => {
         if (!localOptions.value.length) {
           query.value = q;
           pgIndex.value = 0;
-          options.value = await getOptions();
+          setOptions(await getOptions());
           if (props.config.multiple)
             setTimeout(() => {
               tMagicSelect.value?.setSelected();
             }, 0);
         }
       };
+      __expose({
+        options,
+        setOptions
+      });
       return (_ctx, _cache) => {
         const _directive_loading = vue.resolveDirective("loading");
         return _ctx.model ? vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(design.TMagicSelect), {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.20",
+  "version": "1.5.21",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -51,9 +51,9 @@
   "peerDependencies": {
     "vue": ">=3.5.0",
     "typescript": "*",
-    "@tmagic/utils": "1.5.20",
-    "@tmagic/form-schema": "1.5.20",
-    "@tmagic/design": "1.5.20"
+    "@tmagic/design": "1.5.21",
+    "@tmagic/form-schema": "1.5.21",
+    "@tmagic/utils": "1.5.21"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/Select.vue

@@ -188,7 +188,7 @@ const getOptions = async () => {
   const requestFuc = getConfig('request') as Function;
 
   if (typeof option.beforeRequest === 'function') {
-    postOptions = option.beforeRequest(mForm, postOptions, {
+    postOptions = await option.beforeRequest(mForm, postOptions, {
       model: props.model,
       formValue: mForm?.values,
       formValues: mForm?.values,
@@ -204,7 +204,7 @@ const getOptions = async () => {
   let res = await requestFuc(postOptions);
 
   if (typeof option.afterRequest === 'function') {
-    res = option.afterRequest(mForm, res, {
+    res = await option.afterRequest(mForm, res, {
       model: props.model,
       formValue: mForm?.values,
       formValues: mForm?.values,
@@ -270,6 +270,7 @@ const getInitLocalOption = async () => {
   if (config.multiple && value.findIndex) {
     return (localOptions.value as any[]).filter((item) => value.findIndex((v: any) => equalValue(item.value, v)) > -1);
   }
+
   return (localOptions.value as any[]).filter((item) => equalValue(item.value, value));
 };
 
@@ -316,7 +317,7 @@ const getInitOption = async () => {
   };
 
   if (typeof option.beforeInitRequest === 'function') {
-    postOptions = option.beforeInitRequest(mForm, postOptions, {
+    postOptions = await option.beforeInitRequest(mForm, postOptions, {
       model: props.model,
       formValue: mForm?.values,
       formValues: mForm?.values,
@@ -333,7 +334,7 @@ const getInitOption = async () => {
   let res = await requestFuc(postOptions);
 
   if (typeof option.afterRequest === 'function') {
-    res = option.afterRequest(mForm, res, {
+    res = await option.afterRequest(mForm, res, {
       model: props.model,
       formValue: mForm?.values,
       formValues: mForm?.values,
@@ -359,6 +360,10 @@ const getInitOption = async () => {
   return options;
 };
 
+const setOptions = (data: SelectOption[] | SelectGroupOption[]) => {
+  options.value = data;
+};
+
 if (typeof props.config.options === 'function') {
   watchEffect(() => {
     typeof props.config.options === 'function' &&
@@ -371,12 +376,12 @@ if (typeof props.config.options === 'function') {
           config: props.config,
         }),
       ).then((data) => {
-        options.value = data;
+        setOptions(data);
       });
   });
 } else if (Array.isArray(props.config.options)) {
   watchEffect(() => {
-    options.value = props.config.options as SelectOption[] | SelectGroupOption[];
+    setOptions(props.config.options as SelectOption[] | SelectGroupOption[]);
   });
 } else if (props.config.option) {
   onBeforeMount(() => {
@@ -384,7 +389,7 @@ if (typeof props.config.options === 'function') {
     const v = props.model[props.name];
     if (Array.isArray(v) ? v.length : typeof v !== 'undefined') {
       getInitOption().then((data) => {
-        options.value = data;
+        setOptions(data);
       });
     }
   });
@@ -413,7 +418,7 @@ if (props.config.remote) {
         }
         moreLoadingVisible.value = true;
         pgIndex.value += 1;
-        options.value = await getOptions();
+        setOptions(await getOptions());
         moreLoadingVisible.value = false;
       });
     },
@@ -438,7 +443,7 @@ const visibleHandler = async (visible: boolean) => {
     tMagicSelect.value.setPreviousQuery(query.value);
     tMagicSelect.value.setSelectedLabel(query.value);
   } else if (options.value.length <= (props.config.multiple ? props.model?.[props.name].length : 1)) {
-    options.value = await getOptions();
+    setOptions(await getOptions());
   }
 };
 
@@ -446,7 +451,7 @@ const remoteMethod = async (q: string) => {
   if (!localOptions.value.length) {
     query.value = q;
     pgIndex.value = 0;
-    options.value = await getOptions();
+    setOptions(await getOptions());
     // 多选时如果过滤选项会导致已选好的标签异常，需要重新刷新一下el-select的状态
     if (props.config.multiple)
       setTimeout(() => {
@@ -454,4 +459,9 @@ const remoteMethod = async (q: string) => {
       }, 0);
   }
 };
+
+defineExpose({
+  options,
+  setOptions,
+});
 </script>

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import * as vue from 'vue';
 import { App } from 'vue';
 import * as _tmagic_form_schema from '@tmagic/form-schema';
-import { FormState, FormConfig, TabPaneConfig, FormValue, FilterFunction, Rule, ChildConfig, FieldsetConfig, PanelConfig, RowConfig, TabConfig, TableConfig, SortProp, TableColumnConfig, GroupListConfig, FieldProps, TextConfig, NumberConfig, NumberRangeConfig, TextareaConfig, HiddenConfig, DateConfig, DateTimeConfig, TimeConfig, CheckboxConfig, SwitchConfig, DaterangeConfig, ColorPickConfig, CheckboxGroupConfig, RadioGroupConfig, DisplayConfig, LinkConfig, SelectConfig, CascaderConfig, DynamicFieldConfig } from '@tmagic/form-schema';
+import { FormState, FormConfig, TabPaneConfig, FormValue, FilterFunction, Rule, ChildConfig, FieldsetConfig, PanelConfig, RowConfig, TabConfig, TableConfig, SortProp, TableColumnConfig, GroupListConfig, FieldProps, TextConfig, NumberConfig, NumberRangeConfig, TextareaConfig, HiddenConfig, DateConfig, DateTimeConfig, TimeConfig, CheckboxConfig, SwitchConfig, DaterangeConfig, ColorPickConfig, CheckboxGroupConfig, RadioGroupConfig, DisplayConfig, LinkConfig, SelectConfig, SelectOption, SelectGroupOption, CascaderConfig, DynamicFieldConfig } from '@tmagic/form-schema';
 export * from '@tmagic/form-schema';
 import * as _tmagic_editor from '@tmagic/editor';
 import * as _tmagic_design from '@tmagic/design';
@@ -2448,7 +2448,36 @@ declare const _default$4: vue.DefineComponent<__VLS_Props$3, {}, {}, {}, {}, vue
 }>, {}, {}, {}, {}, string, vue.ComponentProvideOptions, false, {}, any>;
 
 type __VLS_Props$2 = FieldProps<SelectConfig>;
-declare const _default$3: vue.DefineComponent<__VLS_Props$2, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
+declare const _default$3: vue.DefineComponent<__VLS_Props$2, {
+    options: vue.Ref<{
+        text: string;
+        value: any;
+        disabled?: boolean | undefined;
+    }[] | {
+        label: string;
+        disabled: boolean;
+        options: {
+            label?: string | undefined;
+            text?: string | undefined;
+            value: any;
+            disabled?: boolean | undefined;
+        }[];
+    }[], SelectOption[] | SelectGroupOption[] | {
+        text: string;
+        value: any;
+        disabled?: boolean | undefined;
+    }[] | {
+        label: string;
+        disabled: boolean;
+        options: {
+            label?: string | undefined;
+            text?: string | undefined;
+            value: any;
+            disabled?: boolean | undefined;
+        }[];
+    }[]>;
+    setOptions: (data: SelectOption[] | SelectGroupOption[]) => void;
+}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {
     change: (...args: any[]) => void;
 }, string, vue.PublicProps, Readonly<__VLS_Props$2> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;