@steedos-widgets/amis-object 1.2.19 → 1.2.26

package/dist/amis-object.esm.js

@@ -3489,7 +3489,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:
  */
 
@@ -3500,14 +3500,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}){
@@ -3521,15 +3521,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}`;
@@ -6279,7 +6274,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}`,
@@ -6368,28 +6366,42 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
-
-    let isMobile = Steedos.isMobile();
-    if(isMobile){
-      // 手机端点击搜索的时候自动收起搜索栏
-      let resizeWindow = function(){
-        //触发amis crud 高度重算
-        setTimeout(()=>{
-          window.dispatchEvent(new Event("resize"))
-        }, 500);
-      }
-      const filterService = filterForm.context.getComponents().find(function(n){
-        return n.props.type === "service";
-      });
-      filterService.setData({showFieldsFilter: false});
-      resizeWindow();
-      // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
-      let filterFormValues = event.data;
-      let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-      let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-      let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
-      crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter: false});
+    // 点击搜索的时候自动收起搜索栏
+    let resizeWindow = function(){
+      //触发amis crud 高度重算
+      setTimeout(()=>{
+        window.dispatchEvent(new Event("resize"))
+      }, 500);
     }
+    const filterService = filterForm.context.getComponents().find(function(n){
+      return n.props.type === "service";
+    });
+    let showFieldsFilter = false;
+    const isMobile = window.innerWidth < 768;
+    if(event.data.__from_fields_filter_settings_confirm){
+      // 如果是从设置搜索项点击确认按钮触发的搜索事件不应该自动关闭搜索栏
+      showFieldsFilter = true;
+    }
+    else if(isMobile){
+      // 如果是手机端，点击搜索后自动关闭搜索栏
+      showFieldsFilter = false;
+    }
+    else if(event.data.displayAs === "split") {
+      // PC上分栏模式下的列表，始终按手机上效果处理，即自动关闭搜索栏
+      showFieldsFilter = false;
+    }
+    else if(window.innerHeight >= 1200){
+      // 高分辨率屏幕（2k+），列表高度比较高，没必要自动关闭搜索栏
+      showFieldsFilter = true;
+    }
+    filterService.setData({showFieldsFilter});
+    resizeWindow();
+    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
+    let filterFormValues = event.data;
+    let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
     const scope = event.context.scoped;
@@ -6428,12 +6440,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     setTimeout(()=>{
       window.dispatchEvent(new Event("resize"))
     }, 100);
