@cloudbase/framework-plugin-low-code 0.6.67 → 0.7.2-beta.0

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 (28) hide show
  1. package/lib/builder/core/generate.d.ts.map +1 -1
  2. package/lib/builder/core/generate.js +8 -3
  3. package/lib/builder/mp/index.d.ts.map +1 -1
  4. package/lib/builder/mp/index.js +11 -6
  5. package/lib/builder/service/builder/generate.d.ts.map +1 -1
  6. package/lib/builder/service/builder/generate.js +2 -0
  7. package/lib/generator/core/generate.d.ts.map +1 -1
  8. package/lib/generator/core/generate.js +2 -0
  9. package/lib/index.d.ts.map +1 -1
  10. package/lib/index.js +13 -46
  11. package/lib/weapps-core/types/app.d.ts +1 -0
  12. package/lib/weapps-core/types/app.d.ts.map +1 -1
  13. package/lib/weapps-core/types/web.d.ts +1 -0
  14. package/lib/weapps-core/types/web.d.ts.map +1 -1
  15. package/package.json +1 -1
  16. package/template/html/index.html.ejs +2 -15
  17. package/template/mp/app/weapps-api.js +3 -0
  18. package/template/mp/app.js +69 -24
  19. package/template/mp/common/util.js +123 -25
  20. package/template/mp/common/weapp-page.js +1 -1
  21. package/template/mp/datasources/config.js.tpl +2 -0
  22. package/template/mp/package.json +9 -7
  23. package/template/package.json +1 -1
  24. package/template/src/app/global-api.js +4 -1
  25. package/template/src/datasources/config.js.tpl +2 -0
  26. package/template/src/handlers/utils/common.js +131 -28
  27. package/template/src/index.jsx +45 -1
  28. package/template/src/pages/app.tpl +6 -5
package/lib/builder/core/generate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBAyGf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBA6Gf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
package/lib/builder/core/generate.js CHANGED
@@ -67,13 +67,18 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
67
67
  domain: domain,
68
68
  appConfig: util_1.JsonToStringWithVariableName({
69
69
  id: appKey,
70
+ envId: appData.envId,
70
71
  staticResourceDomain: domain || '',
71
72
  envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
72
73
  pages: pageInstanceList
73
74
  .sort((item) => (item.isHome ? -1 : 1))
74
- .map((item) => ({
75
- id: item.id,
76
- })),
75
+ .map((item) => {
76
+ var _a;
77
+ return {
78
+ id: item.id,
79
+ type: ((_a = item.data) === null || _a === void 0 ? void 0 : _a.isCustomLoginPage) ? 'login' : '',
80
+ };
81
+ }),
77
82
  }),
78
83
  });
79
84
  yield fs_extra_1.default.writeFile(path_1.default.join(dstDir, 'app/global-api.js'), globalApiContent);
package/lib/builder/mp/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAuSvC;AAiLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAwSvC;AAkLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
package/lib/builder/mp/index.js CHANGED
@@ -61,6 +61,7 @@ const templateDir = config_1.appTemplateDir + '/mp/';
61
61
  const em = chalk_1.default.blue.bold;
62
62
  const error = chalk_1.default.redBright;
