Browse Source

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

es6
Tangjinxia 3 years ago
parent
commit
e47ae5a72a
  1. 2
      .eslintrc
  2. BIN
      dist/font/iconfont.eot
  3. 4
      dist/font/iconfont.svg
  4. BIN
      dist/font/iconfont.ttf
  5. BIN
      dist/font/iconfont.woff
  6. BIN
      dist/font/iconfont.woff2
  7. 2
      package.json
  8. 6
      src/base/combination/combo.js
  9. 8
      src/base/list/virtualgrouplist.js
  10. 8
      src/base/single/input/input.js
  11. 6
      src/case/calendar/calendar.date.item.js
  12. 16
      src/case/calendar/calendar.js
  13. 0
      src/core/8.popper.js
  14. 0
      src/core/9.worker.js
  15. 1
      src/core/constant/var.js
  16. 22
      src/less/base/segment/button.segment.less
  17. 116
      src/less/core/utils/list-item.less
  18. 56
      src/widget/date/calendar/picker.date.js
  19. 4
      src/widget/date/calendar/popup.calendar.date.js
  20. 9
      src/widget/multiselect/check/multiselect.check.pane.js
  21. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  22. 10
      src/widget/multitree/check/multi.tree.check.pane.js
  23. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  24. 13
      src/widget/singleselect/singleselect.combo.js
  25. 12
      src/widget/singleselect/singleselect.insert.combo.js
  26. 1
      src/widget/timeinterval/dateinterval.js
  27. 1
      src/widget/timeinterval/timeinterval.js
  28. 1
      typescript/base/a/a.ts
  29. 1
      typescript/widget/timeinterval/dateinterval.ts
  30. 1
      typescript/widget/timeinterval/timeinterval.ts
  31. 2
      webpack/attachments.js

2
.eslintrc

