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

package/dist/amis-object.umd.js

@@ -1735,26 +1735,11 @@
         }
     };
 
-    /*
-     * @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: 
      */
 
@@ -1846,7 +1831,8 @@
                                                 "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",
@@ -1855,7 +1841,7 @@
                                                     "headers": {
                                                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                     },
-                                                    "requestAdaptor": "",
+                                                    "requestAdaptor": "return { ...api, url: api.body.url }",
                                                     "adaptor": schemaApiAdaptor
                                                 }
                                             }
@@ -2764,6 +2750,166 @@
 
     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["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["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["default"].map(buttons, (button)=>{
+                                    button.className += ' w-full';
+                                    return button;
+                                }),
+                                ...___default__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["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["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 {
@@ -2896,6 +3042,35 @@
     //   }
     // }
     // 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;
@@ -3090,6 +3265,21 @@
                       }
                     }
                   },
+                  {
+                    "type": "button",
+                    "label": "重置",
+                    "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                    "onEvent": {
+                      "click": {
+                        "actions": [
+                          {
+                            "actionType": "custom",
+                            "script": onResetScript
+                          }
+                        ]
+                      }
+                    }
+                  },
                   {
                     "type": "button",
                     "label": "设置搜索项",
@@ -3246,17 +3436,7 @@
         }
       );
 
-      const buttons = getListViewButtons(objectSchema, {});
-      let amisButtonsSchema = ___default.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 {
@@ -3289,8 +3469,8 @@
                       },
                       {
                         "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,
@@ -3438,7 +3618,10 @@
      * @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",
@@ -3459,35 +3642,11 @@
       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 = ___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.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, '-');
 
@@ -3698,8 +3857,8 @@
         "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
