@steedos-widgets/amis-lib 6.10.24 → 6.10.26

package/dist/index.esm.js

@@ -3622,7 +3622,7 @@ function getBatchDelete(objectName){
 const DEFAULT_CALENDAR_OPTIONS = {
   startDateExpr: "start",
   endDateExpr: "end",
-  allDayExpr: "is_all_day",
+  // allDayExpr: "is_all_day",
   textExpr: "name"
 };
 
@@ -3760,7 +3760,8 @@ async function getCalendarApi(mainObject, fields, options) {
         start: n["${calendarOptions.startDateExpr}"],
         end: n["${calendarOptions.endDateExpr}"],
         allDay: n["${calendarOptions.allDayExpr}"],
-        extendedProps: n
+        extendedProps: n,
+        resourceId: n["${calendarOptions.groups?.[0]}"]
       }
     });
     const successCallback = selfData.successCallback;
@@ -3807,7 +3808,7 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
   };
   const saveDataTpl = `
     const formData = api.data.$;
-    const objectName = ${object.name}};
+    const objectName = "${object.name}";
     let query = \`mutation{record: \${objectName}__update(id: "\${formData.${idFieldName}}", doc: {__saveData}){${idFieldName}}}\`;
     delete formData.${idFieldName};
     let __saveData = JSON.stringify(JSON.stringify(formData));
@@ -3838,6 +3839,81 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
   };
 }
 
+
+function getCalendarResourcesApi(objectSchema, calendarOptions) {
+  const { groups, resources } = calendarOptions;
+  const { color, filters } = resources || {};
+  const groupFieldName = groups[0];
+  const groupField = objectSchema.fields[groupFieldName];
+  let groupObjectName = groupField?.reference_to;
+  if (!groupObjectName){
+    return {};
+  }
+  const fetchFields = [objectSchema.NAME_FIELD_KEY || 'name'];
+  if (color) {
+    fetchFields.push(color);
+  }
+  return {
+    url: `/api/v1/${groupObjectName}?fields=${JSON.stringify(fetchFields)}&filters=${JSON.stringify(filters || [])}`,
+    adaptor: function (payload, response, api, context) {
+      const items = payload?.data?.items || [];
+      const resources = items.map(item => ({
+        id: item._id,
+        title: item.name,
+        eventColor: item.color
+      }));
+      context.successCallback(resources);
+      return payload;
+    }
+  }
+}
+
+async function getEventClickActions(options) {
+  const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+  let recordId = "${event.id}";
+  const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+    "recordId": recordId,
+    "data": {
+      ...recordPage.schema.data,
+      "_inDrawer": true,  // 用于判断是否在抽屉中
+      "recordLoaded": false, // 重置数据加载状态
+      "objectName": options.objectName,
+    }
+  }) : {
+    "type": "steedos-record-detail",
+    "objectApiName": options.objectName,
+    "recordId": recordId,
+    "showBackButton": false,
+    "showButtons": true,
+    "data": {
+      "_inDrawer": true,  // 用于判断是否在抽屉中
+      "recordLoaded": false, // 重置数据加载状态
+    }
+  };
+  return [
+    {
+      "actionType": "drawer",
+      "drawer": {
+        "type": "drawer",
+        "title": " ",
+        "headerClassName": "hidden",
+        "size": "lg",
+        "width": window.drawerWidth || "70%",
+        "bodyClassName": "p-0 m-0 bg-gray-100",
+        "closeOnEsc": true,
+        "closeOnOutside": true,
+        "resizable": true,
+        "actions": [],
+        "body": [
+          drawerRecordDetailSchema
+        ],
+        "className": "steedos-record-detail-drawer app-popover"
+      },
+      "preventDefault": true
+    }
+  ]
+}
+
 /**
  * 列表视图Calendar amisSchema
  * @param {*} objectSchema 对象UISchema
@@ -3857,6 +3933,11 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     calendarOptions.allDayExpr,
     calendarOptions.textExpr
   ];
+  const groups = calendarOptions.groups;
+  const groupFieldName = groups?.[0];
+  if (groupFieldName) {
+    titleFields.push(groupFieldName);
+  }
   let fields = [];
   each(titleFields, function (n) {
     if (objectSchema.fields[n]) {
@@ -3920,9 +4001,10 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     doc["${calendarOptions.endDateExpr}"] = data.end;
     doc["${calendarOptions.allDayExpr}"] = data.allDay;
     doc["${calendarOptions.textExpr}"] = data.title;
+    if (data.resource) {
+      doc["${groupFieldName}"] = data.resource.id;
+    }
     // ObjectForm会认作用域下的变量值
-    // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
-    // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
     const title = "${i18next__default.t('frontend_form_new')} ${objectSchema.label}";
     doAction(
       {
@@ -3959,39 +4041,6 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
       });
   `;
 
