@tmagic/form 1.0.0-beta.4 → 1.0.0-beta.8

package/dist/types/src/schema.d.ts

@@ -3,6 +3,7 @@
  */
 export declare type FormState = {
     config: FormConfig;
+    popperClass?: string;
     initValues: FormValue;
     values: FormValue;
     $emit: (event: string, ...args: any[]) => void;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.8",
   "name": "@tmagic/form",
   "sideEffects": false,
   "main": "dist/tmagic-form.umd.js",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-beta.4",
-    "element-plus": "^2.0.2",
+    "@tmagic/utils": "^1.0.0-beta.8",
+    "element-plus": "^2.1.7",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.1",
     "sortablejs": "^1.14.0",
@@ -48,5 +48,6 @@
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6",
     "vue-tsc": "^0.0.24"
-  }
+  },
+  "gitHead": "ff8e32901775ecc145a82f906d6af6119652d61e"
 }

package/src/Form.vue

@@ -103,6 +103,10 @@ export default defineComponent({
       type: String,
       default: '__key',
     },
+
+    popperClass: {
+      type: String,
+    },
   },
 
   emits: ['change', 'field-input', 'field-change'],
@@ -117,6 +121,7 @@ export default defineComponent({
 
     const formState: FormState = reactive<FormState>({
       keyProp: props.keyProp,
+      popperClass: props.popperClass,
       config: props.config,
       initValues: props.initValues,
       parentValues: props.parentValues,

package/src/containers/Container.vue

@@ -224,10 +224,15 @@ export default defineComponent({
 
     const onChangeHandler = async function (v: FormValue, key?: string) {
       const { filter, onChange, trim, name, dynamicKey } = props.config as any;
-      let value: FormValue | number | string = filterHandler(filter, v);
-
-      value = (await changeHandler(onChange, value)) ?? value;
-      value = trimHandler(trim, value) ?? value;
+      let value: FormValue | number | string = v;
+
+      try {
+        value = filterHandler(filter, v);
+        value = (await changeHandler(onChange, value)) ?? value;
+        value = trimHandler(trim, value) ?? value;
+      } catch (e) {
+        console.error(e);
+      }
 
       // field内容下包含field-link时，model===value, 这里避免循环引用
       if ((name || name === 0) && props.model !== value && (v !== value || props.model[name] !== value)) {

package/src/fields/Select.vue

@@ -7,6 +7,7 @@
     ref="select"
     clearable
     filterable
+    :popper-class="`m-select-popper ${popperClass}`"
     :size="size"
     :remote="remote"
     :placeholder="config.placeholder"
@@ -346,6 +347,7 @@ export default defineComponent({
       remote,
       options,
       moreLoadingVisible,
+      popperClass: mForm?.popperClass,
 
       getRequestFuc() {
         return getConfig('request');

package/src/schema.ts

@@ -21,6 +21,7 @@
  */
 export type FormState = {
   config: FormConfig;
+  popperClass?: string;
   initValues: FormValue;
   values: FormValue;
   $emit: (event: string, ...args: any[]) => void;

package/dist/types/src/Form.vue.d.ts

@@ -1,301 +0,0 @@
-import type { ValidateFieldCallback } from 'element-plus';
-import type { Callback } from 'element-plus/es/components/form/src/form.vue';
-import type { FormItemRule } from 'element-plus/es/components/form/src/form.type';
-import type { DefineComponent, Ref, ComponentInternalInstance, ExtractPropTypes, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, ComputedRef, ComponentOptionsMixin, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, PropType } from 'vue';
-import { FormConfig, FormState } from './schema';
-export interface ValidateError {
-    message: string;
-    field: string;
-}
-export interface FieldErrorList {
-    [field: string]: ValidateError[];
-}
-declare const _default: DefineComponent<{
-    initValues: {
-        type: ObjectConstructor;
-        required: true;
-        default: () => {};
-    };
-    parentValues: {
-        type: ObjectConstructor;
-        default: () => {};
-    };
-    config: {
-        type: PropType<FormConfig>;
-        required: true;
-        default: () => never[];
-    };
-    labelWidth: {
-        type: StringConstructor;
-        default: () => string;
-    };
-    disabled: {
-        type: BooleanConstructor;
-        default: () => boolean;
-    };
-    height: {
-        type: StringConstructor;
-        default: () => string;
-    };
-    stepActive: {
-        type: (StringConstructor | NumberConstructor)[];
-        default: () => number;
-    };
-    size: {
-        type: StringConstructor;
-    };
-    inline: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    labelPosition: {
-        type: StringConstructor;
-        default: string;
-    };
-    keyProp: {
-        type: StringConstructor;
-        default: string;
-    };
-}, {
-    initialized: Ref<boolean>;
-    values: Ref<{
-        [x: string]: any;
-        [x: number]: any;
-    }>;
-    elForm: Ref<({
-        $: ComponentInternalInstance;
-        $data: {};
-        $props: Partial<{
-            disabled: boolean;
-            inline: boolean;
-            labelWidth: string | number;
-            labelSuffix: string;
-            inlineMessage: boolean;
-            statusIcon: boolean;
-            showMessage: boolean;
-            validateOnRuleChange: boolean;
-            hideRequiredAsterisk: boolean;
-            scrollToError: boolean;
-        }> & Omit<Readonly<ExtractPropTypes<{
-            model: ObjectConstructor;
-            rules: PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
-            labelPosition: StringConstructor;
-            labelWidth: {
-                type: (StringConstructor | NumberConstructor)[];
-                default: string;
-            };
-            labelSuffix: {
-                type: StringConstructor;
-                default: string;
-            };
-            inline: BooleanConstructor;
-            inlineMessage: BooleanConstructor;
-            statusIcon: BooleanConstructor;
-            showMessage: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            size: PropType<"small" | "default" | "large">;
-            disabled: BooleanConstructor;
-            validateOnRuleChange: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            hideRequiredAsterisk: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            scrollToError: BooleanConstructor;
-        }>> & {
-            onValidate?: ((...args: any[]) => any) | undefined;
-        } & VNodeProps & AllowedComponentProps & ComponentCustomProps, "labelWidth" | "disabled" | "inline" | "labelSuffix" | "inlineMessage" | "statusIcon" | "showMessage" | "validateOnRuleChange" | "hideRequiredAsterisk" | "scrollToError">;
-        $attrs: {
-            [x: string]: unknown;
-        };
-        $refs: {
-            [x: string]: unknown;
-        };
-        $slots: Readonly<{
-            [name: string]: Slot | undefined;
-        }>;
-        $root: ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null;
-        $parent: ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null;
-        $emit: (event: "validate", ...args: any[]) => void;
-        $el: any;
-        $options: ComponentOptionsBase<Readonly<ExtractPropTypes<{
-            model: ObjectConstructor;
-            rules: PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
-            labelPosition: StringConstructor;
-            labelWidth: {
-                type: (StringConstructor | NumberConstructor)[];
-                default: string;
-            };
-            labelSuffix: {
-                type: StringConstructor;
-                default: string;
-            };
-            inline: BooleanConstructor;
-            inlineMessage: BooleanConstructor;
-            statusIcon: BooleanConstructor;
-            showMessage: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            size: PropType<"small" | "default" | "large">;
-            disabled: BooleanConstructor;
-            validateOnRuleChange: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            hideRequiredAsterisk: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            scrollToError: BooleanConstructor;
-        }>> & {
-            onValidate?: ((...args: any[]) => any) | undefined;
-        }, {
-            formKls: ComputedRef<string[]>;
-            validate: (callback?: Callback | undefined) => Promise<boolean> | undefined;
-            resetFields: () => void;
-            clearValidate: (props?: string | string[] | undefined) => void;
-            validateField: (props: string | string[], cb: ValidateFieldCallback) => void;
-            scrollToField: (prop: string) => void;
-        }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, "validate"[], string, {
-            disabled: boolean;
-            inline: boolean;
-            labelWidth: string | number;
-            labelSuffix: string;
-            inlineMessage: boolean;
-            statusIcon: boolean;
-            showMessage: boolean;
-            validateOnRuleChange: boolean;
-            hideRequiredAsterisk: boolean;
-            scrollToError: boolean;
-        }> & {
-            beforeCreate?: ((() => void) | (() => void)[]) | undefined;
-            created?: ((() => void) | (() => void)[]) | undefined;
-            beforeMount?: ((() => void) | (() => void)[]) | undefined;
-            mounted?: ((() => void) | (() => void)[]) | undefined;
-            beforeUpdate?: ((() => void) | (() => void)[]) | undefined;
-            updated?: ((() => void) | (() => void)[]) | undefined;
-            activated?: ((() => void) | (() => void)[]) | undefined;
-            deactivated?: ((() => void) | (() => void)[]) | undefined;
-            beforeDestroy?: ((() => void) | (() => void)[]) | undefined;
-            beforeUnmount?: ((() => void) | (() => void)[]) | undefined;
-            destroyed?: ((() => void) | (() => void)[]) | undefined;
-            unmounted?: ((() => void) | (() => void)[]) | undefined;
-            renderTracked?: (((e: DebuggerEvent) => void) | ((e: DebuggerEvent) => void)[]) | undefined;
-            renderTriggered?: (((e: DebuggerEvent) => void) | ((e: DebuggerEvent) => void)[]) | undefined;
-            errorCaptured?: (((err: unknown, instance: ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void) | ((err: unknown, instance: ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | null, info: string) => boolean | void)[]) | undefined;
-        };
-        $forceUpdate: () => void;
-        $nextTick: typeof nextTick;
-        $watch(source: string | Function, cb: Function, options?: WatchOptions<boolean> | undefined): WatchStopHandle;
-    } & Readonly<ExtractPropTypes<{
-        model: ObjectConstructor;
-        rules: PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
-        labelPosition: StringConstructor;
-        labelWidth: {
-            type: (StringConstructor | NumberConstructor)[];
-            default: string;
-        };
-        labelSuffix: {
-            type: StringConstructor;
-            default: string;
-        };
-        inline: BooleanConstructor;
-        inlineMessage: BooleanConstructor;
-        statusIcon: BooleanConstructor;
-        showMessage: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        size: PropType<"small" | "default" | "large">;
-        disabled: BooleanConstructor;
-        validateOnRuleChange: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        hideRequiredAsterisk: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        scrollToError: BooleanConstructor;
-    }>> & {
-        onValidate?: ((...args: any[]) => any) | undefined;
-    } & ShallowUnwrapRef<{
-        formKls: ComputedRef<string[]>;
-        validate: (callback?: Callback | undefined) => Promise<boolean> | undefined;
-        resetFields: () => void;
-        clearValidate: (props?: string | string[] | undefined) => void;
-        validateField: (props: string | string[], cb: ValidateFieldCallback) => void;
-        scrollToField: (prop: string) => void;
-    }> & {} & {} & ComponentCustomProperties) | undefined>;
-    formState: FormState;
-    changeHandler: () => void;
-    resetForm: () => void | undefined;
-    submitForm: (native?: boolean | undefined) => Promise<any>;
-}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ("change" | "field-input" | "field-change")[], "change" | "field-input" | "field-change", VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<{
-    initValues: {
-        type: ObjectConstructor;
-        required: true;
-        default: () => {};
-    };
-    parentValues: {
-        type: ObjectConstructor;
-        default: () => {};
-    };
-    config: {
-        type: PropType<FormConfig>;
-        required: true;
-        default: () => never[];
-    };
-    labelWidth: {
-        type: StringConstructor;
-        default: () => string;
-    };
-    disabled: {
-        type: BooleanConstructor;
-        default: () => boolean;
-    };
-    height: {
-        type: StringConstructor;
-        default: () => string;
-    };
-    stepActive: {
-        type: (StringConstructor | NumberConstructor)[];
-        default: () => number;
-    };
-    size: {
-        type: StringConstructor;
-    };
-    inline: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    labelPosition: {
-        type: StringConstructor;
-        default: string;
-    };
-    keyProp: {
-        type: StringConstructor;
-        default: string;
-    };
-}>> & {
-    onChange?: ((...args: any[]) => any) | undefined;
-    "onField-input"?: ((...args: any[]) => any) | undefined;
-    "onField-change"?: ((...args: any[]) => any) | undefined;
-}, {
-    initValues: Record<string, any>;
-    parentValues: Record<string, any>;
-    config: FormConfig;
-    labelWidth: string;
-    disabled: boolean;
-    height: string;
-    stepActive: string | number;
-    inline: boolean;
-    labelPosition: string;
-    keyProp: string;
-}>;
-export default _default;