@steedos-widgets/amis-object 1.2.25 → 1.2.27

package/dist/amis-object.cjs.css

@@ -637,6 +637,9 @@ body {
 .overflow-y-auto {
     overflow-y: auto
 }
+.overflow-x-hidden {
+    overflow-x: hidden
+}
 .truncate {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -1210,6 +1213,13 @@ body {
   height: 50px;
 }
 
+.lookup-left {
+  max-width: 50% !important;
+}
+.lookup-left .antd-Select-popover {
+  width: auto !important;
+}
+
 @media (min-width: 767px) {
   .steedos-amis-form .antd-Collapse .antd-Form--normal,
   .steedos-amis-form .antd-Form--normal .antd-Tabs .antd-Tabs-content .antd-Tabs-pane .form-content {
@@ -1342,13 +1352,25 @@ body {
 .h-fill {
   height: -webkit-fill-available !important;
 }
+.steedos-global-header-root .sidebar-wrapper .antd-Nav .antd-Nav-Menu-item-label {
+  white-space: normal;
+  line-height: 1.5;
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+.steedos-global-header-root .sidebar-wrapper .antd-Nav .antd-Nav-Menu-item-link {
+  min-height: var(--Nav-Item-height);
+  height: unset;
+}
 
 .steedos-global-footer {
   border-top: 1px solid rgb(203 213 225);
 }
-.steedos-global-footer .antd-Nav-Menu-item,
-.steedos-global-footer .antd-Nav-Menu-submenu-title {
-  padding-bottom: 5px !important;
+.steedos-global-footer.antd-Nav-Menu-horizontal > .antd-Nav-Menu-item-tooltip-wrap > .antd-Nav-Menu-item,
+.steedos-global-footer.antd-Nav-Menu-horizontal > .antd-Nav-Menu-overflow-item > .antd-Nav-Menu-submenu-title {
+  padding-bottom: 5px;
+  padding-left: 0;
+  padding-right: 0;
 }
 .steedos-global-footer .antd-Nav-Menu-item,
 .steedos-global-footer .antd-Nav-Menu-submenu-title,

package/dist/amis-object.cjs.js

@@ -108,18 +108,6 @@ function __generator(thisArg, body) {
     }
 }
 
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
 function __read(o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -3517,7 +3505,7 @@ const getSteedosAuth = () => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-16 17:02:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-19 15:25:50
+ * @LastEditTime: 2023-06-20 13:50:15
  * @Description:
  */
 
@@ -3528,14 +3516,14 @@ const Router$1 = {
         if(urlSearch.has('display')){
             return urlSearch.get('display')
         }
-        // const key = `tab.${tab_id}.display`;
-        const key = `page_display`;
+        const key = `tab_${tab_id}_display`;
+        // const key = `page_display`;
         const value = localStorage.getItem(key);
         return value ? value : 'grid'
     },
   
     setTabDisplayAs(tab_id, displayAs){
-        const key = `tab.${tab_id}.display`;
+        const key = `tab_${tab_id}_display`;
         localStorage.setItem(key, displayAs);
     },
     getAppPath({formFactor, appId}){
@@ -3549,15 +3537,10 @@ const Router$1 = {
     },
     getObjectDetailPath(props){
         const {formFactor, appId, objectName, recordId, listViewName, _templateType} = props;
-        // var urlParams = new URLSearchParams(window.location.search);
-        // if(objectName === 'instances'){
-        //     return `/workflow/space/\${context.tenantId}/\${listName}/${recordId}`;
-        // }
-        const displayAs =  Router$1.getTabDisplayAs(objectName); //urlParams.get("display") ||
         if(_templateType === 'JavaScript'){
-            return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
+            return `/app/${appId}/${objectName}/view/${recordId}?side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
         }
-        return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=\${objectName}&side_listview_id=\${listName}`;
+        return `/app/${appId}/${objectName}/view/${recordId}?side_object=\${objectName}&side_listview_id=\${listName}`;
     },
     getObjectRelatedViewPath({formFactor, appId, masterObjectName, masterRecordId, objectName, foreignKey}){
         return `/app/${appId}/${masterObjectName}/${masterRecordId}/${objectName}/grid?related_field_name=${foreignKey}`;
@@ -3833,6 +3816,10 @@ async function getFieldsTemplate(fields, expand){
             if(___default.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                 displayFields.push(`${field.name}`);
             }
+        }else {
+            objectFieldName = field.name.split('.')[0];
+            fieldsName.push(objectFieldName);
+            displayFields.push(objectFieldName);
         }
     }
 
@@ -6307,7 +6294,10 @@ async function getObjectFieldsFilterFormSchema(ctx) {
   const formSchema = {
     "type": "service",
     "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+    "style":{
+      "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
+    },
     "schemaApi": {
       method: 'post',
       url: `\${context.rootUrl}/graphql?reload=\${filterFormSearchableFields|join}`,
@@ -8240,14 +8230,14 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     {
       "type": "button",
       "label": instance.t('frontend_display_type_is_table'),
-      "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
       "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
       "rightIconClassName": "m-l-sm"
     },
     {
       "type": "button",
       "label": instance.t('frontend_display_type_is_split'),
-      "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
       "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
       "rightIconClassName": "m-l-sm"
     }
@@ -8409,7 +8399,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
       },
       // getExportExcelToolbarButtonSchema(),
       getSettingListviewToolbarButtonSchema(),
-      getDisplayAsButton(showDisplayAs),
+      getDisplayAsButton(mainObject?.name),
       filterVisible ? {
         "label": instance.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
@@ -11105,6 +11095,7 @@ async function getTableApi(mainObject, fields, options){
     let valueField = mainObject.key_field || '_id';
     const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
+    api.url += "&objectName=${objectName}";//设计器上对象表格组件需要切换对象重新请求列表数据
     if(options.isRelated){
         api.url += "&recordId=${_master.recordId}";
     }
@@ -11240,13 +11231,13 @@ async function getTableApi(mainObject, fields, options){
             const masterRecord = self._master.record;
             const masterObjectName = self._master.objectName;
             let relatedValue = self._master.recordId;
-            if(refField.reference_to_field && refField.reference_to_field != '_id'){
+            if(refField && refField.reference_to_field && refField.reference_to_field != '_id'){
                 relatedValue = masterRecord[refField.reference_to_field]
             }
             let relatedFilters;
             if (
-                refField._reference_to ||
-                (refField.reference_to && !_.isString(refField.reference_to))
+                refField && (refField._reference_to ||
+                (refField.reference_to && !_.isString(refField.reference_to)))
             ) {
                 relatedFilters = [
                     [relatedKey + "/o", "=", masterObjectName],
@@ -11396,7 +11387,7 @@ function getRecordPermissionsApi(object, recordId, options){
 
 const API_CACHE = 100;
 
-function getReadonlyFormAdaptor(object, fields){
+function getReadonlyFormAdaptor(object, fields, options){
     let scriptStr = '';
     const selectFields = ___default__namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && ((field.type == 'select' && field.options) || ((field.type == 'lookup' || field.type == 'master_detail') && !field.reference_to))});
     const gridAndObjectFieldsName = ___default__namespace.map(___default__namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && (field.type === 'object' || field.type === 'grid')}), 'name');
@@ -11434,11 +11425,24 @@ function getReadonlyFormAdaptor(object, fields){
     //     }
     // })
 
+    var fieldNames = ___default__namespace.map(fields, function(n){return n.name});
     return  `
     if(payload.data.data.length === 0){
-        return {
-            status: 2,
-            msg: "无法找到记录"
+        var isEditor = !!${options && options.isEditor};
+        if(isEditor){
+            var fieldNames = ${JSON.stringify(fieldNames)};
+            var emptyDoc = {};//这里如果不把每个字段值设置为空的话，表单上会显示上一次表单上的字段值
+            fieldNames.forEach(function(n){
+                emptyDoc[n] = null;
+            });
+            // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
+            payload.data.data = [emptyDoc];
+        }
+        else{
+            return {
+                status: 2,
+                msg: "无法找到记录"
+            }
         }
     }
     if(payload.data.data){
@@ -11455,7 +11459,7 @@ function getReadonlyFormAdaptor(object, fields){
         var record = _.cloneDeep(data);
         try{
             _.each(gridAndObjectFieldsName, function(name){
-                data[name] = data._display[name];
+                data[name] = data._display && data._display[name];
             })
         }catch(e){
             console.error(e)
@@ -11476,10 +11480,10 @@ function getReadonlyFormAdaptor(object, fields){
 async function getReadonlyFormInitApi(object, recordId, fields, options){
     return {
         method: "post",
-        url: getApi$2()+"&recordId=${recordId}",
+        url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
         cache: API_CACHE,
         // requestAdaptor: "console.log('getReadonlyFormInitApi requestAdaptor', api);return api;",
-        adaptor: getReadonlyFormAdaptor(object, fields),
+        adaptor: getReadonlyFormAdaptor(object, fields, options),
         data: await getFindOneQuery$1(object, recordId, fields, options),
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -12911,8 +12915,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-17 09:09:33
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-06-20 14:05:50
  * @Description:
  */
 
@@ -12955,10 +12959,11 @@ async function getObjectRelatedList(
     if(!___default.isEmpty(relatedLists)){
         for (const relatedList of relatedLists) {
             const arr = relatedList.related_field_fullname.split(".");
+            const foreign_key = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
             related.push({
                 masterObjectName: objectName,
                 object_name: arr[0],
-                foreign_key: arr[1],
+                foreign_key,
                 label: relatedList.label,
                 columns: relatedList.field_names,
                 sort: relatedList.sort,
@@ -12971,10 +12976,11 @@ async function getObjectRelatedList(
         const details = [].concat(uiSchema.details || []);
         for (const detail of details) {
             const arr = detail.split(".");
+            const foreign_key = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
             related.push({
                 masterObjectName: objectName,
                 object_name: arr[0],
-                foreign_key: arr[1]
+                foreign_key
             });
         }
     }
@@ -13006,14 +13012,16 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
             if(!___default.isEmpty(mainRelatedLists)){
                 for (const relatedList of mainRelatedLists) {
                     const arr = relatedList.related_field_fullname.split(".");
-                    mainRelated[arr[0]] = arr[1];
+                    const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
+                    mainRelated[arr[0]] = foreign_key_value;
                 }
             }else {
                 const details = ___default.union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                 for (const detail of details) {
                     const arr = detail.split(".");
+                    const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
                     if(!___default.has(mainRelated,arr[0])){
-                        mainRelated[arr[0]] = arr[1];
+                        mainRelated[arr[0]] = foreign_key_value;
                     }
                 }
             }
@@ -16770,84 +16778,71 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
 });
 
 var getSchema = function (field, value, ctx) { return __awaiter(void 0, void 0, void 0, function () {
-    var refTo, leftName, options, refTo_1, refTo_1_1, item, refObject_1, e_1_1, refObject, rightSchema;
-    var e_1, _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var refTo, leftName, refObject, rightSchema;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 refTo = field.reference_to;
                 if (refTo && ___default.isFunction(refTo)) {
                     refTo = refTo();
                 }
                 leftName = "".concat(field.name, "__left");
-                options = [];
-                _b.label = 1;
-            case 1:
-                _b.trys.push([1, 6, 7, 8]);
-                refTo_1 = __values(refTo), refTo_1_1 = refTo_1.next();
-                _b.label = 2;
-            case 2:
-                if (!!refTo_1_1.done) return [3 /*break*/, 5];
-                item = refTo_1_1.value;
-                return [4 /*yield*/, getUISchema(item, false)];
-            case 3:
-                refObject_1 = _b.sent();
-                options.push({
-                    label: refObject_1.label,
-                    value: item,
-                    icon: refObject_1.icon
-                });
-                _b.label = 4;
-            case 4:
-                refTo_1_1 = refTo_1.next();
-                return [3 /*break*/, 2];
-            case 5: return [3 /*break*/, 8];
-            case 6:
-                e_1_1 = _b.sent();
-                e_1 = { error: e_1_1 };
-                return [3 /*break*/, 8];
-            case 7:
-                try {
-                    if (refTo_1_1 && !refTo_1_1.done && (_a = refTo_1.return)) _a.call(refTo_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-                return [7 /*endfinally*/];
-            case 8:
+                // const options = [];
+                // for (const item of refTo) {
+                //   const refObject = await getUISchema(item, false);
+                //   options.push({
+                //       label: refObject.label,
+                //       value: item,
+                //       icon: refObject.icon
+                //   });
+                // }
                 // console.log(`getSchema refTo`, refTo);
                 // console.log(`getSchema options`, options);
                 // console.log(`getSchema value=========>`, value);
                 if (!value || !value.o) {
                     value = {
-                        o: options[0].value,
+                        o: refTo[0],
                         ids: []
                     };
                 }
                 return [4 /*yield*/, getUISchema(value.o, false)];
-            case 9:
-                refObject = _b.sent();
+            case 1:
+                refObject = _a.sent();
                 rightSchema = null;
-                if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 11];
+                if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 3];
                 return [4 /*yield*/, lookupToAmisPicker(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-            case 10:
-                rightSchema = _b.sent();
-                return [3 /*break*/, 13];
-            case 11:
+            case 2:
+                rightSchema = _a.sent();
+                return [3 /*break*/, 5];
+            case 3:
                 if (!ctx) {
                     ctx = {};
                 }
                 ctx.isRefToMutiple = ___default.isArray(refTo);
                 return [4 /*yield*/, lookupToAmisSelect(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-            case 12:
-                rightSchema = _b.sent();
-                _b.label = 13;
-            case 13: return [2 /*return*/, {
+            case 4:
+                rightSchema = _a.sent();
+                _a.label = 5;
+            case 5: return [2 /*return*/, {
                     "type": "input-group",
                     "label": false,
                     "body": [
                         {
                             "type": "select",
+                            "inputClassName": "lookup-left",
                             "name": leftName,
-                            "options": options,
+                            // "options": options,
+                            "source": {
+                                "method": "post",
+                                "url": "${context.rootUrl}/graphql",
+                                "data": {
+                                    "query": "{options:objects(filters: {__filters}, top: {__top}, sort: \"{__sort}\"){_id label:label value:name icon},count:objects__count(filters:{__filters})}"
+                                },
+                                "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                },
+                                "requestAdaptor": "\nvar filters = [\"name\",\"in\", ".concat(JSON.stringify(refTo), "]; \nvar top = ").concat(JSON.stringify(refTo), ".length;\n\nvar sort = \"\";\napi.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', top).replace('{__sort}', sort.trim());\nreturn api;"),
+                            },
                             "value": "".concat(value.o)
                         },
                         Object.assign({}, rightSchema, {
@@ -17222,11 +17217,22 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 if (defaultData) {
                     // 让ObjectForm支持props中的dafaultData属性与上层组件配置的defaultData混合
                     // 为了解决相关表新建时如果是表单类型微页面，因为找不到ObjectForm在哪层而造成无法设置ObjectForm的defaultData的问题
-                    amisSchema.data.defaultData = __assign$2({ "&": "${defaultData}" }, defaultData);
+                    amisSchema.data.defaultData = __assign$2({ "&": "${defaultData}" }, defaultData //这里的defaultData是form组件的defaultData属性值
+                    );
                 }
                 uiSchema = schema.uiSchema;
                 return [3 /*break*/, 4];
-            case 2: return [4 /*yield*/, getViewSchema(objectApiName, recordId, options)];
+            case 2:
+                // formInitProps
+                if (!recordId && props.$$editor) {
+                    // 设计器中只读表单返回第一条记录
+                    options.formInitProps = {
+                        filters: [],
+                        queryOptions: "top: 1",
+                        isEditor: true
+                    };
+                }
+                return [4 /*yield*/, getViewSchema(objectApiName, recordId, options)];
             case 3:
                 schema = _d.sent();
                 amisSchema = schema.amisSchema;
@@ -17257,13 +17263,10 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
-                // 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, rowClassNameExpr = props.rowClassNameExpr;
                 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) {
@@ -17318,7 +17321,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:page_display || 'grid'}&side_object=${objectName}&side_listview_id=${listName}",
+                                    "url": "/app/${appId}/${objectName}/view/${event.data.result.data.recordId}?side_object=${objectName}&side_listview_id=${listName}",
                                     "blank": false
                                 },
                                 "actionType": "link",
@@ -17384,14 +17387,15 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                                                 {
                                                     "type": "service",
                                                     "schemaApi": {
-                                                        "url": "${context.rootUrl}/graphql?listName=${listName}&display=${display}",
+                                                        // 这里url上加objectApiName属性是因为设计器中切换对象时不会变更列表视图界面，不可以用objectName=${objectName}使用作用域中objectName变量是因为设计器那边不会监听识别data变化来render组件
+                                                        "url": "${context.rootUrl}/graphql?objectName=" + objectApiName + "&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: \"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                      ")
+                                                        "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                          listViewSchemaProps.displayAs = display;\n                          // console.log(\"====listViewSchemaProps===>\", listName, display, 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
@@ -17478,7 +17482,11 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
             case 1:
                 amisSchema = (_d.sent()).amisSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
+                if (___default.has(props, 'objectApiName')) {
+                    amisSchema.data.objectName = objectApiName;
+                }
                 amisSchema.className = "steedos-object-table h-full flex flex-col ".concat(className);
+                amisSchema.objectApiName = objectApiName; //设计器中切换对象时画布中显示的列未同步变更
                 // console.log(`AmisObjectTable===>amisSchema`, amisSchema)
                 // console.timeEnd('AmisObjectTable')
                 return [2 /*return*/, amisSchema];
@@ -18191,7 +18199,7 @@ var AmisGlobalFooter = function (props) { return __awaiter(void 0, void 0, void
                 schemaApi: {
                     "method": "get",
                     "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>").concat(instance.t('Menu'), "</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        "),
+                    "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 truncate 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 class=\"truncate\" style=\"max-width: 20vw\">${tab.name}</span></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 truncate 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><span class=\"truncate\" style=\"max-width: 20vw\">").concat(instance.t('frontend_menu'), "</span></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}"
                     }
@@ -19033,8 +19041,9 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
         switch (_a.label) {
             case 0:
                 defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, props.recordId, display = props.display;
-                //TODO  此代码应该在object page template中处理
-                Router$1.setTabDisplayAs(objectApiName, display);
+                if (display) {
+                    Router$1.setTabDisplayAs(objectApiName, display);
+                }
                 recordSchema = {};
                 return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor })];
             case 1: