From 170f6b756af872d417b4c5d37f83a093d55796cd Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 10 May 2018 17:29:27 +0800 Subject: [PATCH] update --- dist/bundle.js | 30 ++++++++++++++----- dist/case.js | 30 ++++++++++++++----- dist/fineui.js | 30 ++++++++++++++----- .../colorpicker/editor.colorpicker.js | 30 ++++++++++++++----- 4 files changed, 92 insertions(+), 28 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index f815e039e..19a1aeb5e 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -76904,6 +76904,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { _init: function () { BI.ColorPickerEditor.superclass._init.apply(this, arguments); var self = this, o = this.options; + this.storeValue = {}; this.colorShow = BI.createWidget({ type: "bi.layout", cls: "color-picker-editor-display bi-card", @@ -76932,7 +76933,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { BI.each(Ws, function (i, w) { w.on(BI.TextEditor.EVENT_CHANGE, function () { self._checkEditors(); - if (self.R.isValid() && self.G.isValid() && self.B.isValid()) { + if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) { self.colorShow.element.css("background-color", self.getValue()); self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } @@ -77042,6 +77043,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { if(BI.isEmptyString(this.B.getValue())) { this.B.setValue(0); } + this.storeValue = { + r: this.R.getValue() || 0, + g: this.G.getValue() || 0, + b: this.B.getValue() || 0 + }; }, _showPreColor: function (color) { @@ -77062,6 +77068,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.R.setValue(""); this.G.setValue(""); this.B.setValue(""); + this.storeValue = { + r: "", + g: "", + b: "" + }; return; } if (!color) { @@ -77073,9 +77084,14 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.transparent.setSelected(false); this._showPreColor(color); var json = BI.DOM.rgb2json(BI.DOM.hex2rgb(color)); - this.R.setValue(BI.isNull(json.r) ? "" : json.r); - this.G.setValue(BI.isNull(json.g) ? "" : json.g); - this.B.setValue(BI.isNull(json.b) ? "" : json.b); + this.storeValue = { + r: BI.isNull(json.r) ? "" : json.r, + g: BI.isNull(json.r) ? "" : json.g, + b: BI.isNull(json.r) ? "" : json.b + }; + this.R.setValue(this.storeValue.r); + this.G.setValue(this.storeValue.g); + this.B.setValue(this.storeValue.b); }, getValue: function () { @@ -77083,9 +77099,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { return "transparent"; } return BI.DOM.rgb2hex(BI.DOM.json2rgb({ - r: this.R.getValue(), - g: this.G.getValue(), - b: this.B.getValue() + r: this.storeValue.r, + g: this.storeValue.g, + b: this.storeValue.b })); } }); diff --git a/dist/case.js b/dist/case.js index 5230de88a..1efead82c 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4431,6 +4431,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { _init: function () { BI.ColorPickerEditor.superclass._init.apply(this, arguments); var self = this, o = this.options; + this.storeValue = {}; this.colorShow = BI.createWidget({ type: "bi.layout", cls: "color-picker-editor-display bi-card", @@ -4459,7 +4460,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { BI.each(Ws, function (i, w) { w.on(BI.TextEditor.EVENT_CHANGE, function () { self._checkEditors(); - if (self.R.isValid() && self.G.isValid() && self.B.isValid()) { + if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) { self.colorShow.element.css("background-color", self.getValue()); self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } @@ -4569,6 +4570,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { if(BI.isEmptyString(this.B.getValue())) { this.B.setValue(0); } + this.storeValue = { + r: this.R.getValue() || 0, + g: this.G.getValue() || 0, + b: this.B.getValue() || 0 + }; }, _showPreColor: function (color) { @@ -4589,6 +4595,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.R.setValue(""); this.G.setValue(""); this.B.setValue(""); + this.storeValue = { + r: "", + g: "", + b: "" + }; return; } if (!color) { @@ -4600,9 +4611,14 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.transparent.setSelected(false); this._showPreColor(color); var json = BI.DOM.rgb2json(BI.DOM.hex2rgb(color)); - this.R.setValue(BI.isNull(json.r) ? "" : json.r); - this.G.setValue(BI.isNull(json.g) ? "" : json.g); - this.B.setValue(BI.isNull(json.b) ? "" : json.b); + this.storeValue = { + r: BI.isNull(json.r) ? "" : json.r, + g: BI.isNull(json.r) ? "" : json.g, + b: BI.isNull(json.r) ? "" : json.b + }; + this.R.setValue(this.storeValue.r); + this.G.setValue(this.storeValue.g); + this.B.setValue(this.storeValue.b); }, getValue: function () { @@ -4610,9 +4626,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { return "transparent"; } return BI.DOM.rgb2hex(BI.DOM.json2rgb({ - r: this.R.getValue(), - g: this.G.getValue(), - b: this.B.getValue() + r: this.storeValue.r, + g: this.storeValue.g, + b: this.storeValue.b })); } }); diff --git a/dist/fineui.js b/dist/fineui.js index af72277d3..1feef5b66 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -77147,6 +77147,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { _init: function () { BI.ColorPickerEditor.superclass._init.apply(this, arguments); var self = this, o = this.options; + this.storeValue = {}; this.colorShow = BI.createWidget({ type: "bi.layout", cls: "color-picker-editor-display bi-card", @@ -77175,7 +77176,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { BI.each(Ws, function (i, w) { w.on(BI.TextEditor.EVENT_CHANGE, function () { self._checkEditors(); - if (self.R.isValid() && self.G.isValid() && self.B.isValid()) { + if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) { self.colorShow.element.css("background-color", self.getValue()); self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } @@ -77285,6 +77286,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { if(BI.isEmptyString(this.B.getValue())) { this.B.setValue(0); } + this.storeValue = { + r: this.R.getValue() || 0, + g: this.G.getValue() || 0, + b: this.B.getValue() || 0 + }; }, _showPreColor: function (color) { @@ -77305,6 +77311,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.R.setValue(""); this.G.setValue(""); this.B.setValue(""); + this.storeValue = { + r: "", + g: "", + b: "" + }; return; } if (!color) { @@ -77316,9 +77327,14 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.transparent.setSelected(false); this._showPreColor(color); var json = BI.DOM.rgb2json(BI.DOM.hex2rgb(color)); - this.R.setValue(BI.isNull(json.r) ? "" : json.r); - this.G.setValue(BI.isNull(json.g) ? "" : json.g); - this.B.setValue(BI.isNull(json.b) ? "" : json.b); + this.storeValue = { + r: BI.isNull(json.r) ? "" : json.r, + g: BI.isNull(json.r) ? "" : json.g, + b: BI.isNull(json.r) ? "" : json.b + }; + this.R.setValue(this.storeValue.r); + this.G.setValue(this.storeValue.g); + this.B.setValue(this.storeValue.b); }, getValue: function () { @@ -77326,9 +77342,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { return "transparent"; } return BI.DOM.rgb2hex(BI.DOM.json2rgb({ - r: this.R.getValue(), - g: this.G.getValue(), - b: this.B.getValue() + r: this.storeValue.r, + g: this.storeValue.g, + b: this.storeValue.b })); } }); diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.js b/src/case/colorchooser/colorpicker/editor.colorpicker.js index d3d25b5bd..1536c55bc 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js @@ -18,6 +18,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { _init: function () { BI.ColorPickerEditor.superclass._init.apply(this, arguments); var self = this, o = this.options; + this.storeValue = {}; this.colorShow = BI.createWidget({ type: "bi.layout", cls: "color-picker-editor-display bi-card", @@ -46,7 +47,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { BI.each(Ws, function (i, w) { w.on(BI.TextEditor.EVENT_CHANGE, function () { self._checkEditors(); - if (self.R.isValid() && self.G.isValid() && self.B.isValid()) { + if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) { self.colorShow.element.css("background-color", self.getValue()); self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } @@ -156,6 +157,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { if(BI.isEmptyString(this.B.getValue())) { this.B.setValue(0); } + this.storeValue = { + r: this.R.getValue() || 0, + g: this.G.getValue() || 0, + b: this.B.getValue() || 0 + }; }, _showPreColor: function (color) { @@ -176,6 +182,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.R.setValue(""); this.G.setValue(""); this.B.setValue(""); + this.storeValue = { + r: "", + g: "", + b: "" + }; return; } if (!color) { @@ -187,9 +198,14 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { this.transparent.setSelected(false); this._showPreColor(color); var json = BI.DOM.rgb2json(BI.DOM.hex2rgb(color)); - this.R.setValue(BI.isNull(json.r) ? "" : json.r); - this.G.setValue(BI.isNull(json.g) ? "" : json.g); - this.B.setValue(BI.isNull(json.b) ? "" : json.b); + this.storeValue = { + r: BI.isNull(json.r) ? "" : json.r, + g: BI.isNull(json.r) ? "" : json.g, + b: BI.isNull(json.r) ? "" : json.b + }; + this.R.setValue(this.storeValue.r); + this.G.setValue(this.storeValue.g); + this.B.setValue(this.storeValue.b); }, getValue: function () { @@ -197,9 +213,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { return "transparent"; } return BI.DOM.rgb2hex(BI.DOM.json2rgb({ - r: this.R.getValue(), - g: this.G.getValue(), - b: this.B.getValue() + r: this.storeValue.r, + g: this.storeValue.g, + b: this.storeValue.b })); } });