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

package/dist/index.umd.js

@@ -1572,8 +1572,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 +1634,7 @@
                                   "data": {
                                     "objectName": "${_master.objectName}"
                                   },
-                                  "expression": "${_master.objectName}"
+                                  "expression": `\${_master.objectName != '${uiSchema.name}' && _master.objectName}`
                               }
                             ]
                       }
@@ -2058,7 +2058,7 @@
           if(visible.trim().startsWith('function')){
               return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, recordPermissions, data])`
+            }, [objectName, _id, record.recordPermissions, data])`
           }
           return visible;
       }
@@ -3979,6 +3979,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;
     `;
@@ -4052,7 +4056,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 +4150,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 +5435,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 +5454,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);
@@ -5899,7 +5906,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                   "data": {
                     "objectName": "${_master.objectName}"
                   },
-                  "expression": "${_master.objectName}"
+                  "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
                 }
               ]
             }
@@ -5916,7 +5923,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 +6253,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, record.recordPermissions, data)`
           }
           return visible;
       }