@steedos-widgets/sortable 3.6.2-beta.7 → 3.6.2-beta.9

package/dist/sortable.umd.js

@@ -20238,22 +20238,26 @@
      * @Description:
      */
 
-
     const Router = {
         getTabDisplayAs(tab_id){
+            const uiSchema = getUISchemaSync$1(tab_id, false);
             var urlSearch = new URLSearchParams(document.location.search); 
             if(urlSearch.has('display')){
                 return urlSearch.get('display')
             }
             const key = `tab_${tab_id}_display`;
             // const key = `page_display`;
-            const value = localStorage.getItem(key);
-            return value ? value : 'grid'
+            const value = sessionStorage.getItem(key);
+            let defaultDisplay = "grid";
+            if(uiSchema.enable_split){
+                defaultDisplay = "split";
+            }
+            return value ? value : defaultDisplay;
         },
       
         setTabDisplayAs(tab_id, displayAs){
             const key = `tab_${tab_id}_display`;
-            localStorage.setItem(key, displayAs);
+            sessionStorage.setItem(key, displayAs);
         },
         getAppPath({formFactor, appId}){
             return `/app/${appId}`;
@@ -20407,7 +20411,7 @@
 
     function getNameTplUrl(field, ctx){
         if(ctx.objectName === 'cms_files'){
-            return `\${context.rootUrl}/api/files/files/\${versions[0]}?download=true`
+            return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
         }
         const href = Router.getObjectDetailPath({
             ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
@@ -21704,7 +21708,11 @@
             const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
             let className = "";
             if(field.wrap != true){
-                className += " whitespace-nowrap ";
+                if(field.wrap != false && field.is_wide){
+                    className += " break-words ";
+                }else {
+                    className += " whitespace-nowrap ";
+                }
             }else {
                 className += " break-words ";
             }
@@ -21803,12 +21811,12 @@
                 if(field.type === 'textarea'){
                     className += 'min-w-56';
                 }
-                if(field.type === 'date'){
-                    className += 'date-min-w';
-                }
-                if(field.type === 'datetime'){
-                    className += 'datetime-min-w';
-                }
+                // if(field.type === 'date'){
+                //     className += 'date-min-w';
+                // }
+                // if(field.type === 'datetime'){
+                //     className += 'datetime-min-w';
+                // }
 
                 //field上的amis属性里的clssname需要单独判断类型合并
                 if (typeof field.amis?.className == "object") {
@@ -21903,7 +21911,7 @@
             }
             if(isLeft){
                 // 左侧半行
-                lineChildrenClassName = "steedos-listview-item-left truncate";
+                lineChildrenClassName = "steedos-listview-item-left truncate h-5";
                 if(item.field.is_wide){
                     // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
                     lineChildrenClassName = "steedos-listview-item-wide";
@@ -21915,7 +21923,7 @@
             }
             else {
                 // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
-                lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
+                lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0 h-5";
             }
             //支持字段amis属性配置classname，识别classname的类型，与原样式合并
             var className;
@@ -22026,7 +22034,15 @@
                             "actions": [
                                 {
                                     "script": `
-                                    let cms_url = "/api/files/files/"+event.data.versions[0]+"?download=true"
+                                    let cms_url = '';
+                                    let value = event.data.versions[0];
+                                    if(value){
+                                        if(value.url){
+                                            cms_url = value.url;
+                                        }else{
+                                            cms_url = "/api/files/files/"+value+"?download=true"
+                                        }
+                                    }
                                     Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
                                 `,
                                     "actionType": "custom"
@@ -22398,7 +22414,7 @@
 
     function getDefaultParams(options){
         return {
-            perPage: options.top || options.perPage || 10
+            perPage: options.top || options.perPage || 20
         }
     }
 
@@ -22452,7 +22468,6 @@
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -24236,14 +24251,14 @@
         {
           "type": "button",
           "label": instance.t('frontend_display_type_is_table'),
-          "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+          "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
           "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
           "rightIconClassName": "m-l-sm"
         },
         {
           "type": "button",
           "label": instance.t('frontend_display_type_is_split'),
-          "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+          "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
           "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
           "rightIconClassName": "m-l-sm"
         }
@@ -25896,8 +25911,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             labelField: referenceTo.labelField.name,
             valueField: referenceTo.valueField.name,
             // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段，多选字段可以编辑。
-            disabledOn:  `${readonly}`,
-            hiddenOn: `( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
+            disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
             modalMode: 'dialog', //TODO 设置 dialog 或者 drawer，用来配置弹出方式
             source: source,
             size: "lg",
@@ -26140,16 +26154,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         // console.log(`lookupToAmis====`, field, readonly, ctx)
         if(readonly){
-            return {
-                type: 'steedos-field',
-                config: field,
-                static: true
+            if(field.reference_to){
+                return {
+                    type: 'steedos-field',
+                    config: field,
+                    static: true
+                }
+            }else {
+                return {
+                    type: getAmisStaticFieldType('picker', readonly),
+                    tpl: getRelatedFieldTpl(field, ctx)
+                }
             }
-
-            // return {
-            //     type: Field.getAmisStaticFieldType('picker', readonly),
-            //     tpl: Tpl.getRelatedFieldTpl(field, ctx)
-            // }
         }
         if(field.reference_to && !lodash.exports.isString(field.reference_to) && !readonly){
             return {
@@ -27085,7 +27101,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if(field.is_wide || convertData.type === 'group'){
                 convertData.className = 'col-span-2 m-0';
             }else {
-                convertData.className = 'm-1';
+                convertData.className = 'm-0';
             }
             if(readonly){
                 convertData.className = `${convertData.className} border-b`;
@@ -27110,6 +27126,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 }
             }
 
+            if(ctx.amisData && ctx.amisData._master && ctx.amisData._master.relatedKey === field.name){
+                convertData.className = `${convertData.className || ''} hidden`;
+            }
+
             if(lodash.exports.isString(baseData.required)){
                 if(baseData.required.startsWith("{{")){
                     baseData.requiredOn = `${baseData.required.substring(2, baseData.required.length -2).replace(/formData./g, 'data.')}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.7",
+  "version": "3.6.2-beta.9",
   "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.7"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.9"
   },
-  "gitHead": "724dfd7a834539fa951423fceae0fca144429200"
+  "gitHead": "9acd287dd121c0c2c31d65b8fc5bec7279809b9d"
 }