cnhis-design-vue 3.1.38-beta.3 → 3.1.38-beta.4

package/es/components/form-render/src/components/renderer/formItem.d.ts

@@ -1,5 +1,6 @@
 export declare const FORM_ITEM: import("vue").DefineComponent<{
     label: StringConstructor;
+    isSuffix: BooleanConstructor;
     propertyKey: StringConstructor;
     remark: StringConstructor;
     span: NumberConstructor;
@@ -7,9 +8,12 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
     fieldItem: {};
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     label: StringConstructor;
+    isSuffix: BooleanConstructor;
     propertyKey: StringConstructor;
     remark: StringConstructor;
     span: NumberConstructor;
     annotation: {};
     fieldItem: {};
-}>>, {}>;
+}>>, {
+    isSuffix: boolean;
+}>;

package/es/components/form-render/src/components/renderer/formItem.js

@@ -14,6 +14,7 @@ import { validateMessageParser } from '../../utils/index.js';
 const script = defineComponent({
   props: {
     label: String,
+    isSuffix: Boolean,
     propertyKey: String,
     remark: String,
     span: Number,
@@ -21,7 +22,8 @@ const script = defineComponent({
     fieldItem: {}
   },
   setup(props, {
-    slots
+    slots,
+    attrs
   }) {
     const annotation = inject(InjectionAnnotation);
     const annotationContent = computed({
@@ -46,7 +48,7 @@ const script = defineComponent({
     const showAnnotation = computed(() => {
       return annotation.value && props.annotation !== false;
     });
-    const showLabel = computed(() => props.label && props.label !== " ");
+    const needRenderLabel = computed(() => props.label && props.label !== " ");
     const field = useField();
     const uuid = inject(InjectionFormUUID);
     const id = computed(() => {
@@ -59,7 +61,7 @@ const script = defineComponent({
       return result;
     });
     function renderLabel() {
-      return showLabel.value ? createVNode("section", {
+      return needRenderLabel.value ? createVNode("section", {
         "class": "form-render__formItemLabel"
       }, [createVNode("span", {
         "class": "form-render__formItemLabel--text",
@@ -74,6 +76,23 @@ const script = defineComponent({
         "message": props.remark
       }, null)]) : null, showAnnotation.value ? renderAnnotation() : null]) : null]) : null;
     }
+    const nFormConfig = inject("n-form", {
+      props: {}
+    });
+    const showLabel = computed(() => {
+      var _a, _b, _c;
+      if (((_a = nFormConfig.props) == null ? void 0 : _a.labelPlacement) === "left" && props.isSuffix)
+        return false;
+      return (_c = attrs.showLabel) != null ? _c : (_b = nFormConfig.props) == null ? void 0 : _b.showLabel;
+    });
+    const renderSlots = computed(() => {
+      const result = {
+        ...slots
+      };
+      if (showLabel.value)
+        result.label = renderLabel;
+      return result;
+    });
     return () => {
       var _a;
       return createVNode(NFormItem, mergeProps({
@@ -84,11 +103,9 @@ const script = defineComponent({
       }, {
         id: id.value,
         "widget-type": field.value.componentType,
-        "form-field": field.value.path.toString()
-      }), {
-        ...slots,
-        label: renderLabel
-      });
+        "form-field": field.value.path.toString(),
+        showLabel: showLabel.value
+      }), renderSlots.value);
     };
   }
 });

package/es/components/form-render/src/hooks/useFieldListAdaptor.js

@@ -243,7 +243,15 @@ function useFieldListAdaptor(collector) {
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(
       suffixList.map((suffix) => {
-        return { ...suffix, is_show: item.is_show, alias: " " };
+        return {
+          ...suffix,
+          is_show: item.is_show,
+          alias: "",
+          decoratorProps: {
+            ...suffix.decoratorProps,
+            isSuffix: true
+          }
+        };
       })
     );
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.38-beta.3",
+	"version": "3.1.38-beta.4",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "8befc87f7eec7ffb77d7f7808b468fba4f614515"
+	"gitHead": "721f77a45d1d0be32b9186a02f79da33624b5e72"
 }