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

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

@@ -35,7 +35,7 @@ listviews:
     label: all
 actions:
   standard_new:
-    label: New
+    label: Upload
   standard_open_view:
     label: Open View
   online_preview:
@@ -48,3 +48,9 @@ actions:
     label: Download
   new_version:
     label: Upgrade
+CustomLabels:
+  cms_files_upload_success: Uploaded successfully
+  cms_files_pagedetail_tab_preview: Preview
+  cms_files_pagedetail_tab_detail: Details
+  cms_files_pagedetail_tab_historical_versions: Historical Versions
+  cms_files_pagedetail_tab_chatter: Comments

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

@@ -35,7 +35,7 @@ listviews:
     label: 所有
 actions:
   standard_new:
-    label: 新建
+    label: 上传
   standard_open_view:
     label: 查看
   online_preview:
@@ -48,3 +48,9 @@ actions:
     label: 下载
   new_version:
     label: 上传新版本
+CustomLabels:
+  cms_files_upload_success: 上传成功
+  cms_files_pagedetail_tab_preview: 预览
+  cms_files_pagedetail_tab_detail: 详细
+  cms_files_pagedetail_tab_historical_versions: 历史版本
+  cms_files_pagedetail_tab_chatter: 评论

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

@@ -167,8 +167,25 @@ actions:
     label: Verify Email
   verify_mobile:
     label: Verify Mobile
+  clear_login_tokens:
+    label: Log out all logins
 CustomLabels:
   space_users_field_profile_def_options_admin: Administrator
   space_users_field_profile_def_options_user: Employee
   space_users_field_profile_def_options_supplier: Supplier
   space_users_field_profile_def_options_customer: Customer
+  space_users_actions_disable_confirmText: Are you sure you want to disable this user?
+  space_users_actions_disable_success: The user has disabled successfully
+  space_users_actions_disable_failed: The user failed to disable. Please try again later
+  space_users_actions_enable_confirmText: Are you sure you want to enable this user?
+  space_users_actions_enable_success: The user has enabled successfully
+  space_users_actions_enable_failed: The user failed to enable. Please try again later
+  space_users_actions_lockout_confirmText: Are you sure you want to lockout this user?
+  space_users_actions_lockout_success: The user has lockouted successfully
+  space_users_actions_lockout_failed: The user failed to lockout. Please try again later
+  space_users_actions_unlock_confirmText: Are you sure you want to unlock this user?
+  space_users_actions_unlock_success: The user has unlocked successfully
+  space_users_actions_unlock_failed: The user failed to unlock. Please try again later
+  space_users_actions_clear_login_tokens_confirmText: After logging out of all logins, all the logged-in flowers and clients of the user need to log in again. Are you sure you want to clean it up?
+  space_users_actions_clear_login_tokens_success: Logging out successfully
+

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

@@ -156,7 +156,7 @@ actions:
   setPassword:
     label: 修改密码
   disable:
-    label: 停用
+    label: 禁用
   enable:
     label: 启用
   lockout:
@@ -167,8 +167,24 @@ actions:
     label: 验证邮箱
   verify_mobile:
     label: 验证手机
+  clear_login_tokens:
+    label: 注销所有登录
 CustomLabels:
   space_users_field_profile_def_options_admin: 管理员
   space_users_field_profile_def_options_user: 员工
   space_users_field_profile_def_options_supplier: 供应商
   space_users_field_profile_def_options_customer: 客户
+  space_users_actions_disable_confirmText: 确定要禁用此用户吗？
+  space_users_actions_disable_success: 用户已禁用
+  space_users_actions_disable_failed: 用户禁用失败，请稍后再试
+  space_users_actions_enable_confirmText: 确定要启用此用户吗？
+  space_users_actions_enable_success: 用户已启用
+  space_users_actions_enable_failed: 用户启用失败，请稍后再试
+  space_users_actions_lockout_confirmText: 确定要锁定此用户吗？
+  space_users_actions_lockout_success: 用户已锁定
+  space_users_actions_lockout_failed: 用户锁定失败，请稍后再试
+  space_users_actions_unlock_confirmText: 确定要解锁此用户吗？
+  space_users_actions_unlock_success: 用户已解锁
+  space_users_actions_unlock_failed: 用户解锁失败，请稍后再试
+  space_users_actions_clear_login_tokens_confirmText: 注销所有登录后，用户所有已登录的流程器、客户端都需要重新登录。 确定要清理吗？
+  space_users_actions_clear_login_tokens_success: 注销成功

package/main/default/objects/cms_files/buttons/download.button.yml

