@steedos-widgets/amis-object 1.2.2 → 1.2.3

package/dist/amis-object.cjs.js

@@ -721,14 +721,19 @@ const getSteedosAuth = () => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-16 17:02:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-11 09:57:37
+ * @LastEditTime: 2023-04-17 15:24:21
  * @Description:
  */
 
 
 const Router$1 = {
     getTabDisplayAs(tab_id){
-        const key = `tab.${tab_id}.display`;
+        var urlSearch = new URLSearchParams(document.location.search); 
+        if(urlSearch.has('display')){
+            return urlSearch.get('display')
+        }
+        // const key = `tab.${tab_id}.display`;
+        const key = `page.display`;
         const value = localStorage.getItem(key);
         return value ? value : 'grid'
     },
@@ -3215,7 +3220,6 @@ async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
 function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   const { icon, label } = objectSchema;
   const listViewButtonOptions = [];
-  // let currentListView;
   ___default.each(
     objectSchema.list_views,
     (listView, name) => {
@@ -3223,19 +3227,11 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
         type: "button",
         label: listView.label,
         actionType: "link",
-        // icon: "fa fa-plus",
         link: `/app/\${appId}/${objectSchema.name}/grid/${name}`
       });
-      // if(name === listViewName){
-      //   currentListView = listView;
-      // }
     }
   );
 
-  // if(!currentListView){
-  //   return {};
-  // }
-
   const buttons = getListViewButtons(objectSchema, {});
   let amisButtonsSchema = ___default.map(buttons, (button) => {
     return {
@@ -3246,34 +3242,7 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
       className: `button_${button.name}`
     }
   });
-  // if(objectSchema.permissions?.allowDelete){
-  //   const bulkDeleteScript = `
-  //     const data = event.data;
-  //     const listViewId = data.listViewId;
-  //     const uiSchema = data.uiSchema;
-  //     const scopeId = data.scopeId;
-  //     BuilderAmisObject.AmisLib.standardButtonsTodo.standard_delete_many.call({
-  //       listViewId, 
-  //       uiSchema, 
-  //       scopeId
-  //     })
-  //   `;
-  //   amisButtonsSchema.push({
-  //     type: 'button',
-  //     label: "删除",
-  //     className: `antd-Button antd-Button--default antd-Button--size-default`,
-  //     "onEvent": {
-  //       "click": {
-  //         "actions": [
-  //           {
-  //             "actionType": "custom",
-  //             "script": bulkDeleteScript
-  //           }
-  //         ]
-  //       }
-  //     }
-  //   });
-  // }
+  
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
   return {
@@ -3463,27 +3432,14 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @param {*} objectSchema 对象UISchema
  * @returns amisSchema
  */
-async function getObjectListHeader$1(objectSchema, listViewName, ctx) {
+function getObjectListHeader$1(objectSchema, listViewName, ctx) {
   let firstLineSchema = getObjectListHeaderFirstLine(objectSchema);
-  // let secordLineSchema = await getObjectListHeaderSecordLine(objectSchema, listViewName, ctx);
-  // let body = [firstLineSchema, secordLineSchema];
   let body = [firstLineSchema];
-  // let roundedCss = "";
-  // if (ctx.onlyFirstLine) {
-  //   body = [firstLineSchema];
-  // }
-  // else if (ctx.onlySecordLine) {
-  //   // 列表视图自定义amisSchema时不能加圆角
-  //   roundedCss = "";
-  //   // body = [secordLineSchema];
-  // }
   let headerSchema = [{
     "type": "wrapper",
     "body": body,
     "className": `bg-gray-100 sm:rounded-tl sm:rounded-tr p-4 -mb-4`
   }];
-  // const fieldsFilterBarSchema = await getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ctx);
-  // headerSchema.push(fieldsFilterBarSchema);
   return headerSchema;
 }
 
@@ -3737,6 +3693,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "icon": "fa fa-table-columns",
     "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
     "align": "right",
+    "visibleOn": "${formFactor !== 'SMALL'}",
     "buttons": [
       {
         "label": "显示为",
@@ -3873,7 +3830,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       } : {},
-      showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
+      getDisplayAsButton(mainObject?.name)
   ]
   }else {
     return [
@@ -4466,7 +4423,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         ]
       },
-      showDisplayAs ? getDisplayAsButton(showDisplayAs) : {}
+      getDisplayAsButton(showDisplayAs)
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -8731,8 +8688,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-04-14 11:10:07
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-17 15:26:17
  * @Description:
  */
 
@@ -8945,6 +8902,7 @@ async function getListSchema(
         return { uiSchema };
     }
 
+    // 直接返回自定义的列表视图schema
     if(listView.enable_amis_schema && listView.amis_schema){
         const amisSchema = ___default.isString(listView.amis_schema) ? JSON.parse(listView.amis_schema) : listView.amis_schema;
         return {
@@ -8958,6 +8916,7 @@ async function getListSchema(
     let sort = getListViewSort(listView);
     let listviewFilter = getListViewFilter(listView);
     let listview_filters = listView && listView._filters;
+    // 返回 calendar 组件
     if(listView.type === "calendar"){
         const amisSchema = {
             "type": "steedos-object-calendar",
@@ -8976,14 +8935,21 @@ async function getListSchema(
 
     const defaults = ctx.defaults || {};
 
-    if(!defaults.headerSchema && ctx.showHeader){
-        defaults.headerSchema = await getObjectListHeader$1(uiSchema);
-    }
+    // // 未自定义header 且显示header的时候, 使用系统header
+    // if(!defaults.headerSchema && ctx.showHeader){
+    //     defaults.headerSchema = getObjectListHeader(uiSchema, listViewName);
+    // }
+    
+    // // 如果不显示header,则清理掉
+    // if(!ctx.showHeader){
+    //     defaults.headerSchema = null;
+    // }
 
-    if(!ctx.showHeader){
-        defaults.headerSchema = null;
-    }
+    defaults.headerSchema = null;
 
+    /**
+     * 本次存储代码段
+     */
     try {
       const listViewPropsStoreKey = location.pathname + "/crud/" + ctx.listViewId;
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
@@ -9098,7 +9064,7 @@ async function getTableSchema(
         headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     });
-    // console.log('getTableSchema====>amisSchema', amisSchema)
+    console.log('getTableSchema====>amisSchema', amisSchema);
     // console.timeEnd('getTableSchema');
     return {
         uiSchema,
@@ -9296,6 +9262,7 @@ async function getObjectRelated(
 if(typeof window != 'undefined'){
     window.getUISchema = getUISchema;
     window.getUISchemaSync = getUISchemaSync;
+    window.getListSchema = getListSchema;
 }
 
 // import { getListSchema } from './objects';
@@ -12682,11 +12649,14 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
 }); };
 
 var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, top, perPage, _a, showHeader, headerSchema, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, _e, filterVisible, headerToolbarItems, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, objectUiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, schema, amisSchema, uiSchema, body, firstLineSchema, serviceData;
+    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) {
             case 0:
-                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, headerSchema = props.headerSchema, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable, _e = props.filterVisible, filterVisible = _e === void 0 ? true : _e, headerToolbarItems = props.headerToolbarItems;
+                // console.time('AmisObjectListView')
+                console.log("AmisObjectListView props", props);
+                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable, _e = props.filterVisible, filterVisible = _e === void 0 ? true : _e, headerToolbarItems = props.headerToolbarItems;
+                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);
                 defaults = {};
@@ -12713,8 +12683,8 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 }
                 return [4 /*yield*/, getUISchema(objectApiName, false)];
             case 1:
-                objectUiSchema = _f.sent();
-                listView = ___default.find(objectUiSchema.list_views, function (listView, name) {
+                uiSchema = _f.sent();
+                listView = ___default.find(uiSchema.list_views, function (listView, name) {
                     // 传入listViewName空值则取第一个
                     if (!listName) {
                         listName = name;
@@ -12741,7 +12711,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                         "actions": [
                             {
                                 "args": {
-                                    "url": "/app/${appId}/${objectName}/view/${event.data.result.data.recordId}?display=${ls:tab.project.display || 'grid'}&side_object=${objectName}&side_listview_id=${listName}",
+                                    "url": "/app/${appId}/${objectName}/view/${event.data.result.data.recordId}?display=${ls:page.display || 'grid'}&side_object=${objectName}&side_listview_id=${listName}",
                                     "blank": false
                                 },
                                 "actionType": "link",
@@ -12757,58 +12727,62 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                         listSchema: listSchema
                     };
                 }
-                // 支持通过直接定义headerSchema属性来定制表头，而不一定要通过ctx.defaults.headerSchema传入
-                if (headerSchema) {
-                    defaults.headerSchema = headerSchema;
-                }
                 setDataToComponentId = ctx && ctx.setDataToComponentId;
                 if (!setDataToComponentId) {
                     setDataToComponentId = "service_listview_".concat(objectApiName);
                 }
                 amisSchemaData = Object.assign({}, data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
-                return [4 /*yield*/, getListSchema(amisSchemaData.appId, objectApiName, listName, __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 }))];
-            case 2:
-                schema = (_f.sent());
-                amisSchema = schema.amisSchema;
-                uiSchema = schema.uiSchema;
-                body = [amisSchema];
-                if (schema.isCustomAmisSchema || schema.isCalendar) {
-                    firstLineSchema = getObjectListHeaderFirstLine(uiSchema);
-                    body.unshift({
-                        "type": "wrapper",
-                        "body": [firstLineSchema],
-                        "className": "bg-gray-100 pb-0 sm:rounded-tl sm:rounded-tr",
-                    });
-                }
-                if (sideSchema) {
-                    body = [{
-                            "type": "wrapper",
-                            "size": "none",
-                            "className": "flex flex-1 overflow-hidden h-full",
-                            "body": [
-                                {
-                                    "type": "wrapper",
-                                    "size": "none",
-                                    "className": "flex-shrink-0 min-w-[200px] h-full border-r border-gray-200 lg:order-first lg:flex lg:flex-col",
-                                    "body": sideSchema
-                                },
-                                {
-                                    "type": "wrapper",
-                                    "size": "none",
-                                    "className": "flex-1 focus:outline-none lg:order-last w-96 h-full",
-                                    "body": body
-                                },
-                            ]
-                        }];
+                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);
                 }
-                serviceData = Object.assign({}, { listName: listName, uiSchema: uiSchema, showDisplayAs: showDisplayAs, displayAs: displayAs, recordPermissions: uiSchema.permissions, _id: null, $listviewId: listName });
+                serviceData = Object.assign({}, { showDisplayAs: showDisplayAs, displayAs: displayAs, recordPermissions: uiSchema.permissions, _id: null, $listviewId: listName });
                 // console.timeEnd('AmisObjectListView')
                 return [2 /*return*/, {
-                        "type": "service",
-                        "body": body,
-                        "className": "".concat(className, " steedos-object-listview"),
-                        "data": serviceData
+                        type: "service",
+                        data: serviceData,
+                        className: "".concat(className, " steedos-object-listview"),
+                        body: [{
+                                "type": "wrapper",
+                                "size": "none",
+                                "className": "flex flex-1 overflow-hidden h-full",
+                                body: [
+                                    sideSchema ? {
+                                        "type": "wrapper",
+                                        "size": "none",
+                                        "className": "flex-shrink-0 min-w-[200px] h-full border-r border-gray-200 lg:order-first lg:flex lg:flex-col",
+                                        "body": sideSchema
+                                    } : null,
+                                    {
+                                        "type": "wrapper",
+                                        "size": "none",
+                                        "className": sideSchema ? "flex-1 focus:outline-none lg:order-last w-96 h-full" : 'w-full h-full',
+                                        "body": {
+                                            type: "wrapper",
+                                            className: "p-0 m-0 steedos-object-table h-full flex flex-col",
+                                            body: __spreadArray(__spreadArray([], __read(headerSchema), false), [
+                                                {
+                                                    "type": "service",
+                                                    "schemaApi": {
+                                                        "url": "${context.rootUrl}/graphql?listName=${listName}&display=${display}",
+                                                        "method": "post",
+                                                        "messages": {},
+                                                        "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                      ")
+                                                    },
+                                                    // "body": body,
+                                                    // "data": serviceData
+                                                }
+                                            ], false)
+                                        }
+                                    }
+                                ]
+                            }
+                        ]
                     }];
         }
     });
@@ -12845,6 +12819,8 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
+                // console.time('AmisObjectTable')
+                console.log("AmisObjectTable props", props);
                 $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, _c = props.filterVisible, filterVisible = _c === void 0 ? true : _c, headerToolbarItems = props.headerToolbarItems;
                 ctx = props.ctx;
                 if (!ctx) {
@@ -12964,28 +12940,31 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-08 10:32:17
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-04-11 11:28:41
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-13 18:40:42
  * @Description:
  */
 var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var className, appId, _a, objectApiName, recordId, body, schema, recordDetailData;
+    var className, appId, _a, objectApiName, body, schema;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                className = props.className, props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, recordId = props.recordId, props.onEvent, props.defaultData, body = props.body;
+                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;
                 return [4 /*yield*/, getRecordDetailSchema(objectApiName, appId)];
             case 1:
                 schema = (_b.sent()).amisSchema;
-                recordDetailData = {};
-                if (recordId) {
-                    recordDetailData.recordId = recordId;
-                }
-                schema.data = Object.assign({}, schema.data, recordDetailData);
+                // 在非记录页组件下全局作用域下无recordId，会导致表单接口sendOn始终为false，无法发起请求。
+                // let recordDetailData: any = {};
+                // if(recordId){
+                //   recordDetailData.recordId = recordId;
+                // }
+                // schema.data = Object.assign({}, schema.data, recordDetailData);
                 schema.className = className;
                 if (body) {
                     schema.body = body;
                 }
+                console.log("AmisRecordDetail====schema==>", schema);
                 return [2 /*return*/, schema];
         }
     });
@@ -14015,15 +13994,16 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
 }); };
 
 var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var defaultFormFactor, appId, objectApiName, listviewId, display, _a, $schema, listName, displayAs, formFactor, page, listViewId, listSchema, defData, pageGridClassName, pageSplitClassName;
