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

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.1/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.1/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.2-beta.10/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.2-beta.10/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.1/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.2-beta.10/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.1/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.1/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.2-beta.10/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.2-beta.10/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -53937,22 +53937,26 @@ function getRootUrl(defaultRootUrl){
  * @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}`;
@@ -54106,7 +54110,7 @@ function getSelectMap(selectOptions){
 
 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}}`
@@ -54746,9 +54750,9 @@ var frontend_display_type_is_split = "分栏视图";
 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 = "显示的列";
@@ -54947,16 +54951,17 @@ async function getQuickEditSchema(field, options){
                     {
                         actionType: "custom",
                         script: `
+                            console.log("asdasd");
                             let items = _.cloneDeep(event.data.items);
                             let selectedItems = _.cloneDeep(event.data.selectedItems);
                             if(event.data.isBatchEdit){
                                 selectedItems.forEach(function(selectedItem){
                                     selectedItem._display.${field.name} = event.data._display.${field.name};
-                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: ${options.objectName} + "_display_" + selectedItem._index});
+                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "${options.objectName}" + "_display_" + selectedItem._index});
                                     doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
                                 })
                             }else{
-                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: ${options.objectName} + "_display_" + event.data._index});
+                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "${options.objectName}" + "_display_" + event.data._index});
                                 doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
                             }
                         `
@@ -55402,9 +55407,13 @@ async function getTableColumns(fields, options){
         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'){
@@ -55501,12 +55510,24 @@ async function getTableColumns(fields, options){
             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,
@@ -55589,7 +55610,7 @@ function getMobileLines(tpls){
         }
         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";
@@ -55601,14 +55622,26 @@ function getMobileLines(tpls){
         }
         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;
@@ -55658,8 +55691,7 @@ async function getMobileTableColumns(fields, options){
             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 });
@@ -55672,7 +55704,7 @@ async function getMobileTableColumns(fields, options){
 
     let column = {
         name: nameField.name,
-        label: nameField.label,
+        label: options.displayAs == 'split' ? '' : nameField.label,
         sortable: nameField.sortable,
         type: "button",
         level: "link",
@@ -55701,7 +55733,15 @@ async function getMobileTableColumns(fields, options){
                         "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"
@@ -55817,7 +55857,8 @@ async function getTableOperation(ctx){
         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",
@@ -55913,7 +55954,7 @@ async function getTableSchema$1(fields, options){
             }
             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: "",
@@ -55946,7 +55987,7 @@ async function getTableSchema$1(fields, options){
 
     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: "",
@@ -56072,7 +56113,7 @@ async function getListBody(fields, options){
 
 function getDefaultParams(options){
     return {
-        perPage: options.top || options.perPage || 10
+        perPage: options.top || options.perPage || 20
     }
 }
 
@@ -56126,7 +56167,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -57910,14 +57950,14 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     {
       "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"
     }
@@ -58060,7 +58100,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       {
         "type": "search-box",
         "name": keywordsSearchBoxName,
-        "placeholder": "搜索此列表",
+        "placeholder": "快捷搜索",
         "value": crudKeywords,
         // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
         "clearAndSubmit": true,
@@ -58264,7 +58304,10 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     // ]
     if(options.displayAs === 'split'){
       return [
-        "switch-per-page",
+        {
+          "type": "switch-per-page",
+          "visibleOn": "${count >= 20}"
+        },
         {
           "type": "pagination",
           "maxButtons": 5,
@@ -58286,7 +58329,6 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
   else {
     if(options && options.isRelated){
       return [
-        "statistics",
         {
           "type": "pagination",
           "maxButtons": 10,
@@ -58299,7 +58341,6 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
       const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
       const is_lookup = options.isLookup;
       const commonConfig = [
-        "statistics",
         {
           "type": "pagination",
           "maxButtons": 10,
@@ -58310,7 +58351,10 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
       if (no_pagination && is_lookup) {
         return commonConfig;
       } else {
-        return ["switch-per-page", ...commonConfig];
+        return [{
+          "type": "switch-per-page",
+          "visibleOn": "${count >= 20}"
+        }, ...commonConfig];
       }
     }
   }
@@ -58410,8 +58454,8 @@ async function getObjectFilter(objectSchema, fields, options) {
 /*
  * @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:
  */
 
@@ -59356,9 +59400,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
         */
         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;
         }
@@ -59807,9 +59853,17 @@ async function lookupToAmis(field, readonly, ctx){
     }
     // 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){
@@ -60692,11 +60746,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             if(field.subFields){
                 convertData = {
                     type: 'steedos-input-table',
-                    showIndex: true,
                     editable: !readonly,
                     addable: !readonly,
                     removable: !readonly,
-                    draggable: !readonly,
                     fields: [],
                     amis:{
                         columnsTogglable: false
@@ -60748,7 +60800,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         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`;
@@ -60773,6 +60825,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             }
         }
 
+        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.')}`;