Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui

es6
iapyang 3 years ago
parent
commit
aee902c609
  1. 3
      changelog.md
  2. 2
      dist/2.0/fineui.css
  3. 5
      dist/2.0/fineui.ie.min.js
  4. 30
      dist/2.0/fineui.ie.min.js.LICENSE.txt
  5. 2
      dist/2.0/fineui.ie.min.js.map
  6. 6352
      dist/2.0/fineui.js
  7. 2
      dist/2.0/fineui.js.map
  8. 2
      dist/2.0/fineui.min.css
  9. 5
      dist/2.0/fineui.min.js
  10. 38
      dist/2.0/fineui.min.js.LICENSE.txt
  11. 2
      dist/2.0/fineui.min.js.map
  12. 2
      dist/2.0/fineui_without_normalize.css
  13. 2
      dist/2.0/fineui_without_normalize.min.css
  14. 2
      dist/core.css
  15. 5570
      dist/core.js
  16. 2
      dist/core.js.map
  17. 2
      dist/demo.css
  18. 6778
      dist/demo.js
  19. 2
      dist/demo.js.map
  20. 2
      dist/fineui.css
  21. 5
      dist/fineui.ie.min.js
  22. 30
      dist/fineui.ie.min.js.LICENSE.txt
  23. 2
      dist/fineui.ie.min.js.map
  24. 5598
      dist/fineui.js
  25. 2
      dist/fineui.js.map
  26. 2
      dist/fineui.min.css
  27. 5
      dist/fineui.min.js
  28. 38
      dist/fineui.min.js.LICENSE.txt
  29. 2
      dist/fineui.min.js.map
  30. 2
      dist/fineui.proxy.css
  31. 4890
      dist/fineui.proxy.js
  32. 2
      dist/fineui.proxy.js.map
  33. 2
      dist/fineui.proxy.min.css
  34. 5
      dist/fineui.proxy.min.js
  35. 30
      dist/fineui.proxy.min.js.LICENSE.txt
  36. 2
      dist/fineui.proxy.min.js.map
  37. 1618
      dist/fineui_without_jquery_polyfill.js
  38. 2
      dist/fineui_without_jquery_polyfill.js.map
  39. 2
      dist/font.css
  40. 4
      dist/lib/case/trigger/trigger.text.select.d.ts
  41. 2
      dist/lib/core/decorator/decorator.d.ts
  42. 2
      dist/lib/shims-tsx.d.ts
  43. 2
      dist/resource.css
  44. 14
      dist/utils.js
  45. 2
      dist/utils.js.map
  46. 4
      dist/utils.min.js
  47. 2
      dist/utils.min.js.map
  48. 4
      package.json
  49. 6
      src/case/calendar/calendar.js
  50. 4
      src/case/calendar/calendar.year.js
  51. 4
      src/case/combo/iconcombo/popup.iconcombo.js
  52. 6
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  53. 4
      src/case/combo/textvaluecombo/popup.textvalue.js
  54. 2
      src/case/layer/layer.multipopup.js
  55. 2
      src/case/ztree/1.asynctree.js
  56. 9
      src/core/platform/web/config.js
  57. 39
      src/core/system.js
  58. 16
      src/core/wrapper/layout/adapt/adapt.table.js
  59. 4
      src/core/wrapper/layout/flex/flex.horizontal.js
  60. 4
      src/core/wrapper/layout/flex/flex.vertical.js
  61. 4
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  62. 4
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  63. 30
      src/core/wrapper/layout/layout.td.js
  64. 19
      src/router/router2.js
  65. 4
      src/widget/date/calendar/popup.month.js
  66. 2
      src/widget/downlist/item.downlist.js
  67. 2
      src/widget/downlist/popup.downlist.js
  68. 4
      src/widget/dynamicdate/dynamicdate.card.js
  69. 26
      src/widget/dynamicdate/dynamicdate.param.item.js
  70. 9
      src/widget/dynamicdate/dynamicdate.popup.js
  71. 8
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  72. 6
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  73. 2
      src/widget/multiselect/multiselect.combo.js
  74. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  75. 2
      src/widget/multiselect/multiselect.insert.combo.js
  76. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  77. 4
      src/widget/multiselect/multiselect.loader.js
  78. 4
      src/widget/multiselect/multiselect.loader.nobar.js
  79. 2
      src/widget/multiselect/multiselect.popup.view.js
  80. 2
      src/widget/multiselect/multiselect.popup.view.nobar.js
  81. 4
      src/widget/multiselect/search/multiselect.search.insert.pane.js
  82. 2
      src/widget/multiselect/search/multiselect.search.loader.js
  83. 10
      src/widget/multiselectlist/multiselectlist.insert.js
  84. 2
      src/widget/multiselectlist/multiselectlist.insert.nobar.js
  85. 2
      src/widget/multiselectlist/multiselectlist.js
  86. 2
      src/widget/year/card.dynamic.year.js
  87. 9
      src/widget/year/popup.year.js
  88. 2
      src/widget/yearmonth/card.dynamic.yearmonth.js
  89. 4
      src/widget/yearmonth/card.static.yearmonth.js
  90. 9
      src/widget/yearmonth/popup.yearmonth.js
  91. 2
      src/widget/yearquarter/card.dynamic.yearquarter.js
  92. 2
      src/widget/yearquarter/card.static.yearquarter.js
  93. 8
      src/widget/yearquarter/popup.yearquarter.js
  94. 5
      typescript/case/trigger/trigger.text.select.ts
  95. 2
      typescript/core/decorator/decorator.ts
  96. 2
      typescript/shims-tsx.ts

