From 69600488a5f9ff90d756bbe22abd59d97fcb4acf Mon Sep 17 00:00:00 2001 From: Sylar <> Date: Wed, 26 Jul 2023 17:12:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-101548=20=E4=B8=8B=E6=8B=89=E5=A4=8D?= =?UTF-8?q?=E9=80=89=E6=A0=91this=E6=8C=87=E5=90=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../treevaluechooser/abstract.treevaluechooser.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js index 9c84e13ba..d3afdae79 100644 --- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js +++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js @@ -31,7 +31,7 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser { return; } - doCheck([], this.tree.getRoot(), selectedValues); + doCheck.call(this, [], this.tree.getRoot(), selectedValues); callback({ items: values(result), From 416fe4a3baf6235c67655e611960fd911d783d14 Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 26 Jul 2023 19:08:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=20=E7=BB=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/list/listasynctree.js | 2 +- packages/fineui/src/case/ztree/list/listparttree.js | 2 +- packages/fineui/src/case/ztree/list/listtreeview.js | 2 +- packages/fineui/src/case/ztree/tree.list.display.js | 2 +- packages/fineui/src/widget/multitree/multi.tree.list.combo.js | 4 ++-- scripts/lib/fui.component.json | 4 ++-- scripts/lib/fui.export.txt | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/fineui/src/case/ztree/list/listasynctree.js b/packages/fineui/src/case/ztree/list/listasynctree.js index 716d6c79e..f3ec1214d 100644 --- a/packages/fineui/src/case/ztree/list/listasynctree.js +++ b/packages/fineui/src/case/ztree/list/listasynctree.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class Listasynctree extends Listtreeview { +export class ListAsyncTree extends ListTreeView { static xtype = "bi.list_async_tree"; // 配置属性 diff --git a/packages/fineui/src/case/ztree/list/listparttree.js b/packages/fineui/src/case/ztree/list/listparttree.js index 9ec25d2f0..8bcae708f 100644 --- a/packages/fineui/src/case/ztree/list/listparttree.js +++ b/packages/fineui/src/case/ztree/list/listparttree.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class ListPartTree extends Listasynctree { +export class ListPartTree extends ListAsyncTree { static xtype = "bi.list_part_tree"; _loadMore() { diff --git a/packages/fineui/src/case/ztree/list/listtreeview.js b/packages/fineui/src/case/ztree/list/listtreeview.js index b7ec3aaa7..b6955e3de 100644 --- a/packages/fineui/src/case/ztree/list/listtreeview.js +++ b/packages/fineui/src/case/ztree/list/listtreeview.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class Listtreeview extends TreeView { +export class ListTreeView extends TreeView { static xtype = "bi.list_tree_view"; _constants = { diff --git a/packages/fineui/src/case/ztree/tree.list.display.js b/packages/fineui/src/case/ztree/tree.list.display.js index 9add974f5..85720f3d4 100644 --- a/packages/fineui/src/case/ztree/tree.list.display.js +++ b/packages/fineui/src/case/ztree/tree.list.display.js @@ -10,7 +10,7 @@ import $ from "jquery"; */ @shortcut() -export class ListDisplayTree extends Listtreeview { +export class ListDisplayTree extends ListTreeView { static xtype = "bi.list_display_tree"; static EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/packages/fineui/src/widget/multitree/multi.tree.list.combo.js b/packages/fineui/src/widget/multitree/multi.tree.list.combo.js index eb20de280..d32f941ed 100644 --- a/packages/fineui/src/widget/multitree/multi.tree.list.combo.js +++ b/packages/fineui/src/widget/multitree/multi.tree.list.combo.js @@ -19,7 +19,7 @@ import { Single, Combo } from "@/base"; import { MultiTreeSearchInsertPane } from "./trigger/multi.tree.search.insert.pane"; import { MultiTreePopup } from "./multi.tree.popup"; import { MultiSelectTrigger } from "../multiselect/multiselect.trigger"; -import { TriggerIconButton, ListPartTree, ListDisplayTree, Listasynctree } from "@/case"; +import { TriggerIconButton, ListPartTree, ListDisplayTree, ListAsyncTree } from "@/case"; import { MultiSelectCheckSelectedSwitcher } from "../multiselect/trigger/switcher.checkselected"; @shortcut() @@ -126,7 +126,7 @@ export class MultiTreeListCombo extends Single { self.numberCounter.setAdapter(this); }, el: { - type: Listasynctree.xtype, + type: ListAsyncTree.xtype, }, listeners: [ { diff --git a/scripts/lib/fui.component.json b/scripts/lib/fui.component.json index 35bfe7cc1..22d45963a 100644 --- a/scripts/lib/fui.component.json +++ b/scripts/lib/fui.component.json @@ -167,9 +167,9 @@ "bi.small_select_text_trigger": "SmallSelectTextTrigger", "bi.small_text_trigger": "SmallTextTrigger", "bi.async_tree": "AsyncTree", - "bi.list_async_tree": "Listasynctree", + "bi.list_async_tree": "ListAsyncTree", "bi.list_part_tree": "ListPartTree", - "bi.list_tree_view": "Listtreeview", + "bi.list_tree_view": "ListTreeView", "bi.part_tree": "PartTree", "bi.display_tree": "DisplayTree", "bi.list_display_tree": "ListDisplayTree", diff --git a/scripts/lib/fui.export.txt b/scripts/lib/fui.export.txt index ef18cb6a8..b04b355ce 100644 --- a/scripts/lib/fui.export.txt +++ b/scripts/lib/fui.export.txt @@ -233,8 +233,8 @@ ListLoader ListPane ListPartTree ListView -Listasynctree -Listtreeview +ListAsyncTree +ListTreeView Loader LoadingBar Logic From 881aa445f85624d42d9ed1a8fcee43cb5b1e9a04 Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 27 Jul 2023 12:44:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A0JIRA=20=E7=BB=84=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/list/listasynctree.js | 2 +- packages/fineui/src/case/ztree/list/listparttree.js | 2 +- packages/fineui/src/case/ztree/tree.list.display.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fineui/src/case/ztree/list/listasynctree.js b/packages/fineui/src/case/ztree/list/listasynctree.js index f3ec1214d..7efbf4f16 100644 --- a/packages/fineui/src/case/ztree/list/listasynctree.js +++ b/packages/fineui/src/case/ztree/list/listasynctree.js @@ -1,4 +1,4 @@ -import { Listtreeview } from "./listtreeview"; +import { ListTreeView } from "./listtreeview"; import { cjkEncodeDO, delay, isEmpty, shortcut, extend } from "@/core"; import $ from "jquery"; diff --git a/packages/fineui/src/case/ztree/list/listparttree.js b/packages/fineui/src/case/ztree/list/listparttree.js index 8bcae708f..a9719478f 100644 --- a/packages/fineui/src/case/ztree/list/listparttree.js +++ b/packages/fineui/src/case/ztree/list/listparttree.js @@ -1,4 +1,4 @@ -import { Listasynctree } from "./listasynctree"; +import { ListAsyncTree } from "./listasynctree"; import { shortcut, extend, Events, delay } from "@/core"; import { TreeView } from "../treeview"; import $ from "jquery"; diff --git a/packages/fineui/src/case/ztree/tree.list.display.js b/packages/fineui/src/case/ztree/tree.list.display.js index 85720f3d4..179713c87 100644 --- a/packages/fineui/src/case/ztree/tree.list.display.js +++ b/packages/fineui/src/case/ztree/tree.list.display.js @@ -1,4 +1,4 @@ -import { Listtreeview } from "./list/listtreeview"; +import { ListTreeView } from "./list/listtreeview"; import { each, shortcut, i18nText } from "@/core"; import $ from "jquery";