From b7f96194c4f0381b1478ba7b6e951aed86e47ee0 Mon Sep 17 00:00:00 2001 From: jimmychai Date: Wed, 26 Jul 2023 18:34:19 +0800 Subject: [PATCH 01/24] =?UTF-8?q?BI-130613=20fix:=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A0=91=E5=B1=95=E5=BC=80=E6=B2=A1=E6=9C=89=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/asynctree.js | 43 ++++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/case/ztree/asynctree.js b/packages/fineui/src/case/ztree/asynctree.js index f9b5bf6b6..20c698cc7 100644 --- a/packages/fineui/src/case/ztree/asynctree.js +++ b/packages/fineui/src/case/ztree/asynctree.js @@ -1,7 +1,19 @@ -import { cjkEncodeDO, deepClone, each, extend, isEmpty, isNotNull, isNull, shortcut } from "@/core"; +import { + cjkEncodeDO, + deepClone, + each, + extend, + isEmpty, + isNotNull, + isNull, + shortcut, + AbsoluteLayout, + createWidget, +} from "@/core"; import { TreeView } from "./treeview"; import { TreeRenderPageService } from "./treerender.page.service"; import $ from "jquery"; +import { IconLabel } from "@/base"; @shortcut() export class AsyncTree extends TreeView { @@ -197,7 +209,34 @@ export class AsyncTree extends TreeView { }, options ); - o.itemsCreator(op, complete); + + let loadingIcon; + createWidget({ + type: AbsoluteLayout.xtype, + element: `#${treeNode.tId}`, + css: { + position: "relative", + }, + items: [ + { + el: { + type: IconLabel.xtype, + width: 20, + height: 20, + cls: "button-loading-font anim-rotate bi-card", + ref: ref => { + loadingIcon = ref; + }, + }, + left: 5, + top: 5, + }, + ], + }); + o.itemsCreator(op, (...args) => { + complete.apply(this, args); + loadingIcon.destroy(); + }); } // 展开节点会将halfCheck置为false以开启自动计算半选, 所以第一次展开节点的时候需要在置为false之前获取配置 From f8d15575604d0074cd3902899efb31bb16533abf Mon Sep 17 00:00:00 2001 From: Anny Date: Thu, 27 Jul 2023 16:19:37 +0800 Subject: [PATCH 02/24] JSY-26622 --- packages/fineui/src/widget/editor/editor.search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/widget/editor/editor.search.js b/packages/fineui/src/widget/editor/editor.search.js index 00909258f..e0387b342 100644 --- a/packages/fineui/src/widget/editor/editor.search.js +++ b/packages/fineui/src/widget/editor/editor.search.js @@ -69,6 +69,7 @@ export class SearchEditor extends Widget { quitChecker: o.quitChecker, value: o.value, autoTrim: o.autoTrim, + autocomplete: o.autocomplete }); this.clear = createWidget({ type: IconButton.xtype, From ba86ebda9d654aa0ff446d45ce4cc1c1b387af60 Mon Sep 17 00:00:00 2001 From: Kobi Date: Fri, 28 Jul 2023 14:53:38 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20?= =?UTF-8?q?encodeURIcomponent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/func/alias.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/core/func/alias.js b/packages/fineui/src/core/func/alias.js index c2ddbb28f..fc0eaa772 100644 --- a/packages/fineui/src/core/func/alias.js +++ b/packages/fineui/src/core/func/alias.js @@ -637,7 +637,7 @@ export const getEncodeURL = function(urlTemplate, param) { export const encodeURIComponent = function(url) { const specialCharsMap = getSpecialCharsMap(); - url = url || ""; + url = url ?? ""; url = replaceAll(`${url}`, keys(specialCharsMap || []).join("|"), str => { switch (str) { case "\\": From 820db09efe50eeb102b90c09089f187e2441b941 Mon Sep 17 00:00:00 2001 From: guyi Date: Fri, 28 Jul 2023 17:16:28 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8CN?= =?UTF-8?q?umberIntervalSingleEditor=E6=8A=9B=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/widget/index.js b/packages/fineui/src/widget/index.js index b378d16ad..b27a3165f 100644 --- a/packages/fineui/src/widget/index.js +++ b/packages/fineui/src/widget/index.js @@ -7,6 +7,7 @@ export { MultiTreeInsertCombo } from "./multitree/multi.tree.insert.combo"; export { MultiTreeListCombo } from "./multitree/multi.tree.list.combo"; export { NumberEditor } from "./numbereditor/number.editor"; export { NumberInterval } from "./numberinterval/numberinterval"; +export { NumberIntervalSingleEidtor } from "./numberinterval/singleeditor/single.editor" export { YearMonthInterval } from "./yearmonthinterval/yearmonthinterval"; export { YearQuarterInterval } from "./yearquarterinterval/yearquarterinterval"; export { YearInterval } from "./yearinterval/yearinterval"; From 429963a580f267612cf68119fd2cb53ac9ac0ace Mon Sep 17 00:00:00 2001 From: guyi Date: Fri, 28 Jul 2023 17:17:20 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8A=9B=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/widget/index.js b/packages/fineui/src/widget/index.js index b27a3165f..365447f78 100644 --- a/packages/fineui/src/widget/index.js +++ b/packages/fineui/src/widget/index.js @@ -7,7 +7,7 @@ export { MultiTreeInsertCombo } from "./multitree/multi.tree.insert.combo"; export { MultiTreeListCombo } from "./multitree/multi.tree.list.combo"; export { NumberEditor } from "./numbereditor/number.editor"; export { NumberInterval } from "./numberinterval/numberinterval"; -export { NumberIntervalSingleEidtor } from "./numberinterval/singleeditor/single.editor" +export { NumberIntervalSingleEidtor } from "./numberinterval/singleeditor/single.editor"; export { YearMonthInterval } from "./yearmonthinterval/yearmonthinterval"; export { YearQuarterInterval } from "./yearquarterinterval/yearquarterinterval"; export { YearInterval } from "./yearinterval/yearinterval"; From cb2f0bd3be4df67788dcde9476a843d855be14bc Mon Sep 17 00:00:00 2001 From: jimmychai Date: Fri, 28 Jul 2023 18:53:50 +0800 Subject: [PATCH 06/24] =?UTF-8?q?BI-130613=20fix:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/asynctree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/case/ztree/asynctree.js b/packages/fineui/src/case/ztree/asynctree.js index 20c698cc7..7921ef821 100644 --- a/packages/fineui/src/case/ztree/asynctree.js +++ b/packages/fineui/src/case/ztree/asynctree.js @@ -213,7 +213,7 @@ export class AsyncTree extends TreeView { let loadingIcon; createWidget({ type: AbsoluteLayout.xtype, - element: `#${treeNode.tId}`, + element: self.element.find(`#${treeNode.tId}`), css: { position: "relative", }, From 14a3933b78447cfcaa20aa7848382a993b697a5e Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 28 Jul 2023 20:42:37 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20this=E6=8C=87?= =?UTF-8?q?=E5=90=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/single/input/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/base/single/input/file.js b/packages/fineui/src/base/single/input/file.js index 5c33d99b0..c89a02e70 100644 --- a/packages/fineui/src/base/single/input/file.js +++ b/packages/fineui/src/base/single/input/file.js @@ -541,7 +541,7 @@ export class File extends Widget { // We can still show some information } this.fireEvent(File.EVENT_PROGRESS, { - file: this.file, + file: _wrap.file, total: rpe.total, loaded: rpe.loaded, simulation: rpe.simulation, From e35941c50a494e0baf8dfee9bb62b26fc75fb37a Mon Sep 17 00:00:00 2001 From: guyi Date: Sun, 30 Jul 2023 17:50:48 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8CS?= =?UTF-8?q?election=E6=B2=A1=E6=9C=89=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/downlist/popup.downlist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/widget/downlist/popup.downlist.js b/packages/fineui/src/widget/downlist/popup.downlist.js index b598ea65d..c4171246c 100644 --- a/packages/fineui/src/widget/downlist/popup.downlist.js +++ b/packages/fineui/src/widget/downlist/popup.downlist.js @@ -1,5 +1,6 @@ import { ButtonTree, Pane } from "@/base"; import { + Selection, VerticalLayout, Layout, shortcut, From 8c17b9f95fad441d5acf099bfa7e70409078b67f Mon Sep 17 00:00:00 2001 From: jian Date: Mon, 31 Jul 2023 16:07:39 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96height?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/case/combo/textvaluecombo/combo.textvalue.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js b/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js index 8139a1524..dce27ea81 100644 --- a/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js @@ -144,8 +144,8 @@ export class TextValueCombo extends Widget { return { type: Combo.xtype, - height: toPix(o.height, 2), - width: toPix(o.width, 2), + height: toPix(o.height, o.simple ? 1 : 2), + width: toPix(o.width, o.simple ? 0 : 2), ref: ref => (this.combo = ref), container: o.container, direction: o.direction, From 94d10d045e7c7fd4690413288f7f4b2c6326ce6f Mon Sep 17 00:00:00 2001 From: chenzeyu Date: Mon, 31 Jul 2023 16:19:13 +0800 Subject: [PATCH 10/24] =?UTF-8?q?BI-115380=20fix:=20=E6=9A=97=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=8C=89=E9=92=AEdisabled=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/less/base/single/button/button.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/less/base/single/button/button.less b/packages/fineui/src/less/base/single/button/button.less index d404edd24..ddfdf2b22 100644 --- a/packages/fineui/src/less/base/single/button/button.less +++ b/packages/fineui/src/less/base/single/button/button.less @@ -479,7 +479,7 @@ body .bi-button, #body .bi-button { } } -.bi-theme-dark { +#body .bi-theme-dark { .bi-button, #body .bi-button { &.button-ignore { background-color: @color-bi-background-ignore-button-theme-dark; From cfd05b9097853f3c0f9a35beb6da2cf991c40469 Mon Sep 17 00:00:00 2001 From: jian Date: Mon, 31 Jul 2023 19:23:16 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/case/combo/textvaluecombo/combo.textvalue.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js b/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js index 8139a1524..dce27ea81 100644 --- a/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/packages/fineui/src/case/combo/textvaluecombo/combo.textvalue.js @@ -144,8 +144,8 @@ export class TextValueCombo extends Widget { return { type: Combo.xtype, - height: toPix(o.height, 2), - width: toPix(o.width, 2), + height: toPix(o.height, o.simple ? 1 : 2), + width: toPix(o.width, o.simple ? 0 : 2), ref: ref => (this.combo = ref), container: o.container, direction: o.direction, From dadc40069cd4b08eca75891122bdb1cd283707c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Tue, 1 Aug 2023 10:32:23 +0800 Subject: [PATCH 12/24] =?UTF-8?q?REPORT-101922=20fix:=E3=80=90=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E5=AE=9A=E6=97=B6=E8=B0=83=E5=BA=A6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=94=A8=E6=88=B7=E7=BB=84=E9=83=A8=E9=97=A8=E6=A0=91?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=95=88=E6=9E=9C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/parttree.js | 2 +- packages/fineui/src/widget/multiselect/multiselect.combo.js | 1 + .../src/widget/multitree/trigger/searcher.list.multi.tree.js | 4 ++-- .../src/widget/multitree/trigger/searcher.multi.tree.js | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/fineui/src/case/ztree/parttree.js b/packages/fineui/src/case/ztree/parttree.js index 266e0d6b9..d31610099 100644 --- a/packages/fineui/src/case/ztree/parttree.js +++ b/packages/fineui/src/case/ztree/parttree.js @@ -24,7 +24,7 @@ export class PartTree extends AsyncTree { constructor(...args) { super(...args); - this.seMethos = super._selectTreeNode; + this.seMethos = AsyncTree.superclass._selectTreeNode; } _loadMore() { diff --git a/packages/fineui/src/widget/multiselect/multiselect.combo.js b/packages/fineui/src/widget/multiselect/multiselect.combo.js index fb5f31968..72d152bd5 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.combo.js +++ b/packages/fineui/src/widget/multiselect/multiselect.combo.js @@ -48,6 +48,7 @@ export class MultiSelectCombo extends Single { static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM"; static EVENT_CONFIRM = "EVENT_CONFIRM"; static MultiSelectCombo = "MultiSelectCombo"; + static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; _defaultConfig() { return extend(super._defaultConfig(...arguments), { diff --git a/packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js b/packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js index 0c6bcf7e0..d38fd3436 100644 --- a/packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js +++ b/packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js @@ -1,4 +1,4 @@ -import { shortcut, Widget, extend, emptyFn, createWidget, isNotNull, isNumber, size, each, last, Selection } from "@/core"; +import { shortcut, Widget, extend, emptyFn, createWidget, isNotNull, isNumber, size, each, last, Selection, isObject } from "@/core"; import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect"; import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect"; import { Searcher } from "@/base"; @@ -137,7 +137,7 @@ export class MultiListTreeSearcher extends Widget { setState(ob) { const o = this.options; ob || (ob = {}); - ob.value || (ob.value = []); + isObject(ob) && (ob.value || (ob.value = [])); let count = 0; if (isNumber(ob)) { this.editor.setState(ob); diff --git a/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js b/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js index 555e579fd..518dff408 100644 --- a/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js @@ -11,7 +11,8 @@ import { each, isEmptyObject, Func, - Selection + Selection, + isObject } from "@/core"; import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect"; import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect"; @@ -165,7 +166,7 @@ export class MultiTreeSearcher extends Widget { setState(ob) { const o = this.options; ob || (ob = {}); - ob.value || (ob.value = {}); + isObject(ob) && (ob.value || (ob.value = {})); let count = 0; if (isNumber(ob)) { this.editor.setState(ob); From 05f1c78e58206d0e6d668077197e3ac8bc56c4c4 Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 1 Aug 2023 10:43:00 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20title?= =?UTF-8?q?=20=E5=8F=98=E6=9D=A5=E5=8F=98=E5=8E=BB=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/downlist/item.downlist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/widget/downlist/item.downlist.js b/packages/fineui/src/widget/downlist/item.downlist.js index 8a222f980..6e27674ec 100644 --- a/packages/fineui/src/widget/downlist/item.downlist.js +++ b/packages/fineui/src/widget/downlist/item.downlist.js @@ -39,6 +39,7 @@ export class DownListItem extends BasicButton { lgap: o.textLgap, rgap: o.textRgap, text: o.text, + title: o.title, value: o.value, keyword: o.keyword, height: o.height, From 18111db59ce7baf9ad69c56a354179d0e1af8c70 Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 1 Aug 2023 11:26:04 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/downlist/item.downlistgroup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/widget/downlist/item.downlistgroup.js b/packages/fineui/src/widget/downlist/item.downlistgroup.js index 8bc1d6094..afd200dcd 100644 --- a/packages/fineui/src/widget/downlist/item.downlistgroup.js +++ b/packages/fineui/src/widget/downlist/item.downlistgroup.js @@ -42,6 +42,7 @@ export class DownListGroupItem extends BasicButton { cls: "list-group-item-text", textAlign: "left", text: o.text, + title: o.title, value: o.value, height: o.height, }); From e0deea14ec09311d86c52a0bc076d0bb71855ec4 Mon Sep 17 00:00:00 2001 From: chenzeyu Date: Tue, 1 Aug 2023 11:48:08 +0800 Subject: [PATCH 15/24] =?UTF-8?q?BI-115380=20fix:=20=E6=9A=97=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=8C=89=E9=92=AEdisabled=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/less/base/single/button/button.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fineui/src/less/base/single/button/button.less b/packages/fineui/src/less/base/single/button/button.less index ddfdf2b22..80e53c7c3 100644 --- a/packages/fineui/src/less/base/single/button/button.less +++ b/packages/fineui/src/less/base/single/button/button.less @@ -2,7 +2,7 @@ @hoverVal: opacity .3s ease; @activeVal: transform .5s ease, opacity 1s ease; @activeStopVal: transform 0s; -body .bi-button, #body .bi-button { +.bi-button { &.hack { .border-radius(0px); } @@ -479,8 +479,8 @@ body .bi-button, #body .bi-button { } } -#body .bi-theme-dark { - .bi-button, #body .bi-button { +.bi-theme-dark { + .bi-button { &.button-ignore { background-color: @color-bi-background-ignore-button-theme-dark; &:hover, &:focus { From d55f1992b6d6d0156bcdffa61e3c87da06292737 Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 1 Aug 2023 14:03:53 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20title?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/single/button/listitem/icontextitem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/base/single/button/listitem/icontextitem.js b/packages/fineui/src/base/single/button/listitem/icontextitem.js index fb0f36b46..1690e75a1 100644 --- a/packages/fineui/src/base/single/button/listitem/icontextitem.js +++ b/packages/fineui/src/base/single/button/listitem/icontextitem.js @@ -59,6 +59,7 @@ export class IconTextItem extends BasicButton { lgap: o.textLgap, rgap: o.textRgap, text: o.text, + title: o.title, value: o.value, keyword: o.keyword, height: o.height, From e72fa072d6675961478eb848823c3c35245aef71 Mon Sep 17 00:00:00 2001 From: chenzeyu Date: Tue, 1 Aug 2023 20:24:42 +0800 Subject: [PATCH 17/24] =?UTF-8?q?BI-115380=20fix:=20=E6=9A=97=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=8C=89=E9=92=AEdisabled=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/less/base/single/button/button.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/less/base/single/button/button.less b/packages/fineui/src/less/base/single/button/button.less index 80e53c7c3..6d96e3c83 100644 --- a/packages/fineui/src/less/base/single/button/button.less +++ b/packages/fineui/src/less/base/single/button/button.less @@ -2,7 +2,7 @@ @hoverVal: opacity .3s ease; @activeVal: transform .5s ease, opacity 1s ease; @activeStopVal: transform 0s; -.bi-button { +body .bi-button, #body .bi-button { &.hack { .border-radius(0px); } @@ -479,7 +479,7 @@ } } -.bi-theme-dark { +.bi-theme-dark, #body .bi-theme-dark { .bi-button { &.button-ignore { background-color: @color-bi-background-ignore-button-theme-dark; From 1c985e855c5f9bf49104d387a1c9ef4f45b7df24 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Wed, 2 Aug 2023 20:27:58 +0800 Subject: [PATCH 18/24] =?UTF-8?q?BI-131340=20fix:=20DynamicDateTimeCombo?= =?UTF-8?q?=E7=9A=84value=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicdatetime/dynamicdatetime.combo.js | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 97f916acb..73caee9fa 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -31,29 +31,20 @@ export class DynamicDateTimeCombo extends Single { iconWidth: 24 }; - props = () => { - const date = getDate(); - return { - baseCls: "bi-dynamic-date--time-combo", - height: 24, - minDate: "1900-01-01", - maxDate: "2099-12-31", - format: "", - allowEdit: true, - supportDynamic: true, - attributes: { - tabIndex: -1 - }, - isNeedAdjustHeight: false, - isNeedAdjustWidth: false, - value: { - type: DynamicDateTimeCombo.Static, - value: { - year: date.getFullYear(), - month: date.getMonth() + 1 - } - } - }; + props = { + baseCls: "bi-dynamic-date--time-combo", + height: 24, + minDate: "1900-01-01", + maxDate: "2099-12-31", + format: "", + allowEdit: true, + supportDynamic: true, + attributes: { + tabIndex: -1, + }, + isNeedAdjustHeight: false, + isNeedAdjustWidth: false, + value: null, }; static EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; From f41e81b48e2db2630a06b725410dd59247313e66 Mon Sep 17 00:00:00 2001 From: "Oliver.Ke" Date: Wed, 2 Aug 2023 20:31:10 +0800 Subject: [PATCH 19/24] =?UTF-8?q?BI-131340=20fix:=20DynamicDateTimeCombo?= =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AEvalue=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 73caee9fa..3ac88d788 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -44,7 +44,6 @@ export class DynamicDateTimeCombo extends Single { }, isNeedAdjustHeight: false, isNeedAdjustWidth: false, - value: null, }; static EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; From c3c04d94bbd217ba0650b6cec81c4c7428117df2 Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 3 Aug 2023 10:26:22 +0800 Subject: [PATCH 20/24] =?UTF-8?q?BI-131370=20&&=20REPORT-102213=20fix:=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B911.0.18=E7=9A=84worker=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/webpack/webpack.prod.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js index 2fc6ceb37..f7fe62b17 100644 --- a/packages/fineui/webpack/webpack.prod.js +++ b/packages/fineui/webpack/webpack.prod.js @@ -10,7 +10,8 @@ module.exports = merge(common, { entry: { "fineui.min": attachments.fineui, "fineui.worker.min": attachments.fineuiForWorker, - "fineui.worker": attachments.fineuiForWorker + "fineui.worker": attachments.fineuiForWorker, + "fineui_without_jquery_polyfill.min":attachments.fineuiForWorker, }, output: { From f0bfc3a6f7abcc3f139863f579539e79dbc57fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Thu, 3 Aug 2023 11:36:50 +0800 Subject: [PATCH 21/24] =?UTF-8?q?REPORT-101859=20fix:FR11=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F-=E4=B8=8B=E6=8B=89=E6=A0=91=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E6=97=A0=E5=8F=8D=E5=BA=94?= =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/multitree/trigger/multi.tree.search.insert.pane.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js index 6ae93d971..feba439cf 100644 --- a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js +++ b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js @@ -11,6 +11,10 @@ export class MultiTreeSearchInsertPane extends Widget { el: { type: PartTree.xtype }, }; + static constants = { + height: 24, + }; + static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM"; static EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR"; From 0dfa0ac432515244a7043bfd26f6582fb0f3d133 Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 3 Aug 2023 12:25:36 +0800 Subject: [PATCH 22/24] =?UTF-8?q?publicPath=20=E4=BF=AE=E5=A4=8D,=20?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E8=B5=B7=E9=87=8C=E9=9D=A2=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E4=BA=86fineui=E5=B1=85=E7=84=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/webpack/webpack.prod.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js index f7fe62b17..d1d7b9ffc 100644 --- a/packages/fineui/webpack/webpack.prod.js +++ b/packages/fineui/webpack/webpack.prod.js @@ -16,7 +16,8 @@ module.exports = merge(common, { output: { path: dirs.DEST, - filename: "[name].js" + filename: "[name].js", + publicPath: "" }, devtool: "hidden-source-map" From 4d26d239073e9299fa6469a73fddef6269f8afdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Thu, 3 Aug 2023 19:31:39 +0800 Subject: [PATCH 23/24] =?UTF-8?q?REPORT-101119=20fix:=E6=96=B0=E5=BC=95?= =?UTF-8?q?=E6=93=8E-=E4=B8=8B=E6=8B=89=E5=A4=8D=E9=80=89=E6=A1=86?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=90=8E=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89?= =?UTF-8?q?=E9=80=89=E9=A1=B9=EF=BC=8C=E4=B8=80=E7=9B=B4=E5=9C=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=AD=E5=87=BA=E4=B8=8D=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/combination/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/base/combination/loader.js b/packages/fineui/src/base/combination/loader.js index 95081f18b..4706d4c2a 100644 --- a/packages/fineui/src/base/combination/loader.js +++ b/packages/fineui/src/base/combination/loader.js @@ -181,7 +181,7 @@ export class Loader extends Widget { isEmpty(optionsItems) && nextTick( bind(() => { - isDefaultInit && isEmpty(optionsItems) && this._populate(); + isDefaultInit && isEmpty(this.options.items) && this._populate(); }, this) ); const items = isFunction(optionsItems) From 3e0072bb90b4e8ebd0ef900c57acef2b0af8b99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Thu, 3 Aug 2023 19:43:17 +0800 Subject: [PATCH 24/24] =?UTF-8?q?REPORT-101788=20&&=20REPORT-101859=20fix:?= =?UTF-8?q?=E3=80=9011.0.19=E5=86=92=E7=83=9F=E3=80=91=E6=96=B0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF-=E6=8E=A7=E4=BB=B6-=E4=B8=8B=E6=8B=89=E6=A0=91=20?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E6=90=9C=E7=B4=A2=E5=A4=B1=E6=95=88?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E5=80=BC=E6=B2=A1=E5=8F=8D=E5=BA=94?= =?UTF-8?q?=20&&=20FR11=E6=A0=B7=E5=BC=8F-=E4=B8=8B=E6=8B=89=E6=A0=91?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E6=97=A0?= =?UTF-8?q?=E5=8F=8D=E5=BA=94=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/multitree/trigger/multi.tree.search.insert.pane.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js index feba439cf..454e1daf9 100644 --- a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js +++ b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.insert.pane.js @@ -11,7 +11,7 @@ export class MultiTreeSearchInsertPane extends Widget { el: { type: PartTree.xtype }, }; - static constants = { + static CONSTANTS = { height: 24, }; @@ -36,7 +36,7 @@ export class MultiTreeSearchInsertPane extends Widget { self.addTip = _ref; }, text: i18nText("BI-Basic_Click_To_Add_Text", ""), - height: this.constants.height, + height: MultiTreeSearchInsertPane.CONSTANTS.height, cls: "bi-high-light", handler() { self.fireEvent(MultiTreeSearchInsertPane.EVENT_ADD_ITEM, opts.keywordGetter());