@steedos/service-core-objects 3.0.0-beta.9 → 3.0.0-beta.92

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

@@ -37,9 +37,9 @@ router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async func
         //     authToken: userSession.authToken
         // }
         let locale = "zh-CN";
-        if (req.query.locale == "en-us") {
+        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
 				}
 			}
 		},

package/main/default/services/notifications.service.js

@@ -0,0 +1,190 @@
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const _ = require("lodash");
+const objectql = require('@steedos/objectql');
+
+module.exports = {
+    name: 'notifications',
+    namespace: "steedos",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        /**
+         * @api {post} add 发送通知
+         * @apiName add
+         * @apiGroup notifications.service.js
+         * @apiParam {Object} message 消息主体
+         * @apiParam {String} message[name] 消息标题
+         * @apiParam {String} message[body] 消息内容
+         * @apiParam {String} message[related_to] 关联记录
+         * @apiParam {String} message[related_name] 关联名称
+         * @apiParam {String} message[from] 发送者ID，选填
+         * @apiParam {String} message[space] 工作区ID
+         * @apiParam {String} from 发送者ID
+         * @apiParam {String[]} to 接受者ID
+         */
+        add: {
+            params: {
+                message: {
+                    type: "object",
+                    props: {
+                        name: { type: "string" },
+                        body: { type: "string" },
+                        related_to: {
+                            type: "object",
+                            props: {
+                                o: { type: "string" },
+                                ids: { type: "array", items: "string" },
+                            }
+                        },
+                        related_name: { type: "string", optional: true },
+                        from: { type: "string", optional: true },
+                        space: { type: "string" },
+                    }
+                },
+                from: { type: "string" },
+                to: {
+                    type: "multi",
+                    rules: [
+                        { type: "string" },
+                        { type: "array", items: "string" }
+                    ]
+                },
+            },
+            async handler(ctx) {
+                let { from, to, message } = ctx.params;
+                this.broker.emit('notifications.add', {from, to, message})
+
+
+                let notifications_ids = [];
+                if(!_.isArray(to) && _.isString(to)){
+                    to = [to]
+                }
+
+                if (_.isEmpty(to)) {
+                    return
+                }
+                let now = new Date();
+                const datasource = objectql.getDataSource('default');
+                const adapter = datasource.adapter
+                await adapter.connect()
+                const collection = adapter.collection('notifications');
+                let bulk = collection.initializeUnorderedBulkOp();
+
+                let doc = Object.assign({
+                    created: now,
+                    modified: now,
+                    created_by: from,
+                    modified_by: from
+                }, message)
+
+                for (const userId of to) {
+                    let notifications_id = await objectql.getObject('notifications')._makeNewID();
+                    bulk.insert(Object.assign({}, doc, {_id: notifications_id, owner: userId}));
+                    notifications_ids.push(notifications_id)
+                }
+
+                bulk.execute().catch(function (error) {
+                    console.error("通知数据插入失败，错误信息：", error);
+                });
+
+                try {
+                    this.broker.emit(`notifications.hasBeenSent`, {
+                        ids: notifications_ids
+                    });
+                    await ctx.broker.call('b6-microservice.broadcast', {name: '$notification.users', data: {tenantId: message.space, users: to, message: {name: message.name, body: message.body}}})
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                } catch (e) { console.log(e) }
+            }
+        },
+        /**
+         * @api {post} remove 删除通知
+         * @apiName remove
+         * @apiGroup notifications.service.js
+         * @apiParam {Object} doc 消息主体
+         * @apiParam {String} doc[_id] 消息ID
+         * @apiParam {String[]} assignees 接受者ID
+         * @apiParam {String} objectName 关联对象名称
+         */
+        remove: {
+            params: {
+                doc: {
+                    type: "object",
+                    props: {
+                        _id: { type: "string" },
+                    }
+                },
+                assignees: {
+                    type: "array", items: "string"
+                },
+                objectName: { type: "string" },
+            },
+            async handler(ctx) {
+                const { doc, assignees, objectName } = ctx.params;
+                const datasource = objectql.getDataSource('default');
+                const adapter = datasource.adapter
+                await adapter.connect()
+                const collection = adapter.collection('notifications');
+                let bulk = collection.initializeUnorderedBulkOp();
+                assignees.forEach(function (assignee) {
+                    bulk.find({
+                        "related_to.o": objectName,
+                        "related_to.ids": doc._id,
+                        owner: assignee
+                    }).remove();
+                });
+                return bulk.execute().catch(function (error) {
+                    console.error("通知数据删除失败，错误信息：", error);
+                });
+            }
+        },
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+
+    },
+
+    /**
+     * Service created lifecycle event handler
+     */
+    created() {
+
+    },
+
+    /**
+     * Service started lifecycle event handler
+     */
+    async started() {
+        this.broker.logger.info('[service][notifications]===>', 'started')
+    },
+
+    /**
+     * Service stopped lifecycle event handler
+     */
+    async stopped() {
+
+    }
+};