3
changelog.md

@ -1,4 +1,7 @@
# 更新日志
2.0(2021-07)
- 修复了树控件节点未初始化时调用树的getValue始终为空的问题
2.0(2021-05)
- 支持搜索的控件支持搜索包含空格的字符串
- 解决了树列表populate调用两次itemsCreator的问题

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

5
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/2.0/fineui.ie.min.js.LICENSE.txt vendored

@ -0,0 +1,30 @@
/*!
* vue-router v3.5.2
* (c) 2021 Evan You
* @license MIT
*/
/*!
* Sizzle CSS Selector Engine v2.2.1
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-10-17
*/
/*!
* jQuery JavaScript Library v1.12.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*/

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

6352
dist/2.0/fineui.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

5
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

38
dist/2.0/fineui.min.js.LICENSE.txt vendored

@ -0,0 +1,38 @@
/*!
* vue-router v3.5.2
* (c) 2021 Evan You
* @license MIT
*/
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.8+1e68dce6
*/
/*!
* Sizzle CSS Selector Engine v2.2.1
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-10-17
*/
/*!
* jQuery JavaScript Library v1.12.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*/

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

5570
dist/core.js vendored

File diff suppressed because it is too large Load Diff

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

6778
dist/demo.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/fineui.ie.min.js.LICENSE.txt vendored

@ -0,0 +1,30 @@
/*!
* vue-router v3.5.2
* (c) 2021 Evan You
* @license MIT
*/
/*!
* Sizzle CSS Selector Engine v2.2.1
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-10-17
*/
/*!
* jQuery JavaScript Library v1.12.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*/

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

5598
dist/fineui.js vendored

File diff suppressed because it is too large Load Diff

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

38
dist/fineui.min.js.LICENSE.txt vendored

@ -0,0 +1,38 @@
/*!
* vue-router v3.5.2
* (c) 2021 Evan You
* @license MIT
*/
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.8+1e68dce6
*/
/*!
* Sizzle CSS Selector Engine v2.2.1
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-10-17
*/
/*!
* jQuery JavaScript Library v1.12.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*/

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.css vendored

File diff suppressed because one or more lines are too long

4890
dist/fineui.proxy.js vendored

File diff suppressed because it is too large Load Diff

2
dist/fineui.proxy.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.css vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.proxy.min.js vendored

