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

package/dist/amis-object.cjs.css

@@ -689,6 +689,9 @@ fieldset.antd-Collapse > legend{
 .whitespace-nowrap {
     white-space: nowrap
 }
+.break-all {
+    word-break: break-all
+}
 .rounded {
     border-radius: 0.25rem
 }
@@ -1426,6 +1429,9 @@ fieldset.antd-Collapse > legend{
   .steedos-object-form .steedos-markdown .antd-Tabs-pane.is-active {
     display: block;
   }
+  .antd-Select-popover .antd-Select-menu .antd-Select-option .antd-Checkbox--checkbox > span {
+    vertical-align: text-top;
+  }
 }
 
 @media (max-width: 767px) {

package/dist/amis-object.cjs.js

@@ -8488,12 +8488,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){
@@ -9119,8 +9129,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
@@ -9165,12 +9180,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;
@@ -9219,9 +9234,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
                         }
                     });
                 `
-              }
+                }
             ]
-          };
+        };
     }
 
     if(field.pickerSchema){
@@ -9493,7 +9508,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);
@@ -11008,7 +11025,9 @@ async function getTableColumns$1(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'){
@@ -11136,7 +11155,8 @@ async function getTableColumns$1(fields, options){
         }
     }
     // columns.push(getOperation(fields));
-    if(!_$1__namespace.some(columns, { name: options.labelFieldName })){
+    if(!options.isLookup && !_$1__namespace.some(columns, { name: options.labelFieldName })){
+        // 没有名称字段时显示序号字段为链接，lookup弹出的picker不需要此功能
         const href = Router$1.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
@@ -11235,7 +11255,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'){
@@ -11244,7 +11266,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);
         }
@@ -12764,7 +12788,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: 
  */
 
@@ -12854,6 +12878,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
 };
 
@@ -13246,7 +13289,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',
@@ -13321,7 +13364,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                 "formData": "$$"
               },
               wrapWithPanel: false, 
-              body: await getFormBody(_$1.map(fields, (field)=>{field.readonly = true; return field;}), _$1.map(formFields, (field)=>{field.readonly = true; return field;}), Object.assign({}, ctx, {showSystemFields: true})),
+              body: await getFormBody(_$1.map(fields, (field)=>{field.readonly = true; return field;}), _$1.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: {
@@ -13807,7 +13850,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:
  */
 
@@ -14169,6 +14212,7 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                 else if(ctx.extra){
                     // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
                     fields.push({
+                        extra: true,
                         name: column
                     });
                 }
@@ -14200,6 +14244,13 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                         })
                     );
                 }
+                else if(ctx.extra){
+                    // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
+                    fields.push({
+                        extra: true,
+                        name: column.field
+                    });
+                }
             }
         }
     }
@@ -18372,8 +18423,8 @@ var AmisProvider = function (props) { return __awaiter(void 0, void 0, void 0, f
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-01 14:44:57
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-08 15:05:32
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-09-19 11:12:17
  * @Description:
  */
 var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
@@ -18596,10 +18647,8 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                                 "click": {
                                                     "actions": [
                                                         {
-                                                            "actionType": "link",
-                                                            "args": {
-                                                                "link": "${path}"
-                                                            }
+                                                            "actionType": "custom",
+                                                            "script": "\nconst path = context.props.data.path;\ndoAction({\n  actionType: 'url',\n  args: {\n    \"url\": path,\n    \"blank\": false\n  }\n});"
                                                         },
                                                         {
                                                             "actionType": "broadcast",
@@ -19822,7 +19871,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                     Router$1.setTabDisplayAs(objectApiName, _display);
                 }
                 recordSchema = {};
-                return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor })];
+                return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor || data.formFactor })];
             case 1:
                 recordPage = _a.sent();
                 recordSchema = recordPage ? recordPage.schema : {