@steedos-widgets/amis-lib 1.2.6-beta.9 → 1.2.6

package/dist/index.cjs.js

@@ -1377,26 +1377,11 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
     }
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-08-04 10:42:49
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-08-25 10:28:47
- * @Description: 
- */
-var config = {
-    listView: {
-        newRecordMode: 'modal',
-        editRecordMode: 'modal',
-        perPage: 20
-    }
-};
-
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-19 20:26:27
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-04-26 11:52:04
  * @Description: 
  */
 
@@ -1488,7 +1473,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                             "schemaApi": {
                                                 "data": {
                                                     "isLookup": "${isLookup}",
-                                                    "_master": "${_master}"
+                                                    "_master": "${_master}",
+                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}"
                                                 },
                                                 "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                 "method": "get",
@@ -1497,7 +1483,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                                 "headers": {
                                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                 },
-                                                "requestAdaptor": "",
+                                                "requestAdaptor": "return { ...api, url: api.body.url }",
                                                 "adaptor": schemaApiAdaptor
                                             }
                                         }
@@ -2406,6 +2392,166 @@ const execute = (button, props) => {
 
 const executeButton = execute;
 
+
+const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
+    const { name } = objectSchema;
+    const buttons = getObjectDetailButtons(objectSchema, {});
+    const moreButtons = getObjectDetailMoreButtons(objectSchema, {
+        recordId: recordId,
+        objectName: name
+    });
+    let amisButtonsSchema = ___default["default"].map(buttons, (button) => {
+        return {
+        type: 'steedos-object-button',
+        name: button.name,
+        objectName: button.objectName,
+        visibleOn: getButtonVisibleOn$1(button),
+        className: `button_${button.name}`
+        }
+    });
+    let dropdownButtons = ___default["default"].map(moreButtons, (button) => {
+        return {
+        type: 'steedos-object-button',
+        name: button.name,
+        objectName: button.objectName,
+        visibleOn: getButtonVisibleOn$1(button),
+        }
+    });
+    return {
+        buttons: amisButtonsSchema,
+        moreButtons: dropdownButtons
+    };
+};
+
+const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
+    const { buttons, moreButtons } = getObjectDetailHeaderButtons(objectSchema, recordId);
+    if(ctx.formFactor === 'SMALL'){
+        return {
+            "type": "button",
+            "icon": "fa fa-angle-down",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "drawer",
+                    "drawer": {
+                      "type": "drawer",
+                      "title": "操作",
+                      "body": [
+                        {
+                          "type": "button-group",
+                          "id": "u:fd837823be5b",
+                          "vertical": true,
+                          "tiled": true,
+                          "buttons": [
+                            ...___default["default"].map(buttons, (button)=>{
+                                button.className += ' w-full';
+                                return button;
+                            }),
+                            ...___default["default"].map(moreButtons, (button)=>{
+                                button.className += ' w-full';
+                                return button;
+                            })
+                          ],
+                          "btnLevel": "enhance",
+                          "className": "w-full",
+                          "btnClassName": "w-full",
+                          "size": "lg"
+                        }
+                      ],
+                      "id": "u:9815f7366b9f",
+                      "position": "bottom",
+                      "closeOnOutside": true,
+                      "resizable": false,
+                      "className": "buttons-drawer",
+                      "bodyClassName": "m-none p-none",
+                      "actions": []
+                    }
+                  }
+                ]
+              }
+            },
+            "id": "u:ee7c7929e6ae"
+          }
+    }else {
+        if(moreButtons.length > 0){
+            const dropdownButtonsSchema = {
+                type: "steedos-dropdown-button",
+                label: "",
+                buttons: moreButtons,
+                className: 'slds-icon'
+            };
+            buttons.push(dropdownButtonsSchema);
+        }
+        return buttons;
+    }
+};
+
+
+const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
+    const buttons = getListViewButtons(objectSchema, ctx);
+    if(ctx.formFactor === 'SMALL'){
+        return {
+            "type": "button",
+            "icon": "fa fa-angle-down",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "drawer",
+                    "drawer": {
+                      "type": "drawer",
+                      "title": "操作",
+                      "body": [
+                        {
+                          "type": "button-group",
+                          "id": "u:fd837823be5b",
+                          "vertical": true,
+                          "tiled": true,
+                          "buttons": [
+                            ...___default["default"].map(buttons, (button)=>{
+                                return {
+                                    type: 'steedos-object-button',
+                                    name: button.name,
+                                    objectName: button.objectName,
+                                    visibleOn: getButtonVisibleOn$1(button),
+                                    className: `button_${button.name} w-full`
+                                }
+                            })
+                          ],
+                          "btnLevel": "enhance",
+                          "className": "w-full",
+                          "btnClassName": "w-full",
+                          "size": "lg"
+                        }
+                      ],
+                      "id": "u:9815f7366b9f",
+                      "position": "bottom",
+                      "closeOnOutside": true,
+                      "resizable": false,
+                      "className": "buttons-drawer",
+                      "bodyClassName": "m-none p-none",
+                      "actions": []
+                    }
+                  }
+                ]
+              }
+            },
+            "id": "u:ee7c7929e6ae"
+          }
+    }else {
+        return ___default["default"].map(buttons, (button) => {
+            return {
+            type: 'steedos-object-button',
+            name: button.name,
+            objectName: button.objectName,
+            visibleOn: getButtonVisibleOn$1(button),
+            className: `button_${button.name}`
+            }
+        });
+    }
+};
+
 async function getObjectFieldsFilterButtonSchema(objectSchema) {
   // const amisListViewId = `listview_${objectSchema.name}`;
   return {
@@ -2539,6 +2685,35 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
   `;
+  const onResetScript = `
+    const scope = event.context.scoped;
+    var filterForm = scope.parent.parent.getComponents().find(function(n){
+      return n.props.type === "form";
+    });
+    var filterFormValues = filterForm.getValues();
+    var listView = scope.parent.parent.parent.getComponents().find(function(n){
+      return n.props.type === "crud";
+    });
+    const removedValues = {};
+    for(var k in filterFormValues){
+      if(/^__searchable__/.test(k)){
+        removedValues[k] = "";
+      }
+    }
+    if(!event.data.isLookup){
+      // 刷新浏览器后，filterFormValues值是空的，只能从本地存储中取出并重置为空值
+      const listViewId = event.data.listViewId;
+      const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+      let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+      if(localListViewProps){
+        localListViewProps = JSON.parse(localListViewProps);
+        for(var k in localListViewProps){
+          removedValues[k] = "";
+        }
+      }
+    }
+    listView.handleFilterSubmit(removedValues);
+  `;
   const dataProviderInited = `
     const objectName = data.objectName;
     const isLookup = data.isLookup;
@@ -2732,6 +2907,21 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                   }
                 }
               },
