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

package/dist/amis-object.cjs.js

@@ -1193,7 +1193,7 @@ function getSaveDataTpl(fields){
         ${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));
@@ -5789,6 +5789,21 @@ async function getEditFormInitApi(object, recordId, fields){
             }
             else{
                 var uiSchema = api.body.uiSchema;
+                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();
+                        }
+                    }
+                    catch(ex){
+                        console.warn(ex);
+                    }
+                }
                 var defaultData = api.body.defaultData;
                 var defaultValues = {};
                 _.each(uiSchema?.fields, function(field){
@@ -5800,7 +5815,13 @@ async function getEditFormInitApi(object, recordId, fields){
                 if(defaultData && _.isObject(defaultData) && !_.isArray(defaultData)){
                     defaultValues = Object.assign({}, defaultValues, defaultData)
                 }
-                initialValues = defaultValues;
+                if(_.isObject(initialValues)){
+                    // uiSchema.form.initialValues为函数且执行后为json，则优先取initialValues中的默认值
+                    initialValues = Object.assign({}, defaultValues, initialValues);
+                }
+                else{
+                    initialValues = defaultValues;
+                }
             }
             // data下的变量需要在保存接口（getSaveApi）中被删除。
             payload.data = {
@@ -11839,7 +11860,7 @@ var SteedosLoading = function (props) {
 };
 
 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:
@@ -11871,7 +11892,9 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 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
@@ -11883,7 +11906,9 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 }
                 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 = {};
@@ -11892,7 +11917,7 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                     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];
         }
@@ -13049,6 +13074,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 else {
+                    steedosField = field;
                     if (___default.isString(field)) {
                         steedosField = JSON.parse(field);
                     }
@@ -13182,11 +13208,11 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
 }); };
 
 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);
@@ -13214,7 +13240,8 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                     "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,