Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20211102143200",
+  "version": "2.0.20211107204304",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

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()) {
+                                    var value = self.getValue();
-                                        self.lastColor = self.getValue();
+                                    self.setValue("transparent");
-                                        self.setValue("transparent");
+                                    (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-                                    } 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);
-                                    }
                                 }
                             }],
                             ref: function (_ref) {
@@ -101,16 +90,9 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
                                 listeners: [{
                                     eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
                                     action: function () {
-                                        if (this.isSelected()) {
+                                        var value = self.getValue();
-                                            self.lastColor = self.getValue();
+                                        self.setValue("");
-                                            self.setValue("");
+                                        (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-                                        } 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);
-                                        }
                                     }
                                 }],
                                 ref: function (_ref) {

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()) {
+            var value = self.getValue();
-                self.lastColor = self.getValue();
+            self.setValue("");
-                self.setValue("");
+            (value !== "") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-            } 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);
-            }
         });
 
         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()) {
+            var value = self.getValue();
-                self.lastColor = self.getValue();
+            self.setValue("transparent");
-                self.setValue("transparent");
+            (value !== "transparent") && self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
-            } 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);
-            }
         });
 
         BI.createWidget({

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];

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 {
@@ -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)) {