@tmagic/form 1.4.3 → 1.4.5

package/dist/style.css

@@ -66,7 +66,7 @@ div.m-fields-link {
 
 fieldset.m-fieldset {
   position: relative;
-  border: 1px solid #e5e5e5;
+  border: 1px solid rgb(229, 229, 229);
   margin-top: 10px;
   margin-bottom: 10px;
   min-inline-size: auto;
@@ -80,7 +80,7 @@ fieldset.m-fieldset legend {
   border: 0;
   top: -10px;
   left: 20px;
-  background: white;
+  background: rgb(255, 255, 255);
   width: auto;
   padding: 0px 3px;
   font-weight: bold;

package/dist/tmagic-form.js

@@ -2117,7 +2117,8 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
           (openBlock(true), createElementBlock(Fragment, null, renderList(tabs.value, (tab, tabIndex) => {
             return openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), mergeProps(
               {
-                key: tab[unref(mForm)?.keyProp || "__key"] ?? tabIndex
+                key: tab[unref(mForm)?.keyProp || "__key"] ?? tabIndex,
+                ref_for: true
               },
               unref(tabPaneComponent)?.props({ name: filter(tab.status) || tabIndex.toString(), lazy: tab.lazy || false }) || {}
             ), {
@@ -2211,6 +2212,21 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
     const tMagicCascader = ref();
     const options = ref([]);
     const remoteData = ref(null);
+    const value = computed({
+      get() {
+        if (typeof props.model[props.name] === "string" && props.config.valueSeparator) {
+          return props.model[props.name].split(props.config.valueSeparator);
+        }
+        return props.model[props.name];
+      },
+      set(value2) {
+        let result = value2;
+        if (props.config.valueSeparator) {
+          result = value2.join(props.config.valueSeparator);
+        }
+        props.model[props.name] = result;
+      }
+    });
     const setRemoteOptions = async function() {
       const { config } = props;
       const { option } = config;
@@ -2241,9 +2257,17 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
       }
     };
     if (typeof props.config.options === "function" && props.model && mForm) {
-      watchEffect(
-        () => options.value = props.config.options(mForm, { model: props.model, formValues: mForm.values })
-      );
+      watchEffect(() => {
+        typeof props.config.options === "function" && Promise.resolve(
+          props.config.options(mForm, {
+            model: props.model,
+            prop: props.prop,
+            formValue: mForm?.values
+          })
+        ).then((data) => {
+          options.value = data;
+        });
+      });
     } else if (!props.config.options?.length || props.config.remote) {
       Promise.resolve(setRemoteOptions());
     } else if (Array.isArray(props.config.options)) {
@@ -2251,17 +2275,17 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
         options.value = props.config.options;
       });
     }
-    const changeHandler = (value) => {
+    const changeHandler = () => {
       if (!tMagicCascader.value)
         return;
       tMagicCascader.value.setQuery("");
       tMagicCascader.value.setPreviousQuery(null);
-      emit("change", value);
+      emit("change", props.model[props.name]);
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(TMagicCascader), {
-        modelValue: _ctx.model[_ctx.name],
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
+        modelValue: value.value,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
         ref_key: "tMagicCascader",
         ref: tMagicCascader,
         style: { "width": "100%" },
@@ -3756,38 +3780,56 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           _ctx.config.group ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(options.value, (group, index) => {
-            return openBlock(), createBlock(resolveDynamicComponent(unref(optionGroupComponent)?.component), mergeProps(
-              { key: index },
+            return openBlock(), createBlock(resolveDynamicComponent(unref(optionGroupComponent)?.component || "el-option-group"), mergeProps(
+              {
+                key: index,
+                ref_for: true
+              },
               unref(optionGroupComponent)?.props({
                 label: group.label,
                 disabled: group.disabled
-              })
+              }) || {
+                label: group.label,
+                disabled: group.disabled
+              }
             ), {
               default: withCtx(() => [
                 (openBlock(true), createElementBlock(Fragment, null, renderList(group.options, (item, index2) => {
-                  return openBlock(), createBlock(resolveDynamicComponent(unref(optionComponent)?.component), mergeProps(
-                    { key: index2 },
+                  return openBlock(), createBlock(resolveDynamicComponent(unref(optionComponent)?.component || "el-option"), mergeProps(
+                    {
+                      key: index2,
+                      ref_for: true
+                    },
                     unref(optionComponent)?.props({
                       label: item.label || item.text,
                       value: item.value,
                       disabled: item.disabled
-                    })
+                    }) || {
+                      label: item.label || item.text,
+                      value: item.value,
+                      disabled: item.disabled
+                    }
                   ), null, 16);
                 }), 128))
               ]),
               _: 2
             }, 1040);
           }), 128)) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(options.value, (option) => {
-            return openBlock(), createBlock(resolveDynamicComponent(unref(optionComponent)?.component), mergeProps(
+            return openBlock(), createBlock(resolveDynamicComponent(unref(optionComponent)?.component || "el-option"), mergeProps(
               {
                 class: "tmagic-design-option",
-                key: _ctx.config.valueKey ? option.value[_ctx.config.valueKey] : option.value
+                key: _ctx.config.valueKey ? option.value[_ctx.config.valueKey] : option.value,
+                ref_for: true
               },
               unref(optionComponent)?.props({
                 label: option.text,
                 value: option.value,
                 disabled: option.disabled
-              })
+              }) || {
+                label: option.text,
+                value: option.value,
+                disabled: option.disabled
+              }
             ), null, 16);
           }), 128)),
           moreLoadingVisible.value ? withDirectives((openBlock(), createElementBlock("div", _hoisted_1$2, null, 512)), [

package/dist/tmagic-form.umd.cjs

@@ -2116,7 +2116,8 @@
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(tabs.value, (tab, tabIndex) => {
               return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(tabPaneComponent)?.component || "el-tab-pane"), vue.mergeProps(
                 {
-                  key: tab[vue.unref(mForm)?.keyProp || "__key"] ?? tabIndex
+                  key: tab[vue.unref(mForm)?.keyProp || "__key"] ?? tabIndex,
+                  ref_for: true
                 },
                 vue.unref(tabPaneComponent)?.props({ name: filter(tab.status) || tabIndex.toString(), lazy: tab.lazy || false }) || {}
               ), {
@@ -2210,6 +2211,21 @@
       const tMagicCascader = vue.ref();
       const options = vue.ref([]);
       const remoteData = vue.ref(null);
+      const value = vue.computed({
+        get() {
+          if (typeof props.model[props.name] === "string" && props.config.valueSeparator) {
+            return props.model[props.name].split(props.config.valueSeparator);
+          }
+          return props.model[props.name];
+        },
+        set(value2) {
+          let result = value2;
+          if (props.config.valueSeparator) {
+            result = value2.join(props.config.valueSeparator);
+          }
+          props.model[props.name] = result;
+        }
+      });
       const setRemoteOptions = async function() {
         const { config } = props;
         const { option } = config;
@@ -2240,9 +2256,17 @@
         }
       };
       if (typeof props.config.options === "function" && props.model && mForm) {
-        vue.watchEffect(
-          () => options.value = props.config.options(mForm, { model: props.model, formValues: mForm.values })
-        );
+        vue.watchEffect(() => {
+          typeof props.config.options === "function" && Promise.resolve(
+            props.config.options(mForm, {
+              model: props.model,
+              prop: props.prop,
+              formValue: mForm?.values
+            })
+          ).then((data) => {
+            options.value = data;
+          });
+        });
       } else if (!props.config.options?.length || props.config.remote) {
         Promise.resolve(setRemoteOptions());
       } else if (Array.isArray(props.config.options)) {
@@ -2250,17 +2274,17 @@
           options.value = props.config.options;
         });
       }
-      const changeHandler = (value) => {
+      const changeHandler = () => {
         if (!tMagicCascader.value)
           return;
         tMagicCascader.value.setQuery("");
         tMagicCascader.value.setPreviousQuery(null);
-        emit("change", value);
+        emit("change", props.model[props.name]);
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicCascader), {
-          modelValue: _ctx.model[_ctx.name],
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.model[_ctx.name] = $event),
+          modelValue: value.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
           ref_key: "tMagicCascader",
           ref: tMagicCascader,
           style: { "width": "100%" },
@@ -3755,38 +3779,56 @@
         }, {
           default: vue.withCtx(() => [
             _ctx.config.group ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(options.value, (group, index) => {
-              return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionGroupComponent)?.component), vue.mergeProps(
-                { key: index },
+              return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionGroupComponent)?.component || "el-option-group"), vue.mergeProps(
+                {
+                  key: index,
+                  ref_for: true
+                },
                 vue.unref(optionGroupComponent)?.props({
                   label: group.label,
                   disabled: group.disabled
-                })
+                }) || {
+                  label: group.label,
+                  disabled: group.disabled
+                }
               ), {
                 default: vue.withCtx(() => [
                   (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(group.options, (item, index2) => {
-                    return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionComponent)?.component), vue.mergeProps(
-                      { key: index2 },
+                    return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionComponent)?.component || "el-option"), vue.mergeProps(
+                      {
+                        key: index2,
+                        ref_for: true
+                      },
                       vue.unref(optionComponent)?.props({
                         label: item.label || item.text,
                         value: item.value,
                         disabled: item.disabled
-                      })
+                      }) || {
+                        label: item.label || item.text,
+                        value: item.value,
+                        disabled: item.disabled
+                      }
                     ), null, 16);
                   }), 128))
                 ]),
                 _: 2
               }, 1040);
             }), 128)) : (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 1 }, vue.renderList(options.value, (option) => {
-              return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionComponent)?.component), vue.mergeProps(
+              return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(optionComponent)?.component || "el-option"), vue.mergeProps(
                 {
                   class: "tmagic-design-option",
-                  key: _ctx.config.valueKey ? option.value[_ctx.config.valueKey] : option.value
+                  key: _ctx.config.valueKey ? option.value[_ctx.config.valueKey] : option.value,
+                  ref_for: true
                 },
                 vue.unref(optionComponent)?.props({
                   label: option.text,
                   value: option.value,
                   disabled: option.disabled
-                })
+                }) || {
+                  label: option.text,
+                  value: option.value,
+                  disabled: option.disabled
+                }
               ), null, 16);
             }), 128)),
             moreLoadingVisible.value ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", _hoisted_1$2, null, 512)), [

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.3",
+  "version": "1.4.5",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -32,33 +32,31 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@tmagic/design": "1.4.3",
-    "@tmagic/utils": "1.4.3",
     "lodash-es": "^4.17.21",