File diff suppressed because one or more lines are too long

30
dist/fineui.proxy.min.js.LICENSE.txt vendored

@ -0,0 +1,30 @@
/*!
* vue-router v3.5.2
* (c) 2021 Evan You
* @license MIT
*/
/*!
* Sizzle CSS Selector Engine v2.2.1
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2015-10-17
*/
/*!
* jQuery JavaScript Library v1.12.4
* http://jquery.com/
*
* Includes Sizzle.js
* http://sizzlejs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-05-20T17:17Z
*/

2
dist/fineui.proxy.min.js.map vendored

File diff suppressed because one or more lines are too long

1618
dist/fineui_without_jquery_polyfill.js vendored

File diff suppressed because it is too large Load Diff

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

4
dist/lib/case/trigger/trigger.text.select.d.ts vendored

@ -1,4 +1,8 @@
import { Trigger } from "../../base/single/trigger/trigger";
export declare class SelectTextTrigger extends Trigger {
static xtype: string;
props: {
items: any[];
text: string | Function;
} & Trigger['props'];
}

2
dist/lib/core/decorator/decorator.d.ts vendored

@ -78,7 +78,7 @@ export declare class Model<U extends {
context: U["context"];
actions: {
[key: string]: (...args: any[]) => any;
};
} | {};
childContext: ReadonlyArray<keyof (this["computed"] & ReturnType<this["state"]>)>;
TYPE: Pick<{
[key in keyof this["computed"]]: ReturnType<this["computed"][key]>;

2
dist/lib/shims-tsx.d.ts vendored

@ -40,7 +40,7 @@ interface ElementClassProps<T> extends UIProps {
$testId: string;
$point: any;
$value: any;
$scope: () => any;
$scope: any;
beforeRender(callback: () => void): void;
beforeInit(callback: () => void): void;
render(): any;

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

14
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-6-25 17:40:18 */
/*! time: 2021-7-4 12:01:21 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,7 +82,7 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1266);
/******/ return __webpack_require__(__webpack_require__.s = 1268);
/******/ })
/************************************************************************/
/******/ ({
@ -2927,7 +2927,7 @@ BI.Req = {
/***/ }),
/***/ 1124:
/***/ 1126:
/***/ (function(module, exports) {
BI.i18n = {
@ -3132,7 +3132,7 @@ BI.i18n = {
/***/ }),
/***/ 1266:
/***/ 1268:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(91);
@ -3151,8 +3151,8 @@ __webpack_require__(97);
__webpack_require__(98);
__webpack_require__(108);
__webpack_require__(109);
__webpack_require__(1124);
__webpack_require__(1267);
__webpack_require__(1126);
__webpack_require__(1269);
__webpack_require__(110);
__webpack_require__(111);
module.exports = __webpack_require__(112);
@ -3160,7 +3160,7 @@ module.exports = __webpack_require__(112);
/***/ }),
/***/ 1267:
/***/ 1269:
/***/ (function(module, exports) {
/**

2
dist/utils.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map vendored

File diff suppressed because one or more lines are too long

4
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20210625174121",
"version": "2.0.20210704120348",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",
@ -77,4 +77,4 @@
},
"author": "fanruan",
"license": "MIT"
}
}

6
src/case/calendar/calendar.js

@ -78,7 +78,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
var items = BI.map(this._getWeekLabel(), function (i, value) {
return {
type: "bi.label",
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
text: value
};
});
@ -100,7 +100,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
columns: 7,
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
vgap: 10
}))]
});
@ -159,7 +159,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 5,

4
src/case/calendar/calendar.year.js

@ -51,7 +51,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 24
rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
})), {
type: "bi.center_adapt",
vgap: 1
@ -110,7 +110,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
width: 45,
value: td.text,
disabled: td.disabled

4
src/case/combo/iconcombo/popup.iconcombo.js

@ -19,7 +19,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
type: "bi.button_group",
items: BI.createItems(o.items, {
type: "bi.single_select_icon_text_item",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}),
chooseType: o.chooseType,
layouts: [{
@ -47,7 +47,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.IconComboPopup.superclass.populate.apply(this, arguments);
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
this.popup.populate(items);
},

6
src/case/combo/icontextvaluecombo/popup.icontextvalue.js

@ -20,7 +20,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.button_group",
items: BI.createItems(o.items, {
type: "bi.single_select_icon_text_item",
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
@ -55,10 +55,10 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
var o = this.options;
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
iconWidth: o.iconWidth,
});
this.popup.populate(items, keyword);
},

4
src/case/combo/textvaluecombo/popup.textvalue.js

@ -14,7 +14,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
items: BI.createItems(o.items, {
type: "bi.single_select_item",
textAlign: o.textAlign,
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}),
chooseType: o.chooseType,
layouts: [{
@ -43,7 +43,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
BI.TextValueComboPopup.superclass.populate.apply(this, arguments);
items = BI.createItems(items, {
type: "bi.single_select_item",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
this.popup.populate(items);
},

2
src/case/layer/layer.multipopup.js

@ -31,7 +31,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({
type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
items: BI.createItems(text, {
type: "bi.text_button",
once: false,

2
src/case/ztree/1.asynctree.js

@ -219,7 +219,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
_getJoinValue: function () {
if (!this.nodes) {
return {};
return this.options.paras.selectedValues || {};
}
var checkedValues = this._getSelectedValues();
if (BI.isEmpty(checkedValues)) {

9
src/core/platform/web/config.js

@ -27,6 +27,15 @@ BI.prepares.push(function () {
scrollx: true
}, ob, {type: "bi.inline"});
});
BI.Plugin.configWidget("bi.inline", function (ob) {
// 当列宽既需要自动列宽又需要自适应列宽时,inline布局也处理不了了,降级table处理吧
if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
return BI.extend({
horizontalAlign: BI.HorizontalAlign.Stretch
}, ob, {type: "bi.table_adapt"});
}
return ob;
});
BI.Plugin.configWidget("bi.center_adapt", function (ob) {
var supportFlex = isSupportFlex();
// var isAdapt = !ob.horizontalAlign || ob.horizontalAlign === BI.HorizontalAlign.Center || ob.horizontalAlign === BI.HorizontalAlign.Stretch;

39
src/core/system.js

@ -0,0 +1,39 @@
/**
* @author windy
* @version 2.0
* Created by windy on 2021/6/30
*/
// 系统参数常量
!(function () {
var system = {
size: { // 尺寸
TOOL_BAR_HEIGHT: 24,
LIST_ITEM_HEIGHT: 24,
TRIGGER_HEIGHT: 24,
},
};
var provider = function () {
this.SYSTEM = system;
this.setSize = function (opt) {
BI.deepExtend(system, { size: opt });
};
this.$get = function () {
return BI.inherit(BI.OB, {
getSize: function () {
return system.size;
},
});
};
};
BI.provider("bi.provider.system", provider);
})();
BI.prepares.push(function () {
BI.SIZE_CONSANTS = BI.Providers.getProvider('bi.provider.system').getSize();
});

16
src/core/wrapper/layout/adapt/adapt.table.js

@ -33,8 +33,16 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) {
var o = this.options;
var td;
var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] < 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
var td, width = "";
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
if (columnSize > 0) {
width = columnSize < 1 ?
((columnSize * 100).toFixed(1) + "%")
: (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
}
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
width = 2;
}
if (!this.hasWidget(this._getChildName(i))) {
var w = BI._lazyCreateWidget(item);
w.element.css({position: "relative", top: "0", left: "0", margin: "0px auto"});
@ -52,7 +60,9 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
// 3、多百分比宽度就算了
td.element.css({"max-width": BI.isNumber(o.columnSize[i]) ? (o.columnSize[i] < 1 ? width : width / BI.pixRatio + BI.pixUnit) : width});
if (columnSize > 0) {
td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
}
if (i === 0) {
td.element.addClass("first-element");
}

4
src/core/wrapper/layout/flex/flex.horizontal.js

@ -53,6 +53,10 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-s-n");
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
w.element.addClass("f-s-n");
}
} else {
w.element.addClass("f-s-n");
}

4
src/core/wrapper/layout/flex/flex.vertical.js

@ -52,6 +52,10 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-s-n");
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
w.element.addClass("f-s-n");
}
} else {
w.element.addClass("f-s-n");
}

