fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit '1f05d117155e854661e882e4a7b0f5d099a3976f': (22 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
  BI-126352 fix: 仪表板预览空白
  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
  ...
research/test
superman 1 year ago
parent
47d1e2dca2 1f05d11715
commit
0fefab4a81
6 changed files with 53 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      dist/fix/fix.js
  2. 2
      package.json
  3. 4
      src/base/collection/collection.js
  4. 26
      src/case/combo/textvaluecombo/popup.textvalue.js
  5. 2
      src/core/platform/web/dom.js
  6. 12
      src/widget/intervalslider/intervalslider.js

46
dist/fix/fix.js vendored
Unescape View File

@ -919,23 +919,27 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return m;
} : parsePath(exp);
var v = getter.call(model, model);
var _dep = new Dep();
if (isGlobal) {
(v.__ob__._scopeDeps || (v.__ob__._scopeDeps = [])).push(_dep);
} else {
(v.__ob__._deps || (v.__ob__._deps = [])).push(_dep);
if (v.__ob__) {
var _dep = new Dep();
if (isGlobal) {
(v.__ob__._scopeDeps || (v.__ob__._scopeDeps = [])).push(_dep);
} else {
(v.__ob__._deps || (v.__ob__._deps = [])).push(_dep);
}
var _w = new Watcher(model, function () {
_dep.depend();
return NaN;
}, function (newValue, oldValue, attrs) {
callback(i, newValue, oldValue, BI._.extend({ index: i }, attrs));
}, options);
watchers.push(function unwatchFn() {
_w.teardown();
v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, _dep);
v.__ob__._deps && remove(v.__ob__._deps, _dep);
});
}
var _w = new Watcher(model, function () {
_dep.depend();
return NaN;
}, function (newValue, oldValue, attrs) {
callback(i, newValue, oldValue, BI._.extend({ index: i }, attrs));
}, options);
watchers.push(function unwatchFn() {
_w.teardown();
v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, _dep);
v.__ob__._deps && remove(v.__ob__._deps, _dep);
});
return;
}
// **.a.**的情况，场景：a.b.c, 如果用b.**监听, a被重新赋值b上的_scopeDes就不存在了
@ -943,6 +947,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
//先获取到能获取到的对象
var _paths = exp.split(".");
var _currentModel = model[_paths[1]];
if (!_currentModel.__ob__) {
return;
}
exp = _paths[1] + ".**";
//补全路径
var _parent = _currentModel.__ob__.parent,
@ -993,6 +1002,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
currentModel = model[paths[_i]];
}
if (!currentModel.__ob__) {
return;
}
exp = exp.substr(exp.indexOf("*"));
//补全路径
var parent = currentModel.__ob__.parent,

2
package.json
Unescape View File

@ -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",

4
src/base/collection/collection.js
Unescape View File

@ -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();

26
src/case/combo/textvaluecombo/popup.textvalue.js
Unescape View File

@ -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));
},

2
src/core/platform/web/dom.js
Unescape View File

@ -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;
}

12
src/widget/intervalslider/intervalslider.js
Unescape View File

@ -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);

Write Preview
Loading…
Cancel
Save