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

* commit '5507a0d3c6b5f0598daf7074981ebea75ca4eb45':
  JSY-17840 fix: clearButton 占满高度
  无JIRA history.current 变成响应式

dist/fix/fix.js

@@ -788,53 +788,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     function defineReactive(obj, observer, shallow) {
         var props = {};
         var model = void 0;
-        // if (typeof Proxy === 'function') {
-        //     const deps = {}, childObs = {}, cache = {}
-        //     _.each(obj, function (val, key) {
-        //         if (key in $$skipArray) {
-        //             return
-        //         }
-        //         cache[key] = val
-        //         const dep = deps[key] = (observer && observer['__dep' + key]) || new Dep()
-        //         observer && (observer['__dep' + key] = dep)
-        //         childObs[key] = !shallow && observe(val, observer, key)
-        //     })
-        //     return model = new Proxy(props, {
-        //         has: function (target, key) {
-        //             return key in obj;
-        //         },
-        //         get: function (target, key) {
-        //             if (key in $$skipArray) {
-        //                 return target[key]
-        //             }
-        //             const value = cache[key]
-        //             if (Dep.target) {
-        //                 deps[key].depend()
-        //                 if (childObs[key]) {
-        //                     childObs[key].dep.depend()
-        //                     if (_.isArray(value)) {
-        //                         dependArray(value)
-        //                     }
-        //                 }
-        //             }
-        //             return value
-        //         },
-        //         set: function (target, key, newVal) {
-        //             if (key in $$skipArray) {
-        //                 return target[key] = newVal
-        //             }
-        //             const value = cache[key], dep = deps[key]
-        //             if (newVal === value || (newVal !== newVal && value !== value)) {
-        //                 return newVal
-        //             }
-        //             cache[key] = newVal
-        //             childObs[key] = !shallow && observe(newVal, observer, key)
-        //             obj[key] = childObs[key] ? childObs[key].model : newVal
-        //             notify(model, key, dep)
-        //             return obj[key]
-        //         }
-        //     })
-        // }
         _.each(obj, function (val, key) {
             if (key in $$skipArray) {
                 return;
@@ -878,6 +831,50 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         return model = createViewModel$1(obj, props);
     }
 
+    function defineReactiveProperty(obj, key, val, shallow) {
+
+        var dep = new Dep();
+
+        var configurable = isConfigurable(obj, key);
+        if (!configurable) {
+            return;
+        }
+
+        if (arguments.length === 2) {
+            val = obj[key];
+        }
+
+        var childOb = !shallow && observe(val);
+        Object.defineProperty(obj, key, {
+            enumerable: true,
+            configurable: true,
+            get: function reactiveGetter() {
+                var value = childOb ? childOb.model : val;
+                if (Dep.target) {
+                    dep.depend();
+                    if (childOb) {
+                        childOb.dep.depend();
+                        if (_.isArray(value)) {
+                            dependArray(value);
+                        }
+                    }
+                }
+                return value;
+            },
+            set: function reactiveSetter(newVal) {
+                var value = childOb ? childOb.model : val;
+                if (newVal === value || newVal !== newVal && value !== value) {
+                    return;
+                }
+
+                childOb = configurable && !shallow && observe(newVal);
+                val = newVal;
+                obj[key] = childOb ? childOb.model : newVal;
+                dep.notify();
+            }
+        });
+    }
+
     /**
      * Set a property on an object. Adds the new property and
      * triggers change notification if the property doesn't
@@ -1522,6 +1519,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     exports.observe = observe;
     exports.notify = notify;
     exports.defineReactive = defineReactive;
+    exports.defineReactiveProperty = defineReactiveProperty;
     exports.set = set;
     exports.freeze = freeze;
     exports.del = del;

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -28,7 +28,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-focus-shadow",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
             height: height,

src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@@ -86,6 +86,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
                                     stopPropagation: true,
                                     invisible: !BI.isNotEmptyString(stateText),
                                     width: o.height,
+                                    height: o.height,
                                     handler: function () {
                                         self.fireEvent(BI.SearchTextValueTrigger.EVENT_CLEAR);
                                     },

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -7,7 +7,7 @@
 BI.TextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
             text: "",

src/case/trigger/trigger.text.js

@@ -73,6 +73,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
                                     cls: "close-h-font " + (o.allowClear ? "clear-button" : ""),
                                     stopPropagation: true,
                                     width: o.triggerWidth || o.height,
+                                    height: o.height,
                                     invisible: !BI.isNotEmptyString(o.text),
                                     handler: function () {
                                         self.fireEvent(BI.TextTrigger.EVENT_CLEAR);

src/less/base/combo/combo.searchtextvalue.less

@@ -1,33 +1,19 @@
 @import "../../index.less";
-@val: transform .3s ease;
+
 .bi-search-text-value-combo {
   & .trigger-icon-button {
     font-size: 16px;
   }
-  & .search-text-value-trigger{
-    .border-radius(2px);
-  }
+
   &.combo-error {
     & .bi-search-text-value-trigger {
       & .bi-text-button {
         color: @color-bi-text-error-hover-search-text-value-combo;
       }
     }
-    &>.bi-border, &>.bi-border-bottom {
+
+    &.bi-border, &.bi-border-bottom {
       border-color: @border-color-negative;
     }
   }
-  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-    & .x-icon {
-      .rotate(180deg);
-      .transition(@val);
-    }
-  }
-  & .bi-combo + .bi-trigger-icon-button {
-    & .x-icon {
-      .rotate(0deg);
-      .transition(@val);
-    }
-  }
 }

src/router/router.js

@@ -3130,6 +3130,7 @@
           routes: this.options.routes,
           base: this.options.base,
         });
+        Fix.defineReactiveProperty(BI.Router.$router.history, "current");
         this.$router.beforeEach(function (to, from, next) {
           if (to.matched.length === 0) {
             //如果上级也未匹配到路由则跳转主页面，如果上级能匹配到则转上级路由