@steedos-widgets/amis-object 1.2.38 → 1.2.39

package/dist/amis-object.umd.js

@@ -4217,6 +4217,7 @@
     var frontend_objects_related_alert_start$1 = "No related table fields associated with the related list object";
     var frontend_objects_related_alert_end$1 = "were found.";
     var frontend_no_records_found$1 = "No records found.";
+    var frontend_records_no_allowedit$1 = "You do not have edit permission for this record";
     var en_us = {
     	frontend_field_group_generalization: frontend_field_group_generalization$1,
     	frontend_download: frontend_download$1,
@@ -4299,7 +4300,8 @@
     	frontend_message_modification_failed: frontend_message_modification_failed$1,
     	frontend_objects_related_alert_start: frontend_objects_related_alert_start$1,
     	frontend_objects_related_alert_end: frontend_objects_related_alert_end$1,
-    	frontend_no_records_found: frontend_no_records_found$1
+    	frontend_no_records_found: frontend_no_records_found$1,
+    	frontend_records_no_allowedit: frontend_records_no_allowedit$1
     };
 
     var frontend_field_group_generalization = "通用";
@@ -4323,7 +4325,7 @@
     var frontend_display_as = "显示为";
     var frontend_record_sum = "个项目";
     var frontend_button_reload_tooltip = "刷新";
-    var frontend_button_search_tooltip = "搜索";
+    var frontend_button_search_tooltip = "查询";
     var frontend_fields_filter_button_search = "搜索";
     var frontend_fields_filter_button_settings = "设置搜索项";
     var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -4385,6 +4387,7 @@
     var frontend_objects_related_alert_start = "未找到与相关列表对象";
     var frontend_objects_related_alert_end = "关联的相关表字段";
     var frontend_no_records_found = "无法找到记录";
+    var frontend_records_no_allowedit = "您对这条记录没有编辑权限";
     var zh_cn = {
     	frontend_field_group_generalization: frontend_field_group_generalization,
     	frontend_download: frontend_download,
@@ -4468,7 +4471,8 @@
     	frontend_message_modification_failed: frontend_message_modification_failed,
     	frontend_objects_related_alert_start: frontend_objects_related_alert_start,
     	frontend_objects_related_alert_end: frontend_objects_related_alert_end,
-    	frontend_no_records_found: frontend_no_records_found
+    	frontend_no_records_found: frontend_no_records_found,
+    	frontend_records_no_allowedit: frontend_records_no_allowedit
     };
 
     const resources = {
@@ -6522,12 +6526,14 @@
     if(!event.data.isLookup){
       // 刷新浏览器后，filterFormValues值是空的，只能从本地存储中取出并重置为空值
       const listName = event.data.listName;
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = null;
+          if(k !== "__keywords"){
+            removedValues[k] = null;
+          }
         }
       }
     }
@@ -6549,12 +6555,9 @@
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listName = data.listName;
-    let searchableFieldsStoreKey = location.pathname + "/searchable_fields/";
+    let searchableFieldsStoreKey = location.pathname + "/searchable_fields";
     if(isLookup){
-      searchableFieldsStoreKey += "lookup/" + objectName;
-    }
-    else{
-      searchableFieldsStoreKey += (listName || "");
+      searchableFieldsStoreKey += "/lookup/" + objectName;
     }
     let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
@@ -6581,7 +6584,7 @@
       setData({ showFieldsFilter: false });
     }
     else{
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -6621,12 +6624,9 @@
       return n.props.type === "service";
     });
     filterService.setData({ filterFormSearchableFields: value });
-    let searchableFieldsStoreKey = location.pathname + "/searchable_fields/";
+    let searchableFieldsStoreKey = location.pathname + "/searchable_fields";
     if(isLookup){
-      searchableFieldsStoreKey += "lookup/" + objectName;
-    }
-    else{
-      searchableFieldsStoreKey += (listName || "");
+      searchableFieldsStoreKey += "/lookup/" + objectName;
     }
     sessionStorage.setItem(searchableFieldsStoreKey, value);
 