+              {
+                "type": "button",
+                "label": "重置",
+                "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                "onEvent": {
+                  "click": {
+                    "actions": [
+                      {
+                        "actionType": "custom",
+                        "script": onResetScript
+                      }
+                    ]
+                  }
+                }
+              },
               {
                 "type": "button",
                 "label": "设置搜索项",
@@ -2888,17 +3078,7 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
     }
   );
 
-  const buttons = getListViewButtons(objectSchema, {});
-  let amisButtonsSchema = _$1.map(buttons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-      className: `button_${button.name}`
-    }
-  });
-  
+  let amisButtonsSchema = getObjectListViewButtonsSchemas(objectSchema, {formFactor: ctx.formFactor});
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
   return {
@@ -2931,8 +3111,8 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                   },
                   {
                     "type": "dropdown-button",
-                    "className": "",
-                    "label": "\${uiSchema.list_views[listName].label}",
+                    "className": "", 
+                    "label": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
                     "rightIcon": "fa fa-caret-down",
                     "size": "sm",
                     "hideCaret": true,
@@ -3080,7 +3260,10 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @returns amisSchema
  */
 function getObjectListHeader$1(objectSchema, listViewName, ctx) {
-  let firstLineSchema = getObjectListHeaderFirstLine(objectSchema);
+  if (!ctx) {
+    ctx = {};
+  }
+  let firstLineSchema = getObjectListHeaderFirstLine(objectSchema, listViewName, ctx);
   let body = [firstLineSchema];
   let headerSchema = [{
     "type": "wrapper",
@@ -3101,35 +3284,11 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   const { showRecordTitle = true } = options || {};
   // console.log('getObjectRecordDetailHeader==>', objectSchema, recordId)
   const { name, label, icon, NAME_FIELD_KEY } = objectSchema;
-  const buttons = getObjectDetailButtons(objectSchema, {});
-  const moreButtons = getObjectDetailMoreButtons(objectSchema, {
-    recordId: recordId,
-    objectName: name
-  });
-  let amisButtonsSchema = _$1.map(buttons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-      className: `button_${button.name}`
-    }
-  });
-  let dropdownButtons = _$1.map(moreButtons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-    }
-  });
-  const dropdownButtonsSchema = {
-    type: "steedos-dropdown-button",
-    label: "",
-    buttons: dropdownButtons,
-    className: 'slds-icon'
-  };
-  amisButtonsSchema.push(dropdownButtonsSchema);
+  
+  let amisButtonsSchema = getObjectDetailButtonsSchemas(objectSchema, recordId, options);
+
+  // console.log(`getObjectRecordDetailHeader==>`, amisButtonsSchema)
+  
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
 
