Merge pull request #212103 in DEC/fineui from master to feature/x

* commit 'e40e4ff43b13183e851847567e88082420b90cf7':
  auto upgrade version to 2.0.20221216114354
  KERNEL-13893 feat: 颜色选择器默认色板候选调整

package.json

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

src/case/colorchooser/colorpicker/colorpicker.hex.js

@@ -11,118 +11,173 @@ BI.HexColorPicker = BI.inherit(BI.Widget, {
     },
 
     _items: [
-        [{
+        [
-            value: "#808080"
+            {
-        }, {
+                "value": "#999999"
-            value: "#ffffff"
+            },
-        }, {
+            {
-            value: "#ffebe5"
+                "value": "#FFFFFF"
-        }, {
+            },
-            value: "#ffddba"
+            {
-        }, {
+                "value": "#FFE5E5"
-            value: "#ffeebb"
+            },
-        }, {
+            {
-            value: "#d4e9bf"
+                "value": "#FFF1E5"
-        }, {
+            },
-            value: "#c7e1e1"
+            {
-        }, {
+                "value": "#FFF9E5"
-            value: "#bfe3f0"
+            },
-        }, {
+            {
-            value: "#ccd6eb"
+                "value": "#E9F5E9"
-        }],
+            },
-        [{
+            {
-            value: "#616161"
+                "value": "#EAEEFF"
-        }, {
+            },
-            value: "#f2f2f2"
+            {
-        }, {
+                "value": "#EFEBF7"
-            value: "#ffd6cc"
+            },
-        }, {
+            {
-            value: "#ffb87a"
+                "value": "#FCE8EF"
-        }, {
+            }
-            value: "#ffdf91"
+        ],
-        }, {
+        [
-            value: "#b7d2b6"
+            {
-        }, {
+                "value": "#737373"
-            value: "#a3d2c9"
+            },
-        }, {
+            {
-            value: "#8ab6d6"
+                "value": "#F2F2F2"
-        }, {
+            },
-            value: "#bcbce0"
+            {
-        }],
+                "value": "#FFA6A6"
-        [{
+            },
-            value: "#404040"
+            {
-        }, {
+                "value": "#FFD0A6"
-            value: "#dedede"
+            },
-        }, {
+            {
-            value: "#ffab9b"
+                "value": "#FFEDA6"
-        }, {
+            },
-            value: "#eb8a3a"
+            {
-        }, {
+                "value": "#B3DCB2"
-            value: "#ffc947"
+            },
-        }, {
+            {
-            value: "#8aa964"
+                "value": "#B9C6FF"
-        }, {
+            },
-            value: "#5eaaa0"
+            {
-        }, {
+                "value": "#CABAE6"
-            value: "#2978b5"
+            },
-        }, {
+            {
-            value: "#8f8faa"
+                "value": "#F8B1C9"
-        }],
+            }
-        [{
+        ],
-            value: "#202020"
+        [
-        }, {
+            {
-            value: "#bfbfbf"
+                "value": "#4C4C4C"
-        }, {
+            },
-            value: "#df7461"
+            {
-        }, {
+                "value": "#D9D9D9"
-            value: "#cf7536"
+            },
-        }, {
+            {
-            value: "#e6b63b"
+                "value": "#FF5959"
-        }, {
+            },
-            value: "#5b8a72"
+            {
-        }, {
+                "value": "#FFA759"
-            value: "#3b9aa3"
+            },
-        }, {
+            {
-            value: "#336291"
+                "value": "#FFDD59"
-        }, {
+            },
-            value: "#58568f"
+            {
-        }],
+                "value": "#7EBE70"
-        [{
+            },
-            value: "#000000"
+            {
-        }, {
+                "value": "#7B95FF"
-            value: "#a1a1a1"
+            },
-        }, {
+            {
-            value: "#b55140"
+                "value": "#9C7FD0"
-        }, {
+            },
-            value: "#a6713c"
+            {
-        }, {
+                "value": "#F06D99"
-            value: "#ad975f"
+            }
-        }, {
+        ],
-            value: "#5f7d6e"
+        [
-        }, {
+            {
-            value: "#3b7480"
+                "value": "#262626"
-        }, {
+            },
-            value: "#425d78"
+            {
-        }, {
+                "value": "#BFBFBF"
-            value: "#62608a"
+            },
-        }]
+            {
+                "value": "#FF0000"
+            },
+            {
+                "value": "#FF7800"
+            },
+            {
+                "value": "#FFCB00"
+            },
+            {
+                "value": "#259B23"
+            },
+            {
+                "value": "#355CFF"
+            },
+            {
+                "value": "#673AB7"
+            },
+            {
+                "value": "#E91E63"
+            }
+        ],
+        [
+            {
+                "value": "#000000"
+            },
+            {
+                "value": "#A6A6A6"
+            },
+            {
+                "value": "#A80000"
+            },
+            {
+                "value": "#B65600"
+            },
+            {
+                "value": "#CEB000"
+            },
+            {
+                "value": "#0E550C"
+            },
+            {
+                "value": "#09269C"
+            },
+            {
+                "value": "#3A1A73"
+            },
+            {
+                "value": "#B30072"
+            }
+        ]
     ],
 
     render: function () {
         var self = this, o = this.options;
+        
         return {
             type: "bi.button_group",
             items: this._digest(o.items || this._items),
-            layouts: [{
+            layouts: [
-                type: "bi.grid",
+                {
-            }],
+                    type: "bi.grid",
+                }
+            ],
             value: o.value,
-            listeners: [{
+            listeners: [
-                eventName: BI.ButtonGroup.EVENT_CHANGE,
+                {
-                action: function () {
+                    eventName: BI.ButtonGroup.EVENT_CHANGE,
-                    self.fireEvent(BI.HexColorPicker.EVENT_CHANGE, arguments);
+                    action: function () {
+                        self.fireEvent(BI.HexColorPicker.EVENT_CHANGE, arguments);
+                    }
                 }
-            }],
+            ],
             ref: function (_ref) {
                 self.colors = _ref;
             }