vap1 0.3.6 → 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/UForm/_input.js

@@ -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/_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/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 {};

package/deps/app-audit/LookUp.js

@@ -0,0 +1,324 @@
+"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;
+};
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+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.");
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LookUpModal = exports.LookUpInfo = exports.useLookup = void 0;
+var react_1 = __importStar(require("react"));
+var index_1 = require("../../index");
+var lodash_1 = __importDefault(require("lodash"));
+var hooks_1 = require("../../hooks");
+var utils_1 = require("../../utils");
+var useLookup = function () {
+    var _a = __read((0, hooks_1.useGlobal)('lookup', {
+        loading: true,
+        TypeInfoMap: new Map(),
+        CodeInfoMap: new Map()
+    }, {
+        share: true
+    }), 3), state = _a[0], setState = _a[1], loaded = _a[2];
+    var reflush = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var resp, groups, TypeInfoMap, CodeInfoMap;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, utils_1.Ajax.POST('/api-audit/lookup', { "count_": 999, "status": 1 })];
+                case 1:
+                    resp = _a.sent();
+                    groups = lodash_1.default.groupBy(resp.list, 'type');
+                    TypeInfoMap = new Map();
+                    CodeInfoMap = new Map();
+                    lodash_1.default.keys(groups).map(function (type) {
+                        var arr = groups[type] || [];
+                        var infoMap = new Map();
+                        arr.map(function (item) {
+                            infoMap.set(item.code, item);
+                            CodeInfoMap.set(item.code, item);
+                        });
+                        TypeInfoMap.set(type, infoMap);
+                        setState({ TypeInfoMap: TypeInfoMap, CodeInfoMap: CodeInfoMap, loading: false });
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var getLookupsByType = (0, react_1.useCallback)(function (type) {
+        var map = state.TypeInfoMap.get(type);
+        if (map == null)
+            return [];
+        return __spreadArray([], __read(map.values()), false);
+    }, [state]);
+    var getLookups = (0, react_1.useCallback)(function (codes) {
+        var looks = [];
+        codes.map(function (item) {
+            var ptn = (item || '').split('.').map(lodash_1.default.trim);
+            if (ptn.length == 1) {
+                var look = state.CodeInfoMap.get(ptn[0]);
+                if (look == null) {
+                    console.warn("\u6CA1\u6709\u627E\u5230\u914D\u7F6E : ".concat(item));
+                    return;
+                }
+                looks.push(look);
+            }
+            else if (ptn.length >= 2) {
+                var type = state.TypeInfoMap.get(ptn[0]);
+                if (type == null) {
+                    console.warn("\u6CA1\u6709\u627E\u5230\u914D\u7F6E : ".concat(item));
+                    return;
+                }
+                var look = type.get(ptn[1]);
+                if (look == null) {
+                    console.warn("\u6CA1\u6709\u627E\u5230\u914D\u7F6E : ".concat(item));
+                    return;
+                }
+                looks.push(look);
+            }
+        });
+        return looks;
+    }, [state]);
+    var getLookupData = (0, react_1.useCallback)(function (fields) {
+        var e_1, _a, _b, _c;
+        var data = {};
+        try {
+            for (var fields_1 = __values(fields), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
+                var field = fields_1_1.value;
+                var lookups = getLookups([field.field]);
+                if (lookups.length == 0)
+                    continue;
+                var lookup = lookups[0];
+                // if(field.field.indexOf('.'))
+                var ptns = field.field.split('.');
+                var assignField = ptns[ptns.length - 1];
+                switch (field.type) {
+                    case 'number':
+                    case 'slider':
+                        if (ptns.length > 1) {
+                            if (data[ptns[0]]) {
+                                data[ptns[0]][ptns[1]] = parseInt(lookup.value);
+                            }
+                            else {
+                                data[ptns[0]] = (_b = {}, _b[ptns[1]] = parseInt(lookup.value), _b);
+                            }
+                        }
+                        else {
+                            data[assignField] = parseInt(lookup.value);
+                        }
+                        break;
+                    default:
+                        if (ptns.length > 1) {
+                            if (data[ptns[0]]) {
+                                data[ptns[0]][ptns[1]] = lookup.value;
+                            }
+                            else {
+                                data[ptns[0]] = (_c = {}, _c[ptns[1]] = lookup.value, _c);
+                            }
+                        }
+                        else {
+                            data[assignField] = lookup.value;
+                        }
+                        break;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return data;
+    }, [state]);
+    var changeSaveData = function (data) {
+        var changedData = {};
+        var _loop_1 = function (key) {
+            if (lodash_1.default.isObjectLike(data[key])) {
+                changedData[key] = data[key];
+                lodash_1.default.keys(data[key]).forEach(function (itemKey) {
+                    changedData[itemKey] = data[key][itemKey];
+                });
+            }
+            else {
+                if (!changedData[key]) {
+                    changedData[key] = data[key];
+                }
+            }
+        };
+        for (var key in data) {
+            _loop_1(key);
+        }
+        return changedData;
+    };
+    (0, react_1.useEffect)(function () {
+        if (loaded)
+            return;
+        reflush();
+    }, []);
+    var update = function (data) { return __awaiter(void 0, void 0, void 0, function () {
+        var params, paramsCodeArr, lookups;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    params = [];
+                    paramsCodeArr = [];
+                    lookups = getLookups(lodash_1.default.keys(data));
+                    // 更新旧值
+                    lodash_1.default.keys(data).map(function (key) {
+                        var find = lodash_1.default.find(lookups, function (item) { return (item.code == key) || ("".concat(item.type, ".").concat(item.code) == key); });
+                        if (find) {
+                            paramsCodeArr.push({ code: key });
+                            if (data[key] != find.value) {
+                                params.push({ id: find.id, value: data[key] });
+                            }
+                            return;
+                        }
+                    });
+                    // 设置新值--对象类型
+                    lodash_1.default.keys(data).map(function (key) {
+                        var objValue = data[key];
+                        if (lodash_1.default.isObjectLike(objValue)) {
+                            for (var itemKey in objValue) {
+                                if (!lodash_1.default.find(paramsCodeArr, { code: itemKey })) {
+                                    params.push({ type: key, code: itemKey, value: objValue[itemKey] });
+                                }
+                            }
+                        }
+                    });
+                    // 设置新智--简单类型
+                    lodash_1.default.keys(data).map(function (key) {
+                        var objValue = data[key];
+                        if (!lodash_1.default.isObjectLike(objValue)) {
+                            if (!lodash_1.default.find(paramsCodeArr, { code: key }) && !lodash_1.default.find(params, { code: key })) {
+                                params.push({ code: key, value: data[key] });
+                            }
+                        }
+                    });
+                    if (params.length == 0) {
+                        index_1.message.success('配置修改成功');
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, utils_1.Ajax.WHEN.apply(utils_1.Ajax, __spreadArray([], __read(params.map(function (param) { return utils_1.Ajax.PATCH('/api-audit/lookup', param); })), false))];
+                case 1:
+                    _a.sent();
+                    index_1.message.success('配置修改成功');
+                    reflush();
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    return { lookupLoading: state.loading, update: update, getLookups: getLookups, getLookupsByType: getLookupsByType, getLookupData: getLookupData, changeSaveData: changeSaveData };
+};
+exports.useLookup = useLookup;
+var LookUpInfo = function (props) {
+    var getLookupData = (0, exports.useLookup)().getLookupData;
+    var data = getLookupData(props.fields);
+    return react_1.default.createElement(index_1.UInfoModal, { open: props.open, fields: props.fields, data: data, onCancel: props.onCancel, title: props.title || '配置详情', onOk: props.onCancel });
+};
+exports.LookUpInfo = LookUpInfo;
+var LookUpModal = function (props) {
+    var _a = (0, exports.useLookup)(), getLookupData = _a.getLookupData, update = _a.update, changeSaveData = _a.changeSaveData;
+    var data = getLookupData(props.fields);
+    var save = function (saveData) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            update(changeSaveData(saveData));
+            props.onCancel();
+            return [2 /*return*/];
+        });
+    }); };
+    return react_1.default.createElement(index_1.UFormModal, { isEdit: true, data: data, open: props.open, onCancel: props.onCancel, title: props.title || '配置', onOk: save, fields: props.fields });
+};
+exports.LookUpModal = LookUpModal;

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

@@ -0,0 +1 @@
+export { useLookup, LookUpInfo, LookUpModal } from './LookUp';

package/deps/app-audit/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LookUpModal = exports.LookUpInfo = exports.useLookup = void 0;
+var LookUp_1 = require("./LookUp");
+Object.defineProperty(exports, "useLookup", { enumerable: true, get: function () { return LookUp_1.useLookup; } });
+Object.defineProperty(exports, "LookUpInfo", { enumerable: true, get: function () { return LookUp_1.LookUpInfo; } });
+Object.defineProperty(exports, "LookUpModal", { enumerable: true, get: function () { return LookUp_1.LookUpModal; } });

package/hooks/_list.d.ts

@@ -77,8 +77,9 @@ export type ApiListState = ApiModel & {
     mode: 'api' | 'api-global';
     /**
      * ALL 方法需要有满足规范的    GET API 才可以调用
+     * all 方法的默认API 与 CRUD API相同,不同时，可传指定API
     */
-    all?: (status?: boolean) => Promise<PlainObject[]>;
+    all?: (api?: string) => Promise<void>;
 };
 export type SouteListState = ListModel & {
     mode: 'source';

package/hooks/useAjaxQuery.d.ts

@@ -2,9 +2,6 @@
  * 查询方法，返回 Promise对象 即可
 */
 type QueryFunction = (...args: any[]) => Promise<any>;
-/**
- *
-*/
 type UseAjaxQueryOptions<T> = {
     /**
      * 查询方法
@@ -32,6 +29,13 @@ type UseAjaxQuery = <T>(options: QueryFunction | UseAjaxQueryOptions<T>) => UseA
 /**
  * 封装一个Ajax接口查询操作
  * 通过用于 Ajax 操作，实际上可以用于任何 Promise 方法
+ * 返回结果，依次为
+ * [
+ *  0: loading / Boolean 正在查询查询中
+ *  1: data / T = any 查询结果
+ *  2: query / Function  查询方法
+ *  3: param / any[]   当前查询参数
+ * ]
 */
 export declare const useAjaxQuery: UseAjaxQuery;
 export {};

package/hooks/useAjaxQuery.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) {
@@ -72,11 +83,21 @@ var useFirstMountState_1 = require("./useFirstMountState");
 /**
  * 封装一个Ajax接口查询操作
  * 通过用于 Ajax 操作，实际上可以用于任何 Promise 方法
+ * 返回结果，依次为
+ * [
+ *  0: loading / Boolean 正在查询查询中
+ *  1: data / T = any 查询结果
+ *  2: query / Function  查询方法
+ *  3: param / any[]   当前查询参数
+ * ]
 */
 var useAjaxQuery = function (options) {
     var config = lodash_1.default.isFunction(options) ? { fn: options } : options;
-    var _a = __read((0, react_1.useState)([config.defaultValue, lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : []]), 2), _b = __read(_a[0], 2), data = _b[0], param = _b[1], setData = _a[1];
-    var _c = __read((0, react_1.useState)(config.autoLoad != undefined ? true : false), 2), loading = _c[0], setLoading = _c[1];
+    var _a = __read((0, react_1.useState)({
+        loading: config.autoLoad != undefined ? true : false,
+        data: config.defaultValue,
+        param: lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : []
+    }), 2), _b = _a[0], loading = _b.loading, data = _b.data, param = _b.param, setData = _a[1];
     var isFirstMount = (0, useFirstMountState_1.useFirstMountState)();
     var _fetch = function () {
         var args = [];
@@ -84,47 +105,47 @@ var useAjaxQuery = function (options) {
             args[_i] = arguments[_i];
         }
         return __awaiter(void 0, void 0, void 0, function () {
-            var resp, err_1;
+            var response, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        setLoading(true);
+                        setData(function (prev) { return (__assign(__assign({}, prev), { loading: true })); });
                         return [4 /*yield*/, config.fn.apply(config, __spreadArray([], __read(args), false))];
                     case 1:
-                        resp = _a.sent();
-                        if (lodash_1.default.has(resp, 'code') && resp.code != '0' && resp.message) {
-                            antd_1.message.error(resp.message);
-                            setData([config.defaultValue, args]);
-                            setLoading(false);
-                            return [2 /*return*/];
-                        }
+                        response = _a.sent();
                         if (config.valueHander) {
                             if (lodash_1.default.isString(config.valueHander)) {
-                                setData([lodash_1.default.get(resp, config.valueHander), args]);
+                                setData({ loading: false, param: args, data: lodash_1.default.get(response, config.valueHander) });
                             }
                             else {
-                                setData([config.valueHander.apply(config, __spreadArray([resp], __read(args), false)), args]);
+                                setData({ loading: false, param: args, data: config.valueHander.apply(config, __spreadArray([response], __read(args), false)) });
                             }
+                            return [2 /*return*/];
                         }
-                        else {
-                            if (lodash_1.default.has(resp, 'data')) {
-                                setData([resp.data, args]);
-                            }
-                            else if (lodash_1.default.has(resp, 'list')) {
-                                setData([resp.list, args]);
-                            }
-                            else {
-                                setData([resp, args]);
+                        if (lodash_1.default.has(response, 'code') && response.code != '0') {
+                            if (response.message
+                            //         // && !NOT_TIP.has(resp.message)
+                            ) {
+                                antd_1.message.error(response.message);
                             }
+                            setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
+                            return [2 /*return*/];
+                        }
+                        if (lodash_1.default.has(response, 'data')) {
+                            setData({ loading: false, param: args, data: response.data });
+                        }
+                        else if (lodash_1.default.has(response, 'list')) {
+                            setData({ loading: false, param: args, data: response.list });
+                        }
+                        else {
+                            setData({ loading: false, param: args, data: response });
                         }
-                        setLoading(false);
                         return [3 /*break*/, 3];
                     case 2:
                         err_1 = _a.sent();
                         console.error(err_1);
-                        setData([config.defaultValue, args]);
-                        setLoading(false);
+                        setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }

package/hooks/useApiBase.js

@@ -162,33 +162,32 @@ var useApiBase = function (config, state, doLoad, mode) {
             lastQuery.current = {};
         queryHook(param);
     };
-    var all = function (loader) {
-        if (loader === void 0) { loader = true; }
-        return __awaiter(void 0, void 0, void 0, function () {
-            var resp, list;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, utils_1.Ajax.GET(config.api)];
-                    case 1:
-                        resp = _a.sent();
-                        if (resp.code == '0') {
-                            list = lodash_1.default.isArray(resp.data) ? resp.data : (lodash_1.default.isArray(resp.list) ? resp.list : []);
-                        }
-                        if (loader) {
-                            doLoad({
-                                total: list.length,
-                                totalAcc: list.length,
-                                list: list,
-                                pageSize: list.length,
-                                pageNo: 1,
-                                param: {},
-                            });
-                        }
-                        return [2 /*return*/, list];
-                }
-            });
+    var all = function (api) { return __awaiter(void 0, void 0, void 0, function () {
+        var ALL_API, resp, list;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ALL_API = api || config.api;
+                    doLoad({ isQuerying: true });
+                    return [4 /*yield*/, utils_1.Ajax.GET(ALL_API)];
+                case 1:
+                    resp = _a.sent();
+                    if (resp.code == '0') {
+                        list = lodash_1.default.isArray(resp.data) ? resp.data : (lodash_1.default.isArray(resp.list) ? resp.list : []);
+                    }
+                    doLoad({
+                        total: list.length,
+                        totalAcc: list.length,
+                        list: list,
+                        isQuerying: false,
+                        pageSize: list.length,
+                        pageNo: 1,
+                        param: {},
+                    });
+                    return [2 /*return*/];
+            }
         });
-    };
+    }); };
     var pageTo = function (pageNo, pageSize) { return queryHook(null, { pageNo: pageNo, pageSize: pageSize }); };
     var orderBy = function (order, by) { return queryHook(null, null, { order: order, by: by }); };
     var doAdd = function (data) { return doLoad(function (prev) { return ({

package/index.d.ts

@@ -136,6 +136,7 @@ export { STree, DTree, FTree } from './components/Trees';
 export { UploadFile, UploadImage, UploadModal } from './components/Upload';
 export { SList, type SListProps } from './components/Lists/SList';
 export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, UFormRef, Link, LinkValue } from './components/UForm';
+export type { UInfoProps } from './components/UForm/UInfo';
 export type { TableColumn } from './components/Tables/index';
 export type { VTableProps, VTableRef } from './components/Tables/VTable';
 export type { ApiTableProps } from './components/Tables/ApiTable';

package/package.json

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

package/uform/FormViewer.d.ts

@@ -2,12 +2,12 @@ import type { FormSchema } from './schema';
 import type { RefAttributes, ForwardRefExoticComponent, FC } from 'react';
 import type { UModalProps, UFormRef, PlainObject } from '../index';
 /**
- * ˵���� �༭���� UFormϵ����� ����Ӧ��ϵ����
- * InfoViewer �൱�� UInfo
- * FormViewer �൱�� UForm
- * FormModal �൱�� UFormModal
- * InfoModal �൱�� UInfoModal
- * FormInfoModal �൱�� UModal
+ * 说明： 编辑器与 UForm系列组件 ：对应关系如下
+ * InfoViewer 相当于 UInfo
+ * FormViewer 相当于 UForm
+ * FormModal 相当于 UFormModal
+ * InfoModal 相当于 UInfoModal
+ * FormInfoModal 相当于 UModal
 */
 type ModalProps = Pick<UModalProps, 'open' | 'onOk' | 'onCancel' | 'title' | 'data' | 'isEdit' | 'autoTitle'>;
 type FormViewProps = {

package/utils/Format.d.ts

@@ -9,7 +9,14 @@ export type NumberFormat = 'int' | 'int-fixed' | 'number' | 'size' | 'usd' | 'ch
  * 1234567 -> '1,234,567'
 */
 export declare const formatUSD: (num: number, digital?: FractionDigits) => string;
-export declare const formatPercent: (num: number, basic?: number) => string;
+/**
+ * num: 分子，需要格式化的数字
+ * base: 分母,默认为 1
+ *          formatPercent(0.2, 1) = 20%
+ *          formatPercent(20, 100) = 20%
+ * fractionDigits: 小数点位数，默认为2
+*/
+export declare const formatPercent: (num: number, basic?: number, fractionDigits?: FractionDigits) => string;
 export declare const formatSize: (byteSize: number) => string;
 /**
  * pos ： 小数点后面位数,最多20

package/utils/Format.js

@@ -53,9 +53,17 @@ var formatUSD = function (num, digital) {
     return num.toLocaleString('en-US', { minimumFractionDigits: fixed, maximumFractionDigits: fixed });
 };
 exports.formatUSD = formatUSD;
-var formatPercent = function (num, basic) {
+/**
+ * num: 分子，需要格式化的数字
+ * base: 分母,默认为 1
+ *          formatPercent(0.2, 1) = 20%
+ *          formatPercent(20, 100) = 20%
+ * fractionDigits: 小数点位数，默认为2
+*/
+var formatPercent = function (num, basic, fractionDigits) {
     if (basic === void 0) { basic = 1; }
-    return (0, exports.formatNumber)(num / basic) + '%';
+    if (fractionDigits === void 0) { fractionDigits = 2; }
+    return (0, exports.formatNumber)(num * 100 / basic, fractionDigits) + '%';
 };
 exports.formatPercent = formatPercent;
 var formatSize = function (byteSize) {

package/utils/TipUtil.d.ts

@@ -18,6 +18,10 @@ export declare enum TIP_ACTION {
 export declare enum TIP_ACTION_BATCH {
     SORT = 0
 }
+/**
+ * 内置错误,不提示
+*/
+export declare const NOT_TIP: Set<string>;
 /**
  * 批量提示
 */

package/utils/TipUtil.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tipResponse = exports.tipError = exports.tipResponseBatch = exports.TIP_ACTION_BATCH = exports.TIP_ACTION = void 0;
+exports.tipResponse = exports.tipError = exports.tipResponseBatch = exports.NOT_TIP = exports.TIP_ACTION_BATCH = exports.TIP_ACTION = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var i18n_1 = require("./i18n");
@@ -36,11 +36,13 @@ var TIP_ACTION_BATCH;
 })(TIP_ACTION_BATCH || (exports.TIP_ACTION_BATCH = TIP_ACTION_BATCH = {}));
 ;
 /**
- * 内置错误
+ * 内置错误,不提示
 */
-var NOT_TIP = new Set([
+exports.NOT_TIP = new Set([
+    '请求超时，无法负载到后端服务！！',
     '后端内部服务异常，无法负载到后端服务！！',
     '系统繁忙，请稍后再试',
+    '500 INTERNAL_SERVER_ERROR',
     '500_ERROR'
 ]);
 //  const MessageFormat = () => {
@@ -102,7 +104,7 @@ var tipResponse = function (response, action, data, options) {
     var isSuccess = response.code == Global_1.CONFIG.RESULT.success;
     if (!isSuccess) {
         if (Global_1.CONFIG.APP.TIP_ERROR) {
-            if (response.message && !NOT_TIP.has(response.message)) {
+            if (response.message && !exports.NOT_TIP.has(response.message)) {
                 antd_1.message.error(response.message);
                 return false;
             }