From 7f6fcd2690b87d1aff2bd8d4f1fb847811b4f174 Mon Sep 17 00:00:00 2001 From: windy Date: Tue, 4 Aug 2020 00:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=95=B4?= =?UTF-8?q?=E7=90=86=E5=90=8C=E6=AD=A5=E5=BC=82=E6=AD=A5=E6=A0=91=E7=9A=84?= =?UTF-8?q?populate=20&&=20insert=E5=88=97=E8=A1=A8=E5=85=A8=E9=80=89?= =?UTF-8?q?=E5=8F=AF=E6=BB=9A=E5=8A=A8=20&&=20=E5=A4=8D=E9=80=89=E6=A0=91?= =?UTF-8?q?=E7=9A=84=E5=8A=A0=E5=87=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../treevaluechooser/combo.listtreevaluechooser.js | 2 +- .../treevaluechooser/combo.treevaluechooser.insert.js | 2 +- src/component/treevaluechooser/combo.treevaluechooser.js | 2 +- src/component/treevaluechooser/pane.treevaluechooser.js | 7 ++++--- src/less/base/tree/ztree.less | 6 +++--- src/widget/multiselectlist/multiselectlist.insert.js | 4 ++-- src/widget/multiselecttree/multiselecttree.js | 6 +++--- src/widget/multitree/multi.tree.combo.js | 2 +- src/widget/multitree/multi.tree.insert.combo.js | 2 +- src/widget/multitree/multi.tree.list.combo.js | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/component/treevaluechooser/combo.listtreevaluechooser.js b/src/component/treevaluechooser/combo.listtreevaluechooser.js index b4d09b3d1..b6ceac719 100644 --- a/src/component/treevaluechooser/combo.listtreevaluechooser.js +++ b/src/component/treevaluechooser/combo.listtreevaluechooser.js @@ -94,7 +94,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, populate: function (items) { this._initData(items); - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.insert.js b/src/component/treevaluechooser/combo.treevaluechooser.insert.js index 8359d2fab..a99d24cc3 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.insert.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.insert.js @@ -93,7 +93,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { populate: function (items) { this._initData(items); - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 9a90c7957..b1a11cb5d 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -97,7 +97,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { populate: function (items) { this._initData(items); - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } }); diff --git a/src/component/treevaluechooser/pane.treevaluechooser.js b/src/component/treevaluechooser/pane.treevaluechooser.js index 89f981f70..685bf863b 100644 --- a/src/component/treevaluechooser/pane.treevaluechooser.js +++ b/src/component/treevaluechooser/pane.treevaluechooser.js @@ -49,9 +49,10 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, { return this.buildCompleteTree(this.combo.getValue()); }, - populate: function () { - this.pane.populate.apply(this.pane, arguments); + populate: function (items) { + this._initData(items); + this.pane.populate(); } }); BI.TreeValueChooserPane.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.tree_value_chooser_pane", BI.TreeValueChooserPane); \ No newline at end of file +BI.shortcut("bi.tree_value_chooser_pane", BI.TreeValueChooserPane); diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index 77e5fed2a..472bf063e 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -185,8 +185,8 @@ } .ztree li span.button.switch { - width: 25px; - height: 25px + width: 24px; + height: 24px } .ztree li span.button.noline_open { @@ -295,4 +295,4 @@ ul.ztree.zTreeDragUL { .ztree li ul.level0 { padding:0; background:none; -}*/ \ No newline at end of file +}*/ diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js index b5dc4f04f..d4ccc8b7c 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.js +++ b/src/widget/multiselectlist/multiselectlist.insert.js @@ -26,7 +26,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, logic: { - dynamic: true + dynamic: false }, // onLoaded: o.onLoaded, el: {}, @@ -334,4 +334,4 @@ BI.extend(BI.MultiSelectInsertList, { }); BI.MultiSelectInsertList.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.multi_select_insert_list", BI.MultiSelectInsertList); \ No newline at end of file +BI.shortcut("bi.multi_select_insert_list", BI.MultiSelectInsertList); diff --git a/src/widget/multiselecttree/multiselecttree.js b/src/widget/multiselecttree/multiselecttree.js index 21b5b5adb..3771673ce 100644 --- a/src/widget/multiselecttree/multiselecttree.js +++ b/src/widget/multiselecttree/multiselecttree.js @@ -163,9 +163,9 @@ BI.MultiSelectTree = BI.inherit(BI.Single, { }, populate: function () { - this.searcher.populate.apply(this.searcher, arguments); - this.adapter.populate.apply(this.adapter, arguments); + this.searcher.populate(); + this.adapter.populate(); } }); BI.MultiSelectTree.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.multi_select_tree", BI.MultiSelectTree); \ No newline at end of file +BI.shortcut("bi.multi_select_tree", BI.MultiSelectTree); diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 3561e28fa..898b8fec4 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -334,7 +334,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } }); diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index ce0449dd5..d22a01bee 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -349,7 +349,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } }); diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index cbbf67286..ba5690199 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -373,7 +373,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { }, populate: function () { - this.combo.populate.apply(this.combo, arguments); + this.combo.populate(); } });