-    "sortablejs": "^1.14.0",
-    "vue": "^3.4.21"
+    "sortablejs": "^1.15.2"
   },
   "peerDependencies": {
-    "vue": "^3.4.21"
+    "vue": "^3.4.27",
+    "@tmagic/design": "1.4.5",
+    "@tmagic/utils": "1.4.5"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.0",
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
-    "@types/sortablejs": "^1.10.7",
-    "@vitejs/plugin-vue": "^4.5.2",
-    "@vue/compiler-sfc": "^3.4.21",
-    "@vue/test-utils": "^2.4.4",
+    "@types/sortablejs": "^1.15.8",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vue/compiler-sfc": "^3.4.27",
+    "@vue/test-utils": "^2.4.6",
     "rimraf": "^3.0.2",
-    "sass": "^1.35.1",
+    "sass": "^1.77.0",
     "typescript": "^5.4.2",
-    "vite": "^5.1.6",
-    "vue-tsc": "^2.0.6"
+    "vite": "^5.2.11",
+    "vue-tsc": "^2.0.16"
   },
   "scripts": {
     "build": "npm run build:type && vite build",
     "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json",
     "clear:type": "rimraf ./types",
-    "type:check": "vue-tsc --noEmit"
+    "check:type": "vue-tsc --noEmit --project tsconfig.build.json"
   }
 }

