vap1 0.7.4 → 0.7.6

package/components/SearchTool/SearchBar/ByField.js

@@ -104,8 +104,9 @@ exports.InnerSearchBarByField = (0, react_1.forwardRef)(function (props, ref) {
         if (props.fields == undefined || !lodash_1.default.isArray(props.fields) || props.fields.length == 0)
             return 3;
         if (props.__innnerPopup) {
-            if (props.fields.length < 6)
-                return 1;
+            if (props.fields.length < 6) {
+                return lodash_1.default.max(props.fields.map(function (item) { return (0, _register_1.getSearchField)(item.type).defaultSpan || 1; }));
+            }
             return 2;
         }
         ;

package/package.json

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

package/utils/Renders/StringRender.d.ts

@@ -1,5 +1,9 @@
 import type { BaseRenderOptions, Render } from './_define';
 export declare const StrRender: (options?: number | BaseRenderOptions) => Render;
+type StrTipRender = BaseRenderOptions & {
+    title?: string;
+};
+export declare const StrTipRender: (options?: number | StrTipRender) => Render;
 /**
  * 返回一个 htmlRender，用于显示自定义的html,会用div包住
  * @param className 包住自定义html的 className 默认为空
@@ -12,3 +16,5 @@ export declare const StrCopyRender: (options: number | BaseRenderOptions) => Ren
  * 默认使用长度为 24 的 Render
 */
 export declare const strCopyRender: Render;
+export declare const strTipRender: Render;
+export {};

package/utils/Renders/StringRender.js

@@ -52,7 +52,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strCopyRender = exports.StrCopyRender = exports.htmlRender = exports.strRender = exports.HTMRender = exports.StrRender = void 0;
+exports.strTipRender = exports.strCopyRender = exports.StrCopyRender = exports.htmlRender = exports.strRender = exports.HTMRender = exports.StrTipRender = exports.StrRender = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var Icon_1 = require("../../components/_adapt/Icon");
@@ -81,6 +81,28 @@ var StrRender = function (options) {
     return fn;
 };
 exports.StrRender = StrRender;
+var StrTipRender = function (options) {
+    var config;
+    if (options == null) {
+        config = { len: 24 };
+    }
+    else if (lodash_1.default.isNumber(options)) {
+        config = { len: options };
+    }
+    else {
+        config = options;
+    }
+    var fn = function (value) {
+        if (value == null)
+            return config.default || '';
+        return react_1.default.createElement(antd_1.Popover, { title: config.title || undefined, overlayClassName: 'c-render-strtip', content: react_1.default.createElement("span", null, value) }, (0, _define_1.getValue)(value + '', value, config));
+    };
+    fn.getText = function (str, defaultValue) {
+        return str;
+    };
+    return fn;
+};
+exports.StrTipRender = StrTipRender;
 /**
  * 返回一个 htmlRender，用于显示自定义的html,会用div包住
  * @param className 包住自定义html的 className 默认为空
@@ -153,6 +175,7 @@ exports.StrCopyRender = StrCopyRender;
  * 默认使用长度为 24 的 Render
 */
 exports.strCopyRender = (0, exports.StrCopyRender)(24);
+exports.strTipRender = (0, exports.StrTipRender)();
 //     /**
 //      * 字符串截取 Render
 //      * @param len 截取长度，默认为 20

package/utils/Renders/index.d.ts

@@ -5,6 +5,6 @@ export { fileRender, ImgRender, imgRender } from './FileRender';
 export { ListRender, switchYesNoRender, switchOpenRender, switchCloseRender, switchEnableRender, switchDisableRender, switchShowRender, switchHideRender, } from './ListRender';
 export { NumberRender, intRender, numberRender, sizeRender, usdRender, chineseRender, percentRender } from './NumberRender';
 export { StatusRender } from './StatusRender';
-export { StrRender, HTMRender, strRender, htmlRender, StrCopyRender, strCopyRender } from './StringRender';
+export { StrRender, strRender, HTMRender, htmlRender, StrTipRender, strTipRender, StrCopyRender, strCopyRender } from './StringRender';
 export { DictRender, DICT } from './DictRender';
 export { conditionRender } from './CondictionRender';

package/utils/Renders/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.conditionRender = exports.DICT = exports.DictRender = exports.strCopyRender = exports.StrCopyRender = exports.htmlRender = exports.strRender = exports.HTMRender = exports.StrRender = exports.StatusRender = exports.percentRender = exports.chineseRender = exports.usdRender = exports.sizeRender = exports.numberRender = exports.intRender = exports.NumberRender = exports.switchHideRender = exports.switchShowRender = exports.switchDisableRender = exports.switchEnableRender = exports.switchCloseRender = exports.switchOpenRender = exports.switchYesNoRender = exports.ListRender = exports.imgRender = exports.ImgRender = exports.fileRender = exports.dateRender = exports.DateRender = exports.ApiPostRender = exports.ApiGetRender = void 0;
+exports.conditionRender = exports.DICT = exports.DictRender = exports.strCopyRender = exports.StrCopyRender = exports.strTipRender = exports.StrTipRender = exports.htmlRender = exports.HTMRender = exports.strRender = exports.StrRender = exports.StatusRender = exports.percentRender = exports.chineseRender = exports.usdRender = exports.sizeRender = exports.numberRender = exports.intRender = exports.NumberRender = exports.switchHideRender = exports.switchShowRender = exports.switchDisableRender = exports.switchEnableRender = exports.switchCloseRender = exports.switchOpenRender = exports.switchYesNoRender = exports.ListRender = exports.imgRender = exports.ImgRender = exports.fileRender = exports.dateRender = exports.DateRender = exports.ApiPostRender = exports.ApiGetRender = void 0;
 var ApiGetRender_1 = require("./ApiGetRender");
 Object.defineProperty(exports, "ApiGetRender", { enumerable: true, get: function () { return ApiGetRender_1.ApiGetRender; } });
 var ApiPostRender_1 = require("./ApiPostRender");
@@ -33,9 +33,11 @@ var StatusRender_1 = require("./StatusRender");
 Object.defineProperty(exports, "StatusRender", { enumerable: true, get: function () { return StatusRender_1.StatusRender; } });
 var StringRender_1 = require("./StringRender");
 Object.defineProperty(exports, "StrRender", { enumerable: true, get: function () { return StringRender_1.StrRender; } });
-Object.defineProperty(exports, "HTMRender", { enumerable: true, get: function () { return StringRender_1.HTMRender; } });
 Object.defineProperty(exports, "strRender", { enumerable: true, get: function () { return StringRender_1.strRender; } });
+Object.defineProperty(exports, "HTMRender", { enumerable: true, get: function () { return StringRender_1.HTMRender; } });
 Object.defineProperty(exports, "htmlRender", { enumerable: true, get: function () { return StringRender_1.htmlRender; } });
+Object.defineProperty(exports, "StrTipRender", { enumerable: true, get: function () { return StringRender_1.StrTipRender; } });
+Object.defineProperty(exports, "strTipRender", { enumerable: true, get: function () { return StringRender_1.strTipRender; } });
 Object.defineProperty(exports, "StrCopyRender", { enumerable: true, get: function () { return StringRender_1.StrCopyRender; } });
 Object.defineProperty(exports, "strCopyRender", { enumerable: true, get: function () { return StringRender_1.strCopyRender; } });
 var DictRender_1 = require("./DictRender");

package/utils/crontab/_zh_CN.js

@@ -37,7 +37,7 @@ exports.zh_CN = {
         return "生成表达式描述时发生了错误，请检查cron表达式语法。";
     },
     atSpace: function () {
-        return "在";
+        return " ";
     },
     everyMinuteBetweenX0AndX1: function () {
         return "在 %s 至 %s 之间的每分钟";
@@ -79,7 +79,7 @@ exports.zh_CN = {
         return "在%s";
     },
     commaEveryDay: function () {
-        return ", 每天";
+        return "每天";
     },
     commaEveryX0DaysOfTheWeek: function () {
         return ", 每周的每 %s 天";

package/utils/crontab/crontabParser.js

@@ -1,4 +1,20 @@
 "use strict";
+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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.crontabParser = void 0;
 var utils_1 = require("./utils");
@@ -45,9 +61,10 @@ var extractParts = function (expression) {
         throw new Error("\u8868\u8FBE\u5F0F\u81F3\u5C11\u9700\u8981\u75315\u4E2A\u90E8\u5206\u7EC4\u6210");
     }
     else if (parsed.length == 5) {
-        // 5 part cron so shift array past seconds element
-        parsed.unshift("");
-        parsed.push("");
+        // 5 part cron (Linux format): 分 时 日 月 周
+        // Convert to 7 part format: 秒 分 时 日 月 周 年
+        var _a = __read(parsed, 5), minute = _a[0], hour = _a[1], dayOfMonth = _a[2], month = _a[3], dayOfWeek = _a[4];
+        parsed = ["", minute, hour, dayOfMonth, month, dayOfWeek, ""];
     }
     else if (parsed.length == 6) {
         /* We will detect if this 6 part expression has a year specified and if so we will shift the parts and treat the

package/utils/crontab/crontabRender.js

@@ -33,8 +33,10 @@ var ExpressionDescriptor = /** @class */ (function () {
             var monthDesc = this.getMonthDescription();
             var dayOfWeekDesc = this.getDayOfWeekDescription();
             var yearDesc = this.getYearDescription();
-            description += timeSegment + dayOfMonthDesc + dayOfWeekDesc + monthDesc + yearDesc;
+            description += dayOfMonthDesc + dayOfWeekDesc + timeSegment + monthDesc + yearDesc;
             description = this.transformVerbosity(description, !!this.options.verbose);
+            // Remove leading comma and space if present
+            description = description.replace(/^,\s*/, '');
             // uppercase first character
             description = description.charAt(0).toLocaleUpperCase() + description.substr(1);
         }
@@ -175,8 +177,8 @@ var ExpressionDescriptor = /** @class */ (function () {
         var _this = this;
         var daysOfWeekNames = _global_1.i18n.daysOfTheWeek();
         var description = null;
-        if (this.expressionParts[5] == "*") {
-            // DOW is specified as * so we will not generate a description and defer to DOM part.
+        if (this.expressionParts[5] == "*" || this.expressionParts[5] == "?") {
+            // DOW is specified as * or ? so we will not generate a description and defer to DOM part.
             // Otherwise, we could get a contradiction like "on day 1 of the month, every day"
             // or a dupe description like "every day, every day".
             description = "";
@@ -317,10 +319,14 @@ var ExpressionDescriptor = /** @class */ (function () {
                         description = (0, utils_1.format)(_global_1.i18n.commaDaysBeforeTheLastDayOfTheMonth(offSetDays), offSetDays);
                         break;
                     }
-                    else if (expression == "*" && this.expressionParts[5] != "*") {
-                        // * dayOfMonth and dayOfWeek specified so use dayOfWeek verbiage instead
+                    else if (expression == "*" && this.expressionParts[5] != "*" && this.expressionParts[5] != "?") {
+                        // * dayOfMonth and dayOfWeek specified (not ?) so use dayOfWeek verbiage instead
                         return "";
                     }
+                    else if (expression == "*" && (this.expressionParts[5] == "*" || this.expressionParts[5] == "?")) {
+                        // * dayOfMonth and * or ? dayOfWeek means every day
+                        return _global_1.i18n.commaEveryDay();
+                    }
                     else {
                         description = this.getSegmentDescription(expression, _global_1.i18n.commaEveryDay(), function (s) {
                             return s == "L"
@@ -489,7 +495,13 @@ var ExpressionDescriptor = /** @class */ (function () {
         if (!useVerboseFormat) {
             description = description.replace(new RegExp(", ".concat(_global_1.i18n.everyMinute()), "g"), "");
             description = description.replace(new RegExp(", ".concat(_global_1.i18n.everyHour()), "g"), "");
-            description = description.replace(new RegExp(_global_1.i18n.commaEveryDay(), "g"), "");
+            // Don't remove "每天" if it's at the beginning followed by time
+            if (description.startsWith(_global_1.i18n.commaEveryDay()) && description.match(/\d+:\d+(:\d+)?/)) {
+                // Keep "每天" when it's at the beginning with time description
+            }
+            else {
+                description = description.replace(new RegExp(_global_1.i18n.commaEveryDay(), "g"), "");
+            }
             description = description.replace(/\, ?$/, "");
         }
         return description;