@steedos-widgets/sortable 3.6.2-beta.11 → 3.6.2-beta.13

package/dist/sortable.umd.js

@@ -20252,6 +20252,9 @@
             if(uiSchema.enable_split){
                 defaultDisplay = "split";
             }
+            if(window.innerWidth <= 768){
+                return "grid";
+            }
             return value ? value : defaultDisplay;
         },
       
@@ -21681,7 +21684,7 @@
     }
 
     function getFieldWidth(width){
-        const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
+        const defaultWidth = null;
         if(typeof width == 'string'){
             if(isNaN(width)){
                 return width || defaultWidth;
@@ -21711,14 +21714,14 @@
             //增加quickEdit属性，实现快速编辑
             const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
             let className = "";
-            if(field.wrap != true){
-                if(field.wrap != false && field.is_wide){
-                    className += " break-words ";
-                }else {
+            if(/Safari/.test(navigator.userAgent)){
+                className += " whitespace-nowrap ";
+            }else {
+                if(field.wrap != true){
                     className += " whitespace-nowrap ";
+                }else {
+                    className += " break-words ";
                 }
-            }else {
-                className += " break-words ";
             }
             let columnItem;
             if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
@@ -25327,17 +25330,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     function getLookupSapceUserTreeSchema(isMobile){
         let apiAdaptor = `
-        // console.log("===getLookupSapceUserTreeSchema===", JSON.stringify(payload));
         const records = payload.data.options;
-        let isTreeOptionsComputed = false;
-        if(records.length === 1 && records[0].children){
-            isTreeOptionsComputed = true;
-        }
-        if(isTreeOptionsComputed){
-            return payload;
-        }
         const treeRecords = [];
-        const getChildren = (records, childrenIds) => {
+        const getChildren = (currentRecord, records, childrenIds) => {
+            if (currentRecord.children && typeof currentRecord.children[0] === "object") {
+                // 考虑api配置了cache缓存的话，不会请求接口但是会重新进这个接收适配器脚本且payload.data.options返回的会是上一次计算结果，这里直接返回计算过的children
+                return currentRecord.children;
+            }
             if (!childrenIds) {
                 return;
             }
@@ -25346,7 +25345,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             });
             _.each(children, (item) => {
                 if (item.children) {
-                    item.children = getChildren(records, item.children)
+                    item.children = getChildren(item, records, item.children)
                 }else{
                     item.children = [];
                 }
@@ -25372,7 +25371,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         
         _.each(records, (record) => {
             if (record.noParent == 1) {
-                treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));
+                treeRecords.push(Object.assign({}, record, { children: getChildren(record, records, record.children) }));
             }
         });
         console.log(treeRecords)
@@ -25422,6 +25421,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               }
             },
             "label": "",
+            "mode": "normal",
             "name": "organizations",
             "multiple": false,
             "joinValues": false,
@@ -27107,7 +27107,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }else {
                 convertData.className = 'm-0';
             }
-            if(readonly){
+            if(readonly && ctx.mode !== 'edit'){
                 convertData.className = `${convertData.className} border-b`;
             }
             if(readonly){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.11",
+  "version": "3.6.2-beta.13",
   "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.11"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.13"
   },
-  "gitHead": "c8f1202857d0988250628012afbc80be391eae3d"
+  "gitHead": "777952ca7bc0b4ccefe42aa31ae064b7df943e09"
 }