-    let isMobile = Steedos.isMobile();
-    if(isMobile){
-      // 手机端移除搜索按钮上的红点
-      let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-      crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
-    }
+    // 移除搜索按钮上的红点
+    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
   const dataProviderInited = `
     const objectName = data.objectName;
@@ -6486,17 +6495,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
               || (_.isArray(n) && _.isEmpty(n.filter(function(item){return !_.isNil(item)})))
               || (_.isString(n) && n.length === 0);
           });
-          // 有过滤条件时自动展开搜索栏
+          // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            let isMobile = Steedos.isMobile();
-            if(isMobile){
-              // 手机端不展开，只显示搜索按钮上的红点
-              let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
-              crudService && crudService.setData({isFieldsFilterEmpty: false});
-            }
-            else{
-              setData({ showFieldsFilter: true });
-            }
+            let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+            crudService && crudService.setData({isFieldsFilterEmpty: false});
+            // setData({ showFieldsFilter: true });//自动展开搜索栏
           }
         }
       }
@@ -6762,7 +6765,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                     },
                                     {
                                       "actionType": "click",
-                                      "componentId": btnSearchId
+                                      "componentId": btnSearchId,
+                                      "args": {
+                                        "__from_fields_filter_settings_confirm": true
+                                      }
                                     },
                                     {
                                       "componentId": "",
@@ -7294,7 +7300,8 @@ const getNewListviewButtonSchema = ()=>{
                         "name":"",
                         "label":"",
                         "filters":"",
-                        "shared":false
+                        "shared":false,
+                        "object_name": "${targetObjectName}",
                       },
                       "fieldsExtend": fieldsExtend$4(),
                       "fields": fields$1(),
@@ -7341,13 +7348,11 @@ function fields$1(){
     "object_name",
     "filter_scope",
     "show_count",
-    "columns.$.field",
-    "columns.$.width",
-    "sort.$.field_name",
-    "sort.$.order",
+    "columns",
+    "sort",
     "filters",
-    "mobile_columns.$.field",
-    "searchable_fields.$.field",
+    "mobile_columns",
+    "searchable_fields",
     "is_system",
     "shared"
   ]
@@ -7360,7 +7365,8 @@ function fieldsExtend$4(){
     },
     "name": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "object_name": {
@@ -7370,37 +7376,56 @@ function fieldsExtend$4(){
     },
     "filter_scope": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "columns": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
+      }
+    },
+    "mobile_columns":{
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "searchable_fields":{
+      "amis": {
+        "hidden": true,
+        "required": false
       }
     },
     "filter_fields": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "scrolling_mode": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "sort": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "show_count": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "type": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "shared": {
@@ -8185,14 +8210,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"
     }
@@ -8223,36 +8248,38 @@ const filterForm = scope.getComponents().find(function(n){
 const filterService = filterForm.context.getComponents().find(function(n){
   return n.props.type === "service";
 });
-// filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+let toShowFieldsFilter = !!!filterService.props.data.showFieldsFilter;
+filterService.setData({showFieldsFilter: toShowFieldsFilter});
 let resizeWindow = function(){
   //触发amis crud 高度重算
   setTimeout(()=>{
     window.dispatchEvent(new Event("resize"))
   }, 500);
 }
-let isMobile = Steedos.isMobile();
-if(filterService.props.data.showFieldsFilter){
-  if(isMobile){
-    // 手机上只能通过取消按钮来关闭搜索栏
-    return;
-  }
-  let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
-    direction: "down", 
-    name: "btn_filter_form_cancel" 
-  });
-  buttonCancel.props.dispatchEvent('click', {}).then(function(){
-    resizeWindow();
-  });
-}
-else{
-  filterService.setData({showFieldsFilter: true});
-  resizeWindow();
-  if(isMobile){
-    // 手机端在显示搜索栏时隐藏刷新按钮
-    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    crudService && crudService.setData({showFieldsFilter: true});
-  }
-}
+resizeWindow();
+// 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
+let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
+// if(filterService.props.data.showFieldsFilter){
+//   if(isMobile){
+//     // 手机上只能通过取消按钮来关闭搜索栏
+//     return;
+//   }
+//   let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
+//     direction: "down", 
+//     name: "btn_filter_form_cancel" 
+//   });
+//   buttonCancel.props.dispatchEvent('click', {}).then(function(){
+//     resizeWindow();
+//   });
+// }
+// else{
+//   if(isMobile){
+//     // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
+//     let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+//     crudService && crudService.setData({showFieldsFilter: true});
+//   }
+// }
 `;
 
 
@@ -8298,7 +8325,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         },
       },
       filterVisible ? {
-        "label": "",
+        "label": instance.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
         "type": "button",
         "tooltip": instance.t('frontend_button_search_tooltip'),
@@ -8351,12 +8378,23 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
       },
       // getExportExcelToolbarButtonSchema(),
+      getSettingListviewToolbarButtonSchema(),
+      getDisplayAsButton(mainObject?.name),
       filterVisible ? {
-        "label": "",
+        "label": instance.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
         "tooltip": instance.t('frontend_button_search_tooltip'),
         "tooltipPlacement": "bottom",
         "type": "button",
+        "badge": {
+          "offset": [
+            -5,
+            1
+          ],
+          "size":8,
+          "animation": true,
+          "visibleOn": "${isFieldsFilterEmpty == false}"
+        },
         "align": "right",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
         "onEvent": {
@@ -8369,9 +8407,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
             ]
           }
         }
-      } : {},
-      getSettingListviewToolbarButtonSchema(),
-      getDisplayAsButton(showDisplayAs)
+      } : {}
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -9001,6 +9037,58 @@ async function lookupToAmisPicker(field, readonly, ctx){
             "actions": [
               {
                 "actionType": "reload"
+              },
+              {
+                "actionType": "custom",
+                "script": `
+                    const masterRecord = event.data._master?.record;
+                    const fieldConfig = ${JSON.stringify(field)};
+                    let reference_to = fieldConfig.reference_to;
+                    let saveValue;
+                    const newRecord = {
+                        _id: event.data.result.data.recordId,
+                        ...event.data.__super.__super
+                    }
+                    const saveField = fieldConfig.reference_to_field || '_id';
+                    const saveFieldValue = newRecord[saveField];
+
+                    if( fieldConfig._reference_to && (_.isArray(fieldConfig._reference_to) || _.isFunction(fieldConfig._reference_to) || fieldConfig._reference_to.startsWith('function') ) ){
+                        
+                        const fieldValue = masterRecord ? masterRecord[fieldConfig.name] : {o: reference_to, ids: []};
+                        const baseSaveValue = {
+                            o: reference_to,
+                            ids: [saveFieldValue]
+                        };
+                        if(fieldValue && fieldValue.o){
+                            if(fieldValue.o === reference_to){
+                                saveValue = fieldConfig.multiple ? { o: reference_to, ids: fieldValue.ids.concat(saveFieldValue)} : baseSaveValue;
+                            }else{
+                                saveValue = baseSaveValue;
+                            }
+                        }else{
+                            saveValue = baseSaveValue;
+                        }
+
+                    }else{
+                        if(fieldConfig.multiple){
+                            // TODO: 连续新建多个记录时，因为获取的主记录不是实时的，所以只会勾选最后一个新建的记录。
+                            const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            saveValue = fieldValue.concat(saveFieldValue);
+                        }else{
+                            saveValue = saveFieldValue;
+                        }
+                    }
+                    
+                    const ctx = ${JSON.stringify(ctx)};
+                    const componentId = ctx.defaults.formSchema.id ? 'service-'+ctx.defaults.formSchema.id : 'new-'+ctx.defaults.formSchema.objectApiName;
+                    doAction({
+                        actionType: 'setValue',
+                        componentId: componentId, 
+                        args: {
+                            value: { [fieldConfig.name]: saveValue  }
+                        }
+                    });
+                `
               }
             ]
           };
