From cfd05b9097853f3c0f9a35beb6da2cf991c40469 Mon Sep 17 00:00:00 2001 From: jian Date: Mon, 31 Jul 2023 19:23:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E9=97=B4?= =?UTF-8?q?=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 2/2] =?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);