@steedos/standard-object-database 2.4.0-beta.31 → 2.4.0-beta.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/main/default/objects/object_actions.action.js +1 -1
  2. package/main/default/objects/object_listviews.action.js +1 -1
  3. package/main/default/routes/amis_button_design.router.js +3 -14
  4. package/main/default/routes/amis_listview_design.router.js +3 -15
  5. package/package.json +2 -2
package/main/default/objects/object_actions.action.js CHANGED
@@ -7,7 +7,7 @@
7
7
  */
8
8
  module.exports = {
9
9
  showDesign: function (object_name, record_id) {
10
- document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.object}`);
10
+ document.location = Steedos.absoluteUrl(`/api/amisButtonDesign?id=${record_id}&object=${this.record.object}&assetUrls=${Builder.settings.assetUrls}`);
11
11
  },
12
12
  showDesignVisible: function (object_name, record_id, record_permissions) {
13
13
  var perms;
package/main/default/objects/object_listviews.action.js CHANGED
@@ -92,7 +92,7 @@ module.exports = {
92
92
  return true;
93
93
  },
94
94
  showDesign: function (object_name, record_id) {
95
- document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}`);
95
+ document.location = Steedos.absoluteUrl(`/api/amisListviewDesign?id=${record_id}&object=${this.record.object_name}&assetUrls=${Builder.settings.assetUrls}`);
96
96
  },
97
97
  showDesignVisible: function (object_name, record_id, record_permissions) {
98
98
  var perms= {};
package/main/default/routes/amis_button_design.router.js CHANGED
@@ -15,19 +15,8 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
15
15
  try {
16
16
  res.set('Content-Type', 'text/html');
17
17
  const userSession = req.user;
18
- let assetUrl = "";
19
- let assetUrls = null;
20
- if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
21
- assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
22
- assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
23
- }else{
24
- var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
25
- var packageFile = path.join(fullPath,'package.json');
26
- var pkg = require(packageFile);
27
- moduleVersion = pkg.version;
28
- assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
29
- assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
30
- }
18
+ let assetUrls = req.query.assetUrls;
19
+ const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
31
20
 
32
21
  // const dataContext = {
33
22
  // rootUrl: __meteor_runtime_config__.ROOT_URL,
@@ -38,7 +27,7 @@ router.get('/api/amisButtonDesign', core.requireAuthentication, async function (
38
27
 
39
28
  const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/objects/${req.query.object}/object_actions/grid?related_field_name=object`
40
29
  const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
41
- const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}&retUrl=${retUrl}`;
30
+ const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
42
31
 
43
32
  // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
44
33
  // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
package/main/default/routes/amis_listview_design.router.js CHANGED
@@ -15,20 +15,8 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
15
15
  try {
16
16
  res.set('Content-Type', 'text/html');
17
17
  const userSession = req.user;
18
- let assetUrl = "";
19
- let assetUrls = null;
20
- if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
21
- assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
22
- assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
23
- }else{
24
- var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
25
- var packageFile = path.join(fullPath,'package.json');
26
- var pkg = require(packageFile);
27
- moduleVersion = pkg.version;
28
- assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
29
- assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
30
- }
31
-
18
+ let assetUrls = req.query.assetUrls;
19
+ const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
32
20
  // const dataContext = {
33
21
  // rootUrl: __meteor_runtime_config__.ROOT_URL,
34
22
  // tenantId: userSession.spaceId,
@@ -38,7 +26,7 @@ router.get('/api/amisListviewDesign', core.requireAuthentication, async function
38
26
 
39
27
  const retUrl = __meteor_runtime_config__.ROOT_URL + `/app/admin/objects/${req.query.object}/object_listviews/grid?related_field_name=object`
40
28
  const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
41
- const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}&retUrl=${retUrl}`;
29
+ const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}`;
42
30
 
43
31
  // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
44
32
  // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/standard-object-database",
3
- "version": "2.4.0-beta.31",
3
+ "version": "2.4.0-beta.33",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -15,5 +15,5 @@
15
15
  },
16
16
  "repository": {},
17
17
  "license": "MIT",
18
- "gitHead": "a774174cebbb39c961ad03e20e990781082c8c04"
18
+ "gitHead": "8420402aa553e2bb52572a7f5d891c297c4ff908"
19
19
  }