Pull request #3007: 无JIAR任务 解决合并冲突

Merge in VISUAL/fineui from ~KITETOP/fineui_view:master to master

* commit '1a04b48a0d093b9a5507d2ae2453b2d904336cfa':
  REPORT-78579 fix: 调整bi.time_combo组件结构，保持结构统一
  REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开

src/widget/time/time.combo.js

@@ -60,19 +60,20 @@
                 }
             };
             return {
-                type: "bi.horizontal_fill",
-                cls: "bi-border bi-border-radius",
-                columnSize: ["fill", this.constants.iconWidth],
-                height: opts.height - 2,
-                width: opts.width - 2,
+                type: "bi.absolute",
                 items: [{
                     el: {
                         type: "bi.combo",
+                        cls: "bi-border bi-border-radius",
                         container: opts.container,
                         toggle: false,
                         isNeedAdjustHeight: opts.isNeedAdjustHeight,
                         isNeedAdjustWidth: opts.isNeedAdjustWidth,
                         el: {
+                            type: "bi.horizontal_fill",
+                            columnSize: ["fill", this.constants.iconWidth],
+                            height: opts.height - 2,
+                            items: [{
                                 type: "bi.time_trigger",
                                 height: opts.height - 2,
                                 allowEdit: opts.allowEdit,
@@ -150,6 +151,26 @@
                                         self.fireEvent("EVENT_CONFIRM");
                                     }
                                 }]
+                            }, {
+                                el: {
+                                    type: "bi.icon_button",
+                                    cls: "bi-trigger-icon-button time-font",
+                                    width: this.constants.iconWidth,
+                                    listeners: [{
+                                        eventName: BI.IconButton.EVENT_CHANGE,
+                                        action: function () {
+                                            if (self.combo.isViewVisible()) {
+                                                // self.combo.hideView();
+                                            } else {
+                                                self.combo.showView();
+                                            }
+                                        }
+                                    }],
+                                    ref: function (_ref) {
+                                        self.triggerBtn = _ref;
+                                    }
+                                },
+                            }],
                         },
                         adjustLength: this.constants.comboAdjustHeight,
                         popup: {
@@ -171,25 +192,10 @@
                             self.combo = _ref;
                         }
                     },
-                }, {
-                    el: {
-                        type: "bi.icon_button",
-                        cls: "bi-trigger-icon-button time-font",
-                        width: this.constants.iconWidth,
-                        listeners: [{
-                            eventName: BI.IconButton.EVENT_CHANGE,
-                            action: function () {
-                                if (self.combo.isViewVisible()) {
-                                    // self.combo.hideView();
-                                } else {
-                                    self.combo.showView();
-                                }
-                            }
-                        }],
-                        ref: function (_ref) {
-                            self.triggerBtn = _ref;
-                        }
-                    },
+                    top: 0,
+                    left: 0,
+                    right: 0,
+                    bottom: 0
                 }]
             };
         },