cnhis-design-vue 3.1.23-beta.15 → 3.1.23-beta.17

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

@@ -20,9 +20,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<FormConfigTextFormatter>;
             required: true;
         };
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
+    }>> & {}>>;
     currentActiveEditField: import("vue").Ref<import("../../../../../shared/types").UndefinedAble<FormConfigItem>>;
     active: () => void;
     headerClassList: import("vue").ComputedRef<(string | {
@@ -122,7 +120,7 @@ declare const _default: import("vue").DefineComponent<{
             modelValue: unknown[];
             componentData: Record<string, any>;
         }>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         fieldItem: {
             type: PropType<FormConfigItem>;
         };
@@ -142,23 +140,21 @@ declare const _default: import("vue").DefineComponent<{
                 type: PropType<FormConfigItem>;
                 required: true;
             };
-        }>> & {
-            [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-        }>>;
+        }>> & {}>>;
         fieldList: import("vue").Ref<FormConfigItem[]>;
         materialList: import("vue").Ref<FormConfigItem[]>;
         remove: () => void;
         CloseCircle: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
         NButton: any;
         NIcon: any;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         fieldItem: {
             type: PropType<FormConfigItem>;
             required: true;
         };
     }>>, {}>;
     bindHover: typeof bindHover;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldItem: {
         type: PropType<FormConfigItem>;
         required: true;

package/es/components/form-config/src/components/renderer/DefaultNode.js

@@ -1,8 +1,8 @@
 import { defineComponent, inject, computed, openBlock, createBlock, unref, mergeProps, withModifiers, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString } from 'vue';
 import { NButton, NEllipsis } from 'naive-ui';
 import CloseButton from './CloseButton.js';
-import { InjectionActiveFieldItem, WidgetTextMap } from '../../constants/index2.js';
-import { bindHover } from '../../utils/index2.js';
+import { InjectionActiveFieldItem, WidgetTextMap } from '../../constants/index.js';
+import { bindHover } from '../../utils/index.js';
 import _export_sfc from '../../../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({

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

@@ -20,9 +20,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<FormConfigTextFormatter>;
             required: true;
         };
