Merge pull request #121349 in DEC/fineui from master to feature/x

* commit '4fee3113f4d45696c0d667de797898944701beb5':
  无JIRA fix: 补齐事件
  REPORT-76547 fix: 组件是否异步获取数据,和组件是否支持搜索分离开

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -132,6 +132,11 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                     action: function () {
                         self.fireEvent(BI.MultiLayerSelectTreeCombo.EVENT_SEARCHING);
                     }
+                }, {
+                    eventName: BI.MultiLayerSelectTreeTrigger.EVENT_STOP,
+                    action: function () {
+                        self.fireEvent(BI.MultiLayerSelectTreeCombo.EVENT_STOP);
+                    }
                 }, {
                     eventName: BI.MultiLayerSelectTreeTrigger.EVENT_ADD_ITEM,
                     action: function () {
@@ -243,6 +248,7 @@ BI.MultiLayerSelectTreeCombo.EVENT_SEARCHING = "EVENT_SEARCHING";
 BI.MultiLayerSelectTreeCombo.EVENT_BLUR = "EVENT_BLUR";
 BI.MultiLayerSelectTreeCombo.EVENT_FOCUS = "EVENT_FOCUS";
 BI.MultiLayerSelectTreeCombo.EVENT_CHANGE = "EVENT_CHANGE";
+BI.MultiLayerSelectTreeCombo.EVENT_STOP = "EVENT_STOP";
 BI.MultiLayerSelectTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.MultiLayerSelectTreeCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
 BI.shortcut("bi.multilayer_select_tree_combo", BI.MultiLayerSelectTreeCombo);

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -36,11 +36,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         return (o.itemsCreator === BI.emptyFn) ? this._getSyncConfig() : this._getAsyncConfig();
     },
 
-    _shouldWrapper: function () {
-        var o = this.options;
-        return !o.allowEdit && o.itemsCreator === BI.emptyFn;
-    },
-
     _getBaseConfig: function () {
         var self = this, o = this.options;
         return {
@@ -99,7 +94,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 container: o.container,
                 allowInsertValue: o.allowInsertValue,
                 allowSearchValue: o.allowSearchValue,
-                allowEdit: o.allowEdit,
                 cls: "multilayer-single-tree-trigger",
                 ref: function (_ref) {
                     self.trigger = _ref;
@@ -136,6 +130,11 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                     action: function () {
                         self.fireEvent(BI.MultiLayerSingleTreeCombo.EVENT_SEARCHING);
                     }
+                }, {
+                    eventName: BI.MultiLayerSingleTreeTrigger.EVENT_STOP,
+                    action: function () {
+                        self.fireEvent(BI.MultiLayerSingleTreeCombo.EVENT_STOP);
+                    }
                 }, {
                     eventName: BI.MultiLayerSingleTreeTrigger.EVENT_ADD_ITEM,
                     action: function () {
@@ -184,13 +183,28 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 tipType: o.tipType,
                 warningTitle: o.warningTitle,
                 valueFormatter: o.valueFormatter,
-            }
+            },
         });
     },
 
     _getAsyncConfig: function () {
-        var config = this._getBaseConfig();
+        var o = this.options, self = this;
-        return BI.extend(config, this._getSearchConfig());
+        var baseConfig = this._getBaseConfig();
+        return BI.extend(baseConfig, o.allowEdit ? this._getSearchConfig() : {
+            el: {
+                type: "bi.single_tree_trigger",
+                ref: function (_ref) {
+                    self.textTrigger = _ref;
+                },
+                text: o.text,
+                height: o.height,
+                items: o.items,
+                value: o.value,
+                tipType: o.tipType,
+                warningTitle: o.warningTitle,
+                valueFormatter: o.valueFormatter,
+            },
+        });
     },
 
     getSearcher: function () {
@@ -243,5 +257,6 @@ BI.MultiLayerSingleTreeCombo.EVENT_SEARCHING = "EVENT_SEARCHING";
 BI.MultiLayerSingleTreeCombo.EVENT_BLUR = "EVENT_BLUR";
 BI.MultiLayerSingleTreeCombo.EVENT_FOCUS = "EVENT_FOCUS";
 BI.MultiLayerSingleTreeCombo.EVENT_CHANGE = "EVENT_CHANGE";
+BI.MultiLayerSingleTreeCombo.EVENT_STOP = "EVENT_STOP";
 BI.MultiLayerSingleTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.shortcut("bi.multilayer_single_tree_combo", BI.MultiLayerSingleTreeCombo);