package/src/fields/Cascader.vue

@@ -1,6 +1,6 @@
 <template>
   <TMagicCascader
-    v-model="model[name]"
+    v-model="value"
     ref="tMagicCascader"
     style="width: 100%"
     clearable
@@ -20,7 +20,7 @@
 </template>
 
 <script setup lang="ts">
-import { inject, ref, watchEffect } from 'vue';
+import { computed, inject, ref, watchEffect } from 'vue';
 
 import { TMagicCascader } from '@tmagic/design';
 
@@ -47,6 +47,22 @@ const tMagicCascader = ref<InstanceType<typeof TMagicCascader>>();
 const options = ref<CascaderOption[]>([]);
 const remoteData = ref<any>(null);
 
+const value = computed({
+  get() {
+    if (typeof props.model[props.name] === 'string' && props.config.valueSeparator) {
+      return props.model[props.name].split(props.config.valueSeparator);
+    }
+    return props.model[props.name];
+  },
+  set(value) {
+    let result = value;
+    if (props.config.valueSeparator) {
+      result = value.join(props.config.valueSeparator);
+    }
+    props.model[props.name] = result;
+  },
+});
+
 const setRemoteOptions = async function () {
   const { config } = props;
   const { option } = config;
@@ -82,9 +98,18 @@ const setRemoteOptions = async function () {
 
 // 初始化
 if (typeof props.config.options === 'function' && props.model && mForm) {
-  watchEffect(
-    () => (options.value = (props.config.options as Function)(mForm, { model: props.model, formValues: mForm.values })),
-  );
+  watchEffect(() => {
+    typeof props.config.options === 'function' &&
+      Promise.resolve(
+        props.config.options(mForm, {
+          model: props.model,
+          prop: props.prop,
+          formValue: mForm?.values,
+        }),
+      ).then((data) => {
+        options.value = data;
+      });
+  });
 } else if (!props.config.options?.length || props.config.remote) {
   Promise.resolve(setRemoteOptions());
 } else if (Array.isArray(props.config.options)) {
@@ -93,10 +118,10 @@ if (typeof props.config.options === 'function' && props.model && mForm) {
   });
 }
 
-const changeHandler = (value: any) => {
+const changeHandler = () => {
   if (!tMagicCascader.value) return;
   tMagicCascader.value.setQuery('');
   tMagicCascader.value.setPreviousQuery(null);
-  emit('change', value);
+  emit('change', props.model[props.name]);
 };
 </script>

package/src/fields/Select.vue

@@ -23,24 +23,31 @@
       <component
         v-for="(group, index) in (options as SelectGroupOption[])"
         :key="index"
-        :is="optionGroupComponent?.component"
+        :is="optionGroupComponent?.component || 'el-option-group'"
         v-bind="
           optionGroupComponent?.props({
             label: group.label,
             disabled: group.disabled,
-          })
+          }) || {
+            label: group.label,
+            disabled: group.disabled,
+          }
         "
       >
         <component
           v-for="(item, index) in group.options"
