vap1 0.1.0 → 0.1.1

package/hooks/useApiBase.js

@@ -0,0 +1,331 @@
+"use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useApiBase = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+;
+const react_1 = require("react");
+const utils_1 = require("../utils");
+const Const_1 = require("../components/_setup/Const");
+const antd_1 = require("antd");
+const chean = (param) => {
+    lodash_1.default.keys(param).map(key => {
+        if (param[key] === undefined || param[key] === '' || param[key] === null) {
+            lodash_1.default.unset(param, key);
+        }
+    });
+    return param;
+};
+const effectKey = (prevEffect, next, rowKey) => {
+    if (!lodash_1.default.has(next, rowKey))
+        return null;
+    if (next[rowKey] != prevEffect)
+        return next[rowKey];
+    return '_' + next[rowKey];
+};
+const SHOWTIP = (isSuccess, action, data, options) => {
+    let name = '';
+    if (options.tipLabel)
+        name = options.tipLabel;
+    if (options.tipField && lodash_1.default.has(data, options.tipField))
+        name += (' : ' + data[options.tipField]);
+    name = lodash_1.default.trim(name);
+    switch (action) {
+        case 'ADD':
+            if (isSuccess) {
+                antd_1.message.success(utils_1.i18n.txt(name ? Const_1.V.ACT_ADD_SUCCESS_NAMED : Const_1.V.ACT_ADD_SUCCESS, name));
+            }
+            else {
+                antd_1.message.error(utils_1.i18n.txt(name ? Const_1.V.ACT_ADD_FAIL_NAMED : Const_1.V.ACT_ADD_FAIL, name));
+            }
+            break;
+        case 'UPDATE':
+            if (isSuccess) {
+                antd_1.message.success(utils_1.i18n.txt(name ? Const_1.V.ACT_UPDATE_SUCCESS_NAMED : Const_1.V.ACT_UPDATE_SUCCESS, name));
+            }
+            else {
+                antd_1.message.error(utils_1.i18n.txt(name ? Const_1.V.ACT_UPDATE_FAIL_NAMED : Const_1.V.ACT_UPDATE_FAIL, name));
+            }
+            break;
+        case 'DELETE':
+            if (isSuccess) {
+                antd_1.message.success(utils_1.i18n.txt(name ? Const_1.V.ACT_DELETE_SUCCESS_NAMED : Const_1.V.ACT_DELETE_SUCCESS, name));
+            }
+            else {
+                antd_1.message.error(utils_1.i18n.txt(name ? Const_1.V.ACT_DELETE_FAIL_NAMED : Const_1.V.ACT_DELETE_FAIL, name));
+            }
+            break;
+        default:
+            break;
+    }
+};
+const useApiBase = (config, state, doLoad, mode = 'api') => {
+    const { list, effect, pageNo, pageSize, total, totalAcc, isQuerying, param, cost } = state;
+    const rowKey = config.rowKey || 'id';
+    const delKey = config.delKey || 'ids';
+    let lastQuery = (0, react_1.useRef)(config.param || {});
+    var AOP = {};
+    if (config.aop)
+        AOP = config.aop;
+    var TIP = { ADD: true, UPDATE: true, DELETE: true };
+    if (config.tipDisabled) {
+        if (config.tipDisabled === true) {
+            TIP = { ADD: false, UPDATE: false, DELETE: false };
+        }
+        else {
+            if (config.tipDisabled.add)
+                TIP.ADD = false;
+            if (config.tipDisabled.update)
+                TIP.UPDATE = false;
+            if (config.tipDisabled.delete)
+                TIP.DELETE = false;
+        }
+    }
+    const queryHook = (0, react_1.useCallback)((_param, _page = null, _order = null) => {
+        if (_param) {
+            lastQuery.current = chean(lodash_1.default.merge(lastQuery.current, _param));
+            lastQuery.current.start_ = 0;
+            lastQuery.current.count_ = pageSize;
+            doLoad({ param: lastQuery.current, pageNo: 1, isQuerying: true });
+            _query(lastQuery.current);
+        }
+        else if (_page) {
+            lastQuery.current.start_ = _page.pageSize * (_page.pageNo - 1);
+            lastQuery.current.count_ = _page.pageSize;
+            doLoad({ param: lastQuery.current, pageNo: _page.pageNo, pageSize: _page.pageSize, isQuerying: true });
+            _query(lastQuery.current);
+        }
+        else if (_order) {
+            if (_order.order) {
+                lastQuery.current.order_ = _order.order;
+                lastQuery.current.by_ = _order.by == 'asc' ? 'asc' : 'desc';
+            }
+            else {
+                lodash_1.default.unset(lastQuery.current, 'order_');
+                lodash_1.default.unset(lastQuery.current, 'by_');
+            }
+            lastQuery.current.start_ = 0;
+            doLoad({ param: lastQuery.current, pageNo: 1, isQuerying: true });
+            _query(lastQuery.current);
+        }
+    }, [param, pageNo, pageSize]);
+    const _query = (param) => __awaiter(void 0, void 0, void 0, function* () {
+        let _start = Date.now();
+        const queryParam = lodash_1.default.isFunction(AOP.beforeQuery) ? AOP.beforeQuery(param) : param;
+        const response = yield utils_1.Ajax.POST(config.api, queryParam);
+        if (response.code != '0') {
+            doLoad({ isQuerying: false, cost: 0 }, () => {
+                if (lodash_1.default.isFunction(AOP.afterQuery)) {
+                    AOP.afterQuery(false, queryParam, response);
+                }
+            });
+            throw response;
+        }
+        doLoad({
+            list: response.list, total: response.total, totalAcc: response.totalAcc || response.total,
+            cost: Date.now() - _start,
+            isQuerying: false
+        }, () => {
+            if (lodash_1.default.isFunction(AOP.afterQuery)) {
+                AOP.afterQuery(true, queryParam, response);
+            }
+        });
+    });
+    const query = (param, clean = false) => {
+        if (clean)
+            lastQuery.current = {};
+        queryHook(param);
+    };
+    const all = (loader = true) => __awaiter(void 0, void 0, void 0, function* () {
+        const resp = yield utils_1.Ajax.GET(config.api);
+        let list;
+        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 list;
+    });
+    const pageTo = (pageNo, pageSize) => queryHook(null, { pageNo, pageSize });
+    const orderBy = (order, by) => queryHook(null, null, { order, by });
+    const doAdd = (data) => doLoad(prev => ({
+        effect: effectKey(prev.effect, data, rowKey),
+        total: prev.total + 1,
+        totalAcc: prev.totalAcc + 1,
+        list: utils_1.ArrayUtil.add(prev.list, data),
+    }));
+    const add = (data) => __awaiter(void 0, void 0, void 0, function* () {
+        const param = lodash_1.default.isFunction(AOP.beforeQuery) ? AOP.beforeQuery(data) : data;
+        const response = yield utils_1.Ajax.PUT(config.api, param);
+        if (TIP.ADD) {
+            SHOWTIP(response.code == '0', 'ADD', data, config);
+        }
+        const isSuccess = response.code == '0';
+        if (AOP.afterAdd) {
+            AOP.afterAdd(isSuccess, param, response);
+        }
+        else if (AOP.afterAll) {
+            AOP.afterAll('ADD', isSuccess, param, response);
+        }
+        if (!isSuccess)
+            throw response;
+        doAdd(response.data || param);
+        return response;
+    });
+    const doUpdate = (obj) => doLoad(prev => ({
+        effect: effectKey(prev.effect, obj, rowKey),
+        list: utils_1.ArrayUtil.update(prev.list, obj, rowKey)
+    }));
+    const update = (data) => __awaiter(void 0, void 0, void 0, function* () {
+        const param = lodash_1.default.isFunction(AOP.beforeUpdate) ? AOP.beforeUpdate(data) : data;
+        const response = yield utils_1.Ajax.PATCH(config.api, param);
+        if (TIP.UPDATE) {
+            SHOWTIP(response.code == '0', 'UPDATE', param, config);
+        }
+        const isSuccess = response.code == '0';
+        if (AOP.afterUpdate) {
+            AOP.afterUpdate(isSuccess, param, response);
+        }
+        else if (AOP.afterAll) {
+            AOP.afterAll('UPDATE', isSuccess, param, response);
+        }
+        if (!isSuccess)
+            throw response;
+        doUpdate(response.data || param);
+        return response;
+    });
+    const doDelete = (obj) => {
+        const keys = [];
+        if (lodash_1.default.isArray(obj)) {
+            obj.map(item => {
+                if (lodash_1.default.isPlainObject(item) && lodash_1.default.has(item, rowKey)) {
+                    keys.push(item[rowKey]);
+                }
+                else if (lodash_1.default.isString(item) || lodash_1.default.isNumber(item)) {
+                    keys.push(item);
+                }
+            });
+        }
+        else if (lodash_1.default.isString(obj) || lodash_1.default.isNumber(obj)) {
+            keys.push(obj);
+        }
+        else if (lodash_1.default.has(obj, rowKey)) {
+            keys.push(obj[rowKey]);
+        }
+        doLoad(prev => ({
+            list: utils_1.ArrayUtil.del(prev.list, keys, rowKey),
+            total: prev.total - keys.length,
+            totalAcc: prev.totalAcc - keys.length,
+        }));
+    };
+    const delArr = (arr) => __awaiter(void 0, void 0, void 0, function* () {
+        const keys = [];
+        arr.map(item => {
+            if (lodash_1.default.isPlainObject(item)) {
+                keys.push(item[rowKey]);
+            }
+            else if (lodash_1.default.isString(item) || lodash_1.default.isNumber(item)) {
+                keys.push(item);
+            }
+        });
+        if (keys.length == 0)
+            return;
+        let keyStr = keys.length == 1 ? keys[0] : keys.join(',');
+        const response = yield utils_1.Ajax.DELETE(config.api, { [delKey]: keyStr });
+        const isSuccess = response.code == '0';
+        if (TIP.DELETE) {
+            if (isSuccess) {
+                antd_1.message.success(utils_1.i18n.txt(Const_1.V.ACT_DELETE_SUCCESS_COUNT, keys.length + ''));
+            }
+            else {
+                antd_1.message.error(utils_1.i18n.txt(Const_1.V.ACT_DELETE_FAIL_COUNT, keys.length + ''));
+            }
+        }
+        if (isSuccess)
+            doDelete(arr);
+        return response;
+    });
+    const delSingle = (0, react_1.useCallback)((data) => __awaiter(void 0, void 0, void 0, function* () {
+        let key;
+        if (lodash_1.default.isString(data) || lodash_1.default.isNumber(data)) {
+            key = data;
+        }
+        else {
+            key = data[rowKey];
+        }
+        const response = yield utils_1.Ajax.DELETE(config.api, { [delKey]: key });
+        const isSuccess = response.code == '0';
+        if (TIP.DELETE) {
+            let obj = {};
+            if (lodash_1.default.isObject(data)) {
+                obj = data;
+            }
+            else {
+                obj = lodash_1.default.find(list, { [rowKey]: key }) || {};
+            }
+            SHOWTIP(isSuccess, 'DELETE', obj, config);
+            // let name;
+            // if (config.tipField) {
+            //     if (_.isPlainObject(data)) {
+            //         name = data[config.tipField]
+            //     } else {
+            //         let obj = _.find(list, { [rowKey]: key });
+            //         if (obj && obj[config.tipField]) {
+            //             name = obj[config.tipField];
+            //         }
+            //     }
+            // }
+        }
+        if (isSuccess)
+            doDelete(data);
+        return response;
+    }), [list]);
+    const del = (data) => __awaiter(void 0, void 0, void 0, function* () {
+        const param = lodash_1.default.isFunction(AOP.beforeDelete) ? AOP.beforeDelete(data) : data;
+        var response;
+        if (lodash_1.default.isArray(param)) {
+            response = yield delArr(param);
+        }
+        else {
+            response = yield delSingle(param);
+        }
+        const isSuccess = response.code == '0';
+        if (AOP.afterDelete) {
+            AOP.afterDelete(isSuccess, param, response);
+        }
+        else if (AOP.afterAll) {
+            AOP.afterAll('DELETE', isSuccess, param, response);
+        }
+        if (response.code != '0')
+            throw response;
+        return response;
+    });
+    return {
+        mode: mode,
+        rowKey, cost, list, effect, pageNo, pageSize, total, totalAcc, isQuerying, param,
+        query, all, pageTo, orderBy, doLoad,
+        add, doAdd,
+        update, doUpdate,
+        del, doDelete,
+    };
+};
+exports.useApiBase = useApiBase;