63
63
  function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }) {
64
+ var _a;
64
65
  return __awaiter(this, void 0, void 0, function* () {
65
66
  const operationLabel = em('Wexin MiniProgram Generated');
66
67
  console.time(operationLabel);
@@ -169,6 +170,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
169
170
  appID: appId,
170
171
  resourceAppid: !!options.isCrossAccount ? options.resourceAppid : '',
171
172
  isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
173
+ clientID: ((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId) || '',
172
174
  },
173
175
  'datasources/datasource-profiles.js.tpl': {
174
176
  datasourceProfiles: util_3.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(weapps.reduce((datasources, app) => {
@@ -248,7 +250,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
248
250
  console.log('Generating ' + em('page') + ' files');
249
251
  generateFiles_1.cleanDir(path_1.default.join(appRoot, 'pages'), []);
250
252
  yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
251
- var _a, _b;
253
+ var _a;
252
254
  const rootPath = weapp.rootPath || '';
253
255
  const usingComponents = {};
254
256
  const wxml = wxml_1.generateWxml(page.componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, Object.assign(Object.assign({}, ctx), { rootPath, isPage: true }), usingComponents);
@@ -261,7 +263,6 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
261
263
  pageSource: page.data.src || '',
262
264
  eventHanlders: util_2.createEventHanlders(page.componentInstances, '$page', ctx),
263
265
  dataBinds: util_2.createDataBinds(page.componentInstances, ctx),
264
- pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { 'appShareMessage': page.data.appShareMessage.value } : {})),
265
266
  debug: !ctx.isProduction,
266
267
  stringifyObj: util_1.inspect,
267
268
  subLevelPath: rootPath ? path_2.default.relative(rootPath, '') + '/' : '',
@@ -274,7 +275,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
274
275
  content: wxml,
275
276
  },
276
277
  [`index.wxss|${pageFileName}.wxss`]: {
277
- subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
278
+ subWxss: rootPath && !((_a = ctx.mainAppData) === null || _a === void 0 ? void 0 : _a.mpPkgUrl)
278
279
  ? `@import "${path_2.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
279
280
  : '',
280
281
  content: weapps_core_1.toCssText(weapps_core_1.toCssStyle(page.commonStyle, {
@@ -329,13 +330,17 @@ function generateFramework(appData, outDir, ctx) {
329
330
  isBare: false,
330
331
  appConfig: util_3.JsonToStringWithVariableName({
331
332
  id: ctx.appId,
333
+ envId: appData.envId,
332
334
  staticResourceDomain: ctx.domain || '',
333
335
  envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
334
336
  pages: appData.pageInstanceList
335
337
  .sort((item) => (item.isHome ? -1 : 1))
336
- .map((item) => ({
337
- id: item.id,
338
- })),
338
+ .map((item) => {
339
+ return {
340
+ id: item.id,
341
+ type: item.data.isCustomLoginPage ? 'login' : '',
342
+ };
343
+ }),
339
344
  }),
340
345
  }, 'app/common.js': {
341
346
  mods: appData.lowCodes
package/lib/builder/service/builder/generate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
package/lib/builder/service/builder/generate.js CHANGED
@@ -713,6 +713,7 @@ function writeLowCodeFilesForCompositeComp(compositeGroups, appBuildDir) {
713
713
  }
714
714
  exports.writeLowCodeFilesForCompositeComp = writeLowCodeFilesForCompositeComp;
715
715
  function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPath, deployMode, buildTypeList, extraData) {
716
+ var _a;
716
717
  return __awaiter(this, void 0, void 0, function* () {
717
718
  const computedPageIds = [];
718
719
  const pageModules = {};
@@ -750,6 +751,7 @@ function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPat
750
751
  appID: appKey,
751
752
  envID: appData.envId,
752
753
  isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
754
+ clientID: ((_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId) || '',
753
755
  },
754
756
  'datasources/datasource-profiles.js.tpl': {
755
757
  datasourceProfiles: util_1.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(appData.datasources || [])),
package/lib/generator/core/generate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generator/core/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generator/core/generate.ts"],"names":[],"mappings":"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"}
package/lib/generator/core/generate.js CHANGED
@@ -600,6 +600,7 @@ function generateDefaultLifecycle(data) {
600
600
  return isHas;
601
601
  }
602
602
  function generateCodeFromTpl(appKey, appData, appBuildDir, rootPath, extraData, i18nConfig, fileCodeMap, isSandbox, subAppDataList, buildTypeList, deployMode, domain) {
603
+ var _a;
603
604
  return __awaiter(this, void 0, void 0, function* () {
604
605
  const pageIds = [];
605
606
  const pageModules = {};
@@ -632,6 +633,7 @@ function generateCodeFromTpl(appKey, appData, appBuildDir, rootPath, extraData,
632
633
  appID: appKey,
633
634
  envID: appData.envId,
634
635
  isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
636
+ clientID: ((_a = appData.extra) === null || _a === void 0 ? void 0 : _a.clientId) || '',
635
637
  },
636
638
  'datasources/datasource-profiles.js.tpl': {
637
639
  datasourceProfiles: JSON.stringify(dataSource_1.getDatasourceProfiles(appData.datasources || []), null, 2),
package/lib/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/index.js CHANGED
@@ -613,7 +613,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
613
613
  });
614
614
  }
615
615
  deploy() {
616
- var _a;
617
616
  return __awaiter(this, void 0, void 0, function* () {
618
617
  try {
619
618
  this._time("DEPLOY");
@@ -628,27 +627,19 @@ class LowCodePlugin extends framework_core_1.Plugin {
628
627
  else {
629
628
  yield this._postProcessWebsiteConfig();
630
629
  }
631
- try {
632
- let publishAppCustomNavRes = yield this.api.cloudbaseManager
633
- .commonService('lowcode', '2021-01-08')
634
- .call({
635
- Action: 'PublishAppCustomNav',
636
- Param: {
637
- WeAppId: this._resolvedInputs.appId,
638
- EnvId: this.api.envId,
639
- PublishType: this._resolvedInputs.deployOptions.mode === types_1.DEPLOY_MODE.UPLOAD
640
- ? 'product'
641
- : 'preview',
642
- },
643
- });
644
- this.api.logger.info(`${this.api.emoji('🚀')} custom publish success: ${JSON.stringify(publishAppCustomNavRes)}`);
645
- }
646
- catch (e) {
647
- this.api.logger.error(`${this.api.emoji('🚀')} custom publish fail: ${JSON.stringify(e)}`);
648
- if (((_a = e) === null || _a === void 0 ? void 0 : _a.code) !== 'ResourceNotFound') {
649
- throw e;
650
- }
651
- }
630
+ let publishAppCustomNavRes = yield this.api.cloudbaseManager
631
+ .commonService('lowcode', '2021-01-08')
632
+ .call({
633
+ Action: 'PublishAppCustomNav',
634
+ Param: {
635
+ WeAppId: this._resolvedInputs.appId,
636
+ EnvId: this.api.envId,
637
+ PublishType: this._resolvedInputs.deployOptions.mode === types_1.DEPLOY_MODE.UPLOAD
638
+ ? 'product'
639
+ : 'preview',
640
+ },
641
+ });
642
+ this.api.logger.info(`${this.api.emoji('🚀')} custom publish success: ${JSON.stringify(publishAppCustomNavRes)}`);
652
643
  try {
653
644
  const { deployOptions, appId } = this._resolvedInputs;
654
645
  const isPreview = (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW;
@@ -971,7 +962,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
971
962
  });
972
963
  }
973
964
  _postProcessAdminPortal() {
974
- var _a, _b;
975
965
  return __awaiter(this, void 0, void 0, function* () {
976
966
  const { appId, buildTypeList, mainAppSerializeData, deployOptions, } = this._resolvedInputs;
977
967
  if (common_2.buildAsAdminPortalByBuildType(buildTypeList)) {
@@ -1007,23 +997,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
1007
997
  catch (e) {
1008
998
  this.api.logger.error('门户路由注册失败: ', e);
1009
999
  }
1010
- try {
1011
- if (((_b = (_a = this._resolvedInputs) === null || _a === void 0 ? void 0 : _a.deployOptions) === null || _b === void 0 ? void 0 : _b.mode) === types_1.DEPLOY_MODE.UPLOAD) {
1012
- yield this.api.cloudbaseManager
1013
- .commonService('lowcode', '2021-01-08')
1014
- .call({
1015
- Action: 'PublishAppCustomUrl',
1016
- Param: {
1017
- EnvId: this.api.envId,
1018
- WeAppId: this._resolvedInputs.appId,
1019
- },
1020
- });
1021
- }
1022
- this.api.logger.info('PublishAppCustomUrl成功');
1023
- }
1024
- catch (e) {
1025
- this.api.logger.error('PublishAppCustomUrl失败: ', e);
1026
- }
1027
1000
  }
1028
1001
  });
1029
1002
  }
@@ -1095,12 +1068,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
1095
1068
  WeAppId: this._resolvedInputs.appId,
1096
1069
  IndexPath: this._getWebRootPath(),
1097
1070
  },
1098
- })
1099
- .catch((e) => {
1100
- this.api.logger.error('自定义域名发布失败: ', e);
1101
- if ((e === null || e === void 0 ? void 0 : e.code) !== 'ResourceNotFound') {
1102
- throw e;
1103
- }
1104
1071
  })
1105
1072
  : Promise.resolve(),
1106
1073
  hostingService.setWebsiteDocument({
package/lib/weapps-core/types/app.d.ts CHANGED
@@ -36,6 +36,7 @@ export interface IWeAppData {
36
36
  miniprogramPlugins: IMiniprogramPlugin[];
37
37
  extra: {
38
38
  domain: string;
39
+ clientId?: string;
39
40
  };
40
41
  }
41
42
  export interface IWeAppPage {
package/lib/weapps-core/types/app.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"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"}
package/lib/weapps-core/types/web.d.ts CHANGED
@@ -24,6 +24,7 @@ export interface IWebRuntimeAppData extends IAppAndPageVar {
24
24
  };
25
25
  extra: {
26
26
  domain: string;
27
+ clientId?: string;
27
28
  };
28
29
  }
29
30
  export interface IPageInstance extends ICommonInstanceProps, IAppAndPageVar {
package/lib/weapps-core/types/web.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/web.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/web.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "0.6.67",
3
+ "version": "0.7.2-beta.0",
4
4
  "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
5
5
  "author": "yhsunshining@gmail.com",
6
6
  "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
package/template/html/index.html.ejs CHANGED
@@ -388,20 +388,7 @@
388
388
  <div id="react-body" class="main-wrap"></div>
389
389
  <% if(!isAdminPortal){ %>
390
390
  <script src="/weda-config/weda-private.js"></script>
391
- <script>
392
- (function () {
393
- const _isPrivate = window._isPrivate || false;
394
- if (_isPrivate === true) {
395
- document.write(
396
- `<script src="//static.cloudbase.net/cloudbase-js-sdk/2.0.1-alpha.0/cloudbase.full.js?v=1"><\/script>`
397
- );
398
- } else {
399
- document.write(
400
- `<script src="//static.cloudbase.net/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js?v=1"><\/script>`
401
- );
402
- }
403
- })();
404
- </script>
391
+ <script src="//static.cloudbase.net/cloudbase-js-sdk/2.4.0-alpha.0/cloudbase.full.js?v=1"></script>
405
392
  <% }%>
406
393
  <script>
407
394
  if (window.cloudbase) {
@@ -461,7 +448,7 @@
461
448
  ></script>
462
449
  <script
463
450
  crossorigin="anonymous"
464
- src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"
451
+ src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.12/dist/h5.browser.js?v=1"
465
452
  ></script>
466
453
  <script>
467
454
  // zxing polifill
package/template/mp/app/weapps-api.js CHANGED
@@ -66,6 +66,9 @@ function createGlboalApi() {
66
66
  },
67
67
  });
68
68
  return typeof Data === 'string' ? JSON.parse(Data) : Data
69
+ },
70
+ getCurrentPage: function(){
71
+ return globalAPI.activePage
69
72
  }
70
73
  },
71
74
  // ... other sdk apis & apis from mp
package/template/mp/app.js CHANGED
@@ -1,22 +1,24 @@
1
- import { setConfig } from '@cloudbase/weda-cloud-sdk'
1
+ import { setConfig, getAccessToken, initTcb } from '@cloudbase/weda-cloud-sdk'
2
2
  import lifeCycle from './lowcode/lifecycle'
3
3
  import { app } from './app/weapps-api'
4
4
  import WxReportV2 from './common/wx_yypt_report_v2'
5
5
  // 引入数据源管理器并进行初始化
6
- import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
6
+ import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index';
7
+ import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
7
8
 
8
- <% if(yyptConfig.yyptAppKey) { %>
9
+ <% if (yyptConfig.yyptAppKey) { %>
9
10
  const wxReport = new WxReportV2({
10
- appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
11
- reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
12
- autoReportPV: true, // 是否自动上报页面PV
13
- // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
14
- // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
15
- getRemoteParamsUrl: '',
16
- stopReport: <%= yyptConfig.stopReport %>, // 停止上报
17
- intervalTime: 3, // 间隔多久执行一次上报，默认3秒
18
- reportLogsNum: 5, // 每次合并上报记录条数，默认5次
11
+ appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
12
+ reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
13
+ autoReportPV: true, // 是否自动上报页面PV
14
+ // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
15
+ // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
16
+ getRemoteParamsUrl: '',
17
+ stopReport: <%= yyptConfig.stopReport %>, // 停止上报
18
+ intervalTime: 3, // 间隔多久执行一次上报，默认3秒
19
+ reportLogsNum: 5, // 每次合并上报记录条数，默认5次
19
20
  });
21
+ <% }%>
20
22
 
21
23
  // 设置数据源请求的 loading 及 toast 处理
22
24
  setConfig({
@@ -24,36 +26,79 @@ setConfig({
24
26
  if (!cfg.options || !cfg.options.showLoading) return
25
27
  app.showLoading()
26
28
  },
29
+ beforeCallFunction: async (params) => {
30
+ try {
31
+ const loginPage = findLoginPage();
32
+
33
+ let skip = false;
34
+ switch (params?.data?.methodName){
35
+ case 'callWedaApi': {
36
+ if(['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)){
37
+ skip = true;
38
+ }
39
+ break;
40
+ }
41
+ }
42
+
43
+ // 后续做过滤处理
44
+ if (!loginPage || (params?.data?.mode === 'c' && skip)) {
45
+ return params;
46
+ }
47
+ // await initTcb();
48
+ const { accessToken } = await getAccessToken();
49
+ if (accessToken) {
50
+ params.data.accessToken = accessToken;
51
+ }
52
+ } catch (e) {
53
+ console.error('beforeCallFunction error', e);
54
+ }
55
+ return params;
56
+ },
27
57
  afterDSRequest: (cfg, error, result) => {
28
58
  if (!cfg.options) return
29
59
  if (cfg.options.showLoading) app.hideLoading()
30
60
  if (!cfg.options.showToast) return
31
61
  const isSuccess = !error && result && !result.code
32
- app.showToast({icon: isSuccess ? 'success' : 'error'})
62
+ app.showToast({ icon: isSuccess ? 'success' : 'error' })
63
+ },
64
+ async afterCallFunction(params, error, res) {
65
+ if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
66
+ const loginPage = findLoginPage();
67
+ if (loginPage) {
68
+ const authConfig = await getAuthConfig();
69
+ if (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login') {
70
+ redirectToLogin();
71
+ } else if (authConfig.RejectStrategy == 'show_warning') {
72
+ app.showToast({
73
+ title: '接口无访问权限',
74
+ icon: 'error',
75
+ });
76
+ }
77
+ }
78
+ }
33
79
  }
34
80
  })
35
81
 
36
- <% }%>
37
82
  App({
38
83
  onLaunch(options) {
39
84
  this.app = app
40
85
  const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
41
- let { query={} } = options
42
- EXTRA_API.setParams('$global', query )
43
- createStateDataSourceVar('$global', generateParamsParser({app}))
86
+ let { query = {} } = options
87
+ EXTRA_API.setParams('$global', query)
88
+ createStateDataSourceVar('$global', generateParamsParser({ app }))
44
89
 
45
90
  onLaunch && onLaunch.call(this, options)
46
- <% if(yyptConfig.yyptAppKey) { %>
47
- // 挂运营平台上报对象到app里
48
- app.yyptReport = wxReport
49
- <% }%>
91
+ <% if (yyptConfig.yyptAppKey) { %>
92
+ // 挂运营平台上报对象到app里
93
+ app.yyptReport = wxReport
94
+ <% }%>
50
95
  },
51
96
  onShow(options) {
52
97
  const fn = lifeCycle.onShow || lifeCycle.onAppShow
53
98
  fn && fn.call(this, options)
54
- <% if(yyptConfig.yyptAppKey) { %>
55
- wxReport.startReport()
56
- <% }%>
99
+ <% if (yyptConfig.yyptAppKey) { %>
100
+ wxReport.startReport()
101
+ <% }%>
57
102
  },
58
103
  onHide() {
59
104
  const fn = lifeCycle.onHide || lifeCycle.onAppHide
package/template/mp/common/util.js CHANGED
@@ -5,6 +5,8 @@ import lodashGet from 'lodash.get';
5
5
  import lodashSet from 'lodash.set';
6
6
  import { observable } from 'mobx';
7
7
  import { app } from '../app/weapps-api'
8
+ import { getAccessToken } from '@cloudbase/weda-cloud-sdk'
9
+
8
10
  /**
9
11
  * Convert abcWordSnd -> abc-word-snd
10
12
  */
@@ -53,12 +55,12 @@ export function createEventHandlers(evtListeners, context) {
53
55
  })
54
56
  } catch (e) {
55
57
  let eventName = l.key ? `${prefix}$${l.key}_fail` : ''
56
- if(self[eventName]){
58
+ if (self[eventName]) {
57
59
  await self[eventName]({
58
60
  ...event,
59
61
  detail: e
60
62
  })
61
- }else {
63
+ } else {
62
64
  throw e
63
65
  }
64
66
 
@@ -207,8 +209,8 @@ export function set(object, path, value) {
207
209
  newValue = isObject(objValue)
208
210
  ? objValue
209
211
  : isIndex(path[index + 1])
210
- ? []
211
- : {}
212
+ ? []
213
+ : {}
212
214
  }
213
215
  }
214
216
  assignValue(nested, key, newValue)
@@ -231,37 +233,133 @@ export function setter(context, path, value = undefined) {
231
233
  return lodashSet(context, path, value);
232
234
  }
233
235
 
236
+ export function findLoginPage() {
237
+ const { app } = getApp();
238
+ const { pages = [] } = app.utils._getConfig();
239
+ return pages.find(item => item.type === 'login');
240
+ }
241
+
242
+ let _AUTH_CONFIG_CACHE = null;
243
+ export async function getAuthConfig() {
244
+ const { app } = getApp();
245
+ if (_AUTH_CONFIG_CACHE) {
246
+ return _AUTH_CONFIG_CACHE;
247
+ }
248
+ try {
249
+ const res = await app.cloud.callWedaApi({
250
+ action: "DescribeRuntimeResourceStrategy",
251
+ data: {
252
+ ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
253
+ ResourceId: app.id,
254
+ },
255
+ });
256
+ const settingData = {};
257
+ // 云api不支持map只能传字符串，需要转换
258
+ res.forEach((item) => {
259
+ settingData[item.Key] = ['AllowRegister', 'NeedLogin'].includes(item.Key) ? item.Value === '1' : item.Value;
260
+ });
261
+ _AUTH_CONFIG_CACHE = settingData;
262
+ return _AUTH_CONFIG_CACHE;
263
+ } catch (e) {
264
+ return {
265
+ NeedLogin: false,
266
+ RejectStrategy: "show_warning",
267
+ };
268
+ }
269
+ }
270
+
271
+ let _AUTH_CACHE_MAP = {}
272
+ async function getAccessPermission(app, appId, pageId) {
273
+ const cacheKey = `${appId}-${pageId}`
274
+ if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
275
+ return _AUTH_CACHE_MAP[cacheKey];
276
+ }
277
+
278
+ let isAccess = false;
279
+ try {
280
+ const res = await app.cloud.callWedaApi({
281
+ action: 'DescribeResourcesPermission',
282
+ data: {
283
+ ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
284
+ ResourceIdList: [cacheKey],
285
+ AppResourceId: appId,
286
+ },
287
+ });
288
+ if (Array.isArray(res) && res.length > 0) {
289
+ isAccess = !!res[0].IsAccess;
290
+ }
291
+ _AUTH_CACHE_MAP[cacheKey] = isAccess;
292
+ } catch (e) {
293
+ console.warn('getAccessPermission', e);
294
+ }
295
+ return isAccess
296
+ }
297
+
234
298
  /**
235
299
  * 检查页面权限
236
300
  **/
237
- const _AUTH_CACHE_MAP = {}
238
- export async function checkAuth(app, appId, pageId) {
239
- const cacheKey = `${appId}-${pageId}`
240
- if(_AUTH_CACHE_MAP[cacheKey] !== undefined) {
241
- return _AUTH_CACHE_MAP[cacheKey]
301
+ export async function checkAuth(app, appId, $page) {
302
+ const loginPage = findLoginPage(app);
303
+ if (loginPage?.id === $page.id) {
304
+ return true
242
305
  }
243
306
  app.showNavigationBarLoading();
244
- const checkAuthResult = await app.cloud.callWedaApi({
245
- action: 'DescribeResourcesPermission',
246
- data: {
247
- ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
248
- ResourceIdList: [cacheKey],
249
- },
250
- });
251
- let isLogin = false;
252
- if (Array.isArray(checkAuthResult) && checkAuthResult.length > 0) {
253
- isLogin = checkAuthResult[0]?.IsAccess || false;
307
+ const requestList = [getAccessPermission(app, appId, $page.id)];
308
+ // 暂时先认为有登录页则自定义登录功能开启且生效
309
+ if (loginPage) {
310
+ requestList.push(getAuthConfig(app));
254
311
  }
312
+ const [isAccess, authConfig] = await Promise.all(requestList);
255
313
  app.hideNavigationBarLoading();
256
314
 
257
- if (!isLogin) {
315
+ if (!isAccess) {
316
+ if (loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
317
+ redirectToLogin($page);
318
+ } else {
319
+ app.showToast({
320
+ title: '页面无访问权限',
321
+ icon: 'error',
322
+ });
323
+ }
324
+ } else if (loginPage && authConfig.NeedLogin) {
325
+ // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
326
+ try {
327
+ const { accessToken } = await getAccessToken()
328
+ if (!accessToken) {
329
+ redirectToLogin($page);
330
+ }
331
+ } catch (e) {
332
+ redirectToLogin($page);
333
+ }
334
+ }
335
+ return isAccess;
336
+ }
337
+
338
+ export function redirectToLogin(currentPage) {
339
+ // 去登录则清空权限缓存。
340
+ _AUTH_CACHE_MAP = {};
341
+ const { app } = getApp();
342
+ const loginPage = findLoginPage(app);
343
+ if (!currentPage) {
344
+ currentPage = app.utils.getCurrentPage() || {};
345
+ }
346
+ if (loginPage?.id === currentPage.id) {
347
+ return true
348
+ }
349
+ if (loginPage) {
350
+ app.redirectTo({
351
+ pageId: loginPage.id,
352
+ params: {
353
+ sourcePageId: currentPage.id,
354
+ sourcePageParams: currentPage.params
355
+ }
356
+ })
357
+ } else {
258
358
  app.showToast({
259
- title: '页面无访问权限',
359
+ title: '用户未登录',
260
360
  icon: 'error',
261
361
  });
262
362
  }
263
- _AUTH_CACHE_MAP[cacheKey] = isLogin
264
- return isLogin;
265
363
  }
266
364
 
267
365
  // 日期转换
@@ -565,8 +663,8 @@ export function formatEnum(path, optionname) {
565
663
  let value = !isSingle
566
664
  ? JSON.parse(parseOptions)?.find((item) => item?.key === path)?.value
567
665
  : JSON.parse(parseOptions)
568
- ?.filter((item) => path.some((pathValue) => item?.key === pathValue))
569
- .map((item) => multiTmp.push(item?.value));
666
+ ?.filter((item) => path.some((pathValue) => item?.key === pathValue))
667
+ .map((item) => multiTmp.push(item?.value));
570
668
  // 对多选或者单选有不同处理
571
669
  return !isSingle ? value : multiTmp?.join(',');
572
670
  }
package/template/mp/common/weapp-page.js CHANGED
@@ -118,7 +118,7 @@ export function createPage(
118
118
  hook && hook.call(this);
119
119
 
120
120
  // 权限检查
121
- if (await checkAuth(app, app.id, app.activePage.id)) {
121
+ if (await checkAuth(app, app.id, $page)) {
122
122
  this.setData({
123
123
  weDaHasLogin: true,
124
124
  });
package/template/mp/datasources/config.js.tpl CHANGED
@@ -11,6 +11,8 @@ export default {
11
11
  appID: '<%= appID %>',
12
12
  /** 云开发环境ID */
13
13
  envID: '<%= envID %>',
14
+ /** 应用端ID */
15
+ tcbClientId: '<%= clientID %>',
14
16
  /** 云开发资源所属的微信app id */
15
17
  resourceAppid: '<%= resourceAppid %>',
16
18
  /** 数据源描述对象数组 */
package/template/mp/package.json CHANGED
@@ -1,15 +1,17 @@
1
1
  {
2
- "name": "lcap-<%= appId%>",
3
- "version": "1.0.0",
4
- "scripts": { },
5
- "dependencies": {
6
- "@cloudbase/weda-cloud-sdk": "1.0.5",
2
+ "name": "lcap-<%= appId%>",
3
+ "version": "1.0.0",
4
+ "scripts": {},
5
+ "dependencies": {
6
+ "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
7
+ "@cloudbase/oauth": "0.1.1-alpha.2",
7
8
  "mobx": "^5.15.4",
8
9
  "lodash.get": "^4.4.2",
9
10
  "lodash.set": "^4.3.2",
10
- "miniprogram-gesture": "^1.0.6",
11
+ "miniprogram-gesture": "^1.0.6",
11
12
  "miniprogram-api-promise": "^1.0.4"<% Object.keys(extraDeps).map(depName => {%>,
12
- "<%= depName%>": "<%= extraDeps[depName]%>"<%})
13
+ "<%= depName%>": "<%= extraDeps[depName]%>"<%
14
+ })
13
15
  %>
14
16
  }
15
17
  }
package/template/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  },
7
7
  "dependencies": {
8
8
  "@cloudbase/js-sdk": "1.5.3-alpha.0",
9
- "@cloudbase/weda-cloud-sdk": "1.0.1",
9
+ "@cloudbase/weda-cloud-sdk": "1.0.8-alpha.12",
10
10
  "@tcwd/weapps-core": "2.2.6",
11
11
  "@tcwd/weapps-sdk": "1.2.9",
12
12
  "@zxing/library": "^0.18.6",
package/template/src/app/global-api.js CHANGED
@@ -53,9 +53,12 @@ function createGlboalApi() {
53
53
  _getConfig: function () {
54
54
  return <%= appConfig %>;
55
55
  },
56
- getWXContext: function() {
56
+ getWXContext: function () {
57
57
  return Promise.resolve({})
58
58
  },
59
+ getCurrentPage: function () {
60
+ return $page
61
+ },
59
62
  },
60
63
 
61
64
  // ... other sdk apis & apis from mp
package/template/src/datasources/config.js.tpl CHANGED
@@ -11,6 +11,8 @@ export default {
11
11
  appID: '<%= appID %>',
12
12
  /** 云开发环境ID */
13
13
  envID: '<%= envID %>',
14
+ /** 应用端ID */
15
+ tcbClientId: '<%= clientID %>',
14
16
  /** 数据源描述对象数组 */
15
17
  dataSourceProfiles: dataSourceProfiles,
16
18
  /**
package/template/src/handlers/utils/common.js CHANGED
@@ -1,4 +1,11 @@
1
1
  import config from '../../datasources/config'
2
+ import { getTcbInstance, getAccessToken } from '@cloudbase/weda-cloud-sdk/dist/h5';
3
+
4
+ async function loginScope() {
5
+ const { auth } = await getTcbInstance();
6
+ return auth.loginScope();
7
+ }
8
+
2
9
  export function getComponentId(key) {
3
10
  return `__weapps-component-wrapper-${key}`;
4
11
  }
@@ -141,63 +148,159 @@ export function getStaticResourceAttribute(staticUrl) {
141
148
  }
142
149
  return staticUrl;
143
150
  }
151
+
152
+ export function findLoginPage(app = window.app) {
153
+ const { pages = [] } = app.utils._getConfig();
154
+ return pages.find(item => item.type === 'login');
155
+ }
156
+
157
+ let _AUTH_CONFIG_CACHE = null;
158
+ export async function getAuthConfig(app = window.app) {
159
+ if (_AUTH_CONFIG_CACHE) {
160
+ return _AUTH_CONFIG_CACHE;
161
+ }
162
+ try {
163
+ const res = await app.cloud.callWedaApi({
164
+ action: "DescribeRuntimeResourceStrategy",
165
+ data: {
166
+ ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
167
+ ResourceId: app.id,
168
+ },
169
+ });
170
+ const settingData = {};
171
+ // 云api不支持map只能传字符串，需要转换
172
+ res.forEach((item) => {
173
+ settingData[item.Key] = ['AllowRegister', 'NeedLogin'].includes(item.Key) ? item.Value === '1' : item.Value;
174
+ });
175
+ _AUTH_CONFIG_CACHE = settingData;
176
+ return _AUTH_CONFIG_CACHE;
177
+ } catch (e) {
178
+ return {
179
+ NeedLogin: false,
180
+ RejectStrategy: "show_warning",
181
+ };
182
+ }
183
+ }
184
+
185
+ let _AUTH_CACHE_MAP = {}
186
+ async function getAccessPermission(app, appId, pageId) {
187
+ const cacheKey = `${appId}-${pageId}`
188
+ if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
189
+ return _AUTH_CACHE_MAP[cacheKey];
190
+ }
191
+
192
+ let isAccess = false;
193
+ try {
194
+ const res = await app.cloud.callWedaApi({
195
+ action: 'DescribeResourcesPermission',
196
+ data: {
197
+ ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
198
+ ResourceIdList: [cacheKey],
199
+ AppResourceId: appId,
200
+ },
201
+ });
202
+ if (Array.isArray(res) && res.length > 0) {
203
+ isAccess = !!res[0].IsAccess;
204
+ }
205
+ _AUTH_CACHE_MAP[cacheKey] = isAccess;
206
+ } catch (e) {
207
+ console.warn('getAccessPermission', e);
208
+ }
209
+ return isAccess
210
+ }
211
+
144
212
  /**
145
213
  * 检查页面权限
146
214
  **/
147
- const _AUTH_CACHE_MAP = {}
148
- export async function checkAuth(app, appId, pageId) {
149
- <% if(isAdminPortal||isXPage){ %>return true;<% } %>
150
- const cacheKey = `${appId}-${pageId}`
151
- if(_AUTH_CACHE_MAP[cacheKey] !== undefined) {
152
- return _AUTH_CACHE_MAP[cacheKey]
215
+ export async function checkAuth(app, appId, $page) {
216
+ <% if (isAdminPortal || isXPage) { %>return true;<% } %>
217
+ const loginPage = findLoginPage(app);
218
+ if (loginPage?.id === $page.id) {
219
+ return true
153
220
  }
154
221
  app.showNavigationBarLoading();
155
- const checkAuthResult = await app.cloud.callWedaApi({
156
- action: 'DescribeResourcesPermission',
157
- data: {
158
- ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
159
- ResourceIdList: [cacheKey],
160
- },
161
- });
162
- let isLogin = false;
163
- if (Array.isArray(checkAuthResult) && checkAuthResult.length > 0) {
164
- isLogin = checkAuthResult[0]?.IsAccess ?? false;
222
+ const requestList = [getAccessPermission(app, appId, $page.id)];
223
+ // 暂时先认为有登录页则自定义登录功能开启且生效
224
+ if (loginPage) {
225
+ requestList.push(getAuthConfig(app));
165
226
  }
227
+ const [isAccess, authConfig] = await Promise.all(requestList);
166
228
  app.hideNavigationBarLoading();
167
229
 
168
- if (!isLogin) {
230
+ if (!isAccess) {
231
+ if (loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
232
+ redirectToLogin($page);
233
+ } else {
234
+ app.showToast({
235
+ title: '页面无访问权限',
236
+ icon: 'error',
237
+ });
238
+ }
239
+ } else if (loginPage && authConfig.NeedLogin) {
240
+ // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
241
+ try {
242
+ const [scope, { accessToken }] = await Promise.all([loginScope(), getAccessToken()]);
243
+ if (!accessToken || scope === 'anonymous') {
244
+ redirectToLogin($page);
245
+ }
246
+ } catch (e) {
247
+ console.error('获取身份失败', e);
248
+ redirectToLogin($page);
249
+ }
250
+ }
251
+ return isAccess;
252
+ }
253
+
254
+ export function redirectToLogin(currentPage) {
255
+ // 去登录则清空权限缓存。
256
+ _AUTH_CACHE_MAP = {};
257
+ const app = window.app;
258
+ const loginPage = findLoginPage(app);
259
+ if (!currentPage) {
260
+ currentPage = app.utils.getCurrentPage() || {};
261
+ }
262
+ if (loginPage?.id === currentPage.id) {
263
+ return true
264
+ }
265
+ if (loginPage) {
266
+ app.redirectTo({
267
+ pageId: loginPage.id,
268
+ params: {
269
+ sourcePageId: currentPage.id,
270
+ sourcePageParams: currentPage.dataset.params
271
+ }
272
+ })
273
+ } else {
169
274
  app.showToast({
170
- title: '页面无访问权限',
275
+ title: '用户未登录',
171
276
  icon: 'error',
172
277
  });
173
278
  }
174
- _AUTH_CACHE_MAP[cacheKey] = isLogin
175
- return isLogin;
176
279
  }
177
280
 
178
281
  const _REPORTED = {}
179
- export function reportTime(tag, time, only=false){
180
- if(!window._aegis || !tag){
282
+ export function reportTime(tag, time, only = false) {
283
+ if (!window._aegis || !tag) {
181
284
  return;
182
285
  }
183
- if(window['_WedaHostConfig'] && !window['_WedaHostConfig']['_REPORTED']) {
286
+ if (window['_WedaHostConfig'] && !window['_WedaHostConfig']['_REPORTED']) {
184
287
  window['_WedaHostConfig']['_REPORTED'] = _REPORTED
185
288
  }
186
289
 
187
290
  const CACHE_MAP = window['_WedaHostConfig']?.['_REPORTED'] || _REPORTED
188
291
 
189
- if(only && CACHE_MAP[tag]){
190
- return ;
292
+ if (only && CACHE_MAP[tag]) {
293
+ return;
191
294
  }
192
295
  CACHE_MAP[tag] = true
193
296
  try {
194
- let t = time === undefined? (performance?.now?.() || Date.now() - window['_aegis_inited']) :time;
297
+ let t = time === undefined ? (performance?.now?.() || Date.now() - window['_aegis_inited']) : time;
195
298
  window._aegis.reportTime({
196
299
  name: tag,
197
300
  duration: t,
198
- ext2: config.isProd? 'production' : 'preview',
301
+ ext2: config.isProd ? 'production' : 'preview',
199
302
  })
200
- }catch(e){
303
+ } catch (e) {
201
304
  console.log(e)
202
305
  }
203
306
  }
package/template/src/index.jsx CHANGED
@@ -1,6 +1,6 @@
1
1
  import * as React from 'react'
2
2
  import * as ReactDOM from 'react-dom'
3
- import { setConfig } from '@cloudbase/weda-cloud-sdk/dist/h5'
3
+ import { setConfig, getAccessToken, initTcb } from '@cloudbase/weda-cloud-sdk/dist/h5'
4
4
  import App from './router'
5
5
  import './utils/monitor-jssdk.min'
6
6
  import './index.less'
@@ -12,6 +12,7 @@ import attachFastClick from 'fastclick'
12
12
  import { initWebConfig } from 'handlers/lifecycle'
13
13
  const AppConfig = require('../webpack/miniprogram.config')
14
14
  import { app } from './app/global-api'
15
+ import { redirectToLogin, findLoginPage, getAuthConfig } from './handlers/utils'
15
16
  // app 中注册配置页面以及app的全局配置miniprogram.config，h5里分app以及web页分别处理，使用process.env.isApp 区分判断
16
17
  if (process.env.isApp) {
17
18
  initWebConfig(app, AppConfig);
@@ -23,12 +24,55 @@ setConfig({
23
24
  if (!cfg.options || !cfg.options.showLoading) return
24
25
  app.showLoading()
25
26
  },
27
+ beforeCallFunction: async (params) => {
28
+ try{
29
+ const loginPage = findLoginPage();
30
+
31
+ let skip = false;
32
+ switch (params?.data?.methodName) {
33
+ case 'callWedaApi': {
34
+ if(['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)){
35
+ skip = true;
36
+ }
37
+ break;
38
+ }
39
+ }
40
+
41
+ // 后续做过滤处理
42
+ if (!loginPage || (params?.data?.mode === 'c' && skip)) {
43
+ return params;
44
+ }
45
+ const { accessToken } = await getAccessToken();
46
+ if (accessToken) {
47
+ params.data.accessToken = accessToken;
48
+ }
49
+ } catch (e) {
50
+ console.error('beforeCallFunction error', e);
51
+ }
52
+ return params;
53
+ },
26
54
  afterDSRequest: (cfg, error, result) => {
27
55
  if (!cfg.options) return
28
56
  if (cfg.options.showLoading) app.hideLoading()
29
57
  if (!cfg.options.showToast) return
30
58
  const isSuccess = !error && result && !result.code
31
59
  app.showToast({icon: isSuccess ? 'success' : 'error'})
60
+ },
61
+ async afterCallFunction(params, error, res) {
62
+ if(params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure','InvalidAccessToken'].includes(res?.result?.code)) {
63
+ const loginPage = findLoginPage();
64
+ if (loginPage) {
65
+ const authConfig = await getAuthConfig();
66
+ if (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login') {
67
+ redirectToLogin();
68
+ } else if (authConfig.RejectStrategy == 'show_warning') {
69
+ app.showToast({
70
+ title: '接口无访问权限',
71
+ icon: 'error',
72
+ });
73
+ }
74
+ }
75
+ }
32
76
  }
33
77
  })
34
78
  // window.app.yyptReport = window.yyptReport
package/template/src/pages/app.tpl CHANGED
@@ -86,11 +86,6 @@ export default function App() {
86
86
  const isPure = !!pureSrc;
87
87
 
88
88
  React.useEffect(() => {
89
- checkAuth(app, app.id, '<%= pageName %>').then((checkAuthResult) => {
90
- setWeDaHasLogin(checkAuthResult)
91
- reportTime('FIRST_PAGE_CONTENT_RENDERED', undefined, true)
92
- });
93
-
94
89
  Object.assign($page, {
95
90
  id: '<%= pageName %>',
96
91
  state: observable(initPageState),
@@ -107,6 +102,12 @@ export default function App() {
107
102
  app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
108
103
  });
109
104
  };
105
+
106
+ checkAuth(app, app.id, $page).then((checkAuthResult) => {
107
+ setWeDaHasLogin(checkAuthResult)
108
+ reportTime('FIRST_PAGE_CONTENT_RENDERED', undefined, true)
109
+ });
110
+
110
111
  return () => {
111
112
  if (microApp.current) {
112
113
  microApp.current.unmount();