@@ -3796,6 +3955,7 @@ setTimeout(()=>{
     `;
         return [
           // "bulkActions",
+          ...(headerToolbarItems || []),
           hiddenCount ? {} :{
             "type": "tpl",
             "tpl": "${count} 个项目"
@@ -3940,7 +4100,7 @@ setTimeout(()=>{
                                 "list_view": "${uiSchema.list_views[listName]}",
                                 "appId": "${appId}",
                                 "global": "${global}",
-                                "objectName": "${objectName}",
+                                "targetObjectName": "${objectName}",
                               },
                               "body": [
                                 {
@@ -3980,7 +4140,7 @@ setTimeout(()=>{
                                         {
                                           "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",
@@ -4021,7 +4181,7 @@ setTimeout(()=>{
                               "data": {
                                 "&": "$$",
                                 "listName": "${listName}",
-                                "objectName": "${objectName}",
+                                "targetObjectName": "${objectName}",
                                 "list_view": "${uiSchema.list_views[listName]}",
                                 "appId": "${appId}",
                                 "global": "${global}"
@@ -4064,7 +4224,7 @@ setTimeout(()=>{
                                       "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",
@@ -4100,7 +4260,7 @@ setTimeout(()=>{
                               "type": "dialog",
                               "title": "重命名 列表视图",
                               "data": {
-                                "objectName": "${objectName}",
+                                "targetObjectName": "${objectName}",
                                 "recordId": "${uiSchema.list_views[listName]._id}",
                                 "appId": "${appId}"
                               },
@@ -4121,7 +4281,7 @@ setTimeout(()=>{
                                       "actions": [
                                         {
                                           "args": {
-                                            "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${name}",
+                                            "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${name}",
                                             "blank": false
                                           },
                                           "actionType": "url",
@@ -4195,6 +4355,7 @@ setTimeout(()=>{
                               "type": "dialog",
                               "title": "过滤设置",
                               "data": {
+                                "targetObjectName": "${objectName}",
                                 "objectName": "${objectName}",
                                 "recordId": "${uiSchema.list_views[listName]._id}",
                                 "listName": "${listName}",
@@ -4220,7 +4381,7 @@ setTimeout(()=>{
                                       "actions": [
                                         {
                                           "args": {
-                                            "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                            "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                             "blank": false
                                           },
                                           "actionType": "url",
@@ -4258,6 +4419,7 @@ setTimeout(()=>{
                               "title": "显示的列",
                               "data": {
                                 "&": "$$",
+                                "targetObjectName": "${objectName}",
                                 "objectName": "${objectName}",
                                 "recordId": "${uiSchema.list_views[listName]._id}",
                                 "listName": "${listName}",
@@ -4283,7 +4445,7 @@ setTimeout(()=>{
                                       "actions": [
                                         {
                                           "args": {
-                                            "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                            "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                             "blank": false
                                           },
                                           "actionType": "url"
@@ -4319,6 +4481,7 @@ setTimeout(()=>{
                               "title": "弹框标题",
                               "data": {
                                 "&": "$$",
+                                "targetObjectName": "${objectName}",
                                 "objectName": "${objectName}",
                                 "recordId": "${uiSchema.list_views[listName]._id}",
                                 "listName": "${listName}",
@@ -4344,7 +4507,7 @@ setTimeout(()=>{
                                       "actions": [
                                         {
                                           "args": {
-                                            "url": "${context.rootUrl}/app/${appId}/${objectName}/grid/${listName}",
+                                            "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/${listName}",
                                             "blank": false
                                           },
                                           "actionType": "url"
@@ -4892,13 +5055,16 @@ setTimeout(()=>{
         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]];
             }
         }
 
@@ -4952,6 +5118,9 @@ setTimeout(()=>{
         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;
     `;
@@ -5032,6 +5201,8 @@ setTimeout(()=>{
                 ...ctx
             });
 
+            pickerSchema.affixHeader = false;
+
             var headerToolbarItems = [];
             const isMobile = window.innerWidth < 768;
             if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
@@ -5049,14 +5220,11 @@ setTimeout(()=>{
                 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, {
                 "&": "$$",
@@ -5240,11 +5408,12 @@ setTimeout(()=>{
             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>
@@ -5302,8 +5471,10 @@ setTimeout(()=>{
 
         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);
         }
 
@@ -5404,6 +5575,9 @@ setTimeout(()=>{
                 top:  top,
                 ...ctx
             });
+
+            pickerSchema.affixHeader = false;
+
         }
 
         const data = {
@@ -5433,7 +5607,6 @@ setTimeout(()=>{
         if(readonly){
             data.tpl = await getLookupTpl(field, ctx);
         }
-
         return data;
     }
 
@@ -6012,7 +6185,7 @@ setTimeout(()=>{
                 convertData = {
                     type: "editor",
                     language: field.language,
-                    // value: field.defaultValue || ''
+                    editorDidMount: new Function('editor', 'monaco', field.editorDidMount)
                 };
                 break;
             case 'toggle':
@@ -6033,7 +6206,7 @@ setTimeout(()=>{
                         columnsTogglable: false,
                         strictMode:false,
                         affixHeader: false, // 是否固定表头, 不固定表头, 否则form有y轴滚动条时, 表头会跟随滚动条滚动.
-                        // needConfirm: true,  此属性设置为false后，导致table不能编辑。
+                        needConfirm: false,
                         editable: !readonly,
                         addable: !readonly,
                         removable: !readonly,
@@ -6263,6 +6436,12 @@ setTimeout(()=>{
         // })
 
         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)};
@@ -6387,12 +6566,12 @@ setTimeout(()=>{
                                 });
                             }
                         }else{
-                            data[item] = {
+                            data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,
                                 url: fileFieldDisplayValue.url + "?download=true",
                                 state: "uploaded"
-                            };
+                            }];
                         }
                     }
                 })
@@ -6410,7 +6589,7 @@ setTimeout(()=>{
 
         return {
             method: "post",
-            url: getApi$2(),
+            url: getApi$2() + '&objectName=${objectName}' ,
             // sendOn: "!!this.recordId",
             cache: API_CACHE,
             requestAdaptor: `
@@ -6716,7 +6895,7 @@ setTimeout(()=>{
           }), 
           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
           });
@@ -6930,7 +7109,8 @@ setTimeout(()=>{
                       "eventName": `@data.changed.${objectSchema.name}`
                     },
                     "data": {
-                      "objectName": `${objectSchema.name}`
+                      "objectName": `${objectSchema.name}`,
+                      "displayAs": "${displayAs}"
                     }
                   },
                   {
@@ -7030,7 +7210,8 @@ setTimeout(()=>{
                     data: {
                       objectName: "${event.data.__objectName}",
                       record: "${event.data.__record}"
-                    }
+                    },
+                    expression: "${event.data.__response.error != true}"
                   },
                   {
                     "actionType": "setValue",
@@ -7038,7 +7219,8 @@ setTimeout(()=>{
                        value: {
                         "recordLoaded": true,
                        }
-                    }
+                    },
+                    expression: "${event.data.__response.error != true}"
                 }
                 ]
               }
@@ -7046,6 +7228,21 @@ setTimeout(()=>{
         }
     }
 
+    /*
+     * @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$1(fields, options){
         const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
         for (const field of fields) {
@@ -7119,6 +7316,13 @@ setTimeout(()=>{
                 }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,
@@ -7129,7 +7333,7 @@ setTimeout(()=>{
                         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}));
@@ -7254,8 +7458,9 @@ setTimeout(()=>{
         const url = getNameTplUrl(nameField, options);
 
         const columnLines = getMobileLines(tpls);
-        
-        columns.push({
+
+
+        let column = {
             name: nameField.name,
             label: nameField.label,
             sortable: nameField.sortable,
@@ -7264,13 +7469,66 @@ setTimeout(()=>{
             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;
     }
@@ -7389,7 +7647,7 @@ setTimeout(()=>{
             options = {};
         }
         let columns = [];
-        if(options.formFactor === 'SMALL'){
+        if(options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1){
             columns = await getMobileTableColumns(fields, options);
         }
         else {
@@ -7592,7 +7850,11 @@ setTimeout(()=>{
             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){
@@ -7625,8 +7887,7 @@ setTimeout(()=>{
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push('and');
-                filters.push(userFilters)
+                filters = [filters, 'and', userFilters]
             }
         }
         api.data = {
@@ -8053,7 +8314,6 @@ setTimeout(()=>{
     // ObjectForm会认作用域下的变量值
     // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
     // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
-    event.data = doc;
     const title = "新建 ${objectSchema.label}";
     doAction(
       {
@@ -8066,6 +8326,7 @@ setTimeout(()=>{
               "type": "steedos-object-form",
               "objectApiName": "\${objectName}",
               "mode": "edit",
+              "defaultData": doc,
               "onEvent": {
                 "submitSucc": {
                   "weight": 0,
@@ -8358,7 +8619,7 @@ setTimeout(()=>{
      * @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:
      */
 
@@ -8612,7 +8873,7 @@ setTimeout(()=>{
     }  
     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(
@@ -8701,7 +8962,7 @@ setTimeout(()=>{
      * @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:
      */
 
@@ -8899,6 +9160,9 @@ setTimeout(()=>{
         ctx = {}
     ) {
         const uiSchema = await getUISchema(objectName);
+        if(!uiSchema){
+            return {}
+        }
         const listView =  ___default.find(
             uiSchema.list_views,
             (listView, name) => {
@@ -9452,7 +9716,10 @@ setTimeout(()=>{
             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;
@@ -12130,6 +12397,7 @@ setTimeout(()=>{
         getLookupSapceUserTreeSchema: getLookupSapceUserTreeSchema,
         getNotifications: getNotifications,
         getObjectDetailButtons: getObjectDetailButtons,
+        getObjectDetailButtonsSchemas: getObjectDetailButtonsSchemas,
         getObjectDetailMoreButtons: getObjectDetailMoreButtons,
         getObjectFieldsFilterBarSchema: getObjectFieldsFilterBarSchema,
         getObjectFieldsFilterButtonSchema: getObjectFieldsFilterButtonSchema,
@@ -12138,6 +12406,7 @@ setTimeout(()=>{
         getObjectListHeaderFieldsFilterBar: getObjectListHeaderFieldsFilterBar,
         getObjectListHeaderFirstLine: getObjectListHeaderFirstLine,
         getObjectListHeaderSecordLine: getObjectListHeaderSecordLine,
+        getObjectListViewButtonsSchemas: getObjectListViewButtonsSchemas,
         getObjectRecordDetailHeader: getObjectRecordDetailHeader,
         getObjectRecordDetailRelatedListHeader: getObjectRecordDetailRelatedListHeader,
         getObjectRelated: getObjectRelated,
@@ -12385,15 +12654,16 @@ setTimeout(()=>{
                 React__default["default"].createElement("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", "stroke-width": "1.5", stroke: "currentColor", className: "animate-spin w-4 h-4" },
                     React__default["default"].createElement("path", { "stroke-linecap": "round", "stroke-linejoin": "round", d: "M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" }))));
         }
+        // console.log('AmisObjectButton===>', button, className);
         if (button.type === "amis_button") {
             var amisSchema = button.amis_schema;
             var schema = ___default.isString(amisSchema) ? JSON.parse(amisSchema) : amisSchema;
             if (schema && schema.body.length > 0) {
                 delete schema.body[0]['visibleOn'];
             }
-            // if(className){
-            //     schema.className = schema.className + ' ' + className;
-            // }
+            if (schema && className) {
+                schema.className = schema.className + ' ' + className;
+            }
             var renderData = Object.assign(data, { objectName: objectName, app_id: appId, className: className });
             if (data._id) {
                 renderData.recordId = data._id;
@@ -12419,7 +12689,10 @@ setTimeout(()=>{
 
     var getMenu = function (render, buttons, btnClassName, props) {
         return ___default.map(buttons, function (button) {
-            button.className = "".concat(button.className, " ").concat(btnClassName);
+            if (btnClassName) {
+                button.className = "".concat(button.className, " ").concat(btnClassName);
+            }
+            delete button.className;
             return {
                 key: button.name,
                 label: (React__default["default"].createElement(React__default["default"].Fragment, null, render('body', button, props)))
@@ -12654,7 +12927,9 @@ setTimeout(()=>{
                     }
                     amisSchema.className = "steedos-object-form ".concat(className);
                     amisSchema.data = Object.assign(amisSchema.data, formData, { global: globalData, uiSchema: uiSchema });
-                    // console.log(`===AmisObjectForm=amisSchema==`, amisSchema)
+                    if (___default.has(props, 'objectApiName')) {
+                        amisSchema.data.objectName = objectApiName;
+                    }
                     return [2 /*return*/, amisSchema];
             }
         });
@@ -12662,8 +12937,9 @@ setTimeout(()=>{
 
     var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
         var $schema, top, perPage, _a, showHeader, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, _e, filterVisible, headerToolbarItems, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     // console.time('AmisObjectListView')
                     console.log("AmisObjectListView props", props);
@@ -12671,6 +12947,7 @@ setTimeout(()=>{
                     headerSchema = props.headerSchema;
                     ctx = props.ctx;
                     listName = (defaultData === null || defaultData === void 0 ? void 0 : defaultData.listName) || (data === null || data === void 0 ? void 0 : data.listName) || (props === null || props === void 0 ? void 0 : props.listName);
+                    console.log('AmisObjectListView ==listName=>', listName);
                     defaults = {};
                     objectApiName = props.objectApiName || "space_users";
                     if (!ctx) {
@@ -12687,15 +12964,16 @@ setTimeout(()=>{
                             formFactor = 'LARGE';
                         }
                     }
-                    if (["split"].indexOf(displayAs) > -1) {
-                        formFactor = 'SMALL';
-                    }
+                    // 分栏模式不应该改变尺寸变量值
+                    // if(["split"].indexOf(displayAs) > -1){
+                    //   formFactor = 'SMALL';
+                    // }
                     if (!ctx.formFactor) {
                         ctx.formFactor = formFactor;
                     }
                     return [4 /*yield*/, getUISchema(objectApiName, false)];
                 case 1:
-                    uiSchema = _f.sent();
+                    uiSchema = _g.sent();
                     listView = ___default.find(uiSchema.list_views, function (listView, name) {
                         // 传入listViewName空值则取第一个
                         if (!listName) {
@@ -12747,14 +13025,26 @@ setTimeout(()=>{
                     listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
                     listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems });
                     if (!headerSchema) {
-                        headerSchema = getObjectListHeader$1(uiSchema);
+                        headerSchema = getObjectListHeader$1(uiSchema, listName, ctx);
                     }
                     serviceData = Object.assign({}, { showDisplayAs: showDisplayAs, displayAs: displayAs, recordPermissions: uiSchema.permissions, _id: null, $listviewId: listName });
+                    if (___default.has(props, 'objectApiName')) {
+                        serviceData.objectName = objectApiName;
+                    }
+                    if (___default.has(props, 'listName') && ___default.has(props, '$$editor')) {
+                        serviceData.listName = listName;
+                    }
+                    if (!___default.has(data, 'uiSchema')) {
+                        serviceData.uiSchema = uiSchema;
+                    }
+                    serviceData.defaultListName = listName ? listName : (_f = ___default.first(___default.values(uiSchema.list_views))) === null || _f === void 0 ? void 0 : _f.name;
                     // console.timeEnd('AmisObjectListView')
+                    // console.log('serviceData===>', serviceData)
+                    // console.log('headerSchema===>', headerSchema)
                     return [2 /*return*/, {
                             type: "service",
                             data: serviceData,
-                            className: "".concat(className, " steedos-object-listview"),
+                            className: "".concat(className, " sm:bg-gray-100 h-full sm:shadow sm:rounded-tl sm:rounded-tr steedos-object-listview"),
                             body: [{
                                     "type": "wrapper",
                                     "size": "none",
@@ -12783,8 +13073,8 @@ setTimeout(()=>{
                                                             "headers": {
                                                                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                             },
-                                                            "requestAdaptor": "console.log('service listview schemaApi requestAdaptor======>');api.data={query: '{spaces__findOne(id: \"xxx\"){_id,name}}'};return api;",
-                                                            "adaptor": "\n                        console.log('service listview schemaApi adaptor....', api.body); \n                        const { appId, objectName, listName, display, formFactor: defaultFormFactor} = api.body;\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          // console.log(\"====listViewSchemaProps===>\", listViewSchemaProps)\n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            payload.data = schema.amisSchema;\n                            resolve(payload)\n                          });\n                        });\n                      ")
+                                                            "requestAdaptor": "console.log('service listview schemaApi requestAdaptor======>');api.data={query: '{spaces__findOne(id: \"none\"){_id,name}}'};return api;",
+                                                            "adaptor": "\n                        // console.log('service listview schemaApi adaptor....', api.body); \n                        let { appId, objectName, defaultListName: listName, display, formFactor: defaultFormFactor} = api.body;\n                        if(api.body.listName){\n                          listName = api.body.listName;\n                        }\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          // console.log(\"====listViewSchemaProps===>\", listName, listViewSchemaProps)\n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            payload.data = schema.amisSchema;\n                            // console.log(\"payload================>\", payload)\n                            resolve(payload)\n                          });\n                        });\n                      ")
                                                         },
                                                         // "body": body,
                                                         // "data": serviceData
@@ -12939,7 +13229,7 @@ setTimeout(()=>{
                     };
                     props.$schema, recordId = props.recordId, _b = props.onEvent, onEvent = _b === void 0 ? defaultOnEvent : _b, _c = props.showRecordTitle, showRecordTitle = _c === void 0 ? true : _c;
                     objectApiName = props.objectApiName || "space_users";
-                    return [4 /*yield*/, getRecordDetailHeaderSchema(objectApiName, recordId, { showRecordTitle: showRecordTitle })];
+                    return [4 /*yield*/, getRecordDetailHeaderSchema(objectApiName, recordId, { showRecordTitle: showRecordTitle, formFactor: props.data.formFactor })];
                 case 2:
                     schema = (_d.sent()).amisSchema;
                     schema.className = className;
@@ -12957,12 +13247,11 @@ setTimeout(()=>{
      * @Description:
      */
     var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var className, appId, _a, objectApiName, body, schema;
+        var className, $schema, appId, _a, objectApiName, body, schema;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    console.log("AmisRecordDetail======>", props);
-                    className = props.className, props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, props.recordId, props.onEvent, props.defaultData, body = props.body;
+                    className = props.className, $schema = props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, props.recordId, props.onEvent, props.defaultData, body = props.body;
                     return [4 /*yield*/, getRecordDetailSchema(objectApiName, appId)];
                 case 1:
                     schema = (_b.sent()).amisSchema;
@@ -12972,11 +13261,14 @@ setTimeout(()=>{
                     //   recordDetailData.recordId = recordId;
                     // }
                     // schema.data = Object.assign({}, schema.data, recordDetailData);
+                    if (___default.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                        schema.data.recordId = props.recordId;
+                    }
                     schema.className = className;
                     if (body) {
                         schema.body = body;
                     }
-                    console.log("AmisRecordDetail====schema==>", schema);
+                    // console.log(`AmisRecordDetail====schema==>`, schema)
                     return [2 /*return*/, schema];
             }
         });
@@ -13013,11 +13305,11 @@ setTimeout(()=>{
     }); };
 
     var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var objectApiName, recordId, relatedObjectApiName, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, formFactor, schema;
+        var $schema, objectApiName, recordId, relatedObjectApiName, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, formFactor, formData, schema;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
+                    $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
                     formFactor = props.formFactor;
                     if (!formFactor) {
                         formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
@@ -13032,20 +13324,25 @@ setTimeout(()=>{
                                 "className": "mb-3"
                             }];
                     }
+                    formData = {};
+                    if (___default.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                        formData.recordId = recordId;
+                    }
                     return [4 /*yield*/, getRecordDetailRelatedListSchema(objectApiName, recordId, relatedObjectApiName, relatedKey, { top: top, perPage: perPage, appId: appId, relatedLabel: relatedLabel, className: className, formFactor: formFactor, columns: columns, sort: sort, filters: filters, visible_on: visible_on, isRelated: true, hiddenEmptyTable: hiddenEmptyTable, requestAdaptor: requestAdaptor, adaptor: adaptor })];
                 case 1:
                     schema = (_b.sent()).amisSchema;
+                    schema.data = Object.assign(schema.data, formData);
                     return [2 /*return*/, schema];
             }
         });
     }); };
 
     var AmisRecordDetailRelatedLists = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var objectApiName, _a, perPage, relatedLists;
+        var $schema, objectApiName, recordId, _a, perPage, relatedLists, staticRecordId;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    objectApiName = props.objectApiName, props.recordId, props.data, _a = props.perPage, perPage = _a === void 0 ? 5 : _a;
+                    $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, props.data, _a = props.perPage, perPage = _a === void 0 ? 5 : _a;
                     if (!objectApiName) {
                         // if(!objectApiName || !recordId){
                         return [2 /*return*/, {
@@ -13069,11 +13366,15 @@ setTimeout(()=>{
                                 "className": "mb-3"
                             }];
                     }
+                    staticRecordId = '';
+                    if (___default.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                        staticRecordId = recordId;
+                    }
                     return [2 /*return*/, {
                             type: 'service',
                             className: "steedos-record-detail-related-lists",
                             body: ___default.map(relatedLists, function (item) {
-                                return {
+                                var relatedList = {
                                     type: 'steedos-object-related-listview',
                                     objectApiName: objectApiName,
                                     // recordId: recordId,
@@ -13088,6 +13389,10 @@ setTimeout(()=>{
                                     hiddenEmptyTable: true,
                                     relatedLabel: item.label
                                 };
+                                if (staticRecordId) {
+                                    relatedList.recordId = staticRecordId;
+                                }
+                                return relatedList;
                             })
                         }];
             }
@@ -13138,12 +13443,12 @@ setTimeout(()=>{
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-09-01 14:44:57
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-03-13 16:19:22
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2023-05-08 15:05:32
      * @Description:
      */
     var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var app, data, className, _a, showAppName, _b, appNameClassName, formFactor, isMobile, dialogSchema;
+        var app, data, className, _a, showAppName, _b, appNameClassName, formFactor, isMobile, on_click_script, mobile_blank_script, dialogSchema;
         return __generator(this, function (_c) {
             app = props.app, data = props.data, className = props.className, _a = props.showAppName, showAppName = _a === void 0 ? true : _a, _b = props.appNameClassName, appNameClassName = _b === void 0 ? '' : _b;
             if (!app) {
@@ -13151,6 +13456,8 @@ setTimeout(()=>{
             }
             formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
             isMobile = formFactor === "SMALL" ? true : false;
+            on_click_script = "\n    var evalFunString = \"(function(){\" + event.data.on_click + \"})()\";\n    try{\n      eval(evalFunString);\n    }\n    catch(e){\n      console.error(\"catch some error when eval the on_click script for app link:\");\n      console.error(e.message + \"\\r\\n\" + e.stack);\n    }\n  ";
+            mobile_blank_script = "\n    if(event.data.path[0] == \"/\"){\n      Steedos.openWindow(event.data.context.rootUrl + event.data.path)\n    }else{\n      Steedos.openWindow(event.data.path)\n    }\n  ";
             dialogSchema = {};
             if (isMobile) {
                 dialogSchema = {
@@ -13163,8 +13470,6 @@ setTimeout(()=>{
                             "items": {
                                 "type": "button",
                                 "level": "link",
-                                "actionType": "link",
-                                "link": "${path}",
                                 "body": [
                                     {
                                         "type": "tpl",
@@ -13190,6 +13495,23 @@ setTimeout(()=>{
                                         "actions": [
                                             {
                                                 "actionType": "closeDialog"
+                                            },
+                                            {
+                                                "actionType": "link",
+                                                "args": {
+                                                    "link": "${path}"
+                                                },
+                                                "expression": "${AND(!blank , !on_click)}"
+                                            },
+                                            {
+                                                "actionType": "custom",
+                                                "script": mobile_blank_script,
+                                                "expression": "${AND(blank , !on_click)}"
+                                            },
+                                            {
+                                                "actionType": "custom",
+                                                "script": on_click_script,
+                                                "expression": "${on_click}"
                                             }
                                         ]
                                     }
@@ -13213,18 +13535,26 @@ setTimeout(()=>{
                         "headers": {
                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                         },
-                        "adaptor": "\nlet app_items = payload;\npayload.data = {\n  app_items\n}\nreturn payload;",
+                        "adaptor": "\nlet app_items = payload;\npayload = {\n  app_items\n}\nreturn payload;",
                         "messages": {}
                     },
                     "onEvent": {
                         "@data.changed.steedos_keyvalues": {
                             "actions": [
                                 {
-                                    "actionType": "setValue",
+                                    "actionType": "reload"
+                                }
+                            ]
+                        },
+                        "fetchInited": {
+                            "actions": [
+                                {
+                                    "actionType": "broadcast",
                                     "args": {
-                                        "value": {
-                                            "keyvalue": "${event.data.keyvalue.value}"
-                                        }
+                                        "eventName": "@appsLoaded"
+                                    },
+                                    "data": {
+                                        "apps": "${event.data.app_items}"
                                     }
                                 }
                             ]
@@ -13289,7 +13619,7 @@ setTimeout(()=>{
                                                                 "args": {
                                                                     "link": "${path}"
                                                                 },
-                                                                "expression": "${!blank}"
+                                                                "expression": "${AND(!blank , !on_click)}"
                                                             },
                                                             {
                                                                 "actionType": "url",
@@ -13297,7 +13627,12 @@ setTimeout(()=>{
                                                                     "url": "${path}",
                                                                     "blank": true
                                                                 },
-                                                                "expression": "${blank}"
+                                                                "expression": "${AND(blank , !on_click)}"
+                                                            },
+                                                            {
+                                                                "actionType": "custom",
+                                                                "script": on_click_script,
+                                                                "expression": "${!!on_click}"
                                                             }
                                                         ]
                                                     }
@@ -13359,11 +13694,19 @@ setTimeout(()=>{
                         "@data.changed.steedos_keyvalues": {
                             "actions": [
                                 {
-                                    "actionType": "setValue",
+                                    "actionType": "reload"
+                                }
+                            ]
+                        },
+                        "fetchInited": {
+                            "actions": [
+                                {
+                                    "actionType": "broadcast",
                                     "args": {
-                                        "value": {
-                                            "keyvalue": "${event.data.keyvalue.value}"
-                                        }
+                                        "eventName": "@appsLoaded"
+                                    },
+                                    "data": {
+                                        "apps": "${event.data.app_items}"
                                     }
                                 }
                             ]
@@ -13376,7 +13719,7 @@ setTimeout(()=>{
                         "headers": {
                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                         },
-                        "adaptor": "\nlet app_items = payload;\nlet object_items = [];\nlet objects = [];\napp_items.forEach((item) => {\n  item.children.forEach((i) => {\n    if (objects.indexOf(i.id) < 0) {\n      objects.push(i.id);\n      object_items.push(i)\n    }\n  })\n})\npayload.data = {\n  app_items,\n  object_items\n}\nreturn payload;"
+                        "adaptor": "\nlet app_items = payload;\nlet object_items = [];\nlet objects = [];\napp_items.forEach((item) => {\n  item.children.forEach((i) => {\n    if (objects.indexOf(i.id) < 0) {\n      objects.push(i.id);\n      object_items.push(i)\n    }\n  })\n})\npayload = {\n  app_items,\n  object_items\n}\nreturn payload;"
                     }
                 };
             }
@@ -13430,12 +13773,7 @@ setTimeout(()=>{
                         "@data.changed.steedos_keyvalues": {
                             "actions": [
                                 {
-                                    "actionType": "setValue",
-                                    "args": {
-                                        "value": {
-                                            "keyvalue": "${event.data.keyvalue.value}"
-                                        }
-                                    }
+                                    "actionType": "reload"
                                 }
                             ]
                         }
@@ -13480,7 +13818,7 @@ setTimeout(()=>{
                 type: 'service',
                 schemaApi: {
                     "method": "get",
-                    "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus?try=1111111"),
+                    "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus"),
                     "adaptor": "\n                  try {\n                      console.log('payload====>', payload)\n                      if(payload.nav_schema){\n                        payload.data = payload.nav_schema;\n                        return payload\n                      }\n\n                      const data = { nav: [] };\n                      const stacked = ".concat(stacked, ";\n                      const showIcon = ").concat(showIcon, ";\n                      const selectedId = '").concat(selectedId, "';\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                          type: 'tpl',\n                                          tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          } : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": true,\n                                      \"children\": _.map(tabs, (tab) => {\n                                          return {\n                                          \"label\": showIcon ? {\n                                              type: 'tpl',\n                                              tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          }  : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                          }\n                                      })\n                                  })   \n                              }\n                              });\n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                              } : tab.name,\n                              \"to\": tab.path,\n                              \"target\":tab.target\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n                      payload.data = {\n                        \"type\": \"nav\",\n                        className: \"").concat(className, "\",\n                        \"stacked\": ").concat(stacked, ",\n                        \"overflow\": ").concat(JSON.stringify(overflow), ",\n                        \"indentSize\": ").concat(indentSize, ",\n                        \"links\": data.nav,\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                  console.log('payload===2==>', payload)\n                  return payload;\n            "),
                     "headers": {
                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -13496,7 +13834,7 @@ setTimeout(()=>{
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-09-01 14:44:57
      * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-04-11 13:51:50
+     * @LastEditTime: 2023-04-27 13:26:12
      * @Description:
      */
     var AmisGlobalFooter = function (props) { return __awaiter(void 0, void 0, void 0, function () {
@@ -13507,8 +13845,8 @@ setTimeout(()=>{
                 appId = data.context.appId || 'admin';
             }
             isMobile = window.innerWidth <= 768;
-            className = 'fixed bottom-0 z-20 flex justify-evenly w-full h-16 bg-gray-100 AmisGlobalFooter';
-            className1 = 'fixed bottom-0 z-20 flex justify-center w-full h-16 bg-gray-100 AmisGlobalFooter';
+            className = 'fixed bottom-0 z-20 flex justify-evenly w-full h-16 bg-gray-100 steedos-global-footer';
+            className1 = 'fixed bottom-0 z-20 flex justify-center w-full h-16 bg-gray-100 steedos-global-footer';
             schema = {};
             if (links) {
                 schema = {
@@ -13532,8 +13870,8 @@ setTimeout(()=>{
                     type: 'service',
                     schemaApi: {
                         "method": "get",
-                        "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus?try=1111111"),
-                        "adaptor": "\n              try {\n                  if(payload.nav_schema){\n                    payload.data = payload.nav_schema;\n                    return payload\n                  }\n\n                  const data = { nav: [] };\n                  const stacked = ".concat(stacked, ";\n                  const showIcon = ").concat(showIcon, ";\n                  const selectedId = '").concat(selectedId, "';\n                  _.each(payload.children, (tab)=>{\n                    data.nav.push({\n                    \"label\": {\n                        type: 'tpl',\n                        tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[13px] font-medium rounded-md flex-col leading-3 nav-label'><svg class=\" flex-shrink-0 h-10 w-10\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`,\n                        className:'h-full flex items-center'\n                    },\n                    \"to\": tab.path,\n                    \"target\":tab.target\n                    // active: selectedId === tab.id,\n                    });\n                })\n\n                  payload.data = {\n                    \"type\": \"nav\",\n                    className: payload.children.length ==1 ? '").concat(className1, "' : '").concat(className, "',\n                    \"stacked\": ").concat(stacked, ",\n                    \"overflow\": ").concat(JSON.stringify(overflow), ",\n                    \"indentSize\": ").concat(indentSize, ",\n                    \"links\": data.nav,\n                  };\n              } catch (error) {\n                  console.log(`error`, error)\n              }\n              return payload;\n        "),
+                        "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus?mobile=true"),
+                        "adaptor": "\n                        try {\n\n                            if(payload.children.length == 0){\n                                payload.data = {};\n                                return payload\n                            }\n                            const data = { nav: [] };\n                            const stacked = ".concat(stacked, ";\n                            const showIcon = ").concat(showIcon, ";\n                            const selectedId = '").concat(selectedId, "';\n                            let sum = 0;\n                            _.each(payload.children, (tab)=>{\n                                sum++;\n                                const classIcon = tab.icon.replace(/_/g,\"-\");\n                                if(sum >= 5){\n                                    data.nav.push({\n                                        \"label\": {\n                                            type: 'tpl',\n                                            tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[12px] font-medium rounded-md flex-col leading-3 nav-label'><svg class=\"slds-icon slds-icon_container slds-icon-standard-`+classIcon+` flex-shrink-0 h-10 w-10\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg><span>${tab.name}</span><i class=\"fa fa-angle-right\" aria-hidden=\"true\" style=\"position: absolute;right: 20px;color: #bababa;\"></i></span>`,\n                                            className:'h-full flex items-center'\n                                        },\n                                        \"to\": tab.path,\n                                        \"target\":tab.target\n                                    });\n                                }else{\n                                    data.nav.push({\n                                        \"label\": {\n                                            type: 'tpl',\n                                            tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[12px] font-medium rounded-md flex-col leading-3 nav-label'><svg class=\"slds-icon slds-icon_container slds-icon-standard-`+classIcon+` flex-shrink-0 h-10 w-10\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`,\n                                            className:'h-full flex items-center'\n                                        },\n                                        \"to\": tab.path,\n                                        \"target\":tab.target\n                                    });\n                                }\n                                \n                            })\n\n                            payload.data = {\n                                \"type\": \"nav\",\n                                className: payload.children.length ==1 ? '").concat(className1, "' : '").concat(className, "',\n                                \"stacked\": ").concat(stacked, ",\n                                \"overflow\": {\n                                    \"enable\": true,\n                                    \"maxVisibleCount\": 4,\n                                    \"overflowPopoverClassName\": \"steedos-global-footer-popup\",\n                                    \"overflowLabel\":{\n                                        \"type\": 'tpl',\n                                        \"tpl\": `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[12px] font-medium rounded-md flex-col leading-3 nav-label'><svg class=\" flex-shrink-0 h-10 w-10\" style=\"padding:7px\"><use xlink:href=\"/assets/icons/utility-sprite/svg/symbols.svg#rows\"></use></svg>\u83DC\u5355</span>`,\n                                        \"className\":'h-full flex items-center'\n                                    },\n                                    \"overflowIndicator\":\"\"\n                                },\n                                \"indentSize\": ").concat(indentSize, ",\n                                \"links\": data.nav,\n                            };\n                        } catch (error) {\n                            console.log(`error`, error)\n                        }\n                        return payload;\n        "),
                         "headers": {
                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                         }
@@ -14054,7 +14392,7 @@ setTimeout(()=>{
                     {
                         "type": "button",
                         "className": 'p-0 absolute inset-0 mt-[50px] sm:mt-[90px]',
-                        hiddenOn: "${app.showSidebar != true}",
+                        hiddenOn: "${OR(app.showSidebar != true,isMobile)}",
                         body: [
                             {
                                 type: "wrapper",
@@ -14150,7 +14488,7 @@ setTimeout(()=>{
     var getSelectFlowSchema = function (id, props) {
         var label = props.label, data = props.data, name = props.name, required = props.required, _a = props.action, action = _a === void 0 ? 'query' : _a, _b = props.distributeInstanceId, distributeInstanceId = _b === void 0 ? "" : _b, _c = props.distributeStepId, distributeStepId = _c === void 0 ? "" : _c, _d = props.mode, mode = _d === void 0 ? 'input-tree' : _d, className = props.className, onEvent = props.onEvent, _e = props.multiple, multiple = _e === void 0 ? false : _e, delimiter = props.delimiter, joinValues = props.joinValues, extractValue = props.extractValue, searchable = props.searchable, _f = props.showIcon, showIcon = _f === void 0 ? true : _f, _g = props.showRadio, showRadio = _g === void 0 ? false : _g, showOutline = props.showOutline, initiallyOpen = props.initiallyOpen, unfoldedLevel = props.unfoldedLevel, treeContainerClassName = props.treeContainerClassName, _h = props.amis, amis = _h === void 0 ? {} : _h;
         console.log("=====onEvent", onEvent);
-        return __assign$2({ "type": mode, "id": id, "label": label, "name": name, "options": [], "multiple": multiple, "delimiter": delimiter, "joinValues": joinValues, "extractValue": extractValue, "searchable": searchable, "showOutline": showOutline, "initiallyOpen": initiallyOpen, "unfoldedLevel": unfoldedLevel, "className": className, "required": required, "treeContainerClassName": treeContainerClassName, 
+        return __assign$2({ "type": mode, "id": id, "label": label, "name": name, "options": [], "multiple": multiple, "delimiter": delimiter, "joinValues": joinValues, "extractValue": extractValue, "searchable": searchable, "showOutline": showOutline, "initiallyOpen": initiallyOpen, "unfoldedLevel": unfoldedLevel, "className": className, "required": required, "treeContainerClassName": treeContainerClassName, "heightAuto": true, 
             // "menuTpl": {
             //     // type: "button",
             //     type: "tpl",
@@ -14207,6 +14545,7 @@ setTimeout(()=>{
         return {
             "type": "service",
             "id": "selectFlowService",
+            "className": "steedos-select-flow-service",
             "body": [
                 {
                     "type": "search-box",
@@ -14305,7 +14644,10 @@ setTimeout(()=>{
                     // const pageSplitClassName = listSchema.pageSplitClassName || 'p-0 flex flex-1 overflow-hidden h-full'
                     return [2 /*return*/, {
                             type: 'service',
-                            className: "h-full",
+                            className: {
+                                "h-full": "true",
+                                "sm:px-3 sm:pt-3": "${display != 'split'}"
+                            },
                             body: listSchema
                         }];
             }