Pull request #3278: BI-118262 fix: 树过滤组件搜索过滤不生效

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'ede80e51c177639a90db27196cff2715739fe11f':
  BI-118262 fix: 树过滤组件搜索过滤不生效

src/case/ztree/parttree.js

@@ -37,6 +37,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
         var self = this, o = this.options;
         var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode));
         var name = this._getNodeValue(treeNode);
+        this.fireEvent(BI.PartTree.EVENT_CLICK_TREE_NODE);
         if (treeNode.checked === true) {
             this.options.paras.selectedValues = this._getUnionValue();
             // this._buildTree(self.options.paras.selectedValues, BI.concat(parentValues, name));
@@ -80,7 +81,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
         var rootNoots = this.nodes.getNodes();
         track(rootNoots);
 
-        function track (nodes) {
+        function track(nodes) {
             BI.each(nodes, function (i, node) {
                 var checkState = node.getCheckStatus();
                 if (checkState.checked === false) {
@@ -135,7 +136,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
             self.fireEvent(BI.Events.AFTERINIT);
         };
 
-        function callback (nodes) {
+        function callback(nodes) {
             if (self._stop === true) {
                 return;
             }
@@ -171,7 +172,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
         track([], valueA, valueB);
         track([], valueB, valueA);
 
-        function track (parent, node, compare) {
+        function track(parent, node, compare) {
             BI.each(node, function (n, item) {
                 if (BI.isNull(compare[n])) {
                     self._addTreeNode(map, parent, n, item);
@@ -197,4 +198,5 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
     }
 });
 
+BI.PartTree.EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE";
 BI.shortcut("bi.part_tree", BI.PartTree);

src/widget/multitree/multi.tree.combo.js

@@ -42,7 +42,15 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             },
             searcher: {
                 type: "bi.multi_tree_searcher",
-                itemsCreator: o.itemsCreator
+                itemsCreator: o.itemsCreator,
+                listeners: [
+                    {
+                        eventName: BI.MultiTreeSearcher.EVENT_CLICK_TREE_NODE,
+                        action: function () {
+                            self._dataChange = true;
+                        }
+                    }
+                ],
             },
             value: { value: o.value || {} }
         });
@@ -61,43 +69,45 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                     self.trigger.setAdapter(this);
                     self.numberCounter.setAdapter(this);
                 },
-                listeners: [{
-                    eventName: BI.MultiTreePopup.EVENT_AFTERINIT,
-                    action: function () {
-                        self.numberCounter.adjustView();
-                        isInit = true;
-                        if (want2showCounter === true) {
-                            showCounter();
+                listeners: [
+                    {
+                        eventName: BI.MultiTreePopup.EVENT_AFTERINIT,
+                        action: function () {
+                            self.numberCounter.adjustView();
+                            isInit = true;
+                            if (want2showCounter === true) {
+                                showCounter();
+                            }
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CHANGE,
+                        action: function () {
+                            change = true;
+                            var val = {
+                                type: BI.Selection.Multi,
+                                value: this.hasChecked() ? this.getValue() : {}
+                            };
+                            self.trigger.getSearcher().setState(val);
+                            self.numberCounter.setButtonChecked(val);
+                            self.storeValue = { value: self.combo.getValue() };
+                            self.fireEvent(BI.MultiTreeCombo.EVENT_CLICK_ITEM, self.combo.getValue());
+                            self._dataChange = true;
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
+                        action: function () {
+                            self.combo.hideView();
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,
+                        action: function () {
+                            clear = true;
+                            self._dataChange = true;
+                            self.setValue();
+                            self._defaultState();
                         }
                     }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CHANGE,
-                    action: function () {
-                        change = true;
-                        var val = {
-                            type: BI.Selection.Multi,
-                            value: this.hasChecked() ? this.getValue() : {}
-                        };
-                        self.trigger.getSearcher().setState(val);
-                        self.numberCounter.setButtonChecked(val);
-                        self.storeValue = { value: self.combo.getValue() };
-                        self.fireEvent(BI.MultiTreeCombo.EVENT_CLICK_ITEM, self.combo.getValue());
-                        self._dataChange = true;
-                    }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self.combo.hideView();
-                    }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        clear = true;
-                        self._dataChange = true;
-                        self.setValue();
-                        self._defaultState();
-                    }
-                }],
+                ],
                 itemsCreator: o.itemsCreator,
                 onLoaded: function () {
                     BI.nextTick(function () {
@@ -293,26 +303,28 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         BI.createWidget({
             type: "bi.absolute",
             element: this,
-            items: [{
-                el: this.combo,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }, {
-                el: triggerBtn,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }, {
-                el: {
-                    type: "bi.vertical_adapt",
-                    items: [this.numberCounter]
-                },
-                right: o.height,
-                top: 0,
-                bottom: 0
-            }]
+            items: [
+                {
+                    el: this.combo,
+                    left: 0,
+                    right: 0,
+                    top: 0,
+                    bottom: 0
+                }, {
+                    el: triggerBtn,
+                    right: 0,
+                    top: 0,
+                    bottom: 0
+                }, {
+                    el: {
+                        type: "bi.vertical_adapt",
+                        items: [this.numberCounter]
+                    },
+                    right: o.height,
+                    top: 0,
+                    bottom: 0
+                }
+            ]
         });
     },
 

src/widget/multitree/multi.tree.insert.combo.js

@@ -47,18 +47,25 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
                 itemsCreator: o.itemsCreator,
                 popup: {
                     type: "bi.multi_tree_search_insert_pane",
-                    listeners: [{
-                        eventName: BI.MultiTreeSearchInsertPane.EVENT_ADD_ITEM,
-                        action: function () {
-                            self.storeValue.value[self.trigger.getSearcher().getKeyword()] = {};
-                            self._assertShowValue();
-                            // setValue以更新paras.value, 之后从search popup中拿到的就能有add的值了
-                            self.combo.setValue(self.storeValue);
-                            self.numberCounter.setValue(self.storeValue);
-                            self._stopEditing();
-                            self._dataChange = true;
+                    listeners: [
+                        {
+                            eventName: BI.MultiTreeSearchInsertPane.EVENT_ADD_ITEM,
+                            action: function () {
+                                self.storeValue.value[self.trigger.getSearcher().getKeyword()] = {};
+                                self._assertShowValue();
+                                // setValue以更新paras.value, 之后从search popup中拿到的就能有add的值了
+                                self.combo.setValue(self.storeValue);
+                                self.numberCounter.setValue(self.storeValue);
+                                self._stopEditing();
+                                self._dataChange = true;
+                            }
+                        }, {
+                            eventName: BI.MultiTreeSearchInsertPane.EVENT_CLICK_TREE_NODE,
+                            action: function () {
+                                self._dataChange = true;
+                            }
                         }
-                    }]
+                    ]
                 }
             },
             value: { value: o.value || {} }
@@ -79,43 +86,45 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
                     self.trigger.setAdapter(this);
                     self.numberCounter.setAdapter(this);
                 },
-                listeners: [{
-                    eventName: BI.MultiTreePopup.EVENT_AFTERINIT,
-                    action: function () {
-                        self.numberCounter.adjustView();
-                        isInit = true;
-                        if (want2showCounter === true) {
-                            showCounter();
+                listeners: [
+                    {
+                        eventName: BI.MultiTreePopup.EVENT_AFTERINIT,
+                        action: function () {
+                            self.numberCounter.adjustView();
+                            isInit = true;
+                            if (want2showCounter === true) {
+                                showCounter();
+                            }
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CHANGE,
+                        action: function () {
+                            change = true;
+                            var val = {
+                                type: BI.Selection.Multi,
+                                value: this.hasChecked() ? this.getValue() : {}
+                            };
+                            self.trigger.getSearcher().setState(val);
+                            self.numberCounter.setButtonChecked(val);
+                            self.storeValue = { value: self.combo.getValue() };
+                            self.fireEvent(BI.MultiTreeInsertCombo.EVENT_CLICK_ITEM, self.getValue());
+                            self._dataChange = true;
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
+                        action: function () {
+                            self.combo.hideView();
+                        }
+                    }, {
+                        eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,
+                        action: function () {
+                            clear = true;
+                            self._dataChange = true;
+                            self.setValue();
+                            self._defaultState();
                         }
                     }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CHANGE,
-                    action: function () {
-                        change = true;
-                        var val = {
-                            type: BI.Selection.Multi,
-                            value: this.hasChecked() ? this.getValue() : {}
-                        };
-                        self.trigger.getSearcher().setState(val);
-                        self.numberCounter.setButtonChecked(val);
-                        self.storeValue = { value: self.combo.getValue() };
-                        self.fireEvent(BI.MultiTreeInsertCombo.EVENT_CLICK_ITEM, self.getValue());
-                        self._dataChange = true;
-                    }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
-                    action: function () {
-                        self.combo.hideView();
-                    }
-                }, {
-                    eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,
-                    action: function () {
-                        clear = true;
-                        self._dataChange = true;
-                        self.setValue();
-                        self._defaultState();
-                    }
-                }],
+                ],
                 itemsCreator: o.itemsCreator,
                 onLoaded: function () {
                     BI.nextTick(function () {
@@ -303,26 +312,28 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
         BI.createWidget({
             type: "bi.absolute",
             element: this,
-            items: [{
-                el: this.combo,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }, {
-                el: triggerBtn,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }, {
-                el: {
-                    type: "bi.vertical_adapt",
-                    items: [this.numberCounter]
-                },
-                right: o.height,
-                top: 0,
-                height: o.height,
-            }]
+            items: [
+                {
+                    el: this.combo,
+                    left: 0,
+                    right: 0,
+                    top: 0,
+                    bottom: 0
+                }, {
+                    el: triggerBtn,
+                    right: 0,
+                    top: 0,
+                    bottom: 0
+                }, {
+                    el: {
+                        type: "bi.vertical_adapt",
+                        items: [this.numberCounter]
+                    },
+                    right: o.height,
+                    top: 0,
+                    height: o.height,
+                }
+            ]
         });
     },
 

src/widget/multitree/trigger/multi.tree.search.insert.pane.js

@@ -25,55 +25,64 @@ BI.MultiTreeSearchInsertPane = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.absolute",
-            items: [{
-                el: {
-                    type: "bi.text_button",
-                    invisible: true,
-                    ref: function (_ref) {
-                        self.addTip = _ref;
-                    },
-                    text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
-                    height: this.constants.height,
-                    cls: "bi-high-light",
-                    handler: function () {
-                        self.fireEvent(BI.MultiTreeSearchInsertPane.EVENT_ADD_ITEM, opts.keywordGetter());
-                    }
-                },
-                top: 5,
-                left: 0,
-                right: 0
-            }, {
-                el: BI.extend({
-                    type: "bi.part_tree",
-                    tipText: BI.i18nText("BI-No_Select"),
-                    itemsCreator: function (op, callback) {
-                        op.keyword = opts.keywordGetter();
-                        opts.itemsCreator(op, function (res) {
-                            callback(res);
-                            self.setKeyword(opts.keywordGetter(), res.items);
-                        });
-                    },
-                    ref: function (_ref) {
-                        self.partTree = _ref;
-                    },
-                    value: opts.value,
-                    listeners: [{
-                        eventName: BI.Controller.EVENT_CHANGE,
-                        action: function () {
-                            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
+            items: [
+                {
+                    el: {
+                        type: "bi.text_button",
+                        invisible: true,
+                        ref: function (_ref) {
+                            self.addTip = _ref;
+                        },
+                        text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
+                        height: this.constants.height,
+                        cls: "bi-high-light",
+                        handler: function () {
+                            self.fireEvent(BI.MultiTreeSearchInsertPane.EVENT_ADD_ITEM, opts.keywordGetter());
                         }
-                    }, {
-                        eventName: BI.TreeView.EVENT_CHANGE,
-                        action: function () {
-                            self.fireEvent(BI.MultiTreeSearchInsertPane.EVENT_CHANGE);
-                        }
-                    }]
-                }, opts.el),
-                left: 0,
-                top: 0,
-                bottom: 0,
-                right: 0
-            }]
+                    },
+                    top: 5,
+                    left: 0,
+                    right: 0
+                }, {
+                    el: BI.extend({
+                        type: "bi.part_tree",
+                        tipText: BI.i18nText("BI-No_Select"),
+                        itemsCreator: function (op, callback) {
+                            op.keyword = opts.keywordGetter();
+                            opts.itemsCreator(op, function (res) {
+                                callback(res);
+                                self.setKeyword(opts.keywordGetter(), res.items);
+                            });
+                        },
+                        ref: function (_ref) {
+                            self.partTree = _ref;
+                        },
+                        value: opts.value,
+                        listeners: [
+                            {
+                                eventName: BI.Controller.EVENT_CHANGE,
+                                action: function () {
+                                    self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
+                                }
+                            }, {
+                                eventName: BI.TreeView.EVENT_CHANGE,
+                                action: function () {
+                                    self.fireEvent(BI.MultiTreeSearchInsertPane.EVENT_CHANGE);
+                                }
+                            }, {
+                                eventName: BI.PartTree.EVENT_CLICK_TREE_NODE,
+                                action: function () {
+                                    self.fireEvent(BI.MultiTreeSearchInsertPane.EVENT_CLICK_TREE_NODE);
+                                }
+                            }
+                        ]
+                    }, opts.el),
+                    left: 0,
+                    top: 0,
+                    bottom: 0,
+                    right: 0
+                }
+            ]
         };
     },
 
@@ -115,5 +124,6 @@ BI.MultiTreeSearchInsertPane.EVENT_CHANGE = "EVENT_CHANGE";
 BI.MultiTreeSearchInsertPane.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
 BI.MultiTreeSearchInsertPane.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
 BI.MultiTreeSearchInsertPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
+BI.MultiTreeSearchInsertPane.EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE";
 
-BI.shortcut("bi.multi_tree_search_insert_pane", BI.MultiTreeSearchInsertPane);
+BI.shortcut("bi.multi_tree_search_insert_pane", BI.MultiTreeSearchInsertPane);

src/widget/multitree/trigger/multi.tree.search.pane.js

@@ -25,17 +25,24 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, {
                 opts.itemsCreator(op, callback);
             },
             value: opts.value,
-            listeners: [{
-                eventName: BI.Controller.EVENT_CHANGE,
-                action: function () {
-                    self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
+            listeners: [
+                {
+                    eventName: BI.Controller.EVENT_CHANGE,
+                    action: function () {
+                        self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
+                    }
+                }, {
+                    eventName: BI.TreeView.EVENT_CHANGE,
+                    action: function () {
+                        self.fireEvent(BI.MultiTreeSearchPane.EVENT_CHANGE);
+                    }
+                }, {
+                    eventName: BI.PartTree.EVENT_CLICK_TREE_NODE,
+                    action: function () {
+                        self.fireEvent(BI.MultiTreeSearchPane.EVENT_CLICK_TREE_NODE);
+                    }
                 }
-            }, {
-                eventName: BI.TreeView.EVENT_CHANGE,
-                action: function () {
-                    self.fireEvent(BI.MultiTreeSearchPane.EVENT_CHANGE);
-                }
-            }],
+            ],
             ref: function (_ref) {
                 self.partTree = _ref;
             }
@@ -72,5 +79,6 @@ BI.MultiTreeSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
 
 BI.MultiTreeSearchPane.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
 BI.MultiTreeSearchPane.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
+BI.MultiTreeSearchPane.EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE";
 
-BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);
+BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);

src/widget/multitree/trigger/searcher.multi.tree.js

@@ -33,17 +33,19 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
                 defaultText: o.defaultText,
                 height: o.height
             },
-            listeners: [{
-                eventName: BI.MultiSelectEditor.EVENT_FOCUS,
-                action: function () {
-                    self.fireEvent(BI.MultiSelectSearcher.EVENT_FOCUS);
+            listeners: [
+                {
+                    eventName: BI.MultiSelectEditor.EVENT_FOCUS,
+                    action: function () {
+                        self.fireEvent(BI.MultiSelectSearcher.EVENT_FOCUS);
+                    }
+                }, {
+                    eventName: BI.MultiSelectEditor.EVENT_BLUR,
+                    action: function () {
+                        self.fireEvent(BI.MultiSelectSearcher.EVENT_BLUR);
+                    }
                 }
-            }, {
-                eventName: BI.MultiSelectEditor.EVENT_BLUR,
-                action: function () {
-                    self.fireEvent(BI.MultiSelectSearcher.EVENT_BLUR);
-                }
-            }]
+            ]
         });
 
         this.searcher = BI.createWidget({
@@ -67,6 +69,14 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
                     op.keyword = self.editor.getValue();
                     o.itemsCreator(op, callback);
                 },
+                listeners: [
+                    {
+                        eventName: BI.MultiTreeSearchPane.EVENT_CLICK_TREE_NODE,
+                        action: function () {
+                            self.fireEvent(BI.MultiTreeSearcher.EVENT_CLICK_TREE_NODE, arguments);
+                        }
+                    }
+                ],
                 value: o.value
             }, o.popup),
 
@@ -206,4 +216,5 @@ BI.MultiTreeSearcher.EVENT_CHANGE = "EVENT_CHANGE";
 BI.MultiTreeSearcher.EVENT_START = "EVENT_START";
 BI.MultiTreeSearcher.EVENT_STOP = "EVENT_STOP";
 BI.MultiTreeSearcher.EVENT_PAUSE = "EVENT_PAUSE";
+BI.MultiTreeSearcher.EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE";
 BI.shortcut("bi.multi_tree_searcher", BI.MultiTreeSearcher);