@steedos/service-core-objects 3.0.13-beta.3 → 3.0.13-beta.32

package/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml

@@ -10,6 +10,10 @@ fields:
     label: Space Owner
     help: 
     description: 
+  password_expiry_days:
+    label: Password Expiry Days
+    help: Number of days after which users must change their password. Leave empty to disable password expiry.
+    description: 
   admins:
     label: Admins
     help: 
@@ -52,6 +56,7 @@ fields:
     description: 
 groups:
   register_account: Register account
+  Security: Security
   developer: Developer
 listviews:
   all:

package/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml

@@ -10,6 +10,10 @@ fields:
     label: 所有者
     help: 
     description: 
+  password_expiry_days:
+    label: 密码过期天数
+    help: 用户必须修改密码的天数。留空表示禁用密码过期。
+    description: 
   admins:
     label: 管理员
     help: 
@@ -52,6 +56,7 @@ fields:
     description: 
 groups:
   register_account: 用户自助注册
+  Security: 安全
   developer: 华炎云
 listviews:
   all:

package/main/default/objectTranslations/users.en/users.en.objectTranslation.yml

@@ -63,6 +63,10 @@ fields:
     label: Password expired
     help: 
     description: 
+  password_modified_at:
+    label: Password Modified At
+    help: 
+    description: 
   company_id:
     label: 
     help: 

package/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml

@@ -60,7 +60,11 @@ fields:
     help: 
     description: 
   password_expired:
-    label: Password expired
+    label: 密码已过期
+    help: 
+    description: 
+  password_modified_at:
+    label: 密码修改时间
     help: 
     description: 
   company_id:

package/main/default/objects/_base/base.object.js

@@ -12,6 +12,12 @@ var standardCustomizeSaveRequestAdaptor = `
         delete newDoc.__filename;
         delete newDoc.responseData;
         delete newDoc.responseStatus;
+        console.log('newDoc.nav_schema', newDoc.nav_schema);
+        if(newDoc.nav_schema){
+            if(typeof newDoc.nav_schema !== 'string'){
+                newDoc.nav_schema = JSON.stringify(newDoc.nav_schema);
+            }
+        }
     }
     else if(objectName === "permission_set"){
         objectFields = ['name', 'label', 'type', 'license', 'lockout_interval', 'max_login_attempts', 'password_history', 'default_standard_buttons', 'assigned_apps'];

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

@@ -26,7 +26,7 @@ module.exports = {
                     type: 'post', async: false, data: JSON.stringify({
                         space_user_id: record_id,
                         space_id: userSession.spaceId,
-                        password: CryptoJS.SHA256(inputValue).toString()
+                        password: window.sha256(inputValue).toString()
                     })
                 });
                 if (!result) {
@@ -70,6 +70,29 @@ module.exports = {
             autoComplete: "new-password",
             className: "ant-input",
             ref: inputRef,
+            style: {
+                WebkitBoxSizing: 'border-box',
+                boxSizing: 'border-box',
+                margin: 0,
+                padding: '4px 11px', 
+                fontVariant: 'tabular-nums',
+                listStyle: 'none',
+                WebkitFontFeatureSettings: "'tnum'",
+                fontFeatureSettings: "'tnum'",
+                position: 'relative',
+                display: 'inline-block',
+                width: '100%',
+                height: '32px',
+                color: 'rgba(0, 0, 0, 0.65)',
+                fontSize: '14px',
+                lineHeight: 1.5,
+                backgroundColor: '#fff',
+                backgroundImage: 'none',
+                border: '1px solid #d9d9d9',
+                borderRadius: '4px',
+                WebkitTransition: 'all 0.3s',
+                transition: 'all 0.3s',
+                }
             // onKeyDown: (event) => {
             //     // 禁用ctrlKey/metaKey+c/v/a，复制、剪切、粘贴、全选，其中metaKey是mac系统中相关操作的辅助键
             //     if ((event.ctrlKey || event.metaKey) && [67, 88, 86, 65].indexOf(event.keyCode) > -1) {

package/main/default/objects/space_users/permissions/user.permission.yml

@@ -4,6 +4,7 @@ allowDelete: false
 allowEdit: true
 allowRead: true
 modifyAllRecords: false
+viewAllRecords: true
 viewCompanyRecords: true
 uneditable_fields:
   - profile

package/main/default/objects/spaces/spaces.object.yml

@@ -112,6 +112,13 @@ fields:
     omit: false
     hidden: false
     sort_no: 110
+  password_expiry_days:
+    name: password_expiry_days
+    label: Password Expiry Days
+    type: number
+    inlineHelpText: Number of days after which users must change their password. Leave empty to disable password expiry.
+    sort_no: 120
+    min: 0
   services:
     name: services
     type: object

package/main/default/objects/users/users.object.yml

@@ -126,6 +126,13 @@ fields:
     omit: true
     hidden: true
     sort_no: 230
+  password_modified_at:
+    name: password_modified_at
+    label: Password Modified At
+    type: datetime
+    omit: true
+    hidden: true
+    sort_no: 235
   primary_email_verified:
     name: primary_email_verified
     type: boolean

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

@@ -13,7 +13,7 @@
                         {
                             "type": "wrapper",
                             "size": "none",
-                            "className": "space-users-list-sidebar-wrapper flex-shrink-0 min-w-[260px] overflow-y-auto bg-white border-r lg:order-first lg:flex lg:flex-col ",
+                            "className": "space-users-list-sidebar-wrapper flex-shrink-0 min-w-[260px] bg-white border-r lg:order-first lg:flex lg:flex-col ",
                             "body": [
                                 {
                                     "type": "input-tree",
@@ -277,8 +277,18 @@
         ".space-users-list-custom-page.space-users-list-pc.space-users-list-sidebar-open .space-users-list-sidebar-wrapper": {
             "min-width": "260px"
         },
-        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper .antd-Form-item .antd-Tree": {
-            "max-height": "none"
+        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper .antd-Form-item": {
+            "height": "100%"
+        },
+        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper .antd-TreeControl": {
+            "display": "flex",
+            "flex-direction": "column",
+            "height": "100%"
+        },
+        ".space-users-list-custom-page.space-users-list-pc .space-users-list-sidebar-wrapper .antd-Tree": {
+            "flex": "1",
+            "overflow-y": "auto",
+            "max-height": "none !important"
         }
     }
 }

package/main/default/util/password.js

@@ -45,4 +45,5 @@ exports.parsePassword = function(newPassword, options){
     }
     options.services.password.bcrypt = bcrypt;
     options.password_expired = false;
+    options.password_modified_at = new Date();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-core-objects",
-    "version": "3.0.13-beta.3",
+    "version": "3.0.13-beta.32",
     "main": "package.service.js",
     "publishConfig": {
         "access": "public"
@@ -9,7 +9,7 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/service-package-loader": "3.0.13-beta.3",
+        "@steedos/service-package-loader": "3.0.13-beta.32",
         "bcryptjs": "^3.0.3",
         "json2xls": "^0.1.2",
         "lodash": "^4.17.21"
@@ -17,5 +17,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "4d016bc4e89b8bb68765f3b2e13b85a82c28ed03"
+    "gitHead": "a5e6973ccd624211f6a35dfe9f0013db260b7a0b"
 }