@deot/vc-components 1.0.48 → 1.0.49

package/dist/index.js

@@ -11466,7 +11466,14 @@ const props$L = {
   labelStyle: [Object, String],
   labelClass: [Object, String],
   errorStyle: [Object, String],
-  errorClass: [Object, String]
+  errorClass: [Object, String],
+  // 给nestFormItem统一注入
+  nestedContentStyle: [Object, String],
+  nestedContentClass: [Object, String],
+  nestedLabelStyle: [Object, String],
+  nestedLabelClass: [Object, String],
+  nestedErrorStyle: [Object, String],
+  nestedErrorClass: [Object, String]
 };
 
 const useForm = (expose, options = {}) => {
@@ -11686,31 +11693,32 @@ const useFormItem = (expose) => {
   });
   const classes = computed(() => {
     return {
-      "is-require": isRequired.value && props.asterisk,
+      "is-required": isRequired.value && props.asterisk,
       "is-error": validateState.value === "error",
       "is-validating": validateState.value === "validating",
       "is-inline": form.props.inline,
-      "is-nest": isNest.value,
+      "is-nested": isNested.value,
       "is-alone": !props.showMessage,
       // 用于单独去除form-item的默认margin_bottom
       [`is-${labelPosition.value}`]: true
     };
   });
-  const isNest = computed(() => {
+  const isNested = computed(() => {
     return !!formItem.change;
   });
-  const isNestLast = ref(false);
+  const isNestedLast = ref(false);
   const hasLabel = computed(() => {
     return !!props.label || slots.label;
   });
   const labelStyle = computed(() => {
-    const labelWidth = props.labelWidth === 0 || props.labelWidth ? props.labelWidth : isNest.value ? 0 : form.props.labelWidth;
+    const labelWidth = props.labelWidth === 0 || props.labelWidth ? props.labelWidth : isNested.value ? 0 : form.props.labelWidth;
     return [
       {
         width: labelPosition.value !== "top" && labelWidth && labelWidth > 0 ? `${labelWidth}px` : "auto",
         textAlign: labelPosition.value === "top" ? "left" : labelPosition.value
       },
       form.props.labelStyle,
+      isNested.value && form.props.nestedLabelStyle,
       props.labelStyle
     ];
   });
@@ -11718,24 +11726,25 @@ const useFormItem = (expose) => {
     const labelWidth = props.labelWidth === 0 || props.labelWidth ? props.labelWidth : form.props.labelWidth;
     return [
       {
-        marginLeft: !hasLabel.value && isNest.value ? 0 : labelWidth && labelWidth > 0 ? `${labelWidth}px` : "unset",
-        marginBottom: isNest.value && !isNestLast.value ? `20px` : 0
+        marginLeft: labelPosition.value === "top" || !hasLabel.value && isNested.value ? 0 : labelWidth && labelWidth > 0 ? `${labelWidth}px` : "unset",
+        marginBottom: isNested.value && !isNestedLast.value ? `20px` : 0
       },
       form.props.contentStyle,
+      isNested.value && form.props.nestedContentStyle,
       props.contentStyle
     ];
   });
   const errorStyle = computed(() => {
-    return [form.props.errorStyle, props.errorStyle];
+    return [form.props.errorStyle, isNested.value && form.props.nestedErrorStyle, props.errorStyle];
   });
   const labelClass = computed(() => {
-    return [form.props.labelClass, props.labelClass];
+    return [form.props.labelClass, isNested.value && form.props.nestedLabelClass, props.labelClass];
   });
   const contentClass = computed(() => {
-    return [form.props.contentClass, props.contentClass];
+    return [form.props.contentClass, isNested.value && form.props.nestedContentClass, props.contentClass];
   });
   const errorClass = computed(() => {
-    return [form.props.errorClass, props.errorClass];
+    return [form.props.errorClass, isNested.value && form.props.nestedErrorClass, props.errorClass];
   });
   const isStyleless = computed(() => {
     return props.styleless || form.props.styleless;
@@ -11872,7 +11881,7 @@ const useFormItem = (expose) => {
   watch(
     () => formItem.fields?.length,
     async (v) => {
-      if (!isNest.value || !v) return isNestLast.value = false;
+      if (!isNested.value || !v) return isNestedLast.value = false;
       const fields$ = [...toRaw(formItem.fields)];
       const positions = await Promise.all(fields$.map((item) => item.exposed.getPosition()));
       const sortFields = fields$.toSorted((a, b) => {
@@ -11883,7 +11892,7 @@ const useFormItem = (expose) => {
         if (aPosition.top != bPosition.top) return aPosition.top - bPosition.top;
         return aPosition.left - bPosition.left;
       });
-      isNestLast.value = sortFields[sortFields.length - 1] === instance;
+      isNestedLast.value = sortFields[sortFields.length - 1] === instance;
     }
   );
   expose({
@@ -11892,9 +11901,9 @@ const useFormItem = (expose) => {
     getPosition
   });
   return {
-    isNest,
+    isNested,
     isStyleless,
-    isNestLast,
+    isNestedLast,
     validateMessage,
     classes,
     labelStyle,
@@ -11921,7 +11930,7 @@ const FormItem = /* @__PURE__ */ defineComponent({
     const it = useFormItem(expose);
     const {
       isStyleless,
-      isNest,
+      isNested,
       classes,
       labelStyle,
       contentStyle,
@@ -11932,39 +11941,35 @@ const FormItem = /* @__PURE__ */ defineComponent({
       showError,
       validateMessage
     } = it;
-    const {
-      label,
-      labelFor
-    } = props;
     const errorColorClass = 'vc-form-item__error';
     return () => {
       if (isStyleless.value) return [slots.default?.(), slots.error?.({
         show: showError.value,
-        nest: isNest.value,
+        nested: isNested.value,
         message: validateMessage.value,
         class: [errorColorClass, ...errorClass.value],
         style: errorStyle.value
       })];
       return createVNode("div", {
         "class": ['vc-form-item', classes.value]
-      }, [(label || slots.label) && createVNode("div", {
+      }, [(props.label || slots.label) && createVNode("div", {
         "style": labelStyle.value,
         "class": ['vc-form-item__label', ...labelClass.value],
-        "for": labelFor
-      }, [createVNode("label", null, [label || slots.label?.()])]), createVNode("div", {
+        "for": props.labelFor
+      }, [createVNode("label", null, [props.label || slots.label?.()])]), createVNode("div", {
         "class": "vc-form-item__wrapper"
       }, [createVNode("div", {
         "class": ['vc-form-item__content', ...contentClass.value],
         "style": contentStyle.value
       }, [slots.default?.(), slots.error ? slots.error({
         show: showError.value,
-        nest: isNest.value,
+        nest: isNested.value,
         message: validateMessage.value,
         class: [errorColorClass, ...errorClass.value],
         style: errorStyle.value
       }) : createVNode(TransitionFade, null, {
         default: () => [withDirectives(createVNode("div", {
-          "class": ['vc-form-item__tip', isNest.value ? 'is-nest' : '', errorColorClass, ...errorClass.value],
+          "class": ['vc-form-item__tip', isNested.value ? 'is-nested' : '', errorColorClass, ...errorClass.value],
           "style": [errorStyle.value]
         }, [validateMessage.value]), [[vShow, showError.value]])]
       })])])]);
@@ -12035,41 +12040,36 @@ const MFormItem = /* @__PURE__ */ defineComponent({
       labelClass,
       contentClass,
       errorClass,
-      isNest,
+      isNested,
       showError,
       validateMessage
     } = it;
-    const {
-      label,
-      labelFor,
-      showMessage
-    } = props;
     const errorColorClass = 'vcm-form-item__error';
     return () => {
       if (isStyleless.value) return [slots.default?.(), slots.error?.({
         show: showError.value,
-        nest: isNest.value,
+        nested: isNested.value,
         message: validateMessage.value,
         class: [errorColorClass, ...errorClass.value],
         style: errorStyle.value
       })];
       return createVNode("div", {
         "style": {
-          paddingLeft: `${isNest.value ? 0 : props.indent}px`
+          paddingLeft: `${isNested.value ? 0 : props.indent}px`
         },
         "class": [classes.value, 'vcm-form-item']
       }, [createVNode("div", {
         "class": "vcm-form-item__wrapper"
       }, [(props.label || slots.label) && createVNode("label", {
-        "for": labelFor,
+        "for": props.labelFor,
         "style": labelStyle.value,
         "class": ['vcm-form-item__label', ...labelClass.value]
-      }, [label || slots.label?.()]), createVNode("div", {
+      }, [props.label || slots.label?.()]), createVNode("div", {
         "style": contentStyle.value,
         "class": ['vcm-form-item__content', ...contentClass.value]
-      }, [slots.default?.(), showMessage && showError.value && createVNode("div", {
+      }, [slots.default?.(), props.showMessage && showError.value && createVNode("div", {
         "class": [{
-          'is-nest': isNest.value
+          'is-nested': isNested.value
         }, errorColorClass, ...errorClass.value],
         "style": errorStyle.value
       }, [slots.error ? slots.error({