@steedos/service-core-objects 3.0.0-beta.13 → 3.0.0-beta.131

package/main/default/pages/space_users_list.page.amis.json

@@ -1,9 +1,8 @@
 {
-    "type": "service",
+    "type": "page",
     "body": [
         {
             "type": "service",
-            "messages": {},
             "className": "h-full",
             "body": [
                 {
@@ -14,12 +13,12 @@
                         {
                             "type": "wrapper",
                             "size": "none",
-                            "className": "flex-shrink-0 min-w-[200px] overflow-y-auto border-r border-gray-200 lg:order-first lg:flex lg:flex-col hidden",
+                            "className": "space-users-list-sidebar-wrapper flex-shrink-0 min-w-[220px] overflow-y-auto sm:rounded shadow bg-white my-4 ml-4 mr-1 lg:order-first lg:flex lg:flex-col ",
                             "body": [
                                 {
                                     "type": "input-tree",
                                     "id": "u:7fd77b7915b0",
-                                    "className": "",
+                                    "className": "bg-none",
                                     "source": {
                                         "method": "post",
                                         "url": "${context.rootUrl}/graphql",
@@ -37,6 +36,21 @@
                                     "onEvent": {
                                         "change": {
                                             "actions": [
+                                                {
+                                                    "actionType": "custom",
+                                                    "script": "document.querySelector('.space-users-list-custom-page').classList.toggle('space-users-list-sidebar-open');",
+                                                    "expression": "${isMobile}"
+                                                },
+                                                {
+                                                    "actionType": "setValue",
+                                                    "componentId": "u:f6a209c8cf61",
+                                                    "args": {
+                                                        "value": {
+                                                            "isVisible": "${!isVisible}"
+                                                        }
+                                                    },
+                                                    "expression": "${isMobile}"
+                                                },
                                                 {
                                                     "actionType": "setValue",
                                                     "componentId": "u:f6a209c8cf61",
@@ -64,7 +78,7 @@
                                     "initiallyOpen": false,
                                     "extractValue": true,
                                     "onlyChildren": true,
-                                    "treeContainerClassName": "no-border",
+                                    "treeContainerClassName": "no-border h-full",
                                     "showIcon": false,
                                     "enableNodePath": false,
                                     "autoCheckChildren": false,
@@ -83,12 +97,46 @@
                                 }
                             ],
                             "id": "u:fd659f5c3657",
-                            "visibleOn": "${isVisible}"
+                            "visibleOn": "${isVisible}",
+                            "isFixedHeight": false,
+                            "isFixedWidth": false
+                        },
+                        {
+                            "type": "button",
+                            "className": "space-users-sidebar-overlay",
+                            "id": "u:773b1d00aab2",
+                            "visibleOn": "${isVisible && isMobile}",
+                            "body": [],
+                            "onEvent": {
+                                "click": {
+                                    "actions": [
+                                        {
+                                            "actionType": "custom",
+                                            "script": "document.querySelector('.space-users-list-custom-page').classList.toggle('space-users-list-sidebar-open');"
+                                        },
+                                        {
+                                            "actionType": "wait",
+                                            "args": {
+                                                "time": 500
+                                            }
+                                        },
+                                        {
+                                            "actionType": "setValue",
+                                            "componentId": "u:f6a209c8cf61",
+                                            "args": {
+                                                "value": {
+                                                    "isVisible": "${!isVisible}"
+                                                }
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
                         },
                         {
                             "type": "wrapper",
                             "size": "none",
-                            "className": "flex-1 overflow-y-auto focus:outline-none lg:order-last w-96",
+                            "className": "flex-1 focus:outline-none lg:order-last w-96",
                             "body": [
                                 {
                                     "type": "steedos-object-listview",
@@ -101,29 +149,40 @@
                                         {
                                             "type": "button",
                                             "label": "",
-                                            "align": "right",
+                                            "align": "left",
                                             "icon": "fa fa-bars",
                                             "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-                                            "hiddenOn": "${window:innerWidth < 768}",
                                             "onEvent": {
                                                 "click": {
                                                     "actions": [
                                                         {
                                                             "actionType": "setValue",
-                                                            "componentId": "u:f6a209c8cf61",
                                                             "args": {
                                                                 "value": {
                                                                     "isVisible": "${!isVisible}"
                                                                 }
-                                                            }
+                                                            },
+                                                            "componentId": "u:f6a209c8cf61"
+                                                        },
+                                                        {
+                                                            "actionType": "wait",
+                                                            "args": {
+                                                                "time": 50
+                                                            },
+                                                            "expression": "${!isMobile}"
+                                                        },
+                                                        {
+                                                            "actionType": "custom",
+                                                            "script": "document.querySelector('.space-users-list-custom-page').classList.toggle('space-users-list-sidebar-open');"
                                                         }
                                                     ]
                                                 }
                                             },
-                                            "id": "u:6f237cc36419"
+                                            "id": "u:6f237cc36419",
+                                            "hiddenOn": "${window:innerWidth < 768 && false}"
                                         }
                                     ],
-                                    "className": "bg-gray-100",
+                                    "className": "",
                                     "style": {
                                         "border": 0,
                                         "border-radius": 0
@@ -143,9 +202,11 @@
                 }
             ],
             "data": {
-                "isVisible": true
+                "isVisible": "${window:innerWidth > 768}",
+                "isMobile": "${window:innerWidth <= 768}"
             },
-            "id": "u:f6a209c8cf61"
+            "id": "u:f6a209c8cf61",
+            "dsType": "api"
         }
     ],
     "regions": [
@@ -155,15 +216,69 @@
         "objectName": "space_users",
         "context": {}
     },
+    "id": "u:b7167e2fcaf0",
     "name": "page_space_users_list",
     "bodyClassName": "p-0",
-    "id": "u:b7167e2fcaf0",
     "asideResizor": false,
     "pullRefresh": {
         "disabled": true
     },
-    "className": "space-users-list h-full",
-    "style": {
-        "padding": "${displayAs == 'grid'?'':'0px'}"
+    "className": {
+        "space-users-list-custom-page h-full": true,
+        "space-users-list-mobile": "${window:innerWidth < 768}",
+        "space-users-list-pc space-users-list-sidebar-open": "${window:innerWidth > 768}"
+    },
+    "style": {},
+    "dsType": "api",
+    "themeCss": {
+        "baseControlClassName": {
+            "padding-and-margin:default": {
+                "padding": "${displayAs == 'grid'?'':'0px'}"
+            }
+        }
+    },
+    "css": {
+        ".space-users-list-custom-page.space-users-list-mobile .space-users-list-sidebar-wrapper": {
+            "z-index": "601",
+            "top": "50px",
+            "left": "0px",
+            "bottom": "0px",
+            "position": "fixed",
+            "margin": "0px"
+        },
+        ".space-users-list-custom-page.space-users-list-mobile .space-users-sidebar-overlay": {
+            "z-index": "600",
+            "position": "fixed",
+            "bottom": "0px",
+            "right": "0px",
+            "left": "0px",
+            "top": "50px"
+        },
+        ".space-users-list-custom-page .space-users-list-sidebar-wrapper": {
+            "transition": "0.5s ease transform",
+            "will-change": "transform",
+            "transform": "translate(-100%,0)",
+            "-webkit-transform": "translate(-100%,0)",
+            "-moz-transform": "translate(-100%,0)",
+            "-ms-transform": "translate(-100%,0)",
+            "-o-transform": "translate(-100%,0)"
+        },
+        ".space-users-list-custom-page.space-users-list-sidebar-open .space-users-list-sidebar-wrapper": {
+            "transform": "translate(0,0)",
+            "-webkit-transform": "translate(0,0)",
+            "-moz-transform": "translate(0,0)",
+            "-ms-transform": "translate(0,0)",
+            "-o-transform": "translate(0,0)"
+        },
+        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper": {
+            "min-width": "0px",
+            "width": "0px"
+        },
+        ".space-users-list-custom-page.space-users-list-pc.space-users-list-sidebar-open .space-users-list-sidebar-wrapper": {
+            "min-width": "220px"
+        },
+        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper .antd-Form-item .antd-Tree": {
+            "max-height": "none"
+        }
     }
 }

package/main/default/routes/amis_button_design.ejs

@@ -16,7 +16,10 @@
         id: "<%=id%>",
         pageId: "<%=id%>",
         messageOnly: true,
-        hiddenDeploy: true
+        hiddenDeploy: true,
+        title: "<%=locale%>" === 'zh-CN' ? '按钮设计器': 'Button Designer',
+        saveText: "<%=locale%>" === 'zh-CN' ? '保存': 'Save',
+        deployText: "<%=locale%>" === 'zh-CN' ? '发布': 'Deploy',
       };
 
       let comp = document.querySelector("builder-fiddle");

package/main/default/routes/amis_button_design.router.js

@@ -34,8 +34,8 @@ router.get('/api/amisButtonDesign', auth.requireAuthentication, async function (
         //     authToken: userSession.authToken
         // }
 
-        let locale = "zh-CN";
-        if (req.query.locale == "en-us") {
+        let locale = userSession.language || process.env.STEEDOS_DEFAULT_LANGUAGE || "zh-CN";
+        if (req.query.locale?.startsWith('en')) {
             locale = "en-US";
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
@@ -56,7 +56,8 @@ router.get('/api/amisButtonDesign', auth.requireAuthentication, async function (
             userId: userSession.userId,
             authToken: userSession.authToken,
             id: req.query.id,
-            userSession: userSession
+            userSession: userSession,
+            locale
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

package/main/default/routes/importRecords.router.js

@@ -0,0 +1,87 @@
+
+const { requireAuthentication } = require('@steedos/auth');
+const { importWithCmsFile } = require('@steedos/data-import/lib/index')
+const express = require('express');
+const router = express.Router();
+
+const json2xls = require('json2xls');
+const { getObject } = require('@steedos/objectql');
+const _ = require('lodash');
+
+const initiateImport = async function (req, res) {
+    try {
+        const userSession = req.user;
+        // const spaceId = userSession.spaceId;
+        let { importObjId, importObjectHistoryId } = req.body;
+        let fileId = null;
+        const isSpaceAdmin = req.user.is_space_admin;
+        //传入了importObjId参数，必须是工作区管理员权限
+        if (importObjId && !isSpaceAdmin) {
+            return res
+                .status(401)
+                .send({ status: "error", message: "Permission denied" });
+        }
+
+        if (importObjectHistoryId) {
+            const record = await getObject('queue_import_history').findOne(importObjectHistoryId);
+            if (!record) {
+                throw new Error(
+                    `can not find queue_import_history record with given id "${importObjectHistoryId}"`
+                );
+            }
+            if (!record.file) {
+                throw new Error(`Upload excel file, please.`);
+            }
+            fileId = record.file
+            importObjId = record.queue_import
+        }
+
+        // if (!Steedos.hasFeature('metadata_api', spaceId)) {
+        //     return res.status(403).send({ status: 'error', message: 'Please upgrade the platform license to Enterprise Edition' });
+        // }
+
+        try {
+            let result = await importWithCmsFile(importObjId, userSession, importObjectHistoryId, fileId);
+            return res.status(200).send({ status: "success", result });
+        } catch (error) {
+            console.log(error)
+            return res
+                .status(500)
+                .send({ status: "failed", message: error.message });
+        }
+    } catch (error) {
+        console.log(error)
+        return res.status(500).send({ status: "failed", error: error.message });
+    }
+}
+
+router.post('/api/data/initiateImport', requireAuthentication, initiateImport);
+
+router.get('/api/data/download/template/:record_id', requireAuthentication, async function (req, res) {
+    try {
+        const { record_id } = req.params;
+        let queueImportDoc = await getObject("queue_import").findOne(record_id);
+        let fieldMaps = queueImportDoc.field_mappings;
+        if (_.isEmpty(fieldMaps)) {
+            return;
+        }
+        let json = {};
+        for (const fMap of fieldMaps) {
+            json[fMap.header] = null;
+        }
+        let xls = json2xls([json]);
+        res.writeHead(200, {
+            'Content-Type': 'application/octet-stream',
+            'Content-Disposition': 'attachment;filename=' + encodeURI(queueImportDoc.description + '.xlsx'),
+            'Access-Control-Expose-Headers': 'Content-Disposition'
+        });
+        res.end(xls, 'binary');
+    } catch (error) {
+        console.error(error);
+        res.status(500).send({ error: error.message });
+    }
+
+});
+
+exports.default = router;
+

package/main/default/routes/notifications.router.js

@@ -0,0 +1,113 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-05-27 14:51:49
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-05-27 15:48:42
+ */
+const { requireAuthentication } = require("@steedos/auth");
+const { getSteedosSchema, getObject } = require("@steedos/objectql");
+const express = require("express");
+const router = express.Router();
+const _ = require("lodash");
+
+const util = {
+    /**
+     * Returns the object record Relative url
+     */
+    getObjectRecordRelativeUrl: (objectName, recordId, spaceId = null, options = {}) => {
+        let appId = '-';
+        if (options.appId) {
+            appId = options.appId;
+        }
+        let url = `/app/${appId}/${objectName}/view/${recordId}`;
+        if (objectName === "instances") {
+            url = `/api/workflow/instances/redirect/${recordId}`
+        }
+        return url;
+    }
+}
+
+router.get(
+    "/api/v4/notifications/:_id/read",
+    requireAuthentication,
+    async function (req, res) {
+        let { _id: record_id } = req.params;
+        let { rootUrl, appId } = req.query;
+        const userSession = req.user;
+        let req_async = _.has(req.query, 'async');
+        if (userSession.userId) {
+            let record = await getSteedosSchema().getObject("notifications").findOne(record_id, { fields: ['owner', 'is_read', 'related_to', 'space', 'url'] });
+            if (!record) {
+                // 跳转到通知记录界面会显示为404效果
+                let redirectUrl = util.getObjectRecordRelativeUrl("notifications", record_id);
+                if (req.get("X-Requested-With") === 'XMLHttpRequest') {
+                    return res.status(200).send({
+                        "status": 404,
+                        "redirect": redirectUrl
+                    });
+                } else {
+                    return res.redirect(redirectUrl);
+                }
+            }
+            if (!record.related_to && !record.url) {
+                return res.status(401).send({
+                    "error": "Validate Request -- Missing related_to or url",
+                    "success": false
+                });
+            }
+            if (!record.is_read && record.owner === userSession.userId) {
+                // 没有权限时，只是不修改is_read值，但是允许跳转到相关记录查看
+                await getSteedosSchema().getObject('notifications').update(record_id, { 'is_read': true, modified: new Date() })
+            }
+            let redirectUrl = record.url ? record.url : util.getObjectRecordRelativeUrl(record.related_to.o, record.related_to.ids[0], record.space, {
+                rootUrl, appId
+            });
+            if (req_async) { // || req.get("X-Requested-With") === 'XMLHttpRequest'
+                return res.status(200).send({
+                    "status": 200,
+                    "redirect": redirectUrl
+                });
+            } else {
+                return res.redirect(redirectUrl);
+            }
+        }
+        return res.status(401).send({
+            "error": "Validate Request -- Missing X-Auth-Token",
+            "success": false
+        })
+    }
+);
+
+router.post(
+    "/api/v4/notifications/all/markReadAll",
+    requireAuthentication,
+    async function (req, res) {
+        let userSession = req.user;
+        let error;
+        let updatedCount = await getObject("notifications").directUpdateMany([
+            ["space", "=", userSession.spaceId],
+            ["owner", "=", userSession.userId],
+            [["is_read", "=", null], 'or', ["is_read", "=", false]]
+        ], {
+            is_read: true
+        }).catch((ex) => {
+            console.error(ex);
+            error = ex;
+            return 0;
+        });
+        if (error) {
+            res.status(500).send({
+                "error": error,
+                "success": false
+            });
+        }
+        else {
+            return res.send({
+                markedCount: updatedCount,
+                "success": true
+            });
+        }
+    }
+);
+
+exports.default = router;

package/main/default/routes/object_fields_design.ejs

@@ -1,10 +1,3 @@
-<!--
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-06-02 17:45:15
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-10-17 12:02:21
- * @Description: 
--->
 <html>
   <head>
     <script src="/unpkg.com/@steedos-builder/fiddle@0.0.5/dist/builder-fiddle.umd.js"></script>
@@ -14,6 +7,11 @@
     <link href="/toast/toastr.min.css" rel="stylesheet" />
     <script src="/jquery.min.js" ></script>
     <script src="/toast/toastr.min.js"></script>
+    <script>
+    window._disabledFields = [
+      'table'
+    ]
+  </script>
     <style>
       #toast-container.toast-bottom-center>div, #toast-container.toast-top-center>div {
         width: 450px;
@@ -61,7 +59,10 @@
         useOpenAPI: useOpenAPI,
         oid: "<%=id%>",
         pageId: "<%=id%>",
-        hiddenDeploy: true
+        hiddenDeploy: true,
+        title: "<%=locale%>" === 'zh-CN' ? '对象设计器': 'Object Designer',
+        saveText: "<%=locale%>" === 'zh-CN' ? '保存': 'Save',
+        deployText: "<%=locale%>" === 'zh-CN' ? '发布': 'Deploy',
       };
 
       let comp = document.querySelector("builder-fiddle");
@@ -115,6 +116,12 @@
               tenantId,
               authToken,
             },
+            global: {
+              userId: userId,
+              spaceId: tenantId,
+              user: <%- JSON.stringify(userSession) %>, 
+              now: new Date(),
+            }
           },
         };
 
@@ -150,7 +157,12 @@
             schema.data.context.userId = userId;
             schema.data.context.authToken = authToken;
             schema.data.context.user = <%- JSON.stringify(userSession) %>;
-
+            schema.data.global = {
+              userId: userId,
+              spaceId: tenantId,
+              user: <%- JSON.stringify(userSession) %>, 
+              now: new Date(),
+            }
             // if (objectName && pageType === "record") {
             //   const record = await axios.get(
             //     `${rootUrl}/api/v4/${objectName}?$orderby=modified&$top=1`,
@@ -185,11 +197,13 @@
         );
         if (schema.data && typeof schema.data.context === 'object' ) {
           delete schema.data.context
+          delete schema.data.global
         }
 
         try {
           delete schema.data.recordId;
           delete schema.data.objectName;
+          delete schema.data.global
         } catch (error) {
           
         }

package/main/default/routes/object_fields_design.router.js

@@ -36,10 +36,10 @@ router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async func
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
-        let locale = "zh-CN";
-        if (req.query.locale == "en-us") {
+        let locale = userSession.language || process.env.STEEDOS_DEFAULT_LANGUAGE || "zh-CN";
+        if (req.query.locale?.startsWith('en')) {
             locale = "en-US";
-        } else if (req.query.locale == "zh-cn") {
+        } else if (req.query?.locale == "zh-cn") {
             locale = "zh-CN";
         }
         const retUrl = req.query.retUrl || process.env.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
@@ -56,7 +56,8 @@ router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async func
             authToken: userSession.authToken,
             userSession: userSession,
             id: req.query.oid,
-            useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API
+            useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API,
+            locale: locale
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

package/main/default/services/app-design.service.js

@@ -76,7 +76,8 @@ module.exports = {
 					
 					return obj;
 				} catch (error) {
-					console.log(error)
+					console.log(error);
+					throw error
 				}
 			}
 		},