@steedos-widgets/sortable 3.6.2-beta.12 → 3.6.2-beta.14

package/dist/sortable.umd.js

@@ -20287,8 +20287,8 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-20 16:29:22
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-12-28 14:59:08
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2024-01-25 14:44:17
      * @Description: 
      */
 
@@ -20360,6 +20360,25 @@
       }
     }
 
+    /**
+     * 判断浏览器类型
+     * @returns 按需返回浏览器类型;
+     */
+     function getBowserType() {
+        const userAgent = navigator.userAgent;
+        if (userAgent.indexOf("Chrome")!== -1 && userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Edg") === -1) {
+          return "Chrome";
+        } else if (userAgent.indexOf("Firefox") !== -1) {
+          return "Firefox";
+        } else if (userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Chrome") === -1 && userAgent.indexOf("Edge") === -1) {
+          return "Safari";
+        } else if (userAgent.indexOf("Edg") !== -1) {
+          return "Edge";
+        } else {
+          return "Unknown browser"; // 其他浏览器...（可根据自己需要确定是否新增其他浏览器的判断）
+        }
+    }
+
     function getNumberTpl(field){
         return `<span>\${_display.${field.name}}</span>`
     }
@@ -21509,7 +21528,8 @@
                                             "failed": "失败了呢。。"
                                           }
                                         }
-                                    }
+                                    },
+                                    "expression": "${!recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -21525,7 +21545,7 @@
                                     "componentId": quickEditId,
                                     "args": {
                                         "value":{
-                                            "quickedit_record_permissions": "${event.data}"
+                                            "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                         }
                                     }
                                 }
@@ -21589,7 +21609,7 @@
                                           `
                                             }
                                         },
-                                        "expression":"${event.data.value}"
+                                        "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                     },
                                     {
                                         "actionType": "setValue",
@@ -21620,10 +21640,20 @@
                                                             "script": `
                                                             const noPermission = event.data.noPermission;
                                                             const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
-                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            let selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
                                                             noPermission.forEach(function (item) {
                                                                 crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                                _.remove(selectedItems, (selected) => selected._id === item);
                                                             })
+                                                            doAction({
+                                                                "componentId": "${quickEditId}",
+                                                                "actionType": "setValue",
+                                                                "args": {
+                                                                    "value": {
+                                                                        selectedItems
+                                                                    }
+                                                                }
+                                                            });
                                                         `
                                                         },
                                                         {
@@ -21714,7 +21744,8 @@
             //增加quickEdit属性，实现快速编辑
             const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
             let className = "";
-            if(/Safari/.test(navigator.userAgent)){
+            const bowserType = getBowserType();
+            if(bowserType === "Safari"){
                 className += " whitespace-nowrap ";
             }else {
                 if(field.wrap != true){
@@ -21723,6 +21754,18 @@
                     className += " break-words ";
                 }
             }
+
+            if (typeof field.amis?.className == "object") {
+                className = {
+                    [className]: "true",
+                    ...field.amis.className
+                };
+            } else if (typeof field.amis?.className == "string") {
+                className = `${className} ${field.amis.className} `;
+            }
+            let fieldAmis = lodash.exports.clone(field.amis);
+            delete fieldAmis?.className;
+
             let columnItem;
             if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
                 const previewFileScript = `
@@ -21773,7 +21816,7 @@
                     toggled: field.toggled,
                     static: true,
                     className,
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
                 columnItem = Object.assign({}, {
                     type: "switch",
@@ -21784,7 +21827,7 @@
                     static: true,
                     className,
                     ...getAmisFileReadonlySchema(field)
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }
             else if(field.type === 'select'){
                 const map = getSelectMap(field.options);
@@ -21799,7 +21842,7 @@
                     className,
                     inputClassName: "inline",
                     static: true,
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
             }
             else {
                 const tpl = await getFieldTpl(field, options);
@@ -21826,15 +21869,6 @@
                 // }
 
                 //field上的amis属性里的clssname需要单独判断类型合并
-                if (typeof field.amis?.className == "object") {
-                    className = {
-                        [className]: "true",
-                        ...field.amis.className
-                    };
-                } else if (typeof field.amis?.className == "string") {
-                    className = `${className} ${field.amis.className} `;
-                }
-                delete field.amis?.className;
 
                 if(!field.hidden && !field.extra){
                     columnItem = Object.assign({}, {
@@ -21851,7 +21885,7 @@
                         static: true,
                         options: field.type === 'html' ? {html: true} : null
                         // toggled: true 
-                    }, field.amis, {name: field.name});
+                    }, fieldAmis, {name: field.name});
                     
                     if(field.type === 'color'){
                         columnItem.type = 'color';
@@ -25421,6 +25455,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               }
             },
             "label": "",
+            "mode": "normal",
             "name": "organizations",
             "multiple": false,
             "joinValues": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.12",
+  "version": "3.6.2-beta.14",
   "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": "3.6.2-beta.12"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.14"
   },
-  "gitHead": "b33f87b4a0a125c4662bd07bb7dd553208ee90c4"
+  "gitHead": "2a262e978bb60a8cbba19c572024289c7f7ebcbb"
 }