@steedos-widgets/amis-object 6.3.0-beta.15 → 6.3.0-beta.17

package/dist/amis-object.cjs.css

@@ -1293,6 +1293,9 @@ fieldset.antd-Collapse > legend{
     .sm\:sticky {
         position: sticky
     }
+    .sm\:z-10 {
+        z-index: 10
+    }
     .sm\:m-2 {
         margin: 0.5rem
     }

package/dist/amis-object.cjs.js

@@ -4337,6 +4337,29 @@ function getAmisStaticFieldType$1(type, readonly, options){
     }
 }
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-07-13 15:18:03
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-11 10:34:26
+ * @Description: 
+ */
+
+async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
+    const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
+    const page = await fetchAPI(api);
+    if (page && page.schema) {
+        page.schema = JSON.parse(page.schema);
+        if(page.schema.data){
+            delete page.schema.data.recordId;
+            delete page.schema.data.objectName;
+            delete page.schema.data.context;
+            delete page.schema.data.global;
+        }
+        return page;
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
@@ -4360,9 +4383,74 @@ const getAmisFieldType$1 = (steedosField, readonly)=>{
     return getAmisStaticFieldType$1(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
 };
 
-const getAmisFileReadonlySchema = (steedosField)=>{
+async function getLookupLinkOnClick$1(field, options) {
+    const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+
+    const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+        "recordId": "${value}",
+        "data": {
+            ...recordPage.schema.data,
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+            "objectName": options.objectName,
+        }
+    }) : {
+        "type": "steedos-record-detail",
+        "objectApiName": options.objectName,
+        "recordId": "${value}",
+        "showBackButton": false,
+        "showButtons": true,
+        "data": {
+            "_inDrawer": true,  // 用于判断是否在抽屉中
+            "recordLoaded": false, // 重置数据加载状态
+        }
+    };
+    return {
+        "click": {
+            "actions": [
+                // {
+                //     "type": "custom",
+                //     "script": `
+                //         let fileRecordId = url.match(${regFileRecordId})[2]; 
+                //         console.log('fileRecordId:',fileRecordId);
+                //         event.data.recordId = fileRecordId;
+                //     `,
+                // },
+                {
+                    "actionType": "drawer",
+                    "drawer": {
+                        "type": "drawer",
+                        "title": " ",
+                        "headerClassName": "hidden",
+                        "size": "lg",
+                        "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
+                }
+            ]
+        }
+    }
+}
+
+const  getAmisFileReadonlySchema = async (steedosField,ctx)=>{
     const type = steedosField.type;
+    const { appId, formFactor } = ctx.amisData || {};
     const amisFieldType = getAmisFieldType$1(steedosField, true);
+    
+    let lookupATagClick = 'onclick="return false;"';
+
+    if(window.innerWidth < 768){
+        lookupATagClick = "";
+    }
+
     if(_.includes(['avatar','image'], type)){
         return {
             type: amisFieldType,
@@ -4397,13 +4485,34 @@ const getAmisFileReadonlySchema = (steedosField)=>{
                 }
             }
         } : {
-            type: amisFieldType,
-            tpl: `
-                <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
-                    <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
-                    <% fileData.forEach(function(item) { %> 
-                        <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
-                <% });} %>`
+            // type: amisFieldType,
+            // tpl: `
+            //     <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
+            //         <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
+            //         <% fileData.forEach(function(item) { %> 
+            //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
+            //     <% });} %>`
+            "type": "control",
+            "body": {
+                type: 'each',
+                placeholder: "",
+                // className: `steedos-field-lookup-each flex flex-wrap gap-2`,
+                source: `\${_display.${steedosField.name}|asArray}`,
+                items: {
+                    type: 'static',
+                    labelClassName: "hidden",
+                    label: false,
+                    className: 'm-0',
+                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${value}" ${lookupATagClick}>\${name}</a>`,
+                    // tpl: "<%= item.name >",
+                    // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                    onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick$1(steedosField, {
+                        appId,
+                        objectName: "cfs_files_filerecord",
+                        formFactor
+                    })
+                }
+            }
         }
     }
 };
@@ -4465,8 +4574,8 @@ const getAmisFileEditSchema = (steedosField)=>{
     return convertData;
 };
 
