@steedos-widgets/sortable 1.3.4-beta.9 → 1.3.5

package/dist/sortable.esm.js

@@ -54076,7 +54076,7 @@ function getSelectMap(selectOptions){
         if(optionColor){
             const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
             const color = getContrastColor(background);
-            const optionColorStyle = 'background:'+background+';color:'+color;
+            const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
             map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
         }else {
             map[optionValue] = option.label;
@@ -54337,17 +54337,17 @@ async function getFindQuery(object, recordId, fields, options){
     }
 
     const countQuery = options.count === false ? "" : `,count:${object.name}__count(filters:{__filters})`;
-    const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
-        // 把最外层的{}去除
-        return item.replace(/^{/,"").replace(/}$/,"");
-    }).join(",")) : "";
+    // const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
+    //     // 把最外层的{}去除
+    //     return item.replace(/^{/,"").replace(/}$/,"");
+    // }).join(",")) : "";
 
     return {
         orderBy: "${orderBy}",
         orderDir: "${orderDir}",
         pageNo: "${page}",
         pageSize: "${perPage}",
-        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}${moreQuerie}}`
+        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}}`
     }
 }
 
@@ -55213,7 +55213,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(isLookup){
       searchableFieldsStoreKey += "/lookup/" + objectName;
     }
-    let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
+    searchableFieldsStoreKey = searchableFieldsStoreKey + "/" + (data.context && data.context.userId);
+    let defaultSearchableFields = localStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
       defaultSearchableFields = defaultSearchableFields.split(",");
     }
@@ -55282,7 +55283,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(isLookup){
       searchableFieldsStoreKey += "/lookup/" + objectName;
     }
-    sessionStorage.setItem(searchableFieldsStoreKey, value);
+    searchableFieldsStoreKey = searchableFieldsStoreKey + "/" + (data.context && data.context.userId);
+    localStorage.setItem(searchableFieldsStoreKey, value);
 
     // ===START===:当变更可搜索字段时，如果被移除的可搜索字段在本地存储中已经存入过滤条件中则应该清除本地存储中相关字段的过滤条件。
     const searchableFields = data.fields;
@@ -55788,7 +55790,8 @@ const getCopyListviewButtonSchema = ()=>{
                         "&": "${list_view}",
                         "name":"",
                         "label": instance.t('frontend_listview_control_clone_defaultData_label_start') + " ${list_view.label} " + instance.t('frontend_listview_control_clone_defaultData_label_end'),
-                        "shared":false
+                        "shared":false,
+                        "object_name": "${targetObjectName}",
                       },
                       "fieldsExtend": fieldsExtend$3(),
                       "fields": fields(),
@@ -56576,7 +56579,7 @@ let resizeWindow = function(){
   //触发amis crud 高度重算
   setTimeout(()=>{
     window.dispatchEvent(new Event("resize"))
-  }, 500);
+  }, 1000);
 }
 resizeWindow();
 // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
@@ -56813,6 +56816,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 }
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
+  // crud card模式与table模式两种情况下showPageInput默认值不一样，所以需要显式设置为false
   if (formFactor === 'SMALL') {
     // return [
     //   "load-more",
@@ -56822,14 +56826,17 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
         "switch-per-page",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }else {
       return [
+        // "statistics",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }
@@ -56838,16 +56845,31 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     if(options && options.isRelated){
       return [
         "statistics",
-        "pagination"
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
       ]
 
     }
     else {
-      return [
-        "switch-per-page",
+      const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
+      const is_lookup = options.isLookup;
+      const commonConfig = [
         "statistics",
-        "pagination"
-      ]
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
+      ];
+
+      if (no_pagination && is_lookup) {
+        return commonConfig;
+      } else {
+        return ["switch-per-page", ...commonConfig];
+      }
     }
   }
 }