@ -29,6 +29,8 @@
"files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"], "files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"],
"extends": "plugin:@fui/es5", "extends": "plugin:@fui/es5",
"rules": { "rules": {
"no-param-reassign": "off",
"quotes": [2, "double"],
"comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号 "comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号
} }
}, { }, {

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

4
dist/font/iconfont.svg vendored

@ -14,6 +14,10 @@
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="panding" unicode="&#59508;" d="M791.296 768a104.704 104.704 0 0 0 13.952-208.512c-17.792-43.264-42.048-82.688-69.952-113.088C703.36 411.712 653.44 384 608 384H442.24c-58.88 0-99.392-24.064-127.104-54.208a205.44 205.44 0 0 1-47.616-89.6l0.064-36.672a104.768 104.768 0 1 0-69.76 0V564.48a104.768 104.768 0 1 0 69.76 0v-183.36l4.288 4.352c39.04 38.656 94.912 68.352 170.304 68.352H608c16.96 0 49.664 11.328 75.84 39.808 19.392 21.12 37.504 49.024 51.84 80.896A104.704 104.704 0 0 0 791.296 768z m-558.592-628.352a34.88 34.88 0 1 1 0-69.824 34.88 34.88 0 0 1 0 69.76z m0 558.528a34.88 34.88 0 1 1 0-69.76 34.88 34.88 0 0 1 0 69.76z m558.528 0a34.88 34.88 0 1 1 0-69.76 34.88 34.88 0 0 1 0 69.76z" horiz-adv-x="1024" />
<glyph glyph-name="canshuyulan" unicode="&#59507;" d="M630.592-25.536a261.632 261.632 0 1 0 0 523.264 261.632 261.632 0 0 0 0-523.264z m0 465.536a203.904 203.904 0 1 1 203.904-203.904 204.48 204.48 0 0 1-203.904 203.904zM498.368 185.28a28.864 28.864 0 0 0-28.864 28.864c0 102.4 83.008 185.408 185.344 185.408a29.44 29.44 0 0 0 28.928-28.864c0-16-12.928-28.864-28.928-28.864-70.336-0.32-127.296-57.28-127.616-127.68 0-15.936-12.928-28.8-28.864-28.8z m369.984-141.184l58.88-58.88a32 32 0 1 0-45.248-45.248l-58.88 58.88a32 32 0 1 0 45.248 45.248zM384.768 0a32 32 0 0 0 5.76-63.488l-5.76-0.512H160a96 96 0 0 0-95.552 86.784L64 32V526.208l0.32 0.064 0.128 1.472a96 96 0 0 0 19.84 49.92l6.016 6.912L296.32 802.048a96 96 0 0 0 59.84 29.44L366.08 832H800a96 96 0 0 0 95.552-86.784L896 736v-227.264a32 32 0 0 0-26.24-31.488l-5.76-0.512a32 32 0 0 0-31.488 26.24L832 508.736V736a32 32 0 0 1-26.24 31.488L800 768H416.384l0.064-209.792A96 96 0 0 0 329.728 462.72l-9.28-0.448L128 462.272V32a32 32 0 0 1 26.24-31.488L160 0h224.768zM346.688 761.472l-3.904-3.456-206.016-217.472a32 32 0 0 1-7.808-14.272h191.488a32 32 0 0 1 31.488 26.24l0.512 5.76v206.72a32 32 0 0 1-5.76-3.52z" horiz-adv-x="1024" />
<glyph glyph-name="feishuguanli" unicode="&#59506;" d="M951.936 781.888l-197.632-197.76a128 128 0 0 0-173.632-173.632L515.52 345.6l-45.248 45.248 63.488 63.552A128 128 0 0 0 710.4 631.04l196.224 196.16 45.248-45.312zM689.28 570.56a67.2 67.2 0 1 1-95.104-95.104 67.2 67.2 0 0 1 95.104 95.104zM978.048 735.488L748.032-31.36a92.032 92.032 0 0 0-153.216-38.656l-97.92 97.92a91.968 91.968 0 0 0-26.88 67.072l4.736 222.08a27.84 27.84 0 0 1-28.672 26.688l-219.52-5.12a92.032 92.032 0 0 0-67.2 26.88L58.048 466.816a91.968 91.968 0 0 0 38.656 153.152L863.488 850.048a92.032 92.032 0 0 0 114.56-114.56z m-80.064 53.248a28.032 28.032 0 0 1-16.064 0L115.072 558.72A28.032 28.032 0 0 1 103.36 512L204.608 410.88c5.376-5.376 12.8-8.32 20.48-8.192l219.52 5.12a91.968 91.968 0 0 0 94.08-89.792v-3.456l-4.736-220.8a28.032 28.032 0 0 1 8.192-20.48l97.92-97.92a27.968 27.968 0 0 1 46.656 11.776l230.016 766.784a28.032 28.032 0 0 1-13.504 32.704l-5.248 2.176z" horiz-adv-x="1024" /> <glyph glyph-name="feishuguanli" unicode="&#59506;" d="M951.936 781.888l-197.632-197.76a128 128 0 0 0-173.632-173.632L515.52 345.6l-45.248 45.248 63.488 63.552A128 128 0 0 0 710.4 631.04l196.224 196.16 45.248-45.312zM689.28 570.56a67.2 67.2 0 1 1-95.104-95.104 67.2 67.2 0 0 1 95.104 95.104zM978.048 735.488L748.032-31.36a92.032 92.032 0 0 0-153.216-38.656l-97.92 97.92a91.968 91.968 0 0 0-26.88 67.072l4.736 222.08a27.84 27.84 0 0 1-28.672 26.688l-219.52-5.12a92.032 92.032 0 0 0-67.2 26.88L58.048 466.816a91.968 91.968 0 0 0 38.656 153.152L863.488 850.048a92.032 92.032 0 0 0 114.56-114.56z m-80.064 53.248a28.032 28.032 0 0 1-16.064 0L115.072 558.72A28.032 28.032 0 0 1 103.36 512L204.608 410.88c5.376-5.376 12.8-8.32 20.48-8.192l219.52 5.12a91.968 91.968 0 0 0 94.08-89.792v-3.456l-4.736-220.8a28.032 28.032 0 0 1 8.192-20.48l97.92-97.92a27.968 27.968 0 0 1 46.656 11.776l230.016 766.784a28.032 28.032 0 0 1-13.504 32.704l-5.248 2.176z" horiz-adv-x="1024" />
<glyph glyph-name="qingchuhuancun" unicode="&#59505;" d="M634.112-16.448a64 64 0 0 0-87.424-23.424l-443.392 256a64 64 0 0 0-23.488 87.424l224 387.968a64 64 0 0 0 87.488 23.424l110.848-64 54.016 93.632A64 64 0 0 0 643.584 768l110.848-64a64 64 0 0 0 23.424-87.424l-54.016-93.632 110.848-64a64 64 0 0 0 23.424-87.424l-224-387.968z m72.576 253.696l-443.392 256-128-221.696 55.424-32 48 83.136a32 32 0 0 0 55.424-32l-48-83.136 83.136-48 80 138.56a32 32 0 0 0 55.424-32l-80-138.56 83.136-48 48 83.136a32 32 0 0 0 55.424-32l-48-83.136 55.424-32 128 221.696z m15.744 411.328l-110.848 64-86.016-149.12-166.272 96-64-110.72 443.392-256 64 110.72-166.272 96 86.016 149.12z" horiz-adv-x="1024" /> <glyph glyph-name="qingchuhuancun" unicode="&#59505;" d="M634.112-16.448a64 64 0 0 0-87.424-23.424l-443.392 256a64 64 0 0 0-23.488 87.424l224 387.968a64 64 0 0 0 87.488 23.424l110.848-64 54.016 93.632A64 64 0 0 0 643.584 768l110.848-64a64 64 0 0 0 23.424-87.424l-54.016-93.632 110.848-64a64 64 0 0 0 23.424-87.424l-224-387.968z m72.576 253.696l-443.392 256-128-221.696 55.424-32 48 83.136a32 32 0 0 0 55.424-32l-48-83.136 83.136-48 80 138.56a32 32 0 0 0 55.424-32l-80-138.56 83.136-48 48 83.136a32 32 0 0 0 55.424-32l-48-83.136 55.424-32 128 221.696z m15.744 411.328l-110.848 64-86.016-149.12-166.272 96-64-110.72 443.392-256 64 110.72-166.272 96 86.016 149.12z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 424 KiB

After

Width:  |  Height:  |  Size: 426 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

2
package.json

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

6
src/base/combination/combo.js

@ -312,7 +312,7 @@
delete needHideWhenAnotherComboOpen[this.getName()]; delete needHideWhenAnotherComboOpen[this.getName()];
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
}, },
@ -336,10 +336,10 @@
this.element.addClass(this.options.comboClass); this.element.addClass(this.options.comboClass);
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this)); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
}, },

