cnhis-design-vue 3.1.22-beta.8 → 3.1.22-beta.9

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

@@ -38,7 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NCascader } from 'naive-ui';
-import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCascader",
@@ -146,7 +146,7 @@ const script = defineComponent({
       function notNeedToFetchData(props2, option2) {
         return !configFor(props2) || !option2 && remoteOptions.value || deepFor(option2) >= deepFor(props2) - 1;
       }
-      function createRequestParams(deep, config, key, option2) {
+      function createRequestParams(deep, config, key2, option2) {
         const params = {
           lvlnr: deep + 1 + ""
         };
@@ -158,7 +158,7 @@ const script = defineComponent({
         return {
           params,
           ...config,
-          key
+          key: key2
         };
       }
       function getOptionChain(option2) {
@@ -189,7 +189,8 @@ const script = defineComponent({
     }
     const {
       injectValueValidate,
-      injectValueWatchFromEmpty
+      injectValueWatchFromEmpty,
+      injectValueBindKey
     } = useCommonInjection();
     injectValueWatchFromEmpty(() => props.value, fetchData);
     injectValueValidate(() => props.value);
@@ -207,7 +208,7 @@ const script = defineComponent({
     const parsedOptions = computed(() => {
       return remoteOptions.value || props.options || [];
     });
-    function focusDecorator(onFocus) {
+    function visitedDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
           field.value.visited = true;
@@ -216,8 +217,10 @@ const script = defineComponent({
       };
     }
     const remote = computed(() => !props.filterable);
+    const key = injectValueBindKey(valueRef);
     return () => {
       return createVNode(NCascader, {
+        "key": key.value,
         "remote": remote.value,
         "filterable": props.filterable,
         "checkStrategy": "child",
@@ -229,13 +232,13 @@ const script = defineComponent({
         "valueField": valueKey.value,
         "options": parsedOptions.value,
         "onLoad": fetchData,
-        "onFocus": focusDecorator(props.onFocus)
+        "onFocus": visitedDecorator(props.onFocus)
       }, slots);
     };
   }
 });
 const SEARCH_CASCADE = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue, assignValueBindKey));
+}, assignUpdateValue));
 
 export { SEARCH_CASCADE };

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

@@ -6,7 +6,7 @@ import { format } from 'date-fns';
 import { NDatePicker } from 'naive-ui';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import '../../utils/index.js';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -26,7 +26,11 @@ const script = defineComponent({
   setup(props, {
     emit
   }) {
-    useCommonInjection().injectValueValidate(() => props.value);
+    const {
+      injectValueValidate,
+      injectValueBindKey
+    } = useCommonInjection();
+    injectValueValidate(() => props.value);
     function minCurrentDate() {
       var _a;
       return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
@@ -115,12 +119,15 @@ const script = defineComponent({
       get: () => formatDate(props.value),
       set: (value) => emit("update:value", value)
     });
-    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, formatConfig.value, {
+    const key = injectValueBindKey(valueRef);
+    return () => createVNode(NDatePicker, mergeProps({
+      "key": key.value
+    }, validateConfig.value, formatConfig.value, {
       "formatted-value": valueRef.value,
       "onUpdate:formatted-value": ($event) => valueRef.value = $event
     }), null);
   }
 });
-const DATE = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
+const DATE = connect(script, mapProps(assignUpdateValue, assignClearBindVisited));
 
 export { DATE };

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

@@ -3,7 +3,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { createInputSlot } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormInput",
@@ -41,6 +41,6 @@ const INPUT = connect(script, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);
   _props.allowInput = (value) => !value.startsWith(" ") && !value.endsWith(" ");
   return _props;
-}));
+}, assignClearBindVisited));
 
 export { INPUT };

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

@@ -4,7 +4,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { createInputSlot, parseNumberFromMaybeString } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInputNumber } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -50,6 +50,6 @@ const script = defineComponent({
     };
   }
 });
