@steedos-widgets/amis-object 3.6.12 → 6.3.0-beta.4

package/dist/amis-object.cjs.css

@@ -436,6 +436,11 @@ fieldset.antd-Collapse > legend{
 .antd-InputTable .antd-Table-table > thead > tr > th:not(:last-child) {
     border-right: none;
 }
+
+/* amis升级到6.3.0后配置了menuTpl属性的input-tree组件，菜单项内的wrapper组件宽度计算出bug了，需要指定宽度为100% */
+.antd-Tree .antd-Tree-list .antd-Tree-item .antd-Tree-itemLabel-item .antd-Tree-itemText >.antd-Wrapper{
+    width: 100%;
+}
 .ant-dropdown{
     z-index: 1400;
 }

package/dist/amis-object.cjs.js

@@ -12077,10 +12077,6 @@ async function getObjectCRUD(objectSchema, fields, options){
             }
         }
       `;
-      let autoFillHeight = true;
-      if(options.isRelated || window.innerWidth < 768){
-        autoFillHeight = false;
-      }
 
       body = Object.assign({}, table, {
         type: 'crud', 
@@ -12091,7 +12087,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: {
@@ -12357,7 +12353,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 = _$1__default["default"].values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const serviceId = `service_detail_page`;
@@ -12424,6 +12420,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;
@@ -12915,7 +12921,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:
  */
 
@@ -13180,37 +13186,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 = _$1.defaultsDeep({}, listSchema, defaults.listSchema || {});
         }
-        defaults.listSchema = _$1.defaultsDeep({}, listSchema, defaults.listSchema || {});
-      }
     }
     catch (ex) {
-      console.error("本地存储中crud参数解析异常：", ex);
+        console.error("本地存储中crud参数解析异常：", ex);
     }
 
     ctx.defaults = defaults;
@@ -13517,6 +13527,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": {
@@ -21477,11 +21491,11 @@ var SteedosSkeleton = function (props) {
 };
 
 var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, recordId, defaultData, mode, _a, layout, labelAlign, appId, fieldsExtend, _b, excludedFields, _c, fields, _d, form, _e, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, submitSuccActions, data, formDataFilter, onFormDataFilter, env, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, allData, schema, schema, formData, fieldsArray, excludedFieldsArray, InitApiResendOn;
+    var $schema, recordId, defaultData, mode, _a, layout, labelAlign, appId, fieldsExtend, _b, excludedFields, _c, fields, _d, form, _e, className, enableInitApi, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, submitSuccActions, data, formDataFilter, onFormDataFilter, env, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, allData, schema, schema, formData;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
-                $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, _a = props.layout, layout = _a === void 0 ? "horizontal" : _a, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _b = props.excludedFields, excludedFields = _b === void 0 ? null : _b, _c = props.fields, fields = _c === void 0 ? null : _c, _d = props.form, form = _d === void 0 ? {} : _d, _e = props.className, className = _e === void 0 ? "" : _e, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode, submitSuccActions = props.submitSuccActions, data = props.data, formDataFilter = props.formDataFilter, onFormDataFilter = props.onFormDataFilter, env = props.env;
+                $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, _a = props.layout, layout = _a === void 0 ? "horizontal" : _a, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _b = props.excludedFields, excludedFields = _b === void 0 ? null : _b, _c = props.fields, fields = _c === void 0 ? null : _c, _d = props.form, form = _d === void 0 ? {} : _d, _e = props.className, className = _e === void 0 ? "" : _e, enableInitApi = props.enableInitApi, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode, submitSuccActions = props.submitSuccActions, data = props.data, formDataFilter = props.formDataFilter, onFormDataFilter = props.onFormDataFilter, env = props.env;
                 objectApiName = props.objectApiName || "space_users";
                 schemaKeys = _$1.difference(_$1.keys($schema), ["id", "form", "type", "mode", "layout", "defaultData", "formDataFilter", "onFormDataFilter", "env"]);
                 formSchema = _$1.pick(props, schemaKeys);
@@ -21537,6 +21551,7 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                     options.isEditor = true;
                 }
                 return [4 /*yield*/, getViewSchema(objectApiName, recordId, Object.assign({}, options, {
+                        enableInitApi: enableInitApi,
                         initApiRequestAdaptor: initApiRequestAdaptor,
                         initApiAdaptor: initApiAdaptor,
                         enableTabs: enableTabs,
@@ -21566,16 +21581,6 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 if (_$1.has(props, 'objectApiName')) {
                     amisSchema.data.objectName = objectApiName;
                 }
-                if (props.$$editor) {
-                    fieldsArray = fields || [];
-                    excludedFieldsArray = excludedFields || [];
-                    InitApiResendOn = fieldsArray.concat(excludedFieldsArray).join('');
-                    if (InitApiResendOn) {
-                        amisSchema.data.InitApiResendOn = InitApiResendOn;
-                        amisSchema.api.url += "&InitApiResendOn=${InitApiResendOn}";
-                        // amisSchema.api.InitApiResendOn = "${InitApiResendOn}"; 这种写法有bug，当多选几个显示的字段/排除的字段时，表单一直loding。
-                    }
-                }
                 return [2 /*return*/, amisSchema];
         }
     });
@@ -21993,12 +21998,12 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-08 10:32:17
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 16:05:56
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-04-25 19:21:15
  * @Description:
  */
 var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var className, $schema, appId, _a, objectApiName, body, style, recordId, options, schema;
+    var className, $schema, appId, _a, objectApiName, body, style, recordId, options, schema, formData;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -22025,6 +22030,14 @@ var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void
                     }
                     Object.assign(schema.style, style);
                 }
+                formData = {};
+                if (_$1.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                    formData.recordId = props.recordId;
+                }
+                schema.data = Object.assign({}, schema.data || {}, formData);
+                if (_$1.has(props, 'objectApiName')) {
+                    schema.data.objectName = objectApiName;
+                }
                 // console.log(`AmisRecordService====schema==>`, schema)
                 return [2 /*return*/, schema];
         }