+    var formFactor, appId, objectApiName, display, page, listSchema;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, listviewId = props.listviewId, display = props.display, _a = props.$schema, $schema = _a === void 0 ? {} : _a, listName = props.listName;
+                // console.time('PageListView')
+                console.log("PageListView====>", props);
+                formFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.listviewId, display = props.display, props.$schema, props.listName;
+                //TODO  此代码应该在object page template中处理
                 if (display)
                     Router$1.setTabDisplayAs(objectApiName, display);
-                displayAs = (defaultFormFactor === 'SMALL') ? 'grid' : display ? display : Router$1.getTabDisplayAs(objectApiName);
-                formFactor = (["split"].indexOf(displayAs) > -1) ? 'SMALL' : defaultFormFactor;
                 return [4 /*yield*/, getPage({ type: 'list', appId: appId, objectName: objectApiName, formFactor: formFactor })];
             case 1:
                 page = _b.sent();
@@ -14033,65 +14013,51 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                             "show": true
                         }];
                 }
-                listViewId = SteedosUI.getRefId({
-                    type: "listview",
-                    appId: appId,
-                    name: objectApiName,
-                });
                 listSchema = page ? page.schema : {
                     "type": "steedos-object-listview",
                     "objectApiName": objectApiName,
                     "columnsTogglable": false,
                     "showHeader": true,
-                    "showDisplayAs": (defaultFormFactor !== 'SMALL'),
-                    "formFactor": formFactor,
-                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 m-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
+                    // "showDisplayAs": (formFactor !== 'SMALL'),
+                    // "formFactor": formFactor,
+                    // "className": (displayAs === 'split')? 'w-full': 'p-0 flex-1 m-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
                 };