@@ -6684,7 +6684,7 @@
     }
     
     // 列表视图crud支持本地缓存，所以需要进一步清除浏览器本地缓存里面用户在可搜索项中移除的字段值
-    const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+    const listViewPropsStoreKey = location.pathname + "/crud";
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
@@ -8405,9 +8405,23 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 `;
 
 
-    function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
+    function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true, isLookup = false } = {}){
       // console.log(`getObjectHeaderToolbar====>`, filterVisible)
-      console.log(`getObjectHeaderToolbar`, mainObject);
+      // console.log(`getObjectHeaderToolbar`, mainObject)
+      const searchableFieldsLabel = [];
+      _.each(fields, function (field) {
+        if (field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1) {
+          searchableFieldsLabel.push(field.label);
+        }
+      });
+      const listViewPropsStoreKey = location.pathname + "/crud";
+      let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+      let crudKeywords = "";
+      if(localListViewProps && !isLookup){
+        localListViewProps = JSON.parse(localListViewProps);
+        crudKeywords = (localListViewProps && localListViewProps.__keywords) || "";
+      }
+
       const isMobile = window.innerWidth < 768;
       if(isMobile){
         showDisplayAs = false;
@@ -8463,7 +8477,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               ],
               "size":8,
               "animation": true,
-              "visibleOn": "${isFieldsFilterEmpty == false}"
+              "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
             },
             "align": "right",
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
@@ -8478,7 +8492,27 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               }
             }
           } : {},
-          getDisplayAsButton(mainObject?.name)
+          getDisplayAsButton(mainObject?.name),
+          {
+            "type": "tooltip-wrapper",
+            "align": "right",
+            "title": "",
+            "content": "可搜索字段：" + searchableFieldsLabel.join(","),
+            "placement": "bottom",
+            "tooltipTheme": "dark",
+            "trigger": "click",
+            // "className": "mr-1",
+            "body": [
+              {
+                "type": "search-box",
+                "name": "__keywords",
+                "placeholder": "请输入关键字",
+                "value": crudKeywords,
+                "clearable": true,
+                "clearAndSubmit": true
+              }
+            ]
+          },
       ]
       }else {
         return [
@@ -8497,21 +8531,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "type": "tpl",
             "tpl":  "${count} " + instance.t('frontend_record_sum')
           },
-          {
-            "type": "reload",
-            "align": "right",
-            //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-            // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-            "tooltip":"",
-            "tooltipPlacement": "top",
-            "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
-          },
-          // getExportExcelToolbarButtonSchema(),
-          mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
-          getDisplayAsButton(mainObject?.name),
           filterVisible ? {
             "label": instance.t('frontend_button_search_tooltip'),
-            "icon": "fa fa-search",
+            "icon": "fa fa-filter",
             //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
             // "tooltip": i18next.t('frontend_button_search_tooltip'),
             // "tooltipPlacement": "top",
@@ -8523,7 +8545,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               ],
               "size":8,
               "animation": true,
-              "visibleOn": "${isFieldsFilterEmpty == false}"
+              "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
             },
             "align": "right",
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
@@ -8537,14 +8559,39 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 ]
               }
             }
-          } : {}
-          // {
-          //   "type": "search-box",
-          //   "align": "right",
-          //   "name": "__keywords",
-          //   "placeholder": "请输入关键字",
-          //   "mini": true
-          // },
+          } : {},
+          {
+            "type": "reload",
+            "align": "right",
+            //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+            // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+            "tooltip":"",
+            "tooltipPlacement": "top",
+            "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+          },
+          // getExportExcelToolbarButtonSchema(),
+          mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
+          getDisplayAsButton(mainObject?.name),
+          {
+            "type": "tooltip-wrapper",
+            "align": "right",
+            "title": "",
+            "content": "可搜索字段：" + searchableFieldsLabel.join(","),
+            "placement": "bottom",
+            "tooltipTheme": "dark",
+            "trigger": "click",
+            "className": "mr-1",
+            "body": [
+              {
+                "type": "search-box",
+                "name": "__keywords",
+                "placeholder": "请输入关键字",
+                "value": crudKeywords,
+                "clearable": true,
+                "clearAndSubmit": true
+              }
+            ]
+          },
           // {
           //     "type": "drag-toggler",
           //     "align": "right"
@@ -8888,16 +8935,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "autoCheckChildren": false,
             "searchable": true,
             "searchConfig": {
-              "sticky": true
+              "sticky": true,
+              "placeholder": "查找部门"
             },
             "unfoldedLevel": 2,
             "style": {
               "max-height": "100%",
               "position": "absolute",
-              "left": "-200px",
-              "width": "190px",
+              "left": "-330px",
+              "width": "320px",
               "bottom": 0,
-              "top": "2px",
+              "top": "0",
               "overflow": "auto",
               "min-height":"300px"
             },
@@ -8916,7 +8964,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         ctx.idFieldName = refObjectConfig.idFieldName;
         ctx.objectName = refObjectConfig.name;
 
-        const tableFields = [];
+        let tableFields = [];
         let i = 0;
         const searchableFields = [];
 
@@ -8961,7 +9009,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 })){
                     i++;
                     tableFields.push(field);
-                    if(field.searchable){
+                    if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
                         searchableFields.push(field.name);
                     }
                 }
@@ -9045,16 +9093,31 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         }
 
-
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
-                if(keyValue){
+                if(_.isString(keyValue)){
                     filters.push([key, "contains", keyValue]);
+                }else if(_.isArray(keyValue) || _.isBoolean(keyValue) || keyValue){
+                    filters.push([key, "=", keyValue]);
                 }
             })
         }
 
+        if(selfData.__keywords && allowSearchFields){
+            const keywordsFilters = [];
+            allowSearchFields.forEach(function(key, index){
+                const keyValue = selfData.__keywords;
+                if(keyValue){
+                    keywordsFilters.push([key, "contains", keyValue]);
+                    if(index < allowSearchFields.length - 1){
+                        keywordsFilters.push('or');
+                    }
+                }
+            })
+            filters.push(keywordsFilters);
+        };
+
         var fieldFilters = ${JSON.stringify(field.filters)};
         if(fieldFilters && fieldFilters.length){
             filters.push(fieldFilters);
@@ -9143,6 +9206,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
             top = 1000;
         }
+
         let pickerSchema = null;
         if(ctx.formFactor === 'SMALL'){
             pickerSchema = await getListSchema$1(tableFields, {
@@ -9164,18 +9228,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
                  headerToolbarItems = getLookupSapceUserTreeSchema();
                  pickerSchema["style"] = {
-                    "margin-left":"200px",
+                    "margin-left":"330px",
                     "min-height": "300px"
                  };
                  pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
             }
 
-            pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor, { headerToolbarItems });
+            pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true });
             const isAllowCreate = refObjectConfig.permissions.allowCreate;
             if (isAllowCreate) {
                 const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
                 new_button.align = "right";
-                pickerSchema.headerToolbar.push(new_button);
+                // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
+                pickerSchema.headerToolbar.splice(pickerSchema.headerToolbar.length - 1, 0, new_button);
             }
             pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
             if (ctx.filterVisible !== false) {
@@ -9892,6 +9957,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
     };
 
+    const SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
     const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
     // const Lookup = require('./lookup');
 
@@ -10666,6 +10732,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     var index = /*#__PURE__*/Object.freeze({
       __proto__: null,
+      SEARCHABLE_FIELD_TYPES: SEARCHABLE_FIELD_TYPES,
       OMIT_FIELDS: OMIT_FIELDS,
       getBaseFields: getBaseFields,
       getAmisFieldType: getAmisFieldType,
@@ -10865,7 +10932,71 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 `;
                     break;
                 }
