@steedos-widgets/sortable 1.3.17 → 1.3.18

package/dist/sortable.umd.js

@@ -21630,9 +21630,9 @@
         const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
         if(typeof width == 'string'){
             if(isNaN(width)){
-                return width;
+                return width || defaultWidth;
             }else {
-                return Number(width);
+                return Number(width) || defaultWidth;
             }
         }else if(typeof width == 'number'){
             return width;
@@ -21733,6 +21733,7 @@
                     width: getFieldWidth(field.width),
                     toggled: field.toggled,
                     className,
+                    inputClassName: "inline",
                     static: true,
                 }, field.amis, {name: field.name});
             }
@@ -21770,6 +21771,7 @@
                         tpl: tpl,
                         toggled: field.toggled,
                         className,
+                        inputClassName: "inline",
                         static: true,
                         options: field.type === 'html' ? {html: true} : null
                         // toggled: true 
@@ -21791,8 +21793,8 @@
             const href = Router.getObjectDetailPath({
                 ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
             });
-            columns[0].type = "tpl";
-            columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
+            columns[1].type = "tpl";
+            columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
         }
         return columns;
     }
@@ -23236,78 +23238,97 @@
 
     function fieldsExtend$4(){
       return {
+        "group": "",
         "label": {
           "is_wide": true
         },
         "name": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "object_name": {
+          "group": "",
           "amis": {
             "hidden": true
           }
         },
         "filter_scope": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "columns": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "mobile_columns":{
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "searchable_fields":{
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "filter_fields": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "scrolling_mode": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "sort": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "show_count": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "type": {
+          "group": "",
           "amis": {
             "hidden": true,
             "required": false
           }
         },
         "shared": {
+          "group": "",
           "amis": {
             "visibleOn": "${global.user.is_space_admin}"
           }
+        },
+        "filters": {
+          "group": "",
+          "amis": {
+            "hidden": true
+          }
         }
       }
     }
@@ -23454,6 +23475,12 @@
           "amis": {
             "visibleOn": "${global.user.is_space_admin}"
           }
+        },
+        "filters": {
+          "group": "",
+          "amis": {
+            "hidden": true
+          }
         }
       }
     }
@@ -23792,7 +23819,6 @@
           }
         },
         "mobile_columns": {
-          "group": instance.t('frontend_listview_control_columns_mobile_group'),
           "amis": {
             "type": "transfer",
             "sortable": true,
@@ -25066,8 +25092,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return amisSchema;
     }
 
-    const keywordsSearchBoxName = `__keywords_lookup`;
-
     const getReferenceToFieldSchema = (field, refObjectConfig)=>{
         let referenceTo = field.reference_to;
         if(!referenceTo){
@@ -25326,7 +25350,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         
         source.data.$term = "$term";
         source.data.$self = "$$";
-        
+
+        // field.name可能是带点的名称，比如审批王中子表字段'instances.instances_submitter'，如果不替换掉点，会造成审批王表单中新建子表行时报错
+        let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
+
         source.requestAdaptor = `
         let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
         let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
@@ -25469,6 +25496,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
         payload.data.rows = treeRecords;
+        try{
+            setTimeout(() => {
+                $('.amis-dialog-widget.antd-Modal .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn')[0]?.click();
+            }, 600);
+        }
+        catch(ex){
+            console.error("tree数据格式展开异常：", ex);
+        }
     }
     return payload;
     `;
@@ -25641,6 +25676,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     async function lookupToAmisSelect(field, readonly, ctx){
         let referenceTo = await getReferenceTo(field);
+        const isMobile = window.innerWidth <= 768;
         const valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;
         // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
@@ -25821,7 +25857,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         </span>
         <span class='pl-1.5'>\${label}</span>
     </span>`;
-        data.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+        const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+        // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+        if(!(isMobile && field.multiple)){
+            data.menuTpl = menuTpl;
+        }
         if(field.multiple){
             data.multiple = true;
             data.extractValue = true;
@@ -26205,6 +26245,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     async function convertSFieldToAmisField(field, readonly, ctx) {
+        // console.log('convertSFieldToAmisField====>', field, readonly, ctx)
+        const isMobile = window.innerWidth <= 768;
         // 创建人和修改人、创建时间和修改时间不显示
         if(lodash.exports.includes(OMIT_FIELDS, field.name) && ctx.showSystemFields != true){
             return;
@@ -26267,7 +26309,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     </span>
                     <span class='pl-1.5'>\${label}</span>
                 </span>`;
-                    convertData.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                    const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                    // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+                    if(!(isMobile && field.multiple)){
+                        convertData.menuTpl = menuTpl;
+                    }
                     if(field.multiple){
                         convertData.multiple = true;
                         convertData.extractValue = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "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": "1.3.17"
+    "@steedos-widgets/amis-lib": "1.3.18"
   },
-  "gitHead": "d5913f7f83ea078e461357d66193d77874ef0c06"
+  "gitHead": "f3b0222793b8b873dbab5424ecfdee95ee7329d5"
 }