cnhis-design-vue 3.1.24-beta.0 → 3.1.24-beta.2

package/es/components/annotation-edit/src/AnnotationEdit.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, createVNode, unref } from 'vue';
+import { defineComponent, computed, ref, onDeactivated, createVNode, unref } from 'vue';
 import { FileTrayFull, FileTray } from '@vicons/ionicons5';
 import { NPopover, NIcon, NInput } from 'naive-ui';
 
@@ -113,6 +113,9 @@ var script = defineComponent({
         }, null)]);
       }
     }
+    onDeactivated(() => {
+      showPopper.value = false;
+    });
     return renderAnnotation;
   }
 });

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -50,13 +50,16 @@ var EditInput = defineComponent({
     function onBlur() {
       emit("formChange", {
         value: __value.value,
-        ...commData
+        ...commData,
+        type: "blur"
       });
     }
     const config = {
       clearable: true,
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
-      ...props.col.componentProps || {}
+      ...props.col.componentProps || {},
+      onBlur,
+      onKeyup: keyup
     };
     function keyup(event) {
       if (event.key == "Enter") {
@@ -70,20 +73,13 @@ var EditInput = defineComponent({
       "ref": formRef
     }, attrs, config, {
       "value": __value.value,
-      "onUpdate:value": ($event) => __value.value = $event,
-      "onBlur": onBlur,
-      "onKeyup": keyup
+      "onUpdate:value": ($event) => __value.value = $event
     }), null) : createVNode(NInputNumber, mergeProps({
       "ref": formRef
     }, attrs, config, {
       "value": __value.value,
       "onUpdate:value": ($event) => __value.value = $event,
-      "onUpdateValue": onUpdateValue,
-      "onBlur": () => emit("formChange", {
-        value: __value.value,
-        ...commData,
-        type: "blur"
-      })
+      "onUpdateValue": onUpdateValue
     }), null);
   }
 });

package/es/components/form-config/index.d.ts

@@ -970,6 +970,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             } | undefined;
             suffixConfig?: any | any[] | undefined;
             autograph?: string | undefined;
+            defined_error_msg?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -972,6 +972,7 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
             suffixConfig?: any | any[] | undefined;
             autograph?: string | undefined;
