cnhis-design-vue 3.1.18-beta.0 → 3.1.18-beta.10

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

@@ -1,15 +1,15 @@
 import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual } from 'lodash-es';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue } from '../../constants/index.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
+import { InjectAsyncQueue } from '../../constants/index2.js';
 import '@vueuse/core';
-import '../../../index.js';
+import '../../../index2.js';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
-import { useFormField } from '../../hooks/useFormField.js';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
+import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
 import '../../../../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -27,7 +27,7 @@ import './formItem.js';
 import './textarea.js';
 import './inputNumber.js';
 import './linebar.js';
-import './inputGroup.js';
+import './inputGroup2.js';
 import './date.js';
 import './jsonCombination/index.js';
 import './combination.js';
@@ -203,6 +203,6 @@ const script = defineComponent({
 });
 const SEARCH_CASCADE = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { SEARCH_CASCADE };

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

@@ -3,7 +3,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
 
@@ -40,6 +40,6 @@ const script = defineComponent({
 });
 const CHECKBOX = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { CHECKBOX };

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

@@ -1,15 +1,15 @@
-import { defineComponent, ref, computed, inject, createVNode } from 'vue';
-import { isNumber } from 'lodash-es';
-import '../../../index.js';
+import { defineComponent, ref, computed, watch, inject, createVNode } from 'vue';
+import { isNumber, isArray } from 'lodash-es';
+import '../../../index2.js';
 import { useField, RecursionField, connect } from '@formily/vue';
 import { NButton, NIcon } from 'naive-ui';
-import { InjectionBusinessCollector } from '../../constants/index.js';
+import { InjectionBusinessCollector } from '../../constants/index2.js';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { createObjSchema } from '../../utils/schema.js';
+import { createObjSchema } from '../../utils/schema2.js';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
-import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor.js';
+import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor2.js';
 
 const script = defineComponent({
   name: "FormCombination",
@@ -43,6 +43,13 @@ const script = defineComponent({
         return 0;
       return ~~props.maxGroupNum;
     });
+    watch(() => props.value, (value) => {
+      if (!isArray(value))
+        return;
+      currentGroupNum.value = Math.min(Math.max(value.length, 1), maxGroupNum.value);
+    }, {
+      immediate: true
+    });
     function addGroup() {
       currentGroupNum.value++;
     }

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

@@ -4,7 +4,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {

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

@@ -1,14 +1,14 @@
 import { defineComponent, computed, watch, createVNode, mergeProps } from 'vue';
-import { generateTimeFormat } from '../../../../../shared/utils/index.js';
+import { generateTimeFormat } from '../../../../../shared/utils/index2.js';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
 import { format } from 'date-fns';
 import { NDatePicker } from 'naive-ui';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -112,6 +112,6 @@ const script = defineComponent({
     }), null);
   }
 });
-const DATE = connect(script, mapProps(assignUpdateValue));
+const DATE = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { DATE };

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

@@ -2,13 +2,13 @@ import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
 import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
-import Annotation from '../../../../annotation-edit/index.js';
-import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
+import Annotation from '../../../../annotation-edit/index2.js';
+import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index2.js';
 import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { dotEscape } from '../../utils/schema.js';
+import { dotEscape } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {

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

@@ -4,7 +4,7 @@ export { FORM_ITEM } from './formItem.js';
 export { TEXTAREA } from './textarea.js';
 export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
-export { INPUT_GROUP } from './inputGroup.js';
+export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
 export { SEARCH_CASCADE } from './cascader.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';

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

@@ -0,0 +1,18 @@
+export { INPUT } from './input.js';
+export { SELECT } from './select.js';
+export { FORM_ITEM } from './formItem.js';
+export { TEXTAREA } from './textarea.js';
+export { INPUT_NUMBER } from './inputNumber.js';
+export { LINEBAR } from './linebar.js';
+export { INPUT_GROUP } from './inputGroup2.js';
+export { DATE } from './date.js';
+export { SEARCH_CASCADE } from './cascader.js';
+export { JSON_COMBINATION } from './jsonCombination/index.js';
+export { COMBINATION } from './combination.js';
+export { CHECKBOX } from './checkbox.js';
+export { SWITCH } from './switch.js';
+export { RADIO } from './radio.js';
+export { LABEL } from './labelSelect.js';
+export { SLIDER } from './slider.js';
+export { COMPLEX } from './complex.js';
+export { BUTTON, TEXT } from './simpleComponent.js';

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

@@ -1,15 +1,23 @@
 export declare const INPUT: import("vue").DefineComponent<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {
+        type: StringConstructor;
+    };
     prefix: {
         type: StringConstructor;
     };
     suffix: {
         type: StringConstructor;
     };
-}>>, {}>;
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {}>;

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