-    }>> & {
-        [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-    }>>;
+    }>> & {}>>;
     currentActiveEditField: import("vue").Ref<import("../../../../../shared/types").UndefinedAble<FormConfigItem>>;
     setActiveField: () => void;
     classList: import("vue").ComputedRef<(string | {
@@ -46,23 +44,21 @@ declare const _default: import("vue").DefineComponent<{
                 type: PropType<FormConfigItem>;
                 required: true;
             };
-        }>> & {
-            [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-        }>>;
+        }>> & {}>>;
         fieldList: import("vue").Ref<FormConfigItem[]>;
         materialList: import("vue").Ref<FormConfigItem[]>;
         remove: () => void;
         CloseCircle: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
         NButton: any;
         NIcon: any;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         fieldItem: {
             type: PropType<FormConfigItem>;
             required: true;
         };
     }>>, {}>;
     bindHover: typeof bindHover;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldItem: {
         type: PropType<FormConfigItem>;
         required: true;

package/es/components/form-config/src/constants/index.js

@@ -1 +1,60 @@
-export { EditAbleField, InjectionActiveFieldItem, InjectionFieldList, InjectionMaterialList, WidgetTextMap, isEditOptionConfig, isNotFoldOptionConfig, isNullOptionConfig, isShowOptionConfig, widgetWidthOptionConfig } from './index2.js';
+const WidgetTextMap = /* @__PURE__ */ new Map([
+  ["LINE_BAR", "\u5206\u7EBF\u680F"],
+  ["NEWLINE", "\u5206\u884C\u7B26"]
+]);
+var EditAbleField = /* @__PURE__ */ ((EditAbleField2) => {
+  EditAbleField2["NAME"] = "name";
+  EditAbleField2["NOTES"] = "notes";
+  EditAbleField2["DEFAULT_VALUE"] = "defaultValue";
+  EditAbleField2["LAYOUT_WIDTH_ENUM"] = "layoutWidthEnum";
+  EditAbleField2["DESC"] = "desc";
+  EditAbleField2["DEFAULT_EXPAND"] = "defaultExpand";
+  EditAbleField2["FOLD"] = "fold";
+  EditAbleField2["REQUIRED"] = "required";
+  EditAbleField2["EDITABLE"] = "editable";
+  return EditAbleField2;
+})(EditAbleField || {});
+function widgetWidthOptionConfig() {
+  return {
+    option: [
+      { text: "\u6574\u884C", value: "ALL_LINE" },
+      { text: "\u534A\u884C", value: "HALF_LINE" },
+      { text: "5/6", value: "FIVE_SIX" },
+      { text: "2/3", value: "TWO_THREE" },
+      { text: "1/3", value: "ONE_THREE" },
+      { text: "3/4", value: "THREE_FOUR" },
+      { text: "1/4", value: "ONE_FOUR" },
+      { text: "1/6", value: "ONE_SIX" },
+      { text: "1/8", value: "ONE_EIGHT" }
+    ]
+  };
+}
+function isShowOptionConfig() {
+  return {
+    open: { describe: "\u9ED8\u8BA4\u5C55\u5F00", value: true },
+    close: { describe: "\u9ED8\u8BA4\u6536\u8D77", value: false }
+  };
+}
+function isNotFoldOptionConfig() {
+  return {
+    open: { describe: "\u53EF\u6298\u53E0", value: true },
+    close: { describe: "\u4E0D\u53EF\u6298\u53E0", value: false }
+  };
+}
+function isEditOptionConfig() {
+  return {
+    open: { describe: "\u53EF\u7F16\u8F91", value: true },
+    close: { describe: "\u4E0D\u53EF\u7F16\u8F91", value: false }
+  };
+}
+function isNullOptionConfig() {
+  return {
+    open: { describe: "\u5FC5\u586B", value: true },
+    close: { describe: "\u4E0D\u5FC5\u586B", value: false }
+  };
+}
+const InjectionFieldList = Symbol("InjectionFieldList");
+const InjectionMaterialList = Symbol("InjectionMaterialList");
+const InjectionActiveFieldItem = Symbol("InjectionActiveFieldItem");
+
+export { EditAbleField, InjectionActiveFieldItem, InjectionFieldList, InjectionMaterialList, WidgetTextMap, isEditOptionConfig, isNotFoldOptionConfig, isNullOptionConfig, isShowOptionConfig, widgetWidthOptionConfig };

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

@@ -1,3 +1,3 @@
 export { usePresetRenderer } from './usePresetRenderer.js';
-export { useSortableConfig } from './useSortalbeConfig2.js';
-export { useConfigurationField } from './useConfigurationField2.js';
+export { useSortableConfig } from './useSortalbeConfig.js';
+export { useConfigurationField } from './useConfigurationField.js';

package/es/components/form-config/src/hooks/useConfigurationField.js

@@ -1 +1,54 @@
-export { useConfigurationField } from './useConfigurationField2.js';
+import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig } from '../constants/index.js';
+
+function useConfigurationField() {
+  const fieldMap = /* @__PURE__ */ new Map([
+    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 6, is_null: "0", html_type: "INPUT" }],
+    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 6, html_type: "INPUT" }],
+    [
+      EditAbleField.DEFAULT_VALUE,
+      { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } }
+    ],
+    [
+      EditAbleField.LAYOUT_WIDTH_ENUM,
+      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 6, ...widgetWidthOptionConfig() }
+    ],
+    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 6, html_type: "INPUT", validate: { max_length: 30 } }],
+    [
+      EditAbleField.DEFAULT_EXPAND,
+      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 6, ...isShowOptionConfig() }
+    ],
+    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 6, ...isNotFoldOptionConfig() }],
+    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 6, ...isEditOptionConfig() }],
+    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 6, ...isNullOptionConfig() }]
+  ]);
+  function generateFieldListByKeys(keyList) {
+    return keyList.map((key) => {
+      return { ...fieldMap.get(key), val_key: key };
+    });
+  }
+  function generateFieldListByFieldItem(fieldItem) {
+    const htmlMap = new Map([
+      [
+        "LINE_BAR",
+        [EditAbleField.NAME, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DEFAULT_EXPAND, EditAbleField.FOLD]
+      ],
+      ...["NEWLINE", "COMPLEX", "COMBINATION"].map(
+        (key) => [key, [EditAbleField.NAME, EditAbleField.LAYOUT_WIDTH_ENUM]]
+      )
+    ]);
+    const defaultItems = [
+      EditAbleField.NAME,
+      EditAbleField.DEFAULT_VALUE,
+      EditAbleField.LAYOUT_WIDTH_ENUM,
+      EditAbleField.DESC,
+      EditAbleField.NOTES,
+      EditAbleField.EDITABLE,
+      EditAbleField.REQUIRED
+    ];
+    const keys = htmlMap.get(fieldItem.type) || defaultItems;
+    return generateFieldListByKeys(keys);
+  }
+  return { generateFieldListByKeys, generateFieldListByFieldItem };
+}
+
+export { useConfigurationField };

package/es/components/form-config/src/hooks/useSortalbeConfig.js

