Browse Source

Pull request #2418: chore: 整理代码

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '9121917b3bafe1701dc1e5704ce2c7fa0ae39c68':
  chore: 整理代码
es6
guy 3 years ago
parent
commit
6005613692
  1. 2
      src/base/layer/layer.popover.js
  2. 4
      src/case/combo/bubblecombo/popup.bubble.js
  3. 2
      src/case/layer/layer.multipopup.js
  4. 4
      src/widget/multiselect/multiselect.popup.view.js
  5. 4
      src/widget/multiselect/multiselect.popup.view.nobar.js
  6. 4
      src/widget/multitree/multi.tree.popup.js
  7. 4
      src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js

2
src/base/layer/layer.popover.js

@ -233,7 +233,7 @@ BI.shortcut("bi.popover", BI.Popover);
BI.BarPopover = BI.inherit(BI.Popover, { BI.BarPopover = BI.inherit(BI.Popover, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.BarPopover.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.BarPopover.superclass._defaultConfig.apply(this, arguments), {
btns: [BI.i18nText("BI-Basic_Sure"), BI.i18nText("BI-Basic_Cancel")] btns: [BI.i18nText("BI-Basic_OK"), BI.i18nText("BI-Basic_Cancel")]
}); });
}, },

4
src/case/combo/bubblecombo/popup.bubble.js

@ -33,7 +33,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
text: BI.i18nText("BI-Basic_Cancel"), text: BI.i18nText("BI-Basic_Cancel"),
ghost: true ghost: true
}, { }, {
text: BI.i18nText(BI.i18nText("BI-Basic_Sure")), text: BI.i18nText(BI.i18nText("BI-Basic_OK")),
value: true value: true
}] }]
}); });
@ -112,7 +112,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
}, { }, {
value: true, value: true,
stopPropagation: true, stopPropagation: true,
text: BI.i18nText("BI-Basic_Sure") text: BI.i18nText("BI-Basic_OK")
}] }]
}; };
}, },

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

@ -10,7 +10,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments); var conf = BI.MultiPopupView.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-multi-list-view", _baseCls: (conf._baseCls || "") + " bi-multi-list-view",
buttons: [BI.i18nText("BI-Basic_Sure")] buttons: [BI.i18nText("BI-Basic_OK")]
}); });
}, },

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

@ -38,7 +38,7 @@ BI.MultiSelectPopupView = BI.inherit(BI.Widget, {
minWidth: opts.minWidth, minWidth: opts.minWidth,
maxHeight: opts.maxHeight, maxHeight: opts.maxHeight,
element: this, element: this,
buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")], buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_OK")],
el: this.loader, el: this.loader,
value: opts.value value: opts.value
}); });
@ -92,4 +92,4 @@ BI.MultiSelectPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
BI.MultiSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR"; BI.MultiSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
BI.shortcut("bi.multi_select_popup_view", BI.MultiSelectPopupView); BI.shortcut("bi.multi_select_popup_view", BI.MultiSelectPopupView);

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

@ -38,7 +38,7 @@ BI.MultiSelectNoBarPopupView = BI.inherit(BI.Widget, {
minWidth: opts.minWidth, minWidth: opts.minWidth,
maxHeight: opts.maxHeight, maxHeight: opts.maxHeight,
element: this, element: this,
buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")], buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_OK")],
el: this.loader, el: this.loader,
value: opts.value value: opts.value
}); });
@ -88,4 +88,4 @@ BI.MultiSelectNoBarPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
BI.MultiSelectNoBarPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR"; BI.MultiSelectNoBarPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
BI.shortcut("bi.multi_select_no_bar_popup_view", BI.MultiSelectNoBarPopupView); BI.shortcut("bi.multi_select_no_bar_popup_view", BI.MultiSelectNoBarPopupView);

4
src/widget/multitree/multi.tree.popup.js

@ -42,7 +42,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
maxWidth: opts.maxWidth, maxWidth: opts.maxWidth,
minWidth: opts.minWidth, minWidth: opts.minWidth,
maxHeight: opts.maxHeight, maxHeight: opts.maxHeight,
buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")], buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_OK")],
el: this.tree el: this.tree
}); });
@ -99,4 +99,4 @@ BI.MultiTreePopup.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
BI.MultiTreePopup.EVENT_AFTERINIT = "EVENT_AFTERINIT"; BI.MultiTreePopup.EVENT_AFTERINIT = "EVENT_AFTERINIT";
BI.shortcut("bi.multi_tree_popup_view", BI.MultiTreePopup); BI.shortcut("bi.multi_tree_popup_view", BI.MultiTreePopup);

4
src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js

@ -31,7 +31,7 @@ BI.SearchMultiSelectPopupView = BI.inherit(BI.Widget, {
minWidth: opts.minWidth, minWidth: opts.minWidth,
maxHeight: opts.maxHeight, maxHeight: opts.maxHeight,
element: this, element: this,
buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_Sure")], buttons: [BI.i18nText("BI-Basic_Clears"), BI.i18nText("BI-Basic_OK")],
el: this.loader, el: this.loader,
value: opts.value value: opts.value
}); });
@ -85,4 +85,4 @@ BI.SearchMultiSelectPopupView.EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM";
BI.SearchMultiSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR"; BI.SearchMultiSelectPopupView.EVENT_CLICK_CLEAR = "EVENT_CLICK_CLEAR";
BI.shortcut("bi.search_multi_select_popup_view", BI.SearchMultiSelectPopupView); BI.shortcut("bi.search_multi_select_popup_view", BI.SearchMultiSelectPopupView);

Loading…
Cancel
Save