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

package/dist/index.umd.js

@@ -1046,7 +1046,7 @@
 
   async function getSource$1(field, ctx) {
       // data.query 最终格式 "{ \tleftOptions:organizations(filters: {__filters}){value:_id,label:name,children},   children:organizations(filters: {__filters}){ref:_id,children}, defaultValueOptions:space_users(filters: {__options_filters}){user,name} }"
-      const data = await getFindQuery({ name: refOrgsObjectName }, null, [{ name: "_id", alias: "value" }, { name: "name", alias: "label" }, { name: "children" }], {
+      const data = await getFindQuery({ name: refOrgsObjectName }, null, [{ name: "_id", alias: "value" },{name: "parent"}, { name: "name", alias: "label" }, { name: "children" }], {
           alias: "leftOptions",
           filters: "{__filters}"
       });
@@ -1076,7 +1076,7 @@
       // data["&"] = "$$";
 
       const requestAdaptor = `
-        var filters = [['parent', '=', null]];
+        var filters = [];
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
         var defaultValue = api.data.$value;
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
@@ -1089,17 +1089,18 @@
     `;
       const adaptor = `
         const data = payload.data;
+        const rows = data.leftOptions
         data.children = data.children.map(function (child) { 
             // child.defer = !!(child.children && child.children.length);
             child.defer = true;
             delete child.children;
             return child;
         });
-        data.leftOptions = data.leftOptions.map(function (leftOption) {
-            leftOption.defer = !!(leftOption.children && leftOption.children.length);
-            delete leftOption.children;
-            return leftOption;
-        });
+
+        var getTreeOptions = SteedosUI.getTreeOptions
+        data.leftOptions = getTreeOptions(rows);
+
+        
         var defaultValueOptions = data.defaultValueOptions;
         data.children = _.union(data.children, defaultValueOptions);
         delete data.defaultValueOptions;
@@ -2058,7 +2059,7 @@
           if(visible.trim().startsWith('function')){
               return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, record.recordPermissions, data])`
+            }, [objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`
           }
           return visible;
       }
@@ -4000,6 +4001,19 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
+
+        const getParentIds = (records)=>{
+            const ids = _.map(records, (item)=>{
+                return item._id;
+            });
+            const parents = _.filter(records,(record)=>{
+                return !record.parent || !_.includes(ids,record.parent);
+            })
+            const parentsIds = _.map(parents,(item)=>{
+                return item._id;
+            })
+            return parentsIds;
+        }
         const getChildren = (records, childrenIds)=>{
             if(!childrenIds){
                 return;
@@ -4015,8 +4029,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             return children;
         }
 
+        const parentIds = getParentIds(records);
         _.each(records, (record)=>{
-            if(!record.parent){
+            if(!record.parent || _.includes(parentIds, record._id)){
                 treeRecords.push(Object.assign({}, record, {children: getChildren(records, record.children)}));
             }
         });
@@ -5690,7 +5705,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         footerToolbar: getObjectFooterToolbar(objectSchema, options.formFactor, {
           disableStatistics: options.queryCount === false
         }), 
-        filter: !!options.filterVisible && await getObjectFilter(objectSchema, fields, options),
+        filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
       };
       if(options.formFactor !== 'SMALL'){
         Object.assign(bodyProps, {
@@ -5705,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});
@@ -6253,7 +6272,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           //     return 'false';
           // }
           if(visible.trim().startsWith('function')){
-              return `${visible}(objectName, _id, record.recordPermissions, data)`
+              return `${visible}(objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)`
           }
           return visible;
       }
@@ -6322,14 +6341,15 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                           formFactor: "${formFactor}",
                           context: `\${context}`
                       },
-                      "responseData": {
-                          "recordPermissions": "$$"
-                      },
                       headers: {
                           Authorization: "Bearer ${context.tenantId},${context.authToken}"
                       },
                       adaptor: `
-                        payload.recordPermissions = payload;
+                        payload = {
+                            record: {
+                                recordPermissions: payload
+                            }
+                        };
                         return payload;
                     `,
                   }
@@ -6741,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;
@@ -7204,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,
@@ -7291,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:
    */
 
@@ -7367,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;