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

package/dist/index.esm.js

@@ -1020,7 +1020,7 @@ const refOrgsObjectName = "organizations";
 
 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}"
     });
@@ -1050,7 +1050,7 @@ async function getSource$1(field, ctx) {
     // 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" : "="}";
@@ -1063,17 +1063,18 @@ async function getSource$1(field, ctx) {
     `;
     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;
@@ -2032,7 +2033,7 @@ function getButtonVisibleOn$1(button){
         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;
     }
@@ -3974,6 +3975,19 @@ async function lookupToAmisPicker(field, readonly, ctx){
     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;
@@ -3989,8 +4003,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
             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)}));
             }
         });
@@ -5664,7 +5679,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       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, {
@@ -5679,7 +5694,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       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});
@@ -6227,7 +6246,7 @@ function getButtonVisibleOn(button){
         //     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;
     }
@@ -6296,14 +6315,15 @@ async function getTableOperation(ctx){
                         formFactor: "${formFactor}",
                         context: `\${context}`
                     },
-                    "responseData": {
-                        "recordPermissions": "$$"
-                    },
                     headers: {
                         Authorization: "Bearer ${context.tenantId},${context.authToken}"
                     },
                     adaptor: `
-                        payload.recordPermissions = payload;
+                        payload = {
+                            record: {
+                                recordPermissions: payload
+                            }
+                        };
                         return payload;
                     `,
                 }
@@ -6715,6 +6735,11 @@ async function getCalendarApi(mainObject, fields, options) {
     }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;
@@ -7178,6 +7203,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     "type": "steedos-fullcalendar",
     "label": "",
     "name": "fullcalendar",
+    "placeholder":"${additionalFilters}",//用于触发reload
     "editable": permissions.allowEdit,
     "selectable": permissions.allowCreate,
     "selectMirror": permissions.allowCreate,
@@ -7265,8 +7291,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @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:
  */
 
@@ -7341,6 +7367,13 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     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;