@@ -6,7 +6,7 @@ amis_schema: |-
           {
               "id": "u:download",
               "type": "button",
-              "label": "下载",
+              "label": "${'CustomAction.cms_files.download' | t}",
               "onEvent": {
                   "click": {
                       "actions": [

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

@@ -164,7 +164,7 @@ actions:
                             "label": "",
                             "name": "__file",
                             "id": "u:a58d02614e04",
-                            "btnLabel": "上传新版本",
+                            "btnLabel": "${'CustomAction.cms_files.new_version' | t}",
                             "btnClassName": "m-0",
                             "className": "p-0",
                             "multiple": false,
@@ -202,7 +202,7 @@ actions:
                                                 "position": "top-right",
                                                 "closeButton": true,
                                                 "showIcon": true,
-                                                "msg": "上传成功"
+                                                "msg": "${'CustomLabels.cms_files_upload_success' | t}"
                                             },
                                             "actionType": "toast"
                                         },
@@ -265,7 +265,7 @@ actions:
                             "label": "",
                             "name": "__file",
                             "id": "u:a58d02614e04",
-                            "btnLabel": "上传",
+                            "btnLabel": "${'CustomAction.cms_files.standard_new' | t}",
                             "btnClassName": "m-0",
                             "className": "p-0",
                             "multiple": false,
@@ -303,7 +303,7 @@ actions:
                                                 "position": "top-right",
                                                 "closeButton": true,
                                                 "showIcon": true,
-                                                "msg": "${'cms_files.upload.message_success' | t}"
+                                                "msg": "${'CustomLabels.cms_files_upload_success' | t}"
                                             },
                                             "actionType": "toast"
                                         },

package/main/default/objects/objects/buttons/design_fields_layout.button.js

@@ -15,8 +15,11 @@ module.exports = {
         if (!record) {
             return toastr.error("未找到记录");
         }
-
-        window.open(Steedos.getRelativeUrl("/api/amisObjectFieldsDesign?oid=" + record_id+`&assetUrls=${Builder.settings.assetUrls}`));
+        var locale = Builder.settings.context?.user?.language || window.navigator.language;
+        if(locale === 'en' || locale.startsWith('en-')){
+            locale = 'en-US'
+        }
+        window.open(Steedos.getRelativeUrl("/api/amisObjectFieldsDesign?oid=" + record_id+`&assetUrls=${Builder.settings.assetUrls}&locale=${locale}`));
     },
     design_fields_layoutVisible: function(object_name, record_id, record_permissions, data) {
         var record = data && data.record;

package/main/default/objects/space_users/buttons/clear_login_tokens.button.yml

@@ -5,10 +5,10 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "注销所有登录",
+              "label": "${'CustomAction.space_users.clear_login_tokens' | t}",
               "id": "u:clear_login_tokens",
               "editorState": "default",
-              "confirmText": "注销所有登录后, 用户所有已登录的流程器、客户端都需要重新登录. 确定要清理吗?",
+              "confirmText": "${'CustomLabels.space_users_actions_clear_login_tokens_confirmText' | t}",
               "hiddenOn": "context.user.is_space_admin != true || Steedos.settings.public.enable_saas == true",
               "onEvent": {
                   "click": {
@@ -23,10 +23,7 @@ amis_schema: |-
                                       "url": "${context.rootUrl}/api/users/${record.user}/clear_login_tokens",
                                       "method": "get",
                                       "requestAdaptor": "",
-                                      "adaptor": "",
-                                      "messages": {
-                                          "success": "注销成功"
-                                      }
+                                      "adaptor": "return payload.success ? {data: {...payload}, status: 0, msg: t('CustomLabels.space_users_actions_clear_login_tokens_success')} : {...payload, status: 1};"
                                   }
                               }
                           }

package/main/default/objects/space_users/buttons/disable.button.yml