+            defined_error_msg?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("../..").FormRenderer | Record<string, import("../..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -101,6 +101,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
+        defined_error_msg?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("../../../../../es/components/form-render").FormRenderer | Record<string, import("../../../../../es/components/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

package/es/components/form-render/index.js

@@ -8,7 +8,7 @@ export { useFormField } from './src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './src/hooks/useFieldVisitor.js';
 export { useFieldNormalize } from './src/hooks/useFieldNormalize.js';
-export { useFormValidator } from './src/hooks/useFormValidator.js';
+export { useFormValidator, validateMessageLocale } from './src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';

package/es/components/form-render/src/FormRender.js

@@ -22,6 +22,7 @@ import '../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import { validateMessageLocale } from './hooks/useFormValidator.js';
 import '@vueuse/core';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useFormContext } from './hooks/useFormContext.js';
@@ -62,6 +63,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose, emit }) {
     const props = __props;
     const { nuiThemeOverrides } = useNuiThemeOverrides();
+    validateMessageLocale();
     useFormRenderLifeCycle(props).callLifeCycle("onSetup");
     const formModel = createForm({
       initialValues: props.initialData,
@@ -151,7 +153,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return formModel.getFormState().values;
       },
       setFieldState(path, handler) {
-        formModel.setFieldState(path, handler);
+        formModel.setFieldState(path, (state) => {
+          handler(
+            new Proxy(state, {
+              get(target, key, receiver) {
+                return Reflect.get(target, key, receiver);
+              },
+              set(target, key, value, receiver) {
+                return Reflect.set(target, key, value, receiver);
+              }
+            })
+          );
+        });
       },
       resetFields(path = "*") {
         formModel.reset(path);

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

@@ -1,10 +1,11 @@
 import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
 import { useField, connect, mapProps } from '@formily/vue';
+import { isString } from 'lodash-es';
 import { NFormItem } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
-import '../../utils/index.js';
+import { validateMessageParser } from '../../utils/index.js';
 import { dotEscape } from '../../utils/schema.js';
 
 const script = defineComponent({
@@ -65,9 +66,10 @@ const script = defineComponent({
 const FORM_ITEM = connect(script, mapProps({
   title: "label"
 }, (props, field) => {
-  const feedback = !isVoidField(field) ? field.selfErrors.length ? field.selfErrors.join(",") : void 0 : void 0;
+  const feedback = !isVoidField(field) ? field.selfErrors.length ? parseFeedback(field.selfErrors, props.fieldItem) : void 0 : void 0;
   return {
     ...props,
+    fieldItem: void 0,
     required: isVoidField(field) ? void 0 : field.required,
     class: "form-render__formItem",
     style: {
@@ -77,5 +79,11 @@ const FORM_ITEM = connect(script, mapProps({
     "validation-status": feedback ? "error" : void 0
   };
 }));
+function parseFeedback(selfErrors, fieldItem) {
+  if (!isString(fieldItem.defined_error_msg) || !fieldItem.defined_error_msg) {
+    return selfErrors.map((message) => validateMessageParser(message, fieldItem)).join(",");
+  }
+  return validateMessageParser(fieldItem.defined_error_msg, fieldItem);
+}
 
 export { FORM_ITEM };

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

@@ -18,6 +18,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import '../../hooks/useFormValidator.js';
 import '@formily/core';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';

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

@@ -18,6 +18,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import '../../hooks/useFormValidator.js';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './input.js';

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

@@ -18,6 +18,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import '../../hooks/useFormValidator.js';
 import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './input.js';

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

@@ -5,7 +5,7 @@ export { useFormField } from './useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './useAsyncQueue.js';
 export { useFieldVisitor } from './useFieldVisitor.js';
 export { useFieldNormalize } from './useFieldNormalize.js';
-export { useFormValidator } from './useFormValidator.js';
+export { useFormValidator, validateMessageLocale } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';

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

@@ -1,6 +1,6 @@
-import { arrayed } from '../../../../shared/utils/index.js';
+import { arrayed, deepOmit } from '../../../../shared/utils/index.js';
 import { isObject } from '@vueuse/core';
-import { cloneDeep, omit, pick } from 'lodash-es';
+import { cloneDeep, pick } from 'lodash-es';
 import '../../index.js';
 import { parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize.js';
@@ -35,9 +35,13 @@ function useFieldListAdaptor(collector) {
       result["x-reactions"] = item.reactions;
     }
     if (!item.noDecorator) {
+      if (JSON.stringify(item).includes("$deps")) {
+        console.log(item);
+      }
       Object.assign(result, {
         "x-decorator": "FORM_ITEM",
         "x-decorator-props": {
+          fieldItem: deepOmit(item, ["reactions"]),
           span: item.elem_width,
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
@@ -171,7 +175,7 @@ function useFieldListAdaptor(collector) {
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      fieldItem: omit(item, ["reactions"])
+      fieldItem: deepOmit(item, ["reactions"])
     });
     return schema;
   };

package/es/components/form-render/src/hooks/useFormValidator.d.ts

@@ -3,3 +3,4 @@ import { FieldItem } from '../types';
 export declare function useFormValidator(): {
     createValidatorSchema: (fieldItem: FieldItem) => AnyObject[];
 };
+export declare const validateMessageLocale: () => void;

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

@@ -1,7 +1,8 @@
 import { arrayed } from '../../../../shared/utils/index.js';
-import { isString } from 'lodash-es';
+import { once, isString } from 'lodash-es';
 import '../utils/index.js';
 import { isFunction } from '@vueuse/core';
+import { registerValidateLocale } from '@formily/core';
 import { isIdCard } from '../utils/business.js';
 
 function useFormValidator() {
@@ -42,7 +43,11 @@ function useFormValidator() {
   };
   function createValidatorSchema(fieldItem) {
     const rules = [];
-    const { validate: { vali_obj, max_length, message, max_value, min_value, decimal_length } = {}, validator } = fieldItem;
+    const {
+      defined_error_msg,
+      validate: { vali_obj, max_length, min_length, message, max_value, min_value, decimal_length } = {},
+      validator
+    } = fieldItem;
     if (validator) {
       arrayed(validator).forEach((f) => {
         if (!isFunction(f))
@@ -52,6 +57,8 @@ function useFormValidator() {
     }
     if (max_length)
       rules.push({ max: max_length, message });
+    if (min_length)
+      rules.push({ min: min_length, message });
     if (max_value)
       rules.push({ maximum: max_value, message });
     if (min_value)
@@ -66,5 +73,12 @@ function useFormValidator() {
   }
   return { createValidatorSchema };
 }
+const validateMessageLocale = once(() => {
+  registerValidateLocale({
+    "zh-CN": {
+      required: "${alias}\u4E3A\u5FC5\u586B"
+    }
+  });
+});
 
-export { useFormValidator };
+export { useFormValidator, validateMessageLocale };

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -177,6 +177,10 @@ export declare type FieldItem = {
      * 数据源签名
      */
     autograph: string;
+    /**
+     * 合并错误信息
+     */
+    defined_error_msg: string;
     /**
      * 数据类型
      */

package/es/components/form-render/src/utils/index.d.ts

@@ -16,3 +16,4 @@ export declare function presetRequestHandler(res: unknown): any;
 export declare function optionMatcher(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
     keyword?: string;
 }): AnyObject[];
+export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;

package/es/components/form-render/src/utils/index.js

@@ -124,5 +124,14 @@ function optionMatcher(options, input, key, matcherOption = {
     return option[key];
   }
 }
+function validateMessageParser(message, fieldItem) {
+  if (!isString(message) || !message)
+    return "";
+  return message.replace(/\$\{([^}]*)}/g, replacer);
+  function replacer(_, property) {
+    var _a;
+    return (_a = fieldItem[property.trim()]) != null ? _a : "";
+  }
+}
 
-export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler };
+export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, validateMessageParser };

package/es/components/index.js

@@ -47,7 +47,7 @@ export { useFormField } from './form-render/src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './form-render/src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor.js';
 export { useFieldNormalize } from './form-render/src/hooks/useFieldNormalize.js';
-export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
+export { useFormValidator, validateMessageLocale } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';

package/es/components/shortcut-setter/index.d.ts

@@ -132,6 +132,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
+        defined_error_msg?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -134,6 +134,7 @@ declare const _default: import("vue").DefineComponent<{
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         autograph?: string | undefined;
+        defined_error_msg?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("../../../../es/components/form-render").FormRenderer | Record<string, import("../../../../es/components/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;

package/es/shared/utils/index.d.ts

@@ -7,3 +7,4 @@ export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T
 export declare function uuidGenerator(): string;
 export declare const getStringWidth: import("@vueuse/core").UseMemoizedFn<number, [str: string]>;
 export declare const DMZ: AnyObject;
+export declare function deepOmit<T extends AnyObject>(target: T, keys: Array<keyof T>): AnyObject;

package/es/shared/utils/index.js

@@ -1,5 +1,5 @@
 import { useMemoize } from '@vueuse/core';
-import { isArray, isString } from 'lodash-es';
+import { isArray, isString, isObject } from 'lodash-es';
 
 function traverse(target, handler, keys = "children", parent) {
   function stop() {
@@ -94,5 +94,22 @@ const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
   }, 0);
 });
 const DMZ = Object.seal(/* @__PURE__ */ Object.create(null));
+function deepOmit(target, keys) {
+  function search(obj, keys2) {
+    return Object.entries(obj).reduce((result, [k, v]) => {
+      if (keys2.includes(k))
+        return result;
+      if (isArray(v)) {
+        result[k] = v.map((child) => search(child, keys2));
+      } else if (isObject(v)) {
+        result[k] = search(v, keys2);
+      } else {
+        result[k] = v;
+      }
+      return result;
+    }, {});
+  }
+  return search(target, keys);
+}
 
-export { DMZ, arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator };
+export { DMZ, arrayed, deepOmit, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.24-beta.0",
+	"version": "3.1.24-beta.2",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -66,5 +66,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d05d6e707ee1105622da5bac1373cf6d57e2513a"
+	"gitHead": "735a7705ad62257a2127123ad583c4edf048d350"
 }