fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 3 years ago
parent
18594053e7 59d64177bc
commit
a499bffb88
8 changed files with 514 additions and 457 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .eslintrc
  2. 2
      package.json
  3. 8
      src/base/combination/combo.js
  4. 25
      src/widget/dynamicdate/dynamicdate.combo.js
  5. 26
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  6. 23
      src/widget/year/combo.year.js
  7. 22
      src/widget/yearmonth/combo.yearmonth.js
  8. 22
      src/widget/yearquarter/combo.yearquarter.js

5
.eslintrc
Unescape View File

@ -27,7 +27,10 @@
"plugins": ["@typescript-eslint/eslint-plugin"], "plugins": ["@typescript-eslint/eslint-plugin"],
"overrides": [{ "overrides": [{
"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": {
"comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号
}
}, { }, {
"files": ["webpack/*.js", "types/*.ts", "typescript/*.ts","typescript/**/*.ts", "./*.js", "lib/**/*.js", "lib/*.js"], "files": ["webpack/*.js", "types/*.ts", "typescript/*.ts","typescript/**/*.ts", "./*.js", "lib/**/*.js", "lib/*.js"],
"extends": "plugin:@fui/typescript" "extends": "plugin:@fui/typescript"

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20211011153425", "version": "2.0.20211011224217",
"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",

8
src/base/combination/combo.js
Unescape View File

@ -296,12 +296,14 @@
this.popupView && this.popupView.destroy(); this.popupView && this.popupView.destroy();
this.popupView = null; this.popupView = null;
this._rendered = false; this._rendered = false;
} else {
this.popupView && this.popupView.invisible();
}
if (!e || !this.combo.element.__isMouseInBounds__(e)) { if (!e || !this.combo.element.__isMouseInBounds__(e)) {
this.element.removeClass(this.options.hoverClass); this.element.removeClass(this.options.hoverClass);
} // 应对bi-focus-shadow在收起时不失焦
} else { this.element.blur();
this.popupView && this.popupView.invisible();
} }
this.element.removeClass(this.options.comboClass); this.element.removeClass(this.options.comboClass);

25
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -30,20 +30,24 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = ""; this.storeTriggerValue = "";
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.absolute",
items: [{
el: {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius", cls: "bi-border bi-border-radius bi-focus-shadow",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height - 2,
height: opts.height - 2, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: opts.height width: opts.height - 2
}, { }, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
@ -178,7 +182,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
eventName: BI.DynamicDatePopup.BUTTON_OK_EVENT_CHANGE, eventName: BI.DynamicDatePopup.BUTTON_OK_EVENT_CHANGE,
action: function () { action: function () {
var value = self.popup.getValue(); var value = self.popup.getValue();
if(self._checkValue(value)) { if (self._checkValue(value)) {
self.setValue(value); self.setValue(value);
} }
self.combo.hideView(); self.combo.hideView();
@ -222,8 +226,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font", cls: "bi-trigger-icon-button date-font",
width: opts.height, width: opts.height - 2,
height: opts.height, height: opts.height - 2,
listeners: [{ listeners: [{
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
@ -245,6 +249,12 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
ref: function (_ref) { ref: function (_ref) {
self.comboWrapper = _ref; self.comboWrapper = _ref;
} }
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}; };
}, },
@ -261,7 +271,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicDateCombo.Dynamic: case BI.DynamicDateCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = o.height; this.comboWrapper.attr("items")[0].width = o.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -279,6 +289,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

26
src/widget/dynamicdatetime/dynamicdatetime.combo.js
Unescape View File

@ -30,25 +30,30 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = ""; this.storeTriggerValue = "";
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.absolute",
items: [{
el: {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius", cls: "bi-border bi-border-radius bi-focus-shadow",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height - 2,
height: opts.height - 2, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: opts.height width: opts.height - 2
}, { }, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
cls: "bi-focus-shadow",
destroyWhenHide: true, destroyWhenHide: true,
container: opts.container, container: opts.container,
ref: function () { ref: function () {
@ -186,7 +191,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE, eventName: BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE,
action: function () { action: function () {
var value = self.popup.getValue(); var value = self.popup.getValue();
if(self._checkValue(value)) { if (self._checkValue(value)) {
self.setValue(value); self.setValue(value);
} }
self.combo.hideView(); self.combo.hideView();
@ -230,8 +235,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font", cls: "bi-trigger-icon-button date-font",
width: opts.height, width: opts.height - 2,
height: opts.height, height: opts.height - 2,
listeners: [{ listeners: [{
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
@ -253,6 +258,12 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
ref: function (_ref) { ref: function (_ref) {
self.comboWrapper = _ref; self.comboWrapper = _ref;
} }
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}; };
}, },
@ -269,7 +280,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicDateTimeCombo.Dynamic: case BI.DynamicDateTimeCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = o.height; this.comboWrapper.attr("items")[0].width = o.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -287,6 +298,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

23
src/widget/year/combo.year.js
Unescape View File

@ -6,7 +6,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
minDate: "1900-01-01", // 最小日期 minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期 maxDate: "2099-12-31", // 最大日期
height: 24, height: 24,
supportDynamic: true, supportDynamic: true
}, },
_init: function () { _init: function () {
@ -92,7 +92,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE, eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE,
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({type: BI.DynamicYearCombo.Static, value: {year: date.getFullYear()}}); self.setValue({ type: BI.DynamicYearCombo.Static, value: { year: date.getFullYear() } });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
@ -119,9 +119,12 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -129,14 +132,20 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -149,7 +158,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
switch (type) { switch (type) {
case BI.DynamicYearCombo.Dynamic: case BI.DynamicYearCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2,
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:

22
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -93,7 +93,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
eventName: BI.DynamicYearMonthPopup.BUTTON_lABEL_EVENT_CHANGE, eventName: BI.DynamicYearMonthPopup.BUTTON_lABEL_EVENT_CHANGE,
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({type: BI.DynamicYearMonthCombo.Static, value: {year: date.getFullYear(), month: date.getMonth() + 1}}); self.setValue({ type: BI.DynamicYearMonthCombo.Static, value: { year: date.getFullYear(), month: date.getMonth() + 1 } });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
@ -123,9 +123,12 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -133,14 +136,20 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -153,7 +162,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicYearMonthCombo.Dynamic: case BI.DynamicYearMonthCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2,
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -171,6 +180,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, 1, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, 1, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

22
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

@ -93,7 +93,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
eventName: BI.DynamicYearQuarterPopup.BUTTON_lABEL_EVENT_CHANGE, eventName: BI.DynamicYearQuarterPopup.BUTTON_lABEL_EVENT_CHANGE,
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({type: BI.DynamicYearMonthCombo.Static, value: {year: date.getFullYear(), quarter: BI.getQuarter(date)}}); self.setValue({ type: BI.DynamicYearMonthCombo.Static, value: { year: date.getFullYear(), quarter: BI.getQuarter(date) } });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
} }
@ -123,9 +123,12 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -133,14 +136,20 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -153,7 +162,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
switch (type) { switch (type) {
case BI.DynamicYearQuarterCombo.Dynamic: case BI.DynamicYearQuarterCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -171,6 +180,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, (value.quarter - 1) * 3 + 1, 1, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, (value.quarter - 1) * 3 + 1, 1, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

Write Preview
Loading…
Cancel
Save