From 96e4fb0cef52b53f70d75be06c693d5177fa10f6 Mon Sep 17 00:00:00 2001 From: windy Date: Wed, 4 Jan 2023 16:46:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BI-119441=20=E5=85=AC=E5=BC=8F=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=AD=97=E7=AC=A6=E9=A1=B5=E9=9D=A2=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/utils/chinesePY.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/utils/chinesePY.js b/src/core/utils/chinesePY.js index b22cd94cb..392f108b4 100644 --- a/src/core/utils/chinesePY.js +++ b/src/core/utils/chinesePY.js @@ -425,6 +425,10 @@ BI._.extend(BI, { makeFirstPY: function (str, options) { options = options || {}; + // BI-119441 长字段搜索分叉后数量达百万级，这里控制下字段过长的话不进行多音字分叉 + if (str.length > 100 && BI.isNull(options.ignoreMulti)) { + options.ignoreMulti = true; + } if (typeof (str) !== "string") {return "" + str;} var arrResult = []; // 保存中间结果的数组 for (var i = 0, len = str.length; i < len; i++) { From d610d82b01553ea107e57b9a9af5a5a02c037a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dailer-=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Thu, 5 Jan 2023 17:17:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-88040=20fix:=20=E3=80=90BI6.0?= =?UTF-8?q?=E3=80=91=E3=80=90=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E9=83=A8=E9=97=A8=E3=80=91=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8=E5=90=8E?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=85=A8=E9=80=89=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/platform/web/dom.js b/src/core/platform/web/dom.js index 945aa359a..6a2f3fb95 100644 --- a/src/core/platform/web/dom.js +++ b/src/core/platform/web/dom.js @@ -448,7 +448,7 @@ viewportBounds = document.documentElement.getBoundingClientRect(); var left; if (comboRect.left + comboRect.width / 2 + popupRect.width / 2 > viewportBounds.width) { - left = viewportBounds.width - comboRect.width - positionRelativeElementRect.left; + left = viewportBounds.width - popupRect.width - positionRelativeElementRect.left; } else { left = comboRect.left + (comboRect.width - popupRect.width) / 2 - positionRelativeElementRect.left; } 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 3/4] =?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 fddd033a6975fd2635528202403e4c4ae809b53b Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 30 Jan 2023 11:05:30 +0800 Subject: [PATCH 4/4] =?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",