4
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@ -49,6 +49,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-s-n");
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
w.element.addClass("f-s-n");
}
} else {
w.element.addClass("f-s-n");
}

4
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@ -49,6 +49,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
w.element.addClass("f-s-n");
}
}
// 当既有动态宽度和自适应宽度的时候只压缩自适应
if (rowSize === "" && o.rowSize.indexOf("fill") >= 0) {
w.element.addClass("f-s-n");
}
} else {
w.element.addClass("f-s-n");
}

30
src/core/wrapper/layout/layout.td.js

@ -8,7 +8,9 @@ BI.TdLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TdLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-td",
columnSize: [],
rowSize: [],
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Stretch,
hgap: 0,
vgap: 0,
tgap: 0,
@ -20,10 +22,11 @@ BI.TdLayout = BI.inherit(BI.Layout, {
},
render: function () {
BI.TdLayout.superclass.render.apply(this, arguments);
var self = this, o = this.options;
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative",
width: "100%",
height: "100%",
width: (o.horizontalAlign === BI.HorizontalAlign.Center || o.horizontalAlign === BI.HorizontalAlign.Stretch) ? "100%" : "auto",
height: (o.verticalAlign !== BI.VerticalAlign.Top) ? "100%" : "auto",
"border-spacing": "0px",
border: "none",
"border-collapse": "separate"
@ -72,9 +75,15 @@ BI.TdLayout = BI.inherit(BI.Layout, {
}
}
var height = o.rowSize[idx] === "" ? "" : (o.rowSize[idx] < 1 ? ((o.rowSize[idx] * 100).toFixed(1) + "%") : o.rowSize[idx]);
var tr = BI._lazyCreateWidget({
type: "bi.default",
tagName: "tr"
tagName: "tr",
height: height,
css: {
"max-height": BI.isNumber(o.rowSize[idx]) ? (o.rowSize[idx] <= 1 ? height : height / BI.pixRatio + BI.pixUnit) : height
}
});
for (var i = 0; i < arr.length; i++) {
@ -102,7 +111,16 @@ BI.TdLayout = BI.inherit(BI.Layout, {
});
}
first(w, this.rows++, i);
var width = o.columnSize[i] === "" ? "" : (o.columnSize[i] < 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap + o.columnSize[i]);
var width = "";
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
if (columnSize > 0) {
width = columnSize < 1 ?
((columnSize * 100).toFixed(1) + "%")
: (columnSize + (i === 0 ? o.hgap : 0) + o.hgap + o.lgap + o.rgap);
}
if (columnSize === "" && o.columnSize.indexOf("fill") >= 0) {
width = 2;
}
var td = BI._lazyCreateWidget({
type: "bi.default",
width: width,
@ -113,8 +131,10 @@ BI.TdLayout = BI.inherit(BI.Layout, {
// 1、由于直接对td设置最大宽度是在规范中未定义的, 所以要使用类似td:firstChild来迂回实现
// 2、不能给多个td设置最大宽度,这样只会平分宽度
// 3、多百分比宽度就算了
if (columnSize > 0) {
td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
}
td.element.css({
"max-width": BI.isNumber(o.columnSize[i]) ? (o.columnSize[i] <= 1 ? width : width / BI.pixRatio + BI.pixUnit) : width,
position: "relative",
"vertical-align": o.verticalAlign,
margin: "0",

19
src/router/router2.js

@ -3125,7 +3125,6 @@
var $router, cbs = [];
var RouterWidget = BI.inherit(BI.Widget, {
init: function () {
this._routerRoot = this;
this._router = $router = new VueRouter({
routes: this.options.routes
});
@ -3138,14 +3137,17 @@
BI.shortcut("bi.router", RouterWidget);
var RouterView = BI.inherit(BI.Widget, {
props: {
deps: 0
},
created: function () {
var self = this;
cbs.push(function () {
self.tab.setSelect($router.history.current.matched[0].path || "/");
var self = this, o = this.options;
cbs.push(this._callbackListener = function () {
self.tab.setSelect($router.history.current.matched[o.deps].path || "/");
});
},
render: function () {
var self = this;
var self = this, o = this.options;
return {
type: "bi.tab",
ref: function (_ref) {
@ -3157,13 +3159,16 @@
},
showIndex: false,
cardCreator: function (v) {
return $router.history.current.matched[0].components.default;
return $router.history.current.matched[o.deps].components.default;
}
};
},
destroyed: function () {
BI.remove(cbs, this._callbackListener);
}
});
BI.shortcut("bi.router_view", RouterView);
return VueRouter;
})));
})));

4
src/widget/date/calendar/popup.month.js

@ -31,7 +31,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
})), {
type: "bi.center_adapt",
vgap: 1,
@ -68,7 +68,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
whiteSpace: "nowrap",
once: false,
forceSelected: true,
height: 23,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT - 1,
width: 38,
value: td,
text: td,

2
src/widget/downlist/item.downlist.js

@ -4,7 +4,7 @@ BI.DownListItem = BI.inherit(BI.BasicButton, {
return BI.extend(conf, {
baseCls: "bi-down-list-item bi-list-item-active",
cls: "",
height: 24,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
logic: {
dynamic: true
},

2
src/widget/downlist/popup.downlist.js

@ -98,7 +98,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.logic = {
dynamic: true
};
item.el.height = item.el.height || self.constants.height;
item.el.height = item.el.height || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT;
item.el.iconCls2 = self.constants.nextIcon;
item.popup = {
lgap: 1,

4
src/widget/dynamicdate/dynamicdate.card.js

@ -166,7 +166,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
comboItems[0].text = BI.i18nText("BI-Basic_Empty");
items.push({
type: "bi.text_value_combo",
height: 24,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
items: comboItems,
container: null,
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,
@ -183,7 +183,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
if(values.length !== 0 && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.DAY && BI.last(values).dateType !== BI.DynamicDateCard.TYPE.WORK_DAY) {
items.push({
type: "bi.text_value_combo",
height: 24,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
container: null,
items: this._getText(BI.last(values).dateType),
value: positionValue || BI.DynamicDateCard.OFFSET.CURRENT,

26
src/widget/dynamicdate/dynamicdate.param.item.js

@ -1,14 +1,16 @@
BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-param-item",
dateType: BI.DynamicDateCard.TYPE.YEAR,
validationChecker: function() {
return true;
},
value: 0,
offset: 0,
height: 24
props: function() {
return {
baseCls: "bi-dynamic-date-param-item",
dateType: BI.DynamicDateCard.TYPE.YEAR,
validationChecker: function() {
return true;
},
value: 0,
offset: 0,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
}
},
render: function () {
@ -19,7 +21,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
el: {
type: "bi.sign_editor",
cls: "bi-border",
height: 22,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 2,
validationChecker: function (v) {
return BI.isNaturalNumber(v);
},
@ -47,13 +49,13 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
}, {
el: {
type: "bi.label",
height: 24,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
text: this._getText()
},
width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
}, {
type: "bi.text_value_combo",
height: 24,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
items: [{
text: BI.i18nText("BI-Basic_Front"),
value: 0

9
src/widget/dynamicdate/dynamicdate.popup.js

@ -1,7 +1,6 @@
BI.DynamicDatePopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -27,7 +26,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
@ -38,7 +37,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
text: BI.i18nText("BI-Multi_Date_Today"),
disabled: this._checkTodayValid(),
ref: function () {
@ -53,7 +52,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -68,7 +67,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}
}]
}]],
height: 24
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT
},
}]
});

8
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -25,7 +25,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
cls: "bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -37,7 +37,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"),
disabled: this._checkTodayValid(),
@ -53,7 +53,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -63,7 +63,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}
}]
}]],
height: 24
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT
}
}]
});