@@ -1 +1,27 @@
-export { useSortableConfig } from './useSortalbeConfig2.js';
+function useSortableConfig() {
+  let timer = null;
+  function onChoose({ target, item }) {
+    timer = setTimeout(() => {
+      target.classList.add("is-choosing-area");
+      item.classList.add("is-choosing");
+    }, 200);
+  }
+  function onUnchoose({ from, to, target, item }) {
+    clearTimeout(timer);
+    [from, to, target].forEach((ele) => {
+      ele.classList.remove("is-choosing-area");
+    });
+    item.classList.remove("is-choosing");
+  }
+  let prevTo;
+  function onMove({ to, from }) {
+    prevTo == null ? void 0 : prevTo.classList.remove("is-choosing-area");
+    prevTo = to;
+    to !== from && from.classList.remove("is-choosing-area");
+    to.classList.add("is-choosing-area");
+  }
+  const getCommonConfig = () => ({ onMove, onChoose, onUnchoose, tag: "section", animation: "150", "item-key": "key" });
+  return { getCommonConfig };
+}
+
+export { useSortableConfig };

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

@@ -1 +1,26 @@
-export { bindHover, layoutWidthEnum2Column } from './index2.js';
+import { ref } from 'vue';
+
+function layoutWidthEnum2Column(layoutWidthEnum) {
+  const transferMap = {
+    ALL_LINE: 24,
+    HALF_LINE: 12,
+    FIVE_SIX: 20,
+    TWO_THREE: 16,
+    ONE_THREE: 8,
+    THREE_FOUR: 18,
+    ONE_FOUR: 6,
+    ONE_SIX: 4,
+    ONE_EIGHT: 3
+  };
+  return transferMap[layoutWidthEnum] || 24;
+}
+const hovering = ref();
+function bindHover(fieldItem) {
+  return {
+    onMouseenter: () => hovering.value = fieldItem,
+    onMouseleave: () => hovering.value = void 0,
+    "is-hovering": hovering.value === fieldItem
+  };
+}
+
+export { bindHover, layoutWidthEnum2Column };

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

@@ -1,15 +1,24 @@
-export { default } from './index2.js';
-export { useFieldListAdaptor } from './src/hooks/useFieldListAdaptor2.js';
-export { useFormRequest } from './src/hooks/useFormRequest2.js';
-export { useCommonLog } from './src/hooks/useCommonLog2.js';
-export { useFormField } from './src/hooks/useFormField2.js';
-export { AsyncQueue, useAsyncQueue } from './src/hooks/useAsyncQueue2.js';
-export { useFieldVisitor } from './src/hooks/useFieldVisitor2.js';
-export { useFieldNormalize } from './src/hooks/useFieldNormalize2.js';
-export { useFormValidator } from './src/hooks/useFormValidator2.js';
-export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding2.js';
-export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext2.js';
-export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps2.js';
-export { useAnchor } from './src/hooks/useAnchor2.js';
-export { useFormContext } from './src/hooks/useFormContext2.js';
+import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
+import { safeComponentRegister } from '../../shared/utils/index.js';
+import script from './src/FormRender.js';
+export { useFieldListAdaptor } from './src/hooks/useFieldListAdaptor.js';
+export { useFormRequest } from './src/hooks/useFormRequest.js';
+export { useCommonLog } from './src/hooks/useCommonLog.js';
+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 { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
+export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
+export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';
+export { useAnchor } from './src/hooks/useAnchor.js';
+export { useFormContext } from './src/hooks/useFormContext.js';
 export * from '@formily/core';
+
+const FormRender = script;
+FormRender.install = function(app) {
+  safeComponentRegister(app, FormRender, COMPONENT_NAMESPACE + "FormRender");
+};
+
+export { FormRender as default };

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

@@ -1,17 +1,17 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
-import { arrayed } from '../../../shared/utils/index2.js';
+import { arrayed } from '../../../shared/utils/index.js';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
 import { cloneDeep, isArray } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
-import { FormItemLineBarDepKeyPrepend } from './constants/index2.js';
-import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle2.js';
-import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides2.js';
+import { FormItemLineBarDepKeyPrepend } from './constants/index.js';
+import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
+import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides.js';
 import './utils/index.js';
-import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
-import '../index2.js';
-import { useFieldVisitor } from './hooks/useFieldVisitor2.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
+import '../index.js';
+import { useFieldVisitor } from './hooks/useFieldVisitor.js';
 import '../../../shared/utils/tapable/SyncHook.js';
 import '../../../shared/utils/tapable/SyncBailHook.js';
 import '../../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -23,15 +23,15 @@ import '../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 import '@vueuse/core';
-import { useAnchor } from './hooks/useAnchor2.js';
-import { useFormContext } from './hooks/useFormContext2.js';
+import { useAnchor } from './hooks/useAnchor.js';
+import { useFormContext } from './hooks/useFormContext.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
-import { queryDecorator, queryInput } from './utils/dom2.js';
-import { createObjSchema, getParentLinebar } from './utils/schema2.js';
+import { queryDecorator, queryInput } from './utils/dom.js';
+import { createObjSchema, getParentLinebar } from './utils/schema.js';
 
 const _hoisted_1 = {
   key: 0,
-  style: { "height": "50px" }
+  style: { "height": "54px" }
 };
 const _hoisted_2 = { style: { "white-space": "pre" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -80,7 +80,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     });
-    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props, formModel);
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(
+      props,
+      formModel
+    );
     const scrollbarRef = ref();
     const { schemaAdaptor } = useFieldListAdaptor(businessCollector);
     const parsedSchema = computed(() => {
@@ -93,7 +96,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return createObjSchema({});
     });
