Browse Source

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

* commit 'b1a6fe31154649db48eaffc23a35751e450693fa':
  REPORT-92800 fix:FR11样式-控件-yyyy-MM格式的日期控件,无法选中2月份
  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主题模型】主题模型升级后明细过滤复制字段太多前端卡顿
  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
5b75128288
  1. 7
      package.json
  2. 1
      src/case/button/item.singleselect.radio.js
  3. 3
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  4. 2
      src/core/2.base.js
  5. 12
      src/core/utils/events/mousemovetracker.js
  6. 8
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

7
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20230227095536", "version": "2.0.20230314171452",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",
@ -9,7 +9,7 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.17.4", "@babel/core": "^7.17.4",
"@fui/babel-preset-fineui": "^3.0.0", "@fui/babel-preset-fineui": "3.0.1",
"@fui/eslint-plugin": "^1.0.19", "@fui/eslint-plugin": "^1.0.19",
"@types/node": "15.6.1", "@types/node": "15.6.1",
"@typescript-eslint/eslint-plugin": "2.33.0", "@typescript-eslint/eslint-plugin": "2.33.0",
@ -18,7 +18,7 @@
"babel-loader": "8.0.6", "babel-loader": "8.0.6",
"chai": "4.2.0", "chai": "4.2.0",
"concat": "1.0.3", "concat": "1.0.3",
"core-js": "3.3.2", "core-js": "3.29.1",
"cross-env": "6.0.0", "cross-env": "6.0.0",
"css-loader": "3.0.0", "css-loader": "3.0.0",
"es6-promise": "4.2.8", "es6-promise": "4.2.8",
@ -43,7 +43,6 @@
"optimize-css-assets-webpack-plugin": "5.0.3", "optimize-css-assets-webpack-plugin": "5.0.3",
"postcss-loader": "3.0.0", "postcss-loader": "3.0.0",
"postcss-simple-vars": "5.0.2", "postcss-simple-vars": "5.0.2",
"puppeteer": "^13.3.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"source-map-loader": "0.2.4", "source-map-loader": "0.2.4",

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

@ -25,6 +25,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
type: "bi.center_adapt", type: "bi.center_adapt",
items: [{ items: [{
type: "bi.radio", type: "bi.radio",
once: o.once,
ref: function (_ref) { ref: function (_ref) {
self.radio = _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, items: o.items,
height: BI.toPix(o.height, 2), height: BI.toPix(o.height, 2),
text: o.text, text: o.text,
value: o.value value: o.value,
defaultText: o.defaultText
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",

2
src/core/2.base.js

@ -1130,7 +1130,7 @@
m = today.getMonth(); m = today.getMonth();
} }
if (isNaN(d)) { if (isNaN(d)) {
d = today.getDate(); d = Math.min(BI.getMonthDays(BI.getDate(y, m)), today.getDate());
} }
if (isNaN(hr)) { if (isNaN(hr)) {
hr = today.getHours(); hr = today.getHours();

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

@ -82,7 +82,7 @@
// The mouse may move faster then the animation frame does. // The mouse may move faster then the animation frame does.
// Use `requestAnimationFrame` to avoid over-updating. // Use `requestAnimationFrame` to avoid over-updating.
this._animationFrameID = this._animationFrameID =
requestAnimationFrame(this._didMouseMove); requestAnimationFrame(() => this._didMouseMove(event));
} }
this._x = x; this._x = x;
@ -90,18 +90,18 @@
event.preventDefault ? event.preventDefault() : (event.returnValue = false); event.preventDefault ? event.preventDefault() : (event.returnValue = false);
}, },
_didMouseMove: function () { _didMouseMove: function (event) {
this._animationFrameID = null; this._animationFrameID = null;
this._onMove(this._deltaX, this._deltaY); this._onMove(this._deltaX, this._deltaY, event);
this._deltaX = 0; this._deltaX = 0;
this._deltaY = 0; this._deltaY = 0;
}, },
_onMouseUp: function () { _onMouseUp: function (event) {
if (this._animationFrameID) { 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 () { props: function () {
return { return {
baseCls: "bi-date-time-select", 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, width: 60,
height: o.height, height: o.editorHeight,
} }
}, { }, {
type: "bi.label", type: "bi.label",
@ -82,7 +82,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
} }
}], }],
width: 60, width: 60,
height: o.height, height: o.editorHeight,
}, { }, {
type: "bi.label", type: "bi.label",
text: ":", text: ":",
@ -111,7 +111,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
} }
}], }],
width: 60, width: 60,
height: o.height, height: o.editorHeight,
}] }]
}] }]
}; };

Loading…
Cancel
Save