@steedos-widgets/sortable 6.3.10 → 6.3.11-beta.11

package/dist/sortable.umd.js

@@ -20286,18 +20286,24 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-20 16:29:22
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2024-01-25 14:44:17
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2024-11-17 13:05:44
      * @Description: 
      */
 
-    function getImageFieldUrl(url) {
-      if (window.Meteor && window.Meteor.isCordova != true) {
-        //  '//'的位置
-        const doubleSlashIndex = url.indexOf('//');
-        const urlIndex = url.indexOf('/', doubleSlashIndex + 2);
-        const rootUrl = url.substring(urlIndex);
-        return rootUrl;
+    function getImageFieldUrl(url, readonly) {
+      if (window.Meteor) {
+        if(window.Meteor.isCordova != true){
+          //  '//'的位置
+          const doubleSlashIndex = url.indexOf('//');
+          const urlIndex = url.indexOf('/', doubleSlashIndex + 2);
+          const rootUrl = url.substring(urlIndex);
+          return rootUrl;
+        }else {
+          if(readonly || url.startsWith('http')){
+            return `${url}?token=${window.btoa(JSON.stringify({ authToken : Builder.settings.context.authToken }))}`
+          }
+        }
       }
       return url;
     }
@@ -20306,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) {
@@ -20421,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;
@@ -20835,7 +20857,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
      * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2024-08-19 16:26:58
+     * @LastEditTime: 2024-11-14 10:50:01
      * @Description: 
      */
 
@@ -20894,6 +20916,7 @@
                             "title": "&nbsp;",
                             "headerClassName": "hidden",
                             "size": "lg",
+                            "width": "70%",
                             "bodyClassName": "p-0 m-0 bg-gray-100",
                             "closeOnEsc": true,
                             "closeOnOutside": true,
@@ -20933,13 +20956,13 @@
         if(type === 'file'){
             return window.Meteor?.isCordova ? {
                 "type": "control",
-                "body": {
+                "body": steedosField.multiple ? {
                     "type": "each",
                     "name": "_display." + steedosField.name,
                     "items": {
                         "type": "tpl",
                         "tpl": "${name}",
-                        "className": "antd-Button--link inline-block",
+                        "className": "antd-Button--link inline-block mr-2",
                         "onEvent": {
                             "click": {
                                 "actions": [
@@ -20954,6 +20977,24 @@
                             }
                         }
                     }
+                } : {
+                    "type": "tpl",
+                    "tpl": "${_display." + steedosField.name + ".name}",
+                    "className": "antd-Button--link inline-block",
+                    "onEvent": {
+                        "click": {
+                            "actions": [
+                                {
+                                    "script": `
+                                    const data = event.data._display.${steedosField.name};
+                                    Steedos.cordovaDownload(encodeURI(data.url), data.name);
+                                `,
+                                    "actionType": "custom"
+                                }
+                            ],
+                            "weight": 0
+                        }
+                    }
                 }
             } : {
                 // type: amisFieldType,
@@ -21968,6 +22009,7 @@
                       "title": "&nbsp;",
                       "headerClassName": "hidden",
                       "size": "lg",
+                      "width": "70%",
                       "bodyClassName": "p-0 m-0 bg-gray-100",
                       "closeOnEsc": true,
                       "closeOnOutside": true,
@@ -22621,7 +22663,7 @@
     /*
         img/avatar字段值添加URL前缀使其在amis中正常显示图片。
     */
-    function getScriptForAddUrlPrefixForImgFields(fields){
+    function getScriptForAddUrlPrefixForImgFields(fields, readonly){
         let imgFieldsKeys = [];
         let imgFields = {};
         fields.forEach((item)=>{
@@ -22649,12 +22691,12 @@
                         if(fieldProps.multiple){
                             if(imgFieldDisplayValue instanceof Array){
                                 data[item] = imgFieldDisplayValue.map((i)=>{ 
-                                    const url = window.getImageFieldUrl(i.url);
+                                    const url = window.getImageFieldUrl(i.url, ${readonly});
                                     return url;
                                 });
                             }
                         }else{
-                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url);
+                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url, ${readonly});
                             data[item] = url;
                         }
                     }
@@ -27374,7 +27416,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 // }
                 // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
                 convertData = {
-                    type: "input-date-range",
+                    type: "input-datetime-range",
                     inputFormat: "YYYY-MM-DD HH:mm",
                     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                     tpl: readonly ? getDateTimeTpl(field) : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.10",
+  "version": "6.3.11-beta.11",
   "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.10"
+    "@steedos-widgets/amis-lib": "6.3.11-beta.11"
   },
-  "gitHead": "96594583a24bfe3051611eb3573e05dd135287aa"
+  "gitHead": "f0f24add9a8427e1715a5a6f9a765a1725ed0581"
 }