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

package/es/packages/form-config/src/components/FormConfigCreator.js

@@ -1,4 +1,5 @@
 import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, createTextVNode } from 'vue';
+import { pick } from 'lodash-es';
 import { NButtonGroup, NPopconfirm, NButton } from 'naive-ui';
 import { EditAbleField } from '../../../../packages/form-config/src/constants';
 import { useConfigurationField } from '../../../../packages/form-config/src/hooks/useConfigurationField';
@@ -15,20 +16,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props, { emit }) {
     const linebarField = useConfigurationField().generateFieldListByKeys([
-      EditAbleField.ALIAS,
-      EditAbleField.ELEM_WIDTH,
-      EditAbleField.IS_SHOW,
-      EditAbleField.IS_NOT_FOLD
+      EditAbleField.NAME,
+      EditAbleField.LAYOUT_WIDTH_ENUM,
+      EditAbleField.DEFAULT_EXPAND,
+      EditAbleField.FOLD
     ]);
     const linebarFormRef = ref();
     const lineBreakFormRef = ref();
-    const initialData = { is_show: "1", is_not_fold: "0" };
-    async function submit(html_type, formRef) {
+    const initialData = { defaultExpand: true, fold: true, layoutWidthEnum: "ALL_LINE" };
+    async function submit(type, formRef) {
       if (!formRef)
         return;
       await formRef.validate();
       const formData = formRef.getFormValues();
-      emit("submit", { ...formData, html_type, val_key: formData.alias, elem_width: 12 });
+      emit("submit", { layoutWidthEnum: "ALL_LINE", ...formData, type, key: formData.name });
     }
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NButtonGroup), { size: "small" }, {
@@ -37,7 +38,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "200px",
             "show-icon": false,
             "show-arrow": false,
-            onPositiveClick: _cache[0] || (_cache[0] = ($event) => submit("LINE_BREAKS", lineBreakFormRef.value))
+            onPositiveClick: _cache[0] || (_cache[0] = ($event) => submit("NEWLINE", lineBreakFormRef.value))
           }, {
             trigger: withCtx(() => [
               createVNode(unref(NButton), null, {
@@ -51,11 +52,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(unref(FormRender), {
                 ref_key: "lineBreakFormRef",
                 ref: lineBreakFormRef,
+                "initial-data": unref(pick)(initialData, ["layoutWidthEnum"]),
                 size: "small",
                 "label-width": "auto",
                 "label-placement": "left",
-                fieldList: unref(linebarField).slice(0, 1)
-              }, null, 8, ["fieldList"])
+                fieldList: unref(linebarField).slice(0, 2)
+              }, null, 8, ["initial-data", "fieldList"])
             ]),
             _: 1
           }),
@@ -63,7 +65,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "300px",
             "show-icon": false,
             "show-arrow": false,
