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

package/dist/index.umd.js

@@ -5720,7 +5720,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         options.queryCount = true; // 禁止翻页的时候, 需要查找总数
       }else if(top){
         bodyProps.footerToolbar = [];
-        options.queryCount = false;
+        if(options.isRelated){
+          options.queryCount = true;
+        }else {
+          options.queryCount = false;
+        }
       }
 
       bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs, hiddenCount: options.queryCount === false});
@@ -6757,6 +6761,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     }else{
         filters = [filters, 'and', eventDurationFilters]
     }
+
+    if(api.data.$self.additionalFilters){
+      filters.push(api.data.$self.additionalFilters)
+    }
+
     var pageSize = api.data.pageSize || 10;
     var pageNo = api.data.pageNo || 1;
     var skip = (pageNo - 1) * pageSize;
@@ -7220,6 +7229,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       "type": "steedos-fullcalendar",
       "label": "",
       "name": "fullcalendar",
+      "placeholder":"${additionalFilters}",//用于触发reload
       "editable": permissions.allowEdit,
       "selectable": permissions.allowCreate,
       "selectMirror": permissions.allowCreate,
@@ -7307,8 +7317,8 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
-   * @LastEditors: 廖大雪 2291335922@qq.com
-   * @LastEditTime: 2023-03-15 10:57:31
+   * @LastEditors: Please set LastEditors
+   * @LastEditTime: 2023-03-30 17:44:53
    * @Description:
    */
 
@@ -7383,6 +7393,13 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       let { top, perPage, hiddenEmptyTable, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
       // console.log('getRecordDetailRelatedListSchema==>',objectName,recordId,relatedObjectName)
       const relatedObjectUiSchema = await getUISchema(relatedObjectName);
+      if(!relatedObjectUiSchema){
+          // 子表对象不存在时直接返回空值.
+          return {
+              uiSchema: {},
+              amisSchema: {}
+          }
+      }
       const { label , fields } = relatedObjectUiSchema;
       if(!relatedLabel){
           relatedLabel = label;