6
src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -41,7 +41,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}
}, {
type: "bi.label",
@ -77,7 +77,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}, {
type: "bi.label",
text: ":",
@ -106,7 +106,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, {
}
}],
width: 60,
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
}]
}]
};

2
src/widget/multiselect/multiselect.combo.js

@ -10,7 +10,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
baseCls: "bi-multi-select-combo",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
height: 24,
allowEdit: true
});

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -10,7 +10,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
baseCls: "bi-multi-select-combo-no-bar",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
height: 24,
});
},

2
src/widget/multiselect/multiselect.insert.combo.js

@ -11,7 +11,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
height: 24,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
allowEdit: true
});
},

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -10,7 +10,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
baseCls: "bi-multi-select-insert-combo-no-bar",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
itemsHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
height: 24,
});
},

4
src/widget/multiselect/multiselect.loader.js

@ -18,7 +18,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
valueFormatter: BI.emptyFn,
itemsCreator: BI.emptyFn,
onLoaded: BI.emptyFn,
itemHeight: 24
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
},
@ -126,7 +126,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
type: "bi.multi_select_item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: this.options.itemHeight,
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
selected: this.isAllSelected(),
iconWrapperWidth: 36
});

4
src/widget/multiselect/multiselect.loader.nobar.js

@ -17,7 +17,7 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
},
valueFormatter: BI.emptyFn,
itemsCreator: BI.emptyFn,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
onLoaded: BI.emptyFn
});
},
@ -117,7 +117,7 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
type: "bi.multi_select_item",
cls: "bi-list-item-active",
logic: this.options.logic,
height: this.options.itemHeight,
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconWrapperWidth: 36
});
},

