vap1 0.3.2 → 0.3.3

package/components/SearchBar/_register.d.ts

@@ -41,7 +41,7 @@ export type SearchFieldOptions = {
     /**
      * 字段个数， 默认为 1
     */
-    filedNum?: number;
+    fieldNum?: number;
     /**
      * 默认占格 ， 默认为 1
     */

package/components/SearchBar/_register.js

@@ -4,7 +4,7 @@ exports.getSearchField = exports.registerSearchField = void 0;
 var _Support_1 = require("../../utils/_Support");
 var StringUtil_1 = require("../../utils/StringUtil");
 var _RegisterUtil_1 = require("../_RegisterUtil");
-var DEFAULT = { outside: false, filedNum: 1, defaultSpan: 1, };
+var DEFAULT = { outside: false, fieldNum: 1, defaultSpan: 1, };
 var _C_SEARCH_FIELD = (0, _Support_1.globalDefault)('_C_SEARCH_FIELD', new Map());
 /**
  * @param type

package/components/Trees/COTree/COButton.js

@@ -66,7 +66,7 @@ var COButton = function (props) {
     var orgCodeRender = (0, react_1.useMemo)(function () { return utils_1.Renders.ApiPostRender({
         api: props.api || utils_1.GLOBAL.CONFIG.BASIC.ORG_API,
         nameField: props.titleField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[1],
-        valueFiled: props.keyField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[0],
+        valueField: props.keyField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[0],
         render: function (info) {
             if (info.label)
                 return react_1.default.createElement("span", { title: info.label }, info.label);

package/components/Trees/COTree/COSelect.js

@@ -49,7 +49,7 @@ var SelectedTable = function (props) {
     var orgCodeRender = (0, react_1.useMemo)(function () { return utils_1.Renders.ApiPostRender({
         api: props.api || utils_1.GLOBAL.CONFIG.BASIC.ORG_API,
         nameField: props.titleField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[1],
-        valueFiled: props.keyField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[0],
+        valueField: props.keyField || utils_1.GLOBAL.CONFIG.BASIC.ORG_FIELDS[0],
         render: function (info) {
             if (info.label)
                 return react_1.default.createElement("span", { title: info.label }, info.label);

package/components/UForm/_input.d.ts

@@ -36,7 +36,7 @@ type ApiTableBuilderOptions = {
     /**
      * 支持连带返回的字段
      * 1. 字段为数据本身的字段，支持一至多个
-     * 2. Field 配置里面，filed 参数
+     * 2. Field 配置里面，field 参数
     */
     itemFields: string[];
     /**

package/components/UForm/index.d.ts

@@ -16,7 +16,7 @@ import type { ValidationRule } from 'antd/es/form/Form';
  *  2. 大于8个字段时，默认使用  common
 */
 export type UFormLayout = 'common' | 'simple' | 'compress';
-export type FieldDataType = 'string' | 'array' | 'object';
+export type FieldDataType = 'string' | 'number' | 'boolean' | 'array' | 'object';
 /**
  * 分组展示的方式 default = 默认 |  tabs = 标签  | collapse = 折叠风琴
 */
@@ -66,7 +66,7 @@ export type Link = {
     /**
      * 联动事件
      * 返回值为  string | number | boolean 时，改变目标field 的 value
-     * 返回值为  LinkResult, 类型时，根据返回结果改变目标 filed 的 显示/置灰/选项集/值的状态
+     * 返回值为  LinkResult, 类型时，根据返回结果改变目标 field 的 显示/置灰/选项集/值的状态
      * 支持 返回 Promise 对象，返回Promise时，resolve也必须为一个LinkResult
      *
      * 参数

package/hooks/useApiBase.d.ts

@@ -1,5 +1,10 @@
 import type { Key, PlainObject } from '../basetype';
 import type { ListInit, ApiListState, ListQueryState } from './_list';
+type VList = {
+    list?: PlainObject[];
+    total?: number;
+    totalAcc?: number;
+};
 /**
  * 自定义 单个 Api 的AOP行为
  *
@@ -13,15 +18,45 @@ import type { ListInit, ApiListState, ListQueryState } from './_list';
  *
 */
 export type AOP = {
+    /**
+     * 查询前，可修改请求参数
+    */
     beforeQuery?: (queryParam: PlainObject) => PlainObject;
-    afterQuery?: (isSuccess: boolean, queryParam: PlainObject, response: PlainObject) => void;
+    /**
+     * 查询后，可自定义行为，也可修改响应结果，
+    */
+    afterQuery?: (isSuccess: boolean, queryParam: PlainObject, response: PlainObject) => void | VList;
+    /**
+     * 添加前，可修改请求参数
+    */
     beforeAdd?: (queryParam: PlainObject) => PlainObject;
+    /**
+     * 添加后，可自定义行为，如：清理缓存等
+    */
     afterAdd?: (isSuccess: boolean, data: PlainObject, response: PlainObject) => void;
+    /**
+     * 修改前，可修改请求参数
+    */
     beforeUpdate?: (queryParam: PlainObject) => PlainObject;
+    /**
+    * 修改后，可自定义行为，如：清理缓存等
+    */
     afterUpdate?: (isSuccess: boolean, data: PlainObject, response: PlainObject) => void;
+    /**
+     * 删除前，可修改请求参数
+    */
     beforeDelete?: (queryParam: PlainObject | PlainObject[] | Key | Key[]) => PlainObject | PlainObject[] | Key | Key[];
+    /**
+    * 删除后，可自定义行为，如：清理缓存等
+    */
     afterDelete?: (isSuccess: boolean, data: PlainObject | PlainObject[] | Key | Key[], response: PlainObject) => void;
+    /**
+     * 添加/修改 前，可修改请求参数
+    */
     beforeAll?: (queryParam: PlainObject) => PlainObject;
+    /**
+    * 添加/修改/删除 后，可自定义行为，如：清理缓存等
+    */
     afterAll?: (action: 'ADD' | 'UPDATE' | 'DELETE', isSuccess: boolean, data: PlainObject, response: PlainObject) => void;
 };
 export type ApiOption = ListInit & {

package/hooks/useApiBase.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -151,7 +162,7 @@ var useApiBase = function (config, state, doLoad, mode) {
         }
     }, [param, pageNo, pageSize]);
     var _query = function (param) { return __awaiter(void 0, void 0, void 0, function () {
-        var _start, queryParam, response;
+        var _start, queryParam, response, rtnData;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -160,22 +171,22 @@ var useApiBase = function (config, state, doLoad, mode) {
                     return [4 /*yield*/, utils_1.Ajax.POST(config.api, queryParam)];
                 case 1:
                     response = _a.sent();
+                    rtnData = null;
+                    if (lodash_1.default.isFunction(AOP.afterQuery)) {
+                        rtnData = AOP.afterQuery(response.code == '0', queryParam, response);
+                    }
+                    if (rtnData != null && lodash_1.default.isPlainObject(rtnData)) {
+                        doLoad(__assign({ list: response.list || [], total: response.total || 0, totalAcc: response.totalAcc || response.total || 0, cost: Date.now() - _start, isQuerying: false }, rtnData));
+                        return [2 /*return*/];
+                    }
                     if (response.code != '0') {
-                        doLoad({ isQuerying: false, cost: 0 }, function () {
-                            if (lodash_1.default.isFunction(AOP.afterQuery)) {
-                                AOP.afterQuery(false, queryParam, response);
-                            }
-                        });
+                        doLoad({ isQuerying: false, cost: 0 });
                         throw response;
                     }
                     doLoad({
                         list: response.list, total: response.total, totalAcc: response.totalAcc || response.total,
                         cost: Date.now() - _start,
                         isQuerying: false
-                    }, function () {
-                        if (lodash_1.default.isFunction(AOP.afterQuery)) {
-                            AOP.afterQuery(true, queryParam, response);
-                        }
                     });
                     return [2 /*return*/];
             }

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.3.2","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.3.3","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/uform/FormEditor.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { FormSchema } from './schema';
+import type { FormSchema, FixField } from './schema';
 /**
  * TODO
  * 1. input-with-select
@@ -11,11 +11,28 @@ import type { FormSchema } from './schema';
  * 5. dtree-select
  * 6. 所有日期：日期格式设置
  * */
-type FormEditorProps = {
+export type FormEditorProps = {
+    /**
+     * schema 数据，可以为 FormSchema 或 FormSchema序列化后的 JSON
+    */
     data?: string | FormSchema;
+    /**
+     * 表单名称
+    */
     name?: string;
+    /**
+     * 保存方法，
+     * isCtrls = true 时，代码使用快捷键保存
+    */
     onSave: (schema: string, isCtrlS?: boolean) => void;
+    /**
+     * 传 onBack 方法时，编辑器上会多出一个返回按钮
+    */
     onBack?: () => void;
+    /**
+     * 当传 fields 时，切换为字段模式
+     * 字段模式时，为字段选择，字段不可变
+    */
+    fields?: FixField[];
 };
 export declare const FormEditor: React.FC<FormEditorProps>;
-export {};

package/uform/FormEditor.js

@@ -46,8 +46,8 @@ exports.FormEditor = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var index_1 = require("../index");
-var index_2 = __importDefault(require("./panel/Items/index"));
-var index_3 = __importDefault(require("./panel/Editor/index"));
+var Items_1 = __importDefault(require("./panel/Items"));
+var index_2 = __importDefault(require("./panel/Editor/index"));
 var useForm_1 = require("./hooks/useForm");
 var FormViewer_1 = require("./FormViewer");
 var CanvasProperties_1 = __importDefault(require("./panel/Propreties/CanvasProperties"));
@@ -57,7 +57,7 @@ var useEditor_1 = require("./hooks/useEditor");
 var FormViewer_2 = require("./FormViewer");
 var FormEditor = function (props) {
     var schema = (0, react_1.useMemo)(function () { return (0, FormViewer_2.initSchama)(props.data); }, [props.data]);
-    var editor = (0, useEditor_1.useFormEditor)(schema);
+    var editor = (0, useEditor_1.useFormEditor)(schema, props.fields);
     var _a = __read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1];
     var save = function (isCtrlS) {
         if (isCtrlS === void 0) { isCtrlS = false; }
@@ -78,7 +78,7 @@ var FormEditor = function (props) {
         react_1.default.createElement(useEditor_1.FORM_EDITOR.Provider, { value: editor },
             react_1.default.createElement(index_1.Row, { className: 'uform-editor' },
                 react_1.default.createElement(index_1.Col, { style: { width: 210, flexShrink: 0 } },
-                    react_1.default.createElement(index_2.default, null)),
+                    react_1.default.createElement(Items_1.default, { fields: props.fields })),
                 react_1.default.createElement(index_1.Col, { style: { flexGrow: 1 } },
                     react_1.default.createElement("div", { className: 'panel-title' },
                         "\u8868\u5355 ",
@@ -94,7 +94,7 @@ var FormEditor = function (props) {
                                         index_1.message.error('至少添加一个字段');
                                     }
                                 } }, "\u9884\u89C8"))),
-                    react_1.default.createElement(index_3.default, null)),
+                    react_1.default.createElement(index_2.default, null)),
                 react_1.default.createElement(index_1.Col, { style: { width: 320, flexShrink: 0 }, className: "uform-prperties" },
                     react_1.default.createElement("div", { className: 'panel-title' },
                         "\u5C5E\u6027",

package/uform/FormViewer.d.ts

@@ -1,7 +1,15 @@
 import type { FormSchema } from './schema';
 import type { RefAttributes, ForwardRefExoticComponent, FC } from 'react';
 import type { UModalProps, UFormRef, PlainObject } from '../index';
-type ModalProps = Pick<UModalProps, 'open' | 'onOk' | 'onCancel' | 'title' | 'data'>;
+/**
+ * ˵���� �༭���� UFormϵ����� ����Ӧ��ϵ����
+ * InfoViewer �൱�� UInfo
+ * FormViewer �൱�� UForm
+ * FormModal �൱�� UFormModal
+ * InfoModal �൱�� UInfoModal
+ * FormInfoModal �൱�� UModal
+*/
+type ModalProps = Pick<UModalProps, 'open' | 'onOk' | 'onCancel' | 'title' | 'data' | 'isEdit' | 'autoTitle'>;
 type FormViewProps = {
     schema: FormSchema | string;
     data?: PlainObject;
@@ -9,4 +17,5 @@ type FormViewProps = {
 export declare const initSchama: (data: string | FormSchema) => FormSchema;
 export declare const FormViewer: ForwardRefExoticComponent<FormViewProps & RefAttributes<UFormRef>>;
 export declare const FormModal: FC<FormViewProps & ModalProps>;
+export declare const FormInfoModal: FC<FormViewProps & ModalProps>;
 export {};

package/uform/FormViewer.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormModal = exports.FormViewer = exports.initSchama = void 0;
+exports.FormInfoModal = exports.FormModal = exports.FormViewer = exports.initSchama = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var react_1 = __importStar(require("react"));
 var index_1 = require("../index");
@@ -70,6 +70,10 @@ var _ModalRender = function (props) {
     modalProps.title = props.title || props.schema.title || '';
     return react_1.default.createElement(index_1.UFormModal, __assign({}, uformProps, modalProps, { data: props.data, open: props.open, onOk: props.onOk, onCancel: props.onCancel }));
 };
+var _UModalRender = function (props) {
+    var uformProps = (0, react_1.useMemo)(function () { return (0, Convert_1.schemaToForm)(props.schema); }, [props]);
+    return react_1.default.createElement(index_1.UModal, __assign({}, props, uformProps));
+};
 exports.FormViewer = (0, react_1.forwardRef)(function (props, ref) {
     var schema = (0, react_1.useMemo)(function () { return (0, exports.initSchama)(props.schema); }, [props.schema]);
     return react_1.default.createElement(_FormRender, { schema: schema, data: props.data, ref: ref });
@@ -79,3 +83,8 @@ var FormModal = function (props) {
     return react_1.default.createElement(_ModalRender, __assign({}, props, { schema: schema }));
 };
 exports.FormModal = FormModal;
+var FormInfoModal = function (props) {
+    var schema = (0, react_1.useMemo)(function () { return (0, exports.initSchama)(props.schema); }, [props.schema]);
+    return react_1.default.createElement(_UModalRender, __assign({}, props, { schema: schema }));
+};
+exports.FormInfoModal = FormInfoModal;

package/uform/hooks/useEditor.d.ts

@@ -1,11 +1,13 @@
 /// <reference types="react" />
-import type { FormGroup, FormItem, FormSchema, Cursor } from '../schema';
+import type { FormGroup, FormItem, FormSchema, Cursor, FixField } from '../schema';
 type CurrentSelected = {
     group?: string;
     field?: string;
 };
 type FormEditorContext = {
     form: FormSchema;
+    fieldFixed: false | FixField[];
+    fieldUsed: Set<string>;
     selected: CurrentSelected;
     baseSpan: number;
     getForm: () => FormSchema;
@@ -19,10 +21,11 @@ type FormEditorContext = {
     getSelect: () => FormItem | FormGroup;
     sortField: (itemId: string, targetPos: any, groupId?: string) => void;
     addField: (type: string, pointer?: Cursor, groupId?: string) => void;
+    addFixedField: (field: FixField, pointer?: Cursor, groupId?: string) => void;
     setFormProperties: (param: Partial<FormSchema>) => void;
     setFieldProperties: (properties: string, value: any) => void;
 };
 export declare const FORM_EDITOR: import("react").Context<FormEditorContext>;
 export declare const useEditor: () => FormEditorContext;
-export declare const useFormEditor: (dataJson: FormSchema) => FormEditorContext;
+export declare const useFormEditor: (dataJson: FormSchema, fixFields?: FixField[]) => FormEditorContext;
 export {};

package/uform/hooks/useEditor.js

@@ -49,8 +49,25 @@ exports.FORM_EDITOR = (0, react_1.createContext)(null);
 var useEditor = function () { return (0, react_1.useContext)(exports.FORM_EDITOR); };
 exports.useEditor = useEditor;
 var BASESPAN_MAP = new Map([['simple', 24], ['compress', 8], ['common', 12]]);
-var useFormEditor = function (dataJson) {
+var useFormEditor = function (dataJson, fixFields) {
     var _a = __read((0, hooks_1.useSetState)(dataJson), 2), form = _a[0], setForm = _a[1];
+    var fieldFixed = (0, react_1.useMemo)(function () {
+        if (!lodash_1.default.isArray(fixFields) || fixFields.length == 0)
+            return false;
+        return fixFields;
+    }, [fixFields]);
+    var fieldUsed = (0, react_1.useMemo)(function () {
+        if (fieldFixed == false)
+            return null;
+        var used = new Set();
+        if (form.isGroup) {
+            form.fields.map(function (group) { return group.fields.map(function (field) { return used.add(field.field); }); });
+        }
+        else {
+            form.fields.map(function (field) { return used.add(field.field); });
+        }
+        return used;
+    }, [fieldFixed, form]);
     var FORM_REF = (0, react_1.useRef)(form);
     var layout = form.layout, isGroup = form.isGroup, fields = form.fields;
     (0, react_1.useLayoutEffect)(function () { FORM_REF.current = form; }, [form]);
@@ -65,6 +82,18 @@ var useFormEditor = function (dataJson) {
         return len >= 8 ? 12 : 24;
     }, [isGroup, layout, fields === null || fields === void 0 ? void 0 : fields.length]);
     // 添加字段
+    var addFixedField = function (field, temPosition, groupId) {
+        if (groupId) {
+            //     setFields(insertInGroup(type, fields as FormGroup[], groupId, temPosition))
+            // } else {
+            //     setFields(insertInList(type, fields as FormItem[], temPosition))
+        }
+        else {
+            console.log(field);
+            setFields((0, arr_1.insertInList)(field.type, fields, temPosition, field));
+        }
+    };
+    // 添加字段
     var addField = function (type, temPosition, groupId) {
         if (groupId) {
             setFields((0, arr_1.insertInGroup)(type, fields, groupId, temPosition));
@@ -163,6 +192,8 @@ var useFormEditor = function (dataJson) {
     // const getForm = useCallback(()=>{})
     return {
         form: form,
+        fieldFixed: fieldFixed,
+        fieldUsed: fieldUsed,
         selected: selected,
         baseSpan: baseSpan,
         getForm: function () { return FORM_REF.current; },
@@ -173,6 +204,7 @@ var useFormEditor = function (dataJson) {
         sortField: sortField,
         addGroup: addGroup,
         addField: addField,
+        addFixedField: addFixedField,
         setFormProperties: setForm,
         setFieldProperties: setFieldProperties,
     };

package/uform/index.js

@@ -1,12 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCustom = exports.registerGroupPlugin = exports.registerFieldPlugin = exports.registerEditorPlugin = exports.FormModal = exports.FormViewer = exports.FormEditor = void 0;
-var react_1 = __importDefault(require("react"));
-var index_1 = require("../index");
-var lodash_1 = __importDefault(require("lodash"));
 var FormEditor_1 = require("./FormEditor");
 Object.defineProperty(exports, "FormEditor", { enumerable: true, get: function () { return FormEditor_1.FormEditor; } });
 var FormViewer_1 = require("./FormViewer");
@@ -18,18 +12,34 @@ Object.defineProperty(exports, "registerFieldPlugin", { enumerable: true, get: f
 Object.defineProperty(exports, "registerGroupPlugin", { enumerable: true, get: function () { return plugins_1.registerGroupPlugin; } });
 var register_1 = require("./inputs/register");
 Object.defineProperty(exports, "registerCustom", { enumerable: true, get: function () { return register_1.registerCustom; } });
-var picOptions = lodash_1.default.range(1, 17).map(function (key) { return ({ label: key, value: "/data/images/dashboard/".concat(key, ".png") }); });
-(0, register_1.registerCustom)({
-    type: 'dashboard-cover',
-    title: '快速图片选择',
-    icon: 'text.png',
-    Component: function () {
-        var width = 144, height = 81;
-        return react_1.default.createElement("div", null,
-            react_1.default.createElement(index_1.Upload, { name: "file", withCredentials: true, listType: "picture", showUploadList: false, onChange: function () { }, accept: "image/*", className: 'upload-icon-empty', data: { namespace: 'app-data', } }, react_1.default.createElement("div", { style: { width: width, height: height, marginRight: 6, textAlign: 'center', paddingTop: 12, cursor: 'pointer', borderRadius: 4, marginBottom: 6, border: '1px solid rgb(24 144 255 / 24%)' } },
-                react_1.default.createElement(index_1.Icon, { type: 'plus' }),
-                react_1.default.createElement("div", { className: "ant-upload-text" }, "\u4E0A\u4F20"))),
-            react_1.default.createElement(index_1.Row, { style: { height: 140, width: 436, overflowX: 'hidden', overflowY: 'auto', flexWrap: 'wrap' }, gutter: 8 }, picOptions.map(function (img) { return react_1.default.createElement(index_1.Col, { span: 6, style: { height: 64, marginBottom: 6, cursor: 'pointer' } },
-                react_1.default.createElement("img", { style: { height: '100%', width: '100%', borderWidth: 1, borderStyle: 'solid', borderRadius: 6, borderColor: 'transparent' }, src: img.value })); })));
-    }
-});
+// const picOptions = _.range(1, 17).map((key) => ({ label: key, value: `/data/images/dashboard/${key}.png` }));
+// registerCustom({
+//     type: 'dashboard-cover',
+//     title: '快速图片选择',
+//     icon: 'text.png',
+//     Component: () => {
+//         const width = 144, height = 81;
+//         return <div>
+//             <Upload
+//                 name="file"
+//                 withCredentials={true}
+//                 listType="picture"
+//                 showUploadList={false}
+//                 onChange={() => { }}
+//                 accept="image/*"
+//                 className={'upload-icon-empty'}
+//                 data={{ namespace: 'app-data', }}
+//             >{<div style={{ width, height, marginRight: 6, textAlign: 'center', paddingTop: 12, cursor: 'pointer', borderRadius: 4, marginBottom: 6, border: '1px solid rgb(24 144 255 / 24%)' }}>
+//                 <Icon type={'plus'} />
+//                 <div className="ant-upload-text">上传</div>
+//             </div>}</Upload >
+//             <Row style={{ height: 140, width: 436, overflowX: 'hidden', overflowY: 'auto', flexWrap: 'wrap' }} gutter={8}>
+//                 {picOptions.map((img) => <Col span={6} style={{ height: 64, marginBottom: 6, cursor: 'pointer' }}><img
+//                     style={{ height: '100%', width: '100%', borderWidth: 1, borderStyle: 'solid', borderRadius: 6, borderColor: 'transparent' }}
+//                     src={img.value}
+//                 // onClick={() => onChange(img.value)}
+//                 /></Col>)}
+//             </Row>
+//         </div>
+//     }
+// },)

package/uform/panel/Editor/GroupEditor.d.ts

@@ -3,5 +3,7 @@ export declare const getFieldInGroup: (el: HTMLElement) => {
     group: HTMLElement;
     field?: HTMLElement;
 };
-declare const _default: () => React.JSX.Element;
+declare const _default: ({ showSelector }: {
+    showSelector: any;
+}) => React.JSX.Element;
 export default _default;

package/uform/panel/Editor/GroupEditor.js

@@ -37,12 +37,13 @@ var getFieldInGroup = function (el) {
 exports.getFieldInGroup = getFieldInGroup;
 var temPosition = null;
 var gid = null;
-exports.default = (function () {
+exports.default = (function (_a) {
+    var showSelector = _a.showSelector;
     var editor = (0, useEditor_1.useEditor)();
     if (!editor.form.isGroup) {
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
-    var _a = editor.form, groupType = _a.groupType, baseSpan = _a.baseSpan;
+    var _b = editor.form, groupType = _b.groupType, baseSpan = _b.baseSpan;
     var Editor = function () {
         switch (groupType) {
             case 'collapse':
@@ -69,6 +70,11 @@ exports.default = (function () {
             editor.sortField(data, temPosition, gid);
             return;
         }
+        if (editor.fieldFixed) {
+            var fieldType = evt.dataTransfer.getData('field');
+            showSelector(fieldType, temPosition, gid);
+            return;
+        }
         var viewType = evt.dataTransfer.getData('view');
         editor.addField(viewType, temPosition, gid);
     };

package/uform/panel/Editor/ListEditor.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 export declare const getFieldInList: (el: HTMLElement) => HTMLElement;
-declare const _default: () => React.JSX.Element;
+declare const _default: ({ showSelector }: {
+    showSelector: any;
+}) => React.JSX.Element;
 export default _default;

package/uform/panel/Editor/ListEditor.js

@@ -18,7 +18,8 @@ var getFieldInList = function (el) {
     return (0, exports.getFieldInList)(el.parentElement);
 };
 exports.getFieldInList = getFieldInList;
-exports.default = (function () {
+exports.default = (function (_a) {
+    var showSelector = _a.showSelector;
     var editor = (0, useEditor_1.useEditor)();
     var fields = editor.form.fields, baseSpan = editor.baseSpan;
     var onDrop = function (evt) {
@@ -30,6 +31,11 @@ exports.default = (function () {
             editor.sortField(data, temPosition);
             return;
         }
+        if (editor.fieldFixed) {
+            var fieldType = evt.dataTransfer.getData('field');
+            showSelector(fieldType, temPosition);
+            return;
+        }
         var viewType = evt.dataTransfer.getData('view');
         editor.addField(viewType, temPosition);
     };

package/uform/panel/Editor/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,14 +37,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
 var useEditor_1 = require("../../hooks/useEditor");
 var index_1 = require("../../../index");
 var ListEditor_1 = __importStar(require("./ListEditor"));
 var GroupEditor_1 = __importStar(require("./GroupEditor"));
+var hooks_1 = require("../../../hooks");
+var InputSelector_1 = require("../Items/InputSelector");
 exports.default = (function () {
     var editor = (0, useEditor_1.useEditor)();
-    var _a = editor.form, isGroup = _a.isGroup, tip = _a.tip;
+    var _a = (0, hooks_1.useOpenState)(), open = _a.open, data = _a.data, show = _a.show, hide = _a.hide;
+    var _b = editor.form, isGroup = _b.isGroup, tip = _b.tip;
+    var typeRef = (0, react_1.useRef)('text');
     var clazz = ['panel-content', 'uform-canvas'];
     if (editor.baseSpan == 24) {
         clazz.push('uform-canvas-single');
@@ -41,11 +57,27 @@ exports.default = (function () {
     else {
         clazz.push('uform-canvas-multi');
     }
-    var CanvasEditor = function () {
-        if (isGroup) {
-            return react_1.default.createElement(GroupEditor_1.default, null);
+    var showSelector = function (field, pos, groupId) {
+        if (editor.fieldUsed.has(field)) {
+            index_1.message.error("\u5B57\u6BB5: ".concat(field, " \u5DF2\u7ECF\u88AB\u4F7F\u7528\u4E86"));
+            return;
         }
-        return react_1.default.createElement(ListEditor_1.default, null);
+        var f = lodash_1.default.find(editor.fieldFixed, { field: field });
+        if (f == null) {
+            index_1.message.error("\u6CA1\u6709\u5B9A\u4E49\u5B57\u6BB5: ".concat(field, " "));
+            return;
+        }
+        typeRef.current = f.type || 'text';
+        show({ field: __assign(__assign({}, f), { type: typeRef.current }), pos: pos, groupId: groupId });
+    };
+    var onSelector = function () {
+        hide();
+        editor.addFixedField(__assign(__assign({}, data.field), { type: typeRef.current }), data.pos, data.groupId);
+    };
+    var CanvasEditor = function () {
+        if (isGroup)
+            return react_1.default.createElement(GroupEditor_1.default, { showSelector: showSelector });
+        return react_1.default.createElement(ListEditor_1.default, { showSelector: showSelector });
     };
     var onClick = function (evt) {
         evt.preventDefault();
@@ -72,12 +104,21 @@ exports.default = (function () {
             editor.setSelected({ group: el.group.id });
         }
     };
-    return react_1.default.createElement(index_1.Form, { labelCol: { sm: 6 }, wrapperCol: { sm: 18 }, onClick: onClick, className: clazz.join(' ') },
-        (tip && tip.text) && react_1.default.createElement("div", { onClick: function (evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                editor.setSelected(null);
-            } },
-            react_1.default.createElement(index_1.Alert, { type: tip.type || 'info', message: tip.text })),
-        react_1.default.createElement(CanvasEditor, null));
+    return react_1.default.createElement(react_1.default.Fragment, null,
+        react_1.default.createElement(index_1.Form, { labelCol: { sm: 6 }, wrapperCol: { sm: 18 }, onClick: onClick, className: clazz.join(' ') },
+            (tip && tip.text) && react_1.default.createElement("div", { onClick: function (evt) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                    editor.setSelected(null);
+                } },
+                react_1.default.createElement(index_1.Alert, { type: tip.type || 'info', message: tip.text })),
+            react_1.default.createElement(CanvasEditor, null)),
+        open && react_1.default.createElement(index_1.Modal, { onCancel: hide, open: true, title: react_1.default.createElement("span", null,
+                "\u8BF7\u9009\u62E9\u5B57\u6BB5\u7C7B\u578B ",
+                open && react_1.default.createElement("span", null,
+                    data.field.title,
+                    " / ",
+                    react_1.default.createElement("small", null,
+                        react_1.default.createElement("i", null, data.field.field)))), width: 960, bodyStyle: { maxHeight: 520, overflow: 'auto' }, onOk: onSelector },
+            react_1.default.createElement(InputSelector_1.InputSelector, { field: data.field, onChange: function (type) { return typeRef.current = type; } })));
 });

package/uform/panel/Items/Fields.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import type { FormEditorProps } from '../../FormEditor';
+export declare const Fields: React.FC<Pick<FormEditorProps, 'fields'>>;

package/uform/panel/Items/Fields.js

@@ -0,0 +1,42 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Fields = void 0;
+var react_1 = __importStar(require("react"));
+var useEditor_1 = require("../../hooks/useEditor");
+var Fields = function (props) {
+    var _a = (0, useEditor_1.useEditor)(), fieldFixed = _a.fieldFixed, fieldUsed = _a.fieldUsed;
+    var fields = (0, react_1.useMemo)(function () {
+        if (fieldFixed == false)
+            return [];
+        return fieldFixed.filter(function (item) { return !fieldUsed.has(item.field); });
+    }, [fieldFixed, fieldUsed]);
+    return react_1.default.createElement(react_1.default.Fragment, null,
+        react_1.default.createElement("ul", { className: 'uform-editor-fields' }, fields.map(function (item) { return react_1.default.createElement("li", { key: item.field, draggable: true, onDragStart: function (evt) { return evt.dataTransfer.setData("field", item.field); } },
+            react_1.default.createElement("span", null, item.field),
+            " ",
+            react_1.default.createElement("small", null, item.title)); })));
+};
+exports.Fields = Fields;

package/uform/panel/Items/InputSelector.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { FixField } from '../../schema';
+export declare const InputSelector: React.FC<{
+    field: FixField;
+    onChange: (type: string) => void;
+}>;

package/uform/panel/Items/InputSelector.js

@@ -0,0 +1,122 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InputSelector = void 0;
+var react_1 = __importStar(require("react"));
+var inputs_1 = require("../../inputs");
+var index_1 = require("../../../index");
+var Inputs_1 = require("./Inputs");
+var InputSelector = function (props) {
+    var _a = __read((0, react_1.useState)(props.field.type || 'text'), 2), currentType = _a[0], setCurrentType = _a[1];
+    var currentGroup = (0, react_1.useMemo)(function () {
+        var e_1, _a, e_2, _b;
+        try {
+            for (var Groups_1 = __values(inputs_1.Groups), Groups_1_1 = Groups_1.next(); !Groups_1_1.done; Groups_1_1 = Groups_1.next()) {
+                var group = Groups_1_1.value;
+                try {
+                    for (var _c = (e_2 = void 0, __values(group.inputs)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var input = _d.value;
+                        if (input.type == currentType) {
+                            return group.title;
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (Groups_1_1 && !Groups_1_1.done && (_a = Groups_1.return)) _a.call(Groups_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return inputs_1.Groups[0].title;
+    }, []);
+    (0, react_1.useLayoutEffect)(function () {
+        props.onChange(currentType);
+    }, [currentType]);
+    return react_1.default.createElement(index_1.Collapse, { className: 'uform-editor-item uform-editor-item-fields', 
+        // size="small"
+        bordered: false, defaultActiveKey: currentGroup }, inputs_1.Groups.map(function (group) {
+        var inputs = group.inputs.filter(function (item) {
+            var ipt = (0, inputs_1.getInput)(item.type);
+            if (ipt.fieldCount && ipt.fieldCount > 1)
+                return false;
+            return true;
+        });
+        // const 
+        if (inputs.length == 0)
+            return react_1.default.createElement(react_1.default.Fragment, null);
+        return react_1.default.createElement(index_1.Collapse.Panel, { key: group.title, header: group.title },
+            react_1.default.createElement("ul", null, inputs.map(function (item) { return react_1.default.createElement("li", { className: item.type == currentType ? 'uform-editor-item-field-active' : undefined, key: item.type, onClick: function () { return setCurrentType(item.type); } },
+                react_1.default.createElement(Inputs_1.Item, __assign({}, item))); })));
+    }));
+};
+exports.InputSelector = InputSelector;

package/uform/panel/Items/Inputs.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import type { FormInput } from '../../inputs';
+export declare const Item: React.FC<FormInput>;
+export declare const Inputs: () => React.JSX.Element;

package/uform/panel/Items/Inputs.js

@@ -0,0 +1,38 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Inputs = exports.Item = void 0;
+var react_1 = __importDefault(require("react"));
+var inputs_1 = require("../../inputs");
+var utils_1 = require("../../../utils");
+var index_1 = require("../../../index");
+var Item = function (props) { return react_1.default.createElement("div", { className: 'field-type-item' },
+    react_1.default.createElement("img", { src: utils_1.PageUtil.resolveURL('/images/vform/' + props.icon) }),
+    react_1.default.createElement("span", null, props.title)); };
+exports.Item = Item;
+var Inputs = function () { return react_1.default.createElement(react_1.default.Fragment, null,
+    react_1.default.createElement("div", { className: 'panel-title' }, "\u8F93\u5165"),
+    react_1.default.createElement("div", { className: 'panel-content uform-editor-item' },
+        react_1.default.createElement(index_1.Collapse, { accordion: true, defaultActiveKey: inputs_1.Groups[0].title }, inputs_1.Groups.map(function (group) {
+            var inputs = group.inputs;
+            if (inputs.length == 0) {
+                return [];
+            }
+            return react_1.default.createElement(index_1.Collapse.Panel, { key: group.title, header: group.title },
+                react_1.default.createElement("ul", null, inputs.map(function (item) { return react_1.default.createElement("li", { key: item.type, draggable: true, onDragStart: function (evt) { return evt.dataTransfer.setData("view", item.type); } },
+                    react_1.default.createElement(exports.Item, __assign({}, item))); })));
+        })))); };
+exports.Inputs = Inputs;

package/uform/panel/Items/index.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-declare const _default: () => React.JSX.Element;
+import type { FormEditorProps } from '../../FormEditor';
+declare const _default: (props: Pick<FormEditorProps, 'fields'>) => React.JSX.Element;
 export default _default;

package/uform/panel/Items/index.js

@@ -1,34 +1,14 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
-var inputs_1 = require("../../inputs");
-var index_1 = require("../../../index");
-var Item = function (props) { return react_1.default.createElement("div", { className: 'field-type-item' },
-    react_1.default.createElement("img", { src: '/images/vform/' + props.icon }),
-    react_1.default.createElement("span", null, props.title)); };
-exports.default = (function () { return react_1.default.createElement(react_1.default.Fragment, null,
-    react_1.default.createElement("div", { className: 'panel-title' }, "\u8F93\u5165"),
-    react_1.default.createElement("div", { className: 'panel-content', id: "uform-editor-item" },
-        react_1.default.createElement(index_1.Collapse, { accordion: true, defaultActiveKey: inputs_1.Groups[0].title }, inputs_1.Groups.map(function (group) {
-            var inputs = group.inputs;
-            if (inputs.length == 0) {
-                return [];
-            }
-            return react_1.default.createElement(index_1.Collapse.Panel, { key: group.title, header: group.title },
-                react_1.default.createElement("ul", null, inputs.map(function (item) { return react_1.default.createElement("li", { key: item.type, draggable: true, onDragStart: function (evt) { return evt.dataTransfer.setData("view", item.type); } },
-                    react_1.default.createElement(Item, __assign({}, item))); })));
-        })))); });
+var lodash_1 = __importDefault(require("lodash"));
+var Fields_1 = require("./Fields");
+var Inputs_1 = require("./Inputs");
+exports.default = (function (props) {
+    if (lodash_1.default.isArray(props.fields) && props.fields.length)
+        return react_1.default.createElement(Fields_1.Fields, { fields: props.fields });
+    return react_1.default.createElement(Inputs_1.Inputs, null);
+});

package/uform/panel/Propreties/_ItemBase.js

@@ -41,8 +41,11 @@ var plugins_1 = require("../../plugins");
 var FieldPlugin_1 = require("./Component/FieldPlugin");
 var OptionTable_1 = require("./Component/OptionTable");
 var _register_1 = require("../../../components/UForm/_register");
+var useEditor_1 = require("../../hooks/useEditor");
 exports.default = (function (props) {
     var _a, _b;
+    var fieldFixed = (0, useEditor_1.useEditor)().fieldFixed;
+    var disabled = fieldFixed !== false;
     var setFieldProperties = props.setFieldProperties, field = props.field, input = props.input, baseSpan = props.baseSpan;
     var config = field.config || {};
     var setConfig = function (key, value) {
@@ -55,7 +58,7 @@ exports.default = (function (props) {
     };
     return react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(index_1.Form.Item, { label: "\u5B57\u6BB5\u540D", required: true },
-            react_1.default.createElement(index_1.Input, { size: 'small', value: field.field, onChange: function (evt) { return setFieldProperties('field', evt.target.value); } })),
+            react_1.default.createElement(index_1.Input, { disabled: disabled, size: 'small', value: field.field, onChange: function (evt) { return setFieldProperties('field', evt.target.value); } })),
         react_1.default.createElement(index_1.Form.Item, { label: "\u6807\u9898", required: true },
             react_1.default.createElement(index_1.Input, { size: 'small', value: field.title, onChange: function (evt) { return setFieldProperties('title', evt.target.value); } })),
         input.defaultPlaceholder && react_1.default.createElement(index_1.Form.Item, { label: "\u7A7A\u503C\u5360\u4F4D" },

package/uform/plugins/index.js

@@ -18,7 +18,7 @@ var PluginSlot;
     // 字段属性 - 高级
     PluginSlot[PluginSlot["FIELD_ADVANCE"] = 6] = "FIELD_ADVANCE";
 })(PluginSlot || (exports.PluginSlot = PluginSlot = {}));
-// const FiledPlugins = new Map()
+// const FieldPlugins = new Map()
 var FieldPlugins = new Map();
 var registerFieldPlugin = function (slot, type) {
     return [];

package/uform/schema.d.ts

@@ -49,7 +49,7 @@ export type Link = FunctionCode & {
  * 说明：为了保证兼容性，所有字段尽量与VAP UFormField 一致。以保证 schema Json 可以支持使用。
  * 如果有 点 _开头的属性，说明需要使用转换工具进行转换
 */
-export type FormItem = Pick<UFormField, 'field' | 'title' | 'span' | 'placeholder' | 'roleCode' | 'ik' | 'required' | 'tip' | 'extra' | 'help' | 'options' | 'ignore' | 'show' | 'disabled' | 'config' | 'columns'> & {
+export type FormItem = Pick<UFormField, 'field' | 'title' | 'span' | 'placeholder' | 'roleCode' | 'ik' | 'dataType' | 'required' | 'tip' | 'extra' | 'help' | 'options' | 'ignore' | 'show' | 'disabled' | 'config' | 'columns'> & {
     /**
      * itemId 唯一标识
      * */
@@ -157,4 +157,8 @@ type BaseForm = {
     [properties: string]: any;
 };
 export type FormSchema = BaseForm & (_ListSchema | _GroupSchema);
+/**
+ * 固定字段定义，用于字段接取模式
+*/
+export type FixField = Pick<UFormField, 'field' | 'title' | 'type' | 'dataType' | 'config'>;
 export {};

package/uform/utils/arr.d.ts

@@ -1,6 +1,6 @@
-import type { FormItem, FormGroup, Cursor } from "../schema";
+import type { FormItem, FormGroup, Cursor, FixField } from "../schema";
 import type { PlainObject } from '../../basetype';
-export declare const insertInList: (fieldType: string, list: FormItem[], pos?: Cursor) => FormItem[];
+export declare const insertInList: (fieldType: string, list: FormItem[], pos?: Cursor, fixField?: FixField) => FormItem[];
 export declare const insertInGroup: (fieldType: string, list: FormGroup[], groupId: string, pos?: Cursor) => FormGroup[];
 export declare const sortList: (id: string, fields: FormItem[], pos: Cursor) => FormItem[];
 export declare const sortListInGroup: (id: string, fields: FormGroup[], groupId: string, pos?: Cursor) => FormGroup[];

package/uform/utils/arr.js

@@ -58,9 +58,10 @@ var insertFieldInList = function (field, list, pos) {
     return __spreadArray(__spreadArray(__spreadArray([], __read(lodash_1.default.slice(list, 0, inSertPos)), false), [field], false), __read(lodash_1.default.slice(list, inSertPos)), false);
 };
 // 插入一个字段到列表指定位置
-var insertInList = function (fieldType, list, pos) {
+var insertInList = function (fieldType, list, pos, fixField) {
     var _a;
     if (pos === void 0) { pos = null; }
+    if (fixField === void 0) { fixField = null; }
     var info = (0, inputs_1.getInput)(fieldType);
     if (info == null) {
         antd_1.message.error('无此类型');
@@ -68,6 +69,10 @@ var insertInList = function (fieldType, list, pos) {
     }
     var key = utils_1.StringUtil.genKey();
     var field = { id: key, type: fieldType, title: info.title, field: key };
+    if (fixField) {
+        field.field = fixField.field;
+        field.title = fixField.title;
+    }
     if (info.defaultProperties)
         lodash_1.default.assign(field, info.defaultProperties);
     if (info.defaultConfig)

package/utils/Renders/ApiGetRender.js

@@ -122,7 +122,7 @@ var loadApi = function (option) { return __awaiter(void 0, void 0, void 0, funct
                 result = _a.sent();
                 if (!cache.loaded) {
                     arr = (0, _define_1.getList)(result);
-                    arr.map(function (item) { return cache.map.set(item[option.valueFiled] + '', item[option.nameField]); });
+                    arr.map(function (item) { return cache.map.set(item[option.valueField] + '', item[option.nameField]); });
                     cache.loaded = true;
                 }
                 return [2 /*return*/, true];
@@ -234,7 +234,7 @@ var ApiGetRender = function (options) {
                             }
                             arr = (0, _define_1.getList)(result);
                             arr.map(function (item) {
-                                apiOptions.push({ label: item[options.nameField], value: format(item[options.valueFiled]) });
+                                apiOptions.push({ label: item[options.nameField], value: format(item[options.valueField]) });
                             });
                             setState(apiOptions);
                             return [2 /*return*/];
@@ -255,7 +255,7 @@ var ApiGetRender = function (options) {
         var resp = (0, XHR_1.GETSYNC)(options.api);
         var map = new Map();
         var arr = (0, _define_1.getList)(resp);
-        arr.map(function (item) { return map.set(item[options.valueFiled] + '', item[options.nameField]); });
+        arr.map(function (item) { return map.set(item[options.valueField] + '', item[options.nameField]); });
         API_CACHES.set(options.api, {
             fetcher: index_1.Ajax.GET(options.api),
             loaded: true,
@@ -276,4 +276,4 @@ var ApiGetRender = function (options) {
     return fn;
 };
 exports.ApiGetRender = ApiGetRender;
-// export const roleRender = ApiGetRender({ api: GLOBAL.CONFIG.ADMIN.ROLE, nameField: 'name', valueFiled: 'id', });
+// export const roleRender = ApiGetRender({ api: GLOBAL.CONFIG.ADMIN.ROLE, nameField: 'name', valueField: 'id', });

package/utils/Renders/ApiPostRender.js

@@ -141,7 +141,7 @@ var _ApiPostRender = function (props) {
                     cache[cacheKey] = true;
                     index_1.CacheUtil.set(KEY, cache);
                     update();
-                    return [4 /*yield*/, index_1.Ajax.POST(props.api, __assign(__assign({}, props.param), (_a = {}, _a[props.valueFiled] = props.value, _a)), { process: false })];
+                    return [4 /*yield*/, index_1.Ajax.POST(props.api, __assign(__assign({}, props.param), (_a = {}, _a[props.valueField] = props.value, _a)), { process: false })];
                 case 5:
                     resp = _b.sent();
                     result = getLabel(props, resp, cacheKey);
@@ -203,7 +203,7 @@ var ApiPostRender = function (options) {
         var _a;
         var result = getInCache(KEY, key);
         if (result === null) {
-            var resp = (0, XHR_1.POSTSYNC)(options.api, __assign(__assign({}, options.param), (_a = {}, _a[options.valueFiled] = key, _a)));
+            var resp = (0, XHR_1.POSTSYNC)(options.api, __assign(__assign({}, options.param), (_a = {}, _a[options.valueField] = key, _a)));
             result = getLabel(options, resp, key);
         }
         if (result == false)

package/utils/Renders/StringRender.d.ts

@@ -1,4 +1,4 @@
-import { BaseRenderOptions, Render } from './_define';
+import type { BaseRenderOptions, Render } from './_define';
 export declare const StrRender: (options?: number | BaseRenderOptions) => Render;
 /**
  * 返回一个 htmlRender，用于显示自定义的html,会用div包住

package/utils/Renders/_define.d.ts

@@ -4,13 +4,17 @@ export type BaseRenderOptions = {
     className?: string;
     default?: React.ReactNode;
     onlyText?: boolean;
+    bold?: boolean;
+    underline?: boolean;
+    italic?: boolean;
+    color?: string;
     format?: (param: string) => string;
     len?: number;
 };
 export type ApiRenderOptions = BaseRenderOptions & {
     api: string;
     nameField: string;
-    valueFiled: string;
+    valueField: string;
     render?: (info: BaseOption) => React.ReactNode;
 };
 export declare const getValue: (txt: string, options: BaseRenderOptions) => string | React.ReactNode;

package/utils/Renders/_define.js

@@ -24,9 +24,19 @@ var getValue = function (txt, options) {
     if (options.len && str.length > options.len) {
         str = str.substring(0, options.len) + '...';
     }
-    if (options.onlyText || options.className == null)
+    var clazz = [];
+    if (options.className)
+        clazz.push(options.className);
+    if (options.bold)
+        clazz.push('font-bold');
+    if (options.italic)
+        clazz.push('font-italic');
+    if (options.underline)
+        clazz.push('font-underline');
+    var style = options.color ? { color: options.color } : undefined;
+    if (options.onlyText || (clazz.length == 0 && style == undefined))
         return str;
-    return react_1.default.createElement("span", { className: options.className, title: txt }, str);
+    return react_1.default.createElement("span", { className: clazz.join(' '), style: style, title: txt }, str);
 };
 exports.getValue = getValue;
 var convertValue = function (value, config) {