-            onPositiveClick: _cache[1] || (_cache[1] = ($event) => submit("LINEBAR", linebarFormRef.value))
+            onPositiveClick: _cache[1] || (_cache[1] = ($event) => submit("LINE_BAR", linebarFormRef.value))
           }, {
             trigger: withCtx(() => [
               createVNode(unref(NButton), null, {

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

@@ -1,15 +1,18 @@
 /// <reference types="lodash" />
+/// <reference types="lodash" />
 import { FieldItem, FormRenderExpose } from '../../../../../es/packages/form-render';
+import { FormConfigItem } from '../../..';
 declare const _default: import("vue").DefineComponent<{}, {
     linebarField: FieldItem[];
     linebarFormRef: import("vue").Ref<FormRenderExpose | undefined>;
     lineBreakFormRef: import("vue").Ref<FormRenderExpose | undefined>;
-    initialData: {
-        is_show: string;
-        is_not_fold: string;
+    initialData: Partial<FormConfigItem>;
+    emit: (event: "submit", payload: FormConfigItem) => void;
+    submit: (type: string, formRef?: FormRenderExpose) => Promise<void>;
+    pick: {
+        <T extends object, U extends keyof T>(object: T, ...props: import("lodash").Many<U>[]): Pick<T, U>;
+        <T_1>(object: T_1 | null | undefined, ...props: import("lodash").PropertyPath[]): Partial<T_1>;
     };
-    emit: (event: "submit", payload: FieldItem) => void;
-    submit: (html_type: string, formRef?: FormRenderExpose) => Promise<void>;
     NButton: import("vue").DefineComponent<{
         readonly color: StringConstructor;
         readonly textColor: StringConstructor;
@@ -5085,8 +5088,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         consumer: boolean;
     }>>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    submit: (payload: FieldItem) => FieldItem;
+    submit: (payload: FormConfigItem) => FormConfigItem;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>> & {
-    onSubmit?: ((payload: FieldItem) => any) | undefined;
+    onSubmit?: ((payload: FormConfigItem) => any) | undefined;
 }, {}>;
 export default _default;

package/es/packages/form-config/src/components/FormConfigEdit.js

@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       prevOldField = field;
-      initialData.value = { is_edit: "1", ...cloneDeep(toRaw(field)) };
+      initialData.value = { editable: true, ...cloneDeep(toRaw(field)) };
       fieldList.value = generateFieldListByFieldItem(field);
       key.value++;
     }, { immediate: true });

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

@@ -1,11 +1,11 @@
 /// <reference types="lodash" />
-import { AnyObject } from '../../../../../es/src/types';
 import { nextTick } from 'vue';
 import { FieldItem, FormChangePayload, FormRenderExpose } from '../../../../../es/packages/form-render';
+import { FormConfigItem } from '../../../../../es/packages/index';
 declare const _default: import("vue").DefineComponent<{}, {
     key: import("vue").Ref<number>;
     formRenderRef: import("vue").Ref<FormRenderExpose | undefined>;
-    currentActiveField: import("vue").Ref<import("../../../../../es/src/types").WithUndefined<FieldItem>>;
+    currentActiveField: import("vue").Ref<import("../../../../../es/src/types").WithUndefined<FormConfigItem>>;
     fieldList: import("vue").Ref<{
         [x: string]: any;
         val_key: string;
@@ -80,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             method?: import("../../../../../es/packages/form-render").FormRequestType | undefined;
             nameKey?: string | undefined;
             valueKey?: string | undefined;
-            params?: AnyObject | undefined;
+            params?: import("../../../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
@@ -94,8 +94,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         maxGroupNum?: number | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
-        componentProps?: AnyObject | undefined;
-        decoratorProps?: AnyObject | undefined;
+        componentProps?: import("../../../../../es/src/types").AnyObject | undefined;
+        decoratorProps?: import("../../../../../es/src/types").AnyObject | undefined;
         noDecorator?: {
             valueOf: () => boolean;
         } | undefined;
@@ -1637,11 +1637,11 @@ declare const _default: import("vue").DefineComponent<{}, {
             target?: string | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
-                state?: AnyObject | undefined;
+                state?: import("../../../../../es/src/types").AnyObject | undefined;
                 run?: string | undefined;
             } | undefined;
             otherwise?: {
-                state?: AnyObject | undefined;
+                state?: import("../../../../../es/src/types").AnyObject | undefined;
                 run?: string | undefined;
             } | undefined;
         } | {
@@ -1650,17 +1650,45 @@ declare const _default: import("vue").DefineComponent<{}, {
             target?: string | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
-                state?: AnyObject | undefined;
+                state?: import("../../../../../es/src/types").AnyObject | undefined;
                 run?: string | undefined;
             } | undefined;
             otherwise?: {
-                state?: AnyObject | undefined;
+                state?: import("../../../../../es/src/types").AnyObject | undefined;
                 run?: string | undefined;
             } | undefined;
         }[] | undefined;
     }[]>;
-    initialData: import("vue").Ref<AnyObject>;
-    generateFieldListByFieldItem: (fieldItem: FieldItem) => FieldItem[];
+    initialData: import("vue").Ref<{
+        key?: string | undefined;
+        layoutWidthEnum?: import("../../../../../es/packages/index").FormConfigWidth | undefined;
+        type?: string | undefined;
+        name?: string | undefined;
+        show?: boolean | undefined;
+        defaultValue?: any;
+        defaultExpand?: boolean | undefined;
+        fold?: boolean | undefined;
+        required?: boolean | undefined;
+        editable?: boolean | undefined;
+        notes?: string | undefined;
+        desc?: string | undefined;
+        children?: {
+            key: string;
+            layoutWidthEnum: import("../../../../../es/packages/index").FormConfigWidth;
+            type: string;
+            name: string;
+            show?: boolean | undefined;
+            defaultValue?: any;
+            defaultExpand?: boolean | undefined;
+            fold?: boolean | undefined;
+            required?: boolean | undefined;
+            editable?: boolean | undefined;
+            notes?: string | undefined;
+            desc?: string | undefined;
+            children?: any[] | undefined;
+        }[] | undefined;
+    }>;
+    generateFieldListByFieldItem: (fieldItem: FormConfigItem) => FieldItem[];
     showModal: import("vue").Ref<boolean>;
     onPositiveClick: () => Promise<void>;
     prevOldField: null;
@@ -3594,7 +3622,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<FieldItem[]>;
         };
         initialData: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
             default: () => {};
         };
         fieldVisitor: {
@@ -3683,11 +3711,11 @@ declare const _default: import("vue").DefineComponent<{}, {
             default: () => {};
         };
         scope: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
             default: () => {};
         };
         annotation: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
         };
         consumer: {
             type: BooleanConstructor;
@@ -3699,8 +3727,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<AnyObject>;
-                afterRequest(fieldKey: string, payload?: any): AnyObject[];
+                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
             }>>;
         };
     }, {
@@ -3709,7 +3737,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<FieldItem[]>;
             };
             initialData: {
-                type: import("vue").PropType<AnyObject>;
+                type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
                 default: () => {};
             };
             fieldVisitor: {
@@ -3798,11 +3826,11 @@ declare const _default: import("vue").DefineComponent<{}, {
                 default: () => {};
             };
             scope: {
-                type: import("vue").PropType<AnyObject>;
+                type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
                 default: () => {};
             };
             annotation: {
-                type: import("vue").PropType<AnyObject>;
+                type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
             };
             consumer: {
                 type: BooleanConstructor;
@@ -3814,8 +3842,8 @@ declare const _default: import("vue").DefineComponent<{}, {
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<AnyObject>;
-                    afterRequest(fieldKey: string, payload?: any): AnyObject[];
+                    beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                    afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
                 }>>;
             };
         }>> & {
@@ -5209,7 +5237,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<FieldItem[]>;
         };
         initialData: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
             default: () => {};
         };
         fieldVisitor: {
@@ -5298,11 +5326,11 @@ declare const _default: import("vue").DefineComponent<{}, {
             default: () => {};
         };
         scope: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
             default: () => {};
         };
         annotation: {
-            type: import("vue").PropType<AnyObject>;
+            type: import("vue").PropType<import("../../../../../es/src/types").AnyObject>;
         };
         consumer: {
             type: BooleanConstructor;
@@ -5314,8 +5342,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<AnyObject>;
-                afterRequest(fieldKey: string, payload?: any): AnyObject[];
+                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
             }>>;
         };
     }>> & {
@@ -5325,9 +5353,9 @@ declare const _default: import("vue").DefineComponent<{}, {
         maxHeight: string | number;
         column: number;
         components: Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>;
-        initialData: AnyObject;
+        initialData: import("../../../../../es/src/types").AnyObject;
         parallelism: number;
-        scope: AnyObject;
+        scope: import("../../../../../es/src/types").AnyObject;
         consumer: boolean;
     }>>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/packages/form-config/src/constants/index.d.ts

@@ -1,62 +1,62 @@
 import { WithUndefined } from '../../../../../es/src/types';
 import { InjectionKey, Ref } from 'vue';
-import { FieldItem } from '../../../../../es/packages/form-render';
+import { FormConfigItem } from '../../../../../es/packages/form-config';
 export declare const WidgetTextMap: Map<string, string>;
 export declare enum EditAbleField {
-    ALIAS = "alias",
-    TIP = "tip",
-    DEFAULT_VAL = "default_val",
-    ELEM_WIDTH = "elem_width",
-    PLACEHOLDER = "placeholder",
-    IS_SHOW = "is_show",
-    IS_NOT_FOLD = "is_not_fold",
-    IS_NULL = "is_null",
-    IS_EDIT = "is_edit"
+    NAME = "name",
+    NOTES = "notes",
+    DEFAULT_VALUE = "defaultValue",
+    LAYOUT_WIDTH_ENUM = "layoutWidthEnum",
+    DESC = "desc",
+    DEFAULT_EXPAND = "defaultExpand",
+    FOLD = "fold",
+    REQUIRED = "required",
+    EDITABLE = "editable"
 }
 export declare function widgetWidthOptionConfig(): {
     option: {
         text: string;
-        value: number;
+        value: string;
     }[];
 };
 export declare function isShowOptionConfig(): {
     open: {
         describe: string;
-        value: string;
+        value: boolean;
     };
     close: {
         describe: string;
-        value: string;
+        value: boolean;
     };
 };
 export declare function isNotFoldOptionConfig(): {
     open: {
         describe: string;
-        value: string;
+        value: boolean;
     };
     close: {
         describe: string;
-        value: string;
+        value: boolean;
     };
 };
 export declare function isEditOptionConfig(): {
     open: {
         describe: string;
-        value: string;
+        value: boolean;
     };
     close: {
         describe: string;
-        value: string;
+        value: boolean;
     };
 };
 export declare function isNullOptionConfig(): {
     open: {
         describe: string;
-        value: string;
+        value: boolean;
     };
     close: {
         describe: string;
-        value: string;
+        value: boolean;
     };
 };
-export declare const InjectionActiveFieldItem: InjectionKey<Ref<WithUndefined<FieldItem>>>;
+export declare const InjectionActiveFieldItem: InjectionKey<Ref<WithUndefined<FormConfigItem>>>;

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

@@ -1,64 +1,55 @@
 const WidgetTextMap = /* @__PURE__ */ new Map([
-  ["INPUT", "\u8F93\u5165\u6846"],
-  ["SELECT", "\u4E0B\u62C9\u6846"],
-  ["TEXTAREA", "\u6587\u672C\u57DF"],
-  ["CASCADER", "\u7EA7\u8054\u4E0B\u62C9\u6846"],
-  ["SWITCH", "\u5F00\u5173"],
-  ["RADIO", "\u5355\u9009"],
-  ["TEXT", "\u6587\u672C"],
-  ["BUTTON", "\u6309\u94AE"],
-  ["CHECKBOX", "\u591A\u9009"],
-  ["LINEBAR", "\u5206\u884C\u7B26"],
-  ["LINE_BREAKS", "\u5206\u7EBF\u680F"]
+  ["LINE_BAR", "\u5206\u7EBF\u680F"],
+  ["NEWLINE", "\u5206\u884C\u7B26"]
 ]);
 var EditAbleField = /* @__PURE__ */ ((EditAbleField2) => {
-  EditAbleField2["ALIAS"] = "alias";
-  EditAbleField2["TIP"] = "tip";
-  EditAbleField2["DEFAULT_VAL"] = "default_val";
-  EditAbleField2["ELEM_WIDTH"] = "elem_width";
-  EditAbleField2["PLACEHOLDER"] = "placeholder";
-  EditAbleField2["IS_SHOW"] = "is_show";
-  EditAbleField2["IS_NOT_FOLD"] = "is_not_fold";
-  EditAbleField2["IS_NULL"] = "is_null";
-  EditAbleField2["IS_EDIT"] = "is_edit";
+  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: 12 },
-      { text: "\u534A\u884C", value: 6 },
-      { text: "5/6", value: 10 },
-      { text: "2/3", value: 8 },
-      { text: "1/3", value: 4 },
-      { text: "3/4", value: 9 },
-      { text: "1/4", value: 3 },
-      { text: "1/6", value: 2 }
+      { 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" }
     ]
   };
 }
 function isShowOptionConfig() {
   return {
-    open: { describe: "\u9ED8\u8BA4\u5C55\u5F00", value: "1" },
-    close: { describe: "\u9ED8\u8BA4\u6536\u8D77", value: "0" }
+    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: "0" },
-    close: { describe: "\u4E0D\u53EF\u6298\u53E0", value: "1" }
+    open: { describe: "\u53EF\u6298\u53E0", value: true },
+    close: { describe: "\u4E0D\u53EF\u6298\u53E0", value: false }
   };
 }
 function isEditOptionConfig() {
   return {
-    open: { describe: "\u53EF\u7F16\u8F91", value: "1" },
-    close: { describe: "\u4E0D\u53EF\u7F16\u8F91", value: "0" }
+    open: { describe: "\u53EF\u7F16\u8F91", value: true },
+    close: { describe: "\u4E0D\u53EF\u7F16\u8F91", value: false }
   };
 }
 function isNullOptionConfig() {
   return {
-    open: { describe: "\u5FC5\u586B", value: "0" },
-    close: { describe: "\u4E0D\u5FC5\u586B", value: "1" }
+    open: { describe: "\u5FC5\u586B", value: true },
+    close: { describe: "\u4E0D\u5FC5\u586B", value: false }
   };
 }
 const InjectionActiveFieldItem = Symbol("InjectionActiveFieldItem");

