vap1 0.4.1 → 0.4.2

package/package.json

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

package/utils/PageUtil.js

@@ -57,7 +57,7 @@ var _Support_1 = require("./_Support");
 var _AjaxUtil_1 = require("./_AjaxUtil");
 var i18n_1 = require("./i18n");
 var Global_1 = require("./Global");
-var len = window.APP_ROOT ? window.APP_ROOT.length : 0;
+var len = _Support_1.APP_ROOT ? _Support_1.APP_ROOT.length : 0;
 /**
  * 阻止事件简单封装
 */
@@ -111,15 +111,15 @@ var DEFAULT_RESOLVER = function (url) { return url; };
 exports.resolveURL = len == 0 ? DEFAULT_RESOLVER : function (url) {
     if (!url.startsWith('/'))
         return url;
-    if (url.startsWith(window.APP_ROOT))
+    if (url.startsWith(_Support_1.APP_ROOT))
         return url;
-    return window.APP_ROOT + url;
+    return _Support_1.APP_ROOT + url;
 };
 /**
  * 兼容二级目录-恢复URL
 */
 exports.clearURL = len == 0 ? DEFAULT_RESOLVER : function (url) {
-    if (!url.startsWith(window.APP_ROOT))
+    if (!url.startsWith(_Support_1.APP_ROOT))
         return url;
     return url.substring(len);
 };
