vap1 0.3.2 → 0.3.4

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/TreeSelect/BaseTreeSelect.js

@@ -64,7 +64,6 @@ var lodash_1 = __importStar(require("lodash"));
 var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
 var HighLight_1 = require("../_common/HighLight");
-;
 var Icon_1 = require("../_adapt/Icon");
 var utils_1 = require("../../utils");
 var hooks_1 = require("../../hooks");

package/components/TreeSelect/DTreeSelect.js

@@ -224,8 +224,6 @@ var _DTreeSelect = function (props) {
         var key = treeState.treeData[0][treeState.keyField];
         treeProps.treeDefaultExpandedKeys = [key];
     }
-    if (treeState.valueField == null)
-        treeProps.value = value;
     var loadData = function (dataNode) { return __awaiter(void 0, void 0, void 0, function () {
         var data, children;
         return __generator(this, function (_a) {
@@ -241,9 +239,7 @@ var _DTreeSelect = function (props) {
             }
         });
     }); };
-    if (!treeState.inited)
-        return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, treeProps, extraProps, { disabled: props.disabled, loadData: loadData }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, treeProps, extraProps, { value: value == null ? undefined : value, disabled: props.disabled, loadData: loadData }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 var DTreeSelect = function (props) { return react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, __assign({}, props),
     react_1.default.createElement(_DTreeSelect, __assign({}, props))); };

package/components/TreeSelect/FTreeSelect.js

@@ -80,11 +80,9 @@ var _FTreeSelect = function (props) {
     // 如果根节点只有一个，则自动展开这个根结点
     if (treeState.treeData.length == 1)
         treeProps.treeDefaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
-    if (treeState.valueField == null)
-        treeProps.value = value;
     if (!treeState.inited)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, treeProps, extraProps, { disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, treeProps, extraProps, { value: value == null ? undefined : value, disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 var FTreeSelect = function (props) { return react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, __assign({}, props),
     react_1.default.createElement(_FTreeSelect, __assign({}, props))); };

package/components/TreeSelect/STreeSelect.js

@@ -26,7 +26,7 @@ var _STreeSelect = function (props) {
     // 说明，等待数据处理好了再绑定，让 defaultExpand 之类的默认属性能生效
     if (!treeState.inited)
         return utils_1.Const.NONE;
-    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, extraProps, { value: treeState.valueField ? undefined : value, disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
+    return react_1.default.createElement(antd_1.TreeSelect, __assign({}, baseProps, extraProps, { value: value == null ? undefined : value, disabled: props.disabled }), (0, BaseTreeSelect_1.renderRoot)(props, treeState));
 };
 var STreeSelect = function (props) { return react_1.default.createElement(BaseTreeSelect_1.BaseTreeSelect, __assign({}, props),
     react_1.default.createElement(_STreeSelect, __assign({}, props))); };

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/UForm.js

@@ -137,12 +137,12 @@ var onChangeEvent = function (state, field, form, update, values, extra) {
     var needUpdate = false;
     var pushBus = function (targetField, result) {
         if (result === null) {
-            value[targetField] = undefined;
+            lodash_1.default.unset(value, targetField);
         }
         else if (lodash_1.default.isPlainObject(result)) {
             var data = result;
             if (lodash_1.default.has(data, 'value'))
-                value[targetField] = data.value;
+                lodash_1.default.set(value, targetField, data.value);
             if (lodash_1.default.has(data, 'required')) {
                 if (!requireFields.current.has(targetField)) {
                     needUpdate = true;
@@ -191,7 +191,7 @@ var onChangeEvent = function (state, field, form, update, values, extra) {
             }
         }
         else {
-            value[targetField] = result;
+            lodash_1.default.set(value, targetField, result);
         }
         size++;
         if (size == field.link.length) {
@@ -380,11 +380,11 @@ var getValue = function (multipleFields, values, initRef) {
     var RTNData = __assign(__assign({}, initRef === null || initRef === void 0 ? void 0 : initRef.current), values);
     lodash_1.default.keys(RTNData).map(function (property) {
         if (multipleFields.has(property)) {
-            var conbined_1 = RTNData[property];
+            var conbined_1 = lodash_1.default.get(RTNData, property);
             var fields = property.split(',').map(lodash_1.default.trim);
             fields.map(function (field) {
                 if (lodash_1.default.has(conbined_1, field))
-                    data[field] = conbined_1[field];
+                    lodash_1.default.set(data, field, lodash_1.default.get(conbined_1, field));
             });
             return;
         }
@@ -405,14 +405,13 @@ var initValue = function (props) {
     var e_1, _a;
     var values = __assign(__assign({}, props.default), props.data);
     var _loop_1 = function (key) {
-        var _d;
         var fields = key.split(',').map(lodash_1.default.trim);
         if (fields.length == 1) {
             if (lodash_1.default.has(values, key)) {
-                values[key] = (_d = {}, _d[key] = values[key], _d);
+                lodash_1.default.set(values, key, lodash_1.default.get(values, key));
             }
             else {
-                values[key] = {};
+                lodash_1.default.set(values, key, {});
             }
         }
         else {
@@ -420,7 +419,7 @@ var initValue = function (props) {
                 if (lodash_1.default.has(values, item)) {
                     if (!lodash_1.default.has(values, key))
                         values[key] = {};
-                    values[key][item] = values[item];
+                    lodash_1.default.set(values[key], item, lodash_1.default.get(values, item));
                 }
             });
         }
@@ -451,11 +450,11 @@ var _FormField = function (props) {
         props.fields.map(function (field) {
             if (field == null || field == false)
                 return;
-            if (!lodash_1.default.has(values, field.field) || values[field.field] === null || values[field.field] === undefined)
+            if (!lodash_1.default.has(values, field.field) || lodash_1.default.get(values, field.field) === null || lodash_1.default.get(values, field.field) === undefined)
                 return;
             // setFieldsValue 要 render 后才能get ,延时执行 link事件
             if (lodash_1.default.isArray(field.link) && field.link.length > 0)
-                setTimeout(function () { return onChangeEvent(props.state, field, form, update, values[field.field]); }, 2);
+                setTimeout(function () { return onChangeEvent(props.state, field, form, update, lodash_1.default.get(values, field.field)); }, 2);
         });
         update();
     }, []);
@@ -481,11 +480,11 @@ var _FormGroup = function (props) {
                 // @ts-ignore
                 if (field == null || field == false)
                     return;
-                if (!lodash_1.default.has(values, field.field) || values[field.field] === null || values[field.field] === undefined)
+                if (!lodash_1.default.has(values, field.field) || lodash_1.default.get(values, field.field) === null || lodash_1.default.get(values, field.field) === undefined)
                     return;
                 // setFieldsValue 要 render 后才能get ,延时执行 link事件
                 if (lodash_1.default.isArray(field.link) && field.link.length > 0)
-                    setTimeout(function () { return onChangeEvent(props.state, field, form, update, values[field.field]); }, 2);
+                    setTimeout(function () { return onChangeEvent(props.state, field, form, update, lodash_1.default.get(values, field.field)); }, 2);
             });
         });
         update();

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/components/_common/Upagination.js

@@ -16,7 +16,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UPagination = void 0;
 var react_1 = __importDefault(require("react"));
-// import { Pagination } from '../_adapt/Pagination';
 var antd_1 = require("antd");
 var utils_1 = require("../../utils");
 var i18n_1 = require("../../utils/i18n");

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.4","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;