Merge pull request #239004 in DEC/fineui from release/11.0 to final/11.0

* commit 'dbba7f817bca466566489950c4cd1eb54d78131c': (21 commits) BI-127107 fix: 【来源PT项目】bi6.0.7，ie11浏览器过滤组件无法使用 BI-126486 fix: 分组表滚动条拖不动【样板客户】 auto upgrade version to 2.0.20230518101454 JSY-29426 fix:绑定空值时与刷新后展示不同 auto upgrade version to 2.0.20230515174710 auto upgrade version to 2.0.20230510152618 BI-126227 feat: 图标更新 auto upgrade version to 2.0.20230508171534 auto upgrade version to 2.0.20230508162556 auto upgrade version to 2.0.20230508154454 BI-126057: 图标更新 REPORT-80311 fix: 给一下默认值 auto upgrade version to 2.0.20230508111614 auto upgrade version to 2.0.20230504111630 auto upgrade version to 2.0.20230426103404 BI-124907 fix: 下拉无选项 auto upgrade version to 2.0.20230425185447 无JIRA任务 bugfix auto upgrade version to 2.0.20230418112647 auto upgrade version to 2.0.20230417193702 ...
1 year ago · 1f05d11715
5 changed files with 23 additions and 23 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20230413101426",
+  "version": "2.0.20230518101454",
  "description": "fineui",
  "main": "dist/fineui_without_conflict.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/base/collection/collection.js
+++ b/src/base/collection/collection.js
@ -345,7 +345,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
            return;
        }
        this._scrollLock = true;
-        this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
+        this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft() || scrollLeft);
        this._debounceRelease();
        this.element.scrollLeft(this.options.scrollLeft);
        this._calculateChildrenToRender();
@ -356,7 +356,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
            return;
        }
        this._scrollLock = true;
-        this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
+        this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop() || scrollTop);
        this._debounceRelease();
        this.element.scrollTop(this.options.scrollTop);
        this._calculateChildrenToRender();
--- a/src/case/combo/textvaluecombo/popup.textvalue.js
+++ b/src/case/combo/textvaluecombo/popup.textvalue.js
@ -1,4 +1,4 @@
-BI.TextValueComboPopup = BI.inherit(BI.Pane, {
+BI.TextValueComboPopup = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-text-icon-popup",
@ -15,17 +15,20 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                vgap: 5,
                items: [
                    {
-                        type: "bi.button_group",
+                        type: "bi.list_pane",
                        ref: (_ref) => {
                            this.popup = _ref;
                        },
                        items: this._formatItems(o.items),
-                        chooseType: o.chooseType,
-                        layouts: [
-                            {
-                                type: "bi.vertical"
-                            }
-                        ],
+                        el: {
+                            type: "bi.button_group",
+                            chooseType: o.chooseType,
+                            layouts: [
+                                {
+                                    type: "bi.vertical"
+                                }
+                            ],
+                        },
                        value: o.value,
                        listeners: [
                            {
@ -131,12 +134,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
        };
    },

-    beforeMount: function () {
-        if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
-            this.check();
-        }
-    },
-
    _formatItems: function (items) {
        var o = this.options;
        return BI.map(items, function (i, item) {
@ -150,7 +147,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
    },

    populate: function (items) {
-        BI.TextValueComboPopup.superclass.populate.apply(this, arguments);
        this.popup.populate(this._formatItems(items));
    },

--- a/src/core/platform/web/dom.js
+++ b/src/core/platform/web/dom.js
@ -720,7 +720,7 @@
         * 获取position:fixed相对定位的元素
         */
        getPositionRelativeContainingBlock: function (element) {
-            if (['html', 'body', '#document'].indexOf((element.nodeName || '').toLowerCase()) >= 0) {
+            if (BI.isIE() || ['html', 'body', '#document'].indexOf((element.nodeName || '').toLowerCase()) >= 0) {
                // $FlowFixMe[incompatible-return]: assume body is always available
                return element.ownerDocument.body;
            }
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@ -103,7 +103,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
            var oldValueTwo = self.valueTwo;
            var v = BI.parseFloat(this.getValue());
            self.valueTwo = v;
-            var percent = self._getPercentByValue(v);
+            var percent = self._getPercentByValue(v, true);
            var significantPercent = BI.parseFloat(percent.toFixed(1));
            self._setSliderTwoPosition(significantPercent);
            self._setBlueTrack();
@ -381,7 +381,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {

    _setBlueTrack: function () {
        var percentOne = this._getPercentByValue(this.labelOne.getValue());
-        var percentTwo = this._getPercentByValue(this.labelTwo.getValue());
+        var percentTwo = this._getPercentByValue(this.labelTwo.getValue(), true);
        if (percentOne <= percentTwo) {
            this._setBlueTrackLeft(percentOne);
            this._setBlueTrackWidth(percentTwo - percentOne);
@ -435,7 +435,11 @@ BI.IntervalSlider = BI.inherit(BI.Single, {

    },

-    _getPercentByValue: function (v) {
+    _getPercentByValue: function (v, isLast) {
+        if (this.max === this.min) {
+            return isLast ? 100 : 0;
+        }
+
        return (v - this.min) * 100 / (this.max - this.min);
    },

@ -545,7 +549,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
            if ((BI.isNumeric(this.valueOne) || BI.isNotEmptyString(this.valueOne)) && (BI.isNumeric(this.valueTwo) || BI.isNotEmptyString(this.valueTwo))) {
                this.labelOne.setValue(o.digit === false ? this.valueOne : BI.parseFloat(this.valueOne).toFixed(o.digit));
                this.labelTwo.setValue(o.digit === false ? this.valueTwo : BI.parseFloat(this.valueTwo).toFixed(o.digit));
-                this._setAllPosition(this._getPercentByValue(this.valueOne), this._getPercentByValue(this.valueTwo));
+                this._setAllPosition(this._getPercentByValue(this.valueOne), this._getPercentByValue(this.valueTwo, true));
            } else {
                this.labelOne.setValue(this.min);
                this.labelTwo.setValue(this.max);