@steedos/service-pages 2.5.12-beta.8 → 2.5.12

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 (3) hide show
  1. package/main/default/client/page.render.client.js +88 -86
  2. package/main/default/services/page.service.js +23 -8
  3. package/package.json +2 -2
package/main/default/client/page.render.client.js CHANGED
@@ -354,93 +354,95 @@
354
354
  // console.log('autorun=====>computation:', computation)
355
355
  // Session.get("record_id");
356
356
  var container, e, lastData, ref, ref1, ref2, regions, schema, updateProps, updatePropsData;
357
- regions = self.data.regions();
358
- // console.log('regions====>', regions, this.lastRegions);
359
- updateProps = true;
360
- if (regions.objectName !== ((ref = this.lastRegions) != null ? ref.objectName : void 0)) {
361
- updateProps = false;
362
- }
363
- this.lastRegions = regions;
364
- if (updateProps && self.pageName) {
365
- try {
366
- if (SteedosUI.refs[self.pageName]) {
367
- let queryParams = FlowRouter.current().queryParams
368
-
369
- if(_.isArray(queryParams.side_object)){
370
- if(queryParams.side_object.length >= 1){
371
- queryParams.side_object = queryParams.side_object[0]
372
- }else{
373
- queryParams.side_object = ''
357
+ if(self.data.regions){
358
+ regions = self.data.regions();
359
+ // console.log('regions====>', regions, this.lastRegions);
360
+ updateProps = true;
361
+ if (regions.objectName !== ((ref = this.lastRegions) != null ? ref.objectName : void 0)) {
362
+ updateProps = false;
363
+ }
364
+ this.lastRegions = regions;
365
+ if (updateProps && self.pageName) {
366
+ try {
367
+ if (SteedosUI.refs[self.pageName]) {
368
+ let queryParams = FlowRouter.current().queryParams
369
+
370
+ if(_.isArray(queryParams.side_object)){
371
+ if(queryParams.side_object.length >= 1){
372
+ queryParams.side_object = queryParams.side_object[0]
373
+ }else{
374
+ queryParams.side_object = ''
375
+ }
374
376
  }
375
- }
376
-
377
- if(_.isArray(queryParams.side_listview_id)){
378
- if(queryParams.side_listview_id.length >= 1){
379
- queryParams.side_listview_id = queryParams.side_listview_id[0]
380
- }else{
381
- queryParams.side_listview_id = ''
377
+
378
+ if(_.isArray(queryParams.side_listview_id)){
379
+ if(queryParams.side_listview_id.length >= 1){
380
+ queryParams.side_listview_id = queryParams.side_listview_id[0]
381
+ }else{
382
+ queryParams.side_listview_id = ''
383
+ }
384
+ };
385
+
386
+ updatePropsData = {
387
+ objectName: objectName,
388
+ pageType: regions.pageType,
389
+ listViewId: regions.listViewId,
390
+ ...queryParams
391
+ };
392
+ if(queryParams.side_listview_id){
393
+ updatePropsData.listName=queryParams.side_listview_id
394
+ }else if(regions.listViewId){
395
+ updatePropsData.listName=regions.listViewId
382
396
  }
383
- };
384
-
385
- updatePropsData = {
386
- objectName: objectName,
387
- pageType: regions.pageType,
388
- listViewId: regions.listViewId,
389
- ...queryParams
390
- };
391
- if(queryParams.side_listview_id){
392
- updatePropsData.listName=queryParams.side_listview_id
393
- }else if(regions.listViewId){
394
- updatePropsData.listName=regions.listViewId
397
+
398
+ updatePropsData.display = Steedos.Page.getDisplay(objectName)
399
+
400
+ updatePropsData.recordId = Tracker.nonreactive(function() {
401
+ return Session.get("record_id");
402
+ });
403
+ lastData = ((ref1 = SteedosUI.refs[self.pageName]) != null ? (ref2 = ref1.__$schema) != null ? ref2.data : void 0 : void 0) || {};
404
+ // console.log("page_object Steedos.Page.Record.updateProps", {
405
+ // data: window._.defaultsDeep(updatePropsData, lastData)
406
+ // });
407
+ return SteedosUI.refs[self.pageName].updateProps({
408
+ data: window._.defaultsDeep(updatePropsData, lastData)
409
+ });
410
+ }
411
+ } catch (error) {
412
+ e = error;
413
+ console.error(self.pageName + ": " + e);
395
414
  }
396
-
397
- updatePropsData.display = Steedos.Page.getDisplay(objectName)
398
-
399
- updatePropsData.recordId = Tracker.nonreactive(function() {
400
- return Session.get("record_id");
401
- });
402
- lastData = ((ref1 = SteedosUI.refs[self.pageName]) != null ? (ref2 = ref1.__$schema) != null ? ref2.data : void 0 : void 0) || {};
403
- // console.log("page_object Steedos.Page.Record.updateProps", {
404
- // data: window._.defaultsDeep(updatePropsData, lastData)
405
- // });
406
- return SteedosUI.refs[self.pageName].updateProps({
407
- data: window._.defaultsDeep(updatePropsData, lastData)
408
- });
409
415
  }
410
- } catch (error) {
411
- e = error;
412
- console.error(self.pageName + ": " + e);
413
- }
414
- }
415
- if (!updateProps && self.pageName && SteedosUI.refs[self.pageName]) {
416
- try {
417
- SteedosUI.refs[self.pageName].unmount();
418
- } catch (error) {
419
- e = error;
420
- console.error(self.pageName + ": " + e);
421
- }
422
- }
423
- if (self.data.regions) {
424
- regions = Tracker.nonreactive(self.data.regions);
425
- this.lastRegions = regions;
426
- if (regions && regions.page && regions.page.schema) {
427
- schema = regions.page.schema;
428
- if (_.isString(schema)) {
429
- schema = JSON.parse(schema);
416
+ if (!updateProps && self.pageName && SteedosUI.refs[self.pageName]) {
417
+ try {
418
+ SteedosUI.refs[self.pageName].unmount();
419
+ } catch (error) {
420
+ e = error;
421
+ console.error(self.pageName + ": " + e);
422
+ }
423
+ }
424
+ if (self.data.regions) {
425
+ regions = Tracker.nonreactive(self.data.regions);
426
+ this.lastRegions = regions;
427
+ if (regions && regions.page && regions.page.schema) {
428
+ schema = regions.page.schema;
429
+ if (_.isString(schema)) {
430
+ schema = JSON.parse(schema);
431
+ }
432
+ self.pageName = schema.name;
433
+ }
434
+ }
435
+ objectName = Tracker.nonreactive(function() {
436
+ return Session.get("object_name");
437
+ });
438
+ recordId = Tracker.nonreactive(function() {
439
+ return Session.get("record_id");
440
+ });
441
+ container = Steedos.Page.Object.render(self, objectName, recordId);
442
+ // console.log("page_object Steedos.Page.Object.render");
443
+ if (container) {
444
+ return self.containerList.push(container);
430
445
  }
431
- self.pageName = schema.name;
432
- }
433
- }
434
- objectName = Tracker.nonreactive(function() {
435
- return Session.get("object_name");
436
- });
437
- recordId = Tracker.nonreactive(function() {
438
- return Session.get("record_id");
439
- });
440
- container = Steedos.Page.Object.render(self, objectName, recordId);
441
- // console.log("page_object Steedos.Page.Object.render");
442
- if (container) {
443
- return self.containerList.push(container);
444
446
  }
445
447
  });
446
448
  };
@@ -790,19 +792,19 @@
790
792
  const getSpaceLogo = function(){
791
793
  let logoSrc = '';
792
794
  const space = db.spaces.findOne(Steedos.getSpaceId())
793
- if(space?.avatar){
795
+ if(space && space.avatar){
794
796
  logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar)
795
- }else if(space?.avatar_square){
797
+ }else if(space && space.avatar_square){
796
798
  logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar_square)
797
799
  }else{
798
800
  var settings = Session.get("tenant_settings");
799
801
  var avatar_url = "";
800
802
  if(settings){
801
- avatar_url = settings?.logo_square_url;
803
+ avatar_url = settings.logo_square_url;
802
804
  }
803
805
  if(!avatar_url || !settings){
804
806
  avatar_url = "/images/logo_platform.png"
805
- if(Meteor.user()?.locale != 'zh-cn'){
807
+ if(Meteor.user() && Meteor.user().locale != 'zh-cn'){
806
808
  avatar_url = "/images/logo_platform.en-us.png"
807
809
  }
808
810
  }
package/main/default/services/page.service.js CHANGED
@@ -1,7 +1,9 @@
1
1
  const objectql = require('@steedos/objectql');
2
2
  const metadataAPI = require('@steedos/metadata-api');
3
3
  const _ = require('lodash');
4
-
4
+ // 使用变量,存储所有资产
5
+ const ASSETS = {};
6
+ const ENV_ASSETS = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',')
5
7
  module.exports = {
6
8
  name: "page",
7
9
  mixins: [],
@@ -208,9 +210,18 @@ module.exports = {
208
210
  },
209
211
  addAssetUrl: {
210
212
  handler: async function (ctx) {
211
- const { url } = ctx.params;
213
+ const { name, url } = ctx.params;
214
+ console.log(`addAssetUrl`, name, url)
212
215
  return broker.broadcast("page.addAssetUrl", {
213
- url
216
+ name, url
217
+ });
218
+ }
219
+ },
220
+ removeAssetUrl: {
221
+ handler: async function (ctx) {
222
+ const { name } = ctx.params;
223
+ return broker.broadcast("page.removeAssetUrl", {
224
+ name
214
225
  });
215
226
  }
216
227
  }
@@ -221,11 +232,15 @@ module.exports = {
221
232
  */
222
233
  events: {
223
234
  'page.addAssetUrl': function (ctx) {
224
- const { url } = ctx.params;
225
- const urls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
226
- urls.push(url);
227
- process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = _.compact(_.uniq(urls)).join(',');
228
- }
235
+ const { name, url } = ctx.params;
236
+ ASSETS[name] = url;
237
+ process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = _.compact(_.uniq(_.concat(ENV_ASSETS, _.values(ASSETS)))).join(',');
238
+ },
239
+ 'page.removeAssetUrl': function (ctx) {
240
+ const { name } = ctx.params;
241
+ delete ASSETS[name]
242
+ process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = _.compact(_.uniq(_.concat(ENV_ASSETS, _.values(ASSETS)))).join(',');
243
+ },
229
244
  },
230
245
 
231
246
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-pages",
3
- "version": "2.5.12-beta.8",
3
+ "version": "2.5.12",
4
4
  "main": "package.service.js",
5
5
  "scripts": {},
6
6
  "license": "MIT",
@@ -8,7 +8,7 @@
8
8
  "publishConfig": {
9
9
  "access": "public"
10
10
  },
11
- "gitHead": "4fc36005f5c00f97de66b68bb48ac3d0450cdefd",
11
+ "gitHead": "cdf06aa70a7b55d8dae3fdd62bb24d8fe004b5c9",
12
12
  "dependencies": {
13
13
  "ejs": "^3.1.8"
14
14
  }