-const getAmisFileSchema = (steedosField, readonly)=>{
-    return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
+const getAmisFileSchema = async (steedosField, readonly, ctx)=>{
+    return readonly ? await getAmisFileReadonlySchema(steedosField,ctx) : getAmisFileEditSchema(steedosField);
 };
 
 var frontend_field_group_generalization$1 = "General";
@@ -4861,29 +4970,6 @@ instance
     }
   });
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-07-13 15:18:03
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-11 10:34:26
- * @Description: 
- */
-
-async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
-    const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
-    const page = await fetchAPI(api);
-    if (page && page.schema) {
-        page.schema = JSON.parse(page.schema);
-        if(page.schema.data){
-            delete page.schema.data.recordId;
-            delete page.schema.data.objectName;
-            delete page.schema.data.context;
-            delete page.schema.data.global;
-        }
-        return page;
-    }
-}
-
 async function getQuickEditSchema(object, columnField, options){
     let field = object.fields[columnField.name];
     //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
@@ -14769,8 +14855,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = _$1__namespace.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
-        if (isAllowCreate && isCreate && !isHasFilters) {
+        let hasFilters = !_$1__namespace.isEmpty(field.filters) || !!field.filtersFunction || !!field._filtersFunction;
+        if (isAllowCreate && isCreate && !hasFilters) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
             // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
@@ -16215,13 +16301,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'avatar':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'image':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'file':
-            convertData = getAmisFileSchema(field, readonly);
+            convertData = await getAmisFileSchema(field, readonly, ctx);
             break;
         case 'formula':
             if(readonly){
@@ -21415,7 +21501,12 @@ var SteedosDropdownButton = function (props) {
             }
         }
     };
-    return (React__default["default"].createElement(antd.Dropdown, { menu: { items: menu }, trigger: trigger, onOpenChange: onOpenChange, placement: placement, overlayClassName: overlayClassName, arrow: arrow },
+    return (React__default["default"].createElement(antd.Dropdown, { menu: { items: menu }, trigger: trigger, onOpenChange: onOpenChange, placement: placement, overlayClassName: overlayClassName, arrow: arrow, getPopupContainer: function (button) {
+            // 未配置getPopupContainer属性时，默认container为body，这里判断到dropdown button是在drawer中时，统一把container配置为drawer本身
+            // 这样就可以解决drawer内点击dropdown button组件下拉菜单中的按钮时不应该自动关闭drawer的问题
+            var drawerBody = window.$(button).closest(".amis-dialog-widget .antd-Drawer-body")[0];
+            return drawerBody || document.querySelector("body");
+        } },
         React__default["default"].createElement("button", { className: "slds-button slds-button_icon slds-button_icon-border-filled slds-button_icon-x-small ".concat(className ? className : '') },
             React__default["default"].createElement("svg", { className: "w-4 h-4 fill-gray-500" },
                 React__default["default"].createElement("use", { xlinkHref: "/assets/icons/utility-sprite/svg/symbols.svg#down" })))));
@@ -21994,7 +22085,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = props.className, className = _a === void 0 ? 'sm:sticky top-0 p-0 bg-gray-50' : _a, schemaFilter = props.schemaFilter, showButtons = props.showButtons, showBackButton = props.showBackButton;
+                _a = props.className, className = _a === void 0 ? 'sm:sticky top-0 sm:z-10 p-0 bg-gray-50' : _a, schemaFilter = props.schemaFilter, showButtons = props.showButtons, showBackButton = props.showBackButton;
                 return [4 /*yield*/, getUISchema(props.objectApiName || "space_users", false)];
             case 1:
                 _d.sent();
@@ -22763,9 +22854,10 @@ var AmisGlobalFooter = function (props) { return __awaiter(void 0, void 0, void
 * @Author: baozhoutao@steedos.com
 * @Date: 2022-09-01 14:44:57
 * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-* @LastEditTime: 2024-05-24 19:37:30
+* @LastEditTime: 2024-05-29 11:45:57
 * @Description:
 */
+var beforeMarkReadAllScript = "\n  var hasUnRead = !!db.notifications.find({'$or':[{'is_read': null},{'is_read': false}]}).count();\n  // \u6CA1\u6709\u8BA2\u9605\u5230\u672A\u8BFB\u901A\u77E5\u65F6\u9700\u8981\u989D\u5916\u5355\u72EC\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  // \u5982\u679C\u6709\u8BA2\u9605\u5230\u7684\u8BDD\uFF0C\u56E0\u4E3A\u76D1\u542C\u8BA2\u9605\u5230\u7684\u901A\u77E5\u8BB0\u5F55\u53D8\u5316\uFF0C\u6709\u53D8\u5316\u4F1A\u89E6\u53D1@data.changed.notifications\u4E8B\u4EF6\uFF0C\u4ECE\u800C\u4F1A\u81EA\u52A8\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  event.data.needToReload = !hasUnRead;\n";
 var getNotificationBadgeButton = function () {
     var isMobile = window.innerWidth < 768;
     var listContent = {
@@ -22849,6 +22941,10 @@ var getNotificationBadgeButton = function () {
                         "onEvent": {
                             "click": {
                                 "actions": [
+                                    {
+                                        "actionType": "custom",
+                                        "script": beforeMarkReadAllScript
+                                    },
                                     {
                                         "componentId": "",
                                         "args": {
@@ -22864,6 +22960,16 @@ var getNotificationBadgeButton = function () {
                                             }
                                         },
                                         "actionType": "ajax"
+                                    },
+                                    {
+                                        "componentId": "service_global_header_notifications_unread_count",
+                                        "actionType": "reload",
+                                        "expression": "${needToReload}"
+                                    },
+                                    {
+                                        "componentId": "service_global_header_notifications_list",
+                                        "actionType": "reload",
+                                        "expression": "${needToReload}"
                                     }
                                 ],
                                 "weight": 0
@@ -22873,7 +22979,7 @@ var getNotificationBadgeButton = function () {
                 ]
             },
         ],
-        "id": "u:aba521eed5b7",
+        "id": "service_global_header_notifications_list",
         "onEvent": {
             "@data.changed.notifications": {
                 "actions": [
@@ -22917,7 +23023,7 @@ var getNotificationBadgeButton = function () {
                 "count": "${unReadCount}"
             },
         ],
-        "id": "u:aba521eed5b7",
+        "id": "service_global_header_notifications_unread_count",
         "messages": {},
         "api": {
             "method": "post",