vap1 0.3.5 → 0.3.7

package/components/Box/SelectBar.d.ts

@@ -52,6 +52,10 @@ type _BoxSelectBarProps = BaseItem & {
      * 操作区域
     */
     actions?: SelectBarAction[];
+    /**
+     * 初始为收起状态，默认不收起
+    */
+    defaultCollapse?: boolean;
     /**
      * 边栏状态变更触发
     */

package/components/Box/SelectBar.js

@@ -64,7 +64,7 @@ var _i18n_1 = require("../_i18n");
 var Icon_1 = require("../_adapt/Icon");
 exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
     var _a = __read((0, react_1.useState)(null), 2), keyword = _a[0], setKeyword = _a[1];
-    var _b = __read((0, hooks_1.useToggle)(false), 2), collapsed = _b[0], setCollapsed = _b[1];
+    var _b = __read((0, hooks_1.useToggle)(props.defaultCollapse || false), 2), collapsed = _b[0], setCollapsed = _b[1];
     // const setKeyword = _.debounce(_setKeyword, 100);
     var component = (0, _register_1.getSelectBar)(props.type);
     (0, react_1.useLayoutEffect)(function () {

package/components/Tables/VTable.js

@@ -129,6 +129,14 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
             ref.current.onSelected();
         }
     }, [list]);
