@deot/vc-components 1.0.48 → 1.0.49

package/dist/index.umd.cjs

@@ -19902,7 +19902,14 @@
 	  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 = {}) => {
@@ -20254,31 +20261,32 @@
 	  });
 	  const classes = vue.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 = vue.computed(() => {
+	  const isNested = vue.computed(() => {
 	    return !!formItem.change;
 	  });
-	  const isNestLast = vue.ref(false);
+	  const isNestedLast = vue.ref(false);
 	  const hasLabel = vue.computed(() => {
 	    return !!props.label || slots.label;
 	  });
 	  const labelStyle = vue.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
 	    ];
 	  });
@@ -20286,24 +20294,25 @@
 	    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 = vue.computed(() => {
-	    return [form.props.errorStyle, props.errorStyle];
+	    return [form.props.errorStyle, isNested.value && form.props.nestedErrorStyle, props.errorStyle];
 	  });
 	  const labelClass = vue.computed(() => {
-	    return [form.props.labelClass, props.labelClass];
+	    return [form.props.labelClass, isNested.value && form.props.nestedLabelClass, props.labelClass];
 	  });
 	  const contentClass = vue.computed(() => {
-	    return [form.props.contentClass, props.contentClass];
+	    return [form.props.contentClass, isNested.value && form.props.nestedContentClass, props.contentClass];
 	  });
 	  const errorClass = vue.computed(() => {
-	    return [form.props.errorClass, props.errorClass];
+	    return [form.props.errorClass, isNested.value && form.props.nestedErrorClass, props.errorClass];
 	  });
 	  const isStyleless = vue.computed(() => {
 	    return props.styleless || form.props.styleless;
@@ -20440,7 +20449,7 @@
 	  vue.watch(
 	    () => formItem.fields?.length,
 	    async (v) => {
-	      if (!isNest.value || !v) return isNestLast.value = false;
+	      if (!isNested.value || !v) return isNestedLast.value = false;
 	      const fields$ = [...vue.toRaw(formItem.fields)];
 	      const positions = await Promise.all(fields$.map((item) => item.exposed.getPosition()));
 	      const sortFields = fields$.toSorted((a, b) => {
@@ -20451,7 +20460,7 @@
 	        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({
@@ -20460,9 +20469,9 @@
 	    getPosition
 	  });
 	  return {
-	    isNest,
+	    isNested,
 	    isStyleless,
-	    isNestLast,
+	    isNestedLast,
 	    validateMessage,
 	    classes,
 	    labelStyle,
@@ -20489,7 +20498,7 @@
 	    const it = useFormItem(expose);
 	    const {
 	      isStyleless,
-	      isNest,
+	      isNested,
 	      classes,
 	      labelStyle,
 	      contentStyle,
@@ -20500,39 +20509,35 @@
 	      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 vue.createVNode("div", {
 	        "class": ['vc-form-item', classes.value]
-	      }, [(label || slots.label) && vue.createVNode("div", {
+	      }, [(props.label || slots.label) && vue.createVNode("div", {
 	        "style": labelStyle.value,
 	        "class": ['vc-form-item__label', ...labelClass.value],
-	        "for": labelFor
-	      }, [vue.createVNode("label", null, [label || slots.label?.()])]), vue.createVNode("div", {
+	        "for": props.labelFor
+	      }, [vue.createVNode("label", null, [props.label || slots.label?.()])]), vue.createVNode("div", {
 	        "class": "vc-form-item__wrapper"
 	      }, [vue.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
 	      }) : vue.createVNode(TransitionFade, null, {
 	        default: () => [vue.withDirectives(vue.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]), [[vue.vShow, showError.value]])]
 	      })])])]);
@@ -20603,41 +20608,36 @@
 	      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 vue.createVNode("div", {
 	        "style": {
-	          paddingLeft: `${isNest.value ? 0 : props.indent}px`
+	          paddingLeft: `${isNested.value ? 0 : props.indent}px`
 	        },
 	        "class": [classes.value, 'vcm-form-item']
 	      }, [vue.createVNode("div", {
 	        "class": "vcm-form-item__wrapper"
 	      }, [(props.label || slots.label) && vue.createVNode("label", {
-	        "for": labelFor,
+	        "for": props.labelFor,
 	        "style": labelStyle.value,
 	        "class": ['vcm-form-item__label', ...labelClass.value]
-	      }, [label || slots.label?.()]), vue.createVNode("div", {
+	      }, [props.label || slots.label?.()]), vue.createVNode("div", {
 	        "style": contentStyle.value,
 	        "class": ['vcm-form-item__content', ...contentClass.value]
-	      }, [slots.default?.(), showMessage && showError.value && vue.createVNode("div", {
+	      }, [slots.default?.(), props.showMessage && showError.value && vue.createVNode("div", {
 	        "class": [{
-	          'is-nest': isNest.value
+	          'is-nested': isNested.value
 	        }, errorColorClass, ...errorClass.value],
 	        "style": errorStyle.value
 	      }, [slots.error ? slots.error({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc-components",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",