Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
commit
1f854ae8b2
  1. 4
      bi/widget.js
  2. 1
      demo/js/fix-2.0/scene.js
  3. 4
      dist/bundle.js
  4. 1
      dist/demo.js
  5. 2
      dist/fix/fix.compact.js
  6. 4
      dist/widget.js
  7. 4
      src/widget/multidate/multidate.segment.js

4
bi/widget.js

@ -7979,13 +7979,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
this.textEditor = BI.createWidget({ this.textEditor = BI.createWidget({
type: 'bi.text_editor', type: 'bi.sign_editor',
value: this.constants.defaultEditorValue, value: this.constants.defaultEditorValue,
title: function () { title: function () {
return self.textEditor.getValue(); return self.textEditor.getValue();
}, },
tipType: "success", tipType: "success",
cls: 'bi-multidate-editor', cls: 'bi-multidate-editor bi-border',
width: this.constants.textWidth, width: this.constants.textWidth,
height: this.constants.itemHeight height: this.constants.itemHeight
}); });

1
demo/js/fix-2.0/scene.js

@ -139,6 +139,7 @@
return { return {
type: "bi.tab", type: "bi.tab",
defaultShowIndex: this.constant.TAB1, defaultShowIndex: this.constant.TAB1,
single: true,
tab: { tab: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{

4
dist/bundle.js vendored

@ -83025,13 +83025,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
this.textEditor = BI.createWidget({ this.textEditor = BI.createWidget({
type: 'bi.text_editor', type: 'bi.sign_editor',
value: this.constants.defaultEditorValue, value: this.constants.defaultEditorValue,
title: function () { title: function () {
return self.textEditor.getValue(); return self.textEditor.getValue();
}, },
tipType: "success", tipType: "success",
cls: 'bi-multidate-editor', cls: 'bi-multidate-editor bi-border',
width: this.constants.textWidth, width: this.constants.textWidth,
height: this.constants.itemHeight height: this.constants.itemHeight
}); });

1
dist/demo.js vendored

@ -10337,6 +10337,7 @@ BI.shortcut("demo.tmp", Demo.Func);
return { return {
type: "bi.tab", type: "bi.tab",
defaultShowIndex: this.constant.TAB1, defaultShowIndex: this.constant.TAB1,
single: true,
tab: { tab: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{

2
dist/fix/fix.compact.js vendored

@ -34,7 +34,7 @@
var unMount = BI.Widget.prototype._unMount; var unMount = BI.Widget.prototype._unMount;
BI.Widget.prototype._unMount = function () { BI.Widget.prototype._unMount = function () {
unMount.apply(this, arguments); unMount.apply(this, arguments);
this.store && this.store.destroy(); this.store && BI.isFunction(this.store.destroy) && this.store.destroy();
BI.each(this._watchers, function (i, unwatches) { BI.each(this._watchers, function (i, unwatches) {
unwatches = BI.isArray(unwatches) ? unwatches : [unwatches]; unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
BI.each(unwatches, function (j, unwatch) { BI.each(unwatches, function (j, unwatch) {

4
dist/widget.js vendored

@ -7979,13 +7979,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
this.textEditor = BI.createWidget({ this.textEditor = BI.createWidget({
type: 'bi.text_editor', type: 'bi.sign_editor',
value: this.constants.defaultEditorValue, value: this.constants.defaultEditorValue,
title: function () { title: function () {
return self.textEditor.getValue(); return self.textEditor.getValue();
}, },
tipType: "success", tipType: "success",
cls: 'bi-multidate-editor', cls: 'bi-multidate-editor bi-border',
width: this.constants.textWidth, width: this.constants.textWidth,
height: this.constants.itemHeight height: this.constants.itemHeight
}); });

4
src/widget/multidate/multidate.segment.js

@ -36,13 +36,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
}); });
this.textEditor = BI.createWidget({ this.textEditor = BI.createWidget({
type: 'bi.text_editor', type: 'bi.sign_editor',
value: this.constants.defaultEditorValue, value: this.constants.defaultEditorValue,
title: function () { title: function () {
return self.textEditor.getValue(); return self.textEditor.getValue();
}, },
tipType: "success", tipType: "success",
cls: 'bi-multidate-editor', cls: 'bi-multidate-editor bi-border',
width: this.constants.textWidth, width: this.constants.textWidth,
height: this.constants.itemHeight height: this.constants.itemHeight
}); });

Loading…
Cancel
Save