-
+                quickEditSchema.body[0].visibleOn = "${quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}";
+                quickEditSchema.body.push({
+                    "type":"service",
+                    "body":[
+                        {
+                            "type": "tpl",
+                            "tpl": instance.t('frontend_records_no_allowedit'),
+                            "visibleOn": "${!quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}"
+                        },
+                        {
+                            "type": "spinner",
+                            "showOn": "${quickedit_record_permissions_loading}"
+                        }
+                    ],
+                    "onEvent":{
+                        "init":{
+                            "actions":[
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": `service_listview_${options.objectName}`,
+                                    "args": {
+                                        "value":{
+                                            "quickedit_record_permissions_loading": true
+                                        }
+                                    }
+                                },
+                                {
+                                    "actionType": "ajax",
+                                    "args": {
+                                        "api": {
+                                          "url": "${context.rootUrl}/service/api/@\${objectName}/recordPermissions/${_id}",
+                                          "method": "get",
+                                          "headers": {
+                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                          },
+                                          "cache": 30000,
+                                          "messages": {
+                                            "failed": "失败了呢。。"
+                                          }
+                                        }
+                                    }
+                                },
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": `service_listview_${options.objectName}`,
+                                    "args": {
+                                        "value":{
+                                            "quickedit_record_permissions_loading": false
+                                        }
+                                    }
+                                },
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": `service_listview_${options.objectName}`,
+                                    "args": {
+                                        "value":{
+                                            "quickedit_record_permissions": "${event.data}"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                    
+                });
             } else {
                 quickEditSchema = false;
             }
@@ -10898,7 +11029,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     async function getTableColumns$1(fields, options){
         const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
-        const allowEdit = options.permissions?.allowEdit && options.permissions?.modifyAllRecords && !options.isLookup && options.enable_inline_edit != false;
+        const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
         
         for (const field of fields) {
             //增加quickEdit属性，实现快速编辑
@@ -11389,7 +11520,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             baseFilters = filter;
         }
         ___default__namespace.each(fields,function(field){
-            if(field.searchable){
+            if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
                 searchableFields.push(field.name);
             }
         });
@@ -11436,7 +11567,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
             const listName = api.data.listName;
-            const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+            const listViewPropsStoreKey = location.pathname + "/crud";
             let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
             if(localListViewProps){
                 localListViewProps = JSON.parse(localListViewProps);
@@ -11637,7 +11768,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     try{
         // TODO: 不应该直接在这里取localStorage，应该从外面传入
         const listName = api.body.listName;
-        const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+        const listViewPropsStoreKey = location.pathname + "/crud";
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
          * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
@@ -12827,7 +12958,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           }
         }
         // console.log(`getObjectHeaderToolbar====2===>`, options.filterVisible)
-        bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {
+        bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, fields, options.formFactor, {
           showDisplayAs, 
           hiddenCount: options.queryCount === false, 
           headerToolbarItems: options.headerToolbarItems,
@@ -12952,6 +13083,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return {
           type: 'service',
           className: '',
+          //目前crud的service层id不认用户自定义id，只支持默认规则id
           id: `service_${id}`,
           name: `page`,
           data: {
@@ -18540,7 +18672,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if (links) {
                 return [2 /*return*/, {
                         "type": "nav",
-                        className: "".concat(className),
+                        className: "".concat(className, " text-black"),
                         "stacked": stacked,
                         "overflow": overflow,
                         "indentSize": indentSize,
@@ -18552,7 +18684,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 schemaApi: {
                     "method": "get",
                     "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                      const tab_groups = payload.tab_groups;\n                      const locationPathname = window.location.pathname;\n                      var customTabId = \"\";\n                      var objectTabId = \"\";\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      if(locationPathname == tab.path){\n                                        customTabId = tab.id;\n                                      }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                        objectTabId = tab.id;\n                                      }\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                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": _.find(tab_groups, {\"group_name\": groupName})?.default_open != false,\n                                      \"children\": _.map(tabs, (tab) => {\n                                          if(locationPathname == tab.path){\n                                            customTabId = tab.id;\n                                          }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                            objectTabId = tab.id;\n                                          }\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                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                                          // active: selectedId === tab.id,\n                                          }\n                                      })\n                                  })   \n                              }\n                              });\n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              if(locationPathname == tab.path){\n                                customTabId = tab.id;\n                              }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                objectTabId = tab.id;\n                              }\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                              \"id\": tab.id,\n                              \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n\n                      payload.data = {\n                        \"type\":\"service\",\n                        \"data\":{\n                            \"tabId\": customTabId || objectTabId,\n                            \"items\": data.nav\n                        },\n                        \"id\": \"appMenuService\",\n                        \"body\":{\n                            \"type\": \"nav\",\n                            className: \"").concat(className, "\",\n                            \"stacked\": ").concat(stacked, ",\n                            \"overflow\": ").concat(JSON.stringify(overflow), ",\n                            \"indentSize\": ").concat(indentSize, ",\n                            \"source\": \"${items}\",\n                            \"onEvent\": {\n                                \"click\": {\n                                    \"actions\": [\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.item.id}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.item.id}\"\n                                        }\n                                    ]\n                                },\n                                \"@tabId.changed\":{\n                                    \"actions\":[\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.tabId}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.tabId}\"\n                                        }\n                                    ]\n                                }\n                            }\n                        }\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                  console.log('payload===2==>', payload)\n                  return payload;\n            "),
+                    "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                      const tab_groups = payload.tab_groups;\n                      const locationPathname = window.location.pathname;\n                      var customTabId = \"\";\n                      var objectTabId = \"\";\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      if(locationPathname == tab.path){\n                                        customTabId = tab.id;\n                                      }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                        objectTabId = tab.id;\n                                      }\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                          type: 'tpl',\n                                          tpl: `<span class='fill-slate-500 word-break leading-6 block -ml-px no-underline group flex items-center text-[15px] 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                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": _.find(tab_groups, {\"group_name\": groupName})?.default_open != false,\n                                      \"children\": _.map(tabs, (tab) => {\n                                          if(locationPathname == tab.path){\n                                            customTabId = tab.id;\n                                          }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                            objectTabId = tab.id;\n                                          }\n                                          return {\n                                          \"label\": showIcon ? {\n                                              type: 'tpl',\n                                              tpl: `<span class='fill-slate-500 word-break leading-6 block -ml-px no-underline group flex items-center text-[15px] 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                                          \"id\": tab.id,\n                                          \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                                          // active: selectedId === tab.id,\n                                          }\n                                      })\n                                  })   \n                              }\n                              });\n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              if(locationPathname == tab.path){\n                                customTabId = tab.id;\n                              }else if(locationPathname.startsWith(tab.path + \"/\")){\n                                objectTabId = tab.id;\n                              }\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500 word-break leading-6 block -ml-px no-underline group flex items-center text-[15px] 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                              \"id\": tab.id,\n                              \"activeOn\": \"\\\\${tabId == '\"+ tab.id +\"'}\"\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n\n                      payload.data = {\n                        \"type\":\"service\",\n                        \"data\":{\n                            \"tabId\": customTabId || objectTabId,\n                            \"items\": data.nav\n                        },\n                        \"id\": \"appMenuService\",\n                        \"body\":{\n                            \"type\": \"nav\",\n                            className: \"").concat(className, " text-black\",\n                            \"stacked\": ").concat(stacked, ",\n                            \"overflow\": ").concat(JSON.stringify(overflow), ",\n                            \"indentSize\": ").concat(indentSize, ",\n                            \"source\": \"${items}\",\n                            \"onEvent\": {\n                                \"click\": {\n                                    \"actions\": [\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.item.id}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.item.id}\"\n                                        }\n                                    ]\n                                },\n                                \"@tabId.changed\":{\n                                    \"actions\":[\n                                        {\n                                            \"actionType\": \"setValue\",\n                                            \"componentId\": \"appMenuService\",\n                                            \"args\": {\n                                                \"value\": {\n                                                    \"tabId\": \"${event.data.tabId}\",\n                                                    \"items\": data.nav\n                                                }\n                                            },\n                                            \"expression\":\"${event.data.tabId}\"\n                                        }\n                                    ]\n                                }\n                            }\n                        }\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}"
                     }
@@ -19588,7 +19720,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                             type: 'service',
                             className: {
                                 "h-full": "true",
-                                "sm:px-3 sm:pt-3": "${display != 'split'}"
+                                "sm:px-3 sm:pt-3 page-list-grid": "${display != 'split'}",
+                                "page-list-split": "${display == 'split'}"
                             },
                             body: listSchema
                         }];