-          :is="optionComponent?.component"
+          :is="optionComponent?.component || 'el-option'"
           :key="index"
           v-bind="
             optionComponent?.props({
               label: item.label || item.text,
               value: item.value,
               disabled: item.disabled,
-            })
+            }) || {
+              label: item.label || item.text,
+              value: item.value,
+              disabled: item.disabled,
+            }
           "
         >
         </component>
@@ -51,13 +58,17 @@
         v-for="option in (options as SelectOption[])"
         class="tmagic-design-option"
         :key="config.valueKey ? option.value[config.valueKey] : option.value"
-        :is="optionComponent?.component"
+        :is="optionComponent?.component || 'el-option'"
         v-bind="
           optionComponent?.props({
             label: option.text,
             value: option.value,
             disabled: option.disabled,
-          })
+          }) || {
+            label: option.text,
+            value: option.value,
+            disabled: option.disabled,
+          }
         "
       >
       </component>

package/src/schema.ts

@@ -539,12 +539,15 @@ export interface CascaderConfig extends FormItem, Input {
   checkStrictly?: boolean;
   /** 弹出内容的自定义类名 */
   popperClass?: string;
+  /** 合并成字符串时的分隔符 */
+  valueSeparator?: string;
   options?:
     | ((
         mForm: FormState | undefined,
         data: {
           model: Record<any, any>;
-          formValues: Record<any, any>;
+          prop: string;
+          formValue: Record<any, any>;
         },
       ) => CascaderOption[])
     | CascaderOption[];

package/types/Form.vue.d.ts

@@ -92,12 +92,13 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     parentValues: Record<string, any>;
     labelWidth: string;
     disabled: boolean;
-    height: string;
     stepActive: string | number;
+    height: string;
     inline: boolean;
     labelPosition: string;
 }, {}>;
 export default _default;
