@steedos-widgets/sortable 3.6.2-beta.1 → 3.6.2-beta.10

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}}`
@@ -21047,9 +21051,9 @@
     var frontend_display_as = "显示为";
     var frontend_record_sum = "个项目";
     var frontend_button_reload_tooltip = "刷新";
-    var frontend_button_search_tooltip = "筛选";
+    var frontend_button_search_tooltip = "搜索";
     var frontend_fields_filter_button_search = "搜索";
-    var frontend_fields_filter_button_settings = "设置搜索项";
+    var frontend_fields_filter_button_settings = "选择搜索项";
     var frontend_button_listview_control_tooltip = "列表视图控制";
     var frontend_button_listview_control_label = "列表视图控制";
     var frontend_listview_control_columns = "显示的列";
@@ -21704,9 +21708,13 @@
             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-all ";
+                className += " break-words ";
             }
             let columnItem;
             if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
@@ -21803,12 +21811,24 @@
                 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") {
+                    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({}, {
                         name: field.name,
@@ -21891,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";
@@ -21903,14 +21923,26 @@
             }
             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;
+            if (typeof item.field.amis?.className == "object") {
+                className = {
+                    [lineChildrenClassName]: "true",
+                    ...item.field.amis.className
+                };
+            } else if (typeof item.field.amis?.className == "string") {
+                className = `${lineChildrenClassName} ${item.field.amis.className} `;
+            } else {
+                className = lineChildrenClassName;
             }
             lineChildren.push({
                 "type": "tpl",
                 "tpl": item.tpl,
-                "className": lineChildrenClassName
+                className
             });
-
+            
             if(item.field.is_wide){
                 // 宽字段占整行
                 isLeft = true;
@@ -21960,8 +21992,7 @@
                 tpl = await getFieldTpl(field, options);
             }
             if(!tpl){
-                //qhd需求简易处理，加上raw以支持审批王名称字段通过颜色区分缓急，若之后手机端列表支持配置amis，则可以去掉
-                tpl = `\${${field.name} | raw}`;
+                tpl = `\${${field.name}}`;
             }
             if(!field.hidden && !field.extra){
                 tpls.push({ field, tpl });
@@ -21974,7 +22005,7 @@
 
         let column = {
             name: nameField.name,
-            label: nameField.label,
+            label: options.displayAs == 'split' ? '' : nameField.label,
             sortable: nameField.sortable,
             type: "button",
             level: "link",
@@ -22003,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"
@@ -22119,7 +22158,8 @@
             label: " ",
             fixed: 'right',
             labelClassName: 'text-center',
-            className: 'text-center steedos-listview-operation w-10',
+            //TODO:目前3.6.3-patch.3版本中对于动态classname处理存在问题，简单处理固定列问题，等待amis解决crud的columns不支持动态classname的问题
+            className: 'text-center steedos-listview-operation w-10 is-sticky is-sticky-right is-sticky-first-right',
             buttons: [
                   {
                     "type": "steedos-dropdown-button",
@@ -22215,7 +22255,7 @@
                 }
                 return {
                     mode: "cards",
-                    perPageAvailable: [5, 10, 20, 50, 100, 500],
+                    perPageAvailable: [20, 50, 100, 500],
                     name: "thelist",
                     headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                     className: "",
@@ -22248,7 +22288,7 @@
 
         return {
             mode: "table",
-            perPageAvailable: [5, 10, 20, 50, 100, 500],
+            perPageAvailable: [20, 50, 100, 500],
             name: "thelist",
             headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
             className: "",
@@ -22374,7 +22414,7 @@
 
     function getDefaultParams(options){
         return {
-            perPage: options.top || options.perPage || 10
+            perPage: options.top || options.perPage || 20
         }
     }
 
@@ -22428,7 +22468,6 @@
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -24212,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"
         }
@@ -24362,7 +24401,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           {
             "type": "search-box",
             "name": keywordsSearchBoxName,
-            "placeholder": "搜索此列表",
+            "placeholder": "快捷搜索",
             "value": crudKeywords,
             // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
             "clearAndSubmit": true,
@@ -24566,7 +24605,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // ]
         if(options.displayAs === 'split'){
           return [
-            "switch-per-page",
+            {
+              "type": "switch-per-page",
+              "visibleOn": "${count >= 20}"
+            },
             {
               "type": "pagination",
               "maxButtons": 5,
@@ -24588,7 +24630,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       else {
         if(options && options.isRelated){
           return [
-            "statistics",
             {
               "type": "pagination",
               "maxButtons": 10,
@@ -24601,7 +24642,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
           const is_lookup = options.isLookup;
           const commonConfig = [
-            "statistics",
             {
               "type": "pagination",
               "maxButtons": 10,
@@ -24612,7 +24652,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           if (no_pagination && is_lookup) {
             return commonConfig;
           } else {
-            return ["switch-per-page", ...commonConfig];
+            return [{
+              "type": "switch-per-page",
+              "visibleOn": "${count >= 20}"
+            }, ...commonConfig];
           }
         }
       }
@@ -24712,8 +24755,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-10-20 11:38:25
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2024-01-16 11:14:34
      * @Description:
      */
 
@@ -25658,9 +25701,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         */
         if(enable_tree){
             const rows = _.map(payload.data.rows, (item)=>{
-                delete item.children;
-                delete item.parent;
-                return item;
+                if (!item.children) {
+                    return { ...item, children: [] };
+                } else {
+                    return item;
+                }
             })
             payload.data.rows = rows;
         }
@@ -26109,9 +26154,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         // console.log(`lookupToAmis====`, field, readonly, ctx)
         if(readonly){
-            return {
-                type: getAmisStaticFieldType('picker', readonly),
-                tpl: getRelatedFieldTpl(field, ctx)
+            if(field.reference_to){
+                return {
+                    type: 'steedos-field',
+                    config: field,
+                    static: true
+                }
+            }else {
+                return {
+                    type: getAmisStaticFieldType('picker', readonly),
+                    tpl: getRelatedFieldTpl(field, ctx)
+                }
             }
         }
         if(field.reference_to && !lodash.exports.isString(field.reference_to) && !readonly){
@@ -26994,11 +27047,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 if(field.subFields){
                     convertData = {
                         type: 'steedos-input-table',
-                        showIndex: true,
                         editable: !readonly,
                         addable: !readonly,
                         removable: !readonly,
-                        draggable: !readonly,
                         fields: [],
                         amis:{
                             columnsTogglable: false
@@ -27050,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`;
@@ -27075,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.1",
+  "version": "3.6.2-beta.10",
   "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.1"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.10"
   },
-  "gitHead": "51749ac2fcf83301fa5cd22d3116dd1702bc5ef3"
+  "gitHead": "9074b66d1cfd4cdc7a5ebce711a3ac0d295269c1"
 }