@@ -1,12 +1,16 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
+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/schema.js';
+import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormInput",
   props: {
+    value: {
+      type: String
+    },
     prefix: {
       type: String
     },
@@ -14,10 +18,22 @@ const script = defineComponent({
       type: String
     }
   },
-  setup(props) {
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get: () => props.value,
+      set: (v) => emit("update:value", v)
+    });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     const _slots = createInputSlot(props);
     return () => {
-      return createVNode(NInput, null, _slots.value);
+      return createVNode(NInput, {
+        "key": key.value,
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, _slots.value);
     };
   }
 });

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

@@ -1,8 +1 @@
-import { connect, mapProps } from '@formily/vue';
-import { NInputGroup } from 'naive-ui';
-
-const INPUT_GROUP = connect(NInputGroup, mapProps((props) => {
-  return { style: { "--column": props.span }, class: "form-render__inputGroup" };
-}));
-
-export { INPUT_GROUP };
+export { INPUT_GROUP } from './inputGroup2.js';

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

@@ -0,0 +1,8 @@
+import { connect, mapProps } from '@formily/vue';
+import { NInputGroup } from 'naive-ui';
+
+const INPUT_GROUP = connect(NInputGroup, mapProps((props) => {
+  return { style: { "--column": props.span }, class: "form-render__inputGroup" };
+}));
+
+export { INPUT_GROUP };

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

@@ -1,10 +1,10 @@
 import { defineComponent, watch, computed, createVNode } from 'vue';
 import { isString, isNumber } from 'lodash-es';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
+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/schema.js';
+import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -39,8 +39,10 @@ const script = defineComponent({
         return (_a = props.onChange) == null ? void 0 : _a.call(props, v);
       }
     });