@@ -9231,7 +9319,7 @@ async function lookupToAmis(field, readonly, ctx){
             type: 'steedos-field-lookup',
             field,
             readonly,
-            ctx: {},
+            ctx,
         }
         // return await lookupToAmisGroup(field, readonly, ctx);
     }
@@ -9385,8 +9473,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-31 13:34:22
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-06-16 15:58:21
  * @Description: 
  */
 
@@ -9438,6 +9526,7 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
     }else {
         return {
             "type": "input-rich-text",
+            "receiver": "${context.rootUrl}/s3/images",
             "name": field.name
         }
         // return {
@@ -11121,13 +11210,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],
@@ -11277,7 +11366,7 @@ function getRecordPermissionsApi(object, recordId, options){
 
 const API_CACHE = 100;
 
-function getReadonlyFormAdaptor(object, fields){
+function getReadonlyFormAdaptor(object, fields, options){
     let scriptStr = '';
     const selectFields = ___default.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.map(___default.filter(fields, function(field){return field.name.indexOf('.') < 0 && (field.type === 'object' || field.type === 'grid')}), 'name');
@@ -11317,9 +11406,16 @@ function getReadonlyFormAdaptor(object, fields){
 
     return  `
     if(payload.data.data.length === 0){
-        return {
-            status: 2,
-            msg: "无法找到记录"
+        var isEditor = !!${options && options.isEditor};
+        if(isEditor){
+            // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
+            payload.data.data = [{}];
+        }
+        else{
+            return {
+                status: 2,
+                msg: "无法找到记录"
+            }
         }
     }
     if(payload.data.data){
@@ -11336,7 +11432,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)
@@ -11357,10 +11453,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}"
@@ -12624,6 +12720,8 @@ async function getObjectForm(objectSchema, ctx){
     };
     if(formSchema.id){
       amisSchema.id = `service-${formSchema.id}`;
+    }else {
+      amisSchema.id = `new-${objectSchema.name}`;
     }
     return amisSchema;
 }
@@ -12790,8 +12888,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:
  */
 
@@ -12834,10 +12932,11 @@ async function getObjectRelatedList(
     if(!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,
@@ -12850,10 +12949,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
             });
         }
     }
@@ -12885,14 +12985,16 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
             if(!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 = 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(!has(mainRelated,arr[0])){
-                        mainRelated[arr[0]] = arr[1];
+                        mainRelated[arr[0]] = foreign_key_value;
                     }
                 }
             }
@@ -16725,6 +16827,7 @@ var getSchema = function (field, value, ctx) { return __awaiter(void 0, void 0,
                     "body": [
                         {
                             "type": "select",
+                            "inputClassName": "select_left",
                             "name": leftName,
                             "options": options,
                             "value": "".concat(value.o)
@@ -17101,11 +17204,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;
@@ -17136,13 +17250,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) {
@@ -17197,7 +17308,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",
@@ -17269,8 +17380,8 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                                                         "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
@@ -18070,7 +18181,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}"
                     }
@@ -18912,8 +19023,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:
@@ -18971,7 +19083,7 @@ var PageObject = function (props) { return __awaiter(void 0, void 0, void 0, fun
                                     "type": "wrapper",
                                     "size": "none",
                                     "className": {
-                                        "p-0 flex-shrink-0 w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col": "${display == 'split'}",
+                                        "p-0 flex-shrink-0 min-w-[388px] w-fit border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col": "${display == 'split'}",
                                         'h-full': "${display != 'split'}",
                                     },
                                     "body": {