package/main/default/services/users.service.js

@@ -156,7 +156,7 @@ module.exports = {
             }
             const steedosConfig = getSteedosConfig();
             const accountsConfig = steedosConfig.public.accounts || {};
-            const usernameMinLength = accountsConfig.username_min_length ? Number(accountsConfig.username_min_length) : 6
+            const usernameMinLength = accountsConfig.username_min_length ? Number(accountsConfig.username_min_length) : 2
             if (username.length <  usernameMinLength) {
                 throw new Error(`用户名最小长度不能小于 ${usernameMinLength} 位字符`);
             }

package/main/default/tabs/{admin_process_delegation_rules.tab.yml → admin_bull_dashboard.tab.yml}

@@ -1,24 +1,21 @@
-name: admin_process_delegation_rules
+name: admin_bull_dashboard
 desktop: true
-icon: rtc_presence
-is_new_window: false
-label: 流程委托
+icon: dashboard
+is_new_window: true
+label: Bull Dashboard
 mobile: true
 permissions:
-  - permission: 'on'
-    permission_set: admin
-  - permission: 'on'
+  - permission: 'off'
     permission_set: user
   - permission: 'off'
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
+  - permission: 'on'
+    permission_set: admin
   - permission: 'off'
     permission_set: organization_admin
   - permission: 'off'
     permission_set: workflow_admin
-type: object
-object: process_delegation_rules
-license:
-  - platform-professional
-  - platform-enterprise
+type: url
+url: /bull-jobs/dashboard/

package/main/default/translations/en.translation.yml

@@ -84,7 +84,7 @@ CustomTabs:
   admin_space_users: Users
   admin_permission_set: Profiles & Permission Sets
   admin_personal_information: Personal Information
-  admin_license: 
+  admin_license: Licenses
   admin_apps: Apps
   admin_steedos_packages: Packages
   admin_objects: Objects
@@ -118,4 +118,5 @@ CustomTabs:
   admin_holidays: Holidays
   admin_business_hours: Business Hours
   admin_api_keys: API Keys
-  admin_metadata: Metadata
+  admin_metadata: Metadata
+  admin_bull_dashboard: Bull Dashboard

package/main/default/translations/zh-CN.translation.yml

@@ -82,7 +82,7 @@ CustomTabs:
   admin_company: 分部
   admin_space_users: 人员
   admin_permission_set: 简档 & 权限集
-  admin_license: 
+  admin_license: 许可证
   admin_apps: 应用程序
   admin_steedos_packages: 软件包
   admin_objects: 对象
@@ -117,4 +117,5 @@ CustomTabs:
   admin_holidays: 节假日
   admin_business_hours: 工作时间
   admin_api_keys: API Key
-  admin_metadata: 元数据
+  admin_metadata: 元数据
+  admin_bull_dashboard: Bull仪表盘

package/main/default/triggers/objects_set_default_object_properties_trigger.trigger.yml

@@ -5,7 +5,9 @@ when:
 isEnabled: true
 handler: |
   try{
-    const { doc, userId } = ctx.params;
+    const { doc, userId, spaceId} = ctx.params;
+    const user = await ctx.getUser(userId, spaceId);
+    
     // 插入默认字段
     await objects.object_fields.insert({
         object: doc.name,
@@ -20,7 +22,7 @@ handler: |
         index: true,
         searchable: true,
         filterable: true
-    });
+    }, user);
 
     // 插入默认列表视图 "所有"
     await objects.object_listviews.insert({
@@ -34,13 +36,14 @@ handler: |
         crud_mode: 'table',
         type: 'grid',
         columns: [{ field: 'name' }],
+        is_enable: true,
         sort: [
             {
                 field_name: "created",
                 order: "desc"
             }
         ]
-    });
+    }, user);
 
     // 插入默认列表视图 "最近查看"
     await objects.object_listviews.insert({
@@ -54,7 +57,7 @@ handler: |
         filter_scope: "space",
         crud_mode: 'table',
         columns: [{ field: 'name' }]
-    });
+    }, user);
 
 
     const psUserId = "user"; // 用户权限集 ID
@@ -86,7 +89,7 @@ handler: |
         permission_set_id: psUserId,
         object_name: doc.name,
         space: doc.space
