Browse Source

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

* commit 'c849674bbecf6045e84bd1824ef2d201416755fe':
  KERNEL-14365 refactor(tracker): 多暴露个event对象
  auto upgrade version to 2.0.20230314171452
  auto upgrade version to 2.0.20230314161821
  auto upgrade version to 2.0.20230314150956
  BI-123240 fix: 【6.0.7crm主题模型】主题模型升级后明细过滤复制字段太多前端卡顿
  无jira任务 fix:单选按钮设置once后不触发事件但是依然可以取消选中
  auto upgrade version to 2.0.20230310171548
  auto upgrade version to 2.0.20230309140610
  REPORT-90850 fix:修改属性名,防止与父组件高度冲突
  REPORT-89705 feat:传defaultText
  auto upgrade version to 2.0.20230303154526
  auto upgrade version to 2.0.20230302140341
  无JIRA任务 es6写法
  JSY-27224 性能
  auto upgrade version to 2.0.20230302104808
  auto upgrade version to 2.0.20230227200417
research/test
superman 2 years ago
parent
commit
c0ff66462e
  1. 2
      package.json
  2. 1
      src/case/button/item.singleselect.radio.js
  3. 3
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  4. 12
      src/core/utils/events/mousemovetracker.js
  5. 8
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20230227095536",
"version": "2.0.20230314171452",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",

1
src/case/button/item.singleselect.radio.js

@ -25,6 +25,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
type: "bi.center_adapt",
items: [{
type: "bi.radio",
once: o.once,
ref: function (_ref) {
self.radio = _ref;
},

3
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@ -29,7 +29,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
items: o.items,
height: BI.toPix(o.height, 2),
text: o.text,
value: o.value
value: o.value,
defaultText: o.defaultText
});
this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup",

12
src/core/utils/events/mousemovetracker.js

@ -82,7 +82,7 @@
// The mouse may move faster then the animation frame does.
// Use `requestAnimationFrame` to avoid over-updating.
this._animationFrameID =
requestAnimationFrame(this._didMouseMove);
requestAnimationFrame(() => this._didMouseMove(event));
}
this._x = x;
@ -90,18 +90,18 @@
event.preventDefault ? event.preventDefault() : (event.returnValue = false);
},
_didMouseMove: function () {
_didMouseMove: function (event) {
this._animationFrameID = null;
this._onMove(this._deltaX, this._deltaY);
this._onMove(this._deltaX, this._deltaY, event);
this._deltaX = 0;
this._deltaY = 0;
},
_onMouseUp: function () {
_onMouseUp: function (event) {
if (this._animationFrameID) {
this._didMouseMove();
this._didMouseMove(event);
}
this._onMoveEnd();
this._onMoveEnd(event);
}
};
})();

8
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -3,7 +3,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
props: function () {
return {
baseCls: "bi-date-time-select",
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
editorHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
};
},
@ -46,7 +46,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: o.height,
height: o.editorHeight,
}
}, {
type: "bi.label",
@ -82,7 +82,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: o.height,
height: o.editorHeight,
}, {
type: "bi.label",
text: ":",
@ -111,7 +111,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: o.height,
height: o.editorHeight,
}]
}]
};

Loading…
Cancel
Save