From 0812d66d87e8276bc2ed96421903cfe7334a6a6c Mon Sep 17 00:00:00 2001 From: Young Date: Mon, 13 Nov 2017 10:59:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?store=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8mo?= =?UTF-8?q?del=E6=95=B0=E6=8D=AE=E6=97=B6=E6=97=A0destroy=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/fix-2.0/scene.js | 1 + dist/demo.js | 1 + dist/fix/fix.compact.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demo/js/fix-2.0/scene.js b/demo/js/fix-2.0/scene.js index a52e809d4..8e58c2e55 100644 --- a/demo/js/fix-2.0/scene.js +++ b/demo/js/fix-2.0/scene.js @@ -139,6 +139,7 @@ return { type: "bi.tab", defaultShowIndex: this.constant.TAB1, + single: true, tab: { type: "bi.button_group", items: BI.createItems([{ diff --git a/dist/demo.js b/dist/demo.js index cc31af03e..1d76ad8e7 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -10337,6 +10337,7 @@ BI.shortcut("demo.tmp", Demo.Func); return { type: "bi.tab", defaultShowIndex: this.constant.TAB1, + single: true, tab: { type: "bi.button_group", items: BI.createItems([{ diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js index 5815e1b1a..b460abf9c 100644 --- a/dist/fix/fix.compact.js +++ b/dist/fix/fix.compact.js @@ -34,7 +34,7 @@ var unMount = BI.Widget.prototype._unMount; BI.Widget.prototype._unMount = function () { 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) { unwatches = BI.isArray(unwatches) ? unwatches : [unwatches]; BI.each(unwatches, function (j, unwatch) { From ff77ac3b5b8d9d043e4839d070030930c69f14d5 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 13 Nov 2017 15:40:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=8B?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/widget.js | 4 ++-- dist/bundle.js | 4 ++-- dist/widget.js | 4 ++-- src/widget/multidate/multidate.segment.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bi/widget.js b/bi/widget.js index 827e92566..e57c6ea7e 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -7979,13 +7979,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); this.textEditor = BI.createWidget({ - type: 'bi.text_editor', + type: 'bi.sign_editor', value: this.constants.defaultEditorValue, title: function () { return self.textEditor.getValue(); }, tipType: "success", - cls: 'bi-multidate-editor', + cls: 'bi-multidate-editor bi-border', width: this.constants.textWidth, height: this.constants.itemHeight }); diff --git a/dist/bundle.js b/dist/bundle.js index 5a723d18c..30bb4ca7c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -83025,13 +83025,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); this.textEditor = BI.createWidget({ - type: 'bi.text_editor', + type: 'bi.sign_editor', value: this.constants.defaultEditorValue, title: function () { return self.textEditor.getValue(); }, tipType: "success", - cls: 'bi-multidate-editor', + cls: 'bi-multidate-editor bi-border', width: this.constants.textWidth, height: this.constants.itemHeight }); diff --git a/dist/widget.js b/dist/widget.js index 827e92566..e57c6ea7e 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -7979,13 +7979,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); this.textEditor = BI.createWidget({ - type: 'bi.text_editor', + type: 'bi.sign_editor', value: this.constants.defaultEditorValue, title: function () { return self.textEditor.getValue(); }, tipType: "success", - cls: 'bi-multidate-editor', + cls: 'bi-multidate-editor bi-border', width: this.constants.textWidth, height: this.constants.itemHeight }); diff --git a/src/widget/multidate/multidate.segment.js b/src/widget/multidate/multidate.segment.js index f949c0f95..35c0f9da3 100644 --- a/src/widget/multidate/multidate.segment.js +++ b/src/widget/multidate/multidate.segment.js @@ -36,13 +36,13 @@ BI.MultiDateSegment = BI.inherit(BI.Single, { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); this.textEditor = BI.createWidget({ - type: 'bi.text_editor', + type: 'bi.sign_editor', value: this.constants.defaultEditorValue, title: function () { return self.textEditor.getValue(); }, tipType: "success", - cls: 'bi-multidate-editor', + cls: 'bi-multidate-editor bi-border', width: this.constants.textWidth, height: this.constants.itemHeight });