-  const onEventClickScript = `
-    const data = event.data;
-    const eventData = data.event;
-    const appId = data.appId;
-    const objectName = data.objectName;
-    const eventId = data.event && data.event.id;
-    doAction({
-      "actionType": "link",
-      "args": {
-        "link": "/app/" + appId + "/" + objectName + "/view/" + eventId
-      }
-    });
-    // doAction({
-    //   "actionType": "dialog",
-    //   "dialog": {
-    //     "type": "dialog",
-    //     "title": "",
-    //     "body": [
-    //       {
-    //         "type": "steedos-record-detail",
-    //         "objectApiName": "\${objectName}",
-    //         "recordId": data.event && data.event.id
-    //       }
-    //     ],
-    //     "closeOnEsc": false,
-    //     "closeOnOutside": false,
-    //     "showCloseButton": true,
-    //     "size": "lg",
-    //     "actions": []
-    //   }
-    // });
-  `;
-
   const recordId = "${event.id}";
   const recordPermissionsApi = getCalendarRecordPermissionsApi(objectSchema, recordId);
   const recordSaveApi = getCalendarRecordSaveApi(objectSchema, calendarOptions);
@@ -4008,6 +4057,21 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     businessHours.endTime = `${calendarOptions.endDayHour}:00`;
   }
 
+  const moreEvents = {};
+  if (groupFieldName) {
+    moreEvents.getRresources = {
+      "weight": 0,
+      "actions": [
+        {
+          "actionType": "ajax",
+          "args": {
+            "api": getCalendarResourcesApi(objectSchema, calendarOptions)
+          }
+        }
+      ]
+    };
+  }
+
   // api.trackExpression="\\\${additionalFilters}";
   const onEvent = {
     "getEvents": {
@@ -4052,19 +4116,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     },
     "eventClick": {
       "weight": 0,
-      "actions": [
-        {
-          "actionType": "custom",
-          "script": onEventClickScript
-        },
-        // amis 升级到 3.2后，以下的"actionType": "link"方式拿不到appId和objectName了
-        // {
-        //   "actionType": "link",
-        //   "args": {
-        //     "link": "/app/${appId}/${objectName}/view/${event.id}"
-        //   }
-        // }
-      ]
+      "actions": await getEventClickActions({objectName: objectSchema.name, appId: options.appId, formFactor: options.formFactor})
     },
     "eventAdd": {
       "weight": 0,
@@ -4103,7 +4155,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
             "api": recordSaveApi,
             "messages": {
               "success": objectSchema.label + i18next__default.t('frontend_message_modification_successful'),
-              "failed": objectSchema.label + i18next__default.t('frontend_message_modification_successful')
+              // "failed": objectSchema.label + i18next.t('frontend_message_modification_failed') //不可以设置请求失败错误信息，否则上面接收适配器中返回的错误信息不会显示
             }
           }
         }
@@ -4146,7 +4198,8 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
           "actionType": "setValue",
         }
       ]
-    }
+    },
+    ...moreEvents
   };
 
   Object.assign(onEvent, options.onEvent);
@@ -4178,6 +4231,25 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     }
   }
 
+  if (!___default.isEmpty(calendarOptions.groups)) {
+    const headerToolbarViews = "prev,next today resourceTimelineMonth,resourceTimelineWeek,resourceTimelineDay,listWeek";
+    const groupField = objectSchema.fields[groupFieldName];
+    let groupObjectName = groupField?.reference_to;
+    let groupHeaderTitle = "资源";
+    if (groupObjectName){
+      const groupObjectConfig = getUISchemaSync(groupObjectName);
+      groupHeaderTitle = groupObjectConfig?.label || groupHeaderTitle;
+    }
+    Object.assign(config, {
+      // "height": "auto",
+      initialView: 'resourceTimelineWeek',
+      resourceAreaHeaderContent: groupHeaderTitle,
+      "headerToolbar": {
+        "right": headerToolbarViews
+      }
+    });
+  }
+
   const amisSchema = {
     "type": "steedos-fullcalendar",
     "label": "",
@@ -7541,7 +7613,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
               "actions": [
                 {
                   "actionType": "custom",
-                  "script": "const data = event.data; window.open(`/app/${data.app_id}/${data.objectName}/view/${data.recordId}?side_object=${data.side_object}&side_listview_id=${data.side_listview_id}`)"
+                  "script": "const data = event.data; window.open(`/app/${data.app_id || '-'}/${data.objectName}/view/${data.recordId}?side_object=${data.side_object}&side_listview_id=${data.side_listview_id}`)"
                 }
               ]
           }
