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

package/dist/amis-object.cjs.js

@@ -1933,8 +1933,8 @@ const getSchema$3 = async (uiSchema, ctx) => {
 /*
  * @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 {
@@ -1995,7 +1995,7 @@ const getSchema$2 = (uiSchema)=>{
                                 "data": {
                                   "objectName": "${_master.objectName}"
                                 },
-                                "expression": "${_master.objectName}"
+                                "expression": `\${_master.objectName != '${uiSchema.name}' && _master.objectName}`
                             }
                           ]
                     }
@@ -2419,7 +2419,7 @@ function getButtonVisibleOn$1(button){
         if(visible.trim().startsWith('function')){
             return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, recordPermissions, data])`
+            }, [objectName, _id, record.recordPermissions, data])`
         }
         return visible;
     }
@@ -4340,6 +4340,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
+        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;
     `;
@@ -4413,7 +4417,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             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++;
@@ -4507,7 +4511,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
         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}"
+            }
         };
     }
 
@@ -5789,6 +5796,17 @@ async function getEditFormInitApi(object, recordId, fields){
             }
             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);
@@ -5797,24 +5815,13 @@ async function getEditFormInitApi(object, recordId, fields){
                             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);
@@ -6260,7 +6267,7 @@ async function getObjectForm(objectSchema, ctx){
                 "data": {
                   "objectName": "${_master.objectName}"
                 },
-                "expression": "${_master.objectName}"
+                "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               }
             ]
           }
@@ -6277,7 +6284,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, formInitProps } = ctx;
     const fields = ___default__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}`,
@@ -6607,7 +6614,7 @@ function getButtonVisibleOn(button){
         //     return 'false';
         // }
         if(visible.trim().startsWith('function')){
-            return `${visible}(objectName, _id, recordPermissions, data)`
+            return `${visible}(objectName, _id, record.recordPermissions, data)`
         }
         return visible;
     }
@@ -13264,11 +13271,11 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
 }); };
 
 var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var defaultFormFactor, appId, objectApiName, recordId, display, sideObject, sideListviewId, $schema, displayAs, formFactor, listPage, recordSchema, recordPage, listSchema, defData;
+    var defaultFormFactor, appId, objectApiName, recordId, display, sideObject, sideListviewId, $schema, data, displayAs, formFactor, listPage, recordSchema, recordPage, listSchema, defData;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, recordId = props.recordId, display = props.display, sideObject = props.sideObject, sideListviewId = props.sideListviewId, $schema = props.$schema;
+                defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, recordId = props.recordId, display = props.display, sideObject = props.sideObject, sideListviewId = props.sideListviewId, $schema = props.$schema, data = props.data;
                 if (display)
                     Router$1.setTabDisplayAs(objectApiName, display);
                 displayAs = (defaultFormFactor === 'SMALL') ? 'grid' : display ? display : sideObject ? 'split' : Router$1.getTabDisplayAs(objectApiName);
@@ -13305,7 +13312,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                     "showDisplayAs": true,
                     "formFactor": 'SMALL',
                 };
-                defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: sideListviewId, listName: sideListviewId, recordId: recordId, appId: appId, formFactor: formFactor, displayAs: displayAs });
+                defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: sideListviewId, listName: sideListviewId, recordId: data.recordId || recordId, appId: appId, formFactor: formFactor, displayAs: displayAs });
                 return [2 /*return*/, {
                         type: 'service',
                         data: defData,