8
src/base/list/virtualgrouplist.js

@ -55,8 +55,16 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
mounted: function () { mounted: function () {
var self = this, o = this.options; var self = this, o = this.options;
this._populate(); this._populate();
this._debounceRelease = BI.debounce(function () {
self._scrollLock = false;
}, 30);
this.element.scroll(function (e) { this.element.scroll(function (e) {
if (self._scrollLock === true) {
return;
}
self._scrollLock = true;
o.scrollTop = self.element.scrollTop(); o.scrollTop = self.element.scrollTop();
self._debounceRelease();
self._calculateBlocksToRender(); self._calculateBlocksToRender();
}); });
BI.ResizeDetector.addResizeListener(this, function () { BI.ResizeDetector.addResizeListener(this, function () {

8
src/base/single/input/input.js

@ -24,7 +24,7 @@ BI.Input = BI.inherit(BI.Single, {
var _keydown = BI.debounce(function (keyCode) { var _keydown = BI.debounce(function (keyCode) {
self.onKeyDown(keyCode, ctrlKey); self.onKeyDown(keyCode, ctrlKey);
self._keydown_ = false; self._keydown_ = false;
}, 300); }, BI.EVENT_RESPONSE_TIME);
var _clk = BI.debounce(BI.bind(this._click, this), BI.EVENT_RESPONSE_TIME, { var _clk = BI.debounce(BI.bind(this._click, this), BI.EVENT_RESPONSE_TIME, {
"leading": true, "leading": true,
"trailing": false "trailing": false
@ -95,11 +95,7 @@ BI.Input = BI.inherit(BI.Single, {
_blur: function () { _blur: function () {
var self = this; var self = this;
if (self._keydown_ === true) { blur();
BI.delay(blur, 300);
} else {
blur();
}
function blur () { function blur () {
if (!self.isValid() && self.options.quitChecker.apply(self, [BI.trim(self.getValue())]) !== false) { if (!self.isValid() && self.options.quitChecker.apply(self, [BI.trim(self.getValue())]) !== false) {

6
src/case/calendar/calendar.date.item.js

@ -21,8 +21,8 @@ BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
}, },
left: o.lgap, left: o.lgap,
right: o.rgap, right: o.rgap,
top: 0, top: o.tgap,
bottom: 0 bottom: o.rgap
}] }]
}; };
}, },
@ -50,4 +50,4 @@ BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
return this.text.getValue(); return this.text.getValue();
} }
}); });
BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem); BI.shortcut("bi.calendar_date_item", BI.CalendarDateItem);

16
src/case/calendar/calendar.js

@ -100,8 +100,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
columns: 7, columns: 7,
rows: 6, rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 10
vgap: 10
}))] }))]
}); });
this.days.on(BI.Controller.EVENT_CHANGE, function () { this.days.on(BI.Controller.EVENT_CHANGE, function () {
@ -111,7 +110,10 @@ BI.Calendar = BI.inherit(BI.Widget, {
element: this element: this
}, BI.LogicFactory.createLogic("vertical", BI.extend({}, o.logic, { }, BI.LogicFactory.createLogic("vertical", BI.extend({}, o.logic, {
items: BI.LogicFactory.createLogicItemsByDirection("top", title, this.days) items: BI.LogicFactory.createLogicItemsByDirection("top", title, {
el: this.days,
tgap: -5
})
})))); }))));
}, },
@ -159,11 +161,13 @@ BI.Calendar = BI.inherit(BI.Widget, {
whiteSpace: "normal", whiteSpace: "normal",
once: false, once: false,
forceSelected: true, forceSelected: true,
height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 10,
value: o.year + "-" + month + "-" + td.text, value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled, disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 5, lgap: 5,
rgap: 5 rgap: 5,
tgap: 5,
bgap: 5
// selected: td.currentDay // selected: td.currentDay
}); });
}); });
@ -231,4 +235,4 @@ BI.extend(BI.Calendar, {
} }
}); });
BI.shortcut("bi.calendar", BI.Calendar); BI.shortcut("bi.calendar", BI.Calendar);

