vap1 0.6.0 → 0.6.2

package/components/UForm/FormWrapper.js

@@ -202,7 +202,7 @@ var _LOOP = function (fs, maxLabel, isInfo, isEdit, isAdd, hiddFields, disableFi
             hiddFields.add(field.field);
             return;
         }
-        var maxCount = getMaxTitleWidth(field);
+        var maxCount = utils_1.StringUtil.txtWidth(field.title, 0.8);
         if (maxLabel.current < maxCount)
             maxLabel.current = maxCount;
         var disabled = false;
@@ -262,20 +262,26 @@ var FormWrapper = function (props) {
         else {
             _LOOP(fields, maxLabelRef, isInfo, isEdit, isAdd, HiddenFieldRef.current, DisableFieldRef.current);
         }
-        var fieldWidth = width / cols;
-        var FONT_SIZE = utils_1.GLOBAL.CONFIG.FORM.LABEL_FONT_SIZE || 12;
-        var percent = (maxLabelRef.current * FONT_SIZE + 20) / fieldWidth;
-        var labelSpan = Math.ceil(percent * 24);
-        if (labelSpan > colMax) {
-            labelSpan = colMax;
+        var labelSpan;
+        if (lodash_1.default.isNumber(props.labelSpan)) {
+            labelSpan = props.labelSpan;
         }
-        var fix = labelSpan % cols;
-        if (fix != 0) {
-            labelSpan += fix;
-        }
-        if (cols == 1) {
-            if (labelSpan < 6) {
-                labelSpan = 6;
+        else {
+            var fieldWidth = width / cols;
+            var FONT_SIZE = utils_1.GLOBAL.CONFIG.FORM.LABEL_FONT_SIZE || 12;
+            var percent = (maxLabelRef.current * FONT_SIZE + 20) / fieldWidth;
+            labelSpan = Math.ceil(percent * 24);
+            if (labelSpan > colMax) {
+                labelSpan = colMax;
+            }
+            var fix = labelSpan % cols;
+            if (fix != 0) {
+                labelSpan += fix;
+            }
+            if (cols == 1) {
+                if (labelSpan < 6) {
+                    labelSpan += 1;
+                }
             }
         }
         var inputSpan = 24 - labelSpan;

package/components/UForm/UInfo.js

@@ -79,7 +79,7 @@ var _UInfo = function (props) {
     if (state.isGroup)
         return renderGroup(props, props.fields, state, data);
     // @ts-ignore
-    return react_1.default.createElement(UDescriptions_1.UDescriptions, { labelWidth: state.maxLabel > 20 ? 20 : state.maxLabel, column: state.cols, theme: props.theme, hideBorder: props.hideBorder, className: props.className }, renderFields(props.fields, state, data));
+    return react_1.default.createElement(UDescriptions_1.UDescriptions, { labelWidth: state.maxLabel > 20 ? 20 : state.maxLabel, column: state.cols, style: props.style, theme: props.theme, hideBorder: props.hideBorder, className: props.className }, renderFields(props.fields, state, data));
 };
 var UInfo = function (props) { return react_1.default.createElement(FormWrapper_1.FormWrapper, __assign({ isInfo: true }, props),
     react_1.default.createElement(_UInfo, __assign({}, props))); };

package/components/UForm/index.d.ts

@@ -248,6 +248,10 @@ export type UFromProps = {
      * 表单大小
     */
     size?: SizeType;
+    /**
+     * 自行指定LABEL_SPAN，1-24 默认不传，会根据字段数量自动计算
+    */
+    labelSpan?: number;
     /**
      * 说明：
      *

package/hooks/useAjaxQuery.js

@@ -97,9 +97,9 @@ var useAjaxQuery = function (options) {
         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];
+    }), 2), _b = _a[0], loading = _b.loading, data = _b.data, param = _b.param, setState = _a[1];
     var isFirstMount = (0, useFirstMountState_1.useFirstMountState)();
-    var _fetch = function () {
+    var query = (0, react_1.useCallback)(function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
@@ -110,16 +110,18 @@ var useAjaxQuery = function (options) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        setData(function (prev) { return (__assign(__assign({}, prev), { loading: true })); });
+                        setState(function (prev) {
+                            return (__assign(__assign({}, prev), { loading: true }));
+                        });
                         return [4 /*yield*/, config.fn.apply(config, __spreadArray([], __read(args), false))];
                     case 1:
                         response = _a.sent();
                         if (config.valueHander) {
                             if (lodash_1.default.isString(config.valueHander)) {
-                                setData({ loading: false, param: args, data: lodash_1.default.get(response, config.valueHander) });
+                                setState({ loading: false, param: args, data: lodash_1.default.get(response, config.valueHander) });
                             }
                             else {
-                                setData({ loading: false, param: args, data: config.valueHander.apply(config, __spreadArray([response], __read(args), false)) });
+                                setState({ loading: false, param: args, data: config.valueHander.apply(config, __spreadArray([response], __read(args), false)) });
                             }
                             return [2 /*return*/];
                         }
@@ -129,40 +131,35 @@ var useAjaxQuery = function (options) {
                             ) {
                                 antd_1.message.error(response.message);
                             }
-                            setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
+                            setState(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 });
+                            setState({ loading: false, param: args, data: response.data });
                         }
                         else if (lodash_1.default.has(response, 'list')) {
-                            setData({ loading: false, param: args, data: response.list });
+                            setState({ loading: false, param: args, data: response.list });
                         }
                         else {
-                            setData({ loading: false, param: args, data: response });
+                            setState({ loading: false, param: args, data: response });
                         }
                         return [3 /*break*/, 3];
                     case 2:
                         err_1 = _a.sent();
                         console.error(err_1);
-                        setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
+                        setState(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
             });
         });