+
 type __VLS_WithDefaults<P, D> = {
     [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
         default: D[K];

package/types/FormBox.vue.d.ts

@@ -54,10 +54,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -65,6 +61,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -132,10 +132,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -143,6 +139,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -168,8 +168,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }, true, {}, {}, {
@@ -217,10 +217,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -228,6 +224,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -261,8 +261,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }> | undefined>;
@@ -291,8 +291,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     confirmText: string;
 }>>> & {
     onChange?: ((...args: any[]) => any) | undefined;
-    onError?: ((...args: any[]) => any) | undefined;
     onSubmit?: ((...args: any[]) => any) | undefined;
+    onError?: ((...args: any[]) => any) | undefined;
 }, {
     config: FormConfig;
     values: Object;

package/types/FormDialog.vue.d.ts

@@ -56,10 +56,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -67,6 +63,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -134,10 +134,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -145,6 +141,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -170,8 +170,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }, true, {}, {}, {
@@ -219,10 +219,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -230,6 +226,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -263,8 +263,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }> | undefined>;
@@ -299,8 +299,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     confirmText: string;
 }>>> & {
     onChange?: ((...args: any[]) => any) | undefined;
-    onError?: ((...args: any[]) => any) | undefined;
     onSubmit?: ((...args: any[]) => any) | undefined;
+    onError?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
 }, {
     config: FormConfig;

package/types/FormDrawer.vue.d.ts

@@ -59,10 +59,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -70,6 +66,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -137,10 +137,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -148,6 +144,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -173,8 +173,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }, true, {}, {}, {
@@ -222,10 +222,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        height: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
         stepActive: {
             type: import("vue").PropType<string | number>;
             default: number;
@@ -233,6 +229,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         size: {
             type: import("vue").PropType<"large" | "default" | "small">;
         };
+        height: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         inline: {
             type: import("vue").PropType<boolean>;
             default: boolean;
@@ -266,8 +266,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         parentValues: Record<string, any>;
         labelWidth: string;
         disabled: boolean;
-        height: string;
         stepActive: string | number;
+        height: string;
         inline: boolean;
         labelPosition: string;
     }> | undefined>;
@@ -307,8 +307,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     confirmText: string;
 }>>> & {
     onChange?: ((...args: any[]) => any) | undefined;
-    onError?: ((...args: any[]) => any) | undefined;
     onSubmit?: ((...args: any[]) => any) | undefined;
+    onError?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
     onOpen?: ((...args: any[]) => any) | undefined;
     onOpened?: ((...args: any[]) => any) | undefined;

package/types/containers/Container.vue.d.ts

@@ -48,9 +48,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
 }, {
     lastValues: FormValue;
     isCompare: boolean;
-    size: string;
     prop: string;
     expandMore: boolean;
+    size: string;
 }, {}>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {

package/types/schema.d.ts

@@ -439,9 +439,12 @@ export interface CascaderConfig extends FormItem, Input {
     checkStrictly?: boolean;
     /** 弹出内容的自定义类名 */
     popperClass?: string;
+    /** 合并成字符串时的分隔符 */
+    valueSeparator?: string;
     options?: ((mForm: FormState | undefined, data: {
         model: Record<any, any>;
-        formValues: Record<any, any>;
+        prop: string;
+        formValue: Record<any, any>;
     }) => CascaderOption[]) | CascaderOption[];
     option?: {
         url: string;