Browse Source

Merge pull request #228309 in DEC/fineui from feature/x to bugfix/11.0

* commit 'f391b3b05b2967484d6bb6d875e99b89e92e0e0c':
  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
b732e2a93d
  1. 2
      package.json
  2. 1
      src/case/button/item.singleselect.radio.js
  3. 3
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  4. 8
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

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

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

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