@ibiz-template/model-helper 0.1.17 → 0.1.18

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 (12) hide show
  1. package/dist/index.esm.js +15 -6
  2. package/dist/index.system.min.js +1 -1
  3. package/dist/index.system.min.js.map +1 -1
  4. package/out/model-helper.d.ts +3 -1
  5. package/out/model-helper.d.ts.map +1 -1
  6. package/out/model-helper.js +4 -2
  7. package/out/model-util.d.ts +2 -1
  8. package/out/model-util.d.ts.map +1 -1
  9. package/out/model-util.js +10 -2
  10. package/package.json +3 -3
  11. package/src/model-helper.ts +3 -0
  12. package/src/model-util.ts +9 -3
package/out/model-helper.d.ts CHANGED
@@ -12,6 +12,7 @@ import { ModelUtil } from './model-util';
12
12
  export declare class ModelHelper {
13
13
  protected getModel: (url: string) => Promise<IModel>;
14
14
  protected defaultAppId: string;
15
+ protected permission: boolean;
15
16
  protected dsl: DSLHelper;
16
17
  /**
17
18
  * 模型获取工具类缓存
@@ -28,8 +29,9 @@ export declare class ModelHelper {
28
29
  * @date 2023-04-16 17:04:01
29
30
  * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
30
31
  * @param {string} defaultAppId 默认应用标识
32
+ * @param {boolean} [permission=true] 是否启用权限
31
33
  */
32
- constructor(getModel: (url: string) => Promise<IModel>, defaultAppId: string);
34
+ constructor(getModel: (url: string) => Promise<IModel>, defaultAppId: string, permission?: boolean);
33
35
  /**
34
36
  * 初始化具体应用模型工具类
35
37
  *
package/out/model-helper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAqBpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IACpD,SAAS,CAAC,YAAY,EAAE,MAAM;IArBhC,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;OAMG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM;IAGhC;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAchB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgClE;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAMlE;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAKpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}
1
+ {"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAsBpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IACpD,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAvB/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAGtC;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgClE;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAMlE;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAKpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}
package/out/model-helper.js CHANGED
@@ -17,10 +17,12 @@ export class ModelHelper {
17
17
  * @date 2023-04-16 17:04:01
18
18
  * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
19
19
  * @param {string} defaultAppId 默认应用标识
20
+ * @param {boolean} [permission=true] 是否启用权限
20
21
  */
21
- constructor(getModel, defaultAppId) {
22
+ constructor(getModel, defaultAppId, permission = true) {
22
23
  this.getModel = getModel;
23
24
  this.defaultAppId = defaultAppId;
25
+ this.permission = permission;
24
26
  this.dsl = new DSLHelper();
25
27
  /**
26
28
  * 模型获取工具类缓存
@@ -43,7 +45,7 @@ export class ModelHelper {
43
45
  */
44
46
  async initModelUtil(modelTag, appId = this.defaultAppId) {
45
47
  ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
46
- const modelUtil = new ModelUtil(appId, modelTag, this.getModel, this.defaultAppId === appId);
48
+ const modelUtil = new ModelUtil(appId, modelTag, this.getModel, this.defaultAppId === appId, this.permission);
47
49
  await modelUtil.init();
48
50
  this.cache.set(appId, modelUtil);
49
51
  await ibiz.hub.getAppAsync(ibiz.env.appId);
package/out/model-util.d.ts CHANGED
@@ -12,6 +12,7 @@ export declare class ModelUtil {
12
12
  protected modelTag: string;
13
13
  protected get: (url: string) => Promise<IModel>;
14
14
  protected hub: boolean;
15
+ protected permission: boolean;
15
16
  /**
16
17
  * 模型缓存
17
18
  *
@@ -48,7 +49,7 @@ export declare class ModelUtil {
48
49
  * @param {(url: string) => Promise<IModel>} get 模型加载方法
49
50
  * @param {boolean} hub 是否为 hub 应用基座
50
51
  */
51
- constructor(appId: string, modelTag: string, get: (url: string) => Promise<IModel>, hub: boolean);
52
+ constructor(appId: string, modelTag: string, get: (url: string) => Promise<IModel>, hub: boolean, permission?: boolean);
52
53
  /**
53
54
  * 在使用前需要初始化，来进行异步加载
54
55
  *
package/out/model-util.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IA3CxB;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO;IAGxB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAUpC;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
1
+ {"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IA5C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
package/out/model-util.js CHANGED
@@ -19,11 +19,12 @@ export class ModelUtil {
19
19
  * @param {(url: string) => Promise<IModel>} get 模型加载方法
20
20
  * @param {boolean} hub 是否为 hub 应用基座
21
21
  */
22
- constructor(appId, modelTag, get, hub) {
22
+ constructor(appId, modelTag, get, hub, permission = true) {
23
23
  this.appId = appId;
24
24
  this.modelTag = modelTag;
25
25
  this.get = get;
26
26
  this.hub = hub;
27
+ this.permission = permission;
27
28
  /**
28
29
  * 模型缓存
29
30
  *
@@ -77,7 +78,14 @@ export class ModelUtil {
77
78
  */
78
79
  async getAppModel() {
79
80
  if (!this.appModel) {
80
- this.appModel = await this.getModel(this.hub && ibiz.env.hub ? `/PSSYSAPP.hub.json` : `/PSSYSAPP.json`);
81
+ let appPath = '/PSSYSAPP.json';
82
+ if (this.hub && ibiz.env.hub) {
83
+ appPath = `/PSSYSAPP.hub.json`;
84
+ }
85
+ if (this.permission === false) {
86
+ appPath = `/PSSYSAPP.simple.json`;
87
+ }
88
+ this.appModel = await this.getModel(appPath);
81
89
  this.appModel.id = this.appId;
82
90
  }
83
91
  return this.appModel;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/model-helper",
3
- "version": "0.1.17",
3
+ "version": "0.1.18",
4
4
  "description": "控制器包",
5
5
  "main": "out/index.js",
6
6
  "types": "out/index.d.ts",
@@ -34,11 +34,11 @@
34
34
  "pluralize": "^8.0.0"
35
35
  },
36
36
  "devDependencies": {
37
- "@ibiz-template/runtime": "^0.1.17",
37
+ "@ibiz-template/runtime": "^0.1.18",
38
38
  "@types/pluralize": "^0.0.30"
39
39
  },
40
40
  "peerDependencies": {
41
41
  "@ibiz-template/runtime": "^0.1.0"
42
42
  },
43
- "gitHead": "7f956bdd62e436209f34b16d69a78a73b35842ae"
43
+ "gitHead": "d363fb94c05e098f5a6c928533788e7cba99f833"
44
44
  }
package/src/model-helper.ts CHANGED
@@ -37,10 +37,12 @@ export class ModelHelper {
37
37
  * @date 2023-04-16 17:04:01
38
38
  * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
39
39
  * @param {string} defaultAppId 默认应用标识
40
+ * @param {boolean} [permission=true] 是否启用权限
40
41
  */
41
42
  constructor(
42
43
  protected getModel: (url: string) => Promise<IModel>,
43
44
  protected defaultAppId: string,
45
+ protected permission: boolean = true,
44
46
  ) {}
45
47
 
46
48
  /**
@@ -62,6 +64,7 @@ export class ModelHelper {
62
64
  modelTag,
63
65
  this.getModel,
64
66
  this.defaultAppId === appId,
67
+ this.permission,
65
68
  );
66
69
  await modelUtil.init();
67
70
  this.cache.set(appId, modelUtil);
package/src/model-util.ts CHANGED
@@ -55,6 +55,7 @@ export class ModelUtil {
55
55
  protected modelTag: string,
56
56
  protected get: (url: string) => Promise<IModel>,
57
57
  protected hub: boolean,
58
+ protected permission: boolean = true,
58
59
  ) {}
59
60
 
60
61
  /**
@@ -105,9 +106,14 @@ export class ModelUtil {
105
106
  */
106
107
  async getAppModel(): Promise<IModel> {
107
108
  if (!this.appModel) {
108
- this.appModel = await this.getModel(
109
- this.hub && ibiz.env.hub ? `/PSSYSAPP.hub.json` : `/PSSYSAPP.json`,
110
- );
109
+ let appPath: string = '/PSSYSAPP.json';
110
+ if (this.hub && ibiz.env.hub) {
111
+ appPath = `/PSSYSAPP.hub.json`;
112
+ }
113
+ if (this.permission === false) {
114
+ appPath = `/PSSYSAPP.simple.json`;
115
+ }
116
+ this.appModel = await this.getModel(appPath);
111
117
  this.appModel.id = this.appId;
112
118
  }
113
119
  return this.appModel;