-const INPUT_NUMBER = connect(script, mapProps(assignUpdateValue));
+const INPUT_NUMBER = connect(script, mapProps(assignUpdateValue, assignClearBindVisited));
 
 export { INPUT_NUMBER };

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

@@ -39,7 +39,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import { NSelect } from 'naive-ui';
-import { focusDecorator, assignUpdateValue } from '../../utils/schema2.js';
+import { visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSearch",
@@ -157,10 +157,10 @@ const script = defineComponent({
       "options": parsedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": focusDecorator(field, props.onFocus)
+      "onFocus": visitedDecorator(field, props.onFocus)
     }, slots);
   }
 });
-const SEARCH = connect(script, mapProps(assignUpdateValue));
+const SEARCH = connect(script, mapProps(assignUpdateValue, assignClearBindVisited));
 
 export { SEARCH };

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

@@ -38,7 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NSelect } from 'naive-ui';
-import { traverseDependKey, focusDecorator, assignUpdateValue } from '../../utils/schema2.js';
+import { traverseDependKey, visitedDecorator, assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -174,12 +174,12 @@ const script = defineComponent({
       "options": parsedOptions.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
-      "onFocus": focusDecorator(field, props.onFocus)
+      "onFocus": visitedDecorator(field, props.onFocus)
     }, slots);
   }
 });
 const SELECT = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignClearBindVisited));
 
 export { SELECT };

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

@@ -3,7 +3,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormTextarea",
@@ -31,6 +31,6 @@ const script = defineComponent({
     };
   }
 });
-const TEXTAREA = connect(script, mapProps(assignUpdateValue));
+const TEXTAREA = connect(script, mapProps(assignUpdateValue, assignClearBindVisited));
 
 export { TEXTAREA };

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

@@ -7,9 +7,13 @@ function useCommonInjection() {
   function injectValueValidate(traverser) {
     const { field } = useFormField();
     watch(traverser, () => {
-      var _a, _b;
+      var _a, _b, _c;
       try {
-        isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+        if (!isField(field.value))
+          return;
+        if (!field.value.visited && !((_a = field.value.selfErrors) == null ? void 0 : _a.length))
+          return;
+        (_c = (_b = field.value).validate) == null ? void 0 : _c.call(_b);
       } catch (e) {
       }
     });

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

@@ -17,6 +17,9 @@ export declare function assignUpdateValue(props: AnyObject, field: GeneralField)
 export declare function assignValueBindKey(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
+export declare function assignClearBindVisited(props: AnyObject, field: GeneralField): {
+    [x: string]: any;
+};
 export declare function createObjSchema(properties: Record<string, ISchema>): {
     type: string;
     properties: Record<string, import("@formily/json-schema/esm/types").Stringify<{
@@ -77,4 +80,4 @@ export declare function createObjSchema(properties: Record<string, ISchema>): {
         "x-compile-omitted"?: string[] | undefined;
     }>>;
 };
-export declare function focusDecorator(field: Ref<GeneralField>, onFocus?: Func): (...args: unknown[]) => any;
+export declare function visitedDecorator(field: Ref<GeneralField>, onFocus?: Func): (...args: unknown[]) => any;

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

@@ -1 +1 @@
-export { assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, focusDecorator, getParentLinebar, traverseDependKey, traverseSchema } from './schema2.js';
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './schema2.js';

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

@@ -86,10 +86,17 @@ function assignValueBindKey(props, field) {
   }
   return _props;
 }
+function assignClearBindVisited(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    _props.onClear = () => field.visited = true;
+  }
+  return _props;
+}
 function createObjSchema(properties) {
   return { type: "object", properties };
 }
-function focusDecorator(field, onFocus) {
+function visitedDecorator(field, onFocus) {
   return (...args) => {
     if (isField(field.value)) {
       field.value.visited = true;
@@ -98,4 +105,4 @@ function focusDecorator(field, onFocus) {
   };
 }
 
-export { assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, focusDecorator, getParentLinebar, traverseDependKey, traverseSchema };
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator };