@steedos-widgets/amis-lib 1.3.2-beta.5 → 1.3.3

package/dist/index.esm.js

@@ -5319,12 +5319,22 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     // return [
     //   "load-more",
     // ]
-    return [
-      {
-        "type": "pagination",
-        "maxButtons": 5
-      }
-    ]
+    if(options.displayAs === 'split'){
+      return [
+        "switch-per-page",
+        {
+          "type": "pagination",
+          "maxButtons": 5
+        }
+      ]
+    }else {
+      return [
+        {
+          "type": "pagination",
+          "maxButtons": 5
+        }
+      ]
+    }
   }
   else {
     if(options && options.isRelated){
@@ -5950,8 +5960,13 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
     let pickerSchema = null;
     {
+        let labelFieldName = refObjectConfig.NAME_FIELD_KEY || 'name';
+        // organizations 对象的历史遗留问题, fullname 被标记为了 名称字段. 在此处特殊处理.
+        if(refObjectConfig.name === 'organizations'){
+          labelFieldName = 'name';
+        }
         pickerSchema = await getTableSchema$1(tableFields, {
-            labelFieldName: refObjectConfig.NAME_FIELD_KEY,
+            labelFieldName,
             top:  top,
             isLookup: true,
             ...ctx
@@ -5996,12 +6011,12 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         pickerSchema.onEvent[`@data.changed.${refObjectConfig.name}`] = {
             "actions": [
-              {
-                "actionType": "reload"
-              },
-              {
-                "actionType": "custom",
-                "script": `
+                {
+                    "actionType": "reload"
+                },
+                {
+                    "actionType": "custom",
+                    "script": `
                     const masterRecord = event.data._master && event.data._master.record;
                     const fieldConfig = ${JSON.stringify(field)};
                     let reference_to = fieldConfig.reference_to;
@@ -6050,9 +6065,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
                         }
                     });
                 `
-              }
+                }
             ]
-          };
+        };
     }
 
     if(field.pickerSchema){
@@ -6324,7 +6339,9 @@ async function lookupToAmis(field, readonly, ctx){
     }
 
     if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
-        ctx.onlyDisplayLookLabel = true;
+        ctx = Object.assign({}, ctx, {
+            onlyDisplayLookLabel: true
+        });
         if(ctx.idsDependOn){
             // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
@@ -7839,7 +7856,9 @@ async function getTableColumns(fields, options){
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
         if(field.wrap != true){
-            className += " whitespace-nowrap";
+            className += " whitespace-nowrap ";
+        }else {
+            className += " break-all ";
         }
         let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
@@ -7967,7 +7986,8 @@ async function getTableColumns(fields, options){
         }
     }
     // columns.push(getOperation(fields));
-    if(!_$1.some(columns, { name: options.labelFieldName })){
+    if(!options.isLookup && !_$1.some(columns, { name: options.labelFieldName })){
+        // 没有名称字段时显示序号字段为链接，lookup弹出的picker不需要此功能
         const href = Router.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
@@ -8066,7 +8086,9 @@ async function getMobileTableColumns(fields, options){
         let tpl = "";
         if(field.is_name || field.name === options.labelFieldName){
             nameField = field;
-            options.onlyDisplayLookLabel = true;
+            options = Object.assign({}, options, {
+                onlyDisplayLookLabel: true
+            });
             tpl = await getFieldTpl(field, options);
         }
         else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
@@ -8075,7 +8097,9 @@ async function getMobileTableColumns(fields, options){
         }
         else {
             if(field.type === 'lookup' || field.type === 'master_detail'){
-                options.onlyDisplayLookLabel = true;
+                options = Object.assign({}, options, {
+                    onlyDisplayLookLabel: true
+                });
             }
             tpl = await getFieldTpl(field, options);
         }
@@ -9595,7 +9619,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-26 16:02:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-05 15:42:26
+ * @LastEditTime: 2023-09-15 15:36:17
  * @Description: 
  */
 
@@ -9685,6 +9709,25 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
   if (sectionFieldsVisibleOn.length > 0 && fieldSetBody.length === sectionFieldsVisibleOn.length) {
     section.visibleOn = `${sectionFieldsVisibleOn.join(" || ")}`;
   }
+
+  const fieldGroups = ctx.fieldGroups;
+  const group = fieldGroups && fieldGroups.find(function(groupItem){
+    return groupItem.group_name == sectionName;
+  });
+  let groupVisibleOn = group && group.visible_on;
+  if (groupVisibleOn) {
+    if (groupVisibleOn.startsWith("{{")) {
+      groupVisibleOn = `${groupVisibleOn.substring(2, groupVisibleOn.length - 2).replace(/formData./g, 'data.')}`;
+    } else {
+      groupVisibleOn = `${groupVisibleOn.replace(/formData./g, 'data.')}`;
+    }
+    if (section.visibleOn) {
+      section.visibleOn = `${section.visibleOn + " && " + groupVisibleOn}`;
+    }
+    else {
+      section.visibleOn = groupVisibleOn;
+    }
+  }
   return section
 };
 
@@ -10077,7 +10120,7 @@ async function getObjectForm(objectSchema, ctx){
         submitText: "", // amis 表单不显示提交按钮, 表单提交由项目代码接管
         api: await getSaveApi(objectSchema, recordId, fields, ctx),
         initFetch: recordId != 'new',
-        body: await getFormBody(fields, formFields, ctx),
+        body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
         bodyClassName: 'p-0',
         className: 'steedos-amis-form',
@@ -10152,7 +10195,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                 "formData": "$$"
               },
               wrapWithPanel: false, 
-              body: await getFormBody(map(fields, (field)=>{field.readonly = true; return field;}), map(formFields, (field)=>{field.readonly = true; return field;}), Object.assign({}, ctx, {showSystemFields: true})),
+              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})),
               className: 'steedos-amis-form bg-white',
               actions: [], // 不显示表单默认的提交按钮
               onEvent: {
@@ -10638,7 +10681,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-14 11:34:23
+ * @LastEditTime: 2023-09-14 13:57:32
  * @Description:
  */
 
@@ -11000,6 +11043,7 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                 else if(ctx.extra){
                     // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
                     fields.push({
+                        extra: true,
                         name: column
                     });
                 }
@@ -11031,6 +11075,13 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                         })
                     );
                 }
+                else if(ctx.extra){
+                    // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
+                    fields.push({
+                        extra: true,
+                        name: column.field
+                    });
+                }
             }
         }
     }