Browse Source

Pull request #1823: 无JIRA任务 变量修改

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '7cd9ea11cdad1a89fb8d8fce9d9cbb3bc7961cc0':
  适配下回滚
  无JIRA任务 变量修改
es6
windy 4 years ago
parent
commit
df54cd98a5
  1. 4
      src/widget/dynamicdate/dynamicdate.card.js
  2. 2
      src/widget/dynamicdate/dynamicdate.popup.js

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

@ -46,7 +46,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.multi_select_item", type: "bi.multi_select_item",
logic: { logic: {
dynamic: true dynamic: true
} },
iconWrapperWidth: 26,
}), }),
layouts: [{ layouts: [{
type: "bi.left", type: "bi.left",
@ -90,6 +91,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.multi_select_item", type: "bi.multi_select_item",
iconWrapperWidth: 26,
ref: function () { ref: function () {
self.workDayBox = this; self.workDayBox = this;
}, },

2
src/widget/dynamicdate/dynamicdate.popup.js

@ -171,7 +171,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
_setInnerValue: function () { _setInnerValue: function () {
if (this.dateTab.getSelect() === BI.DynamicDateCombo.Static) { if (this.dateTab.getSelect() === BI.DynamicDateCombo.Static) {
this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today"));
this.textButton.setEnable(!this._checkTodayValid()); this.todayButton.setEnable(!this._checkTodayValid());
} else { } else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%X-%d"); date = BI.print(date, "%Y-%X-%d");

Loading…
Cancel
Save