-    });
+    }, user);
 
     // 插入管理员权限对象
     await objects.permission_objects.insert({
@@ -95,7 +98,7 @@ handler: |
         permission_set_id: psAdminId,
         object_name: doc.name,
         space: doc.space
-    });
+    }, user);
   }catch(error){
     console.log(error)
   }

package/main/default/triggers/queue_import.trigger.js

@@ -0,0 +1,16 @@
+
+const objectql = require('@steedos/objectql');
+
+module.exports = {
+    listenTo: 'queue_import',
+
+    afterFind: async function () {
+        if (this.data.values) {
+            for (const value of this.data.values) {
+                if (value) {
+                    value.template_url = objectql.absoluteUrl(`/api/data/download/template/${value._id}`)
+                }
+            }
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-core-objects",
-    "version": "3.0.0-beta.9",
+    "version": "3.0.0-beta.92",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,11 +10,12 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/service-package-loader": "3.0.0-beta.9",
+        "@steedos/service-package-loader": "3.0.0-beta.92",
+        "json2xls": "^0.1.2",
         "lodash": "^4.17.21"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "9111ae9e9ce7c57c67c6bd670706f4344c28d69d"
+    "gitHead": "16a684ff645d0a9b745e4b49309f2c63d6a41395"
 }

package/package.service.js

@@ -31,7 +31,7 @@ module.exports = {
         $package: {
             path: __dirname,
             name: packageName,
-            isPackage: true
+            isPackage: false
         }
     },
     /**
@@ -212,9 +212,10 @@ module.exports = {
         this.broker.createService({
             name: 'steedos-server',
             mixins: [],
+            dependencies: ['metadata-cachers-service'],
 			actions: {
 				setSettings(ctx) {
-					console.log(`TODO setSettings:`, ctx.params)
+                    global.Steedos.settings = _.defaultsDeep({}, ctx.params, global.Steedos.settings);
 				}
 			},
             started: function() {

package/public/platform.css

@@ -0,0 +1,62 @@
+:root {
+    --tw-border-opacity: 1;
+    --private: rgb(14 165 233 / var(--tw-border-opacity));
+    --primary-onHover: var(--colors-brand-9);
+}
+
+.ant-modal-mask{
+    z-index: 2999 !important;
+}
+
+.ant-modal-wrap{
+    z-index: 3999 !important;
+}
+
+
+.antd-PdfViewer-Tool svg{
+    display: inline !important;
+}
+
+.antd-PdfViewer-Tool .page-input {
+    background: transparent !important;
+}
+
+.antd-PdfViewer-Tool{
+    bottom: 10px !important;
+}
+
+
+.ant-notification{
+    z-index: 1900 !important;
+}
+
+
+.button_uninstall {
+    color: var(--button-danger-default-font-color);
+    background: var(--button-danger-default-bg-color);
+    border-color: var(--button-danger-default-top-border-color) var(--button-danger-default-right-border-color) var(--button-danger-default-bottom-border-color) var(--button-danger-default-left-border-color);
+    border-width: var(--button-danger-default-top-border-width) var(--button-danger-default-right-border-width) var(--button-danger-default-bottom-border-width) var(--button-danger-default-left-border-width);
+    border-style: var(--button-danger-default-top-border-style) var(--button-danger-default-right-border-style) var(--button-danger-default-bottom-border-style) var(--button-danger-default-left-border-style);
+    box-shadow: var(--button-danger-default-shadow);
+}
+
+.button_uninstall:hover {
+    color: var(--button-danger-hover-font-color) !important;
+    background: var(--button-danger-hover-bg-color) !important;
+    border-color: var(--button-danger-hover-top-border-color) var(--button-danger-hover-right-border-color) var(--button-danger-hover-bottom-border-color) var(--button-danger-hover-left-border-color);
+    border-width: 0px !important;
+    border-style: var(--button-danger-hover-top-border-style) var(--button-danger-hover-right-border-style) var(--button-danger-hover-bottom-border-style) var(--button-danger-hover-left-border-style);
+    box-shadow: var(--button-danger-hover-shadow)
+}
+
+
+/* .steedos-apps-home .antd-Panel .antd-Panel-body .app-item.app-item-_add_admin .slds-app-launcher__tile{
+    box-shadow: 0 0 2px var(--private), 0 2px 4px rgba(0, 0, 0, 0.14);
+    border: none;
+} */
+
+
+.antd-Pagination > li > a, .antd-Pagination > li > span {
+    line-height: 28px;
+    height: 28px;
+}