@steedos-widgets/amis-lib 1.2.43 → 1.3.0-beta.11

package/dist/index.esm.js

@@ -400,7 +400,7 @@ function getContrastColor(bgColor) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-03 18:07:54
+ * @LastEditTime: 2023-08-29 15:04:39
  * @Description: 
  */
 
@@ -504,7 +504,7 @@ function getRelatedFieldTpl(field, ctx){
         linkTarget = "target='_blank'";
     }
 
-    const onlyDisplayLabel = ctx.onlyDisplayLabel;
+    const onlyDisplayLookLabel = ctx.onlyDisplayLookLabel;
 
     let fieldDataStrTpl = `data._display.${field.name}`;
 
@@ -515,7 +515,7 @@ function getRelatedFieldTpl(field, ctx){
     if(_.isString(field.reference_to) || !field.reference_to){
         if(field.multiple){
             let labelTpl = `<%=item.label%>`;
-            if(!onlyDisplayLabel){
+            if(!onlyDisplayLookLabel){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
                 });
@@ -533,7 +533,7 @@ function getRelatedFieldTpl(field, ctx){
                 objectNameTpl = `\${${field.name}.objectName}`;
                 recordIdTpl = `\${${field.name}.value}`;
             }
-            if(!onlyDisplayLabel){
+            if(!onlyDisplayLookLabel){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
@@ -545,7 +545,7 @@ function getRelatedFieldTpl(field, ctx){
         
     }else {
         let labelTpl = `<%=item.label%>`;
-        if(!onlyDisplayLabel){
+        if(!onlyDisplayLookLabel){
             const href = Router.getObjectDetailPath({
                 formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
             });
@@ -598,7 +598,7 @@ function getLocationTpl(field){
 }
 
 async function getFieldTpl (field, options){
-    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLabel){
+    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
         return getNameTpl(field, options)
     }
     switch (field.type) {
@@ -787,7 +787,7 @@ function getScriptForRemoveUrlPrefixForImgFields(fields){
                 if(imgFields[item].multiple){
                     if(imgFieldValue instanceof Array){
                         formData[item] = imgFieldValue.map((value)=>{ 
-                            let itemValue = value?.split('/');
+                            let itemValue = value && value.split('/');
                             return itemValue[itemValue.length - 1];
                         });
                     }
@@ -1014,6 +1014,7 @@ var frontend_listview_control_rename_title$1 = "Rename List View";
 var frontend_listview_control_share$1 = "Sharing Settings";
 var frontend_listview_control_sort$1 = "Default sorting rule";
 var frontend_export_excel$1 = "Export Excel";
+var frontend_export_excel_toast$1 = "Exporting, please wait";
 var frontend_operation$1 = "Operation";
 var frontend_import_data$1 = "Import data";
 var frontend_import_data_object_name$1 = "Import object";
@@ -1098,6 +1099,7 @@ var en_us = {
 	frontend_listview_control_share: frontend_listview_control_share$1,
 	frontend_listview_control_sort: frontend_listview_control_sort$1,
 	frontend_export_excel: frontend_export_excel$1,
+	frontend_export_excel_toast: frontend_export_excel_toast$1,
 	frontend_operation: frontend_operation$1,
 	frontend_import_data: frontend_import_data$1,
 	frontend_import_data_object_name: frontend_import_data_object_name$1,
@@ -1184,6 +1186,7 @@ var frontend_listview_control_rename_title = "重命名 列表视图";
 var frontend_listview_control_share = "共享设置";
 var frontend_listview_control_sort = "默认排序规则";
 var frontend_export_excel = "导出";
+var frontend_export_excel_toast = "正在导出,请稍后...";
 var frontend_operation = "操作";
 var frontend_import_data = "导入数据";
 var frontend_import_data_object_name = "导入对象";
@@ -1269,6 +1272,7 @@ var zh_cn = {
 	frontend_listview_control_share: frontend_listview_control_share,
 	frontend_listview_control_sort: frontend_listview_control_sort,
 	frontend_export_excel: frontend_export_excel,
+	frontend_export_excel_toast: frontend_export_excel_toast,
 	frontend_operation: frontend_operation,
 	frontend_import_data: frontend_import_data,
 	frontend_import_data_object_name: frontend_import_data_object_name,
@@ -2258,7 +2262,7 @@ const getSchema$2 = (uiSchema) => {
                                     "Bearer ${context.tenantId},${context.authToken}",
                                 },
                                 requestAdaptor:
-                                  "\n        const selfData = JSON.parse(JSON.stringify(api.data.$self));\n        var filters = [];\n        var pageSize = api.data.pageSize || 10;\n        var pageNo = api.data.pageNo || 1;\n        var skip = (pageNo - 1) * pageSize;\n        var orderBy = api.data.orderBy || '';\n        var orderDir = api.data.orderDir || '';\n        var sort = orderBy + ' ' + orderDir;\n        var allowSearchFields = [\"description\"];\n        if(api.data.$term){\n            filters = [[\"name\", \"contains\", \"'+ api.data.$term +'\"]];\n        }else if(selfData.op === 'loadOptions' && selfData.value){\n            if(selfData.value?.indexOf(',') > 0){\n                filters = [[\"_id\", \"=\", selfData.value.split(',')]];\n            }else{\n                filters = [[\"_id\", \"=\", selfData.value]];\n            }\n        }\n        if(allowSearchFields){\n            allowSearchFields.forEach(function(key){\n                const keyValue = selfData[key];\n                if(keyValue){\n                    filters.push([key, \"contains\", keyValue]);\n                }\n            })\n        }\n\n        const filtersFunction = function(filters, values){return ['object_name', '=', values.object_name]};\n\n        if(filtersFunction){\n            const _filters = filtersFunction(filters, api.data.$self.__super.__super);\n            if(_filters && _filters.length > 0){\n                filters.push(_filters);\n            }\n        }\n\n        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());\n        return api;\n    ",
+                                  "\n        const selfData = JSON.parse(JSON.stringify(api.data.$self));\n        var filters = [];\n        var pageSize = api.data.pageSize || 10;\n        var pageNo = api.data.pageNo || 1;\n        var skip = (pageNo - 1) * pageSize;\n        var orderBy = api.data.orderBy || '';\n        var orderDir = api.data.orderDir || '';\n        var sort = orderBy + ' ' + orderDir;\n        var allowSearchFields = [\"description\"];\n        if(api.data.$term){\n            filters = [[\"name\", \"contains\", \"'+ api.data.$term +'\"]];\n        }else if(selfData.op === 'loadOptions' && selfData.value){\n            if(selfData.value && selfData.value.indexOf(',') > 0){\n                filters = [[\"_id\", \"=\", selfData.value.split(',')]];\n            }else{\n                filters = [[\"_id\", \"=\", selfData.value]];\n            }\n        }\n        if(allowSearchFields){\n            allowSearchFields.forEach(function(key){\n                const keyValue = selfData[key];\n                if(keyValue){\n                    filters.push([key, \"contains\", keyValue]);\n                }\n            })\n        }\n\n        const filtersFunction = function(filters, values){return ['object_name', '=', values.object_name]};\n\n        if(filtersFunction){\n            const _filters = filtersFunction(filters, api.data.$self.__super.__super);\n            if(_filters && _filters.length > 0){\n                filters.push(_filters);\n            }\n        }\n\n        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());\n        return api;\n    ",
                                 adaptor:
                                   "\n    const enable_tree = undefined;\n    if(enable_tree){\n        const records = payload.data.rows;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds)=>{\n            if(!childrenIds){\n                return;\n            }\n            const children = _.filter(records, (record)=>{\n                return _.includes(childrenIds, record._id)\n            });\n            _.each(children, (item)=>{\n                if(item.children){\n                    item.children = getChildren(records, item.children)\n                }\n            })\n            return children;\n        }\n\n        _.each(records, (record)=>{\n            if(!record.parent){\n                treeRecords.push(Object.assign({}, record, {children: getChildren(records, record.children)}));\n            }\n        });\n        payload.data.rows = treeRecords;\n    }\n    return payload;\n    ",
                               },
@@ -2437,7 +2441,7 @@ const getSchema$2 = (uiSchema) => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-07 17:00:38
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-07 17:12:20
+ * @LastEditTime: 2023-08-24 16:44:42
  * @Description: 
  */
 
@@ -2457,7 +2461,7 @@ const getSchema$1 = (uiSchema)=>{
                         "componentId": "",
                         "args": {
                           "blank": false,
-                          "url": "/app/${app_id}/${objectName}/view/${_id}"
+                          "url": "/app/${app_id}/${objectName}/view/${_id}?side_object=${objectName}&side_listview_id=${listName}"
                         },
                         "actionType": "link"
                       }
@@ -2474,90 +2478,69 @@ const getSchema$1 = (uiSchema)=>{
 };
 
 const getSchema = async (uiSchema, ctx) => {
-  const requestAdaptor = `
-      // 获取列表视图的属性
-      let uiSchema = api.body.uiSchema;
-      let list_views = uiSchema.list_views;
-      let list_views_name = api.body.listName;
-      let col = list_views[list_views_name].columns;
-      let sort_test = list_views[list_views_name].sort;
-
-      // 获取下载字段
-      let select = [];
-      _.each(col, (col) => {
-          if (col.field == undefined)
-              select.push(col);
-          else select.push(col.field);
-      });
-
-      // 获取排序字段
-
-      let sort = [];
-      _.forEach(sort_test, (sortField) => {
-          if (sortField.field_name == undefined)
-              sort.push(sortField);
-          else sort.push([sortField.field_name, sortField.order]);
-      })
-
-      let orders = [];
-      _.map(sort, (value) => {
-          let order_tmp = [];
-          if (value[1] == "desc")
-              order_tmp = value[0] + ' desc';
-          else
-              order_tmp = value[0];
-          orders.push(order_tmp);
-      });
-      let order = orders.join(',');
-
-      let filename = uiSchema.label + "-" + list_views[list_views_name].label;
-
-      url_tmp = api.url.split('?')[0];
-      api.url = url_tmp + "?$select=" + encodeURIComponent(select.toString()) + "&filename=" + encodeURIComponent(filename);
-
-      // 判断sort 和 filters
-      if (sort.length > 0) {
-          api.url += "&$orderby=" + encodeURIComponent(order);
-      }
-      let filters = list_views[list_views_name].filters;
-      if (filters && filters.length > 0) {
-          api.url = api.url + "&filters=" + encodeURIComponent(JSON.stringify(filters));
-      }
-      return api;
-  `;
+  const requestAdaptor = function () {
+    let uiSchema = api.body.uiSchema;
+    let list_views_name = api.body.listName;
+    let list_views = uiSchema.list_views;
+    const listViewPropsStoreKey = location.pathname + "/crud/query";
+    const query = JSON.parse(sessionStorage.getItem(listViewPropsStoreKey));
+    const { filters, sort, fields: select } = query;
+    let filename = uiSchema.label + "-" + list_views[list_views_name].label;
+
+    var url_tmp = api.url.split('?')[0];
+    api.url = url_tmp + "?$select=" + encodeURIComponent(select.toString()) + "&filename=" + encodeURIComponent(filename);
+    // 判断sort 和 filters
+    if (sort.length > 0) {
+      api.url += "&$orderby=" + encodeURIComponent(sort);
+    }
+    if (filters && filters.length > 0) {
+      api.url = api.url + "&filters=" + encodeURIComponent(JSON.stringify(filters));
+    }
+    return api;
+  };
   return {
     "type": "service",
-    "body": [{
-      "type": "button",
-      "label": i18next.t('frontend_export_excel'),
-      "id": "u:standard_export_excel",
-      "level": "default",
-      "onEvent": {
-        "click": {
-          "weight": 0,
-          "actions": [
-            {
-              "args": {
-                "api": {
-                  "url": "${context.rootUrl}/api/record/export/${objectName}",
-                  "method": "get",
-                  "messages": {},
-                  "requestAdaptor": requestAdaptor,
-                  "data": {
-                    "uiSchema": "${uiSchema}",
-                    "listName": "${listName}"
-                  },
-                  "headers": {
-                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+    "body": [
+      {
+        "type": "button",
+        "label": i18next.t('frontend_export_excel'),
+        "id": "u:standard_export_excel",
+        "level": "default",
+        "disabledTip": i18next.t('frontend_export_excel_toast'),
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [{
+              "componentId": "u:standard_export_excel",
+              "actionType": "disabled"
+            },
+              {
+                "args": {
+                  "api": {
+                    "url": "${context.rootUrl}/api/record/export/${objectName}",
+                    "method": "get",
+                    "messages": {},
+                    "requestAdaptor": requestAdaptor.toString().match(/function[^{]+\{([\s\S]*)\}$/)[1],
+                    "data": {
+                      "uiSchema": "${uiSchema}",
+                      "listName": "${listName}"
+                    },
+                    "headers": {
+                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    }
                   }
-                }
+                },
+                "actionType": "download"
               },
-              "actionType": "download"
-            }
-          ]
+              {
+                "componentId": "u:standard_export_excel",
+                "actionType": "enabled"
+              }
+            ]
+          }
         }
       }
-    }]
+    ]
   }
 };
 
@@ -3069,6 +3052,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
         return {
             "type": "button",
             "icon": "fa fa-angle-down",
+            "className": "mr-0",
             "onEvent": {
               "click": {
                 "actions": [
@@ -3120,7 +3104,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
             name: button.name,
             objectName: button.objectName,
             visibleOn: getButtonVisibleOn$1(button),
-            className: `button_${button.name}`
+            className: `button_${button.name} mr-0`
             }
         });
     }
@@ -3640,7 +3624,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       const selfData = api.body.$self;
                                       const uiSchema = selfData.uiSchema;
                                       const fields = uiSchema.fields;
-                                      const options = (payload.data?.options || []).filter(function(item){
+                                      const options = ((payload.data && payload.data.options) || []).filter(function(item){
                                         let field = fields[item.value];
                                         // TODO: 暂时禁用location类型字段的列表搜索
                                         return !!field && window.isFieldTypeSearchable(field.type) && field.type !== 'location'
@@ -4043,7 +4027,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                           "actions": [
                               {
                                   "actionType": "custom",
-                                  "script": "Steedos.goBack()"
+                                  "script": "window.goBack()"
                               }
                           ]
                       }
@@ -4919,10 +4903,10 @@ function apiRequestAdaptor$1(){
     const recordId_tmp = api.body.recordId;
     
     if (typeof formData_tmp.columns == 'string') {
-      formData_tmp.columns = formData_tmp.columns?.split(',');
+      formData_tmp.columns = formData_tmp.columns && formData_tmp.columns.split(',');
     }
     if (typeof formData_tmp.mobile_columns == 'string') {
-      formData_tmp.mobile_columns = formData_tmp.mobile_columns?.split(',');
+      formData_tmp.mobile_columns = formData_tmp.mobile_columns && formData_tmp.mobile_columns.split(',');
     }
     
     // 数据格式转换
@@ -5055,7 +5039,7 @@ function apiRequestAdaptor(){
     const recordId = api.body.recordId;
     //数据格式转换
     if (typeof formData.sort == 'string') {
-      formData.sort = formData.sort?.split(',');
+      formData.sort = formData.sort && formData.sort.split(',');
     }
     formData.sort = lodash.map(formData.sort, (item) => {
       const arr = item.split(':');
@@ -5245,7 +5229,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
 function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
   const searchableFieldsLabel = [];
-  _.each(fields, function (field) {
+  _.each(mainObject.fields, function (field) {
     if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
       searchableFieldsLabel.push(field.label);
     }
@@ -5437,8 +5421,14 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
   if (formFactor === 'SMALL') {
+    // return [
+    //   "load-more",
+    // ]
     return [
-      "load-more",
+      {
+        "type": "pagination",
+        "maxButtons": 5
+      }
     ]
   }
   else {
@@ -5837,13 +5827,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })){
                 i++;
                 tableFields.push(field);
-                if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
-                    searchableFields.push(field.name);
-                }
             }
         }
     });
 
+    _$1.each(refObjectConfig.fields, function (field) {
+      if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
+          searchableFields.push(field.name);
+      }
+    });
+
     const fields = {
         [referenceTo.labelField.name]: referenceTo.labelField,
         [referenceTo.valueField.name]: referenceTo.valueField
@@ -5895,7 +5888,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
-            if(selfData.value?.indexOf(',') > 0){
+            if(selfData.value && selfData.value.indexOf(',') > 0){
                 fieldValue = selfData.value.split(',');
                 filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }else{
@@ -6028,13 +6021,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     }
 
     let pickerSchema = null;
-    if(ctx.formFactor === 'SMALL'){
-        pickerSchema = await getListSchema$1(tableFields, {
-            top:  top,
-            ...ctx,
-            actions: false
-        });
-    }else {
+    {
         pickerSchema = await getTableSchema$1(tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
@@ -6090,7 +6077,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
               {
                 "actionType": "custom",
                 "script": `
-                    const masterRecord = event.data._master?.record;
+                    const masterRecord = event.data._master && event.data._master.record;
                     const fieldConfig = ${JSON.stringify(field)};
                     let reference_to = fieldConfig.reference_to;
                     let saveValue;
@@ -6403,6 +6390,7 @@ async function lookupToAmis(field, readonly, ctx){
     }
 
     if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+        ctx.onlyDisplayLookLabel = true;
         if(ctx.idsDependOn){
             // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
@@ -6473,7 +6461,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
         if(selfData.op === 'loadOptions' && selfData.value){
-            if(selfData.value?.indexOf(',') > 0){
+            if(selfData.value && selfData.value.indexOf(',') > 0){
                 filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
             }else{
                 filters = [["${referenceTo.valueField.name}", "=", selfData.value]];
@@ -6506,6 +6494,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
         pickerSchema = await getTableSchema$1(tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
+            isLookup: true,
             ...ctx
         });
 
@@ -6548,8 +6537,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-07-27 17:33:54
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-08-28 17:45:38
  * @Description: 
  */
 
@@ -6611,14 +6600,29 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
 
 const getHtmlFieldSchema = (field, readonly, ctx)=>{
     if(readonly){
+        // return {
+        //     "type": "control",
+        //     "label": field.label,
+        //     "body": {
+        //       "type": "html",
+        //       "name": field.name
+        //     }
+        //   }
         return {
-            "type": "control",
-            "label": field.label,
-            "body": {
-              "type": "html",
-              "name": field.name
-            }
+          "type": "input-rich-text",
+          "receiver": "${context.rootUrl}/s3/images",
+          "name": field.name,
+          "options": {
+            "plugins": [
+              "autoresize"
+            ],
+            // "max_height": 2000,
+            "statusbar": false,
+            "readonly": true,
+            "toolbar": false,
+            "menubar": false
           }
+        }
     }else {
         return {
             "type": "input-rich-text",
@@ -6676,6 +6680,9 @@ function getAmisStaticFieldType(type, readonly, options){
         return type;
     }
     if(_$1.includes(['text','image'], type)){
+        if('text' === type && options && options.amis && options.amis.tpl){
+            return 'static';
+        }
         if('image' === type && options && options.multiple){
             return `static-images`;
         }
@@ -6946,7 +6953,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     // }
     switch (field.type) {
         case 'text':
-            convertData.type = getAmisStaticFieldType('text', readonly);
+            convertData.type = getAmisStaticFieldType('text', readonly, field);
             break;
         case 'textarea':
             convertData.type = getAmisStaticFieldType('textarea', readonly);
@@ -7712,7 +7719,7 @@ async function getQuickEditSchema(field, options){
                 case "number":
                 case "currency":
                     TempDisplayField = `
-                            _display["${field.name}"] = event.data.value?.toFixed(${field.scale});
+                            _display["${field.name}"] = event.data.value && event.data.value.toFixed(${field.scale});
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
 
@@ -7900,13 +7907,15 @@ async function getTableColumns(fields, options){
                                 }
                             },
                             "actionType": "download",
-                            "expression": "!!!window?.nw?.require"//浏览器上直接下载
+                            // "expression": "!!!window?.nw?.require"//浏览器上直接下载
+                            "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
                         },
                         {
                           "args": {},
                           "actionType": "custom",
                           "script": previewFileScript,
-                          "expression": "!!window?.nw?.require" //PC客户端预览附件
+                        //   "expression": "!!window?.nw?.require" //PC客户端预览附件
+                          "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                         }
                     ]
                   }
@@ -8027,7 +8036,7 @@ async function getTableColumns(fields, options){
  */
 function getMobileLines(tpls){
     let lines = [];
-    let maxLineCount = 2;
+    let maxLineCount = 3;
     let lineChildren = [];
     let isNewLine = false;
     let isLeft = true;
@@ -8045,10 +8054,10 @@ function getMobileLines(tpls){
         }
         if(isLeft){
             // 左侧半行
-            lineChildrenClassName = "steedos-listview-item-left two-lines-truncate";
+            lineChildrenClassName = "steedos-listview-item-left truncate";
             if(item.field.is_wide){
-                // 左侧全行样式可以单独写
-                lineChildrenClassName = "steedos-listview-item-wide truncate";
+                // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
+                lineChildrenClassName = "steedos-listview-item-wide";
             }
             if(lines.length === 0){
                 // 第一个字段加粗黑色显示
@@ -8056,7 +8065,7 @@ function getMobileLines(tpls){
             }
         }
         else {
-            // 右侧半行
+            // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
             lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
         }
         lineChildren.push({
@@ -8096,7 +8105,7 @@ async function getMobileTableColumns(fields, options){
         let tpl = "";
         if(field.is_name || field.name === options.labelFieldName){
             nameField = field;
-            options.onlyDisplayLabel = true;
+            options.onlyDisplayLookLabel = true;
             tpl = await getFieldTpl(field, options);
         }
         else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
@@ -8105,12 +8114,13 @@ async function getMobileTableColumns(fields, options){
         }
         else {
             if(field.type === 'lookup' || field.type === 'master_detail'){
-                options.onlyDisplayLabel = true;
+                options.onlyDisplayLookLabel = true;
             }
             tpl = await getFieldTpl(field, options);
         }
         if(!tpl){
-            tpl = `\${${field.name}}`;
+            //qhd需求简易处理，加上raw以支持审批王名称字段通过颜色区分缓急，若之后手机端列表支持配置amis，则可以去掉
+            tpl = `\${${field.name} | raw}`;
         }
         if(!field.hidden && !field.extra){
             tpls.push({ field, tpl });
@@ -8301,19 +8311,26 @@ async function getTableOperation(ctx){
 
 async function getTableSchema$1(fields, options){
     let isLookup = options && options.isLookup;
+    let hiddenColumnOperation = options && options.hiddenColumnOperation;
     if(!options){
         options = {};
     }
     let columns = [];
-    if(options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1){
+    let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
+    if(isLookup){
+        // 在lookup手机端列表模式调式好之前不使用getMobileTableColumns
+        useMobileColumns = false;
+    }
+    if(useMobileColumns){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
         columns = await getTableColumns(fields, options);
-        if(!isLookup){
+        if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
     }
+
     return {
         mode: "table",
         name: "thelist",
@@ -8324,7 +8341,7 @@ async function getTableSchema$1(fields, options){
         columns: columns,
         syncLocation: false,
         keepItemSelectionOnPageChange: true,
-        checkOnItemClick: false,
+        checkOnItemClick: isLookup ? true : false,
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
@@ -8361,7 +8378,7 @@ async function getTableApi(mainObject, fields, options){
         baseFilters = filter;
     }
 
-    _$1.each(fields, function (field) {
+    _$1.each(mainObject.fields, function (field) {
         if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
             searchableFields.push(field.name);
         }
@@ -8423,7 +8440,9 @@ async function getTableApi(mainObject, fields, options){
                     // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                     let formFactor = "${options.formFactor}";
                     // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                    api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                    // api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                    // 移动端暂时去除加载更多，放开翻页
+                    api.data.pageNo = localListViewProps.page || 1;
                 }
             }
         }
@@ -8544,7 +8563,17 @@ async function getTableApi(mainObject, fields, options){
         api.data = {
             query: api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim())
         }
-        ${options.requestAdaptor || ''}
+        ${options.requestAdaptor || ''};
+
+        //写入本次存储filters、sort
+        const listViewPropsStoreKey = location.pathname + "/crud/query";
+        sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
+            filters: filters,
+            sort: sort.trim(),
+            pageSize: pageSize,
+            skip: skip,
+            fields: ${JSON.stringify(_$1.map(fields, 'name'))}
+        }));
         return api;
     `;
     api.adaptor = `
@@ -8623,7 +8652,8 @@ async function getTableApi(mainObject, fields, options){
                 // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                 let formFactor = "${options.formFactor}";
                 // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                // selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                selfData.page = localListViewProps.page || 1;
             }
         }
         delete selfData.context;
@@ -8641,7 +8671,13 @@ async function getTableApi(mainObject, fields, options){
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
         //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
-        SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
+        var scope = SteedosUI.getRef(api.body.$self.$scopeId);
+        var scopeParent = scope && scope.parent;
+        var setDataToComponent = scopeParent && scopeParent.getComponentById(setDataToComponentId);
+        if(setDataToComponent){
+            setDataToComponent.setData({$count: payload.data.count});
+        }
+        // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
     ${options.adaptor || ''}
     return payload;
@@ -8927,7 +8963,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 var uiSchema = api.body.uiSchema;
                 var defaultData = api.body.defaultData;
                 var defaultValues = {};
-                _.each(uiSchema?.fields, function(field){
+                _.each(uiSchema && uiSchema.fields, function(field){
                     var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
                     if(value){
                         defaultValues[field.name] = value;
@@ -9146,7 +9182,12 @@ async function getCalendarApi(mainObject, fields, options) {
     window.postMessage(Object.assign({type: "listview.loaded"}), "*");
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
-        SteedosUI.getRef(api.body.$self.scopeId)?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
+        var scope = SteedosUI.getRef(api.body.$self.scopeId);
+        var setDataToComponent = scope && scope.getComponentById(setDataToComponentId);
+        if(setDataToComponent){
+          setDataToComponent.setData({$count: payload.data.count});
+        }
+        // SteedosUI.getRef(api.body.$self.scopeId)?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     }
     const rows = payload.data.rows || [];
     const selfData = api.data.$self;
@@ -9893,6 +9934,10 @@ async function getObjectCRUD(objectSchema, fields, options){
             }
         }
       `;
+      let autoFillHeight = true;
+      if(options.isRelated || Steedos.isMobile()){
+        autoFillHeight = false;
+      }
 
       body = Object.assign({}, table, {
         type: 'crud', 
@@ -9903,7 +9948,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight: options.isRelated ? false : true,
+        autoFillHeight,
         className: `flex-auto ${crudClassName || ""}`,
         bodyClassName: "bg-white",
         crudClassName: crudClassName,
@@ -10146,7 +10191,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                       //   "blank": false
                       // },
                       "actionType": "custom",
-                      "script": "Steedos.goBack()",
+                      "script": "window.goBack()",
                       "expression": "this.__deletedRecord === true"
                     }
                   ]
@@ -10263,7 +10308,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-21 14:50:21
+ * @LastEditTime: 2023-08-28 14:55:23
  * @Description:
  */
 
@@ -10409,11 +10454,16 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     // }
     const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel, ctx);
     const componentId = `steedos-record-related-list-${relatedObjectName}`;
+    const isMobile = window.innerWidth < 768;
+    let headerToolbar = [];
+    if(!isMobile){
+        headerToolbar.push("bulkActions");
+    }
     const options = {
         globalFilter,
         defaults: {
             listSchema: { 
-                headerToolbar:["bulkActions"],
+                headerToolbar,
                 columnsTogglable: false,
                 onEvent: {
                     [`@data.changed.${relatedObjectName}`]: {
@@ -10609,8 +10659,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-17 18:03:51
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-08-25 11:55:15
  * @Description:
  */
 
@@ -10875,7 +10925,7 @@ async function getListSchema(
      * 本次存储代码段
      */
     try {
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       /**
        * localListViewProps规范来自crud请求api中api.data.$self参数值的。
@@ -10897,11 +10947,12 @@ async function getListSchema(
         if(localListViewProps.orderDir){
             listSchema.orderDir = localListViewProps.orderDir;
         }
-        // if(localListViewProps.perPage){
-        //     listSchema.defaultParams = {
-        //         perPage: localListViewProps.perPage
-        //     }
-        // }
+
+        if(localListViewProps.perPage){
+            listSchema.defaultParams = {
+                perPage: localListViewProps.perPage
+            };
+        }
         defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
       }
     }
@@ -12254,7 +12305,7 @@ const getNextStepUsersInput = async (instance) => {
     id: "u:ffff15b76c89",
     className: "b-a b-1x p-xs m-b-none m-l-none m-r-none m-t-sm",
     subFormMode: "",
-    hiddenOn: "!!!this.new_next_step || this.new_next_step?.step_type === 'end'"
+    hiddenOn: "!!!this.new_next_step || (this.new_next_step && this.new_next_step.step_type === 'end')"
   };
 };
 
@@ -13174,7 +13225,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
       map[item.value] = item.label;
     });
     tpl.type = 'static';
-    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return options?.[data.${field.code}] || ''%>`;
+    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data.${field.code}]) || ''%>`;
   }else if(field.type === 'odata'){
     tpl.type = 'static';
     tpl.tpl = `<div>\${${field.code}['@label']}</div>`;
@@ -13204,7 +13255,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
     if(field.is_multiselect){
       tpl.tpl = `\${_.map(${field.code}, 'name')}`;
     }else {
-      tpl.tpl = `\${${field.code}?.name}`;
+      tpl.tpl = `\${${field.code} && ${field.code}.name}`;
     }
   }else if(field.type === 'group'){
     tpl.type = 'static';