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

package/dist/index.umd.js

@@ -832,7 +832,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));
@@ -5428,6 +5428,21 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             }
             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){
@@ -5439,7 +5454,13 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 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 = {