@steedos-widgets/amis-object 3.6.2 → 3.6.3

package/dist/amis-object.cjs.js

@@ -12346,8 +12346,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-24 10:18:17
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-08 16:10:52
  * @Description:
  */
 
@@ -12464,19 +12464,6 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let globalFilter = null;
     // TODO: refField变量去掉，写到amis运行时脚本中，uiSchema.fields[relatedKey];可以取到
     const refField = await getField(relatedObjectName, relatedKey);
-
-    if(!refField){
-        return {
-            uiSchema: relatedObjectUiSchema,
-            amisSchema: {
-                "type": "alert",
-                "body": `${instance.t('frontend_objects_related_alert_start')} ${relatedObjectName} ${instance.t('frontend_objects_related_alert_end')}`,
-                "level": "warning",
-                "showIcon": true,
-                "className": "mb-3"
-            }
-        }
-    }
     // if(refField.reference_to_field && refField.reference_to_field != '_id'){
     //     const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
     //     relatedValue = masterRecord[refField.reference_to_field]
@@ -12720,7 +12707,10 @@ async function getRelatedListSchema(
         "filterVisible": false,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
-        "ctx": ctx
+        "ctx": ctx,
+        "crud": ctx.crud,
+        "crudDataFilter": ctx.crudDataFilter,
+        "onCrudDataFilter": ctx.onCrudDataFilter
     };
     // console.log(`getRelatedListSchema amisSchema`, amisSchema);
     return {
@@ -15753,8 +15743,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                 },
                                 "adaptor": `
-                                    payload.data["${field.name}"] = payload.data && payload.data.autonumber;
+                                    var tempValue = payload.data && payload.data.autonumber;
                                     delete payload.data.autonumber;
+                                    payload.data["${field.name}"] = tempValue;
                                     return payload;
                                 `
                             },
@@ -16306,6 +16297,11 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
       section.visibleOn = groupVisibleOn;
     }
   }
+
+  let groupCollapsed = group && group.collapsed;
+  if(groupCollapsed === true) {
+    section.collapsed = true;
+  }
   return section
 };
 
@@ -21216,7 +21212,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 if (crudMode) {
                     // 把crudMode属性传入到crud.mode属性值中
                     // 如果只配置了crudMode属性，则后续内核代码会自动生成对应mode的默认属性值，比如card,listItem
-                    // 这样可以手动配置crud.card或crud.listItem属性的时间提高开发效率
+                    // 这样可以省去手动配置crud.card或crud.listItem属性的时间提高开发效率
                     crud = Object.assign({
                         mode: crudMode
                     }, crud);
@@ -21372,7 +21368,7 @@ function getTableColumns(columns, includedFields, fieldsExtend) {
     return tableColumns;
 }
 var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, _c, filterVisible, headerToolbarItems, crudDataFilter, onCrudDataFilter, env, crudMode, _d, hiddenColumnOperation, ctx, crud, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, allData, appId, tableSchema, amisSchema, uiSchema;
+    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, _c, filterVisible, headerToolbarItems, crudDataFilter, onCrudDataFilter, env, crudMode, _d, hiddenColumnOperation, ctx, crud, columns, defaults, objectApiName, schemaKeys, listSchema, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, allData, appId, tableSchema, amisSchema, uiSchema;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
@@ -21409,6 +21405,12 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                         listSchema: Object.assign({}, listSchema, crud)
                     };
                 }
+                else {
+                    listSchema = ctx && ctx.defaults && ctx.defaults.listSchema;
+                    if (listSchema) {
+                        ctx.defaults.listSchema = Object.assign({}, listSchema, crud);
+                    }
+                }
                 // 支持通过直接定义headerSchema属性来定制表头，而不一定要通过ctx.defaults.headerSchema传入
                 if (headerSchema) {
                     defaults.headerSchema = headerSchema;
@@ -21603,12 +21605,12 @@ var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void
 }); };
 
 var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, objectApiName, recordId, relatedObjectApiName, data, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, visibleOn, formFactor, formData, schema;
+    var $schema, objectApiName, recordId, relatedObjectApiName, data, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, visibleOn, crud, crudDataFilter, onCrudDataFilter, env, formFactor, formData, schema;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, data = props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, visibleOn = props.visibleOn;
+                $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, data = props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, visibleOn = props.visibleOn, crud = props.crud, crudDataFilter = props.crudDataFilter, onCrudDataFilter = props.onCrudDataFilter, env = props.env;
                 formFactor = props.formFactor;
                 if (!formFactor) {
                     formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
@@ -21627,7 +21629,26 @@ var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, vo
                 if (_$1.has(props, "recordId") && $schema.recordId !== "${recordId}") {
                     formData.recordId = recordId;
                 }
-                return [4 /*yield*/, getRecordDetailRelatedListSchema(objectApiName, recordId, relatedObjectApiName, relatedKey, { top: top, perPage: perPage, appId: appId, relatedLabel: relatedLabel, className: className, formFactor: formFactor, columns: columns, sort: sort, filters: filters, visible_on: visible_on, isRelated: true, hiddenEmptyTable: hiddenEmptyTable, requestAdaptor: requestAdaptor, adaptor: adaptor })];
+                return [4 /*yield*/, getRecordDetailRelatedListSchema(objectApiName, recordId, relatedObjectApiName, relatedKey, {
+                        top: top,
+                        perPage: perPage,
+                        appId: appId,
+                        relatedLabel: relatedLabel,
+                        className: className,
+                        formFactor: formFactor,
+                        columns: columns,
+                        sort: sort,
+                        filters: filters,
+                        visible_on: visible_on,
+                        isRelated: true,
+                        hiddenEmptyTable: hiddenEmptyTable,
+                        requestAdaptor: requestAdaptor,
+                        adaptor: adaptor,
+                        crud: crud,
+                        crudDataFilter: crudDataFilter,
+                        onCrudDataFilter: onCrudDataFilter,
+                        env: env
+                    })];
             case 1:
                 schema = (_c.sent()).amisSchema;
                 if (_$1.isEmpty(schema)) {