+    const key = useCommonInjection().injectValueBindKey(valueRef);
     return () => {
       return createVNode(NInputNumber, {
+        "key": key.value,
         "value": valueRef.value,
         "onUpdate:value": ($event) => valueRef.value = $event,
         "show-button": false

package/es/components/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate.js

@@ -1,33 +1 @@
-import { isField } from '@formily/core';
-import { flatten } from 'lodash-es';
-import { onMounted } from 'vue';
-import '../../../../../index.js';
-import { arrayed } from '../../../../utils/index.js';
-import { useFormField } from '../../../../hooks/useFormField.js';
-
-function useDeepValidate() {
-  function bindDeepValidate(formRenderRefs) {
-    const { field } = useFormField();
-    onMounted(() => {
-      if (!isField(field.value))
-        return;
-      const tempValidator = field.value.validator;
-      field.value.validator = [
-        {
-          async validator() {
-            return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then((resultList) => {
-              const rejected = resultList.filter((res) => res.status === "rejected");
-              if (!rejected.length)
-                return "";
-              return flatten(rejected.map((res) => res.reason));
-            });
-          }
-        },
-        ...tempValidator ? arrayed(tempValidator) : []
-      ];
-    });
-  }
-  return { bindDeepValidate };
-}
-
-export { useDeepValidate };
+export { useDeepValidate } from './useDeepValidate2.js';

package/es/components/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate2.js

@@ -0,0 +1,33 @@
+import { isField } from '@formily/core';
+import { flatten } from 'lodash-es';
+import { onMounted } from 'vue';
+import '../../../../../index2.js';
+import { arrayed } from '../../../../utils/index.js';
+import { useFormField } from '../../../../hooks/useFormField2.js';
+
+function useDeepValidate() {
+  function bindDeepValidate(formRenderRefs) {
+    const { field } = useFormField();
+    onMounted(() => {
+      if (!isField(field.value))
+        return;
+      const tempValidator = field.value.validator;
+      field.value.validator = [
+        {
+          async validator() {
+            return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then((resultList) => {
+              const rejected = resultList.filter((res) => res.status === "rejected");
+              if (!rejected.length)
+                return "";
+              return flatten(rejected.map((res) => res.reason));
+            });
+          }
+        },
+        ...tempValidator ? arrayed(tempValidator) : []
+      ];
+    });
+  }
+  return { bindDeepValidate };
+}
+
+export { useDeepValidate };

package/es/components/form-render/src/components/renderer/jsonCombination/index.js

@@ -3,13 +3,13 @@ import { isField } from '@formily/core';
 import { Path } from '@formily/path';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
 import { isNumber, isArray, isEqual } from 'lodash-es';
-import { useDeepValidate } from './hooks/useDeepValidate.js';
+import { useDeepValidate } from './hooks/useDeepValidate2.js';
 import { formRenderLog, mergeDeepProperties } from '../../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton, NIcon } from 'naive-ui';
 import script$1 from '../../../FormRender.js';
-import { assignUpdateValue } from '../../../utils/schema.js';
+import { assignUpdateValue } from '../../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormJsonCombination",
@@ -36,7 +36,7 @@ const script = defineComponent({
   setup(props, {
     emit
   }) {
-    formRenderLog("\u5F53\u524DCOMBINATION\u63A7\u4EF6\u4E3Ajson\u6A21\u5F0F,\u63A8\u8350\u4F7F\u7528\u975Ejson\u6A21\u5F0F,FieldItem.jsonCombination=false", "warn");
+    formRenderLog("\u5F53\u524DCOMBINATION\u63A7\u4EF6\u4E3Ajson\u6A21\u5F0F,\u63A8\u8350\u4F7F\u7528\u975Ejson\u6A21\u5F0F,FieldItem.jsonCombination=false");
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(combinationData.value));
     }, 300);

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

@@ -34,7 +34,7 @@ export declare const LINEBAR: import("vue").DefineComponent<{
     };
 }>>, {
     disabled: boolean;
-    title: string;
     show: boolean;
+    title: string;
     line: boolean;
 }>;

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

@@ -1,9 +1,9 @@
 import { defineComponent, ref, inject, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NDivider, NCollapseTransition } from 'naive-ui';
-import '../../../index.js';
-import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../constants/index.js';
-import { useFormField } from '../../hooks/useFormField.js';
+import '../../../index2.js';
+import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../constants/index2.js';
+import { useFormField } from '../../hooks/useFormField2.js';
 
 const script = defineComponent({
   name: "FormCollapse",

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

@@ -5,7 +5,7 @@ import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -64,6 +64,6 @@ const script = defineComponent({
 });
 const RADIO = connect(script, mapProps({
   dataSource: "options"
-}, assignUpdateValue));
+}, assignUpdateValue, assignValueBindKey));
 
 export { RADIO };

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

@@ -1,12 +1,12 @@
 import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { cloneDeep, isEqual, isString } from 'lodash-es';
-import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
+import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
 import '@vueuse/core';
-import '../../../index.js';
+import '../../../index2.js';
 import { formRenderLog } from '../../utils/index.js';
-import { useFormField } from '../../hooks/useFormField.js';
+import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
 import '../../../../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -24,7 +24,7 @@ import './formItem.js';
 import './textarea.js';
 import './inputNumber.js';
 import './linebar.js';
-import './inputGroup.js';
+import './inputGroup2.js';
 import './date.js';
 import './cascader.js';
 import './jsonCombination/index.js';
@@ -37,7 +37,7 @@ import './slider.js';
 import './complex.js';
 import './simpleComponent.js';
 import { NSelect } from 'naive-ui';
-import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -95,9 +95,9 @@ const script = defineComponent({
       try {
         remoteOptions.value = await asyncQueue.addAsync(await createParams(configFor(props), field.value, fieldKey.value));
       } catch (e) {
-        isString(e) && formRenderLog(e, "warn");
+        isString(e) && formRenderLog(e);
       }
-      async function createParams(config, field2, key) {
+      async function createParams(config, field2, key2) {
         const _params = {};
         try {
           traverseDependKey(config.dependKey, (dependKey, valueKey2, required) => {
@@ -115,7 +115,7 @@ const script = defineComponent({
         return {
           ...config,
           params: Object.assign({}, config.params, _params),
-          key
+          key: key2
         };
       }
       function configFor(target) {
@@ -162,10 +162,12 @@ const script = defineComponent({
     });
     const {
       injectValueValidate,
-      injectValueWatchFromEmpty
+      injectValueWatchFromEmpty,
+      injectValueBindKey
     } = useCommonInjection();
     injectValueWatchFromEmpty(valueRef, fetchData);
     injectValueValidate(valueRef);
+    const key = injectValueBindKey(valueRef);
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -175,6 +177,7 @@ const script = defineComponent({
       };
     }
     return () => createVNode(NSelect, {
+      "key": key.value,
       "remote": true,
       "filterable": true,
       "value": valueRef.value,

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

@@ -2,7 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
 import { parseNumberFromMaybeString } from '../../utils/index.js';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   props: {
@@ -24,7 +24,7 @@ const script = defineComponent({
     }, null);
   }
 });
-const SLIDER = connect(script, mapProps((props, field) => {
+const SLIDER = connect(script, mapProps(assignUpdateValue, (props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {
@@ -33,6 +33,6 @@ const SLIDER = connect(script, mapProps((props, field) => {
     }, {});
   }
   return _props;
-}));
+}, assignValueBindKey));
 
 export { SLIDER };

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

@@ -4,7 +4,7 @@ import '@formily/path';
 import '@vue/shared';
 import 'lodash-es';
 import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 import { connect, mapProps } from '@formily/vue';
 
 const script = defineComponent({
@@ -46,6 +46,6 @@ const script = defineComponent({
     };
   }
 });
-const SWITCH = connect(script, mapProps(assignUpdateValue));
+const SWITCH = connect(script, mapProps(assignUpdateValue, assignValueBindKey));
 
 export { SWITCH };