@steedos-widgets/amis-lib 6.3.1 → 6.3.3

package/dist/index.esm.js

@@ -1805,6 +1805,11 @@ async function getQuickEditSchema(object, columnField, options){
         const submitEvent = {
             submit: {
                 actions: [
+                    {
+                        "actionType": "validate",
+                        "componentId": quickEditId,
+                        "outputVar": "form_validate_result"
+                    },
                     {
                         actionType: "custom",
                         script: `
@@ -1821,10 +1826,12 @@ async function getQuickEditSchema(object, columnField, options){
                                 doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "${options.objectName}" + "_display_" + event.data._index});
                                 doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
                             }
-                        `
+                        `,
+                        expression: "${!form_validate_result.error}"
                     },
                     {
-                        "actionType": "closeDialog"
+                        "actionType": "closeDialog",
+                        expression: "${!form_validate_result.error}"
                     }
                 ]
             }
@@ -3423,7 +3430,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             nameLabel = `record._display.${nameField.name}.label`;
         }
     } else if (nameField){
-        nameLabel = `(record._display ? record._display.${nameField.name} : record.${nameField.name})`;
+        nameLabel = `(record._display && record._display.${nameField.name}) || record.${nameField.name}`;
     }
     return  `
     if(payload.data.data.length === 0){
@@ -3616,7 +3623,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
     
     return {
         method: "post",
-        url: getApi$2() + '&objectName=${objectName}' ,
+        url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
         // sendOn: "!!this.recordId",
         cache: API_CACHE,
         requestAdaptor: `
@@ -9668,9 +9675,10 @@ async function getFormSchemaWithDataFilter(form, options = {}){
 async function getObjectForm(objectSchema, ctx){
     const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
+    let enableTabs = ctx.enableTabs;
     //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
-    if (typeof ctx.enableTabs !== 'boolean') {
-      ctx.enableTabs = objectSchema.enable_form_tabs;
+    if (typeof enableTabs !== 'boolean') {
+      enableTabs = objectSchema.enable_form_tabs;
     }
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -9714,7 +9722,7 @@ async function getObjectForm(objectSchema, ctx){
         body: {
           type: 'wrapper',
           className: 'p-0 m-0',
-          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups, omitReadonlyFields: true})),
+          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups, omitReadonlyFields: true, enableTabs})),
           hiddenOn: "${editFormInited != true}",
         },
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
@@ -9769,6 +9777,11 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const serviceId = `service_detail_page`;
+    let enableTabs = ctx.enableTabs;
+    //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
+    if (typeof enableTabs !== 'boolean') {
+      enableTabs = objectSchema.enable_form_tabs;
+    }
     const amisSchema = {
         type: 'service',
         name: `page_readonly_${recordId}`,
@@ -9795,7 +9808,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
               body: await getFormBody(
                 map(fields, (field) => { field.readonly = true; return field; }),
                 map(formFields, (field) => { field.readonly = true; return field; }),
-                Object.assign({}, ctx, { showSystemFields: true, fieldGroups: objectSchema.field_groups })
+                Object.assign({}, ctx, { showSystemFields: true, fieldGroups: objectSchema.field_groups, enableTabs })
               ),
               className: 'steedos-amis-form bg-white',
               actions: [], // 不显示表单默认的提交按钮