package/es/packages/form-config/src/hooks/useConfigurationField.d.ts

@@ -1,6 +1,7 @@
+import { FormConfigItem } from '../../../../../es/packages/form-config';
 import { EditAbleField } from '../../../../../es/packages/form-config/src/constants';
 import { FieldItem } from '../../../../../es/packages/form-render';
 export declare function useConfigurationField(): {
     generateFieldListByKeys: (keyList: EditAbleField[]) => FieldItem[];
-    generateFieldListByFieldItem: (fieldItem: FieldItem) => FieldItem[];
+    generateFieldListByFieldItem: (fieldItem: FormConfigItem) => FieldItem[];
 };

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

@@ -2,62 +2,48 @@ import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOp
 
 function useConfigurationField() {
   const fieldMap = /* @__PURE__ */ new Map([
-    [EditAbleField.ALIAS, { alias: "\u540D\u79F0", elem_width: 12, is_null: "0", val_key: "alias", html_type: "INPUT" }],
-    [EditAbleField.TIP, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 12, val_key: "tip", html_type: "INPUT" }],
+    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 12, is_null: "0", html_type: "INPUT" }],
+    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 12, html_type: "INPUT" }],
     [
-      EditAbleField.DEFAULT_VAL,
-      { alias: "\u9ED8\u8BA4\u503C", val_key: "default_val", elem_width: 12, html_type: "INPUT", validate: { max_length: 20 } }
+      EditAbleField.DEFAULT_VALUE,
+      { alias: "\u9ED8\u8BA4\u503C", elem_width: 12, html_type: "INPUT", validate: { max_length: 20 } }
     ],
     [
-      EditAbleField.ELEM_WIDTH,
-      {
-        alias: "\u5BBD\u5EA6",
-        fieldType: "number",
-        val_key: "elem_width",
-        html_type: "SELECT",
-        elem_width: 12,
-        ...widgetWidthOptionConfig()
-      }
+      EditAbleField.LAYOUT_WIDTH_ENUM,
+      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 12, ...widgetWidthOptionConfig() }
     ],
+    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 12, html_type: "INPUT", validate: { max_length: 30 } }],
     [
-      EditAbleField.PLACEHOLDER,
-      { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 12, val_key: "placeholder", html_type: "INPUT", validate: { max_length: 30 } }
+      EditAbleField.DEFAULT_EXPAND,
+      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 12, ...isShowOptionConfig() }
     ],
-    [
-      EditAbleField.IS_SHOW,
-      { val_key: "is_show", alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 12, ...isShowOptionConfig() }
-    ],
-    [
-      EditAbleField.IS_NOT_FOLD,
-      { val_key: "is_not_fold", alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 12, ...isNotFoldOptionConfig() }
-    ],
-    [
-      EditAbleField.IS_EDIT,
-      { val_key: "is_edit", alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 12, ...isEditOptionConfig() }
-    ],
-    [
-      EditAbleField.IS_NULL,
-      { val_key: "is_null", alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 12, ...isNullOptionConfig() }
-    ]
+    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 12, ...isNotFoldOptionConfig() }],
+    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 12, ...isEditOptionConfig() }],
+    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 12, ...isNullOptionConfig() }]
   ]);
   function generateFieldListByKeys(keyList) {
-    return keyList.map((key) => fieldMap.get(key));
+    return keyList.map((key) => {
+      return { ...fieldMap.get(key), val_key: key };
+    });
   }
   function generateFieldListByFieldItem(fieldItem) {
     const htmlMap = new Map([
-      ["LINEBAR", [EditAbleField.ALIAS, EditAbleField.ELEM_WIDTH, EditAbleField.IS_SHOW, EditAbleField.IS_NOT_FOLD]],
-      ...["LINE_BREAKS", "COMPLEX", "COMBINATION"].map((key) => [key, [EditAbleField.ALIAS, EditAbleField.ELEM_WIDTH]])
+      [
+        "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.ALIAS,
-      EditAbleField.DEFAULT_VAL,
-      EditAbleField.ELEM_WIDTH,
-      EditAbleField.PLACEHOLDER,
-      EditAbleField.TIP,
-      EditAbleField.IS_EDIT,
-      EditAbleField.IS_NULL
+      EditAbleField.NAME,
+      EditAbleField.DEFAULT_VALUE,
+      EditAbleField.LAYOUT_WIDTH_ENUM,
+      EditAbleField.DESC,
+      EditAbleField.NOTES,
+      EditAbleField.EDITABLE,
+      EditAbleField.REQUIRED
     ];
-    const keys = htmlMap.get(fieldItem.html_type) || defaultItems;
+    const keys = htmlMap.get(fieldItem.type) || defaultItems;
     return generateFieldListByKeys(keys);
   }
   return { generateFieldListByKeys, generateFieldListByFieldItem };

package/es/packages/form-config/src/hooks/usePresetRenderer.d.ts

@@ -1,5 +1,4 @@
-import { FieldItem } from '../../../../../es/packages/form-render';
-import { FormConfigTextFormatter } from '../types';
+import { FormConfigItem, FormConfigTextFormatter } from '../types';
 export declare function usePresetRenderer(textFormatter: FormConfigTextFormatter): {
-    getRenderer: (fieldItem: FieldItem) => import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>;
+    getRenderer: (fieldItem: FormConfigItem) => import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>;
 };