@@ -3340,8 +3499,8 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "icon": "fa fa-table-columns",
     "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
     "align": "right",
-    "visibleOn": "${formFactor !== 'SMALL'}",
-    "buttons": [
+    "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
+    "buttons": [ 
       {
         "label": "显示为",
         "children": buttons
@@ -3438,6 +3597,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
     `;
     return [
       // "bulkActions",
+      ...(headerToolbarItems || []),
       hiddenCount ? {} :{
         "type": "tpl",
         "tpl": "${count} 个项目"
@@ -3582,7 +3742,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                             "list_view": "${uiSchema.list_views[listName]}",
                             "appId": "${appId}",
                             "global": "${global}",
-                            "objectName": "${objectName}",
+                            "targetObjectName": "${objectName}",
                           },
                           "body": [
                             {
@@ -3622,7 +3782,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                     {
                                       "args": {
                                         // 直接使用recordId不能拿到数据，只能通过result里面拿数据
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
                                         "blank": false
                                       },
                                       "actionType": "url",
@@ -3663,7 +3823,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                           "data": {
                             "&": "$$",
                             "listName": "${listName}",
-                            "objectName": "${objectName}",
+                            "targetObjectName": "${objectName}",
                             "list_view": "${uiSchema.list_views[listName]}",
                             "appId": "${appId}",
                             "global": "${global}"
@@ -3706,7 +3866,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                   "actions": [
                                     {
                                       "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
                                         "blank": false
                                       },
                                       "actionType": "url",
@@ -3742,7 +3902,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                           "type": "dialog",
                           "title": "重命名 列表视图",
                           "data": {
-                            "objectName": "${objectName}",
+                            "targetObjectName": "${objectName}",
                             "recordId": "${uiSchema.list_views[listName]._id}",
                             "appId": "${appId}"
                           },
@@ -3763,7 +3923,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                   "actions": [
                                     {
                                       "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${name}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${name}",
                                         "blank": false
                                       },
                                       "actionType": "url",
@@ -3837,6 +3997,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                           "type": "dialog",
                           "title": "过滤设置",
                           "data": {
+                            "targetObjectName": "${objectName}",
                             "objectName": "${objectName}",
                             "recordId": "${uiSchema.list_views[listName]._id}",
                             "listName": "${listName}",
@@ -3862,7 +4023,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                   "actions": [
                                     {
                                       "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                         "blank": false
                                       },
                                       "actionType": "url",
@@ -3900,6 +4061,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                           "title": "显示的列",
                           "data": {
                             "&": "$$",
+                            "targetObjectName": "${objectName}",
                             "objectName": "${objectName}",
                             "recordId": "${uiSchema.list_views[listName]._id}",
                             "listName": "${listName}",
@@ -3925,7 +4087,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                   "actions": [
                                     {
                                       "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                         "blank": false
                                       },
                                       "actionType": "url"
@@ -3961,6 +4123,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                           "title": "弹框标题",
                           "data": {
                             "&": "$$",
+                            "targetObjectName": "${objectName}",
                             "objectName": "${objectName}",
                             "recordId": "${uiSchema.list_views[listName]._id}",
                             "listName": "${listName}",
@@ -3986,7 +4149,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                   "actions": [
                                     {
                                       "args": {
-                                        "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                        "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                         "blank": false
                                       },
                                       "actionType": "url"
@@ -4534,13 +4697,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         var sort = orderBy + ' ' + orderDir;
         sort = orderBy ? sort : "${sort}";
         var allowSearchFields = ${JSON.stringify(searchableFields)};
+        let fieldValue;
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
             if(selfData.value?.indexOf(',') > 0){
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
+                fieldValue = selfData.value.split(',');
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }else{
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value]];
+                fieldValue = selfData.value;
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }
         }
 
@@ -4594,6 +4760,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(enable_tree){
             pageSize = 10000;
         }
+        if(fieldValue && _.isArray(fieldValue) && fieldValue.length > pageSize){
+            pageSize = fieldValue.length;
+        }
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `;
@@ -4674,6 +4843,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             ...ctx
         });
 
+        pickerSchema.affixHeader = false;
+
         var headerToolbarItems = [];
         const isMobile = window.innerWidth < 768;
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
@@ -4691,14 +4862,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
             pickerSchema.headerToolbar.push(new_button);
         }
         pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