@@ -8,9 +8,9 @@ amis_schema: |-
     "body": [
       {
         "type": "button",
-        "label": "禁用",
+        "label": "${'CustomAction.space_users.disable' | t}",
         "id": "u:disable",
-        "confirmText": "确定要禁用此用户吗?",
+        "confirmText": "${'CustomLabels.space_users_actions_disable_confirmText' | t}",
         "onEvent": {
           "click": {
             "weight": 0,
@@ -21,11 +21,7 @@ amis_schema: |-
                   "url": "/service/api/space_users/disable",
                   "method": "post",
                   "requestAdaptor": "api.data={suId: context.recordId}\n\n\nreturn api;",
-                  "adaptor": "",
-                  "messages": {
-                    "success": "用户已禁用",
-                    "failed": "用户禁用失败,请稍后再试"
-                  }
+                  "adaptor": "return payload.success ? {data: {...payload}, status: 0, msg: t('CustomLabels.space_users_actions_disable_success')} : {...payload, status: 1, msg: t('CustomLabels.space_users_actions_disable_failed')};"
                 }
               },
               {

package/main/default/objects/space_users/buttons/enable.button.yml

@@ -8,9 +8,9 @@ amis_schema: |-
     "body": [
       {
         "type": "button",
-        "label": "启用",
+        "label": "${'CustomAction.space_users.enable' | t}",
         "id": "u:enable",
-        "confirmText": "确定要启用此用户吗?",
+        "confirmText": "${'CustomLabels.space_users_actions_enable_confirmText' | t}",
         "onEvent": {
           "click": {
             "weight": 0,
@@ -21,11 +21,7 @@ amis_schema: |-
                   "url": "/service/api/space_users/enable",
                   "method": "post",
                   "requestAdaptor": "api.data={suId: context.recordId}\n\n\nreturn api;",
-                  "adaptor": "",
-                  "messages": {
-                    "success": "用户已启用",
-                    "failed": "用户启用失败,请稍后再试"
-                  }
+                  "adaptor": "return payload.success ? {data: {...payload}, status: 0, msg: t('CustomLabels.space_users_actions_enable_success')} : {...payload, status: 1, msg: t('CustomLabels.space_users_actions_enable_failed')};"
                 }
               },
               {

package/main/default/objects/space_users/buttons/lockout.button.yml

@@ -19,9 +19,9 @@ amis_schema: |-
       "body": [
         {
           "type": "button",
-          "label": "锁定",
+          "label": "${'CustomAction.space_users.lockout' | t}",
           "id": "u:lockout",
-          "confirmText": "确定要锁定此用户吗?",
+          "confirmText": "${'CustomLabels.space_users_actions_lockout_confirmText' | t}",
           "onEvent": {
             "click": {
               "weight": 0,
@@ -32,11 +32,7 @@ amis_schema: |-
                     "url": "/service/api/space_users/lockout",
                     "method": "post",
                     "requestAdaptor": "api.data={suId: context.recordId}\n\n\nreturn api;",
-                    "adaptor": "",
-                    "messages": {
-                      "success": "用户已锁定",
-                      "failed": "用户锁定失败,请稍后再试"
-                    }
+                    "adaptor": "return payload.success ? {data: {...payload}, status: 0, msg: t('CustomLabels.space_users_actions_lockout_success')} : {...payload, status: 1, msg: t('CustomLabels.space_users_actions_lockout_failed')};"
                   }
                 },
                 {

package/main/default/objects/space_users/buttons/unlock.button.yml

@@ -20,9 +20,9 @@ amis_schema: |-
       "body": [
         {
           "type": "button",
-          "label": "解锁",
+          "label": "${'CustomAction.space_users.unlock' | t}",
           "id": "u:lockout",
-          "confirmText": "确定要解锁此用户吗?",
+          "confirmText": "${'CustomLabels.space_users_actions_unlock_confirmText' | t}",
           "onEvent": {
             "click": {
               "weight": 0,
@@ -33,11 +33,7 @@ amis_schema: |-
                     "url": "/service/api/space_users/unlock",
                     "method": "post",
                     "requestAdaptor": "api.data={suId: context.recordId}\n\n\nreturn api;",
-                    "adaptor": "",
-                    "messages": {
-                      "success": "用户已解锁",
-                      "failed": "用户解锁失败,请稍后再试"
-                    }
+                    "adaptor": "return payload.success ? {data: {...payload}, status: 0, msg: t('CustomLabels.space_users_actions_unlock_success')} : {...payload, status: 1, msg: t('CustomLabels.space_users_actions_unlock_failed')};"
                   }
                 },
                 {

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

@@ -13,7 +13,7 @@
             "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:border sm:rounded",
             "tabs": [
                 {
-                    "title": "预览",
+                    "title": "${'CustomLabels.cms_files_pagedetail_tab_preview' | t}",
                     "className": "tab-container-office-preview",
                     "body": [
                         {
@@ -119,7 +119,7 @@
                     "visibleOn": "${ARRAYINCLUDES(['docx', 'xlsx', 'pdf', 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'],${extention})}"
                 },
                 {
-                    "title": "详细",
+                    "title": "${'CustomLabels.cms_files_pagedetail_tab_detail' | t}",
                     "body": [
                         {
                             "type": "steedos-object-form",
@@ -134,7 +134,7 @@
                     "id": "u:5d4e7e3f6ecc"
                 },
                 {
-                    "title": "历史版本",
+                    "title": "${'CustomLabels.cms_files_pagedetail_tab_historical_versions' | t}",
                     "body": [
                         {
                             "type": "steedos-object-related-lists",
@@ -149,7 +149,7 @@
                     "id": "u:f2f42d8195ab"
                 },
                 {
-                    "title": "评论",
+                    "title": "${'CustomLabels.cms_files_pagedetail_tab_chatter' | t}",
                     "body": [
                         {
                             "type": "rooms-provider",

package/main/default/routes/object_fields_design.ejs

@@ -59,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");

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/package.json

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