cnhis-design-vue 3.1.34-beta.9 → 3.1.35-beta.1

package/es/components/fabric-chart/src/utils/utils.js

@@ -1,18 +1,6 @@
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
-function getPointArr(arr) {
-  let _arr = [];
-  return arr.reduce((pre, cur, index) => {
-    var _a, _b;
-    _arr.push([cur.left, cur.top]);
-    if (((_b = (_a = cur.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.breakpoint) || arr.length - 1 === index) {
-      pre.push(_arr);
-      _arr = [];
-    }
-    return pre;
-  }, []);
-}
 function deleteProperty(data, list) {
   list.map((v) => v.type).forEach((key) => {
     if (Reflect.has(data, key))
@@ -23,5 +11,14 @@ function getIndex(time, list) {
   const index = list.findIndex((v) => new Date(v.time).getTime() > new Date(time).getTime());
   return !~index ? list.length : index;
 }
+function isOneLine(type) {
+  return ["temperature", "pulse"].includes(type);
+}
+function setOtherType(title, type) {
+  return title.includes("\u5FC3\u7387") ? "pulse_other" : type;
+}
+function getType(type) {
+  return type.includes("_other") ? type.split("_")[0] : type;
+}
 
-export { deleteProperty, getIndex, getPointArr, isEffectiveNode };
+export { deleteProperty, getIndex, getType, isEffectiveNode, isOneLine, setOtherType };

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

@@ -34,6 +34,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -51,6 +55,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -281,7 +289,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -403,7 +411,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         type: import("vue").PropType<import("..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -781,7 +789,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -795,7 +803,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -1023,6 +1031,8 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             autograph?: string | undefined;
             defined_error_msg?: string | undefined;
             extendKey?: string | undefined;
+            is_not_fold?: string | undefined;
+            remark?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;
@@ -2598,6 +2608,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             type?: string | undefined;
             name?: string | undefined;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -2612,6 +2626,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 type: string;
                 name: string;
                 show?: boolean | undefined;
+                options?: {
+                    value: string;
+                    text: string;
+                }[] | undefined;
                 defaultValue?: any;
                 defaultExpand?: boolean | undefined;
                 fold?: boolean | undefined;
@@ -2755,7 +2773,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -2877,7 +2895,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         type: import("vue").PropType<import("..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -3255,7 +3273,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -3269,7 +3287,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -35,6 +35,10 @@ declare const _default: import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -52,6 +56,10 @@ declare const _default: import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -282,7 +290,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -404,7 +412,7 @@ declare const _default: import("vue").DefineComponent<{
                         type: PropType<import("../..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -782,7 +790,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -796,7 +804,7 @@ declare const _default: import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("../..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -1024,6 +1032,8 @@ declare const _default: import("vue").DefineComponent<{
             autograph?: string | undefined;
             defined_error_msg?: string | undefined;
             extendKey?: string | undefined;
+            is_not_fold?: string | undefined;
+            remark?: string | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
             content?: string | import("../..").FormRenderer | Record<string, import("../..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;
@@ -2599,6 +2609,10 @@ declare const _default: import("vue").DefineComponent<{
             type?: string | undefined;
             name?: string | undefined;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -2613,6 +2627,10 @@ declare const _default: import("vue").DefineComponent<{
                 type: string;
                 name: string;
                 show?: boolean | undefined;
+                options?: {
+                    value: string;
+                    text: string;
+                }[] | undefined;
                 defaultValue?: any;
                 defaultExpand?: boolean | undefined;
                 fold?: boolean | undefined;
@@ -2756,7 +2774,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -2878,7 +2896,7 @@ declare const _default: import("vue").DefineComponent<{
                         type: PropType<import("../..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -3256,7 +3274,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -3270,7 +3288,7 @@ declare const _default: import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("../..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -139,7 +139,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -261,7 +261,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                     type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -639,7 +639,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -653,7 +653,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             parallelism: number;
             scope: import("../../../../shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {

package/es/components/form-config/src/components/FormConfigDragDisplay.vue.js

@@ -2,6 +2,7 @@ import { defineComponent, openBlock, createBlock, unref, mergeProps, withCtx, cr
 import draggableComponent from '../../../../shared/components/VueDraggable/src/vuedraggable.js';
 import { usePresetRenderer } from '../hooks/usePresetRenderer.js';
 import { useSortableConfig } from '../hooks/useSortalbeConfig.js';
+import 'lodash-es';
 import { layoutWidthEnum2Column } from '../utils/index.js';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 

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

@@ -115,6 +115,8 @@ declare const _default: import("vue").DefineComponent<{
         autograph?: string | undefined;
         defined_error_msg?: string | undefined;
         extendKey?: string | undefined;
+        is_not_fold?: string | undefined;
+        remark?: string | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
         content?: string | import("../../../../../es/components/form-render").FormRenderer | Record<string, import("../../../../../es/components/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
@@ -1690,6 +1692,10 @@ declare const _default: import("vue").DefineComponent<{
         type?: string | undefined;
         name?: string | undefined;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -1704,6 +1710,10 @@ declare const _default: import("vue").DefineComponent<{
             type: string;
             name: string;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -1847,7 +1857,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -1969,7 +1979,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -2347,7 +2357,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -2361,7 +2371,7 @@ declare const _default: import("vue").DefineComponent<{
             parallelism: number;
             scope: import("../../../../../es/shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, 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, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -1,3 +1,4 @@
+import { isArray } from 'lodash-es';
 import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig } from '../constants/index.js';
 
 function useConfigurationField() {
@@ -6,7 +7,12 @@ function useConfigurationField() {
     [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 } })
+      (fieldItem) => {
+        if (isArray(fieldItem == null ? void 0 : fieldItem.options) && fieldItem.options.length) {
+          return { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "SELECT", option: fieldItem == null ? void 0 : fieldItem.options };
+        }
+        return { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } };
+      }
     ],
     [
       EditAbleField.LAYOUT_WIDTH_ENUM,

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

@@ -16,6 +16,7 @@ export declare type FormConfigItem = {
     name: string;
 } & Partial<{
     show: boolean;
+    options: Record<'text' | 'value', string>[];
     defaultValue: any;
     defaultExpand: boolean;
     fold: boolean;

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

@@ -126,7 +126,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("./src/hooks").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }, {
@@ -248,7 +248,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("./src/hooks").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -626,7 +626,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("./src/hooks").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -640,7 +640,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         parallelism: number;
         scope: import("../../../es/shared/types").AnyObject;
         consumer: boolean;
-        enterToNextWidget: boolean;
+        enterToNextWidget: boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void);
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default FormRender;

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

@@ -120,7 +120,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<RequestInstance>;
     };
     enterToNextWidget: {
-        type: BooleanConstructor;
+        type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
         default: boolean;
     };
 }, {
@@ -242,7 +242,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -620,7 +620,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<RequestInstance>;
     };
     enterToNextWidget: {
-        type: BooleanConstructor;
+        type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
         default: boolean;
     };
 }>> & {
@@ -634,6 +634,6 @@ declare const _default: import("vue").DefineComponent<{
     parallelism: number;
     scope: AnyObject;
     consumer: boolean;
-    enterToNextWidget: boolean;
+    enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
 }>;
 export default _default;

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

@@ -4,7 +4,7 @@ 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 { cloneDeep, isArray, isFunction } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { NESTED_FORM_ITEM_TYPE, FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
@@ -60,7 +60,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     uuid: { type: String },
     lifeCycle: { type: Object },
     requestInstance: { type: Object },
-    enterToNextWidget: { type: Boolean, default: true }
+    enterToNextWidget: {
+      type: [Boolean, Function],
+      default: true
+    }
   },
   emits: [
     "formChange"
@@ -111,6 +114,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     watch(parsedSchema, generateAnchorList, { immediate: true });
     function onKeydown(event) {
+      var _a;
       if (!props.enterToNextWidget || !formRenderRef.value)
         return;
       const ancestorFormItem = findAncestor(
@@ -124,10 +128,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const formItemIndex = formItemElements.findIndex((ele) => ele.id === ancestorFormItem.id);
       if (!~formItemIndex)
         return;
-      const nextWidget = findNextWidget(formItemElements, formItemIndex, event.target);
-      if (!nextWidget)
+      const { widget, field } = findNextWidget(formItemElements, formItemIndex, event.target);
+      if (!widget)
         return;
-      setTimeout(() => nextWidget.focus());
+      const formItemInstance = field && formModel.query(field).take();
+      if (formItemInstance && isFunction(props.enterToNextWidget)) {
+        props.enterToNextWidget((_a = formItemInstance.decoratorProps) == null ? void 0 : _a.fieldItem) ? focus() : onKeydown({ target: widget });
+      }
+      function focus() {
+        widget == null ? void 0 : widget.focus();
+      }
     }
     async function queryWidget(key, wrapperElement, fieldList) {
       if (!formRenderRef.value)

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

@@ -123,7 +123,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }, {
@@ -245,7 +245,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -623,7 +623,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -637,7 +637,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         parallelism: number;
         scope: import("../../../shared/types").AnyObject;
         consumer: boolean;
-        enterToNextWidget: boolean;
+        enterToNextWidget: boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void);
     }>;
 }, {}, {}, {}, 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,12 +1,14 @@
 export declare const FORM_ITEM: import("vue").DefineComponent<{
     label: StringConstructor;
     propertyKey: StringConstructor;
+    remark: 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;
+    remark: StringConstructor;
     span: NumberConstructor;
     annotation: {};
     fieldItem: {};

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

@@ -1,10 +1,12 @@
 import { defineComponent, inject, computed, createVNode, mergeProps } from 'vue';
+import { widthAppend } from '../../../../../shared/utils/index.js';
 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 TooltipMessage from '../tooltipMessage.vue.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
 import { dotEscape } from '../../utils/schema.js';
 import { validateMessageParser } from '../../utils/index.js';
@@ -13,6 +15,7 @@ const script = defineComponent({
   props: {
     label: String,
     propertyKey: String,
+    remark: String,
     span: Number,
     annotation: {},
     fieldItem: {}
@@ -49,14 +52,27 @@ const script = defineComponent({
     const id = computed(() => {
       return dotEscape(`${uuid}-${field.value.path.toString()}`);
     });
+    const marginRight = computed(() => {
+      let result = 0;
+      showAnnotation.value && (result += 18);
+      props.remark && (result += 18);
+      return result;
+    });
     function renderLabel() {
       return showLabel.value ? createVNode("section", {
         "class": "form-render__formItemLabel"
       }, [createVNode("span", {
-        "class": ["form-render__formItemLabel--text", {
-          "has-annotation": showAnnotation.value
-        }]
-      }, [props.label]), showAnnotation.value ? renderAnnotation() : null]) : null;
+        "class": "form-render__formItemLabel--text",
+        "style": {
+          marginRight: widthAppend(marginRight.value)
+        }
+      }, [props.label]), marginRight.value ? createVNode("section", {
+        "class": "form-render__formItemLabel--operation"
+      }, [props.remark ? createVNode("div", {
+        "class": "form-render__formItemLabel--tooltip"
+      }, [createVNode(TooltipMessage, {
+        "message": props.remark
+      }, null)]) : null, showAnnotation.value ? renderAnnotation() : null]) : null]) : null;
     }
     return () => createVNode(NFormItem, mergeProps({
       "class": "form-render__formItem",
@@ -65,7 +81,8 @@ const script = defineComponent({
       }
     }, {
       id: id.value,
-      "widget-type": field.value.componentType
+      "widget-type": field.value.componentType,
+      "form-field": field.value.path.toString()
     }), {
       ...slots,
       label: renderLabel