@steedos-widgets/amis-lib 6.3.0-beta.3 → 6.3.0-beta.4

package/dist/index.esm.js

@@ -8896,10 +8896,6 @@ async function getObjectCRUD(objectSchema, fields, options){
             }
         }
       `;
-      let autoFillHeight = true;
-      if(options.isRelated || window.innerWidth < 768){
-        autoFillHeight = false;
-      }
 
       body = Object.assign({}, table, {
         type: 'crud', 
@@ -8910,7 +8906,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight,
+        // autoFillHeight,//autoFillHeight按amis规范默认为false，需要配置此属性时在各个组件层配置，比如列表视图组件那边传入此属性为true
         className: `flex-auto ${crudClassName || ""}`,
         // 这里不可以用动态className，因为它会把样式类加到.antd-Crud和.antd-Table.antd-Crud-body这两层div中，而子表列表中crudClassName中有hidden样式类会造成所有子表都不显示的bug
         // className: {
@@ -9176,7 +9172,7 @@ async function getObjectForm(objectSchema, ctx){
 
 async function getObjectDetail(objectSchema, recordId, ctx){
     const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, 
-      formDataFilter, onFormDataFilter, amisData, env } = ctx;
+      formDataFilter, onFormDataFilter, amisData, env, enableInitApi } = ctx;
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const serviceId = `service_detail_page`;
@@ -9243,6 +9239,16 @@ async function getObjectDetail(objectSchema, recordId, ctx){
         // }
     };
 
+    if(enableInitApi){
+      amisSchema.api = await getReadonlyFormInitApi(objectSchema, recordId, fields, ctx);
+      // 开启初始化api请求时，如果不把recordLoaded默认设置为false，recordLoaded值会取RecordServic组件中的recordLoaded值
+      // 这会造成表单内steedos field组件lookup字段中props.data取到的是RecordServic组件
+      amisSchema.data = {
+        ...amisSchema.data,
+        recordLoaded: false
+      };
+    }
+
     amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
     // console.log('getObjectDetail=====>', amisSchema);
     return amisSchema;
@@ -9734,7 +9740,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-02-23 16:37:06
+ * @LastEditTime: 2024-04-25 19:01:52
  * @Description:
  */
 
@@ -9999,37 +10005,41 @@ async function getListSchema(
      * 本次存储代码段
      */
     try {
-      const listViewPropsStoreKey = location.pathname + "/crud";
-      let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
-      /**
-       * localListViewProps规范来自crud请求api中api.data.$self参数值的。
-       * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
-       * __searchable__...:顶部放大镜搜索条件
-       * filter:右侧过滤器
-       * perPage:每页条数
-       * page:当前页码
-       * orderBy:排序字段
-       * orderDir:排序方向
-       */
-      if (localListViewProps) {
-        localListViewProps = JSON.parse(localListViewProps);
-        // localListViewProps.perPage = 3;
-        let listSchema = {};
-        if(localListViewProps.orderBy){
-            listSchema.orderBy = localListViewProps.orderBy;
-        }
-        if(localListViewProps.orderDir){
-            listSchema.orderDir = localListViewProps.orderDir;
-        }
+        const listViewPropsStoreKey = location.pathname + "/crud";
+        let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+        /**
+         * localListViewProps规范来自crud请求api中api.data.$self参数值的。
+         * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
+         * __searchable__...:顶部放大镜搜索条件
+         * filter:右侧过滤器
+         * perPage:每页条数
+         * page:当前页码
+         * orderBy:排序字段
+         * orderDir:排序方向
+         */
+        if (localListViewProps) {
+            localListViewProps = JSON.parse(localListViewProps);
+            // localListViewProps.perPage = 3;
+            let listSchema = {};
+            if (localListViewProps.orderBy) {
+                listSchema.orderBy = localListViewProps.orderBy;
+            }
+            if (localListViewProps.orderDir) {
+                listSchema.orderDir = localListViewProps.orderDir;
+            }
 
-        if(localListViewProps.perPage){
-            listSchema.perPage = localListViewProps.perPage;
+            if (localListViewProps.perPage) {
+                listSchema.perPage = localListViewProps.perPage;
+            }
+            if (window.innerWidth > 768) {
+                // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight
+                listSchema.autoFillHeight = true;
+            }
+            defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
         }
-        defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
-      }
     }
     catch (ex) {
-      console.error("本地存储中crud参数解析异常：", ex);
+        console.error("本地存储中crud参数解析异常：", ex);
     }
 
     ctx.defaults = defaults;
@@ -10336,6 +10346,10 @@ async function getRecordServiceSchema(objectName, appId, props = {}, body) {
                 data: {
                     "_master.objectName": "${objectName}",
                     "_master.recordId": "${recordId}",
+                    // 微页面设计器中用RecordServic组件包裹一个ObjectForm只读组件时，如果这里不把recordLoaded默认设置为false
+                    // recordLoaded值会取父作用域中已经被设置为true的值（比如父级有RecordServic组件，在加载完数据后，父作用域中recordLoaded值为true)
+                    // 这会造成表单内steedos field组件lookup字段中props.data取到的是父作用域中的数据
+                    "recordLoaded": false,
                     ...(props.data || {})
                 },
                 "style": {