cnhis-design-vue 3.1.27-beta.4 → 3.1.27-beta.6

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

@@ -1,11 +1,12 @@
-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/index.js';
+import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, withKeys, withModifiers, toDisplayString, nextTick } from 'vue';
+import { arrayed, findAncestor } from '../../../shared/utils/index.js';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
+import { Path } from '@formily/path';
 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/index.js';
+import { NESTED_FORM_ITEM_TYPE, FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides.js';
 import { validateMessageParser, combineExtendKey, splitExtendKey } from './utils/index.js';
@@ -27,14 +28,15 @@ import '@vueuse/core';
 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/dom.js';
+import { queryDecorator, queryInput, findNextWidget } from './utils/dom.js';
 import { createObjSchema, getParentLinebar } from './utils/schema.js';
 
 const _hoisted_1 = {
   key: 0,
   style: { "height": "54px" }
 };
-const _hoisted_2 = { style: { "white-space": "pre" } };
+const _hoisted_2 = ["onKeydownCapture"];
+const _hoisted_3 = { style: { "white-space": "pre" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FormRender",
   props: {
@@ -56,7 +58,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     consumer: { type: Boolean, default: false },
     uuid: { type: String },
     lifeCycle: { type: Object },
-    requestInstance: { type: Object }
+    requestInstance: { type: Object },
+    enterToNextWidget: { type: Boolean, default: true }
   },
   emits: [
     "formChange"
@@ -87,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props,
       formModel
     );
-    const scrollbarRef = ref();
+    const formRenderRef = ref();
     const { schemaAdaptor } = useFieldListAdaptor(businessCollector);
     let _fieldList = props.fieldList || [];
     const parsedSchema = computed(() => {
@@ -102,12 +105,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(
       props,
-      scrollbarRef,
+      formRenderRef,
       formItemDepsCollector
     );
     watch(parsedSchema, generateAnchorList, { immediate: true });
+    function onKeydown(event) {
+      if (!props.enterToNextWidget || !formRenderRef.value)
+        return;
+      const ancestorFormItem = findAncestor(
+        event.target,
+        (ele) => ele.classList.contains("form-render__formItem")
+      );
+      if (!ancestorFormItem)
+        return;
+      const selector = `.form-render__formItem${NESTED_FORM_ITEM_TYPE.map((type) => `:not([widget-type=${type}])`).join("")}`;
+      const formItemElements = Array.from(formRenderRef.value.querySelectorAll(selector));
+      const formItemIndex = formItemElements.findIndex((ele) => ele.id === ancestorFormItem.id);
+      if (!~formItemIndex)
+        return;
+      const nextWidget = findNextWidget(formItemElements, formItemIndex, event.target);
+      if (!nextWidget)
+        return;
+      setTimeout(() => nextWidget.focus());
+    }
     async function queryWidget(key, wrapperElement, fieldList) {
-      if (!scrollbarRef.value)
+      if (!formRenderRef.value)
         return createResult();
       const decoratorElement = queryDecorator(key, wrapperElement, formUUID);
       if (decoratorElement)
@@ -150,7 +172,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const messages = info.messages.map(
             (message) => errMessageNormalize(message, pattern.get("decoratorProps"))
           );
-          const decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
+          const decoratorElement = queryDecorator(info.path, formRenderRef.value, formUUID);
           return { ...info, messages, title, decoratorElement, ...queryInput(info.decoratorElement) };
         }
         function errMessageNormalize(message, decoratorProps) {
@@ -172,7 +194,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.setFieldState("*", (state) => {
           if (!isField(state))
             return;
-          state.value = values[state.path.toString()];
+          state.value = Path.getIn(values, state.path);
         });
       },
       setFieldState(path, handler) {
@@ -182,7 +204,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.reset(path);
       },
       async queryWidget(key) {
-        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, _fieldList) : null;
+        return formRenderRef.value ? await queryWidget(key, formRenderRef.value, _fieldList) : null;
       },
       async reload() {
         console.error("reload function is abstract,it should be overwrite!");
@@ -217,23 +239,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createElementVNode("section", {
                 class: "form-render__wrapper",
                 style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
-                ref_key: "scrollbarRef",
-                ref: scrollbarRef,
-                onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+                ref_key: "formRenderRef",
+                ref: formRenderRef,
+                onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args)),
+                onKeydownCapture: withKeys(withModifiers(onKeydown, ["prevent"]), ["enter"])
               }, [
                 createVNode(unref(FormProvider), { form: unref(formModel) }, {
                   default: withCtx(() => [
                     createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"]),
                     __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
                       default: withCtx(({ form }) => [
-                        createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                        createElementVNode("div", _hoisted_3, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
                       ]),
                       _: 1
                     })) : createCommentVNode("v-if", true)
                   ]),
                   _: 1
                 }, 8, ["form"])
-              ], 36)
+              ], 44, _hoisted_2)
             ]),
             _: 1
           }, 8, ["theme-overrides"])