0
src/core/9.popper.js → src/core/8.popper.js

0
src/core/10.worker.js → src/core/9.worker.js

1
src/core/constant/var.js

@ -6,6 +6,7 @@ _.extend(BI, {
MAX: 0xfffffffffffffff, MAX: 0xfffffffffffffff,
MIN: -0xfffffffffffffff, MIN: -0xfffffffffffffff,
EVENT_RESPONSE_TIME: 200, EVENT_RESPONSE_TIME: 200,
EVENT_BLUR: true,
zIndex_layer: 1e5, zIndex_layer: 1e5,
zIndex_popover: 1e6, zIndex_popover: 1e6,
zIndex_popup: 1e7, zIndex_popup: 1e7,

22
src/less/base/segment/button.segment.less

@ -2,14 +2,14 @@
.bi-segment-button { .bi-segment-button {
color: @color-bi-text-highlight; color: @color-bi-text-highlight;
&.active { //&.active {
&:active { // &:active {
color: @color-bi-text; // color: @color-bi-text;
background-color: @color-bi-background-highlight; // background-color: @color-bi-background-highlight;
} // }
} //}
&:active { //&:active {
color: @color-bi-text-highlight; // color: @color-bi-text-highlight;
.background-color(@color-bi-background-highlight, 10%); // .background-color(@color-bi-background-highlight, 10%);
} //}
} }

116
src/less/core/utils/list-item.less

@ -337,13 +337,69 @@
} }
} }
// hover的时候背景变化 -- 变灰
// active的时候文字高亮背景变化 -- 变灰
.bi-list-item-active3, .bi-list-item-select3 {
&:hover, &.hover {
background-color: @color-bi-background-normal;
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-normal;
}
&.disabled {
&:hover, &.hover, &:active, &.active {
background-color: @color-bi-background-default !important;
}
}
}
.bi-theme-dark {
.bi-list-item-active3, .bi-list-item-select3 {
&:hover, &.hover {
background-color: @color-bi-background-normal-theme-dark;
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-normal-theme-dark;
}
&.disabled {
&:hover, &.hover, &:active, &.active {
background-color: @color-bi-background-default-theme-dark !important;
}
}
}
}
// hover的时候背景变化 // hover的时候背景变化
// active的时候背景高亮 // active的时候背景高亮
.bi-list-item-select { .bi-list-item-select {
&:hover, &.hover { &:hover, &.hover {
.background-color(@color-bi-background-highlight, 10%); .background-color(@color-bi-background-highlight, 10%);
} }
&:active, &.active { &:active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 15%);
}
&.active {
color: @color-bi-text; color: @color-bi-text;
& .bi-input { & .bi-input {
color: @color-bi-text; color: @color-bi-text;
@ -471,7 +527,17 @@
} }
.background-color(@color-bi-background-default, 5%); .background-color(@color-bi-background-default, 5%);
} }
&:active, &.active { &:active {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
.background-color(@color-bi-background-default, 5%);
}
&.active {
color: @color-bi-text; color: @color-bi-text;
& .bi-input { & .bi-input {
color: @color-bi-text; color: @color-bi-text;
@ -600,52 +666,6 @@
} }
} }
// hover的时候背景变化 -- 变灰
// active的时候文字高亮背景变化 -- 变灰
.bi-list-item-select3 {
&:hover, &.hover {
background-color: @color-bi-background-normal;
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-normal;
}
&.disabled {
&:hover, &.hover, &:active, &.active {
background-color: @color-bi-background-default !important;
}
}
}
.bi-theme-dark {
.bi-list-item-select3 {
&:hover, &.hover {
background-color: @color-bi-background-normal-theme-dark;
}
&:active, &.active {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
background-color: @color-bi-background-normal-theme-dark;
}
&.disabled {
&:hover, &.hover, &:active, &.active {
background-color: @color-bi-background-default-theme-dark !important;
}
}
}
}
// 去掉list-item效果 // 去掉list-item效果
.bi-list-item-none { .bi-list-item-none {
&:hover, &.hover { &:hover, &.hover {

56
src/widget/date/calendar/picker.date.js

@ -11,31 +11,32 @@ BI.DatePicker = BI.inherit(BI.Widget, {
baseCls: "bi-date-picker", baseCls: "bi-date-picker",
height: 40, height: 40,
min: "1900-01-01", // 最小日期 min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期 max: "2099-12-31" // 最大日期
}); });
}, },
_init: function () { _init: function () {
BI.DatePicker.superclass._init.apply(this, arguments); BI.DatePicker.superclass._init.apply(this, arguments);
var self = this; var o = this.options; var self = this;
var o = this.options;
this._year = BI.getDate().getFullYear(); this._year = BI.getDate().getFullYear();
this._month = BI.getDate().getMonth() + 1; this._month = BI.getDate().getMonth() + 1;
this.left = BI.createWidget({ this.left = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
cls: "pre-page-h-font", cls: "pre-page-h-font",
width: 24, width: 24,
height: 24, height: 24
}); });
this.left.on(BI.IconButton.EVENT_CHANGE, function () { this.left.on(BI.IconButton.EVENT_CHANGE, function () {
if (self._month === 1) { if (self._month === 1) {
self.setValue({ self.setValue({
year: (self.year.getValue() - 1) || (BI.getDate().getFullYear() - 1), year: (self.year.getValue() - 1) || (BI.getDate().getFullYear() - 1),
month: 12, month: 12
}); });
} else { } else {
self.setValue({ self.setValue({
year: self.year.getValue() || BI.getDate().getFullYear(), year: self.year.getValue() || BI.getDate().getFullYear(),
month: (self.month.getValue() - 1) || BI.getDate().getMonth(), month: (self.month.getValue() - 1) || BI.getDate().getMonth()
}); });
} }
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
@ -47,19 +48,19 @@ BI.DatePicker = BI.inherit(BI.Widget, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "next-page-h-font", cls: "next-page-h-font",
width: 24, width: 24,
height: 24, height: 24
}); });
this.right.on(BI.IconButton.EVENT_CHANGE, function () { this.right.on(BI.IconButton.EVENT_CHANGE, function () {
if (self._month === 12) { if (self._month === 12) {
self.setValue({ self.setValue({
year: (self.year.getValue() + 1) || (BI.getDate().getFullYear() + 1), year: (self.year.getValue() + 1) || (BI.getDate().getFullYear() + 1),
month: 1, month: 1
}); });
} else { } else {
self.setValue({ self.setValue({
year: self.year.getValue() || BI.getDate().getFullYear(), year: self.year.getValue() || BI.getDate().getFullYear(),
month: (self.month.getValue() + 1) || (BI.getDate().getMonth() + 2), month: (self.month.getValue() + 1) || (BI.getDate().getMonth() + 2)
}); });
} }
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
@ -71,7 +72,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
type: "bi.year_date_combo", type: "bi.year_date_combo",
behaviors: o.behaviors, behaviors: o.behaviors,
min: o.min, min: o.min,
max: o.max, max: o.max
}); });
this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () { this.year.on(BI.YearDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({
@ -91,7 +92,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () { this.month.on(BI.MonthDateCombo.EVENT_CHANGE, function () {
self.setValue({ self.setValue({
year: self.year.getValue() || self._year, year: self.year.getValue() || self._year,
month: self.month.getValue(), month: self.month.getValue()
}); });
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
}); });
@ -105,33 +106,26 @@ BI.DatePicker = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.center_adapt", type: "bi.center_adapt",
items: [this.left], items: [this.left]
}, },
width: 24, width: 24
}, { }, {
type: "bi.center_adapt", el: {
items: [{ type: "bi.center_adapt",
el: { hgap: 10,
type: "bi.horizontal", items: [this.year, this.month]
width: 120, }
rgap: 10,
items: [{
el: this.year,
lgap: 10,
}, this.month],
},
}],
}, { }, {
el: { el: {
type: "bi.center_adapt", type: "bi.center_adapt",
items: [this.right], items: [this.right]
}, },
width: 24, width: 24
}], }]
}); });
this.setValue({ this.setValue({
year: this._year, year: this._year,
month: this._month, month: this._month
}); });
}, },
@ -177,7 +171,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
return valid; return valid;
}, },
_getCheckMinMaxDate: function() { _getCheckMinMaxDate: function () {
var o = this.options; var o = this.options;
var minDate = BI.parseDateTime(o.min, "%Y-%X-%d"); var minDate = BI.parseDateTime(o.min, "%Y-%X-%d");
var maxDate = BI.parseDateTime(o.max, "%Y-%X-%d"); var maxDate = BI.parseDateTime(o.max, "%Y-%X-%d");
@ -219,9 +213,9 @@ BI.DatePicker = BI.inherit(BI.Widget, {
getValue: function () { getValue: function () {
return { return {
year: this.year.getValue(), year: this.year.getValue(),
month: this.month.getValue(), month: this.month.getValue()
}; };
}, }
}); });
BI.DatePicker.EVENT_CHANGE = "EVENT_CHANGE"; BI.DatePicker.EVENT_CHANGE = "EVENT_CHANGE";
BI.DatePicker.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; BI.DatePicker.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW";

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