2
src/widget/multiselect/multiselect.popup.view.js

@ -14,7 +14,7 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, {
valueFormatter: BI.emptyFn,
itemsCreator: BI.emptyFn,
onLoaded: BI.emptyFn,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
},

2
src/widget/multiselect/multiselect.popup.view.nobar.js

@ -13,7 +13,7 @@ BI.MultiSelectNoBarPopupView = BI.inherit(BI.Widget, {
maxHeight: 400,
valueFormatter: BI.emptyFn,
itemsCreator: BI.emptyFn,
itemHeight: 24,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
onLoaded: BI.emptyFn
});
},

4
src/widget/multiselect/search/multiselect.search.insert.pane.js

@ -30,7 +30,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
this.addNotMatchTip = BI.createWidget({
type: "bi.label",
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
height: this.constants.height,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
cls: "bi-high-light",
hgap: 5,
});
@ -57,7 +57,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.addNotMatchTip,
height: this.constants.height,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}, {
el: this.loader,
}],

2
src/widget/multiselect/search/multiselect.search.loader.js

@ -92,7 +92,7 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
logic: {
dynamic: false
},
height: this.options.itemHeight,
height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
selected: this.isAllSelected(),
cls: "bi-list-item-active",
iconWrapperWidth: 36

10
src/widget/multiselectlist/multiselectlist.insert.js