@@ -10330,7 +10402,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-06-17 20:18:18
+ * @LastEditTime: 2025-12-02 15:56:17
  * @Description:
  */
 
@@ -10529,6 +10601,80 @@ async function getFormSchema(objectName, ctx) {
     };
 }
 
+/**
+ * 合并 calendar_ 开头的属性与 options 属性，以 options 属性为优先。
+ * @param {object} listView 列表视图配置对象
+ * @returns {object} 合并后的日历配置选项
+ */
+function getCalendarOptions(listView) {
+    const calendarDefaults = {};
+
+    if (listView.calendar_start_field) {
+        calendarDefaults.startDateExpr = listView.calendar_start_field;
+    }
+    if (listView.calendar_end_field) {
+        calendarDefaults.endDateExpr = listView.calendar_end_field;
+    }
+    if (listView.calendar_all_day_field) {
+        calendarDefaults.allDayExpr = listView.calendar_all_day_field;
+    }
+    if (listView.calendar_text_field) {
+        calendarDefaults.textExpr = listView.calendar_text_field;
+    }
+
+    if (listView.calendar_current_view) {
+        calendarDefaults.currentView = listView.calendar_current_view;
+    }
+    // if (listView.calendar_views) {
+    //     calendarDefaults.views = listView.calendar_views;
+    // }
+
+    if (listView.calendar_group_field) {
+        calendarDefaults.groups = [listView.calendar_group_field];
+    }
+
+    const resourceDefaults = {};
+    if (listView.calendar_resource_color_field) {
+        resourceDefaults.color = listView.calendar_resource_color_field;
+    }
+    if (listView.calendar_resource_filters) {
+        resourceDefaults.filters = listView.calendar_resource_filters;
+    }
+    if (listView.calendar_resource_sort) {
+        resourceDefaults.sort = listView.calendar_resource_sort;
+    }
+
+    if (Object.keys(resourceDefaults).length > 0) {
+        calendarDefaults.resources = resourceDefaults;
+    }
+
+    // 第一次合并：将 calendarDefaults 作为默认值，listView.options 作为高优先级配置
+    let mergedOptions = {
+        ...calendarDefaults,
+        ...listView.options
+    };
+
+    // 第二次合并：深度合并 'resources' 属性（如果两者都有定义）
+    // 确保 options 内部的 resources 属性优先于 calendar_resource_... 属性
+    const defaultResources = calendarDefaults.resources;
+    const optionResources = listView.options?.resources;
+    
+    if (defaultResources && optionResources) {
+        mergedOptions.resources = {
+            ...defaultResources, // 默认的资源属性（如 color）
+            ...optionResources   // options中指定的资源属性（如 sort）
+        };
+    }
+
+    if (listView.type !== "timeline") {
+        // 只有资源视图才显示分资源分组的模式
+        delete mergedOptions.groups;
+        delete mergedOptions.resources;
+    }
+    
+    return mergedOptions;
+}
+
 // 获取只读页面 recordId 已废弃, 函数签名保持不变, 但recordId变量不可再使用, 请使用运行时的${recordId}
 async function getViewSchema(objectName, recordId, ctx) {
     const uiSchema = await getUISchema(objectName);
@@ -10583,14 +10729,15 @@ async function getListSchema(
     let listviewFilter = getListViewFilter(listView);
     let listview_filters = listView && listView._filters;
     // 返回 calendar 组件
-    if(listView.type === "calendar"){
+    if(listView.type === "calendar" || listView.type === "timeline"){
+        const calendarOptions = getCalendarOptions(listView);
         const amisSchema = {
             "type": "steedos-object-calendar",
             "objectApiName": objectName,
             "filters": listviewFilter,
             "filtersFunction": listview_filters,
             "sort": sort,
-            ...listView.options
+            ...calendarOptions
         };
         return {
             uiSchema,
@@ -18366,7 +18513,7 @@ const getTdField = async (field, fieldsCount) => {
 };
 
 const getTdTitle = (field) => {
-  const requiredOn = field.config?.amis.requiredOn;
+  const requiredOn = field.config?.amis?.requiredOn;
   // console.log('getTdTitle', field.is_required , requiredOn, field);
   return {
     className: `td-title td-title-${field.type}`,