@ -88,7 +88,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
items: [{ items: [{
el: this.calendar, el: this.calendar,
hgap: 5, hgap: 5,
bgap: 12 bgap: 7
}] }]
}, { }, {
type: "bi.absolute", type: "bi.absolute",
@ -148,4 +148,4 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
}); });
BI.DateCalendarPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.DateCalendarPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.DateCalendarPopup.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW"; BI.DateCalendarPopup.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW";
BI.shortcut("bi.date_calendar_popup", BI.DateCalendarPopup); BI.shortcut("bi.date_calendar_popup", BI.DateCalendarPopup);

9
src/widget/multiselect/check/multiselect.check.pane.js

@ -39,6 +39,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
callback({ callback({
items: BI.map(self.storeValue.value, function (i, v) { items: BI.map(self.storeValue.value, function (i, v) {
var txt = opts.valueFormatter(v) || v; var txt = opts.valueFormatter(v) || v;
return { return {
text: txt, text: txt,
value: v, value: v,
@ -46,6 +47,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
}; };
}) })
}); });
return; return;
} }
opts.itemsCreator(op, callback); opts.itemsCreator(op, callback);
@ -54,6 +56,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
this.continueSelect = BI.createWidget({ this.continueSelect = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
title: BI.i18nText("BI-Continue_Select"),
text: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"),
cls: "multi-select-check-selected bi-high-light" cls: "multi-select-check-selected bi-high-light"
}); });
@ -69,18 +72,20 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.vertical_adapt", type: "bi.vertical_adapt",
columnSize: ["auto", "auto"],
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
el: { el: {
type: "bi.label", type: "bi.label",
title: BI.i18nText("BI-Selected_Data"),
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap lgap: this.constants.lgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap hgap: this.constants.lgap
}] }]
}, },
tgap: this.constants.tgap tgap: this.constants.tgap
@ -105,4 +110,4 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
} }
}); });
BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane); BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane);

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

