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

package/dist/index.umd.js

@@ -839,10 +839,11 @@
     `
   }
 
-  function getSaveRequestAdaptor(fields){
+  function getSaveRequestAdaptor(fields, options){
       return `
         ${getSaveDataTpl(fields)}
         api.data = {query: query.replace('{__saveData}', __saveData)};
+        ${options.apiRequestAdaptor || ''}
         return api;
     `
   }
@@ -5397,7 +5398,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     `
   }
 
-  async function getEditFormInitApi(object, recordId, fields){
+  async function getEditFormInitApi(object, recordId, fields, options){
       const data = await getFindOneQuery$1(object, recordId, fields);
       data.recordId = "${recordId}";
       data.objectName = "${objectName}";
@@ -5418,6 +5419,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 data.query = "{data:" + objectName + "(filters: " + JSON.stringify(["_id", "=", null]) + ", top: 1){_id}}";
             }
             api.data = data;
+            ${options.initApiRequestAdaptor || ''}
             return api;
         `,
           adaptor: `
@@ -5489,6 +5491,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 initialValues,
                 editFormInited: true
             }
+            ${options.initApiAdaptor || ''}
             return payload;
         `,
           data: data,
@@ -5504,7 +5507,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           method: 'post',
           url: getApi$2(),
           data: getSaveQuery(object, recordId),
-          requestAdaptor: getSaveRequestAdaptor(fields),
+          requestAdaptor: getSaveRequestAdaptor(fields, options),
           responseData: {
               "recordId": "${record._id}"
           },
@@ -5513,6 +5516,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 payload.status = 2;
                 payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
             }
+            ${options.apiAdaptor || ''}
             return payload;
         `,
           headers: {
@@ -5720,7 +5724,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});
@@ -5872,7 +5880,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         type: 'service',
         className: 'p-0',
         name: `page_edit_${recordId}`,
-        api: await getEditFormInitApi(objectSchema, recordId, fields),
+        api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
         data:{
           editFormInited: false
         },
@@ -5893,7 +5901,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           debug: false,
           title: "",
           submitText: "", // amis 表单不显示提交按钮, 表单提交由项目代码接管
-          api: await getSaveApi(objectSchema, recordId, fields),
+          api: await getSaveApi(objectSchema, recordId, fields, ctx),
           initFetch: recordId != 'new',
           body: await getFormBody(fields, formFields, ctx),
           panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
@@ -6757,6 +6765,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 +7233,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 +7321,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 +7397,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;