package/es/components/form-render/src/FormRender.vue.d.ts

@@ -119,6 +119,10 @@ declare const _default: import("vue").DefineComponent<{
     requestInstance: {
         type: PropType<RequestInstance>;
     };
+    enterToNextWidget: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -237,6 +241,10 @@ declare const _default: import("vue").DefineComponent<{
         requestInstance: {
             type: PropType<RequestInstance>;
         };
+        enterToNextWidget: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -250,7 +258,7 @@ declare const _default: import("vue").DefineComponent<{
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;
     changeContextCollector: import("./hooks").ContextCollector;
     formUUID: string;
-    scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+    formRenderRef: import("vue").Ref<HTMLElement | undefined>;
     schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
@@ -430,6 +438,7 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<string | undefined>;
     onScroll: () => void;
+    onKeydown: (event: KeyboardEvent) => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
         widgetElementList: HTMLInputElement[];
@@ -610,6 +619,10 @@ declare const _default: import("vue").DefineComponent<{
     requestInstance: {
         type: PropType<RequestInstance>;
     };
+    enterToNextWidget: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {
@@ -621,5 +634,6 @@ declare const _default: import("vue").DefineComponent<{
     parallelism: number;
     scope: AnyObject;
     consumer: boolean;
+    enterToNextWidget: boolean;
 }>;
 export default _default;

package/es/components/form-render/src/FormRenderWrapper.vue.d.ts

@@ -122,6 +122,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         requestInstance: {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
+        enterToNextWidget: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
@@ -240,6 +244,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             requestInstance: {
                 type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
             };
+            enterToNextWidget: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
@@ -253,7 +261,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         formItemDepsCollector: import("../../../../es/components/form-render").FormItemDepsCollector;
         changeContextCollector: import("../../../../es/components/form-render").ContextCollector;
         formUUID: string;
-        scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+        formRenderRef: import("vue").Ref<HTMLElement | undefined>;
         schemaAdaptor: (fieldList: import("../../../../es/components/form-render").FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
             [key: `x-${string}`]: any;
@@ -433,6 +441,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }[]>;
         formHeight: import("vue").ComputedRef<string | undefined>;
         onScroll: () => void;
+        onKeydown: (event: KeyboardEvent) => void;
         queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("../../../../es/components/form-render").FieldItem[]) => Promise<{
             widgetElement: HTMLInputElement | null | undefined;
             widgetElementList: HTMLInputElement[];
@@ -613,6 +622,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         requestInstance: {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
+        enterToNextWidget: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }, {
@@ -624,6 +637,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         parallelism: number;
         scope: import("../../../shared/types").AnyObject;
         consumer: boolean;
+        enterToNextWidget: boolean;
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

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

@@ -1,9 +1,13 @@
 export declare const FORM_ITEM: import("vue").DefineComponent<{
     label: StringConstructor;
     propertyKey: StringConstructor;
+    span: NumberConstructor;
     annotation: {};
+    fieldItem: {};
 }, () => 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;
+    span: NumberConstructor;
     annotation: {};
+    fieldItem: {};
 }>>, {}>;

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

@@ -1,18 +1,21 @@
-import { defineComponent, inject, computed, createVNode } from 'vue';
+import { defineComponent, inject, computed, createVNode, mergeProps } 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 '../../../index.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
-import { validateMessageParser } from '../../utils/index.js';
 import { dotEscape } from '../../utils/schema.js';
+import { validateMessageParser } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {
     label: String,
     propertyKey: String,
-    annotation: {}
+    span: Number,
+    annotation: {},
+    fieldItem: {}
   },
   setup(props, {
     slots
@@ -55,9 +58,15 @@ const script = defineComponent({
         }]
       }, [props.label]), showAnnotation.value ? renderAnnotation() : null]) : null;
     }
-    return () => createVNode(NFormItem, {
-      id: id.value
+    return () => createVNode(NFormItem, mergeProps({
+      "class": "form-render__formItem",
+      "style": {
+        "--form-item-column": props.span
+      }
     }, {
+      id: id.value,
+      "widget-type": field.value.componentType
+    }), {
       ...slots,
       label: renderLabel
     });
@@ -71,10 +80,6 @@ const FORM_ITEM = connect(script, mapProps({
     ...props,
     fieldItem: void 0,
     required: isVoidField(field) ? void 0 : field.required,
-    class: "form-render__formItem",
-    style: {
-      "--form-item-column": props.span
-    },
     feedback,
     "validation-status": feedback ? "error" : void 0
   };

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

@@ -1,7 +1,7 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
 import { isEqual, isString, isEmpty, isFunction, omit } from 'lodash-es';
 import '../../../index.js';
-import { InjectAsyncQueue } from '../../constants/index.js';
+import { InjectionAsyncQueue } from '../../constants/index.js';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import { formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -68,7 +68,7 @@ const script = defineComponent({
       var _a;
       return ((_a = props.wordbook) == null ? void 0 : _a.level_num) || Infinity;
     });
-    const asyncQueue = inject(InjectAsyncQueue);
+    const asyncQueue = inject(InjectionAsyncQueue);
     const {
       getSearchRequestInfo
     } = useFormRequest();

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

@@ -2,7 +2,7 @@ import { defineComponent, ref, computed, inject, watch, createVNode, nextTick }
 import { isField } from '@formily/core';
 import { isEqual, isArray } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue, InjectionFormUUID } from '../../constants/index.js';
+import { InjectionAsyncQueue, InjectionFormUUID } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
 import '../../utils/index.js';
@@ -91,7 +91,7 @@ const script = defineComponent({
         };
       }
     }
-    const asyncQueue = inject(InjectAsyncQueue);
+    const asyncQueue = inject(InjectionAsyncQueue);
     async function fetchData(option) {
       props.filterable ? await fetchFullData() : await fetchGradeData(option);
       await syncPosition();

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

@@ -3,7 +3,7 @@ import { isField } from '@formily/core';
 import { useDebounceFn } from '@vueuse/core';
 import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { InjectionAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
 import { formRenderLog, optionMatcher } from '../../utils/index.js';
@@ -74,7 +74,7 @@ const script = defineComponent({
       field,
       fieldKey
     } = useFormField();
-    const asyncQueue = inject(InjectAsyncQueue);
+    const asyncQueue = inject(InjectionAsyncQueue);
     const fetchData = useDebounceFn(async function(content) {
       lastSearch.value = content || "";
       if (!configFor(props)) {

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

@@ -3,7 +3,7 @@ import { ContextCollector } from '../../../../../es/components/form-render/src/h
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
 import { Component, InjectionKey, WritableComputedRef } from 'vue';
-export declare const InjectAsyncQueue: InjectionKey<FormAsyncQueue>;
+export declare const InjectionAsyncQueue: InjectionKey<FormAsyncQueue>;
 export declare const InjectionSchemaField: InjectionKey<Component>;
 export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>;
 export declare const InjectionChangeContextCollector: InjectionKey<ContextCollector>;
@@ -39,3 +39,4 @@ export declare enum FIELD_AGE_UNIT {
     WEEK = "W",
     MINUTE = "N"
 }
+export declare const NESTED_FORM_ITEM_TYPE: string[];

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

@@ -1,4 +1,4 @@
-const InjectAsyncQueue = Symbol("InjectAsyncQueue");
+const InjectionAsyncQueue = Symbol("InjectionAsyncQueue");
 const InjectionSchemaField = Symbol("InjectionSchemaField");
 const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
 const InjectionChangeContextCollector = Symbol(
@@ -41,5 +41,6 @@ var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
   FIELD_AGE_UNIT2["MINUTE"] = "N";
   return FIELD_AGE_UNIT2;
 })(FIELD_AGE_UNIT || {});
+const NESTED_FORM_ITEM_TYPE = ["COMPLEX", "COMBINATION"];
 
-export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionAnnotation, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectionAnnotation, InjectionAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField, NESTED_FORM_ITEM_TYPE };

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

@@ -2,7 +2,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isString, isEqual } from 'lodash-es';
 import { getCurrentInstance, inject, computed, ref, watch } from 'vue';
 import '../../index.js';
-import { InjectAsyncQueue } from '../constants/index.js';
+import { InjectionAsyncQueue } from '../constants/index.js';
 import { formRenderLog, optionMatcher } from '../utils/index.js';
 import { useFormField } from './useFormField.js';
 import { useFormRequest } from './useFormRequest.js';
@@ -10,7 +10,7 @@ import { useFormRequest } from './useFormRequest.js';
 function useAutographOptions(props, valueRef) {
   if (!getCurrentInstance())
     throw new Error("can't use this hook out of setup environment");
-  const asyncQueue = inject(InjectAsyncQueue);
+  const asyncQueue = inject(InjectionAsyncQueue);
   const labelKey = computed(() => {
     var _a, _b, _c;
     return (_c = (_b = (_a = props.wordbook) == null ? void 0 : _a.render_key) == null ? void 0 : _b[0]) != null ? _c : "text";

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

@@ -8,7 +8,7 @@ import components from '../components/renderer/index.js';
 import { useFormRenderLifeCycle } from './useFormRenderLifeCycle.js';
 import { usePresetScope } from './usePresetScope.js';
 import { injectOrProvide, presetRequestHandler } from '../utils/index.js';
-import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionAnnotation } from '../constants/index.js';
+import { InjectionAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionAnnotation } from '../constants/index.js';
 import { useAsyncQueue } from './useAsyncQueue.js';
 import { useBusinessBinding } from './useBusinessBinding.js';
 import { useChangeContext } from './useChangeContext.js';
@@ -17,7 +17,7 @@ import { useFormItemDeps } from './useFormItemDeps.js';
 function useFormContext(props, formModel) {
   const { callLifeCycle } = useFormRenderLifeCycle(props);
   const asyncQueue = injectOrProvide(
-    InjectAsyncQueue,
+    InjectionAsyncQueue,
     () => useAsyncQueue(computed(() => props.requestInstance)).create(props.parallelism, {
       beforeRequest(...args) {
         return callLifeCycle("beforeRequest", cloneDeep(args)) || args[1];

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

@@ -1,6 +1,7 @@
-import { Nullable } from '../../../../../es/shared/types';
+import { Nullable, UndefinedAble } from '../../../../../es/shared/types';
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
 export declare function queryInput(decoratorElement?: Nullable<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };
+export declare function findNextWidget(containers: HTMLElement[], currentContainerIndex: number, currentWidget: HTMLElement): UndefinedAble<HTMLElement>;

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

@@ -10,5 +10,22 @@ function queryInput(decoratorElement) {
     widgetElementList: Array.from((_a = decoratorElement == null ? void 0 : decoratorElement.querySelectorAll("input")) != null ? _a : [])
   };
 }
+function findNextWidget(containers, currentContainerIndex, currentWidget) {
+  const nextWidget = findInnerNextWidget(containers[currentContainerIndex], currentWidget);
+  if (nextWidget)
+    return nextWidget;
+  let result;
+  containers.slice(currentContainerIndex + 1).some((container) => {
+    return result = findInnerNextWidget(container);
+  });
+  return result;
+  function findInnerNextWidget(container, currentWidget2) {
+    const widgets = Array.from(container.querySelectorAll("textarea,input,[tabindex]"));
+    const widgetIndex = currentWidget2 ? widgets.findIndex((widget) => widget === currentWidget2) : -1;
+    return widgets.slice(widgetIndex + 1).find(
+      (widget) => !Reflect.get(widget, "disabled") && !Array.from(widget.classList).some((className) => className.endsWith("--disabled"))
+    );
+  }
+}
 
-export { queryDecorator, queryInput };
+export { findNextWidget, queryDecorator, queryInput };

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

@@ -1,4 +1,5 @@
 import { AnyObject, ArrayAble, Nullable } from '../../../../../es/shared/types';
+import { GeneralField } from '@formily/core';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { FieldItem } from '../types';
 export * from './business';
@@ -19,3 +20,5 @@ export declare function optionMatcher(options: AnyObject[], input: Nullable<stri
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
 export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function isNestedType(type?: string): boolean | "" | undefined;
+export declare function isNestedFieldType(field: FieldItem | GeneralField): boolean | "" | undefined;

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

@@ -1,11 +1,12 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { arrayed } from '../../../../shared/utils/index.js';
+import { isGeneralField } from '@formily/core';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { useMemoize } from '@vueuse/core';
 import { isString, isFunction, omit } from 'lodash-es';
+import { NESTED_FORM_ITEM_TYPE } from '../constants/index.js';
 import 'date-fns';
-import '@formily/core';
 
 function formRenderLog(message) {
   console.warn(`[FormRender]: ${message}`);
@@ -136,7 +137,7 @@ function validateMessageParser(message, fieldItem) {
 function findExtendKeyField(fieldList) {
   return fieldList.reduce((result, field) => {
     isString(field.extendKey) && field.extendKey && result.push(field);
-    if (field.html_type === "COMPLEX") {
+    if (isNestedFieldType(field)) {
       result.push(...findExtendKeyField(field.children || []));
     }
     return result;
@@ -190,5 +191,11 @@ function splitExtendKey(fieldList, values) {
   });
   return result;
 }
+function isNestedType(type) {
+  return type && NESTED_FORM_ITEM_TYPE.includes(type);
+}
+function isNestedFieldType(field) {
+  return isNestedType(isGeneralField(field) ? field.componentType : field.html_type);
+}
 
-export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };
+export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };

package/es/components/index.js

@@ -56,9 +56,9 @@ export { useAutographOptions } from './form-render/src/hooks/useAutographOptions
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './form-render/src/hooks/useCommonInjection.js';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
-export { queryDecorator, queryInput } from './form-render/src/utils/dom.js';
+export { findNextWidget, queryDecorator, queryInput } from './form-render/src/utils/dom.js';
 export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './form-render/src/utils/schema.js';
-export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';
+export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';
 export * from '@formily/core';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';

package/es/components/shortcut-provider/src/hooks/useShortcuts.js

@@ -1,8 +1,9 @@
+import { findAncestor } from '../../../../shared/utils/index.js';
 import { useEventListener, useDebounceFn } from '@vueuse/core';
 import { once, pick, omit, isFunction, isString } from 'lodash-es';
 import { reactive, ref, unref, computed, getCurrentInstance, inject, onBeforeUnmount, onDeactivated, onActivated } from 'vue';
 import { ShortcutStatus, InjectionShortcutManager } from '../constants/index.js';
-import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, findAncestor, isShortcutProvider } from '../utils/index.js';
+import { normalizeSignatureInfo, getKeySignature, getDisplaySignature, isInvalidSignature, isKeyboardEvent, isShortcutProvider } from '../utils/index.js';
 
 const GlobalShortcutProvider = Symbol("Glob");
 const ShortcutManagerCacheMap = /* @__PURE__ */ new Map();

package/es/components/shortcut-provider/src/utils/index.d.ts

@@ -7,4 +7,3 @@ export declare function isInvalidSignature(info: KeyboardEvent | Partial<Shortcu
 export declare function getDisplaySignature(info: KeyboardEvent | Partial<ShortcutSignatureInfo>): string;
 export declare function transformKey2DisplaySignature(keySignature: string): string;
 export declare function isShortcutProvider(ele: HTMLElement): boolean;
-export declare function findAncestor(ele: HTMLElement | null, finder: (ele: HTMLElement) => boolean): HTMLElement | null;

package/es/components/shortcut-provider/src/utils/index.js

@@ -44,16 +44,5 @@ function transformKey2DisplaySignature(keySignature) {
 function isShortcutProvider(ele) {
   return ele && ele.getAttribute("is-shortcut-capture") != void 0;
 }
-function findAncestor(ele, finder) {
-  if (!ele)
-    return ele;
-  if (finder(ele))
-    return ele;
-  let next = ele.parentElement;
-  while (next && !finder(next)) {
-    next = next.parentElement;
-  }
-  return next;
-}
 
-export { findAncestor, getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };
+export { getDisplaySignature, getKeySignature, inKeyBlackList, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo, transformKey2DisplaySignature };

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

@@ -1834,6 +1834,10 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             requestInstance: {
                 type: import("vue").PropType<import("..").RequestInstance>;
             };
+            enterToNextWidget: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
@@ -1952,6 +1956,10 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 requestInstance: {
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
+                enterToNextWidget: {
+                    type: BooleanConstructor;
+                    default: boolean;
+                };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
             }>>;
@@ -1965,7 +1973,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             formItemDepsCollector: import("..").FormItemDepsCollector;
             changeContextCollector: import("..").ContextCollector;
             formUUID: string;
-            scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
+            formRenderRef: import("vue").Ref<HTMLElement | undefined>;
             schemaAdaptor: (fieldList: import("..").FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
                 [key: `x-${string}`]: any;
@@ -2145,6 +2153,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             }[]>;
             formHeight: import("vue").ComputedRef<string | undefined>;
             onScroll: () => void;
+            onKeydown: (event: KeyboardEvent) => void;
             queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("..").FieldItem[]) => Promise<{
                 widgetElement: HTMLInputElement | null | undefined;
                 widgetElementList: HTMLInputElement[];
@@ -2325,6 +2334,10 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             requestInstance: {
                 type: import("vue").PropType<import("..").RequestInstance>;
             };
+            enterToNextWidget: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }, {
@@ -2336,6 +2349,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             parallelism: number;
             scope: import("../../../es/shared/types").AnyObject;
             consumer: boolean;
+            enterToNextWidget: boolean;
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("error" | "update")[], "error" | "update", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{