@steedos/service-core-objects 3.0.13-beta.9 → 3.0.14-beta.1

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

@@ -45,6 +45,10 @@ fields:
     label: Shared to which organizations?
     help: 
     description: 
+  filter_required:
+    label: Filter Required
+    help: When enabled, users must set filter conditions before data is loaded.
+    description: 
   show_count:
     label: Show Record Count
     help: 

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

@@ -42,6 +42,10 @@ fields:
     label: 共享列表视图给哪些组织？
     help: 
     description: 
+  filter_required:
+    label: 要求先筛选
+    help: 启用后，用户必须先设置过滤条件才会请求数据。
+    description: 
   show_count:
     label: 显示条目数
     help: 

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/OAuth2AccessTokens.object.yml

@@ -0,0 +1,49 @@
+name: OAuth2AccessTokens
+icon: entity
+label: OAuth2 Token
+enable_search: false
+hidden: true
+fields:
+  userId:
+    label: User
+    type: lookup
+    reference_to: users
+    sortable: true
+    filterable: true
+  expires:
+    type: datetime
+    label: Expiration Time
+  clientId:
+    type: text
+    label: Client ID
+    omit: true
+    defaultValue: creator
+  accessToken:
+    type: text
+    label: Token
+    defaultValue: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              return Random.id(38);
+            }
+list_views:
+  all:
+    label: All OAuth2 Access Tokens
+    columns:
+      - userId
+      - expires
+      - accessToken
+permission_set:
+  user:
+    allowCreate: false
+    allowDelete: false
+    allowEdit: false
+    allowRead: false
+    modifyAllRecords: false
+    viewAllRecords: false
+  admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: true
+    viewAllRecords: true

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

@@ -0,0 +1,63 @@
+name: OAuth2Clients
+icon: entity
+label: OAuth2 Client
+hidden: true
+enable_search: false
+fields:
+  clientName:
+    type: text
+    label: Name
+    is_name: true
+    required: true
+    searchable: true
+  active:
+    type: boolean
+    label: Active
+    defaultValue: true
+  expires:
+    type: number
+    label: Term of Validity（HOUR）
+    defaultValue: '1'
+  redirectUri:
+    type: text
+    label: Callback URL
+    is_wide: true
+    required: true
+  clientId:
+    type: text
+    label: Client ID
+    is_wide: true
+    defaultValue: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              return Random.id();
+            }
+  clientSecret:
+    type: text
+    label: Secret
+    is_wide: true
+    defaultValue: !<tag:yaml.org,2002:js/function> |-
+      function () {
+              return Random.secret();
+            }
+list_views:
+  all:
+    label: All OAuth2 Clients
+    columns:
+      - clientName
+      - active
+      - redirectUri
+permission_set:
+  user:
+    allowCreate: false
+    allowDelete: false
+    allowEdit: false
+    allowRead: false
+    modifyAllRecords: false
+    viewAllRecords: false
+  admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: true
+    viewAllRecords: true

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/object_listviews/object_listviews.object.yml

@@ -300,6 +300,14 @@ fields:
     sort_no: 900
     group: advanced
     visible_on: '${type != ''calendar'' && type != ''timeline''}'
+  filter_required:
+    name: filter_required
+    label: Filter Required
+    inlineHelpText: When enabled, users must set filter conditions before data is loaded.
+    type: boolean
+    defaultValue: false
+    sort_no: 902
+    group: advanced
   filter_fields:
     name: filter_fields
     label: Default Filter Fields

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/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/routes/amis_button_design.router.js

@@ -32,7 +32,7 @@ router.get('/api/amisButtonDesign', auth.requireAuthentication, async function (
         }
         const retUrl = process.env.ROOT_URL + `/app/admin/object_actions/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}&unpkgUrl=${process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn'}`;
 
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

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

@@ -32,7 +32,7 @@ router.get('/api/amisListviewDesign', auth.requireAuthentication, async function
         }
         const retUrl = process.env.ROOT_URL + `/app/admin/object_listviews/view/${req.query.id}`
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}&unpkgUrl=${process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn'}`;
         const record = await objectql.getObject('object_listviews').findOne(req.query.id);
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

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

@@ -31,7 +31,7 @@ router.get('/api/amisObjectFieldsDesign', auth.requireAuthentication, async func
         }
         const retUrl = req.query.retUrl || process.env.ROOT_URL + '/app/admin/objects/view/' + req.query.oid
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/object?${assetUrl}retUrl=${retUrl}&locale=${locale}&isObjectDesign=1&pType=objectDesign`;
+        const builderHost = `${steedosBuilderUrl}/object?${assetUrl}retUrl=${retUrl}&locale=${locale}&isObjectDesign=1&pType=objectDesign&unpkgUrl=${process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn'}`;
 
         const filename = __dirname+'/object_fields_design.ejs'
         const data = {

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

@@ -129,7 +129,7 @@ module.exports = {
         const suObj = objectql.getObject('space_users')
         const spaceObj = objectql.getObject('spaces')
         // 工作区修改后，该工作区的根部门的name也要修改，根部门和子部门的fullname也要修改
-        if (doc.name) {
+        if (doc.name && doc.name !== previousDoc.name) {
             const spaceDoc = await spaceObj.findOne(id)
             // 直接修改根部门名字，跳过验证
             const rootOrg = (await orgObj.find({

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.9",
+    "version": "3.0.14-beta.1",
     "main": "package.service.js",
     "publishConfig": {
         "access": "public"
@@ -9,7 +9,7 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/service-package-loader": "3.0.13-beta.9",
+        "@steedos/service-package-loader": "3.0.14-beta.1",
         "bcryptjs": "^3.0.3",
         "json2xls": "^0.1.2",
         "lodash": "^4.17.21"
@@ -17,5 +17,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "3195edc9120425e3384ce713160bc77d585612f9"
+    "gitHead": "cfda80963d2a7acc1e1d387808824dc52c2348cd"
 }