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

package/dist/amis-object.umd.js

@@ -1191,7 +1191,7 @@
         ${getScriptForSimplifiedValueForFileFields(fields)}
         let query = \`mutation{record: \${objectName}__insert(doc: {__saveData}){_id}}\`;
         if(formData.recordId && formData.recordId !='new'){
-            query = \`mutation{record: \${objectName}__update(id: "\${formData._id}", doc: {__saveData}){_id}}\`;
+            query = \`mutation{record: \${objectName}__update(id: "\${formData.recordId}", doc: {__saveData}){_id}}\`;
         };
         delete formData._id;
         let __saveData = JSON.stringify(JSON.stringify(formData));
@@ -1931,8 +1931,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 {
@@ -1993,7 +1993,7 @@
                                     "data": {
                                       "objectName": "${_master.objectName}"
                                     },
-                                    "expression": "${_master.objectName}"
+                                    "expression": `\${_master.objectName != '${uiSchema.name}' && _master.objectName}`
                                 }
                               ]
                         }
@@ -2417,7 +2417,7 @@
             if(visible.trim().startsWith('function')){
                 return `${visible}.apply({
                 object: uiSchema
-            }, [objectName, _id, recordPermissions, data])`
+            }, [objectName, _id, record.recordPermissions, data])`
             }
             return visible;
         }
@@ -4338,6 +4338,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;
     `;
@@ -4411,7 +4415,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++;
@@ -4505,7 +4509,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}"
+                }
             };
         }
 
@@ -5798,7 +5805,28 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 if(defaultData && _.isObject(defaultData) && !_.isArray(defaultData)){
                     defaultValues = Object.assign({}, defaultValues, defaultData)
                 }
-                initialValues = defaultValues;
+                if(uiSchema.form){
+                    try{
+                        var objectFormConfig = JSON.parse(uiSchema.form);
+                        initialValues = objectFormConfig.initialValues;
+                        if(initialValues){
+                            initialValues = new Function("return " + initialValues)();
+                        }
+                        if(typeof initialValues === "function"){
+                            initialValues = initialValues.apply({doc: defaultValues || {} })
+                        }
+                    }
+                    catch(ex){
+                        console.warn(ex);
+                    }
+                }
+                if(_.isObject(initialValues)){
+                    // uiSchema.form.initialValues为函数且执行后为json，则优先取initialValues中的默认值
+                    initialValues = Object.assign({}, defaultValues, initialValues);
+                }
+                else{
+                    initialValues = defaultValues;
+                }
             }
             // data下的变量需要在保存接口（getSaveApi）中被删除。
             payload.data = {
@@ -6237,7 +6265,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                     "data": {
                       "objectName": "${_master.objectName}"
                     },
-                    "expression": "${_master.objectName}"
+                    "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
                   }
                 ]
               }
@@ -6254,7 +6282,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         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}`,
@@ -6584,7 +6612,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;
         }
@@ -11837,7 +11865,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     };
 
     var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, recordId, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, formData;
+        var $schema, recordId, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -11869,7 +11897,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                     if (!(mode === 'edit')) return [3 /*break*/, 2];
                     return [4 /*yield*/, getFormSchema(objectApiName, options)];
                 case 1:
-                    amisSchema = (_d.sent()).amisSchema;
+                    schema = _d.sent();
+                    amisSchema = schema.amisSchema;
+                    uiSchema = schema.uiSchema;
                     return [3 /*break*/, 4];
                 case 2:
                     // formInitProps
@@ -11881,7 +11911,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                     }
                     return [4 /*yield*/, getViewSchema(objectApiName, recordId, options)];
                 case 3:
-                    amisSchema = (_d.sent()).amisSchema;
+                    schema = _d.sent();
+                    amisSchema = schema.amisSchema;
+                    uiSchema = schema.uiSchema;
                     _d.label = 4;
                 case 4:
                     formData = {};
@@ -11890,7 +11922,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                         formData.objectName = objectApiName;
                     }
                     amisSchema.className = "steedos-object-form ".concat(className);
-                    amisSchema.data = Object.assign({ "&": "$$" }, amisSchema.data, formData, { global: globalData });
+                    amisSchema.data = Object.assign({ "&": "$$" }, amisSchema.data, formData, { global: globalData, uiSchema: uiSchema });
                     // console.log(`amisSchema`, amisSchema)
                     return [2 /*return*/, amisSchema];
             }
@@ -13047,6 +13079,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                         }
                     }
                     else {
+                        steedosField = field;
                         if (___default.isString(field)) {
                             steedosField = JSON.parse(field);
                         }
@@ -13180,11 +13213,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     }); };
 
     var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var defaultFormFactor, appId, objectApiName, listviewId, display, _a, $schema, displayAs, formFactor, page, listViewId, listSchema, defData;
+        var defaultFormFactor, appId, objectApiName, listviewId, display, _a, $schema, listName, displayAs, formFactor, page, listViewId, listSchema, defData;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, listviewId = props.listviewId, display = props.display, _a = props.$schema, $schema = _a === void 0 ? {} : _a;
+                    defaultFormFactor = props.formFactor, appId = props.appId, objectApiName = props.objectApiName, listviewId = props.listviewId, display = props.display, _a = props.$schema, $schema = _a === void 0 ? {} : _a, listName = props.listName;
                     if (display)
                         Router$1.setTabDisplayAs(objectApiName, display);
                     displayAs = (defaultFormFactor === 'SMALL') ? 'grid' : display ? display : Router$1.getTabDisplayAs(objectApiName);
@@ -13212,7 +13245,8 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                         "formFactor": formFactor,
                         "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 sm:m-3 sm:mb-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
                     };
-                    defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, listName: listviewId, appId: appId, formFactor: formFactor, displayAs: displayAs });
+                    defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, listName: listName || listviewId, appId: appId, formFactor: formFactor, displayAs: displayAs });
+                    // console.log("defData====>", defData)
                     return [2 /*return*/, {
                             type: 'service',
                             data: defData,
@@ -13235,11 +13269,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     }); };
 
     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);
@@ -13276,7 +13310,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                         "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,