cnhis-design-vue 3.1.40-beta.10 → 3.1.40-beta.11

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

@@ -2,7 +2,7 @@ import { defineComponent, inject, computed, createVNode, mergeProps } from 'vue'
 import { arrayed, widthAppend } from '../../../../../shared/utils/index.js';
 import { isVoidField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
-import { isString } from 'lodash-es';
+import { isString, isArray } from 'lodash-es';
 import { NFormItem } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index.js';
 import '../../../index.js';
@@ -104,10 +104,11 @@ const FORM_ITEM = connect(script, mapProps({
   title: "label"
 }, (props, field) => {
   const feedback = !isVoidField(field) ? arrayed(field.selfErrors).length ? parseFeedback(arrayed(field.selfErrors), props.fieldItem) : void 0 : void 0;
+  const required = isVoidField(field) ? isSuffixRequired(props.fieldItem) : field.required;
   return {
     ...props,
     fieldItem: void 0,
-    required: isVoidField(field) ? void 0 : field.required,
+    required,
     feedback,
     "validation-status": feedback ? "error" : void 0
   };
@@ -118,5 +119,10 @@ function parseFeedback(selfErrors, fieldItem) {
   }
   return validateMessageParser(fieldItem.defined_error_msg, fieldItem);
 }
+function isSuffixRequired(field) {
+  if (!field || !isArray(field.suffixConfig) || !field.suffixConfig.length)
+    return false;
+  return `${field.is_null}` === "0";
+}
 
 export { FORM_ITEM };

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

@@ -4,8 +4,8 @@ import '../../index.js';
 import { parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize.js';
 import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
-import { transformDateFormat } from '../utils/business.js';
 import { useFormValidator } from './useFormValidator.js';
+import { transformDateFormat } from '../utils/business.js';
 
 function bindAutoGraphProps(schema, item) {
   Object.assign(schema["x-component-props"], {
@@ -234,23 +234,25 @@ function useFieldListAdaptor(collector) {
     if (!item.suffixConfig)
       return createWidgetSchema(item);
     const suffixList = arrayed(item.suffixConfig);
-    const fieldList = [{ ...item, suffixConfig: void 0 }].concat(
+    const fieldList = [{ ...item, hide_title: "1", suffixConfig: void 0 }].concat(
       suffixList.map((suffix) => {
         return {
           ...suffix,
-          is_show: item.is_show,
-          alias: ""
+          hide_title: "1",
+          is_show: item.is_show
         };
       })
     );
-    return {
+    const schema = createStandardSchema(item);
+    Object.assign(schema, {
       type: "void",
       name: fieldKeyEscape(fieldList),
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
       "x-component-props": { span: (item.elem_width || 3) * 2 },
       properties: schemaAdaptor(fieldList)
-    };
+    });
+    return schema;
   };
   const { FieldNormalizeWaterfallHook } = useFieldNormalize();
   function schemaAdaptor(fieldList) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.40-beta.10",
+	"version": "3.1.40-beta.11",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "e91f488ae42382741e5c2b9601d4204e951a2a37"
+	"gitHead": "5e2ed2cc2e0159dabb41893227bcf53c4d3f8f5c"
 }

package/es/components/form-render/test/basic-config.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/es/components/form-render/test/renderer.spec.d.ts

@@ -1 +0,0 @@
-export {};