@@ -129,7 +129,7 @@ exports.clearURL = len == 0 ? DEFAULT_RESOLVER : function (url) {
 var urlPath = function (url) {
     var result = (0, exports.clearURL)(url);
     var idx = result.indexOf('?');
-    if (idx = 0)
+    if (idx >= 0)
         result = result.substring(0, idx);
     idx = result.indexOf('#');
     if (idx >= 0)
@@ -142,12 +142,10 @@ var GLOBAL_APPS = new Map();
  *  获取当前 APP 名称
 */
 var currentApp = function (root) {
-    var pathname = root ? root : location.pathname;
+    var pathname = (0, exports.urlPath)(root ? root : location.pathname);
     if (GLOBAL_APPS.has(pathname))
         return GLOBAL_APPS.get(pathname);
     var path = pathname;
-    if (lodash_1.default.startsWith(path, _Support_1.APP_ROOT))
-        path = path.substring(_Support_1.APP_ROOT.length);
     if (lodash_1.default.endsWith(path, '/'))
         path = path.substring(0, path.length - 1);
     if (lodash_1.default.startsWith(path, '/'))

package/utils/Renders/DictRender.d.ts

@@ -1,17 +1,20 @@
 import type { Render, BaseRenderOptions, OptionConvertConfig } from './_define';
 import type { BaseOption, PlainObject } from '../../basetype';
+declare const DICT_FORMATS: readonly ["tag", "color", "status", "sup", "sub", "icon", "badge", "progress", "tip", "clazz"];
+type DictFormat = typeof DICT_FORMATS[number];
 type DictRenderOptions = Omit<BaseRenderOptions, 'len' | 'format'> & {
     dictType: string;
 };
 type DictInfo = {
     code: string;
-    format?: 'tag' | 'color' | 'status' | 'sup' | 'sub' | 'icon' | 'progress' | 'clazz';
+    format?: DictFormat;
     nodes: BaseOption[];
 };
-declare const _V_DICT: {
-    DICTS: any[];
+type GlobalDict = {
+    DICTS: BaseOption[];
     DICT_MAP: Map<string, DictInfo>;
 };
+declare const _V_DICT: GlobalDict;
 interface DictRender extends Render {
     /**
      * 将数据转出为 option 用于 select / checkbox / vap组件中的 options 等。

package/utils/Renders/DictRender.js

@@ -33,165 +33,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DICT = exports.initDict = exports.DictRender = void 0;
 var react_1 = __importDefault(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
-var antd_1 = require("antd");
-var Icon_1 = require("../../components/_adapt/Icon");
 var index_1 = require("../index");
 var _i18n_1 = require("../../components/_i18n");
 var _Support_1 = require("../_Support");
 var Const_1 = require("../Const");
+var _DictBaseRender_1 = require("./_DictBaseRender");
+var DICT_FORMATS = ['tag', 'color', 'status', 'sup', 'sub', 'icon', 'badge', 'progress', 'tip', 'clazz'];
+;
+var VALIDATE_FORMAT = new Set(DICT_FORMATS);
 var _V_DICT = (0, _Support_1.globalDefault)('_V_DICT', { DICTS: [], DICT_MAP: new Map() });
 exports.DICT = _V_DICT;
 var DICT = _V_DICT.DICT_MAP;
-// var DICT = globalDefault('_V_DICT' as any, new Map<string, DictInfo>());
-var VALIDATE_FORMAT = new Set(['tag', 'color', 'status', 'sup', 'sub', 'icon', 'progress', 'clazz']);
-// const tagRender = (key: string | number, def: string | false = TEXT.RENDER_TEXT, map: Map<string, [string, string]>) => {
-//     if (!map.has(key)) {
-//         if (def) {
-//             return <Tag>{def}</Tag>
-//         }
-//         return '';
-//     }
-//     let [txt, format] = map.get(key);
-//     return <Tag className="c-dict-tag" color={format ? format : 'geekblue'}>{txt}</Tag>
-// }
-var STATUS = new Set(['success', 'processing', 'warning', 'error', 'default']);
-var statusRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return react_1.default.createElement(antd_1.Badge, { className: "c-dict-status", status: "default", text: def });
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    if (STATUS.has(format)) {
-        // return <Badge status={format as any} text={txt} />
-    }
-    return react_1.default.createElement(antd_1.Badge, { className: "c-dict-status", status: "default", text: txt });
-};
-var subRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    return react_1.default.createElement("span", { className: "c-dict-sub" },
-        txt,
-        format && react_1.default.createElement("sub", null, format));
-};
-var supRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    return react_1.default.createElement("span", { className: "c-dict-sup" },
-        txt,
-        format && react_1.default.createElement("sup", null, format));
-};
-var iconRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    if (format == null || format == '') {
-        return txt;
-    }
-    if (lodash_1.default.startsWith(format, '/')) {
-        return react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement("img", { className: "c-dict-icon-img", src: format }),
-            txt);
-    }
-    return react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(Icon_1.Icon, { className: "c-dict-icon", type: format }),
-        txt);
-};
-// const PROGRESS = new Set<string>(['prepare', 'ready', 'doing', 'finsh', 'error'])
-var progressRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def == false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    switch (format) {
-        case 'prepare':
-            return react_1.default.createElement(antd_1.Badge, { className: "c-dict-progress c-dict-progress-" + format, count: react_1.default.createElement(Icon_1.Icon, { type: "plus-circle" }), text: txt });
-        case 'ready':
-            return react_1.default.createElement(antd_1.Badge, { className: "c-dict-progress c-dict-progress-" + format, count: react_1.default.createElement(Icon_1.Icon, { type: "clock-circle" }), text: txt });
-        case 'doing':
-            return react_1.default.createElement(antd_1.Badge, { className: "c-dict-progress c-dict-progress-" + format, count: react_1.default.createElement(Icon_1.Icon, { type: "play-circle" }), text: txt });
-        case 'finsh':
-            return react_1.default.createElement(antd_1.Badge, { className: "c-dict-progress c-dict-progress-" + format, count: react_1.default.createElement(Icon_1.Icon, { type: "check-circle" }), text: txt });
-        case 'error':
-            return react_1.default.createElement(antd_1.Badge, { className: "c-dict-progress c-dict-progress-" + format, count: react_1.default.createElement(Icon_1.Icon, { type: "close-circle" }), text: txt });
-    }
-    return txt;
-};
-var borderRender = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    return react_1.default.createElement("span", { className: "c-dict-border", style: { color: format, borderLeftColor: format } }, txt);
-};
-var extClass = function (key, def, map) {
-    if (!map.has(key)) {
-        if (def === false)
-            return key;
-        return def;
-    }
-    var _a = __read(map.get(key), 2), txt = _a[0], format = _a[1];
-    if (format) {
-        return react_1.default.createElement("span", { className: format }, txt);
-    }
-    return txt;
-};
-var renderDictValue = function (info, item) {
-    switch (info.format) {
-        case 'tag':
-            // return tagRender(item.value);
-            break;
+var _DictRender = function (props) {
+    var root = DICT.get(props.dictType);
+    if (root == null)
+        return props.default || Const_1.NONE; // 没有字典
+    var idx = lodash_1.default.findIndex(root.nodes, function (item) { return (props.value + '') == item.value; });
+    var hasFormat = root.format != null && VALIDATE_FORMAT.has(root.format);
+    var _a = __read([null, null], 2), format = _a[0], label = _a[1];
+    if (idx >= 0) {
+        var info = root.nodes[idx];
+        format = info.format;
+        label = info.label;
+    }
+    if (!hasFormat)
+        return label || props.default || Const_1.NONE;
+    switch (root.format) {
+        case 'clazz':
+            return (0, _DictBaseRender_1.renderClazz)(format, label, props.default);
+        case 'badge':
+            return (0, _DictBaseRender_1.renderBadge)(format, label, props.default);
         case 'color':
-            break;
-        // return;
-        case 'status':
-            break;
-        // return;
-        case 'sup':
-            // return;
-            break;
-        case 'sub':
-            // return;
-            break;
+            return (0, _DictBaseRender_1.renderColor)(format, label, props.default);
         case 'icon':
-            // return;
-            break;
+            return (0, _DictBaseRender_1.renderIcon)(format, label, props.default);
         case 'progress':
-        // return;
-        case 'clazz':
-            return react_1.default.createElement("span", { className: item.format }, item.label);
-        default:
-            return item.label;
+            return (0, _DictBaseRender_1.renderProgress)(format, label, props.default);
+        case 'status':
+            return (0, _DictBaseRender_1.renderStatus)(format, label, props.default);
+        case 'sub':
+            return (0, _DictBaseRender_1.renderSub)(format, label, props.default);
+        case 'sup':
+            return (0, _DictBaseRender_1.renderSup)(format, label, props.default);
+        case 'tag':
+            return (0, _DictBaseRender_1.renderTag)(format, label, props.default);
+        case 'tip':
+            return (0, _DictBaseRender_1.renderTip)(format, label, props.default);
     }
-    return item.label;
-};
-var _DictRender = function (props) {
-    // if (DICT == null) return NONE;
-    if (props.value === null)
-        return props.default || Const_1.NONE;
-    var dictInfo = DICT.get(props.dictType);
-    if (dictInfo == null)
-        return props.default || Const_1.NONE;
-    var dictKey = props.value + '';
-    var idx = lodash_1.default.findIndex(dictInfo.nodes, function (item) { return dictKey == item.value; });
-    if (idx < 0)
-        return props.default || Const_1.NONE;
-    return renderDictValue(dictInfo, dictInfo.nodes[idx]);
+    return label || props.default || Const_1.NONE;
 };
 var putOptions = function (arr, config) {
     if (config === undefined)
@@ -216,14 +105,9 @@ var putOptions = function (arr, config) {
     }
     return list;
 };
-var DictCache = new Map();
 var DictRender = function (options) {
-    if (lodash_1.default.isString(options) && DictCache.has(options))
-        return DictCache.get(options);
     var props = lodash_1.default.isString(options) ? { dictType: options } : options;
-    var fn = function (txt) {
-        return react_1.default.createElement(_DictRender, __assign({}, props, { value: txt }));
-    };
+    var fn = function (txt) { return react_1.default.createElement(_DictRender, __assign({}, props, { value: txt })); };
     fn.options = function (config) {
         var info = DICT.get(props.dictType);
         if (info == null)
@@ -242,8 +126,6 @@ var DictRender = function (options) {
             return lodash_1.default.isString(def) ? def : '';
         return dictInfo.nodes[idx].label;
     };
-    if (lodash_1.default.isString(options))
-        DictCache.set(options, fn);
     return fn;
 };
 exports.DictRender = DictRender;
@@ -252,7 +134,7 @@ var initNodes = function (parentType, dict, nodes) {
     childs.map(function (item) {
         var value = lodash_1.default.trim(item.code);
         if (value.length > 0)
-            nodes.push({ label: item.codeValue, value: value });
+            nodes.push({ label: item.codeValue, value: value, format: item.format });
         var subChildren = lodash_1.default.filter(dict, function (sub) { return sub.parentType == item.type; });
         if (subChildren.length > 0) {
             initNodes(item.type, dict, nodes);
@@ -266,10 +148,11 @@ var initDict = function (dict) {
     var roots = lodash_1.default.filter(dict, function (item) { return item['parentType'] == '0' || item['parentType'] == ''; });
     _V_DICT.DICTS = [];
     roots.map(function (root) {
-        var info = { code: root.type, nodes: [] };
+        var format = (root.format && VALIDATE_FORMAT.has(root.format)) ? root.format : null;
+        var info = { code: root.type, nodes: [], };
+        if (format)
+            info.format = format;
         _V_DICT.DICTS.push({ label: root.codeValue, value: root.type });
-        if (root.format && VALIDATE_FORMAT.has(root.format))
-            info.format = root.format;
         initNodes(root.type, dict, info.nodes);
         DICT.set(root.type, info);
     });

package/utils/Renders/_DictBaseRender.d.ts

@@ -0,0 +1,13 @@
+import type { ReactNode } from 'react';
+type DictFormartRender = (itemFormat: string, value: string | number, def?: ReactNode) => ReactNode;
+export declare const renderTag: DictFormartRender;
+export declare const renderColor: DictFormartRender;
+export declare const renderStatus: DictFormartRender;
+export declare const renderSub: DictFormartRender;
+export declare const renderSup: DictFormartRender;
+export declare const renderBadge: DictFormartRender;
+export declare const renderIcon: DictFormartRender;
+export declare const renderProgress: DictFormartRender;
+export declare const renderClazz: DictFormartRender;
+export declare const renderTip: DictFormartRender;
+export {};

package/utils/Renders/_DictBaseRender.js

@@ -0,0 +1,167 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderTip = exports.renderClazz = exports.renderProgress = exports.renderIcon = exports.renderBadge = exports.renderSup = exports.renderSub = exports.renderStatus = exports.renderColor = exports.renderTag = void 0;
+var react_1 = __importDefault(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
+var index_1 = require("../../index");
+var Const_1 = require("../Const");
+var antd_1 = require("antd");
+var STATUS_CONST = new Set(['success', 'processing', 'error', 'default', 'warning']);
+/**
+ * 获取 label 内容
+*/
+var getLabel = function (value, def) {
+    if (typeof value == 'number')
+        return value + '';
+    if (value === undefined || value === null)
+        return def === undefined ? null : def;
+    var label = lodash_1.default.trim(value);
+    if (label == '')
+        return def === undefined ? null : def;
+    return label;
+};
+var renderTag = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    return react_1.default.createElement(index_1.Tag, { className: "c-dict-tag", color: itemFormat }, label);
+};
+exports.renderTag = renderTag;
+var renderColor = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    return react_1.default.createElement("span", { className: "c-dict-color", style: { color: itemFormat } }, label);
+};
+exports.renderColor = renderColor;
+var renderStatus = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.toLower(lodash_1.default.trim(itemFormat));
+    var status = STATUS_CONST.has(format) ? format : 'default';
+    return react_1.default.createElement(index_1.Badge, { className: "c-dict-status", status: status, text: label });
+};
+exports.renderStatus = renderStatus;
+var renderSub = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.trim(itemFormat);
+    return react_1.default.createElement("span", { className: "c-dict-sub" },
+        label,
+        format && react_1.default.createElement("sub", null, format));
+};
+exports.renderSub = renderSub;
+var renderSup = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.trim(itemFormat);
+    return react_1.default.createElement("span", { className: "c-dict-sup" },
+        label,
+        format && react_1.default.createElement("sup", null, format));
+};
+exports.renderSup = renderSup;
+var renderBadge = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.toLower(lodash_1.default.trim(itemFormat));
+    if (format.length == 0)
+        return label;
+    // 讨嫌小红点
+    if (format == 'dot')
+        return react_1.default.createElement(index_1.Badge, { className: "c-dict-badge c-dict-badge-dot", dot: true },
+            react_1.default.createElement("span", null, label));
+    try {
+        var count = parseInt(format);
+        if (lodash_1.default.isNaN(count))
+            throw new Error('format is not number');
+        return react_1.default.createElement(index_1.Badge, { className: "c-dict-badge", count: count },
+            react_1.default.createElement("span", null, label));
+    }
+    catch (_a) {
+        return label;
+    }
+};
+exports.renderBadge = renderBadge;
+var renderIcon = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.toLower(lodash_1.default.trim(itemFormat));
+    if (format.length == 0)
+        return label;
+    if (lodash_1.default.startsWith(format, '/') || lodash_1.default.startsWith(format, 'http://') || lodash_1.default.startsWith(format, 'https://')) {
+        return react_1.default.createElement("span", { className: "c-dict-icon" },
+            react_1.default.createElement("img", { src: format }),
+            react_1.default.createElement("span", null, label));
+    }
+    return react_1.default.createElement("span", { className: "c-dict-icon " },
+        react_1.default.createElement(index_1.Icon, { type: format }),
+        react_1.default.createElement("span", null, label));
+};
+exports.renderIcon = renderIcon;
+var renderProgress = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.toLower(lodash_1.default.trim(itemFormat));
+    if (format.length == 0)
+        return label;
+    switch (format) {
+        case 'waiting':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-waiting" },
+                react_1.default.createElement(index_1.Icon, { type: "audit-task-status-waiting" }),
+                react_1.default.createElement("span", null, label));
+        case 'prepare':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-prepare" },
+                react_1.default.createElement(index_1.Icon, { type: "info-circle" }),
+                react_1.default.createElement("span", null, label));
+        case 'ready':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-ready" },
+                react_1.default.createElement(index_1.Icon, { type: "trademark" }),
+                react_1.default.createElement("span", null, label));
+        case 'doing':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-doing" },
+                react_1.default.createElement(index_1.Icon, { type: "audit-task-status-doing" }),
+                react_1.default.createElement("span", null, label));
+        case 'finish':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-finish" },
+                react_1.default.createElement(index_1.Icon, { type: "audit-task-status-finish" }),
+                react_1.default.createElement("span", null, label));
+        case 'error':
+            return react_1.default.createElement("span", { className: "c-dict-progress c-dict-progress-error" },
+                react_1.default.createElement(index_1.Icon, { type: "audit-task-status-error" }),
+                react_1.default.createElement("span", null, label));
+    }
+    return label;
+};
+exports.renderProgress = renderProgress;
+var renderClazz = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.toLower(lodash_1.default.trim(itemFormat));
+    if (format.length == 0)
+        return label;
+    return react_1.default.createElement("span", { className: format }, label);
+};
+exports.renderClazz = renderClazz;
+var renderTip = function (itemFormat, value, def) {
+    var label = getLabel(value, def);
+    if (label === null)
+        return Const_1.NONE;
+    var format = lodash_1.default.trim(itemFormat);
+    if (format.length == 0)
+        return label;
+    return react_1.default.createElement("span", { className: "c-dict-tip" },
+        react_1.default.createElement(antd_1.Popover, { content: react_1.default.createElement("pre", null, format) },
+            react_1.default.createElement("span", null, label),
+            react_1.default.createElement(index_1.Icon, { type: "question-circle", evt: true })));
+};
+exports.renderTip = renderTip;