caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

日期类型更新

es6
windy 3 years ago
parent
fd4e4eb973
commit
88a0a4e305
13 changed files with 39 additions and 33 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. 6
      src/case/calendar/calendar.js
  2. 8
      src/core/system.js
  3. 4
      src/widget/date/calendar/popup.month.js
  4. 4
      src/widget/dynamicdate/dynamicdate.card.js
  5. 9
      src/widget/dynamicdate/dynamicdate.popup.js
  6. 8
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  7. 6
      src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  8. 2
      src/widget/yearmonth/card.dynamic.yearmonth.js
  9. 4
      src/widget/yearmonth/card.static.yearmonth.js
  10. 9
      src/widget/yearmonth/popup.yearmonth.js
  11. 2
      src/widget/yearquarter/card.dynamic.yearquarter.js
  12. 2
      src/widget/yearquarter/card.static.yearquarter.js
  13. 8
      src/widget/yearquarter/popup.yearquarter.js

6
src/case/calendar/calendar.js
Unescape View File

@ -78,7 +78,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
var items = BI.map(this._getWeekLabel(), function (i, value) { var items = BI.map(this._getWeekLabel(), function (i, value) {
return { return {
type: "bi.label", type: "bi.label",
height: 24, height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
text: value text: value
}; };
}); });
@ -100,7 +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: 24, rowSize: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
vgap: 10 vgap: 10
}))] }))]
}); });
@ -159,7 +159,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
whiteSpace: "normal", whiteSpace: "normal",
once: false, once: false,
forceSelected: true, forceSelected: true,
height: 24, height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
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,

8
src/core/system.js
Unescape View File

@ -37,3 +37,11 @@
BI.prepares.push(function () { BI.prepares.push(function () {
BI.SIZE_CONSANTS = BI.Providers.getProvider('bi.provider.system').getSize(); BI.SIZE_CONSANTS = BI.Providers.getProvider('bi.provider.system').getSize();
}); });
BI.config('bi.provider.system', function (provider) {
provider.setSize({
TOOL_BAR_HEIGHT: 30,
LIST_ITEM_HEIGHT: 30,
TRIGGER_HEIGHT: 30,
})
});

4
src/widget/date/calendar/popup.month.js
Unescape View File

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

4
src/widget/dynamicdate/dynamicdate.card.js
Unescape View File

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

9
src/widget/dynamicdate/dynamicdate.popup.js
Unescape View File

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

@ -25,7 +25,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
items: [[{ items: [[{
type: "bi.text_button", type: "bi.text_button",
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1, textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
listeners: [{ listeners: [{
@ -37,7 +37,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", 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, shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"), text: BI.i18nText("BI-Multi_Date_Today"),
disabled: this._checkTodayValid(), disabled: this._checkTodayValid(),
@ -53,7 +53,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
textHeight: c.buttonHeight - 1, textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ 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
Unescape View File

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

2
src/widget/yearmonth/card.dynamic.yearmonth.js
Unescape View File

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

4
src/widget/yearmonth/card.static.yearmonth.js
Unescape View File

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

9
src/widget/yearmonth/popup.yearmonth.js
Unescape View File

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

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

2
src/widget/yearquarter/card.static.yearquarter.js
Unescape View File

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

8
src/widget/yearquarter/popup.yearquarter.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save