@steedos-widgets/sortable 6.3.11-beta.9 → 6.3.12-beta.1

package/dist/sortable.umd.js

@@ -20287,7 +20287,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-20 16:29:22
      * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2024-10-14 13:33:27
+     * @LastEditTime: 2024-11-17 13:05:44
      * @Description: 
      */
 
@@ -20312,13 +20312,29 @@
       window.getImageFieldUrl = getImageFieldUrl;
     }
 
+
+
+    // js color
+
+    function toGrayscale(r, g, b){
+      return (
+        0.2126 * r +
+        0.7152 * g +
+        0.0722 * b
+      );
+    }
+
+    function isLight(r, g, b){
+      // 专业的亮度是 > 255 / 2. 此处的阈值调整为200 
+      return toGrayscale(r, g, b) > 200
+    }
+
     function getContrastColor(bgColor) {
       var backgroundColor = (bgColor.charAt(0) === '#') ? bgColor.substring(1, 7) : bgColor;
       var r = parseInt(backgroundColor.substr(0, 2), 16);
       var g = parseInt(backgroundColor.substr(2, 2), 16);
       var b = parseInt(backgroundColor.substr(4, 2), 16);
-      var brightness = (r * 299 + g * 587 + b * 114) / 1000;
-      return brightness < 128 ? "#ffffff" : "#000000";
+      return isLight(r, g, b) ? "#000000" : "#ffffff";
     }
 
     function getLookupListView(refObjectConfig) {
@@ -20427,7 +20443,7 @@
             if(optionColor && optionColor != "undefined"){
                 const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
                 const color = getContrastColor(background);
-                const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
+                const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem;font-size:14px';
                 map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
             }else {
                 map[optionValue] = option.label;
@@ -20841,7 +20857,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
      * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2024-10-14 14:01:15
+     * @LastEditTime: 2024-11-14 10:50:01
      * @Description: 
      */
 
@@ -20900,6 +20916,7 @@
                             "title": "&nbsp;",
                             "headerClassName": "hidden",
                             "size": "lg",
+                            "width": "70%",
                             "bodyClassName": "p-0 m-0 bg-gray-100",
                             "closeOnEsc": true,
                             "closeOnOutside": true,
@@ -21992,6 +22009,7 @@
                       "title": "&nbsp;",
                       "headerClassName": "hidden",
                       "size": "lg",
+                      "width": "70%",
                       "bodyClassName": "p-0 m-0 bg-gray-100",
                       "closeOnEsc": true,
                       "closeOnOutside": true,
@@ -27275,6 +27293,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         type: "static-mapping",
                         name: field.name,
                         label: field.label,
+                        options: field.options,
                         map: map
                     };
                 }else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.11-beta.9",
+  "version": "6.3.12-beta.1",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "6.3.11-beta.9"
+    "@steedos-widgets/amis-lib": "6.3.12-beta.1"
   },
-  "gitHead": "be88aea9725de92242a0ca303b32f248d114fa22"
+  "gitHead": "98cb69b94cbb05678ff1a577e90053f38de98b8d"
 }