-                defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, 
-                    // listName: listName || listviewId,
-                    appId: appId, formFactor: formFactor, displayAs: displayAs });
-                if (listName) {
-                    defData.listName = listName || listviewId;
-                }
-                pageGridClassName = listSchema.pageGridClassName || 'h-full sm:p-3';
-                pageSplitClassName = listSchema.pageSplitClassName || 'p-0 flex flex-1 overflow-hidden h-full';
+                // const defData = {
+                //   ...$schema.data,
+                //   objectName: objectApiName,
+                //   listViewId: listViewId,
+                //   // listName: listName || listviewId,
+                //   appId: appId,
+                //   // formFactor: formFactor,
+                //   // displayAs: displayAs
+                // };
+                // if(listName){
+                //   defData.listName = listName || listviewId
+                // }
+                // console.log("defData====>", defData)
+                // console.timeEnd('PageListView')
+                // const pageGridClassName = listSchema.pageGridClassName || 'h-full sm:p-3'
+                // const pageSplitClassName = listSchema.pageSplitClassName || 'p-0 flex flex-1 overflow-hidden h-full'
                 return [2 /*return*/, {
                         type: 'service',
-                        data: defData,
-                        "className": (displayAs === 'grid') ? pageGridClassName : pageSplitClassName,
-                        body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, listSchema) : [
-                            {
-                                "type": "wrapper",
-                                "className": "p-0 flex-shrink-0 min-w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
-                                "body": ___default.defaultsDeep({ data: defData }, listSchema)
-                            },
-                            {
-                                "type": "wrapper",
-                                "className": 'p-0 flex-1 focus:outline-none xl:order-last',
-                                "body": []
-                            }
-                        ]
+                        className: "h-full",
+                        body: listSchema
                     }];
         }
     });
 }); };
 
 var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var defaultFormFactor, appId, objectApiName, display, sideObject, sideListviewId, $schema, displayAs, formFactor, listPage, recordSchema, recordPage, listSchema, defData;
