@steedos/standard-object-database 2.5.10-beta.2 → 2.5.10

package/main/default/objects/object_actions.action.js

@@ -7,7 +7,7 @@
  */
 module.exports = {
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}`);
+    document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.record.object}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms;

package/main/default/objects/object_listviews.action.js

@@ -92,7 +92,7 @@ module.exports = {
     return true;
   },
   showDesign: function (object_name, record_id) {
-    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}`);
+    document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
   },
   showDesignVisible: function (object_name, record_id, record_permissions) {
       var perms= {};

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

@@ -24,9 +24,16 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
+
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
         const retUrl = __meteor_runtime_config__.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}retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
 
         // 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

@@ -24,10 +24,15 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
-
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
         const retUrl = __meteor_runtime_config__.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}retUrl=${retUrl}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}locale=${locale}&retUrl=${retUrl}`;
         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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.10-beta.2",
+    "version": "2.5.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "d8944b0c8f42c29411911e093df35cbf9fe736e0"
+    "gitHead": "b918b6237fcf33152033429f055d5707d3cf0e02"
 }