package/hooks/useApiGlobal.d.ts

@@ -0,0 +1,11 @@
+import type { ApiOption } from './useApiBase';
+import type { ApiListState } from './_list';
+export type ApiGlobalOption = ApiOption & {
+    /**
+     * 指定存储空间,
+     * 不指定时会以当前页面的URL做为存储空间。
+     * 当同一个页面使用两个 不同的 useApiGlobal ，必须为两个 hook 分别指定，应用内唯一NAMESPACE
+    */
+    namespace?: string;
+};
+export declare const useApiGlobal: (options: string | ApiGlobalOption) => ApiListState;

package/hooks/useApiGlobal.js

@@ -1,5 +1,39 @@
-// import { useGlobal } from './useGlobal'
-// import { proxyApi } from './useApi'
-// export const useApiGlobal = (namespace: string, initValue?: {}) => {
-//     const [state, setState] = useGlobal(namespace, initValue);
-// }
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useApiGlobal = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const react_1 = require("react");
+const useGlobal_1 = require("./useGlobal");
+const _list_1 = require("./_list");
+const useApiBase_1 = require("./useApiBase");
+const toKey = (pathname, hash) => {
+    let root = lodash_1.default.toLower(lodash_1.default.trim(pathname));
+    if (root.endsWith('/'))
+        root = root.substring(0, root.length - 1);
+    if (root.startsWith('/'))
+        root = root.substring(1);
+    root = root.replace('/', '-');
+    return root + hash;
+};
+const useApiGlobal = (options) => {
+    const config = lodash_1.default.isString(options) ? { api: options } : options;
+    const BASE = Object.assign(Object.assign({}, _list_1.DEFAULT_STATE), { effect: null });
+    BASE.rowKey = config.rowKey || 'id';
+    ;
+    if (config.list)
+        BASE.list = config.list;
+    if (config.pageSize)
+        BASE.pageSize = config.pageSize;
+    const namespace = (0, react_1.useMemo)(() => {
+        if (config.namespace)
+            return config.namespace;
+        const { pathname, hash } = location;
+        return toKey(pathname, hash);
+    }, []);
+    const [state, doLoad] = (0, useGlobal_1.useGlobal)(namespace, BASE);
+    return (0, useApiBase_1.useApiBase)(config, state, doLoad, 'api-global');
+};
+exports.useApiGlobal = useApiGlobal;

