Merge pull request #146045 in DEC/fineui from final/11.0 to persist/11.0

* commit '3ca8bf00d6a759190a60193a8934fe19d699ffdd':
  REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
  chore: 打包加上hash
  REPORT-77246 fix: 根据review建议修改代码
  REPORT-77246 fix: 修复bi.time_combo组件内容和图标重叠的问题

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -132,11 +132,6 @@ 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 () {
@@ -248,7 +243,6 @@ 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,6 +36,11 @@ 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 {
@@ -94,6 +99,7 @@ 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;
@@ -130,11 +136,6 @@ 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 () {
@@ -183,28 +184,13 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 tipType: o.tipType,
                 warningTitle: o.warningTitle,
                 valueFormatter: o.valueFormatter,
-            },
+            }
         });
     },
 
     _getAsyncConfig: function () {
-        var o = this.options, self = this;
-        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,
-            },
-        });
+        var config = this._getBaseConfig();
+        return BI.extend(config, this._getSearchConfig());
     },
 
     getSearcher: function () {
@@ -257,6 +243,5 @@ 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);

src/widget/time/time.combo.js

@@ -60,13 +60,14 @@
                 }
             };
             return {
-                type: "bi.htape",
-                items: [{
-                    type: "bi.absolute",
+                type: "bi.horizontal_fill",
+                cls: "bi-border bi-border-radius",
+                columnSize: ["fill", this.constants.iconWidth],
+                height: opts.height - 2,
+                width: opts.width - 2,
                 items: [{
                     el: {
                         type: "bi.combo",
-                            cls: "bi-border bi-border-radius",
                         container: opts.container,
                         toggle: false,
                         isNeedAdjustHeight: opts.isNeedAdjustHeight,
@@ -170,16 +171,11 @@
                             self.combo = _ref;
                         }
                     },
-                        top: 0,
-                        left: 0,
-                        right: 0,
-                        bottom: 0
                 }, {
                     el: {
                         type: "bi.icon_button",
-                            cls: "bi-trigger-icon-button time-font icon-size-16",
+                        cls: "bi-trigger-icon-button time-font",
                         width: this.constants.iconWidth,
-                            height: opts.height,
                         listeners: [{
                             eventName: BI.IconButton.EVENT_CHANGE,
                             action: function () {
@@ -194,9 +190,6 @@
                             self.triggerBtn = _ref;
                         }
                     },
-                        top: 0,
-                        right: 0
-                    }]
                 }]
             };
         },

webpack/webpack.prod.js

@@ -12,6 +12,15 @@ const common = require("./webpack.common.js");
 const attachments = require("./attachments");
 const components = require("./components");
 
+const childProcess = require('child_process');
+
+function git(command) {
+    return childProcess
+        .execSync(`git ${command}`)
+        .toString()
+        .trim();
+}
+
 module.exports = merge.smart(common, {
     mode: "production",
     entry: {
@@ -63,7 +72,11 @@ module.exports = merge.smart(common, {
                 }
             }),
             new webpack.BannerPlugin({
-                banner: `time: ${new Date().toLocaleString()}`
+                banner: `time: ${new Date().toLocaleString()}; branch: ${git(
+                    'rev-parse --abbrev-ref HEAD'
+                )} commit: ${git(
+                    'rev-parse HEAD'
+                )}`
             })
         ]
     },