@ -401,7 +401,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
callback(); callback();
function adjust () { function adjust () {
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.MultiSelectInsertNoBarCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.MultiSelectInsertNoBarCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;

10
src/widget/multitree/check/multi.tree.check.pane.js

@ -30,6 +30,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
var continueSelect = BI.createWidget({ var continueSelect = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
title: BI.i18nText("BI-Continue_Select"),
text: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"),
cls: "multi-tree-check-selected" cls: "multi-tree-check-selected"
}); });
@ -41,12 +42,14 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
}); });
var backToPopup = BI.createWidget({ var backToPopup = BI.createWidget({
type: "bi.left", type: "bi.vertical_adapt",
columnSize: ["auto", "auto"],
cls: "multi-tree-continue-select", cls: "multi-tree-continue-select",
items: [ items: [
{ {
el: { el: {
type: "bi.label", type: "bi.label",
title: BI.i18nText("BI-Selected_Data"),
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap,
@ -54,7 +57,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
}, },
{ {
el: continueSelect, el: continueSelect,
lgap: this.constants.lgap, hgap: this.constants.lgap,
tgap: this.constants.tgap tgap: this.constants.tgap
}] }]
}); });
@ -92,7 +95,6 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
el: this.display el: this.display
}] }]
}); });
}, },
empty: function () { empty: function () {
@ -116,4 +118,4 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, {
BI.MultiTreeCheckPane.EVENT_CONTINUE_CLICK = "EVENT_CONTINUE_CLICK"; BI.MultiTreeCheckPane.EVENT_CONTINUE_CLICK = "EVENT_CONTINUE_CLICK";
BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane); BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane);

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -333,7 +333,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
self._updateAllValue(); self._updateAllValue();
self._checkError(); self._checkError();
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;

13
src/widget/singleselect/singleselect.combo.js

@ -64,6 +64,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
self.fireEvent(BI.SingleSelectCombo.EVENT_STOP); self.fireEvent(BI.SingleSelectCombo.EVENT_STOP);
}); });
this.trigger.on(BI.SingleSelectTrigger.EVENT_SEARCHING, function () { this.trigger.on(BI.SingleSelectTrigger.EVENT_SEARCHING, function () {
self._dataChange = true;
self.fireEvent(BI.SingleSelectCombo.EVENT_SEARCHING); self.fireEvent(BI.SingleSelectCombo.EVENT_SEARCHING);
}); });
@ -71,6 +72,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
assertShowValue(); assertShowValue();
self._defaultState(); self._defaultState();
self._dataChange = true;
}); });
this.trigger.on(BI.SingleSelectTrigger.EVENT_COUNTER_CLICK, function () { this.trigger.on(BI.SingleSelectTrigger.EVENT_COUNTER_CLICK, function () {
if (!self.combo.isViewVisible()) { if (!self.combo.isViewVisible()) {
@ -95,6 +97,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
listeners: [{ listeners: [{
eventName: BI.SingleSelectPopupView.EVENT_CHANGE, eventName: BI.SingleSelectPopupView.EVENT_CHANGE,
action: function () { action: function () {
self._dataChange = true;
self.storeValue = this.getValue(); self.storeValue = this.getValue();
self._adjust(function () { self._adjust(function () {
assertShowValue(); assertShowValue();
@ -120,6 +123,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -133,7 +139,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
} }
}); });
@ -173,7 +179,8 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.combo.hideView(); this.combo.hideView();
}, },
_assertValue: function (val) {}, _assertValue: function (val) {
},
_makeMap: function (values) { _makeMap: function (values) {
return BI.makeObject(values || []); return BI.makeObject(values || []);
@ -220,7 +227,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
function adjust () { function adjust () {
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.SingleSelectCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;

12
src/widget/singleselect/singleselect.insert.combo.js

@ -75,6 +75,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
self._defaultState(); self._defaultState();
}); });
this.trigger.on(BI.SingleSelectTrigger.EVENT_SEARCHING, function () { this.trigger.on(BI.SingleSelectTrigger.EVENT_SEARCHING, function () {
self._dataChange = true;
self.fireEvent(BI.SingleSelectInsertCombo.EVENT_SEARCHING); self.fireEvent(BI.SingleSelectInsertCombo.EVENT_SEARCHING);
}); });
@ -82,6 +83,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
self.storeValue = this.getValue(); self.storeValue = this.getValue();
assertShowValue(); assertShowValue();
self._defaultState(); self._defaultState();
self._dataChange = true;
}); });
this.trigger.on(BI.SingleSelectTrigger.EVENT_COUNTER_CLICK, function () { this.trigger.on(BI.SingleSelectTrigger.EVENT_COUNTER_CLICK, function () {
if (!self.combo.isViewVisible()) { if (!self.combo.isViewVisible()) {
@ -106,6 +108,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
listeners: [{ listeners: [{
eventName: BI.SingleSelectPopupView.EVENT_CHANGE, eventName: BI.SingleSelectPopupView.EVENT_CHANGE,
action: function () { action: function () {
self._dataChange = true;
self.storeValue = this.getValue(); self.storeValue = this.getValue();
self._adjust(function () { self._adjust(function () {
assertShowValue(); assertShowValue();
@ -131,6 +134,9 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self.populate(); self.populate();
@ -144,7 +150,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
} }
}); });
@ -198,7 +204,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
function adjust () { function adjust () {
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.SingleSelectInsertCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;
@ -237,4 +243,4 @@ BI.SingleSelectInsertCombo.EVENT_SEARCHING = "EVENT_SEARCHING";
BI.SingleSelectInsertCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM"; BI.SingleSelectInsertCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SingleSelectInsertCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo); BI.shortcut("bi.single_select_insert_combo", BI.SingleSelectInsertCombo);

1
src/widget/timeinterval/dateinterval.js

@ -73,6 +73,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
minDate: o.minDate, minDate: o.minDate,
maxDate: o.maxDate, maxDate: o.maxDate,
behaviors: o.behaviors, behaviors: o.behaviors,
watermark: o.watermark,
value: v, value: v,
height: o.height, height: o.height,
listeners: [{ listeners: [{

1
src/widget/timeinterval/timeinterval.js

@ -73,6 +73,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
minDate: o.minDate, minDate: o.minDate,
maxDate: o.maxDate, maxDate: o.maxDate,
behaviors: o.behaviors, behaviors: o.behaviors,
watermark: o.watermark,
value: v, value: v,
height: o.height, height: o.height,
}); });

1
typescript/base/a/a.ts

@ -4,5 +4,6 @@ export declare class A extends Text {
static xtype: string; static xtype: string;
props: { props: {
href: string; href: string;
el: Obj;
} & Text['props']; } & Text['props'];
} }

1
typescript/widget/timeinterval/dateinterval.ts

@ -12,6 +12,7 @@ export declare class DateInterval extends Single {
minDate?: string; minDate?: string;
maxDate?: string; maxDate?: string;
supportDynamic?: boolean; supportDynamic?: boolean;
watermark?: string;
} & Single['props'] } & Single['props']
getValue(): { getValue(): {

1
typescript/widget/timeinterval/timeinterval.ts

@ -11,6 +11,7 @@ export declare class TimeInterval extends Single {
minDate?: string; minDate?: string;
maxDate?: string; maxDate?: string;
supportDynamic?: boolean; supportDynamic?: boolean;
watermark?: string;
} & Single['props'] } & Single['props']
getValue(): { getValue(): {

2
webpack/attachments.js

@ -161,7 +161,7 @@ const fineuiProxy = [].concat(
const fineuiWithoutJqueryAndPolyfillJs = [].concat( const fineuiWithoutJqueryAndPolyfillJs = [].concat(
sync([ sync([
"src/core/foundation.js", "src/core/0.foundation.js",
lodashJs, lodashJs,
"src/core/**/*.js", "src/core/**/*.js",
"src/data/**/*.js", "src/data/**/*.js",

Loading…
Cancel
Save