From 2726fbc0b0aa44b54dcf5d67a8b1de4193790598 Mon Sep 17 00:00:00 2001 From: Treecat Date: Wed, 22 Feb 2023 17:34:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-14316=20chore:=20=E5=BC=95=E5=85=A5r?= =?UTF-8?q?ollup=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E7=BB=86?= =?UTF-8?q?=E8=8A=82=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rollup.config.js | 39 +++++++++++++++++++++ src/case/button/node/treenode.js | 2 +- src/core/func/string.js | 4 +-- src/widget/dynamicdate/dynamicdate.combo.js | 3 +- 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 rollup.config.js diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 000000000..b71ac0e49 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,39 @@ +const babel = require("@rollup/plugin-babel"); +const alias = require("@rollup/plugin-alias"); +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const path = require("path"); +// import { fileURLToPath } from "url"; +// import path from "path"; + +// const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const input = "src/index.js"; + +module.exports = [ + { + input, + output: [ + { + file: "dist/fineui.esm.js", + format: "esm", + sourcemap: true + } + ], + plugins: [ + alias({ + entries: [ + { find: "@", replacement: path.resolve(__dirname, "src") } + ] + }), + resolve(), + babel({ + babelHelpers: "runtime", + presets: ["@babel/preset-env"], + plugins: [ + ["@babel/plugin-proposal-decorators", { legacy: true }] + ] + }), + commonjs() + ] + } +]; diff --git a/src/case/button/node/treenode.js b/src/case/button/node/treenode.js index 5e6a31d58..9a599f344 100644 --- a/src/case/button/node/treenode.js +++ b/src/case/button/node/treenode.js @@ -169,7 +169,7 @@ export class FirstPlusGroupNode extends BasicTreeNode { } } -@shortcut +@shortcut() export class MidPlusGroupNode extends BasicTreeNode { static xtype = "bi.mid_plus_group_node"; diff --git a/src/core/func/string.js b/src/core/func/string.js index d273db525..c6f98fedc 100644 --- a/src/core/func/string.js +++ b/src/core/func/string.js @@ -1,4 +1,4 @@ -import {isString} from "../2.base"; +import {isString, each} from "../2.base"; /** * 判断字符串是否已指定的字符串开始 @@ -62,7 +62,7 @@ export function appendQuery(str, paras) { } else { src += "&"; } - BI._.each(paras, function (value, name) { + each(paras, function (value, name) { if (typeof (name) === "string") { src += name + "=" + value + "&"; } diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 96266a023..684776f8c 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -28,8 +28,7 @@ export class DynamicDateCombo extends Single { static EVENT_ERROR = "EVENT_ERROR"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; - static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; - + static Static = 1; static Dynamic = 2; From 07aec861b9c95b0b4c4d96a0838f58de1fd3b791 Mon Sep 17 00:00:00 2001 From: Treecat Date: Thu, 23 Feb 2023 10:28:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-14316=20chore:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20string=20=E7=9A=84=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/string.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/core/func/string.js b/src/core/func/string.js index c6f98fedc..f380b3581 100644 --- a/src/core/func/string.js +++ b/src/core/func/string.js @@ -1,4 +1,4 @@ -import {isString, each} from "../2.base"; +import { isString, each } from "../2.base"; /** * 判断字符串是否已指定的字符串开始 @@ -11,6 +11,7 @@ export function startWith(str, startTag) { if (startTag == null || startTag == "" || str.length === 0 || startTag.length > str.length) { return false; } + return str.substring(0, startTag.length) == startTag; } @@ -24,6 +25,7 @@ export function endWith(str, endTag) { if (endTag == null || endTag == "" || str.length === 0 || endTag.length > str.length) { return false; } + return str.substring(str.length - endTag.length) == endTag; } @@ -34,11 +36,12 @@ export function endWith(str, endTag) { * @return {String} 参数的值 */ export function getQuery(str, name) { - const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); + const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`); const r = str.substr(str.indexOf("?") + 1).match(reg); if (r) { return unescape(r[2]); } + return null; } @@ -58,16 +61,17 @@ export function appendQuery(str, paras) { src += "?"; } // 如果以问号结尾，说明没有其他参数 - if (BI.endWith(src, "?") !== false) { - } else { + if (!src.endsWith("?")) { src += "&"; } - each(paras, function (value, name) { + + each(paras, (name, value) => { if (typeof (name) === "string") { - src += name + "=" + value + "&"; + src += `${name}=${value}&`; } }); src = src.substr(0, src.length - 1); + return src; } @@ -89,11 +93,11 @@ export function replaceAll(str, s1, s2) { * @returns {String} 以指定字符开头的字符串 */ export function perfectStart(str, start) { - if (BI.startWith(str, start)) { + if (str.startsWith(start)) { return str; } - return start + str; + return start + str; } /** @@ -117,5 +121,6 @@ export function allIndexOf(str, sub) { str = str.substring(loc + sub.length, str.length); offset += loc + sub.length; } + return location; }