@ -7,8 +7,8 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
baseCls: "bi-multi-select-insert-list",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcherHeight: 24,
itemHeight: 24
searcherHeight: BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
},
_init: function () {
@ -71,7 +71,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
ref: function (ref) {
self.editor = ref;
},
height: o.searcherHeight,
height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
},
isAutoSearch: false,
isAutoSync: false,
@ -164,7 +164,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.trigger,
height: o.searcherHeight
height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
}, {
el: this.adapter,
height: "fill"
@ -175,7 +175,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
element: this,
items: [{
el: this.searcherPane,
top: o.searcherHeight,
top: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
bottom: 0,
left: 0,
right: 0

2
src/widget/multiselectlist/multiselectlist.insert.nobar.js

@ -7,7 +7,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
baseCls: "bi-multi-select-insert-list",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcherHeight: 24
searcherHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
},
_init: function () {

2
src/widget/multiselectlist/multiselectlist.js

@ -8,7 +8,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
searcherHeight: 24,
itemHeight: 24
itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
});
},
_init: function () {

2
src/widget/year/card.dynamic.year.js

@ -22,7 +22,7 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}, {
type: "bi.dynamic_date_param_item",
ref: function () {

9
src/widget/year/popup.year.js

@ -8,7 +8,6 @@
BI.DynamicYearPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -33,7 +32,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -44,7 +43,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.text_button",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"),
@ -61,7 +60,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -76,7 +75,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}
}]
}]],
height: 24
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
},
}]
};