@@ -57484,13 +57506,15 @@ async function lookupToAmisPicker(field, readonly, ctx){
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
-        if (isAllowCreate && isCreate) {
+        // lookup字段配置过滤条件就强制不显示新建按钮
+        let isHasFilters = (field.filters || field._filtersFunction) ? true : false;
+        if (isAllowCreate && isCreate && !isHasFilters) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
             // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
             pickerSchema.headerToolbar.splice(pickerSchema.headerToolbar.length - 1, 0, new_button);
         }
-        pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
+        pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar(refObjectConfig,ctx.formFactor,{isLookup: true});
         if (ctx.filterVisible !== false) {
             pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                 ...ctx,
@@ -57618,10 +57642,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
     // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
     let apiInfo;
-
+    let defaultValueOptionsQueryData;
     if(referenceTo){
         // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
         ], {
@@ -57634,7 +57658,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
+        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -57728,11 +57752,16 @@ async function lookupToAmisSelect(field, readonly, ctx){
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
         var optionsFilters = [["${valueFieldKey}", optionsFiltersOp, []]];
         if (defaultValue && !api.data.$term) { 
+            const defaultValueOptionsQueryData = ${JSON.stringify(defaultValueOptionsQueryData)};
+            const defaultValueOptionsQuery = defaultValueOptionsQueryData?.query?.replace(/^{/,"").replace(/}$/,"");
             // 字段值单独请求，没值的时候在请求中返回空
             optionsFilters = [["${valueFieldKey}", optionsFiltersOp, defaultValue]];
             if(filters.length > 0){
                 optionsFilters = [filters, optionsFilters];
             }
+            if(defaultValueOptionsQuery){
+                api.data.query = "{"+api.data.query.replace(/^{/,"").replace(/}$/,"")+","+defaultValueOptionsQuery+"}";
+            } 
         }
         api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters));
         return api;
@@ -57774,7 +57803,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
         // labelField: labelField,
         // valueField: valueField,
-        source: apiInfo,
+        // source: apiInfo,
         autoComplete: apiInfo,
         searchable: true,
     };
@@ -57853,10 +57882,10 @@ async function lookupToAmis(field, readonly, ctx){
 
     const refObject = await getUISchema(referenceTo.objectName);
 
-    // 此处不参考 steedos 的 enable_enhanced_lookup 规则. 如果默认是开启弹出选择,用户选择过程操作太繁琐, 所以默认是关闭弹出选择.
-    // 由于amis picker 目前不支持联动, 配置了depend_on时, 使用使用select ,以支持联动
-    // TODO: 确认 amis picker 支持联动时, 清理field.depend_on判断
-    if(refObject.enable_enhanced_lookup == true && lodash.exports.isEmpty(field.depend_on)){
+    // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
+    let enableEnhancedLookup = lodash.exports.isBoolean(field.enable_enhanced_lookup) ? field.enable_enhanced_lookup : refObject.enable_enhanced_lookup;
+    // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
+    if(enableEnhancedLookup == true){
         return await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
         return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
@@ -58169,8 +58198,8 @@ function getAmisStaticFieldType(type, readonly, options){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-02 18:06:16
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-10-30 17:51:54
  * @Description: 
  */
 
@@ -58221,11 +58250,26 @@ const getAmisFileEditSchema = (steedosField)=>{
         useChunk: false, // 关闭分块上传
         receiver: {
             method: "post",
+            dataType: "form-data",
             url: `\${context.rootUrl}/s3/${tableName}`,
-            data: {
-                $: "$$",
-                context: `\${context}`,
-            },
+            requestAdaptor: `
+                const { _master, global,context } = api.body;
+                // const { recordId, objectName } = _master;
+                const { spaceId, userId, user } = global;
+                /*
+                    record_id: recordId,
+                    parent: recordId,
+                    object_name: objectName,
+                    owner_name: user.name,
+                    space: spaceId,
+                    owner: userId
+                */
+                // 参考platform 2.2版本，附件字段保存时cfs.files.filerecord、cfs.images.filerecord表中的metadata下只保存space、owner两个属性值。
+                api.data.append('space', spaceId);
+                api.data.append('owner', userId);
+
+                return api;
+            `,
             adaptor: `
                 const { context } = api.body; 
                 var rootUrl = context.rootUrl + "/api/files/${tableName}/";
@@ -58306,8 +58350,6 @@ function getSelectFieldOptions(field){
 }
 
 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;
@@ -58396,26 +58438,33 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'date':
-            convertData = isMobile && !readonly ? {
-                type: "native-date",
-                pipeIn: (value, data) => {
-                    if (value) {
-                        value = moment(value).utc().format('YYYY-MM-DD');
-                        return value;
-                    } else {
-                        return "";
-                    }
-
-                },
-                pipeOut: (value, oldValue, data) => {
-                    if (value) {
-                        value = moment(value).format('YYYY-MM-DDT00:00:00.000[Z]');
-                        return value;
-                    } else {
-                        return "";
-                    }
-                }
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "native-date",
+            //     pipeIn: (value, data) => {
+            //         if (value) {
+            //             value = moment(value).utc().format('YYYY-MM-DD');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         if (value) {
+            //             value = moment(value).format('YYYY-MM-DDT00:00:00.000[Z]');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+            //     }
+            // } : {
+            //     type: getAmisStaticFieldType('date', readonly),
+            //     inputFormat: "YYYY-MM-DD",
+            //     format:'YYYY-MM-DDT00:00:00.000[Z]',
+            //     tpl: readonly ? Tpl.getDateTpl(field) : null,
+            //     // utc: true
+            // }
+            convertData = {
                 type: getAmisStaticFieldType('date', readonly),
                 inputFormat: "YYYY-MM-DD",
                 format:'YYYY-MM-DDT00:00:00.000[Z]',
@@ -58434,43 +58483,51 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'datetime':
-            convertData = isMobile && !readonly ? {
-                type: "combo",
-                pipeIn: (value, data) => {
-                    let revalue = {};
-                    if (value && value != "Invalid date") {
-                        value = moment(value).format('YYYY-MM-DD HH:mm:ss');
-                        revalue[field.name + "-native-date"] = value.split(' ')[0];
-                        revalue[field.name + "-native-time"] = value.split(' ')[1];
-                    } else {
-                        revalue[field.name + "-native-date"] = "";
-                        revalue[field.name + "-native-time"] = "";
-                    }
-                    return revalue;
-                },
-                pipeOut: (value, oldValue, data) => {
-                    let revalue = "";
-                    if (value[field.name + "-native-date"] && value[field.name + "-native-time"]) {
-                        revalue = value[field.name + "-native-date"] + " " + value[field.name + "-native-time"];
-                        revalue = moment(revalue).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
-                    }
-                    return revalue;
-                },
-                items: [
-                    {
-                        type: "native-date",
-                        name: field.name + "-native-date",
-                        className: "steedos-native-date",
-                        value: ""
-                    },
-                    {
-                        type: "native-time",
-                        name: field.name + "-native-time",
-                        className: "steedos-native-time",
-                        value: ""
-                    }
-                ]
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "combo",
+            //     pipeIn: (value, data) => {
+            //         let revalue = {};
+            //         if (value && value != "Invalid date") {
+            //             value = moment(value).format('YYYY-MM-DD HH:mm:ss');
+            //             revalue[field.name + "-native-date"] = value.split(' ')[0];
+            //             revalue[field.name + "-native-time"] = value.split(' ')[1];
+            //         } else {
+            //             revalue[field.name + "-native-date"] = "";
+            //             revalue[field.name + "-native-time"] = "";
+            //         }
+            //         return revalue;
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         let revalue = "";
+            //         if (value[field.name + "-native-date"] && value[field.name + "-native-time"]) {
+            //             revalue = value[field.name + "-native-date"] + " " + value[field.name + "-native-time"];
+            //             revalue = moment(revalue).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+            //         }
+            //         return revalue;
+            //     },
+            //     items: [
+            //         {
+            //             type: "native-date",
+            //             name: field.name + "-native-date",
+            //             className: "steedos-native-date",
+            //             value: ""
+            //         },
+            //         {
+            //             type: "native-time",
+            //             name: field.name + "-native-time",
+            //             className: "steedos-native-time",
+            //             value: ""
+            //         }
+            //     ]
+            // } : {
+            //     type: getAmisStaticFieldType('datetime', readonly),
+            //     inputFormat: 'YYYY-MM-DD HH:mm',
+            //     format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     utc: true,
+            // }
+
+            convertData = {
                 type: getAmisStaticFieldType('datetime', readonly),
                 inputFormat: 'YYYY-MM-DD HH:mm',
                 format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
@@ -58490,26 +58547,34 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'time':
-            convertData = isMobile && !readonly ? {
-                type: "native-time",
-                pipeIn: (value, data) => {
-                    if (value) {
-                        value = moment(value).utc().format('HH:mm');
-                        return value;
-                    } else {
-                        return "";
-                    }
-
-                },
-                pipeOut: (value, oldValue, data) => {
-                    if (value) {
-                        value = moment('1970-01-01 ' + value).format('1970-01-01THH:mm:00.000[Z]');
-                        return value;
-                    } else {
-                        return "";
-                    }
-                }
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "native-time",
+            //     pipeIn: (value, data) => {
+            //         if (value) {
+            //             value = moment(value).utc().format('HH:mm');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         if (value) {
+            //             value = moment('1970-01-01 ' + value).format('1970-01-01THH:mm:00.000[Z]');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+            //     }
+            // } : {
+            //     type: getAmisStaticFieldType('time', readonly),
+            //     inputFormat: 'HH:mm',
+            //     timeFormat:'HH:mm',
+            //     format:'1970-01-01THH:mm:00.000[Z]',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     // utc: true
+            // }
+            convertData = {
                 type: getAmisStaticFieldType('time', readonly),
                 inputFormat: 'HH:mm',
                 timeFormat:'HH:mm',
@@ -58559,7 +58624,20 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     type: getAmisStaticFieldType('number', readonly),
                     min: field.min,
                     max: field.max,
-                    precision: field.scale
+                    precision: field.scale,
+                    suffix: "%",
+                    pipeIn: (value, data) => {
+                        if(value){
+                            return value*100;
+                        }
+                        return value;
+                    },
+                    pipeOut: (value, oldValue, data) => {
+                        if(value){
+                            return value/100;
+                        }
+                        return value;
+                    },
                 };
             }
             break;
@@ -58954,8 +59032,41 @@ var config = {
 };
 
 async function getQuickEditSchema(field, options){
-    const quickEditId = options.objectName + "_" + field.name + "QuickEdit";//定义快速编辑的表单id，用于setvalue传值
+    //判断在amis3.2以上环境下，放开批量编辑
+    const isAmisVersionforBatchEdit = amisRequire('amis').version[0] >= 3 && amisRequire('amis').version[2] >= 2;
+    const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
     var quickEditSchema = { body: [], id: quickEditId };
+    //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
+    if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+        const submitEvent = {
+            submit: {
+                actions: [
+                    {
+                        actionType: "custom",
+                        script: `
+                            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: "_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: "_display_" + event.data._index});
+                                doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
+                            }
+                        `
+                    },
+                    {
+                        "actionType": "closeDialog"
+                    }
+                ]
+            }
+        };
+        quickEditSchema.onEvent = submitEvent;
+    }
+    
     if (field.disabled) {
         quickEditSchema = false;
     } else {
@@ -58972,7 +59083,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-                                    var _display = event.data._display;
+                                    var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
                                 `
@@ -58994,7 +59105,7 @@ async function getQuickEditSchema(field, options){
                             第二种是增加选项时，按照value的值，找到对应选项，并按照_display的规则为其赋值
                         */
                         TempDisplayField = `
-                            const preData = event.data.__super.${field.name};
+                            const preData = _.cloneDeep(event.data.__super.${field.name});
                             if(preData && event.data.${field.name}.length < preData.length){
                                 let deletedIndex;
                                 preData.forEach(function(item,index){
@@ -59038,7 +59149,7 @@ async function getQuickEditSchema(field, options){
                     break;
                 case "percent":
                     TempDisplayField = `
-                            _display["${field.name}"] = (event.data.value * 100).toFixed(${field.scale}) + '%';
+                            _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                     break;
@@ -59189,6 +59300,131 @@ async function getQuickEditSchema(field, options){
                 }
                 
             });
+            if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+                quickEditSchema.body.push({
+                    "name": "isBatchEdit",
+                    "type": "checkbox",
+                    "option": [
+                        {
+                            "type": "tpl",
+                            "tpl": "更新${COUNT(selectedItems)}个选定记录"
+                        },
+                        {
+                            "type": "spinner",
+                            "showOn": "${batchPermissionLoading}",
+                            "size": "sm",
+                            "className": "mr-4"
+                        }
+                    ],
+                    "visibleOn": "${ARRAYSOME(selectedItems, item => item._id === _id) && COUNT(selectedItems)>1 && quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}",
+                    "disabledOn": "${batchPermissionLoading}",
+                    "onEvent":{
+                        "change":{
+                            "actions":[
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": quickEditId,
+                                    "args": {
+                                        "value":{
+                                            "batchPermissionLoading": true
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "ajax",
+                                    "args": {
+                                        "api": {
+                                          "url": "${context.rootUrl}/graphql",
+                                          "method": "post",
+                                          "headers": {
+                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                          },
+                                          "data": {
+                                            "query": "{rows:${objectName}(filters:[\"_id\",\"in\",${selectedItems | pick:_id | split | json}]){_id,_permissions{allowEdit}}}"
+                                          },
+                                          "adaptor": `
+                                            const noPermission = [];
+                                            payload.data.rows.forEach(function (row) {
+                                                if(!row._permissions.allowEdit){
+                                                    noPermission.push(row._id);
+                                                }
+                                            })
+                                            payload.data.noPermission = noPermission;
+                                            return payload;
+                                          `
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": quickEditId,
+                                    "args": {
+                                        "value":{
+                                            "batchPermissionLoading": false
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "dialog",
+                                    "dialog":{
+                                        "title": "记录权限",
+                                        "showCloseButton": false,
+                                        "body":[
+                                            {
+                                                "type": "tpl",
+                                                "tpl": "当前选中记录中，有${COUNT(noPermission)}条记录无编辑权限，是否需要批量编辑其他记录？"
+                                            }
+                                        ],
+                                        "onEvent":{
+                                            "confirm":{
+                                                "actions":[
+                                                    {
+                                                        "actionType": "custom",
+                                                        "script": `
+                                                            const noPermission = event.data.noPermission;
+                                                            const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
+                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            noPermission.forEach(function (item) {
+                                                                crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                            })
+                                                        `
+                                                    },
+                                                    {
+                                                        "actionType": "setValue",
+                                                        "componentId": quickEditId,
+                                                        "args": {
+                                                            "value":{
+                                                                "isBatchEdit": true
+                                                            }
+                                                        },
+                                                    }
+                                                ]
+                                            },
+                                            "cancel":{
+                                                "actions":[
+                                                    {
+                                                        "actionType": "setValue",
+                                                        "componentId": quickEditId,
+                                                        "args": {
+                                                            "value":{
+                                                                "isBatchEdit": false
+                                                            }
+                                                        },
+                                                    }
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "expression":"${COUNT(event.data.noPermission)>0}"
+                                }
+                            ]
+                        }
+                    }
+                });
+            }
         } else {
             quickEditSchema = false;
         }
@@ -59223,6 +59459,8 @@ async function getTableColumns(fields, options){
     const columns = [];
     if(!options.isLookup){
         columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+        //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
+        columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
     }
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
@@ -59254,7 +59492,7 @@ async function getTableColumns(fields, options){
                         {
                             "args": {
                                 "api": {
-                                    "url": "${context.rootUrl}/api/files/files/${versions[0]}?download=true",
+                                    "url": "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}",
                                     "method": "get",
                                     "headers": {
                                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -59301,7 +59539,7 @@ async function getTableColumns(fields, options){
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
             columnItem = Object.assign({}, {
-                type: "mapping",
+                type: "static-mapping",
                 name: field.name,
                 label: field.label,
                 map: map,
@@ -59316,7 +59554,7 @@ async function getTableColumns(fields, options){
             const tpl = await getFieldTpl(field, options);
             let type = 'text';
             if(tpl){
-                type = 'tpl';
+                type = 'static';
             }else if(field.type === 'html'){
                 type = 'markdown';
             }else if(field.type === 'url'){
@@ -59357,6 +59595,7 @@ async function getTableColumns(fields, options){
                 columnItem.quickEdit = quickEditSchema;
                 columnItem.quickEditEnabledOn = "${is_system !== true}";
             }
+            columnItem.id = `${options.objectName}_${field.name}_\${_index}`;
             columns.push(columnItem);
         }
     }
@@ -59635,7 +59874,7 @@ async function getTableOperation(ctx){
     }
     return {
         type: 'operation',
-        label: instance.t('frontend_operation'),
+        label: "",
         fixed: 'right',
         labelClassName: 'text-center',
         className: 'text-center steedos-listview-operation w-10',
@@ -59669,23 +59908,87 @@ async function getTableOperation(ctx){
     }
 }
 
+async function getDefaultCrudCard(columns, options) {
+    let labelFieldName = options?.labelFieldName || "name";
+    let titleColumn, bodyColumns = [];
+    columns.forEach(function (item) {
+        delete item.quickEdit;
+        delete item.width;
+        if (item.name === labelFieldName) {
+            titleColumn = item;
+        }
+        else {
+            if (item.name !== "_index") {
+                bodyColumns.push(item);
+            }
+        }
+    });
+    let card = {
+        "header": {
+            "title": titleColumn.tpl
+        },
+        body: bodyColumns,
+        // useCardLabel: false,
+        toolbar: []
+    };
+    let hideToolbarOperation = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
+    if(!hideToolbarOperation){
+        let toolbarOperation = await getTableOperation(options);
+        if (toolbarOperation) {
+            toolbarOperation.className += " inline-block w-auto";
+        }
+        card.toolbar.push(toolbarOperation);
+    }
+    return card;
+}
+
 async function getTableSchema$1(fields, options){
     if(!options){
         options = {};
     }
     let { isLookup, hiddenColumnOperation } = options;
+    const defaults = options.defaults;
+    const listSchema = (defaults && defaults.listSchema) || {};
+
     let columns = [];
     let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
     if(isLookup){
         // 在lookup手机端列表模式调式好之前不使用getMobileTableColumns
         useMobileColumns = false;
     }
+    if(listSchema.mode && listSchema.mode !== "table"){
+        // 如果指定的mode，则不走我们内置的手机端列表效果，使用steedos组件内部开发的默认card/list效果，或者由用户自己实现card/list模式的crud列表
+        useMobileColumns = false;
+    }
     if(useMobileColumns){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
         columns = await getTableColumns(fields, options);
 
+        if(listSchema.mode === "cards"){
+            let card = listSchema.card;
+            if(!card){
+                card = await getDefaultCrudCard(columns, options);
+            }
+            return {
+                mode: "cards",
+                perPageAvailable: [5, 10, 20, 50, 100, 500],
+                name: "thelist",
+                headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
+                className: "",
+                draggable: false,
+                defaultParams: getDefaultParams(options),
+                card: card,
+                syncLocation: false,
+                keepItemSelectionOnPageChange: true,
+                checkOnItemClick: isLookup ? true : false,
+                labelTpl: `\${${options.labelFieldName}}`,
+                autoFillHeight: false, // 自动高度效果不理想,先关闭
+                columnsTogglable: false
+            }
+        }
+
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
@@ -59693,6 +59996,7 @@ async function getTableSchema$1(fields, options){
 
     return {
         mode: "table",
+        perPageAvailable: [5, 10, 20, 50, 100, 500],
         name: "thelist",
         headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
@@ -59780,8 +60084,8 @@ function isObject(obj) {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-21 17:35:06
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-10-20 11:38:25
  * @Description:
  */
 
@@ -60078,8 +60382,8 @@ async function getListSchema(
         "filtersFunction": listview_filters,
         "sort": sort,
         "ctx": ctx,
-        "requestAdaptor": listView.requestAdaptor,  
-        "adaptor": listView.adaptor,
+        "requestAdaptor": listView.requestAdaptor || ctx.requestAdaptor,  
+        "adaptor": listView.adaptor || ctx.adaptor,
         "headerToolbarItems": ctx.headerToolbarItems,
         "filterVisible": ctx.filterVisible,
         "rowClassNameExpr": ctx.rowClassNameExpr,
@@ -65213,7 +65517,13 @@ var PLACEHOLDER_ID = 'placeholder';
 var empty = [];
 function MultipleContainers(props) {
     var _this = this;
-    var _a = props.adjustScale, adjustScale = _a === void 0 ? false : _a; props.itemCount; var cancelDrop = props.cancelDrop, _c = props.columns, columns = _c === void 0 ? 1 : _c, _d = props.handle, handle = _d === void 0 ? true : _d, containerStyle = props.containerStyle, _e = props.coordinateGetter, coordinateGetter$1 = _e === void 0 ? coordinateGetter : _e, _f = props.getItemStyles, getItemStyles = _f === void 0 ? function () { return ({}); } : _f, _g = props.wrapperStyle, wrapperStyle = _g === void 0 ? function () { return ({}); } : _g, _h = props.minimal, minimal = _h === void 0 ? false : _h, modifiers = props.modifiers, renderItem = props.renderItem, _j = props.strategy, strategy = _j === void 0 ? verticalListSortingStrategy : _j, _k = props.addable, addable = _k === void 0 ? false : _k, _l = props.trashable, trashable = _l === void 0 ? false : _l, _m = props.vertical, vertical = _m === void 0 ? false : _m, scrollable = props.scrollable, _o = props.boardSource, boardSource = _o === void 0 ? [] : _o, _p = props.cardSource, cardSource = _p === void 0 ? [] : _p, defaultValue = props.defaultValue, amisOnChange = props.onChange, amisData = props.data, amisDispatchEvent = props.dispatchEvent, amisRender = props.render, _q = props.cardSchema, cardSchema = _q === void 0 ? [{
+    var _a = props.adjustScale, adjustScale = _a === void 0 ? false : _a; props.itemCount; var cancelDrop = props.cancelDrop, _c = props.columns, columns = _c === void 0 ? 1 : _c, _d = props.handle, handle = _d === void 0 ? true : _d, containerStyle = props.containerStyle, _e = props.coordinateGetter, coordinateGetter$1 = _e === void 0 ? coordinateGetter : _e, _f = props.getItemStyles, getItemStyles = _f === void 0 ? function () { return ({}); } : _f, _g = props.wrapperStyle, wrapperStyle = _g === void 0 ? function () { return ({}); } : _g, _h = props.minimal, minimal = _h === void 0 ? false : _h, modifiers = props.modifiers, renderItem = props.renderItem, 
+    // strategy = verticalListSortingStrategy,
+    _j = props.strategy, 
+    // strategy = verticalListSortingStrategy,
+    strategy = _j === void 0 ? rectSortingStrategy : _j, //这里默认值不用rectSortingStrategy的话，会出现字段在左右两边拖动变更顺序时拖动过程中dragOverlay丢失问题
+    _k = props.addable, //这里默认值不用rectSortingStrategy的话，会出现字段在左右两边拖动变更顺序时拖动过程中dragOverlay丢失问题
+    addable = _k === void 0 ? false : _k, _l = props.trashable, trashable = _l === void 0 ? false : _l, _m = props.vertical, vertical = _m === void 0 ? false : _m, scrollable = props.scrollable, _o = props.boardSource, boardSource = _o === void 0 ? [] : _o, _p = props.cardSource, cardSource = _p === void 0 ? [] : _p, value = props.value, amisOnChange = props.onChange, amisData = props.data, amisDispatchEvent = props.dispatchEvent, amisRender = props.render, _q = props.cardSchema, cardSchema = _q === void 0 ? [{
             "type": "tpl",
             "tpl": "${label}",
             "inline": false,
@@ -65221,24 +65531,28 @@ function MultipleContainers(props) {
             "type": "tpl",
             "tpl": "${label}",
         }] : _r, _s = props.boardFooter, boardFooter = _s === void 0 ? [] : _s, _t = props.wrapperClassName, wrapperClassName = _t === void 0 ? "gap-2" : _t, _u = props.boardClassName, boardClassName = _u === void 0 ? "border rounded" : _u, _v = props.cardClassName, cardClassName = _v === void 0 ? "" : _v;
-    defaultValue && delete (defaultValue.$$id);
+    value && delete (value.$$id);
     var _w = __read(react.exports.useState(function () {
         var _a;
-        return (_a = defaultValue) !== null && _a !== void 0 ? _a : {
+        return (_a = value) !== null && _a !== void 0 ? _a : {
             A: ['A1', 'A2'],
             B: ['B1', 'B2'],
             C: ['C1', 'C2'],
         };
     }), 2), items = _w[0], setItems = _w[1];
     var _x = __read(react.exports.useState(Object.keys(items)), 2), containers = _x[0], setContainers = _x[1];
-    var handleChange = function () { return __awaiter(_this, void 0, void 0, function () {
+    react.exports.useEffect(function () {
+        setItems(value);
+        setContainers(Object.keys(value));
+    }, [value]);
+    var handleChange = function (newItems) { return __awaiter(_this, void 0, void 0, function () {
         var value, rendererEvent;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!amisDispatchEvent || !amisOnChange)
                         return [2 /*return*/];
-                    value = items;
+                    value = newItems || items;
                     return [4 /*yield*/, amisDispatchEvent('change', createObject(amisData, {
                             value: value
                         }))];
@@ -65247,7 +65561,7 @@ function MultipleContainers(props) {
                     if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                         return [2 /*return*/];
                     }
-                    setTimeout(function () { return amisOnChange(value); }, 1000);
+                    setTimeout(function () { return amisOnChange(value); }, 500);
                     return [2 /*return*/];
             }
         });
@@ -65350,6 +65664,7 @@ function MultipleContainers(props) {
             var active = _a.active, over = _a.over;
             var overId = over === null || over === void 0 ? void 0 : over.id;
             if (overId == null || overId === TRASH_ID || active.id in items) {
+                // 拖动的是分组则跳过后面的逻辑
                 return;
             }
             var overContainer = findContainer(overId);
@@ -65425,19 +65740,44 @@ function MultipleContainers(props) {
                 return;
             }
             var overContainer = findContainer(overId);
+            var newItems = items;
             if (overContainer) {
-                var activeIndex_1 = items[activeContainer].indexOf(active.id);
-                var overIndex_1 = items[overContainer].indexOf(overId);
-                if (activeIndex_1 !== overIndex_1) {
-                    setItems(function (items) {
-                        var _a;
-                        return (__assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a)));
-                    });
+                if (activeContainer !== overContainer) {
+                    // 拖动变更分组之间的顺序时，activeContainer 与 overContainer 值不相等
+                    setTimeout(function () {
+                        var sortedGroups = over.data.current.sortable.items; //不加setTimeout的话，这里拿到的会是变更前的数据
+                        newItems = {};
+                        sortedGroups.forEach(function (groupKey) {
+                            newItems[groupKey] = items[groupKey];
+                        });
+                        delete newItems[TRASH_ID];
+                        delete newItems[PLACEHOLDER_ID];
+                        if (lodash.exports.keys(items).join(",") !== lodash.exports.keys(newItems).join(",")) {
+                            // 只有顺序发生变化时才触发change事件
+                            setItems(newItems);
+                            // console.log('拖动结束2，更新form value')
+                            handleChange(newItems);
+                        }
+                        setActiveId(null);
+                    }, 500);
+                    return;
+                }
+                else {
+                    // 同一个分组中字段顺序变更以及把一个字段从某个分组拖动到另一个分组内时，activeContainer 与 overContainer 值相等
+                    var activeIndex_1 = items[activeContainer].indexOf(active.id);
+                    var overIndex_1 = items[overContainer].indexOf(overId);
+                    if (activeIndex_1 !== overIndex_1) {
+                        setItems(function (items) {
+                            var _a;
+                            newItems = __assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a));
+                            return newItems;
+                        });
+                    }
                 }
             }
             setActiveId(null);
             // console.log('拖动结束2，更新form value')
-            handleChange();
+            handleChange(newItems);
         }, cancelDrop: cancelDrop, onDragCancel: onDragCancel, modifiers: modifiers },
         React.createElement("div", { style: {
                 display: 'inline-grid',