@steedos-widgets/amis-lib 3.6.14 → 6.3.0-beta.10

package/dist/index.esm.js

@@ -570,10 +570,23 @@ function getNameTpl(field, ctx){
     if(ctx && ctx.isLookup){
         linkTarget = "target='_blank'";
     }
+    let nameLabel = field.name;
+    //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
+    if (field.type == "lookup") {
+        if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
+            if(!field.isTableField){
+                nameLabel = `\${${field.name}__label}`;
+            }
+        } else {
+            nameLabel = `\${_display.${field.name}.label}`;
+        }
+    } else {
+        nameLabel = `\${_display.${field.name} || ${field.name}}`;
+    }
     if(ctx.isRelated && window.innerWidth >= 768){
-        return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+        return `<a href="${href}" ${linkTarget} onclick="return false;">\${${nameLabel} | raw}</a>`
     }else {
-        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+        return `<a href="${href}" ${linkTarget}>\${${nameLabel} | raw}</a>`
     }
 }
 
@@ -698,7 +711,7 @@ function getLocationTpl(field){
 }
 
 async function getFieldTpl (field, options){
-    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
+    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel && field.multiple !== true){
         return getNameTpl(field, options)
     }
     switch (field.type) {
@@ -2319,7 +2332,7 @@ async function getTableColumns(object, fields, options){
                                   "title": "&nbsp;",
                                   "headerClassName": "hidden",
                                   "size": "lg",
-                                  "bodyClassName": "p-0 m-0",
+                                  "bodyClassName": "p-0 m-0 bg-gray-100",
                                   "closeOnEsc": true,
                                   "closeOnOutside": true,
                                   "resizable": true,
@@ -3255,6 +3268,19 @@ function getReadonlyFormAdaptor(object, fields, options){
     // })
 
     var fieldNames = _$1.map(fields, function(n){return n.name});
+    var nameField = object.fields[object.NAME_FIELD_KEY];
+    let nameLabel = nameField && nameField.name;
+    if (nameField && nameField.type == "lookup") {
+        if(!nameField.reference_to && (nameField.optionsFunction || nameField._optionsFunction || nameField.options)){
+            if(!nameField.isTableField){
+                nameLabel = `record.${nameField.name}__label`;
+            }
+        } else {
+            nameLabel = `record._display.${nameField.name}.label`;
+        }
+    } else if (nameField){
+        nameLabel = `record._display.${nameField.name} || record.${nameField.name}`;
+    }
     return  `
     if(payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
@@ -3296,8 +3322,7 @@ function getReadonlyFormAdaptor(object, fields, options){
         payload.data = data;
         payload.data.__objectName = "${object.name}";
         payload.data.record = record;
-
-        payload.data.NAME_FIELD_VALUE = record.${object.NAME_FIELD_KEY || 'name'};
+        payload.data.NAME_FIELD_VALUE = ${nameLabel} || record.name;
         payload.data._master = {
             record: record,
             objectName: "${object.name}",
@@ -4764,7 +4789,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                             type: 'button',
                                             actionType: 'confirm',
                                             label: i18next.t('frontend_form_save'),
-                                            primary: true
+                                            primary: true,
+                                            close: `object_actions_drawer_${uiSchema.name}`
                                         },
                                     ]
                                 }
@@ -4883,6 +4909,20 @@ const getSchema$4 = async (uiSchema, ctx) => {
                       ]
                     }
                   },
+                  "actions": [
+                    {
+                        type: 'button',
+                        actionType: 'cancel',
+                        label: i18next.t('frontend_form_cancel')
+                    },
+                    {
+                        type: 'button',
+                        actionType: 'confirm',
+                        label: i18next.t('frontend_form_save'),
+                        primary: true,
+                        close: `object_actions_drawer_${uiSchema.name}`
+                    },
+                  ]
                 },
               },
             ],
@@ -4964,7 +5004,8 @@ const getSchema$3 = (uiSchema)=>{
                             }
                           ]
                     }
-                }
+                },
+                "close": `object_actions_drawer_${uiSchema.name}`
             }
         ],
         "regions": [
@@ -8899,10 +8940,6 @@ async function getObjectCRUD(objectSchema, fields, options){
             }
         }
       `;
-      let autoFillHeight = true;
-      if(options.isRelated || window.innerWidth < 768){
-        autoFillHeight = false;
-      }
 
       body = Object.assign({}, table, {
         type: 'crud', 
@@ -8913,7 +8950,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight,
+        // autoFillHeight,//autoFillHeight按amis规范默认为false，需要配置此属性时在各个组件层配置，比如列表视图组件那边传入此属性为true
         className: `flex-auto ${crudClassName || ""}`,
         // 这里不可以用动态className，因为它会把样式类加到.antd-Crud和.antd-Table.antd-Crud-body这两层div中，而子表列表中crudClassName中有hidden样式类会造成所有子表都不显示的bug
         // className: {
@@ -9086,6 +9123,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;
+    //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
+    if (typeof ctx.enableTabs !== 'boolean') {
+      ctx.enableTabs = objectSchema.enable_form_tabs;
+    }
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const formSchema =  defaults && defaults.formSchema || {};
@@ -9179,7 +9220,7 @@ async function getObjectForm(objectSchema, ctx){
 
 async function getObjectDetail(objectSchema, recordId, ctx){
     const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, 
-      formDataFilter, onFormDataFilter, amisData, env } = ctx;
+      formDataFilter, onFormDataFilter, amisData, env, enableInitApi } = ctx;
     const fields = ___default.values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const serviceId = `service_detail_page`;
@@ -9246,6 +9287,16 @@ async function getObjectDetail(objectSchema, recordId, ctx){
         // }
     };
 
+    if(enableInitApi){
+      amisSchema.api = await getReadonlyFormInitApi(objectSchema, recordId, fields, ctx);
+      // 开启初始化api请求时，如果不把recordLoaded默认设置为false，recordLoaded值会取RecordServic组件中的recordLoaded值
+      // 这会造成表单内steedos field组件lookup字段中props.data取到的是RecordServic组件
+      amisSchema.data = {
+        ...amisSchema.data,
+        recordLoaded: false
+      };
+    }
+
     amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
     // console.log('getObjectDetail=====>', amisSchema);
     return amisSchema;
@@ -9737,7 +9788,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-02-23 16:37:06
+ * @LastEditTime: 2024-04-26 16:46:44
  * @Description:
  */
 
@@ -10002,37 +10053,44 @@ async function getListSchema(
      * 本次存储代码段
      */
     try {
-      const listViewPropsStoreKey = location.pathname + "/crud";
-      let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
-      /**
-       * localListViewProps规范来自crud请求api中api.data.$self参数值的。
-       * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
-       * __searchable__...:顶部放大镜搜索条件
-       * filter:右侧过滤器
-       * perPage:每页条数
-       * page:当前页码
-       * orderBy:排序字段
-       * orderDir:排序方向
-       */
-      if (localListViewProps) {
-        localListViewProps = JSON.parse(localListViewProps);
-        // localListViewProps.perPage = 3;
-        let listSchema = {};
-        if(localListViewProps.orderBy){
-            listSchema.orderBy = localListViewProps.orderBy;
-        }
-        if(localListViewProps.orderDir){
-            listSchema.orderDir = localListViewProps.orderDir;
-        }
+        const listViewPropsStoreKey = location.pathname + "/crud";
+        let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+        /**
+         * localListViewProps规范来自crud请求api中api.data.$self参数值的。
+         * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
+         * __searchable__...:顶部放大镜搜索条件
+         * filter:右侧过滤器
+         * perPage:每页条数
+         * page:当前页码
+         * orderBy:排序字段
+         * orderDir:排序方向
+         */
+        if (localListViewProps) {
+            localListViewProps = JSON.parse(localListViewProps);
+            // localListViewProps.perPage = 3;
+            let listSchema = {};
+            if (localListViewProps.orderBy) {
+                listSchema.orderBy = localListViewProps.orderBy;
+            }
+            if (localListViewProps.orderDir) {
+                listSchema.orderDir = localListViewProps.orderDir;
+            }
 
-        if(localListViewProps.perPage){
-            listSchema.perPage = localListViewProps.perPage;
+            if (localListViewProps.perPage) {
+                listSchema.perPage = localListViewProps.perPage;
+            }
+            defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
         }
-        defaults.listSchema = defaultsDeep$1({}, listSchema, defaults.listSchema || {});
-      }
     }
     catch (ex) {
-      console.error("本地存储中crud参数解析异常：", ex);
+        console.error("本地存储中crud参数解析异常：", ex);
+    }
+
+    if (window.innerWidth > 768) {
+        // 列表视图组件PC端高度自动计算实现满屏效果，手机端不需要满屏效果，所以不用autofillheight，且允许重写微页面中重新组件autoFillHeight属性
+        defaults.listSchema = defaultsDeep$1({}, defaults.listSchema || {}, {
+            autoFillHeight: true
+        });
     }
 
     ctx.defaults = defaults;
@@ -10082,15 +10140,15 @@ async function getListSchema(
 async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
     let fields = [];
     for (const column of columns) {
+        let columnField, fieldName, displayName, filedInfo, rfUiSchema, rfFieldInfo;
         if (isString(column)) {
-            let columnField;
             if (column.indexOf('.') > 0) {
-                const fieldName = column.split('.')[0];
-                const displayName = column.split('.')[1];
-                const filedInfo = uiSchema.fields[fieldName];
+                fieldName = column.split('.')[0];
+                displayName = column.split('.')[1];
+                filedInfo = uiSchema.fields[fieldName];
                 if (filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to)) {
-                    const rfUiSchema = await getUISchema(filedInfo.reference_to);
-                    const rfFieldInfo = rfUiSchema.fields[displayName];
+                    rfUiSchema = await getUISchema(filedInfo.reference_to);
+                    rfFieldInfo = rfUiSchema.fields[displayName];
                     columnField = Object.assign({}, rfFieldInfo, { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } }, ctx);
                 }else if(filedInfo && filedInfo.type === 'object'){
                     columnField = uiSchema.fields[column];
@@ -10114,14 +10172,13 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
             }
 
         } else if (isObject$1(column)) {
-            let columnField;
             if (column.field.indexOf('.') > 0) {
-                const fieldName = column.field.split('.')[0];
-                const displayName = column.field.split('.')[1];
-                const filedInfo = uiSchema.fields[fieldName];
+                fieldName = column.field.split('.')[0];
+                displayName = column.field.split('.')[1];
+                filedInfo = uiSchema.fields[fieldName];
                 if (filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to)) {
-                    const rfUiSchema = await getUISchema(filedInfo.reference_to);
-                    const rfFieldInfo = rfUiSchema.fields[displayName];
+                    rfUiSchema = await getUISchema(filedInfo.reference_to);
+                    rfFieldInfo = rfUiSchema.fields[displayName];
                     columnField = Object.assign({}, rfFieldInfo, ctx,
                         { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } },
                         {
@@ -10129,6 +10186,8 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                             wrap: column.wrap // wrap = true 是没效果的
                         }
                     );
+                } else if (filedInfo && filedInfo.type === 'object') {
+                    columnField = uiSchema.fields[column.field];
                 }
             } else {
                 if (uiSchema.fields[column.field]) {
@@ -10263,7 +10322,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 mt-2",
+        "className": "steedos-record-tabs bg-white p-4 m-2 border rounded",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -10339,6 +10398,10 @@ async function getRecordServiceSchema(objectName, appId, props = {}, body) {
                 data: {
                     "_master.objectName": "${objectName}",
                     "_master.recordId": "${recordId}",
+                    // 微页面设计器中用RecordServic组件包裹一个ObjectForm只读组件时，如果这里不把recordLoaded默认设置为false
+                    // recordLoaded值会取父作用域中已经被设置为true的值（比如父级有RecordServic组件，在加载完数据后，父作用域中recordLoaded值为true)
+                    // 这会造成表单内steedos field组件lookup字段中props.data取到的是父作用域中的数据
+                    "recordLoaded": false,
                     ...(props.data || {})
                 },
                 "style": {
@@ -11227,7 +11290,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     });
 
     // 把自动填充规则中依赖的字段也加到api请求中
-    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    let autoFillMapping = field.auto_fill_mapping;
     if (autoFillMapping && autoFillMapping.length) {
         autoFillMapping.forEach(function (item) {
             if(!_$1.find(tableFields, function(f){
@@ -11377,7 +11440,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }
@@ -11699,7 +11762,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         ];
 
         // 把自动填充规则中依赖的字段也加到api请求中
-        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        let autoFillMapping = field.auto_fill_mapping;
         if (autoFillMapping && autoFillMapping.length) {
             autoFillMapping.forEach(function (item) {
                 queryFields.push(refObjectConfig.fields[item.from]);
@@ -11794,7 +11857,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
                     // 如果当前元素不是数组，则处理该元素
                     // 下面正则用于匹配amis公式\${}
                     if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
-                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$self);
                     }
                 }
             }
@@ -11941,14 +12004,25 @@ async function getApi(object, recordId, fields, options){
 }
 
 async function getAutoFill(field, refObject) {
-    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    let autoFillMapping = field.auto_fill_mapping;
     if (autoFillMapping && autoFillMapping.length) {
         let fillMapping = {};
+        if (field.multiple) {
+            autoFillMapping.forEach(function (item) {
+                //from的字段类型为lookup、master_detail、select时，需要保留数组格式；其他类型需要转变为字符串格式
+                if (_$1.includes(["lookup","master_detail","select"], refObject.fields[item.from].type)) {
+                    fillMapping[item.to] = `\${items | pick:${item.from}}`;
+                } else {
+                    fillMapping[item.to] = `\${items | pick:${item.from} | join}`;
+                }
+            });
+        }else {
+            autoFillMapping.forEach(function (item) {
+                fillMapping[item.to] = `\${${item.from}}`;
+            });
+        }
         // let fieldsForApi = [];
-        autoFillMapping.forEach(function (item) {
-            fillMapping[item.to] = `\${${item.from}}`;
-            // fieldsForApi.push(item.from);
-        });
+        // fieldsForApi.push(item.from);
         // let api = {
         //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
         //     "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
@@ -12050,7 +12124,7 @@ async function lookupToAmis(field, readonly, ctx){
             amisSchema = _$1.defaultsDeep({}, pageAmisSchema, amisSchema);
         }
     }
-    const autoFill = await getAutoFill(field);
+    const autoFill = await getAutoFill(field, refObject);
     if(autoFill){
         amisSchema.autoFill = autoFill;
         // 这里不配置initAutoFill值，按amis规则initAutoFill默认值为fillIfNotSet处理--需要amis sdk 版本 > 3.6.3-patch.6（不包括）版本