@cloudbase/framework-plugin-low-code 1.7.22 → 1.7.23

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 (4) hide show
  1. package/lib/index.d.ts +1 -1
  2. package/lib/index.d.ts.map +1 -1
  3. package/lib/index.js +35 -15
  4. package/package.json +3 -3
package/lib/index.d.ts CHANGED
@@ -107,7 +107,7 @@ declare class LowCodePlugin extends Plugin {
107
107
  deploy(): Promise<void>;
108
108
  _getHostingInfoTask(envId: any, loose?: boolean): Promise<any[]>;
109
109
  _getHostingInfo(envId: any, loose?: boolean): any;
110
- _checkBillingResource(envId: any): Promise<boolean>;
110
+ _enableExpireTime(envId: any): Promise<boolean>;
111
111
  _checkIsVersion(version: any): boolean;
112
112
  _postPersistentDependiences(): Promise<void>;
113
113
  _debugInfo(): Promise<void>;
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
@@ -255,12 +255,21 @@ class LowCodePlugin extends framework_core_1.Plugin {
255
255
  let miniAppDir = '';
256
256
  let webAppDir = '';
257
257
  const { envId } = this.api;
258
- const [hostingRes, isExpPackage] = yield Promise.all([
258
+ const [hostingRes, isExpPackage, uin] = yield Promise.all([
259
259
  this._getHostingInfoTask(envId, true).catch((e) => {
260
260
  this.api.logger.error('获取静态托管失败: ', e);
261
261
  throw e;
262
262
  }),
263
- this._checkBillingResource(envId),
263
+ this._enableExpireTime(envId),
264
+ this.api.cloudbaseManager
265
+ .commonService('cam', '2019-01-16')
266
+ .call({
267
+ Action: 'GetUserAppId',
268
+ Param: {},
269
+ })
270
+ .then(({ OwnerUin }) => OwnerUin, (e) => {
271
+ return null;
272
+ }),
264
273
  ]);
265
274
  const [website] = hostingRes;
266
275
  this._website = website;
@@ -324,6 +333,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
324
333
  domain,
325
334
  endpointType: runtimeEndpointType,
326
335
  enableExpiredTag: isExpPackage,
336
+ account: { uin },
327
337
  }, (err, result) => __awaiter(this, void 0, void 0, function* () {
328
338
  if (!err) {
329
339
  try {
@@ -498,18 +508,30 @@ class LowCodePlugin extends framework_core_1.Plugin {
498
508
  }
499
509
  });
500
510
  }
501
- _checkBillingResource(envId) {
511
+ _enableExpireTime(envId) {
502
512
  return __awaiter(this, void 0, void 0, function* () {
503
513
  try {
504
- const { Resources = [] } = yield this.api.cloudbaseManager.commonService('tcb', '2018-06-08').call({
505
- Action: 'DescribeCommonBillingResources',
506
- Param: {
507
- EnvId: envId,
508
- ProductCode: 'p_lcap',
509
- SubProductCode: 'sp_lcap_base',
510
- StatusList: ['normal'],
511
- },
512
- });
514
+ const [{ Resources = [] }, isOperationAppUser] = yield Promise.all([
515
+ this.api.cloudbaseManager
516
+ .commonService('tcb', '2018-06-08')
517
+ .call({
518
+ Action: 'DescribeCommonBillingResources',
519
+ Param: {
520
+ EnvId: envId,
521
+ ProductCode: 'p_lcap',
522
+ SubProductCode: 'sp_lcap_base',
523
+ StatusList: ['normal'],
524
+ },
525
+ })
526
+ .catch((e) => {
527
+ this.api.logger.error('查询校验套餐失败: ', e);
528
+ throw e;
529
+ }),
530
+ Promise.resolve(false),
531
+ ]);
532
+ if (isOperationAppUser) {
533
+ return false;
534
+ }
513
535
  const list = Resources.sort((a, b) => {
514
536
  let atimesnap;
515
537
  let btimesnap;
@@ -536,9 +558,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
536
558
  }
537
559
  }
538
560
  }
539
- catch (e) {
540
- this.api.logger.error('查询校验套餐失败: ', e);
541
- }
561
+ catch (e) { }
542
562
  return false;
543
563
  });
544
564
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "1.7.22",
3
+ "version": "1.7.23",
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",
@@ -34,11 +34,11 @@
34
34
  "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
35
35
  },
36
36
  "dependencies": {
37
- "@cloudbase/cals": "^1.0.35",
37
+ "@cloudbase/cals": "^1.0.37",
38
38
  "@cloudbase/framework-core": "^1.8.16",
39
39
  "@cloudbase/framework-plugin-auth": "^1.8.16",
40
40
  "@cloudbase/framework-plugin-website": "^1.8.17",
41
- "@cloudbase/lowcode-builder": "^1.8.49",
41
+ "@cloudbase/lowcode-builder": "^1.8.50",
42
42
  "@cloudbase/lowcode-deployer": "^1.3.2",
43
43
  "@formily/react-schema-renderer": "1.1.7",
44
44
  "archiver": "^4.0.1",