From 22945e71586d40ff127f2c74195d8b1359019208 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 2 Nov 2021 16:11:57 +0800 Subject: [PATCH 1/9] auto upgrade version to 2.0.20211102161149 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 681253437..11010334d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211102143200", + "version": "2.0.20211102161149", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 5e8abc7b6a8ec01d3ce89f42baaf63cc57e91ee0 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Wed, 3 Nov 2021 19:33:40 +0800 Subject: [PATCH 2/9] =?UTF-8?q?CHART-21632=20fix:=E4=B8=8E=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E6=B2=9F=E9=80=9A=EF=BC=8C=E8=87=AA=E5=8A=A8/?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E6=8C=89=E9=92=AE=E5=86=8D=E6=AC=A1=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=97=B6=E4=B8=8D=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../colorpicker/editor.colorpicker.hex.js | 30 ++++--------------- .../colorpicker/editor.colorpicker.js | 30 ++++--------------- 2 files changed, 12 insertions(+), 48 deletions(-) diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js index 6aa07afe8..83b7b9462 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js @@ -72,20 +72,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.ColorChooserShowButton.EVENT_CHANGE, action: function () { - if (this.isSelected()) { - self.lastColor = self.getValue(); - self.setValue("transparent"); - } else { - if (self.lastColor === "transparent") { - self.lastColor = ""; - } - self.setValue(self.lastColor || "#ffffff"); - } - if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || - self._isEmptyRGB()) { - self.colorShow.element.css("background-color", self.getValue()); - self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); - } + var value = self.getValue(); + self.setValue("transparent"); + (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } }], ref: function (_ref) { @@ -101,16 +90,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, { listeners: [{ eventName: BI.ColorChooserShowButton.EVENT_CHANGE, action: function () { - if (this.isSelected()) { - self.lastColor = self.getValue(); - self.setValue(""); - } else { - self.setValue(self.lastColor || "#ffffff"); - } - if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) { - self.colorShow.element.css("background-color", self.getValue()); - self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); - } + var value = self.getValue(); + self.setValue(""); + (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); } }], ref: function (_ref) { diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.js b/src/case/colorchooser/colorpicker/editor.colorpicker.js index 4be3375a4..9d0dbbca0 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js @@ -72,16 +72,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { title: BI.i18nText("BI-Basic_Auto") }); this.none.on(BI.IconButton.EVENT_CHANGE, function () { - if (this.isSelected()) { - self.lastColor = self.getValue(); - self.setValue(""); - } else { - self.setValue(self.lastColor || "#ffffff"); - } - if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || self._isEmptyRGB()) { - self.colorShow.element.css("background-color", self.getValue()); - self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); - } + var value = self.getValue(); + self.setValue(""); + (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); }); this.transparent = BI.createWidget({ @@ -94,20 +87,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { title: BI.i18nText("BI-Transparent_Color") }); this.transparent.on(BI.IconButton.EVENT_CHANGE, function () { - if (this.isSelected()) { - self.lastColor = self.getValue(); - self.setValue("transparent"); - } else { - if (self.lastColor === "transparent") { - self.lastColor = ""; - } - self.setValue(self.lastColor || "#ffffff"); - } - if ((self.R.isValid() && self.G.isValid() && self.B.isValid()) || - self._isEmptyRGB()) { - self.colorShow.element.css("background-color", self.getValue()); - self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); - } + var value = self.getValue(); + self.setValue("transparent"); + (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE); }); BI.createWidget({ From 91f4eae752596e6c81f1444f3ab3618152cd20d8 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 4 Nov 2021 09:44:06 +0800 Subject: [PATCH 3/9] auto upgrade version to 2.0.20211104094350 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 11010334d..e88ac6e5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211102161149", + "version": "2.0.20211104094350", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From ff4a43ca5dbc5ba8894850e6944938088da64755 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 4 Nov 2021 14:48:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=AE=B9?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/6.inject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/6.inject.js b/src/core/6.inject.js index b60093e31..ed4d1165b 100644 --- a/src/core/6.inject.js +++ b/src/core/6.inject.js @@ -397,7 +397,7 @@ if (!providers[type]) { providers[type] = new providerInjection[type](); } - if (!providerInstance[type]) { + if (!providerInstance[type] && providers[type].$get) { providerInstance[type] = new (providers[type].$get())(config); } return providerInstance[type]; From 9cdce313ae3adc03257b1c6b5c7e71e3ea6e23e1 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 4 Nov 2021 15:02:06 +0800 Subject: [PATCH 5/9] auto upgrade version to 2.0.20211104150155 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e88ac6e5c..e75291645 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211104094350", + "version": "2.0.20211104150155", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 572e5cc9beedfa4e96860b4e7ec34de901507331 Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 5 Nov 2021 09:31:23 +0800 Subject: [PATCH 6/9] =?UTF-8?q?DEC-21295=20fix:=20=E3=80=90=E4=B8=93?= =?UTF-8?q?=E9=A2=98=E3=80=91=E3=80=90=E7=9B=AE=E5=BD=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E7=AE=A1=E7=90=86=E7=9B=AE=E5=BD=95=E4=B8=8B=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=B1=95=E5=BC=80=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=BD=95=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index 01ff69be8..db45e7af7 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -420,6 +420,7 @@ BI.Layout = BI.inherit(BI.Widget, { var shouldUpdate = this.shouldUpdateItem(oldIndex, vnode); var child = this._children[this._getChildName(oldIndex)]; if (shouldUpdate) { + this._children[this._getChildName(newIndex) + "-temp"] = child; return child._update(this._getOptions(vnode), shouldUpdate); } if (shouldUpdate === null && !this._compare(oldVnode, vnode)) { From 022c1750f671ae1849c9df8e9c08ff57a28692e3 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 5 Nov 2021 13:54:30 +0800 Subject: [PATCH 7/9] auto upgrade version to 2.0.20211105135413 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e75291645..cfb431787 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211104150155", + "version": "2.0.20211105135413", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 41a5ee08418801c9c8e75532639a2ae1c19f178c Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 7 Nov 2021 20:29:03 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=8D=A2=E4=B8=80=E7=A7=8D=E5=86=99?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index db45e7af7..bc48cd3f4 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -240,7 +240,7 @@ BI.Layout = BI.inherit(BI.Widget, { var w = this._newElement(newIndex, item); // 需要有个地方临时存一下新建的组件，否则如果直接使用newIndex的话，newIndex位置的元素可能会被用到 this._children[this._getChildName(newIndex) + "-temp"] = w; - var nextSibling = del.element[0].nextSibling; + var nextSibling = del.element.next(); if (nextSibling) { BI.Widget._renderEngine.createElement(nextSibling).before(w.element); } else { From 30240a5d5c1d03e63a2245efe01f0f4f12287b44 Mon Sep 17 00:00:00 2001 From: data Date: Sun, 7 Nov 2021 20:43:18 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20211107204304 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cfb431787..13ede08ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211105135413", + "version": "2.0.20211107204304", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",