2
src/widget/yearmonth/card.dynamic.yearmonth.js

@ -19,7 +19,7 @@ BI.DynamicYearMonthCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}, {
type: "bi.vertical",
ref: function (_ref) {

4
src/widget/yearmonth/card.static.yearmonth.js

@ -25,7 +25,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
whiteSpace: "nowrap",
once: false,
forceSelected: true,
height: 23,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT - 1,
width: 38,
value: td,
text: td,
@ -77,7 +77,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1
})), {
type: "bi.center_adapt",
vgap: 1,

9
src/widget/yearmonth/popup.yearmonth.js

@ -8,7 +8,6 @@
BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
constants: {
tabHeight: 30,
buttonHeight: 24
},
props: {
@ -33,7 +32,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
@ -45,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"),
disabled: this._checkTodayValid(),
@ -61,7 +60,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
@ -76,7 +75,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}
}]
}]],
height: 24
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT
},
}]
};

2
src/widget/yearquarter/card.dynamic.yearquarter.js

@ -19,7 +19,7 @@ BI.DynamicYearQuarterCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
}, {
type: "bi.vertical",
ref: function (_ref) {

2
src/widget/yearquarter/card.static.yearquarter.js

@ -28,7 +28,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
whiteSpace: "nowrap",
once: false,
forceSelected: true,
height: 24,
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT,
ref: function (_ref) {
self.quarterMap[j + 1] = _ref;
}

8
src/widget/yearquarter/popup.yearquarter.js

@ -27,7 +27,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
text: BI.i18nText("BI-Basic_Clear"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -38,7 +38,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
}, {
type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"),
disabled: this._checkTodayValid(),
@ -55,7 +55,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
type: "bi.text_button",
cls: "bi-split-top bi-high-light",
shadow: true,
textHeight: c.buttonHeight - 1,
textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
text: BI.i18nText("BI-Basic_OK"),
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
@ -69,7 +69,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
}
}]
}]],
height: 24
height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT
},
}]
};

5
typescript/case/trigger/trigger.text.select.ts

@ -2,4 +2,9 @@ import { Trigger } from "../../base/single/trigger/trigger";
export declare class SelectTextTrigger extends Trigger {
static xtype: string;
props: {
items: any[];
text: string | Function;
} & Trigger['props'];
}

2
typescript/core/decorator/decorator.ts

@ -100,7 +100,7 @@ export class Model<U extends {types?: {[key: string]: unknown} | {}, context?: R
context: U["context"];
actions:{[key: string]: (...args: any[]) => any};
actions:{[key: string]: (...args: any[]) => any} | {};
childContext: ReadonlyArray<keyof (this["computed"] & ReturnType<this["state"]>)>;

2
typescript/shims-tsx.ts

@ -44,7 +44,7 @@ interface ElementClassProps<T> extends UIProps {
$testId: string;
$point: any;
$value: any;
$scope: () => any;
$scope: any;
beforeRender(callback: () => void): void;
beforeInit(callback: () => void): void;

Loading…
Cancel
Save