package/index.d.ts

@@ -132,8 +132,7 @@ export { VTable, ApiTable, ApiTableModal, STable, TopTable, TopTableModal } from
 export { STree, DTree, FTree } from './components/Trees';
 export { UploadFile, UploadImage, UploadModal } from './components/Upload';
 export { SList } from './components/Lists/SList';
-export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, } from './components/UForm';
-export type { UFormFunctions } from './components/UForm/UForm';
+export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, UFormFunctions } from './components/UForm';
 export type { TableColumn } from './components/Tables/index';
 export type { VTableProps } from './components/Tables/VTable';
 export type { ApiTableProps } from './components/Tables/ApiTable';

package/index.js

@@ -132,7 +132,7 @@ Object.defineProperty(exports, "ColorPicker", { enumerable: true, get: function
 // Enrich antd Components
 var Upagination_1 = require("./components/_common/Upagination"); // 增强版 Pagination
 Object.defineProperty(exports, "UPagination", { enumerable: true, get: function () { return Upagination_1.UPagination; } });
-// VAP Data Components
+// VAP Data Components 
 var UForm_1 = require("./components/UForm"); // UForm 系列 
 Object.defineProperty(exports, "UForm", { enumerable: true, get: function () { return UForm_1.UForm; } });
 Object.defineProperty(exports, "UFormModal", { enumerable: true, get: function () { return UForm_1.UFormModal; } });

package/package.json

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