-        //TODO: 等待放大镜bug修复,if会去掉，始终显示放大镜
-        if(referenceTo.objectName != "space_users" || field.reference_to_field != "user"){
-            if (ctx.filterVisible !== false) {
-                pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
-                    isLookup: true,
-                    ...ctx
-                });
-            }
+        if (ctx.filterVisible !== false) {
+            pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
+                isLookup: true,
+                ...ctx
+            });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
             "&": "$$",
@@ -4882,11 +5050,12 @@ async function lookupToAmisSelect(field, readonly, ctx){
         autoComplete: apiInfo,
         searchable: true,
     };
+    //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
     const select_menuTpl = `<span class='flex items-center mt-0.5'>
         <span role='img' aria-label='smile' class='anticon anticon-smile'>
             <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
                 <svg class='slds-icon slds-icon_x-small' aria-hidden='true'>
-                    <use xlink:href='\${context.rootUrl}/assets/icons/standard-sprite/svg/symbols.svg#\${icon}'></use>
+                    <use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#\${icon}'></use>
                 </svg>
             </span> 
         </span>
@@ -4944,8 +5113,10 @@ async function lookupToAmis(field, readonly, ctx){
 
     if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
         if(ctx.idsDependOn || field.amis){
+            // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
         }
+        // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
         // return await lookupToAmisSelectUser(field, readonly, ctx);
     }
 
@@ -5046,6 +5217,9 @@ async function getIdsPickerSchema(field, readonly, ctx){
             top:  top,
             ...ctx
         });
+
+        pickerSchema.affixHeader = false;
+
     }
 
     const data = {
@@ -5075,7 +5249,6 @@ async function getIdsPickerSchema(field, readonly, ctx){
     if(readonly){
         data.tpl = await getLookupTpl(field, ctx);
     }
-
     return data;
 }
 
@@ -5654,7 +5827,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData = {
                 type: "editor",
                 language: field.language,
-                // value: field.defaultValue || ''
+                editorDidMount: new Function('editor', 'monaco', field.editorDidMount)
             };
             break;
         case 'toggle':
@@ -5675,7 +5848,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     columnsTogglable: false,
                     strictMode:false,
                     affixHeader: false, // 是否固定表头, 不固定表头, 否则form有y轴滚动条时, 表头会跟随滚动条滚动.
-                    // needConfirm: true,  此属性设置为false后，导致table不能编辑。
+                    needConfirm: false,
                     editable: !readonly,
                     addable: !readonly,
                     removable: !readonly,
@@ -5905,6 +6078,12 @@ function getReadonlyFormAdaptor(object, fields){
     // })
 
     return  `
+    if(payload.data.data.length === 0){
+        return {
+            status: 2,
+            msg: "无法找到记录"
+        }
+    }
     if(payload.data.data){
         var data = payload.data.data[0];
         var gridAndObjectFieldsName = ${JSON.stringify(gridAndObjectFieldsName)};
@@ -6029,12 +6208,12 @@ function getScriptForRewriteValueForFileFields(fields){
                                 });
                             }
                         }else{
-                            data[item] = {
+                            data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,
                                 url: fileFieldDisplayValue.url + "?download=true",
                                 state: "uploaded"
-                            };
+                            }];
                         }
                     }
                 })