+    var defaultFormFactor, appId, objectApiName, display, recordSchema, recordPage;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.recordId, display = props.display, sideObject = props.sideObject, sideListviewId = props.sideListviewId, $schema = props.$schema, props.data;
-                if (display)
-                    Router$1.setTabDisplayAs(objectApiName, display);
-                displayAs = (defaultFormFactor === 'SMALL') ? 'grid' : display ? display : sideObject ? 'split' : Router$1.getTabDisplayAs(objectApiName);
-                formFactor = (["split"].indexOf(displayAs) > -1) ? 'SMALL' : defaultFormFactor;
-                return [4 /*yield*/, getPage({ type: 'list', appId: appId, objectName: objectApiName, formFactor: formFactor })];
-            case 1:
-                listPage = _a.sent();
+                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.recordId, display = props.display;
+                //TODO  此代码应该在object page template中处理
+                Router$1.setTabDisplayAs(objectApiName, display);
                 recordSchema = {};
                 return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor })];
-            case 2:
+            case 1:
                 recordPage = _a.sent();
                 recordSchema = recordPage ? recordPage.schema : {
                     "type": "wrapper",
@@ -14107,37 +14073,85 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                         }
                     ],
                 };
-                _a.label = 3;
-            case 3:
-                listSchema = listPage ? listPage.schema : {
-                    "type": "steedos-object-listview",
-                    "objectApiName": sideObject,
-                    "columnsTogglable": false,
-                    "showHeader": true,
-                    "showDisplayAs": true,
-                    "formFactor": 'SMALL',
-                };
-                defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: sideListviewId, listName: sideListviewId, 
-                    // recordId: "${recordId}",
-                    // appId: appId,
-                    formFactor: formFactor, displayAs: displayAs });
-                // console.log('defData====>', defData)
+                _a.label = 2;
+            case 2: return [2 /*return*/, {
+                    type: 'service',
+                    "className": 'h-full',
+                    body: recordSchema
+                }];
+        }
+    });
+}); };
+
+var PageObject = function (props) { return __awaiter(void 0, void 0, void 0, function () {
+    var data, _a, $schema, uiSchema;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                data = props.data, _a = props.$schema, $schema = _a === void 0 ? {} : _a;
+                return [4 /*yield*/, getUISchema($schema.data.objectName, false)];
+            case 1:
+                uiSchema = _b.sent();
+                delete $schema.data.recordId;
+                // 最外层的data是render data, 会被updateProps data覆盖, 所以组件data需要单开一个数据域. 所以此处有2层service
                 return [2 /*return*/, {
-                        type: 'service',
-                        data: defData,
-                        "className": (displayAs === 'grid') ? 'h-full' : 'p-0 flex flex-1 overflow-hidden h-full',
-                        body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, recordSchema) : [
-                            {
-                                "type": "wrapper",
-                                "className": "p-0 flex-shrink-0 min-w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
-                                "body": ___default.defaultsDeep({ data: defData }, listSchema)
+                        type: "service",
+                        data: $schema.data,
+                        className: "h-full",
+                        body: {
+                            type: 'service',
+                            className: {
+                                'h-full': "${display != 'split'}",
+                                'flex flex-1 overflow-hidden h-full': "${display == 'split'}"
                             },
-                            {
-                                "type": "wrapper",
-                                "className": 'overflow-y-auto p-0 flex-1 focus:outline-none lg:order-last h-full',
-                                "body": ___default.defaultsDeep({ data: defData }, recordSchema)
-                            }
-                        ]
+                            data: {
+                                uiSchema: uiSchema
+                            },
+                            body: [
+                                {
+                                    "type": "wrapper",
+                                    "size": "none",
+                                    "className": {
+                                        "p-0 flex-shrink-0 min-w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col": "${display == 'split'}",
+                                        'h-full': "${display != 'split'}",
+                                    },
+                                    "body": {
+                                        "name": "".concat(data.objectName, "-listview-").concat(data.listViewId),
+                                        "type": "steedos-page-listview",
+                                        "showHeader": true,
+                                        "objectApiName": data.objectName,
+                                        "appId": data.appId,
+                                        "display": data.display,
+                                        "columnsTogglable": false
+                                    },
+                                    "visibleOn": "${pageType === 'list' || (pageType === 'record' && display == 'split')}"
+                                },
+                                {
+                                    "type": "wrapper",
+                                    "size": "none",
+                                    "className": {
+                                        "overflow-y-auto p-0 flex-1 focus:outline-none lg:order-last h-full": "${display == 'split'}",
+                                        'h-full': "${display != 'split'}",
+                                    },
+                                    "body": {
+                                        "name": "".concat(data.objectName, "-recordDetail-").concat(data.recordId),
+                                        "type": "steedos-page-record-detail",
+                                        "objectApiName": data.objectName,
+                                        "sideObject": data.sideObject,
+                                        "sideListviewId": data.sideListviewId,
+                                        // "recordId": recordId,
+                                        "display": data.display,
+                                        "appId": data.appId
+                                    },
+                                    "visibleOn": "${pageType === 'record'}"
+                                },
+                                {
+                                    "type": "tpl",
+                                    "tpl": "无效的页面类型: ${pageType}",
+                                    "visibleOn": "${pageType !== 'record' && pageType !== 'list'}"
+                                }
+                            ]
+                        }
                     }];
         }
     });
@@ -14174,6 +14188,7 @@ exports.AmisSelectUser = AmisSelectUser;
 exports.AmisSteedosField = AmisSteedosField;
 exports.FromNow = FromNow;
 exports.PageListView = PageListView;
+exports.PageObject = PageObject;
 exports.PageRecordDetail = PageRecordDetail;
 exports.SteedosBadge = SteedosBadge;
 exports.SteedosBadgeRibbon = SteedosBadgeRibbon;