@deot/vc 1.0.45 → 1.0.46

package/dist/index.d.ts

@@ -2495,10 +2495,10 @@ export declare const Components: {
             title?: string | undefined;
             onCancel?: Function | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
             maskStyle?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
@@ -2801,10 +2801,10 @@ export declare const Components: {
             title?: string | undefined;
             onCancel?: Function | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
             maskStyle?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
@@ -3573,6 +3573,12 @@ export declare const Components: {
     type: BooleanConstructor;
     default: boolean;
     };
+    contentStyle: (ObjectConstructor | StringConstructor)[];
+    contentClass: (ObjectConstructor | StringConstructor)[];
+    labelStyle: (ObjectConstructor | StringConstructor)[];
+    labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>, () => VNode<RendererNode, RendererElement, {
     [key: string]: any;
     }>, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<    {
@@ -3609,6 +3615,12 @@ export declare const Components: {
     type: BooleanConstructor;
     default: boolean;
     };
+    contentStyle: (ObjectConstructor | StringConstructor)[];
+    contentClass: (ObjectConstructor | StringConstructor)[];
+    labelStyle: (ObjectConstructor | StringConstructor)[];
+    labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>> & Readonly<{}>, {
     tag: string;
     styleless: boolean;
@@ -3659,6 +3671,12 @@ export declare const Components: {
     type: BooleanConstructor;
     default: boolean;
     };
+    contentStyle: (ObjectConstructor | StringConstructor)[];
+    contentClass: (ObjectConstructor | StringConstructor)[];
+    labelStyle: (ObjectConstructor | StringConstructor)[];
+    labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>, () => VNode<RendererNode, RendererElement, {
     [key: string]: any;
     }>, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<    {
@@ -3703,6 +3721,12 @@ export declare const Components: {
     type: BooleanConstructor;
     default: boolean;
     };
+    contentStyle: (ObjectConstructor | StringConstructor)[];
+    contentClass: (ObjectConstructor | StringConstructor)[];
+    labelStyle: (ObjectConstructor | StringConstructor)[];
+    labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>> & Readonly<{}>, {
     tag: string;
     border: boolean;
@@ -3760,6 +3784,8 @@ export declare const Components: {
     contentClass: (ObjectConstructor | StringConstructor)[];
     labelStyle: (ObjectConstructor | StringConstructor)[];
     labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>, () => JSX_2.Element | (VNode<RendererNode, RendererElement, {
     [key: string]: any;
     }>[] | undefined)[], {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<    {
@@ -3809,6 +3835,8 @@ export declare const Components: {
     contentClass: (ObjectConstructor | StringConstructor)[];
     labelStyle: (ObjectConstructor | StringConstructor)[];
     labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>> & Readonly<{}>, {
     label: string;
     styleless: boolean;
@@ -3868,6 +3896,8 @@ export declare const Components: {
     contentClass: (ObjectConstructor | StringConstructor)[];
     labelStyle: (ObjectConstructor | StringConstructor)[];
     labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>, () => JSX_2.Element | (VNode<RendererNode, RendererElement, {
     [key: string]: any;
     }>[] | undefined)[], {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<    {
@@ -3921,6 +3951,8 @@ export declare const Components: {
     contentClass: (ObjectConstructor | StringConstructor)[];
     labelStyle: (ObjectConstructor | StringConstructor)[];
     labelClass: (ObjectConstructor | StringConstructor)[];
+    errorStyle: (ObjectConstructor | StringConstructor)[];
+    errorClass: (ObjectConstructor | StringConstructor)[];
     }>> & Readonly<{}>, {
     label: string;
     styleless: boolean;
@@ -5671,10 +5703,10 @@ export declare const Components: {
             x?: number | undefined;
             y?: number | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
         }>) => PortalLeaf;
@@ -5704,10 +5736,10 @@ export declare const Components: {
             x?: number | undefined;
             y?: number | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
         }>) => PortalLeaf;
@@ -5737,10 +5769,10 @@ export declare const Components: {
             x?: number | undefined;
             y?: number | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
         }>) => PortalLeaf;
@@ -5770,10 +5802,10 @@ export declare const Components: {
             x?: number | undefined;
             y?: number | undefined;
             wrapperStyle?: string | Record<string, any> | undefined;
-            onOk?: Function | undefined;
-            wrapperClass?: string | Record<string, any> | undefined;
             contentStyle?: string | Record<string, any> | undefined;
             contentClass?: string | Record<string, any> | undefined;
+            onOk?: Function | undefined;
+            wrapperClass?: string | Record<string, any> | undefined;
         } & {
             onClose: (...args: any[]) => any;
         }>) => PortalLeaf;
@@ -8620,6 +8652,8 @@ export declare const Components: {
     height: string | number;
     always: boolean;
     wrapperStyle: StyleValue;
+    contentStyle: StyleValue;
+    contentClass: StyleValue;
     thumbMinSize: number;
     native: boolean;
     autoResize: boolean;
@@ -8627,8 +8661,6 @@ export declare const Components: {
     trackOffsetY: number[];
     maxHeight: string | number;
     wrapperClass: StyleValue;
-    contentStyle: StyleValue;
-    contentClass: StyleValue;
     showBar: boolean;
     }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
     MScroller: DefineComponent<ExtractPropTypes<    {
@@ -8762,6 +8794,8 @@ export declare const Components: {
     height: string | number;
     always: boolean;
     wrapperStyle: StyleValue;
+    contentStyle: StyleValue;
+    contentClass: StyleValue;
     thumbMinSize: number;
     native: boolean;
     autoResize: boolean;
@@ -8769,8 +8803,6 @@ export declare const Components: {
     trackOffsetY: number[];
     maxHeight: string | number;
     wrapperClass: StyleValue;
-    contentStyle: StyleValue;
-    contentClass: StyleValue;
     showBar: boolean;
     }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
     Select: DefineComponent<ExtractPropTypes<    {

package/dist/index.iife.js

@@ -19889,7 +19889,14 @@ var Vc = (function (exports, vue) {
     styleless: {
       type: Boolean,
       default: false
-    }
+    },
+    // 给formItem统一注入
+    contentStyle: [Object, String],
+    contentClass: [Object, String],
+    labelStyle: [Object, String],
+    labelClass: [Object, String],
+    errorStyle: [Object, String],
+    errorClass: [Object, String]
   };
   const useForm = (expose, options = {}) => {
     const instance = vue.getCurrentInstance();
@@ -20046,7 +20053,9 @@ var Vc = (function (exports, vue) {
     contentStyle: [Object, String],
     contentClass: [Object, String],
     labelStyle: [Object, String],
-    labelClass: [Object, String]
+    labelClass: [Object, String],
+    errorStyle: [Object, String],
+    errorClass: [Object, String]
   };
   const filterEmpty = (val) => {
     if (val instanceof Array) {
@@ -20127,6 +20136,7 @@ var Vc = (function (exports, vue) {
           width: labelPosition.value !== "top" && labelWidth && labelWidth > 0 ? `${labelWidth}px` : "auto",
           textAlign: labelPosition.value === "top" ? "left" : labelPosition.value
         },
+        form.props.labelStyle,
         props2.labelStyle
       ];
     });
@@ -20137,9 +20147,22 @@ var Vc = (function (exports, vue) {
           marginLeft: !hasLabel.value && isNest.value ? 0 : labelWidth && labelWidth > 0 ? `${labelWidth}px` : "unset",
           marginBottom: isNest.value && !isNestLast.value ? `20px` : 0
         },
+        form.props.contentStyle,
         props2.contentStyle
       ];
     });
+    const errorStyle = vue.computed(() => {
+      return [form.props.errorStyle, props2.errorStyle];
+    });
+    const labelClass = vue.computed(() => {
+      return [form.props.labelClass, props2.labelClass];
+    });
+    const contentClass = vue.computed(() => {
+      return [form.props.contentClass, props2.contentClass];
+    });
+    const errorClass = vue.computed(() => {
+      return [form.props.errorClass, props2.errorClass];
+    });
     const isStyleless = vue.computed(() => {
       return props2.styleless || form.props.styleless;
     });
@@ -20302,6 +20325,10 @@ var Vc = (function (exports, vue) {
       classes,
       labelStyle,
       contentStyle,
+      errorStyle,
+      labelClass,
+      contentClass,
+      errorClass,
       showError,
       labelPosition
     };
@@ -20321,6 +20348,10 @@ var Vc = (function (exports, vue) {
         classes,
         labelStyle,
         contentStyle,
+        errorStyle,
+        labelClass,
+        contentClass,
+        errorClass,
         showError,
         validateMessage
       } = it;
@@ -20334,27 +20365,30 @@ var Vc = (function (exports, vue) {
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         })];
         return vue.createVNode("div", {
           "class": ["vc-form-item", classes.value]
         }, [(label || slots.label) && vue.createVNode("div", {
           "style": labelStyle.value,
-          "class": ["vc-form-item__label", props2.labelClass],
+          "class": ["vc-form-item__label", ...labelClass.value],
           "for": labelFor
         }, [vue.createVNode("label", null, [label || slots.label?.()])]), vue.createVNode("div", {
           "class": "vc-form-item__wrapper"
         }, [vue.createVNode("div", {
-          "class": ["vc-form-item__content", props2.contentClass],
+          "class": ["vc-form-item__content", ...contentClass.value],
           "style": contentStyle.value
         }, [slots.default?.(), slots.error ? slots.error({
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         }) : vue.createVNode(TransitionFade, null, {
           default: () => [vue.withDirectives(vue.createVNode("div", {
-            "class": ["vc-form-item__tip", isNest.value ? "is-nest" : "", errorColorClass]
+            "class": ["vc-form-item__tip", isNest.value ? "is-nest" : "", errorColorClass, ...errorClass.value],
+            "style": [errorStyle.value]
           }, [validateMessage.value]), [[vue.vShow, showError.value]])]
         })])])]);
       };
@@ -20414,6 +20448,10 @@ var Vc = (function (exports, vue) {
         classes,
         labelStyle,
         contentStyle,
+        errorStyle,
+        labelClass,
+        contentClass,
+        errorClass,
         isNest,
         showError,
         validateMessage
@@ -20429,7 +20467,8 @@ var Vc = (function (exports, vue) {
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         })];
         return vue.createVNode("div", {
           "style": {
@@ -20441,14 +20480,15 @@ var Vc = (function (exports, vue) {
         }, [(props2.label || slots.label) && vue.createVNode("label", {
           "for": labelFor,
           "style": labelStyle.value,
-          "class": "vcm-form-item__label"
+          "class": ["vcm-form-item__label", ...labelClass.value]
         }, [label || slots.label?.()]), vue.createVNode("div", {
           "style": contentStyle.value,
-          "class": "vcm-form-item__content"
+          "class": ["vcm-form-item__content", ...contentClass.value]
         }, [slots.default?.(), showMessage && showError.value && vue.createVNode("div", {
           "class": [{
             "is-nest": isNest.value
-          }, errorColorClass]
+          }, errorColorClass, ...errorClass.value],
+          "style": errorStyle.value
         }, [slots.error ? slots.error({
           message: validateMessage.value
         }) : validateMessage.value])])])]);
@@ -24814,6 +24854,7 @@ var Vc = (function (exports, vue) {
     });
     const classes = vue.computed(() => {
       return {
+        "is-disabled": props2.disabled,
         "is-loading": isLoading.value,
         "is-checked": checked.value
       };

package/dist/index.umd.cjs

@@ -19892,7 +19892,14 @@
     styleless: {
       type: Boolean,
       default: false
-    }
+    },
+    // 给formItem统一注入
+    contentStyle: [Object, String],
+    contentClass: [Object, String],
+    labelStyle: [Object, String],
+    labelClass: [Object, String],
+    errorStyle: [Object, String],
+    errorClass: [Object, String]
   };
   const useForm = (expose, options = {}) => {
     const instance = vue.getCurrentInstance();
@@ -20049,7 +20056,9 @@
     contentStyle: [Object, String],
     contentClass: [Object, String],
     labelStyle: [Object, String],
-    labelClass: [Object, String]
+    labelClass: [Object, String],
+    errorStyle: [Object, String],
+    errorClass: [Object, String]
   };
   const filterEmpty = (val) => {
     if (val instanceof Array) {
@@ -20130,6 +20139,7 @@
           width: labelPosition.value !== "top" && labelWidth && labelWidth > 0 ? `${labelWidth}px` : "auto",
           textAlign: labelPosition.value === "top" ? "left" : labelPosition.value
         },
+        form.props.labelStyle,
         props2.labelStyle
       ];
     });
@@ -20140,9 +20150,22 @@
           marginLeft: !hasLabel.value && isNest.value ? 0 : labelWidth && labelWidth > 0 ? `${labelWidth}px` : "unset",
           marginBottom: isNest.value && !isNestLast.value ? `20px` : 0
         },
+        form.props.contentStyle,
         props2.contentStyle
       ];
     });
+    const errorStyle = vue.computed(() => {
+      return [form.props.errorStyle, props2.errorStyle];
+    });
+    const labelClass = vue.computed(() => {
+      return [form.props.labelClass, props2.labelClass];
+    });
+    const contentClass = vue.computed(() => {
+      return [form.props.contentClass, props2.contentClass];
+    });
+    const errorClass = vue.computed(() => {
+      return [form.props.errorClass, props2.errorClass];
+    });
     const isStyleless = vue.computed(() => {
       return props2.styleless || form.props.styleless;
     });
@@ -20305,6 +20328,10 @@
       classes,
       labelStyle,
       contentStyle,
+      errorStyle,
+      labelClass,
+      contentClass,
+      errorClass,
       showError,
       labelPosition
     };
@@ -20324,6 +20351,10 @@
         classes,
         labelStyle,
         contentStyle,
+        errorStyle,
+        labelClass,
+        contentClass,
+        errorClass,
         showError,
         validateMessage
       } = it;
@@ -20337,27 +20368,30 @@
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         })];
         return vue.createVNode("div", {
           "class": ["vc-form-item", classes.value]
         }, [(label || slots.label) && vue.createVNode("div", {
           "style": labelStyle.value,
-          "class": ["vc-form-item__label", props2.labelClass],
+          "class": ["vc-form-item__label", ...labelClass.value],
           "for": labelFor
         }, [vue.createVNode("label", null, [label || slots.label?.()])]), vue.createVNode("div", {
           "class": "vc-form-item__wrapper"
         }, [vue.createVNode("div", {
-          "class": ["vc-form-item__content", props2.contentClass],
+          "class": ["vc-form-item__content", ...contentClass.value],
           "style": contentStyle.value
         }, [slots.default?.(), slots.error ? slots.error({
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         }) : vue.createVNode(TransitionFade, null, {
           default: () => [vue.withDirectives(vue.createVNode("div", {
-            "class": ["vc-form-item__tip", isNest.value ? "is-nest" : "", errorColorClass]
+            "class": ["vc-form-item__tip", isNest.value ? "is-nest" : "", errorColorClass, ...errorClass.value],
+            "style": [errorStyle.value]
           }, [validateMessage.value]), [[vue.vShow, showError.value]])]
         })])])]);
       };
@@ -20417,6 +20451,10 @@
         classes,
         labelStyle,
         contentStyle,
+        errorStyle,
+        labelClass,
+        contentClass,
+        errorClass,
         isNest,
         showError,
         validateMessage
@@ -20432,7 +20470,8 @@
           show: showError.value,
           nest: isNest.value,
           message: validateMessage.value,
-          class: errorColorClass
+          class: [errorColorClass, ...errorClass.value],
+          style: errorStyle.value
         })];
         return vue.createVNode("div", {
           "style": {
@@ -20444,14 +20483,15 @@
         }, [(props2.label || slots.label) && vue.createVNode("label", {
           "for": labelFor,
           "style": labelStyle.value,
-          "class": "vcm-form-item__label"
+          "class": ["vcm-form-item__label", ...labelClass.value]
         }, [label || slots.label?.()]), vue.createVNode("div", {
           "style": contentStyle.value,
-          "class": "vcm-form-item__content"
+          "class": ["vcm-form-item__content", ...contentClass.value]
         }, [slots.default?.(), showMessage && showError.value && vue.createVNode("div", {
           "class": [{
             "is-nest": isNest.value
-          }, errorColorClass]
+          }, errorColorClass, ...errorClass.value],
+          "style": errorStyle.value
         }, [slots.error ? slots.error({
           message: validateMessage.value
         }) : validateMessage.value])])])]);
@@ -24817,6 +24857,7 @@
     });
     const classes = vue.computed(() => {
       return {
+        "is-disabled": props2.disabled,
         "is-loading": isLoading.value,
         "is-checked": checked.value
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,9 +19,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/vc-components": "^1.0.45",
-    "@deot/vc-hooks": "^1.0.45",
-    "@deot/vc-shared": "^1.0.45"
+    "@deot/vc-components": "^1.0.46",
+    "@deot/vc-hooks": "^1.0.46",
+    "@deot/vc-shared": "^1.0.46"
   },
   "peerDependencies": {
     "vue": "*"