-    };
-    if (isFirstMount && config.autoLoad) {
-        var params = lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : [];
-        _fetch.apply(void 0, __spreadArray([], __read(params), false));
-    }
-    var query = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
+    }, []);
+    (0, react_1.useEffect)(function () {
+        if (isFirstMount && config.autoLoad) {
+            var params = lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : [];
+            query.apply(void 0, __spreadArray([], __read(params), false));
         }
-        _fetch.apply(void 0, __spreadArray([], __read(args), false));
-    };
+    }, []);
     return [loading, data, query, param];
 };
 exports.useAjaxQuery = useAjaxQuery;

package/package.json

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

package/utils/ModeUtil.d.ts

@@ -0,0 +1,9 @@
+export declare const createMode: (defaultMode?: number) => number;
+type FLAG_ITEM = number;
+type FLAG = FLAG_ITEM | Array<FLAG_ITEM>;
+export declare const hasFlag: (mode: number, flag: FLAG) => boolean;
+export declare const add: (mode: number, flag: FLAG) => number;
+export declare const remove: (mode: number, flag: FLAG) => number;
+export declare const modeToFlag: (role: number | string) => FLAG;
+export declare const convertFlagOptions: (options: any[], isPos?: boolean) => any[];
+export {};

package/utils/ModeUtil.js

