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

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;
@@ -1572,8 +1573,8 @@
   /*
    * @Author: 殷亮辉 yinlianghui@hotoa.com
    * @Date: 2023-03-22 09:31:21
-   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-03-27 16:03:34
+   * @LastEditors: Please set LastEditors
+   * @LastEditTime: 2023-03-28 14:06:47
    */
   const getSchema$2 = (uiSchema)=>{
       return {
@@ -1634,7 +1635,7 @@
                                   "data": {
                                     "objectName": "${_master.objectName}"
                                   },
-                                  "expression": "${_master.objectName}"
+                                  "expression": `\${_master.objectName != '${uiSchema.name}' && _master.objectName}`
                               }
                             ]
                       }
@@ -2058,7 +2059,7 @@
           if(visible.trim().startsWith('function')){
               return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, recordPermissions, data])`
+            }, [objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`
           }
           return visible;
       }
@@ -3979,6 +3980,10 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             }
         }
 
+        const enable_tree = ${refObjectConfig.enable_tree};
+        if(enable_tree){
+            pageSize = 10000;
+        }
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `;
@@ -3996,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;
@@ -4011,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)}));
             }
         });
@@ -4052,7 +4071,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
               new_button.align = "right";
               pickerSchema.headerToolbar.push(new_button);
           }
-          pickerSchema.footerToolbar = getObjectFooterToolbar();
+          pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
           if(ctx.filterVisible !== false){
               let filterLoopCount = ctx.filterLoopCount || 0;
               filterLoopCount++;
@@ -4146,7 +4165,10 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           apiInfo = {
               method: "post",
               url: getApi$2(),
-              data: {query: '{objects(filters: ["_id", "=", "-1"]){_id}}', $: "$$"}
+              data: {query: '{objects(filters: ["_id", "=", "-1"]){_id}}', $: "$$"},
+              "headers": {
+                  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+              }
           };
       }
 
@@ -5428,6 +5450,17 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             }
             else{
                 var uiSchema = api.body.uiSchema;
+                var defaultData = api.body.defaultData;
+                var defaultValues = {};
+                _.each(uiSchema?.fields, function(field){
+                    var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
+                    if(value){
+                        defaultValues[field.name] = value;
+                    }
+                });
+                if(defaultData && _.isObject(defaultData) && !_.isArray(defaultData)){
+                    defaultValues = Object.assign({}, defaultValues, defaultData)
+                }
                 if(uiSchema.form){
                     try{
                         var objectFormConfig = JSON.parse(uiSchema.form);
@@ -5436,24 +5469,13 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                             initialValues = new Function("return " + initialValues)();
                         }
                         if(typeof initialValues === "function"){
-                            initialValues = initialValues();
+                            initialValues = initialValues.apply({doc: defaultValues || {} })
                         }
                     }
                     catch(ex){
                         console.warn(ex);
                     }
                 }
-                var defaultData = api.body.defaultData;
-                var defaultValues = {};
-                _.each(uiSchema?.fields, function(field){
-                    var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
-                    if(value){
-                        defaultValues[field.name] = value;
-                    }
-                });
-                if(defaultData && _.isObject(defaultData) && !_.isArray(defaultData)){
-                    defaultValues = Object.assign({}, defaultValues, defaultData)
-                }
                 if(_.isObject(initialValues)){
                     // uiSchema.form.initialValues为函数且执行后为json，则优先取initialValues中的默认值
                     initialValues = Object.assign({}, defaultValues, initialValues);
@@ -5683,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, {
@@ -5899,7 +5921,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                   "data": {
                     "objectName": "${_master.objectName}"
                   },
-                  "expression": "${_master.objectName}"
+                  "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
                 }
               ]
             }
@@ -5916,7 +5938,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, formInitProps } = ctx;
       const fields = ___default["default"].values(objectSchema.fields);
       const formFields = getFormFields(objectSchema, ctx);
-      const serviceId = `detail_${recordId}`;
+      const serviceId = `service_detail_page`;
       return {
           type: 'service',
           name: `page_readonly_${recordId}`,
@@ -6246,7 +6268,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           //     return 'false';
           // }
           if(visible.trim().startsWith('function')){
-              return `${visible}(objectName, _id, recordPermissions, data)`
+              return `${visible}(objectName, _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data)`
           }
           return visible;
       }
@@ -6315,14 +6337,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;
                     `,
                   }