@@ -6052,7 +6231,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
 
     return {
         method: "post",
-        url: getApi$2(),
+        url: getApi$2() + '&objectName=${objectName}' ,
         // sendOn: "!!this.recordId",
         cache: API_CACHE,
         requestAdaptor: `
@@ -6358,7 +6537,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       }), 
       filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
     };
-    if(options.formFactor !== 'SMALL'){
+    if(options.formFactor !== 'SMALL' || ["split"].indexOf(options.displayAs) == -1){
       Object.assign(bodyProps, {
         bulkActions: options.bulkActions != false ? bulkActions : false
       });
@@ -6572,7 +6751,8 @@ async function getObjectForm(objectSchema, ctx){
                   "eventName": `@data.changed.${objectSchema.name}`
                 },
                 "data": {
-                  "objectName": `${objectSchema.name}`
+                  "objectName": `${objectSchema.name}`,
+                  "displayAs": "${displayAs}"
                 }
               },
               {
@@ -6672,7 +6852,8 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                 data: {
                   objectName: "${event.data.__objectName}",
                   record: "${event.data.__record}"
-                }
+                },
+                expression: "${event.data.__response.error != true}"
               },
               {
                 "actionType": "setValue",
@@ -6680,7 +6861,8 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                    value: {
                     "recordLoaded": true,
                    }
-                }
+                },
+                expression: "${event.data.__response.error != true}"
             }
             ]
           }
@@ -6688,6 +6870,21 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     }
 }
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-04 10:42:49
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-08-25 10:28:47
+ * @Description: 
+ */
+var config = {
+    listView: {
+        newRecordMode: 'modal',
+        editRecordMode: 'modal',
+        perPage: 20
+    }
+};
+
 async function getTableColumns(fields, options){
     const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
     for (const field of fields) {
@@ -6761,6 +6958,13 @@ async function getTableColumns(fields, options){
             }else if(field.type === 'html'){
                 type = 'markdown';
             }
+            let className = "";
+            if(field.type === 'textarea'){
+                className = 'min-w-56';
+            }
+            if(field.wrap === false){
+                className += " whitespace-nowrap";
+            }
             if(!field.hidden && !field.extra){
                 columns.push(Object.assign({}, {
                     name: field.name,
@@ -6771,7 +6975,7 @@ async function getTableColumns(fields, options){
                     type: type,
                     tpl: tpl,
                     toggled: field.toggled,
-                    className: field.type === 'textarea' ? 'min-w-56 whitespace-pre-wrap textarea' :  "whitespace-nowrap",
+                    className,
                     html: field.type === 'html' ? true : null
                     // toggled: true 
                 }, field.amis, {name: field.name}));
@@ -6896,8 +7100,9 @@ async function getMobileTableColumns(fields, options){
     const url = getNameTplUrl(nameField, options);
 
     const columnLines = getMobileLines(tpls);
-    
-    columns.push({
+
+
+    let column = {
         name: nameField.name,
         label: nameField.label,
         sortable: nameField.sortable,
@@ -6906,13 +7111,66 @@ async function getMobileTableColumns(fields, options){
         actionType: "link",
         link: url,
         innerClassName: "steedos-listview-item block text-gray-500",
-        body:{
+        body: {
             "type": "wrapper",
             "body": columnLines,
             "size": "none",
             "className": "p-1"
         }
-    });
+    };
+    
+    if(options.objectName === 'cms_files'){
+        if(window.Meteor?.isCordova){
+            column = {
+                ...column,
+                actionType: "",
+                link: "",
+                onEvent: {
+                    "click": {
+                        "actions": [
+                            {
+                                "script": `
+                                    let cms_url = "/api/files/files/"+event.data.versions[0]+"?download=true"
+                                    Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
+                                `,
+                                "actionType": "custom"
+                            }
+                        ],
+                        "weight": 0
+                    }
+                }
+            };
+        }else {
+            column = {
+                ...column,
+                actionType: "",
+                link: "",
+                onEvent: {
+                    "click": {
+                        "actions": [
+                            {
+                                "args": {
+                                    "api": {
+                                        "url": url,
+                                        "method": "get",
+                                        "headers": {
+                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                        }
+                                    }
+                                },
+                                "actionType": "download"
+                            }
+                        ],
+                        "weight": 0
+                    }
+                }
+            };
+        }
+        
+    }
+
+    columns.push(column);
+    
 
     return columns;
 }
@@ -7031,7 +7289,7 @@ async function getTableSchema$1(fields, options){
         options = {};
     }
     let columns = [];
-    if(options.formFactor === 'SMALL'){
+    if(options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
@@ -7234,7 +7492,11 @@ async function getTableApi(mainObject, fields, options){
             filters = systemFilters;
         };
         if(api.data.$self.additionalFilters){
-            userFilters.push(api.data.$self.additionalFilters)
+            if(_.isString(api.data.$self.additionalFilters)){
+                userFilters.push(eval(api.data.$self.additionalFilters))
+            }else{
+                userFilters.push(api.data.$self.additionalFilters)
+            }
         }
 
         if(api.data.$self._isRelated){
@@ -7267,8 +7529,7 @@ async function getTableApi(mainObject, fields, options){
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push('and');
-                filters.push(userFilters)
+                filters = [filters, 'and', userFilters]
             }
         }
         api.data = {
@@ -7695,7 +7956,6 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     // ObjectForm会认作用域下的变量值
     // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
     // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
-    event.data = doc;
     const title = "新建 ${objectSchema.label}";
     doAction(
       {
@@ -7708,6 +7968,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
               "type": "steedos-object-form",
               "objectApiName": "\${objectName}",
               "mode": "edit",
+              "defaultData": doc,
               "onEvent": {
                 "submitSucc": {
                   "weight": 0,
@@ -8000,7 +8261,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-04-20 11:43:14
+ * @LastEditTime: 2023-05-08 16:34:25
  * @Description:
  */
 
@@ -8254,7 +8515,7 @@ function getDefaultRelatedListProps(uiSchema, listName, ctx) {
 }  
 function getRelatedListProps(uiSchema, listViewName, ctx) {
     if (ctx.columns) {
-        const sort = getListViewSort(ctx.sort);
+        const sort = getListViewSort({sort: ctx.sort});
         let { filters , filtersFunction} = ctx;
         if(!filtersFunction && filters){
             filtersFunction = str2function(
@@ -8343,7 +8604,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-17 15:26:17
+ * @LastEditTime: 2023-04-28 11:11:29
  * @Description:
  */
 
@@ -8541,6 +8802,9 @@ async function getListSchema(
     ctx = {}
 ) {
     const uiSchema = await getUISchema(objectName);
+    if(!uiSchema){
+        return {}
+    }
     const listView =  _$1.find(
         uiSchema.list_views,
         (listView, name) => {
@@ -9094,7 +9358,10 @@ async function getListviewInitSchema(objectApiName, listViewName, ctx) {
         const defaults = ctx.defaults || {};
         if(!defaults.headerSchema){
             //传入isListviewInit是区别于对象列表类型的微页面，即getListPageInitSchema函数中该属性为false
-            const headerSchema = await getObjectListHeader$1(uiSchema);
+            const headerSchema = await getObjectListHeader$1(uiSchema, listViewName, {
+                onlySecordLine: true,
+                isListviewInit: true
+            });
             defaults.headerSchema = headerSchema;
         }
         ctx.defaults = defaults;
@@ -11770,6 +12037,7 @@ exports.getListviewInitSchema = getListviewInitSchema;
 exports.getLookupSapceUserTreeSchema = getLookupSapceUserTreeSchema;
 exports.getNotifications = getNotifications;
 exports.getObjectDetailButtons = getObjectDetailButtons;
+exports.getObjectDetailButtonsSchemas = getObjectDetailButtonsSchemas;
 exports.getObjectDetailMoreButtons = getObjectDetailMoreButtons;
 exports.getObjectFieldsFilterBarSchema = getObjectFieldsFilterBarSchema;
 exports.getObjectFieldsFilterButtonSchema = getObjectFieldsFilterButtonSchema;
@@ -11778,6 +12046,7 @@ exports.getObjectListHeader = getObjectListHeader$1;
 exports.getObjectListHeaderFieldsFilterBar = getObjectListHeaderFieldsFilterBar;
 exports.getObjectListHeaderFirstLine = getObjectListHeaderFirstLine;
 exports.getObjectListHeaderSecordLine = getObjectListHeaderSecordLine;
+exports.getObjectListViewButtonsSchemas = getObjectListViewButtonsSchemas;
 exports.getObjectRecordDetailHeader = getObjectRecordDetailHeader;
 exports.getObjectRecordDetailRelatedListHeader = getObjectRecordDetailRelatedListHeader;
 exports.getObjectRelated = getObjectRelated;