@@ -0,0 +1,164 @@
+"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 __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.convertFlagOptions = exports.modeToFlag = exports.remove = exports.add = exports.hasFlag = exports.createMode = void 0;
+var lodash_1 = __importDefault(require("lodash"));
+var createMode = function (defaultMode) {
+    if (defaultMode === void 0) { defaultMode = 0; }
+    return defaultMode;
+};
+exports.createMode = createMode;
+//判断是否有选中
+var hasFlag = function (mode, flag) {
+    var e_1, _a;
+    if (lodash_1.default.isArray(flag)) {
+        try {
+            for (var flag_1 = __values(flag), flag_1_1 = flag_1.next(); !flag_1_1.done; flag_1_1 = flag_1.next()) {
+                var item = flag_1_1.value;
+                if (!(0, exports.hasFlag)(mode, item))
+                    return false;
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (flag_1_1 && !flag_1_1.done && (_a = flag_1.return)) _a.call(flag_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return true;
+    }
+    return (mode & (1 << flag)) > 0;
+};
+exports.hasFlag = hasFlag;
+//选中
+var add = function (mode, flag) {
+    var e_2, _a;
+    if (lodash_1.default.isArray(flag)) {
+        try {
+            for (var flag_2 = __values(flag), flag_2_1 = flag_2.next(); !flag_2_1.done; flag_2_1 = flag_2.next()) {
+                var item = flag_2_1.value;
+                mode = (0, exports.add)(mode, item);
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (flag_2_1 && !flag_2_1.done && (_a = flag_2.return)) _a.call(flag_2);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return mode;
+    }
+    if ((0, exports.hasFlag)(mode, flag))
+        return mode;
+    return mode | (1 << flag);
+};
+exports.add = add;
+//取消选中
+var remove = function (mode, flag) {
+    var e_3, _a;
+    if (lodash_1.default.isArray(flag)) {
+        try {
+            for (var flag_3 = __values(flag), flag_3_1 = flag_3.next(); !flag_3_1.done; flag_3_1 = flag_3.next()) {
+                var item = flag_3_1.value;
+                mode = (0, exports.remove)(mode, item);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (flag_3_1 && !flag_3_1.done && (_a = flag_3.return)) _a.call(flag_3);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        return mode;
+    }
+    if (!(0, exports.hasFlag)(mode, flag))
+        return mode;
+    return mode & (~(1 << flag));
+};
+exports.remove = remove;
+var FLAG_MODE_MAP = new Map(); // 查询 & 转换
+for (var i = 0; i < 31; i++) {
+    FLAG_MODE_MAP.set((0, exports.add)(0, i), i);
+    FLAG_MODE_MAP.set((0, exports.add)(0, i) + '', i);
+}
+var modeToFlag = function (role) {
+    if (!FLAG_MODE_MAP.has(role)) {
+        var result = [];
+        var roleNum = lodash_1.default.isString(role) ? parseInt(role) : role;
+        for (var i = 0; i < 31; i++) {
+            if ((0, exports.hasFlag)(roleNum, i)) {
+                result.push(i);
+            }
+        }
+        return result;
+    }
+    return FLAG_MODE_MAP.get(role);
+};
+exports.modeToFlag = modeToFlag;
+var convertFlagOptions = function (options, isPos) {
+    var e_4, _a, e_5, _b;
+    if (isPos === void 0) { isPos = false; }
+    var result = [];
+    if (isPos) {
+        try {
+            for (var options_1 = __values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
+                var item = options_1_1.value;
+                var value = parseInt(item.value);
+                if (value >= 0 && value < 30) {
+                    result.push(__assign(__assign({}, item), { value: value }));
+                }
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+    }
+    else {
+        try {
+            for (var options_2 = __values(options), options_2_1 = options_2.next(); !options_2_1.done; options_2_1 = options_2.next()) {
+                var item = options_2_1.value;
+                result.push(__assign(__assign({}, item), { value: (0, exports.modeToFlag)(item.value) }));
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (options_2_1 && !options_2_1.done && (_b = options_2.return)) _b.call(options_2);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+    }
+    return result;
+};
+exports.convertFlagOptions = convertFlagOptions;

package/utils/StringUtil.d.ts

@@ -360,3 +360,4 @@ export declare const ratio: (count: number, total: number) => number;
  * rise(80, 100) // => -0.2
  */
 export declare const rise: (current: number, prev: number) => number;
+export declare const txtWidth: (txt: string, enDiff?: number) => number;

package/utils/StringUtil.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rise = exports.ratio = exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.spellMatch = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.LETTERS = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
+exports.txtWidth = exports.rise = exports.ratio = exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.spellMatch = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.LETTERS = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var dayjs_1 = __importDefault(require("dayjs"));
 var _Support_1 = require("./_Support");
@@ -662,3 +662,18 @@ var rise = function (current, prev) {
     return (current - prev) / prev;
 };
 exports.rise = rise;
+var txtWidth = function (txt, enDiff) {
+    if (enDiff === void 0) { enDiff = 0.6; }
+    var len = 0;
+    for (var i = 0; i < txt.length; i++) {
+        var char = txt.charCodeAt(i);
+        if (char < 127) {
+            len += enDiff;
+        }
+        else {
+            len += 1;
+        }
+    }
+    return Math.ceil(len);
+};
+exports.txtWidth = txtWidth;

package/utils/index.d.ts

@@ -11,6 +11,7 @@ export * as i18n from './i18n';
 export * as GLOBAL from './Global';
 export * as Renders from './Renders';
 export * as Const from './Const';
+export * as BitModeUtil from './ModeUtil';
 export { default as VAP } from './VAP';
 /**
  * 路由信息

package/utils/index.js

@@ -61,7 +61,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRoot = exports.VAP = exports.Const = exports.Renders = exports.GLOBAL = exports.i18n = exports.Ajax = exports.Format = exports.TipUtil = exports.CacheUtil = exports.EventUtil = exports.ArrayUtil = exports.PageUtil = exports.TreeUtil = exports.StringUtil = void 0;
+exports.renderRoot = exports.VAP = exports.BitModeUtil = exports.Const = exports.Renders = exports.GLOBAL = exports.i18n = exports.Ajax = exports.Format = exports.TipUtil = exports.CacheUtil = exports.EventUtil = exports.ArrayUtil = exports.PageUtil = exports.TreeUtil = exports.StringUtil = void 0;
 exports.registerRoute = registerRoute;
 var lodash_1 = __importDefault(require("lodash"));
 // 全局 UTILS 定义
@@ -78,6 +78,7 @@ exports.i18n = __importStar(require("./i18n"));
 exports.GLOBAL = __importStar(require("./Global"));
 exports.Renders = __importStar(require("./Renders"));
 exports.Const = __importStar(require("./Const"));
+exports.BitModeUtil = __importStar(require("./ModeUtil"));
 // export * as logger from './Logger';
 var VAP_1 = require("./VAP");
 Object.defineProperty(exports, "VAP", { enumerable: true, get: function () { return __importDefault(VAP_1).default; } });