+    (0, react_1.useLayoutEffect)(function () {
+        if (!isQuerying || !utils_1.GLOBAL.CONFIG.TABLE.UNSELECT_ON_QUERY)
+            return;
+        if (ref.current.selected[0].length > 0) {
+            ref.current.selected = [[], []];
+            ref.current.onSelected();
+        }
+    }, [isQuerying]);
     // 初始选中
     var isFristMounted = (0, hooks_1.useFirstMountState)();
     (0, react_1.useLayoutEffect)(function () {

package/components/TreeSelect/index.d.ts

@@ -29,7 +29,7 @@ type TreeValue = Single | Multi;
 /**
  * 基础参数
 */
-export type BaseTreeSelectProps = BaseTreeOpts & TreeValue & Pick<TreeSelectProps<any>, 'className' | 'style' | 'placeholder' | 'treeDefaultExpandAll' | 'allowClear' | 'disabled' | 'showSearch' | 'maxTagCount'> & {
+export type BaseTreeSelectProps = BaseTreeOpts & TreeValue & Pick<TreeSelectProps<any>, 'className' | 'dropdownClassName' | 'style' | 'placeholder' | 'treeDefaultExpandAll' | 'allowClear' | 'disabled' | 'showSearch' | 'maxTagCount'> & {
     /**
      * 树显示Icon字段 ，默认为空，传入后，以此字段显示图标
     */

package/components/Trees/ActionTree.d.ts

@@ -17,7 +17,7 @@ export type CacheTree = {
     */
     clearCache: Function;
     /**
-     *
+     * 获取子节点方法
     */
     getChildren?: Function;
 };

package/components/Trees/ActionTree.js

@@ -121,6 +121,7 @@ var INSER_POS;
 })(INSER_POS || (INSER_POS = {}));
 ;
 var txt = utils_1.i18n.txt;
+var tipResponse = utils_1.TipUtil.tipResponse, tipResponseBatch = utils_1.TipUtil.tipResponseBatch, TIP_ACTION = utils_1.TipUtil.TIP_ACTION, TIP_ACTION_BATCH = utils_1.TipUtil.TIP_ACTION_BATCH;
 var ActionTreeContext = (0, react_1.createContext)(null);
 var useActionTree = function () { return (0, react_1.useContext)(ActionTreeContext); };
 exports.useActionTree = useActionTree;
@@ -151,6 +152,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
     if (props.notCache)
         action.notCache = true;
     action.objectName = utils_1.i18n.getText(props.ik, props.objectName, _i18n_1.V.TREE_NODE);
+    var tipOptions = (0, react_1.useMemo)(function () { return ({ label: action.objectName, field: treeState.titleField }); }, []);
     if (props.api) {
         action.api = props.api;
         if (props.canAdd) {
@@ -181,7 +183,8 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
             var treeData = treeState.treeData;
             var node = lodash_1.default.get(treeData, nodePath);
             if (node == null) {
-                antd_1.message.error('No parent found');
+                // message.error('No parent found')
+                return;
             }
             add(data, { pos: INSER_POS.INNER, node: node, position: position });
         }
@@ -208,7 +211,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
     var showEdit = function (node, position) { return modals.showEdit(node, { position: position }); };
     // ref.
     var addRoot = function (data, extra) { return __awaiter(void 0, void 0, void 0, function () {
-        var pos, position, parentField, titleField, sortField, rootCode, treeData, child, api, objectName, sort, param, result, tree;
+        var pos, position, parentField, titleField, sortField, rootCode, treeData, child, api, sort, param, response, isSuccess, tree;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -233,7 +236,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         }
                         return [2 /*return*/];
                     }
-                    api = action.api, objectName = action.objectName;
+                    api = action.api;
                     sort = 0;
                     if (treeData.length) {
                         if (pos == INSER_POS.TOP) {
@@ -246,21 +249,19 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     param = __assign(__assign({}, data), (_a = {}, _a[parentField] = rootCode, _a.sort = sort, _a));
                     return [4 /*yield*/, utils_1.Ajax.PUT(api, param)];
                 case 1:
-                    result = _b.sent();
-                    if (result.code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    response = _b.sent();
+                    isSuccess = tipResponse(response, TIP_ACTION.ADD, param, tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
-                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     props.clearCache(rootCode);
-                    tree = utils_1.ArrayUtil.add(treeData, result.data);
+                    tree = utils_1.ArrayUtil.add(treeData, response.data);
                     setTreeData(tree);
                     return [2 /*return*/];
             }
         });
     }); };
     var addInner = function (data, extra) { return __awaiter(void 0, void 0, void 0, function () {
-        var node, position, api, objectName, canSort, parentField, titleField, sortField, keyField, treeData, root, nodePath, rootPath, tree, arr, param, sort, resp;
+        var node, position, api, objectName, canSort, parentField, titleField, sortField, keyField, treeData, root, nodePath, rootPath, tree, arr, param, sort, response, isSuccess;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -292,13 +293,11 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     _b.label = 3;
                 case 3: return [4 /*yield*/, utils_1.Ajax.PUT(api, param)];
                 case 4:
-                    resp = _b.sent();
-                    if (resp.code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    response = _b.sent();
+                    isSuccess = tipResponse(response, TIP_ACTION.ADD, param, tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
-                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
-                    arr.push(resp.data);
+                    arr.push(response.data);
                     props.clearCache(node[keyField]);
                     lodash_1.default.set(tree, rootPath, arr);
                     setTreeData(tree);
@@ -307,7 +306,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var add = function (data, extra) { return __awaiter(void 0, void 0, void 0, function () {
-        var pos, position, root, idForApiField, api, objectName, canSort, parentField, titleField, sortField, keyField, treeData, idField, tree, idx, nodePath, arr, obj, promises, needLoop, lastSort, dataDefault, diff, i, item, len, diff, i, item, resps, resp;
+        var pos, position, root, idForApiField, api, objectName, canSort, parentField, titleField, sortField, keyField, treeData, idField, tree, idx, nodePath, arr, obj, promises, needLoop, lastSort, dataDefault, diff, i, item, len, diff, i, item, resps, response, isSuccess;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return __generator(this, function (_m) {
             switch (_m.label) {
@@ -413,13 +412,11 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, utils_1.Ajax.WHEN.apply(utils_1.Ajax, __spreadArray([], __read(promises), false))];
                 case 1:
                     resps = _m.sent();
-                    resp = resps[0];
-                    if (resp.code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.ACT_ADD_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    response = resps[0];
+                    isSuccess = tipResponse(response, TIP_ACTION.ADD, data, tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
-                    antd_1.message.success(txt(_i18n_1.V.ACT_ADD_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
-                    arr = utils_1.ArrayUtil.add(arr, resp.data);
+                    arr = utils_1.ArrayUtil.add(arr, response.data);
                     if (canSort) {
                         arr = lodash_1.default.orderBy(arr, sortField, 'asc');
                     }
@@ -453,21 +450,20 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
         setTreeData(tree);
     }, [treeState.treeData]);
     var update = (0, react_1.useCallback)(function (data, position) { return __awaiter(void 0, void 0, void 0, function () {
-        var api, objectName, parentField, titleField, treeData, resp, root, tree, idx, rootPath, nodePath, node;
+        var api, parentField, treeData, resp, isSuccess, root, tree, idx, rootPath, nodePath, node;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (position.length == 0)
                         return [2 /*return*/];
-                    api = action.api, objectName = action.objectName;
-                    parentField = treeState.parentField, titleField = treeState.titleField, treeData = treeState.treeData;
+                    api = action.api;
+                    parentField = treeState.parentField, treeData = treeState.treeData;
                     return [4 /*yield*/, utils_1.Ajax.PATCH(api, data)];
                 case 1:
                     resp = _a.sent();
-                    if (resp.code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.ACT_UPDATE_FAIL_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
+                    isSuccess = tipResponse(resp, TIP_ACTION.UPDATE, data, tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
                     root = lodash_1.default.concat([], position);
                     tree = lodash_1.default.concat([], treeData);
                     idx = root.pop();
@@ -476,15 +472,15 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         nodePath = root.map(function (i) { return "[".concat(i, "]"); }).join('.children');
                         rootPath = nodePath + '.children';
                     }
-                    antd_1.message.success(txt(_i18n_1.V.ACT_UPDATE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(data[titleField])));
                     node = lodash_1.default.get(tree, "".concat(rootPath, "[").concat(idx, "]"));
                     if (node) {
                         props.clearCache(lodash_1.default.get(node, parentField));
-                        // if (node && node.children) {
-                        //     _.set(tree, rootPath + `[${idx}]`, { ...data, children: node.children });
-                        // } else {
-                        lodash_1.default.set(tree, rootPath + "[".concat(idx, "]"), data);
-                        // }
+                        if (node && node.children) {
+                            lodash_1.default.set(tree, rootPath + "[".concat(idx, "]"), __assign(__assign({}, data), { children: node.children }));
+                        }
+                        else {
+                            lodash_1.default.set(tree, rootPath + "[".concat(idx, "]"), data);
+                        }
                         setTreeData(tree);
                     }
                     return [2 /*return*/];
@@ -492,7 +488,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); }, [treeState.treeData]);
     var del = (0, react_1.useCallback)(function (node, position) { return __awaiter(void 0, void 0, void 0, function () {
-        var root, rootPath, arr, idForApiField, keyField, parentField, titleField, treeData, api, objectName, nodePath, resp, tree;
+        var root, rootPath, arr, idForApiField, keyField, parentField, titleField, treeData, api, objectName, nodePath, resp, isSuccess, tree;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -515,10 +511,9 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, utils_1.Ajax.DELETE(api, { ids: node[idForApiField || keyField] })];
                 case 1:
                     resp = _a.sent();
-                    if (resp.code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.ACT_DELETE_FAIL_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
+                    isSuccess = tipResponse(resp, TIP_ACTION.DELETE, node, tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
                     props.clearCache(node[parentField]);
                     tree = lodash_1.default.concat([], treeData);
                     if (rootPath) {
@@ -528,13 +523,12 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = utils_1.ArrayUtil.del(tree, node[keyField], keyField);
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(_i18n_1.V.ACT_DELETE_SUCCESS_NAMED, "".concat(objectName, " : ").concat(node[titleField])));
                     return [2 /*return*/];
             }
         });
     }); }, [treeState]);
     var up = function (node, position) { return __awaiter(void 0, void 0, void 0, function () {
-        var root, parentField, keyField, sortField, treeData, api, idForApiField, idField, idx, rootPath, arr, nodePath, current, swap, tree, resp;
+        var root, parentField, keyField, sortField, treeData, api, idForApiField, idField, idx, rootPath, arr, nodePath, current, swap, tree, resp, isSuccess;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -565,10 +559,9 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, utils_1.Ajax.WHEN(utils_1.Ajax.PATCH(api, (_a = {}, _a[idField] = arr[idx][idField], _a[sortField] = swap, _a)), utils_1.Ajax.PATCH(api, (_b = {}, _b[idField] = arr[idx - 1][idField], _b[sortField] = current, _b)))];
                 case 1:
                     resp = _c.sent();
-                    if (resp[0].code != '0' || resp[1].code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.TREE_SORT_FAIL));
+                    isSuccess = tipResponseBatch(resp, TIP_ACTION_BATCH.SORT, [arr[idx - 1], arr[idx]], tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
                     props.clearCache(node[parentField]);
                     if (rootPath) {
                         lodash_1.default.set(tree, rootPath, lodash_1.default.orderBy(arr, sortField, 'asc'));
@@ -577,13 +570,12 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = lodash_1.default.orderBy(tree, sortField, 'asc');
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(_i18n_1.V.TREE_SORT_SUCCESS));
                     return [2 /*return*/];
             }
         });
     }); };
     var down = function (node, position) { return __awaiter(void 0, void 0, void 0, function () {
-        var parentField, keyField, sortField, treeData, api, idForApiField, idField, root, idx, rootPath, arr, nodePath, current, swap, tree, resp;
+        var parentField, keyField, sortField, treeData, api, idForApiField, idField, root, idx, rootPath, arr, nodePath, current, swap, tree, resp, isSuccess;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -614,10 +606,9 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                     return [4 /*yield*/, utils_1.Ajax.WHEN(utils_1.Ajax.PATCH(api, (_a = {}, _a[idField] = arr[idx][idField], _a[sortField] = swap, _a)), utils_1.Ajax.PATCH(api, (_b = {}, _b[idField] = arr[idx + 1][idField], _b[sortField] = current, _b)))];
                 case 1:
                     resp = _c.sent();
-                    if (resp[0].code != '0' || resp[1].code != '0') {
-                        antd_1.message.error(txt(_i18n_1.V.TREE_SORT_FAIL));
+                    isSuccess = tipResponseBatch(resp, TIP_ACTION_BATCH.SORT, [arr[idx + 1], arr[idx]], tipOptions);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
                     props.clearCache(node[parentField]);
                     if (rootPath) {
                         lodash_1.default.set(tree, rootPath, lodash_1.default.orderBy(arr, sortField, 'asc'));
@@ -626,7 +617,6 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                         tree = lodash_1.default.orderBy(tree, sortField, 'asc');
                     }
                     setTreeData(tree);
-                    antd_1.message.success(txt(_i18n_1.V.TREE_SORT_SUCCESS));
                     return [2 /*return*/];
             }
         });

package/components/Trees/BaseTree.js

@@ -70,7 +70,6 @@ var HighLight_1 = require("../_common/HighLight");
 var Icon_1 = require("../_adapt/Icon");
 var hooks_1 = require("../../hooks");
 var _Support_1 = require("../../utils/_Support");
-"";
 // 搜索事件延时
 var SEARCH_DELAY = 200;
 var BaseTreeContext = (0, react_1.createContext)(null);

package/components/Trees/DTree.js

@@ -129,7 +129,7 @@ var _Dtree = function (props) {
     var actionContext = (0, ActionTree_1.useActionTree)();
     var rootApi = props.rootApi, notCache = props.notCache;
     (0, hooks_1.useEffectFunction)(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var tree, rootResp, _a;
+        var tree, rootResp, isSuccess, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -140,10 +140,9 @@ var _Dtree = function (props) {
                     return [4 /*yield*/, utils_1.Ajax.GET(rootApi)];
                 case 1:
                     rootResp = _b.sent();
-                    if (rootResp.code != '0') {
-                        antd_1.message.error(rootResp.message);
+                    isSuccess = utils_1.TipUtil.tipError(rootResp);
+                    if (!isSuccess)
                         return [2 /*return*/];
-                    }
                     tree = (0, ActionTree_1.getResponseList)(rootResp, treeState.sortField);
                     return [3 /*break*/, 4];
                 case 2: return [4 /*yield*/, props.getChildren(treeState.rootCode)];

package/components/UForm/UForm.js

@@ -248,7 +248,7 @@ var renderFormField = function (state, field, form, update, data) {
         itemProps.label = react_1.default.createElement(Popover_1.Popover, { content: field.tip, placement: "top" },
             react_1.default.createElement("span", null,
                 itemProps.label,
-                react_1.default.createElement(Icon_1.Icon, { type: "question-circle", style: { marginLeft: 4, cursor: 'pointer' }, evt: true })));
+                react_1.default.createElement(Icon_1.Icon, { type: "question-circle", style: { marginLeft: 4, cursor: 'pointer' } })));
     }
     // 消除非必填项认证
     var ignoreRule = disableFields.current.has(field.field);

package/components/UForm/_input.js

@@ -91,7 +91,7 @@ exports.copyMultiValue = copyMultiValue;
 var getMultiFieldValues = function (field, value) {
     var fields = field.field.split(',').map(lodash_1.default.trim);
     if (fields.length == 1)
-        return [fields, [value || undefined]];
+        return [fields, [(typeof value == 'object' && value != null) ? value[fields[0]] : value]];
     if (value) {
         return [fields, fields.map(function (field) { return (value || {})[field]; })];
     }
@@ -142,9 +142,9 @@ var builderApiTableSerletor = function (options, nameIdx) { return function (pro
     };
     return react_1.default.createElement(react_1.default.Fragment, null,
         values[0] != undefined ? react_1.default.createElement(Button_1.Button, __assign({}, params, { onClick: function () { return setOpen(true); } }), getTip(values)) : react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), (0, exports.getPlaceholder)(field, true)),
-        react_1.default.createElement(Tables_1.ApiTableModal, { title: options.title, api: options.api, width: options.width || 720, columns: __spreadArray(__spreadArray([], __read(options.columns), false), [
+        react_1.default.createElement(Tables_1.ApiTableModal, __assign({ title: options.title, searchBar: options.searchBar, width: options.width || 720 }, field.config, { api: options.api, columns: __spreadArray(__spreadArray([], __read(options.columns), false), [
                 Tables_1.ApiTable.COL_OPERACTION({ render: function (data) { return react_1.default.createElement(Tables_1.ApiTable.ACTION, { title: "\u9009\u62E9", icon: "select", onClick: function () { return onSelect(data); } }); } })
-            ], false), searchBar: options.searchBar, open: open, onCancel: function () { return setOpen(false); } }));
+            ], false), open: open, onCancel: function () { return setOpen(false); } })));
 }; };
 /**
  * 快速注册 一个 弹出ApiTable 的选择组件

package/components/UForm/index.d.ts

@@ -321,7 +321,7 @@ export type UModalProps = UFromProps & Omit<ModalProps, 'children'> & {
     * 传 字串 string : 传数据字名称字段
     * 传  { field: string, label: string } ： 以 label: data[field] 展示
    */
-    autoTitle?: true | string | {
+    autoTitle?: string | {
         field: string;
         label: string;
     };

package/components/_adapt/Col.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
 import { ColProps as AntdColprops } from 'antd/es/grid/col';
 import type { ActButton } from '../SearchBar/ActionButtons';
-export interface ColProps extends Omit<AntdColprops, 'title'> {
+import type { UTitleProps } from '../_common/UTitle';
+export type ColProps = Omit<AntdColprops, 'title'> & UTitleProps & {
     /**
      * 面板标题前的 ICON
     */
@@ -49,5 +50,5 @@ export interface ColProps extends Omit<AntdColprops, 'title'> {
     width?: number;
     height?: number;
     bodySytle?: React.CSSProperties;
-}
+};
 export declare const Col: React.FC<ColProps>;

package/components/_adapt/Col.js

@@ -19,33 +19,8 @@ var react_1 = __importDefault(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var Loading_1 = require("../_common/Loading");
-var Icon_1 = require("./Icon");
-var utils_1 = require("../../utils");
-var ActionButtons_1 = require("../SearchBar/ActionButtons");
+var UTitle_1 = require("../_common/UTitle");
 var PANEL_PROPERTIES = ['icon', 'title', 'titleSub', 'noBg', 'loading', 'actions', 'empty', 'width', 'height', 'bodySytle'];
-var ColHead = function (props) {
-    var elAction = '';
-    var actions = [];
-    if ((lodash_1.default.isArray(props.actions) && props.actions.length)) {
-        props.actions.map(function (item) {
-            if (item.roleCode == null || utils_1.PageUtil.hasRole(item.roleCode)) {
-                actions.push(item);
-            }
-        });
-        elAction = react_1.default.createElement(ActionButtons_1.ActionButtons, { size: 'small', buttons: actions });
-    }
-    else if (lodash_1.default.isObject(props.actions) && react_1.default.isValidElement(props.actions)) {
-        elAction = props.actions;
-    }
-    if (props.title == null && actions.length == 0)
-        return utils_1.Const.NONE;
-    return react_1.default.createElement("div", { className: 'v-col-head' },
-        react_1.default.createElement("div", { className: 'c-col-title' },
-            props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon, className: 'c-col-title-icon' }),
-            react_1.default.createElement("span", { className: 'c-col-title-text' }, props.title),
-            props.titleSub && react_1.default.createElement("span", { className: 'c-col-title-sub' }, props.titleSub)),
-        react_1.default.createElement("div", { className: 'c-col-actions' }, elAction));
-};
 var Col = function (props) {
     var clazz = ['v-col'];
     if (props.className) {
@@ -97,7 +72,7 @@ var Col = function (props) {
     }
     return react_1.default.createElement(antd_1.Col, __assign({}, colProps, { className: clazz.join(' '), style: style }),
         react_1.default.createElement("div", { className: 'v-col-content' },
-            react_1.default.createElement(ColHead, __assign({}, props)),
+            react_1.default.createElement(UTitle_1.UTitle, __assign({}, lodash_1.default.omit(props, ['className', 'style']))),
             react_1.default.createElement("div", { className: 'v-col-body', style: props.bodySytle }, isLoading ? react_1.default.createElement(Loading_1.Loading, null) : (isEmpty ? react_1.default.createElement(antd_1.Empty, null) : props.children))));
 };
 exports.Col = Col;

package/components/_adapt/Icon.js

@@ -16,6 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Icon = void 0;
 var react_1 = __importDefault(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var Icon = function (props) {
     if (props.type == null || props.type == '')
@@ -40,6 +41,11 @@ var Icon = function (props) {
         };
     }
     spanProps.className = clazz.join(' ');
+    if (lodash_1.default.startsWith(props.type, '/')
+        || lodash_1.default.startsWith(props.type, 'https://')
+        || lodash_1.default.startsWith(props.type, 'https://')) {
+        return react_1.default.createElement("img", __assign({}, spanProps, { src: props.type }));
+    }
     return react_1.default.createElement("span", __assign({}, spanProps));
 };
 exports.Icon = Icon;

package/components/_common/CountUp.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { NumberFormat, FractionDigits } from '../../utils/Format';
+type FormatFunction = (number: any) => string;
 export type CountUpProps = {
     /**
      * 自定义样式
@@ -20,7 +21,7 @@ export type CountUpProps = {
     /**
      * 样式
     */
-    format?: NumberFormat;
+    format?: NumberFormat | FormatFunction;
     /**
      * pos 仅在  int-fixed 与 digtal 模式下有效
      * int-fixed
@@ -36,3 +37,4 @@ export type CountUpProps = {
  * 数据变化组件
 */
 export declare const CountUp: React.FC<CountUpProps>;
+export {};

package/components/_common/CountUp.js

@@ -62,7 +62,11 @@ var loop = function (from, to, el, format, startTime, ms) {
 var CountUp = function (props) {
     var el = (0, react_1.useRef)(null);
     var ms = lodash_1.default.isNumber(props.ms) ? props.ms : 800;
-    var format = (0, Format_1.getFormater)(props.format, props.pos);
+    var format = (0, react_1.useMemo)(function () {
+        if (lodash_1.default.isFunction(props.format))
+            return props.format;
+        return (0, Format_1.getFormater)(props.format, props.pos);
+    }, [props.format]);
     var _a = __read((0, react_1.useState)({ lastTime: Date.now(), lastValue: props.initValue || 0 }), 2), state = _a[0], setState = _a[1];
     var start = function (from, to) {
         setState({ lastTime: Date.now(), lastValue: to });

package/components/_common/Loading.d.ts

@@ -1,9 +1,8 @@
 import React from 'react';
-type LoadingProps = {
+export type LoadingProps = {
     title?: React.ReactNode;
 };
 /**
  * 通用 Loading ，用于数据请求中的效果
 */
 export declare const Loading: React.FC<LoadingProps>;
-export {};

package/components/_common/UTitle.d.ts

@@ -0,0 +1,27 @@
+import React from 'react';
+import type { ActButton } from '../SearchBar/ActionButtons';
+export type UTitleProps = {
+    className?: string;
+    style?: React.CSSProperties;
+    /**
+     * 面板标题前的 ICON
+    */
+    icon?: string;
+    /**
+    * 面板标题
+    */
+    title?: React.ReactNode;
+    /**
+     * 标题下标额外内容（以 small小一号）展示
+     */
+    titleSub?: React.ReactNode;
+    /**
+     * 标题后面的帮助文案
+    */
+    help?: React.ReactNode;
+    /**
+     * 右上角按钮
+    */
+    actions?: ActButton[] | React.ReactNode;
+};
+export declare const UTitle: (props: UTitleProps) => React.JSX.Element;

package/components/_common/UTitle.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UTitle = void 0;
+var react_1 = __importDefault(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
+var utils_1 = require("../../utils");
+var Popover_1 = require("../_adapt/Popover");
+var Icon_1 = require("../_adapt/Icon");
+var ActionButtons_1 = require("../SearchBar/ActionButtons");
+var UTitle = function (props) {
+    var elAction = '';
+    var actions = [];
+    if ((lodash_1.default.isArray(props.actions) && props.actions.length)) {
+        props.actions.map(function (item) {
+            if (item.roleCode == null || utils_1.PageUtil.hasRole(item.roleCode)) {
+                actions.push(item);
+            }
+        });
+        elAction = react_1.default.createElement(ActionButtons_1.ActionButtons, { size: 'small', buttons: actions });
+    }
+    else if (lodash_1.default.isObject(props.actions) && react_1.default.isValidElement(props.actions)) {
+        elAction = props.actions;
+    }
+    if (props.title == null && actions.length == 0)
+        return utils_1.Const.NONE;
+    return react_1.default.createElement("div", { className: utils_1.StringUtil.className(['v-col-head', 'c-title'], props.className), style: props.style },
+        react_1.default.createElement("div", { className: 'c-col-title c-title-content' },
+            props.icon && react_1.default.createElement(Icon_1.Icon, { type: props.icon, className: 'c-col-title-icon c-title-icon' }),
+            react_1.default.createElement("span", { className: 'c-col-title-text c-title-text' },
+                props.title,
+                props.help && react_1.default.createElement(Popover_1.Popover, { content: props.help },
+                    react_1.default.createElement("span", { className: "vicon vicon-question-circle" }))),
+            props.titleSub && react_1.default.createElement("span", { className: 'c-col-title-sub c-title-sub' }, props.titleSub)),
+        react_1.default.createElement("div", { className: 'c-col-actions c-title-action' }, elAction));
+};
+exports.UTitle = UTitle;

package/deps/app-audit/ESTable.js

@@ -0,0 +1 @@
+// 

package/deps/app-audit/LookUp.d.ts

@@ -0,0 +1,27 @@
+import React from "react";
+import type { PlainObject, UFormField } from "../../index";
+type LookUp = {
+    title: string;
+    id: number;
+    type: string;
+    code: string;
+    value: string;
+    description: string;
+};
+export declare const useLookup: () => {
+    lookupLoading: boolean;
+    update: (data: PlainObject) => Promise<void>;
+    getLookups: (codes: string[]) => LookUp[];
+    getLookupsByType: (type: string) => LookUp[];
+    getLookupData: (fields: UFormField[]) => PlainObject;
+    changeSaveData: (data: any) => {};
+};
+type LookUpModalProps = {
+    title?: string;
+    open: boolean;
+    fields: UFormField[];
+    onCancel: () => void;
+};
+export declare const LookUpInfo: React.FC<LookUpModalProps>;
+export declare const LookUpModal: React.FC<LookUpModalProps>;
+export {};