From f35ca9a1aae7d8b4e218b1ff1b38ddab1eecbb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dailer-=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Wed, 11 Jan 2023 16:38:46 +0800 Subject: [PATCH 01/27] =?UTF-8?q?REPORT-88341=20fix:=20=E3=80=90=E4=B8=93?= =?UTF-8?q?=E9=A2=98=E3=80=91=E3=80=90=E6=99=BA=E8=83=BD=E8=BF=90=E7=BB=B4?= =?UTF-8?q?-=E5=B9=B3=E5=8F=B0=E6=97=A5=E5=BF=97=E3=80=91=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A1=8C=E4=B8=BA-=E6=93=8D=E4=BD=9C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E6=A8=A1=E6=9D=BF=E7=83=AD=E5=BA=A6-?= =?UTF-8?q?=E8=A2=AB=E8=AE=BF=E9=97=AE=E8=B5=84=E6=BA=90=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?ie=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/dom.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/platform/web/dom.js b/src/core/platform/web/dom.js index 6a2f3fb95..dba5e46a6 100644 --- a/src/core/platform/web/dom.js +++ b/src/core/platform/web/dom.js @@ -745,13 +745,14 @@ * 获取position:fixed相对定位的元素的clientRect */ getPositionRelativeContainingBlockRect: function (element) { - var positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element); - var rect = positionRelativeElement.getBoundingClientRect(); + const positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(element); + const { top, right, bottom, left, width, height, x, y } = positionRelativeElement.getBoundingClientRect(); + return { - ...rect.toJSON(), - scaleX: rect.width / positionRelativeElement.offsetWidth, - scaleY: rect.height / positionRelativeElement.offsetHeight + top, right, bottom, left, width, height, x, y, + scaleX: width / positionRelativeElement.offsetWidth, + scaleY: height / positionRelativeElement.offsetHeight, }; }, }); From eabdc4aafa4a3292adcd5ae68831427ef16507dc Mon Sep 17 00:00:00 2001 From: Renzo Date: Thu, 12 Jan 2023 15:16:29 +0800 Subject: [PATCH 02/27] =?UTF-8?q?JSY-25995=20feat:=20TextValueCombo=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20EVENT=5FBEFORE=5FPOPUPVIEW=20=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 2 ++ typescript/case/combo/combo.textvalue.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 9dc088639..bc43fce64 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -130,6 +130,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, action: () => { changeTag = false; + this.fireEvent(BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW); } }, { eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, @@ -209,5 +210,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { this.combo.populate(items); } }); +BI.TextValueCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; BI.TextValueCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.text_value_combo", BI.TextValueCombo); diff --git a/typescript/case/combo/combo.textvalue.ts b/typescript/case/combo/combo.textvalue.ts index 128ec03b6..f2a080ba5 100644 --- a/typescript/case/combo/combo.textvalue.ts +++ b/typescript/case/combo/combo.textvalue.ts @@ -4,6 +4,7 @@ export declare class TextValueCombo extends Widget { static xtype: string; static EVENT_CHANGE: string; + static EVENT_BEFORE_POPUPVIEW: string; clear(): void; setText(text: string): void; From 4d3bafb78b1aba2ca7c556682968c2dfa84ba406 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 12 Jan 2023 21:08:55 +0800 Subject: [PATCH 03/27] auto upgrade version to 2.0.20230112210841 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 241a140d7..f7069a394 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230109200447", + "version": "2.0.20230112210841", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 4c47fa328d2292a9c8f1caeed70b6e0be0db540c Mon Sep 17 00:00:00 2001 From: data Date: Fri, 13 Jan 2023 12:17:05 +0800 Subject: [PATCH 04/27] auto upgrade version to 2.0.20230113121657 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7069a394..dec8d418f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230112210841", + "version": "2.0.20230113121657", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 8d827f15d56b578c53fa1589e41b4a10b2bfb424 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 30 Jan 2023 11:05:30 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=97=A0jira=20=E5=8E=BB=E6=8E=89grunt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 814ba6fa12ce1bf376d25945b424c7246f316549) --- lib/postbuild/postbuild.js | 9 +++------ package.json | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/postbuild/postbuild.js b/lib/postbuild/postbuild.js index 6a0d81928..9e7e5301a 100644 --- a/lib/postbuild/postbuild.js +++ b/lib/postbuild/postbuild.js @@ -1,9 +1,9 @@ const { resolve } = require("path"); const { existsSync, mkdirSync, readFileSync, writeFileSync } = require("fs"); const rimraf = require("rimraf"); -const grunt = require("grunt"); const concat = require("concat"); -const { config } = require("../../webpack/attachments") +const glob = require("glob"); +const { config } = require("../../webpack/attachments"); const dest = resolve(__dirname, '../../dist'); @@ -25,10 +25,7 @@ const deleteList = [ "2.0/fineui_without_normalize.min.js.map", "fineui_without_normalize.min.js", "fineui_without_normalize.min.js.map", -].concat(grunt.file.expand({}, [ - "dist/*.css.map", - "dist/**/*.css.map", -]).map(name => name.replace("dist/", ""))); +].concat(glob.sync("dist/**/*.css.map").map(name => name.replace("dist/", ""))); deleteList.forEach(filename => { const sourcefile = resolve(dest, `./${filename}`); diff --git a/package.json b/package.json index dec8d418f..a0cd07fa0 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "express": "4.15.2", "fork-ts-checker-webpack-plugin": "1.4.3", "glob": "^7.2.0", - "grunt": "^1.0.1", "html-webpack-plugin": "3.2.0", "husky": "^3.1.0", "karma": "3.1.4", From fddd033a6975fd2635528202403e4c4ae809b53b Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 30 Jan 2023 11:05:30 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E6=97=A0jira=20=E5=8E=BB=E6=8E=89grunt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 814ba6fa12ce1bf376d25945b424c7246f316549) (cherry picked from commit 8d827f15d56b578c53fa1589e41b4a10b2bfb424) --- lib/postbuild/postbuild.js | 9 +++------ package.json | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/postbuild/postbuild.js b/lib/postbuild/postbuild.js index 6a0d81928..9e7e5301a 100644 --- a/lib/postbuild/postbuild.js +++ b/lib/postbuild/postbuild.js @@ -1,9 +1,9 @@ const { resolve } = require("path"); const { existsSync, mkdirSync, readFileSync, writeFileSync } = require("fs"); const rimraf = require("rimraf"); -const grunt = require("grunt"); const concat = require("concat"); -const { config } = require("../../webpack/attachments") +const glob = require("glob"); +const { config } = require("../../webpack/attachments"); const dest = resolve(__dirname, '../../dist'); @@ -25,10 +25,7 @@ const deleteList = [ "2.0/fineui_without_normalize.min.js.map", "fineui_without_normalize.min.js", "fineui_without_normalize.min.js.map", -].concat(grunt.file.expand({}, [ - "dist/*.css.map", - "dist/**/*.css.map", -]).map(name => name.replace("dist/", ""))); +].concat(glob.sync("dist/**/*.css.map").map(name => name.replace("dist/", ""))); deleteList.forEach(filename => { const sourcefile = resolve(dest, `./${filename}`); diff --git a/package.json b/package.json index 912095db0..201c3bb20 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "express": "4.15.2", "fork-ts-checker-webpack-plugin": "1.4.3", "glob": "^7.2.0", - "grunt": "^1.0.1", "html-webpack-plugin": "3.2.0", "husky": "^3.1.0", "karma": "3.1.4", From f6710d95a2fb1d68e500f9cc9291ac22b972aa56 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 30 Jan 2023 11:29:02 +0800 Subject: [PATCH 07/27] auto upgrade version to 2.0.20230130112753 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0cd07fa0..0f77dd82e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230113121657", + "version": "2.0.20230130112753", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From f4ea6a9170322fe6d97ae876b61e59d0d7c6906d Mon Sep 17 00:00:00 2001 From: data Date: Mon, 30 Jan 2023 11:46:33 +0800 Subject: [PATCH 08/27] auto upgrade version to 2.0.20230130114621 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f77dd82e..c0a5b94bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230130112753", + "version": "2.0.20230130114621", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From bb7905bf0f347d7944e3255cecd3a64f61e46a0e Mon Sep 17 00:00:00 2001 From: Renzo Date: Wed, 1 Feb 2023 14:08:44 +0800 Subject: [PATCH 09/27] =?UTF-8?q?JSY-26063=20fix:=20=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/function.js | 10 +++++++--- typescript/core/func/function.ts | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/func/function.js b/src/core/func/function.js index 83d58c5ec..cc77b7798 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -40,11 +40,13 @@ BI._.extend(BI.Func, { * @param items * @param keyword * @param param 搜索哪个属性 + * @param opt 额外配置，caseSensitive: 大小写敏感 */ - getSearchResult: function (items, keyword, param) { + getSearchResult: function (items, keyword, param, opt) { var isArray = BI.isArray(items); items = isArray ? BI.flatten(items) : items; param || (param = "text"); + opt || (opt = {caseSensitive: false}); if (!BI.isKey(keyword)) { return { find: items, @@ -69,8 +71,10 @@ BI._.extend(BI.Func, { py = BI.makeFirstPY(text, { splitChar: "\u200b" }); - text = BI.toUpperCase(text); - py = BI.toUpperCase(py); + if (!opt.caseSensitive) { + text = BI.toUpperCase(text); + py = BI.toUpperCase(py); + } var pidx; if (text.indexOf(keyword) > -1) { if (text === keyword) { diff --git a/typescript/core/func/function.ts b/typescript/core/func/function.ts index 4da9ab104..12634e513 100644 --- a/typescript/core/func/function.ts +++ b/typescript/core/func/function.ts @@ -13,8 +13,9 @@ export type _function = { * @param items 待搜索的数据 * @param keyword 关键字 * @param param 搜索哪个属性 + * @param opt 额外配置，caseSensitive: 大小写敏感 */ - getSearchResult: (items: any, keyword: any, param?: string) => { find: any[], match: any[] }; + getSearchResult: (items: any, keyword: any, param?: string, opt?: {caseSensitive: boolean}) => { find: any[], match: any[] }; /** * 获取编码后的url From 0ae05dc79cc6262d29f99f87ee4b93b47133ef1f Mon Sep 17 00:00:00 2001 From: Renzo Date: Wed, 1 Feb 2023 16:01:30 +0800 Subject: [PATCH 10/27] =?UTF-8?q?JSY-26079=20feat:=20multi=5Fselect=5Finse?= =?UTF-8?q?rt=5Fno=5Fbar=5Flist=20=E6=90=9C=E7=B4=A2=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=E6=94=AF=E6=8C=81=E5=8F=AF?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/multiselect.search.insert.pane.js | 6 +- .../search/multiselect.search.loader.js | 66 +++++++++++++++++-- .../multiselectlist.insert.nobar.js | 4 +- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/widget/multiselect/search/multiselect.search.insert.pane.js b/src/widget/multiselect/search/multiselect.search.insert.pane.js index d459dc73a..8def90700 100644 --- a/src/widget/multiselect/search/multiselect.search.insert.pane.js +++ b/src/widget/multiselect/search/multiselect.search.insert.pane.js @@ -19,7 +19,8 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, { itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, keywordGetter: BI.emptyFn, - itemHeight: 24 + allowSelectAll: true, + itemHeight: 24, }); }, @@ -47,7 +48,8 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, { }]); }, itemHeight: o.itemHeight, - value: o.value + value: o.value, + allowSelectAll: o.allowSelectAll, }); this.loader.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); diff --git a/src/widget/multiselect/search/multiselect.search.loader.js b/src/widget/multiselect/search/multiselect.search.loader.js index 5f6d09f54..9029a94ed 100644 --- a/src/widget/multiselect/search/multiselect.search.loader.js +++ b/src/widget/multiselect/search/multiselect.search.loader.js @@ -13,6 +13,7 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { keywordGetter: BI.emptyFn, valueFormatter: BI.emptyFn, itemFormatter: BI.emptyFn, + allowSelectAll: true, itemHeight: 24 }); }, @@ -23,7 +24,7 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { var self = this, opts = this.options; var hasNext = false; this.storeValue = BI.deepClone(opts.value); - this.button_group = BI.createWidget({ + this.button_group = BI.createWidget(opts.allowSelectAll ? { type: "bi.select_list", toolbar: { type: "bi.multi_select_bar", @@ -83,19 +84,71 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { hasNext: function () { return hasNext; } + } : { + type: "bi.list_pane", + logic: { + dynamic: true, + innerVgap: 5, + rowSize: ["", "fill"], + verticalAlign: BI.VerticalAlign.Stretch + }, + element: this, + el: { + chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI, + behaviors: { + redmark: function () { + return true; + } + }, + layouts: [ + { + type: "bi.vertical" + } + ] + }, + itemsCreator: function (op, callback) { + self.storeValue && (op = BI.extend(op || {}, { + selectedValues: self.storeValue.value + })); + opts.itemsCreator(op, function (ob) { + var keyword = ob.keyword = opts.keywordGetter(); + hasNext = ob.hasNext; + var firstItems = []; + if (op.times === 1 && self.storeValue) { + var json = self._filterValues(self.storeValue); + firstItems = self._createItems(json); + } + var context = { + tipText: ob.tipText, + }; + callback(firstItems.concat(self._createItems(ob.items)), keyword, context); + if (op.times === 1 && self.storeValue) { + self.setValue(self.storeValue); + } + }); + }, + value: opts.value, + height: "fill", }); + this.button_group.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); - this.button_group.on(BI.SelectList.EVENT_CHANGE, function () { - self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, arguments); - }); + if (opts.allowSelectAll) { + this.button_group.on(BI.SelectList.EVENT_CHANGE, function () { + self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, arguments); + }); + } else { + this.button_group.on(BI.ListPane.EVENT_CHANGE, function (val) { + self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, val); + }); + } }, _createItems: function (items) { var allSelected = this.isAllSelected(); var itemFormatter = this.options.itemFormatter; - + return BI.map(items, (index, item) => { return { type: "bi.multi_select_item", @@ -113,7 +166,8 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { }, isAllSelected: function () { - return this.button_group.isAllSelected(); + var o = this.options; + return o.allowSelectAll ? this.button_group.isAllSelected() : false; }, _filterValues: function (src) { diff --git a/src/widget/multiselectlist/multiselectlist.insert.nobar.js b/src/widget/multiselectlist/multiselectlist.insert.nobar.js index be87999ad..d88116279 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.nobar.js +++ b/src/widget/multiselectlist/multiselectlist.insert.nobar.js @@ -8,6 +8,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, searcherHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + allowSelectAll: true, }); }, _init: function () { @@ -61,6 +62,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { o.itemsCreator(op, callback); } }, + allowSelectAll: o.allowSelectAll, }); this.searcherPane.setVisible(false); @@ -244,7 +246,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { // 和复选下拉框同步，allData做缓存是会爆炸的 digest(); - function digest (items) { + function digest(items) { BI.each(keywords, function (i, val) { self.storeValue.type === BI.Selection.Multi ? BI.pushDistinct(self.storeValue.value, val) : BI.remove(self.storeValue.value, val); }); From fc54af70a787b9ab3ced9851226e3e13874c3a86 Mon Sep 17 00:00:00 2001 From: Renzo Date: Wed, 1 Feb 2023 16:38:40 +0800 Subject: [PATCH 11/27] =?UTF-8?q?Revert=20"JSY-26063=20fix:=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bb7905bf0f347d7944e3255cecd3a64f61e46a0e. --- src/core/func/function.js | 10 +++------- typescript/core/func/function.ts | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/core/func/function.js b/src/core/func/function.js index cc77b7798..83d58c5ec 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -40,13 +40,11 @@ BI._.extend(BI.Func, { * @param items * @param keyword * @param param 搜索哪个属性 - * @param opt 额外配置，caseSensitive: 大小写敏感 */ - getSearchResult: function (items, keyword, param, opt) { + getSearchResult: function (items, keyword, param) { var isArray = BI.isArray(items); items = isArray ? BI.flatten(items) : items; param || (param = "text"); - opt || (opt = {caseSensitive: false}); if (!BI.isKey(keyword)) { return { find: items, @@ -71,10 +69,8 @@ BI._.extend(BI.Func, { py = BI.makeFirstPY(text, { splitChar: "\u200b" }); - if (!opt.caseSensitive) { - text = BI.toUpperCase(text); - py = BI.toUpperCase(py); - } + text = BI.toUpperCase(text); + py = BI.toUpperCase(py); var pidx; if (text.indexOf(keyword) > -1) { if (text === keyword) { diff --git a/typescript/core/func/function.ts b/typescript/core/func/function.ts index 12634e513..4da9ab104 100644 --- a/typescript/core/func/function.ts +++ b/typescript/core/func/function.ts @@ -13,9 +13,8 @@ export type _function = { * @param items 待搜索的数据 * @param keyword 关键字 * @param param 搜索哪个属性 - * @param opt 额外配置，caseSensitive: 大小写敏感 */ - getSearchResult: (items: any, keyword: any, param?: string, opt?: {caseSensitive: boolean}) => { find: any[], match: any[] }; + getSearchResult: (items: any, keyword: any, param?: string) => { find: any[], match: any[] }; /** * 获取编码后的url From e2e05e9d7af00f3a4785841be0670f21b4a55296 Mon Sep 17 00:00:00 2001 From: Renzo Date: Wed, 1 Feb 2023 16:43:59 +0800 Subject: [PATCH 12/27] =?UTF-8?q?JSY-26079=20update:=20=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=20multi=5Fselect=5Finsert=5Fno=5Fbar=5Flist=20=E7=9A=84?= =?UTF-8?q?=E5=85=A8=E9=80=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselectlist/multiselectlist.insert.nobar.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/widget/multiselectlist/multiselectlist.insert.nobar.js b/src/widget/multiselectlist/multiselectlist.insert.nobar.js index d88116279..aa322378b 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.nobar.js +++ b/src/widget/multiselectlist/multiselectlist.insert.nobar.js @@ -8,7 +8,6 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, searcherHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, - allowSelectAll: true, }); }, _init: function () { @@ -62,7 +61,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, { o.itemsCreator(op, callback); } }, - allowSelectAll: o.allowSelectAll, + allowSelectAll: false, }); this.searcherPane.setVisible(false); From 96604bdc5302b095e7782703e9d6dbfef44e383c Mon Sep 17 00:00:00 2001 From: data Date: Thu, 2 Feb 2023 14:30:19 +0800 Subject: [PATCH 13/27] auto upgrade version to 2.0.20230202142959 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0a5b94bd..a922cc97b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230130114621", + "version": "2.0.20230202142959", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 49e50f0a5ca02ff951aca5cfb4d39c60deabd198 Mon Sep 17 00:00:00 2001 From: Renzo Date: Fri, 3 Feb 2023 10:49:33 +0800 Subject: [PATCH 14/27] =?UTF-8?q?JSY-26262=20fix:=20multi=5Fselect=5Finser?= =?UTF-8?q?t=5Fno=5Fbar=5Flist=20=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.loader.nobar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multiselect/multiselect.loader.nobar.js b/src/widget/multiselect/multiselect.loader.nobar.js index dde974df8..4b6970d25 100644 --- a/src/widget/multiselect/multiselect.loader.nobar.js +++ b/src/widget/multiselect/multiselect.loader.nobar.js @@ -99,9 +99,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, { }, opts.el)); BI.createWidget({ - type: "bi.vertical", + type: "bi.absolute", element: this, - items: [this.button_group], + items: [{el: this.button_group, inset: 0}], vgap: 5 }); From 5125e3211a2827e2131c96080236fbf29d46bce1 Mon Sep 17 00:00:00 2001 From: Renzo Date: Fri, 3 Feb 2023 13:45:28 +0800 Subject: [PATCH 15/27] =?UTF-8?q?JSY-26289=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=E6=97=B6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=9D=A2=E6=9D=BF=E5=8B=BE=E9=80=89=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/multiselect.search.loader.js | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/widget/multiselect/search/multiselect.search.loader.js b/src/widget/multiselect/search/multiselect.search.loader.js index 9029a94ed..7ccda9374 100644 --- a/src/widget/multiselect/search/multiselect.search.loader.js +++ b/src/widget/multiselect/search/multiselect.search.loader.js @@ -123,7 +123,7 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { }; callback(firstItems.concat(self._createItems(ob.items)), keyword, context); if (op.times === 1 && self.storeValue) { - self.setValue(self.storeValue); + self.setValue(self.storeValue.value); } }); }, @@ -134,15 +134,10 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { this.button_group.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); - if (opts.allowSelectAll) { - this.button_group.on(BI.SelectList.EVENT_CHANGE, function () { - self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, arguments); - }); - } else { - this.button_group.on(BI.ListPane.EVENT_CHANGE, function (val) { - self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, val); - }); - } + var searchLoaderEventChangeName = opts.allowSelectAll ? BI.SelectList.EVENT_CHANGE : BI.ListPane.EVENT_CHANGE + this.button_group.on(searchLoaderEventChangeName, function () { + self.fireEvent(BI.MultiSelectSearchLoader.EVENT_CHANGE, arguments); + }); }, _createItems: function (items) { @@ -202,7 +197,15 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { }, getValue: function () { - return this.button_group.getValue(); + var o = this.options; + if (o.allowSelectAll) { + return this.button_group.getValue(); + } + return { + type: BI.ButtonGroup.CHOOSE_TYPE_MULTI, + value: this.button_group.getValue(), + assist: this.button_group.getNotSelectedValue() + }; }, getAllButtons: function () { From f102934f1d6277e2b5b12c34e2ccd9eceaff24ba Mon Sep 17 00:00:00 2001 From: Renzo Date: Fri, 3 Feb 2023 15:37:11 +0800 Subject: [PATCH 16/27] =?UTF-8?q?JSY-26289=20fix:=20=E7=BB=9F=E4=B8=80setV?= =?UTF-8?q?alue=E5=92=8CgetValue=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/search/multiselect.search.loader.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/widget/multiselect/search/multiselect.search.loader.js b/src/widget/multiselect/search/multiselect.search.loader.js index 7ccda9374..a4a3d8ed5 100644 --- a/src/widget/multiselect/search/multiselect.search.loader.js +++ b/src/widget/multiselect/search/multiselect.search.loader.js @@ -123,7 +123,7 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { }; callback(firstItems.concat(self._createItems(ob.items)), keyword, context); if (op.times === 1 && self.storeValue) { - self.setValue(self.storeValue.value); + self.setValue(self.storeValue); } }); }, @@ -191,9 +191,11 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, { }, setValue: function (v) { + v || (v = {}); + var o = this.options; // 暂存的值一定是新的值，不然v改掉后，storeValue也跟着改了 this.storeValue = BI.deepClone(v); - this.button_group.setValue(v); + o.allowSelectAll ? (this.button_group.setValue(v)) : (this.button_group.setValue(v.value)); }, getValue: function () { From d5bcff9a0a87b4d964ed89d5b374792f0dd891bb Mon Sep 17 00:00:00 2001 From: Renzo Date: Fri, 3 Feb 2023 15:39:13 +0800 Subject: [PATCH 17/27] =?UTF-8?q?JSY-26262=20fix:=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.loader.nobar.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/widget/multiselect/multiselect.loader.nobar.js b/src/widget/multiselect/multiselect.loader.nobar.js index 4b6970d25..274d51f6c 100644 --- a/src/widget/multiselect/multiselect.loader.nobar.js +++ b/src/widget/multiselect/multiselect.loader.nobar.js @@ -98,13 +98,15 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, { value: this.storeValue }, opts.el)); - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{el: this.button_group, inset: 0}], + BI.createWidget(BI.extend({ + element: this + }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Top), BI.extend({ + scrolly: true, vgap: 5 - }); - + }, opts.logic, { + items: BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Top, this.button_group) + })))); + this.button_group.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); From 7780adabea856315950b8e142ce6f66ebc13a125 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 3 Feb 2023 20:25:34 +0800 Subject: [PATCH 18/27] auto upgrade version to 2.0.20230203202509 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a922cc97b..de726f9e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230202142959", + "version": "2.0.20230203202509", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From fa1b9e1e6e7bcdf90580c9bf226123c8deb68b2e Mon Sep 17 00:00:00 2001 From: data Date: Mon, 6 Feb 2023 10:05:24 +0800 Subject: [PATCH 19/27] auto upgrade version to 2.0.20230206100506 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de726f9e5..d751bfd21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230203202509", + "version": "2.0.20230206100506", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 3df163fafeabc6dbec0742fcdda9080b11c59ef8 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Mon, 6 Feb 2023 14:58:36 +0800 Subject: [PATCH 20/27] =?UTF-8?q?BI-120672=20feat:=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6opt=E9=87=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BC=A0height?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicdatetime/dynamicdatetime.timeselect.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js index 5642cb799..fb92e505a 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js @@ -1,11 +1,14 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { props: { - baseCls: "bi-date-time-select" + baseCls: "bi-date-time-select", + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, }, render: function () { var self = this; + var o = this.options; + return { type: "bi.center_adapt", items: [{ @@ -41,7 +44,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + height: o.height, } }, { type: "bi.label", @@ -77,7 +80,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + height: o.height, }, { type: "bi.label", text: ":", @@ -106,7 +109,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + height: o.height, }] }] }; From 0184d389ba461f510d23a5bf754dde9f68afee7f Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Mon, 6 Feb 2023 15:14:11 +0800 Subject: [PATCH 21/27] =?UTF-8?q?BI-120672=20feat:=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6opt=E9=87=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BC=A0height?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.timeselect.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js index fb92e505a..857fc368f 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js @@ -1,8 +1,10 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { - props: { - baseCls: "bi-date-time-select", - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + props: function () { + return { + baseCls: "bi-date-time-select", + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + }; }, render: function () { From 2dc7788a9c2327a3469cad243cd110804ace8ef0 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 7 Feb 2023 10:25:47 +0800 Subject: [PATCH 22/27] auto upgrade version to 2.0.20230207102533 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d751bfd21..cd08060b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230206100506", + "version": "2.0.20230207102533", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From c99d31949bec0139dc3e01d91149d4c8625c3bce Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 7 Feb 2023 19:02:18 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AE=8C=E4=B9=8B=E5=90=8E=E5=86=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8CsetMinMax=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/singleslider/singleslider.js | 174 +++++++++++++----------- 1 file changed, 95 insertions(+), 79 deletions(-) diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index 8cf77b180..4eaf0cc0c 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -58,16 +58,18 @@ BI.SingleSlider = BI.inherit(BI.Single, { type: "bi.vertical_adapt", cls: "slider-wrapper", columnSize: ["fill"], - items: [{ - type: "bi.absolute", - items: [ - { - el: this.slider, - top: 8, - } - ], - height: c.SLIDER_HEIGHT - }], + items: [ + { + type: "bi.absolute", + items: [ + { + el: this.slider, + top: 8, + } + ], + height: c.SLIDER_HEIGHT + } + ], hgap: c.SLIDER_WIDTH_HALF, height: c.SLIDER_HEIGHT }); @@ -124,41 +126,49 @@ BI.SingleSlider = BI.inherit(BI.Single, { this._setVisible(false); return { type: "bi.absolute", - items: [{ - el: { - type: "bi.vertical", - items: [{ - type: "bi.absolute", - items: [{ - el: this.track, - width: "100%", - height: c.TRACK_HEIGHT - }] - }], - hgap: c.TRACK_GAP_HALF, - height: c.TRACK_HEIGHT - }, - top: 23, - left: 0, - width: "100%" - }, { - el: sliderVertical, - top: 20, - left: 0, - width: "100%" - }, { - el: { - type: "bi.vertical", - items: [{ - type: "bi.horizontal_auto", - items: [this.label] - }], - // height: c.EDITOR_HEIGHT - }, - top: 0, - left: 0, - width: "100%" - }] + items: [ + { + el: { + type: "bi.vertical", + items: [ + { + type: "bi.absolute", + items: [ + { + el: this.track, + width: "100%", + height: c.TRACK_HEIGHT + } + ] + } + ], + hgap: c.TRACK_GAP_HALF, + height: c.TRACK_HEIGHT + }, + top: 23, + left: 0, + width: "100%" + }, { + el: sliderVertical, + top: 20, + left: 0, + width: "100%" + }, { + el: { + type: "bi.vertical", + items: [ + { + type: "bi.horizontal_auto", + items: [this.label] + } + ], + // height: c.EDITOR_HEIGHT + }, + top: 0, + left: 0, + width: "100%" + } + ] }; }, @@ -198,7 +208,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { self.fireEvent(BI.SingleSlider.EVENT_CHANGE); }, window); widget.element.on("mousedown", function (event) { - if(!widget.isEnabled()) { + if (!widget.isEnabled()) { return; } defaultSize = this.offsetLeft; @@ -206,7 +216,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { mouseMoveTracker.captureMouseMoves(event); }); - function optimizeSize (s) { + function optimizeSize(s) { return BI.clamp(s, 0, self._getGrayTrackLength()); } }, @@ -214,30 +224,36 @@ BI.SingleSlider = BI.inherit(BI.Single, { _createTrackWrapper: function () { return BI.createWidget({ type: "bi.absolute", - items: [{ - el: { - type: "bi.vertical", - items: [{ - type: "bi.absolute", - items: [{ - el: this.grayTrack, - top: 0, - left: 0, - width: "100%" - }, { - el: this.blueTrack, - top: 0, - left: 0, - width: "0%" - }] - }], - hgap: 8, - height: 8 - }, - top: 8, - left: 0, - width: "100%" - }] + items: [ + { + el: { + type: "bi.vertical", + items: [ + { + type: "bi.absolute", + items: [ + { + el: this.grayTrack, + top: 0, + left: 0, + width: "100%" + }, { + el: this.blueTrack, + top: 0, + left: 0, + width: "0%" + } + ] + } + ], + hgap: 8, + height: 8 + }, + top: 8, + left: 0, + width: "100%" + } + ] }); }, @@ -245,9 +261,9 @@ BI.SingleSlider = BI.inherit(BI.Single, { var o = this.options; var valid = false; if (BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)) { - if(o.digit === false) { + if (o.digit === false) { valid = true; - }else{ + } else { var dotText = (v + "").split(".")[1] || ""; valid = (dotText.length === o.digit); } @@ -256,7 +272,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { }, _setBlueTrack: function (percent) { - this.blueTrack.element.css({width: percent + "%"}); + this.blueTrack.element.css({ width: percent + "%" }); }, _setLabelPosition: function (percent) { @@ -264,7 +280,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { }, _setSliderPosition: function (percent) { - this.slider.element.css({left: percent + "%"}); + this.slider.element.css({ left: percent + "%" }); }, _setAllPosition: function (percent) { @@ -314,7 +330,7 @@ BI.SingleSlider = BI.inherit(BI.Single, { _setEnable: function (b) { BI.SingleSlider.superclass._setEnable.apply(this, [b]); - if(b) { + if (b) { this.blueTrack.element.removeClass("disabled-blue-track").addClass("blue-track"); } else { this.blueTrack.element.removeClass("blue-track").addClass("disabled-blue-track"); @@ -322,9 +338,9 @@ BI.SingleSlider = BI.inherit(BI.Single, { }, setMinAndMax: function (v) { - var minNumber = BI.parseFloat(v.min); - var maxNumber = BI.parseFloat(v.max); - if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber > minNumber )) { + var minNumber = this.options.min = BI.parseFloat(v.min); + var maxNumber = this.options.max = BI.parseFloat(v.max); + if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber > minNumber)) { this.min = minNumber; this.max = maxNumber; } From c26ec91e0b3e1583c0d6432db6f1c48b53366b0c Mon Sep 17 00:00:00 2001 From: data Date: Wed, 8 Feb 2023 16:39:05 +0800 Subject: [PATCH 24/27] auto upgrade version to 2.0.20230208163847 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd08060b2..d60add07a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230207102533", + "version": "2.0.20230208163847", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From f271573c89f787d898afc8b30adcbefd9de6494f Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 9 Feb 2023 15:23:06 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E6=97=A0JIRA=20=E7=94=A8core-js/stable?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3=E5=B7=B2=E7=BB=8F=E5=BA=9F=E5=BC=83=E7=9A=84?= =?UTF-8?q?@babel/polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不然有些array.prototype.flat, includes等都用不了 --- webpack/attachments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/attachments.js b/webpack/attachments.js index acb30ad2a..befe73db1 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -7,7 +7,7 @@ const workerCompact = './dist/fix/worker.compact.js'; const lodashJs = "src/core/1.lodash.js"; const jqueryJs = "src/core/platform/web/jquery/_jquery.js"; -const runtimePolyfill = ["@babel/polyfill", "es6-promise/auto"]; +const runtimePolyfill = ["core-js/stable"]; const basicAttachmentMap = { polyfill: sync([ From 59b7d2eb697c5810e91917939321ed808c932ccf Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 9 Feb 2023 15:23:27 +0800 Subject: [PATCH 26/27] update --- package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cd08060b2..43fe4b3fe 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ }, "devDependencies": { "@babel/core": "^7.17.4", - "@babel/polyfill": "7.6.0", - "@fui/babel-preset-fineui": "^2.0.0", + "@fui/babel-preset-fineui": "^3.0.0", "@fui/eslint-plugin": "^1.0.19", "@types/node": "15.6.1", "@typescript-eslint/eslint-plugin": "2.33.0", @@ -18,7 +17,6 @@ "autoprefixer": "9.6.1", "babel-loader": "8.0.6", "chai": "4.2.0", - "cnpm": "6.1.1", "concat": "1.0.3", "core-js": "3.3.2", "cross-env": "6.0.0", @@ -91,4 +89,4 @@ "jquery": "3.6.3", "yargs": "17.6.2" } -} \ No newline at end of file +} From 352ab6acf0c09fb160fd1ab0bc1b34ee2e9d16a0 Mon Sep 17 00:00:00 2001 From: "Xavier.Meng" Date: Wed, 15 Feb 2023 15:27:29 +0800 Subject: [PATCH 27/27] =?UTF-8?q?BI-121538=20fix(bi.file):=20=E4=B8=A5?= =?UTF-8?q?=E6=A0=BC=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/input/file.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index 290970141..1769de9c5 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -437,11 +437,11 @@ var matches; matches = mime.match(r1); if (matches) { - return fileName.toLowerCase().indexOf(matches[1]) > -1; + return fileName.toLowerCase().endsWith(matches[0]); } matches = mime.match(r2); if (matches) { - return matches[1] === "*" ? true : fileName.toLowerCase().indexOf(matches[1]) > -1; + return matches[1] === "*" ? true : fileName.toLowerCase().endsWith(`.${matches[1]}`); } }); }