@steedos/service-core-objects 3.0.0-beta.99 → 3.0.0

package/main/default/objects/space_users/buttons/setPassword.button.js

@@ -70,18 +70,18 @@ module.exports = {
             autoComplete: "new-password",
             className: "ant-input",
             ref: inputRef,
-            onKeyDown: (event) => {
-                // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
-                if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
-                    event.preventDefault();
-                    return false;
-                }
-            },
-            onContextMenu: (event) => {
-                // 禁用鼠标右键菜单
-                event.preventDefault();
-                return false;
-            }
+            // onKeyDown: (event) => {
+            //     // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
+            //     if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {
+            //         event.preventDefault();
+            //         return false;
+            //     }
+            // },
+            // onContextMenu: (event) => {
+            //     // 禁用鼠标右键菜单
+            //     event.preventDefault();
+            //     return false;
+            // }
         });
         let observered = false;
         const modalName = "modal-setPassword";

package/main/default/objects/space_users/fields/password_expired.field.yml

@@ -4,4 +4,4 @@ type: boolean
 omit: false
 hidden: false
 sort_no: 360
-defaultValue: true
+defaultValue: false

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

@@ -10,6 +10,17 @@
                 "tpl": "<div class='flex' style='align-items: center;'><div style='margin-right: 10px;'><span><span><svg class='slds-icon slds-icon_container slds-icon-standard-team-member slds-page-header__icon' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#team_member'></use></svg></span></span></div><div class='text-lg leading-none text-black font-bold'><span>关于</span></div></div>"
             },
             "body": [
+                {
+                    "type": "input-text",
+                    "label": {
+                        "type": "tpl",
+                        "tpl": "Product"
+                    },
+                    "name": "steedos",
+                    "value": "Steedos Platform",
+                    "static": true,
+                    "className": "mb-0 border-b py-1 ml-2"
+                },
                 {
                     "type": "input-text",
                     "label": {
@@ -28,6 +39,7 @@
                         "tpl": "<%= ['资产包','Asset package','資産パッケージ'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
                     },
                     "type": "input-text",
+                    "hiddenOn": "true",
                     "name": "zichan",
                     "id": "u:65ad5545aeda",
                     "value": "${window:Builder.settings.assetUrls}",
@@ -41,6 +53,7 @@
                         "tpl": "<%= ['Amis版本','Amis Version','Amis バージョン'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
                     },
                     "name": "Amis",
+                    "hiddenOn": "true",
                     "id": "u:8a4d0a674931",
                     "value": "${window:Builder.settings.steedosAmisVersion}",
                     "static": true,
@@ -52,6 +65,7 @@
                         "tpl": "<%= ['CDN服务器','CDN Server','CDN サーバー'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
                     },
                     "name": "CDN",
+                    "hiddenOn": "true",
                     "type": "input-text",
                     "id": "u:5491c057ce27",
                     "value": "${window:Builder.settings.unpkgUrl}",
@@ -59,7 +73,7 @@
                     "className": "mb-0 border-b py-1 ml-2"
                 },
                 {
-                    "label": "ROOT_URL",
+                    "label": "URL",
                     "name": "RootUrl",
                     "type": "input-text",
                     "id": "u:184e9280ea50",
@@ -71,20 +85,20 @@
                     "type": "button-toolbar",
                     "label": {
                         "type": "tpl",
-                        "tpl": "<%= ['技术支持','Technical Support','テクニカルサポート'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
+                        "tpl": "<%= ['官网','Website','テクニカルサポート'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
                     },
                     "className": "mb-0 border-b py-1 ml-2",
                     "buttons": [
                       {
                         "type": "button",
-                        "label": "https://www.steedos.cn/",
+                        "label": "https://www.steedos.com/",
                         "level": "link",
                         "style": {
                           "padding": 0,
                           "margin": 0,
                           "height": "unset"
                         },
-                        "onClick": "Steedos.openWindow('https://www.steedos.cn/');"
+                        "onClick": "Steedos.openWindow('https://www.steedos.com/');"
                       }
                     ],
                     "inputClassName": "antd-Form-static m-0",
@@ -95,6 +109,7 @@
                         "type": "tpl",
                         "tpl": "<%= ['客服热线','Customer Service Hotline','カスタマーサービスホットライン'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
                     },