-    const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, scrollbarRef, formItemDepsCollector);
+    const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(
+      props,
+      scrollbarRef,
+      formItemDepsCollector
+    );
     watch(parsedSchema, generateAnchorList, { immediate: true });
     async function queryWidget(key, wrapperElement, fieldList) {
       if (!scrollbarRef.value)

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

@@ -10,7 +10,7 @@ export declare const CHECKBOX: import("vue").DefineComponent<{
         default: boolean;
     };
     onChange: {};
-}, () => 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];

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

@@ -2,7 +2,7 @@ import { defineComponent, createVNode } from 'vue';
 import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCheckbox",

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

@@ -1,13 +1,13 @@
 import { defineComponent, ref, computed, watch, inject, createVNode } from 'vue';
 import { isNumber, isArray } from 'lodash-es';
-import '../../../index2.js';
+import '../../../index.js';
 import { useField, RecursionField, connect } from '@formily/vue';
 import { NButton, NIcon } from 'naive-ui';
-import { InjectionBusinessCollector } from '../../constants/index2.js';
+import { InjectionBusinessCollector } from '../../constants/index.js';
 import '../../utils/index.js';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
-import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor2.js';
-import { createObjSchema } from '../../utils/schema2.js';
+import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor.js';
+import { createObjSchema } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCombination",

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

@@ -13,7 +13,7 @@ export declare const COMPLEX: import("vue").DefineComponent<{
         type: PropType<CSSProperties>;
         default: () => {};
     };
-}, () => 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     onChange: {};
     span: {
         type: NumberConstructor;

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

@@ -1,7 +1,7 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import '../../utils/index.js';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -1,12 +1,12 @@
 import { defineComponent, computed, watch, createVNode, mergeProps } from 'vue';
-import { generateTimeFormat } from '../../../../../shared/utils/index2.js';
+import { generateTimeFormat } from '../../../../../shared/utils/index.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/useCommonInjection2.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import '../../utils/index.js';
-import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -2,7 +2,7 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
     label: StringConstructor;
     propertyKey: StringConstructor;
     annotation: {};
-}, () => 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     label: StringConstructor;
     propertyKey: StringConstructor;
     annotation: {};

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

@@ -2,10 +2,10 @@ 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/index2.js';
-import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index2.js';
+import Annotation from '../../../../annotation-edit/index.js';
+import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
 import '../../utils/index.js';
-import { dotEscape } from '../../utils/schema2.js';
+import { dotEscape } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -3,7 +3,7 @@ export * from './select';
 export * from './formItem';
 export * from './textarea';
 export * from './inputNumber';
-export * from './linebar';
+export * from './lineBar';
 export * from './inputGroup';
 export * from './date';
 export * from './levelSearchCascade';

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

@@ -3,8 +3,8 @@ 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 { LINEBAR } from './lineBar/index.js';
+export { INPUT_GROUP } from './inputGroup.js';
 export { DATE } from './date.js';
 export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';

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

@@ -1,9 +1,9 @@
 import { defineComponent, computed, createVNode } from 'vue';
-import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { createInputSlot } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
-import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormInput",
@@ -27,7 +27,13 @@ const script = defineComponent({
       set: (v) => emit("update:value", v)
     });
     const key = useCommonInjection().injectValueBindKey(valueRef);
-    const _slots = createInputSlot(props);
+    const _slots = createInputSlot(props, (v) => {
+      return [createVNode("i", {
+        "style": {
+          color: "rgba(33,33,33,.4)"
+        }
+      }, [v])];
+    });
     return () => {
       return createVNode(NInput, {
         "key": key.value,

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

@@ -1 +1,11 @@
-export { INPUT_GROUP } from './inputGroup2.js';
+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.d.ts

@@ -14,7 +14,7 @@ export declare const INPUT_NUMBER: import("vue").DefineComponent<{
     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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: (NumberConstructor | StringConstructor)[];
     };

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/useCommonInjection2.js';
+import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { createInputSlot, parseNumberFromMaybeString } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInputNumber } from 'naive-ui';
-import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema2.js';
+import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -1 +1,35 @@
-export { useDeepValidate } from './useDeepValidate2.js';
+import { isField } from '@formily/core';
+import { flatten } from 'lodash-es';
+import { onMounted } from 'vue';
+import '../../../../../index.js';
+import { arrayed } from '../../../../../../../shared/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 };