+                    "hiddenOn": "true",
                     "name": "rexian",
                     "type": "input-text",
                     "id": "u:27b9745bd047",
@@ -104,6 +119,7 @@
                 },
                 {
                     "type": "button-toolbar",
+                    "hiddenOn": "true",
                     "label": {
                         "type": "tpl",
                         "tpl": "<%= ['客服邮箱','Customer Service Email','カスタマーサービスのメールアドレス'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"
@@ -123,6 +139,7 @@
                   },
                 {
                     "type": "button-toolbar",
+                    "hiddenOn": "true",
                     "label": {
                         "type": "tpl",
                         "tpl": "<%= ['隐私政策','Privacy Policy','プライバシーポリシー'][['zh-cn','en-us','ja'].indexOf(data.global.user.locale  || 'zh-cn')] %>"

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

@@ -4,7 +4,7 @@
   "body": [
     {
       "type": "steedos-object-form",
-      "className": "sm:border sm:rounded sm:border-gray-300 bg-white p-4",
+      "className": "",
       "label": "对象表单",
       "objectApiName": "apps",
       "recordId": "${recordId}",
@@ -47,6 +47,7 @@
                 "amis": {
                   "type": "select",
                   "source": "${tab_groups|pick:group_name}",
+                  "popOverContainerSelector": "body",
                   "onEvent": {
                     "change": {
                       "actions": [

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

@@ -30,7 +30,7 @@
                                         "bulletUseFont": true,
                                         "enableVar": false
                                     },
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${_id}/${original.name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${_id}/${original.name}?redirect=false",
                                     "visibleOn": "${ARRAYINCLUDES(['application/vnd.openxmlformats-officedocument.wordprocessingml.document'],record.original.type)}",
                                     "className": "flex justify-center items-center h-full",
                                     "loading": true
@@ -43,26 +43,26 @@
                                         "bulletUseFont": true,
                                         "enableVar": false
                                     },
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${_id}/${original.name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${_id}/${original.name}?redirect=false",
                                     "visibleOn": "${ARRAYINCLUDES(['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],record.original.type)}",
                                     "className": "office-viewer-excel",
                                     "id": "u:07ef4d92d664",
                                     "loading": true
                                 },
                                 {
-                                    "type": "pdf-viewer",
+                                    "type": "iframe",
                                     "id": "pdf-viewer",
                                     "name": "file",
-                                    "width": 500,
                                     "source": "src",
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${_id}/${original.name}",
-                                    "visibleOn": "${ARRAYINCLUDES(['application/pdf'],record.original.type)}"
+                                    "src": "/api/v6/files/cfs.files.filerecord/${_id}/${original.name}",
+                                    "visibleOn": "${ARRAYINCLUDES(['application/pdf'],record.original.type)}",
+                                    "className": "pdf-viewer w-full"
                                 },
                                 {
                                     "type": "image",
                                     "id": "u:4d9071791016",
                                     "visibleOn": "${ARRAYINCLUDES(['image/png','image/jpeg','image/bmp','image/gif','image/webp','image/psd','image/svg','image/tiff'],record.original.type)}",
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${_id}/${original.name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${_id}/${original.name}",
                                     "imageMode": "original",
                                     "enlargeAble": false,
                                     "maxScale": 200,
@@ -116,7 +116,7 @@
                     ],
                     "id": "u:0bed5e9e0a6f",
                     "visibleOn": "${ARRAYINCLUDES(['application/vnd.openxmlformats-officedocument.wordprocessingml.document','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/pdf','image/png','image/jpeg','image/bmp','image/gif','image/webp','image/psd','image/svg','image/tiff'],${record.original.type})}",
-                    "className": "tab-container-office-preview"
+                    "className": "tab-container-office-preview  p-0"
                 },
                 {
                     "title": "详细",

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

@@ -14,7 +14,7 @@
             "tabs": [
                 {
                     "title": "${'CustomLabels.cms_files_pagedetail_tab_preview' | t}",
-                    "className": "tab-container-office-preview",
+                    "className": "tab-container-office-preview p-0",
                     "body": [
                         {
                             "type": "page",
@@ -29,7 +29,7 @@
                                         "bulletUseFont": true,
                                         "enableVar": false
                                     },
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${versions[0].value}/${name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${versions[0].value}/${name}?redirect=false",
                                     "visibleOn": "${ARRAYINCLUDES(['docx'],extention)}",
                                     "className": "flex justify-center items-center h-full",
                                     "loading": true
@@ -42,26 +42,26 @@
                                         "bulletUseFont": true,
                                         "enableVar": false
                                     },
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${versions[0].value}/${name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${versions[0].value}/${name}?redirect=false",
                                     "visibleOn": "${ARRAYINCLUDES(['xlsx'],extention)}",
                                     "className": "office-viewer-excel",
                                     "id": "u:07ef4d92d664",
                                     "loading": true
                                 },
                                 {
-                                   "type": "pdf-viewer",
+                                   "type": "iframe",
                                     "id": "pdf-viewer",
                                     "name": "file",
-                                    "width": 500,
                                     "source": "src",
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${versions[0].value}/${name}",
+                                    "className": "pdf-viewer w-full",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${versions[0].value}/${name}",
                                     "visibleOn": "${ARRAYINCLUDES(['pdf','PDF'],extention)}"
                                 },
                                 {
                                     "type": "image",
                                     "id": "u:4d9071791016",
                                     "visibleOn": "${ARRAYINCLUDES(['png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'],extention)}",
-                                    "src": "/api/v6/files/download/cfs.files.filerecord/${versions[0].value}/${name}",
+                                    "src": "/api/v6/files/cfs.files.filerecord/${versions[0].value}/${name}",
                                     "imageMode": "original",
                                     "enlargeAble": false,
                                     "maxScale": 200,

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

@@ -196,7 +196,7 @@
             ],
             "id": "u:6a3b45d7adcf",
             "tabsMode": "vertical",
-            "className": "steedos-record-tabs bg-white m-4 border-none sm:shadow",
+            "className": "steedos-record-tabs bg-white m-4 border-none sm:shadow p-1 sm:rounded",
             "toolbarClassName": "",
             "linksClassName": "",
             "contentClassName": "bg-white",

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

@@ -78,7 +78,7 @@
                                     "initiallyOpen": false,
                                     "extractValue": true,
                                     "onlyChildren": true,
-                                    "treeContainerClassName": "no-border",
+                                    "treeContainerClassName": "no-border h-full",
                                     "showIcon": false,
                                     "enableNodePath": false,
                                     "autoCheckChildren": false,
@@ -182,7 +182,7 @@
                                             "hiddenOn": "${window:innerWidth < 768 && false}"
                                         }
                                     ],
-                                    "className": "bg-gray-100",
+                                    "className": "",
                                     "style": {
                                         "border": 0,
                                         "border-radius": 0
@@ -276,6 +276,9 @@
         },
         ".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.router.js

@@ -9,22 +9,12 @@ const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
-const path = require('path');
-const getPublicAssetUrls = function(assetUrls){
-    const values = _.map(_.split(assetUrls), (item)=>{
-        if(_.startsWith(item, '/')){
-            return Meteor.absoluteUrl(item) ;
-        }else{
-            return item;
-        }
-    })
-    return _.join(values, ',')
-}
+
 router.get('/api/amisButtonDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
+        let assetUrls = req.query.assetUrls;
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {

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

@@ -11,21 +11,12 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const objectql = require('@steedos/objectql');
-const getPublicAssetUrls = function(assetUrls){
-    const values = _.map(_.split(assetUrls), (item)=>{
-        if(_.startsWith(item, '/')){
-            return Meteor.absoluteUrl(item) ;
-        }else{
-            return item;
-        }
-    })
-    return _.join(values, ',')
-}
+
 router.get('/api/amisListviewDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
+        let assetUrls = req.query.assetUrls;
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
         //     rootUrl: process.env.ROOT_URL,

package/main/default/routes/object_fields_design.ejs

@@ -9,7 +9,8 @@
     <script src="/toast/toastr.min.js"></script>
     <script>
     window._disabledFields = [
-      'table'
+      'table',
+      'approval_comments'
     ]
   </script>
     <style>

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

@@ -9,25 +9,12 @@ const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
-const path = require('path');
-const objectql = require('@steedos/objectql');
-
-const getPublicAssetUrls = function(assetUrls){
-    const values = _.map(_.split(assetUrls), (item)=>{
-        if(_.startsWith(item, '/')){
-            return Meteor.absoluteUrl(item) ;
-        }else{
-            return item;
-        }
-    })
-    return _.join(values, ',')
-}
 
 router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
+        let assetUrls = req.query.assetUrls;
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {

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

@@ -253,7 +253,7 @@ module.exports = {
                         rootUrl = process.env.ROOT_URL
                     }
                     if (!rootUrl) {
-                        rootUrl = 'http://localhost:5000'
+                        rootUrl = 'http://localhost:5100'
                     }
                     const server = rootUrl
                     if (!server.startsWith('http')) {

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

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-12-02 16:53:23
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-27 15:20:23
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-10-22 09:32:01
  * @Description: 
  */
 "use strict";
@@ -98,6 +98,9 @@ module.exports = {
                         }
                     })
                 }
+                return {
+                    success: true
+                };
             }
         },
         invite_user: {

package/main/default/tabs/admin_bull_dashboard.tab.yml

@@ -1,7 +1,8 @@
 name: admin_bull_dashboard
 desktop: true
 icon: dashboard
-is_new_window: true
+is_new_window: false
+is_use_iframe: true
 label: Bull Dashboard
 mobile: true
 permissions:

package/main/default/tabs/admin_object_functions.tab.yml

@@ -0,0 +1,21 @@
+name: admin_object_functions
+desktop: true
+icon: formula
+is_new_window: false
+label: Object Functions
+mobile: true
+permissions:
+  - permission: 'on'
+    permission_set: admin
+  - permission: 'off'
+    permission_set: user
+  - permission: 'off'
+    permission_set: customer
+  - permission: 'off'
+    permission_set: supplier
+  - permission: 'off'
+    permission_set: organization_admin
+  - permission: 'off'
+    permission_set: workflow_admin
+type: object
+object: object_functions

package/main/default/tabs/admin_swagger.tab.yml

@@ -0,0 +1,22 @@
+name: admin_swagger
+desktop: true
+icon: data_model
+is_new_window: false
+is_use_iframe: true
+label: OpenAPI
+mobile: true
+permissions:
+  - 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: url
+url: /api/v6/

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

@@ -90,7 +90,7 @@ CustomTabs:
   admin_objects: Objects
   admin_datasources: External Data Sources
   admin_queue_import: Data Import
-  admin_pages: Micro Pages
+  admin_pages: Custom Pages
   admin_tabs: Tabs
   admin_queries: Queries
   admin_charts: Charts
@@ -112,7 +112,7 @@ CustomTabs:
   admin_instances_statistic: Efficiency Statistics
   admin_webhooks: Webhooks
   admin_object_workflows: Object Synchronization Rules
-  admin_sessions: Sessions
+  admin_sessions: Login Sessions
   admin_audit_records: Audit Records
   admin_autonumber: Auto Number
   admin_holidays: Holidays

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

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-12-07 14:19:57
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2025-02-18 16:58:48
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-10-14 10:16:10
  * @Description: 
  */
 "use strict";
@@ -258,7 +258,7 @@ async function updatevaildate(suDoc, doc) {
             filters: [
                 ['mobile', '=', tmpMobile]
             ]
-        }))[0]
+        }))
 
         if (mobileUser && mobileUser._id !== suDoc.user) {
             throw new Error("space_users_error_phone_already_existed");

package/package.json

@@ -1,8 +1,7 @@
 {
     "name": "@steedos/service-core-objects",
-    "version": "3.0.0-beta.99",
+    "version": "3.0.0",
     "main": "package.service.js",
-    "private": false,
     "publishConfig": {
         "access": "public"
     },
@@ -10,12 +9,12 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/service-package-loader": "3.0.0-beta.99",
+        "@steedos/service-package-loader": "3.0.0",
         "json2xls": "^0.1.2",
         "lodash": "^4.17.21"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "a0e9d5ee78766e54048a385b7677f6916aa287c4"
+    "gitHead": "20ea485d800dd4ad0a99c82b26000879c2f85741"
 }

package/public/platform.css

@@ -59,4 +59,9 @@
 .antd-Pagination > li > a, .antd-Pagination > li > span {
     line-height: 28px;
     height: 28px;
+}
+
+
+body>.antd-PopOver{
+    z-index: 1410 !important;
 }