@ibiz-template/model-helper 0.5.3-beta.5 → 0.5.3-beta.7

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 (7) hide show
  1. package/dist/index.esm.js +9 -5
  2. package/dist/index.system.min.js +1 -1
  3. package/out/model-helper.d.ts +1 -1
  4. package/out/model-helper.d.ts.map +1 -1
  5. package/out/model-helper.js +9 -5
  6. package/package.json +3 -3
  7. package/src/model-helper.ts +9 -4
package/out/model-helper.d.ts CHANGED
@@ -80,7 +80,7 @@ export declare class ModelHelper {
80
80
  * @param {ISubAppRef} subApp
81
81
  * @return {*} {Promise<void>}
82
82
  */
83
- protected initSubApp(app: IApplication, subApp: ISubAppRef): Promise<void>;
83
+ protected initSubApp(app: IApplication, subApp: ISubAppRef, sourceSubApp: IModel): Promise<void>;
84
84
  /**
85
85
  * 获取应用模型
86
86
  *
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,EACP,UAAU,EAGX,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;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;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;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAatD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAUpB;;;;;;;;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,EACP,UAAU,EAGX,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;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;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;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAatD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAUpB;;;;;;;;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
@@ -88,7 +88,7 @@ export class ModelHelper {
88
88
  if (appSourceModel.getAllPSAppViews && appId === ibiz.env.appId) {
89
89
  const appViews = appSourceModel.getAllPSAppViews;
90
90
  appViews.forEach(appView => {
91
- ibiz.hub.setAppView(appView.id, appSourceModel.id);
91
+ ibiz.hub.setAppView(appView.id, appSourceModel.id, appView.priority);
92
92
  });
93
93
  }
94
94
  if (appSourceModel.getDefaultPSAppIndexView) {
@@ -118,10 +118,12 @@ export class ModelHelper {
118
118
  // 子应用模型相关处理
119
119
  {
120
120
  const { subAppRefs = [] } = app.model;
121
+ const { getAllPSSubAppRefs = [] } = appSourceModel;
121
122
  for (let i = 0; i < subAppRefs.length; i++) {
122
123
  const subApp = subAppRefs[i];
124
+ const sourceSubApp = getAllPSSubAppRefs[i];
123
125
  // eslint-disable-next-line no-await-in-loop
124
- await this.initSubApp(app, subApp);
126
+ await this.initSubApp(app, subApp, sourceSubApp);
125
127
  }
126
128
  }
127
129
  }
@@ -135,11 +137,13 @@ export class ModelHelper {
135
137
  * @param {ISubAppRef} subApp
136
138
  * @return {*} {Promise<void>}
137
139
  */
138
- async initSubApp(app, subApp) {
140
+ async initSubApp(app, subApp, sourceSubApp) {
139
141
  this.subAppRefs.push(subApp);
140
142
  const ids = subApp.appViewIds || [];
141
- ids.forEach(id => {
142
- ibiz.hub.setAppView(id, subApp.id);
143
+ const views = sourceSubApp.getAllPSAppViews || [];
144
+ ids.forEach((id, index) => {
145
+ const view = views[index];
146
+ ibiz.hub.setAppView(id, subApp.id, view.priority);
143
147
  });
144
148
  }
145
149
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/model-helper",
3
- "version": "0.5.3-beta.5",
3
+ "version": "0.5.3-beta.7",
4
4
  "description": "控制器包",
5
5
  "main": "out/index.js",
6
6
  "types": "out/index.d.ts",
@@ -35,7 +35,7 @@
35
35
  "ramda": "^0.29.1"
36
36
  },
37
37
  "devDependencies": {
38
- "@ibiz-template/runtime": "^0.5.3-beta.5",
38
+ "@ibiz-template/runtime": "^0.5.3-beta.7",
39
39
  "@types/pluralize": "^0.0.33",
40
40
  "@types/ramda": "^0.29.9"
41
41
  },
@@ -43,5 +43,5 @@
43
43
  "@ibiz-template/runtime": "^0.5.0-beta.0",
44
44
  "ramda": "^0.29.0"
45
45
  },
46
- "gitHead": "5e76e5c131a8b28decd6af541137e756e2ca8c77"
46
+ "gitHead": "8a6d086ba278298213201f71876fc18d1a1995c3"
47
47
  }
package/src/model-helper.ts CHANGED
@@ -115,7 +115,7 @@ export class ModelHelper {
115
115
  if (appSourceModel.getAllPSAppViews && appId === ibiz.env.appId) {
116
116
  const appViews = appSourceModel.getAllPSAppViews as IModel[];
117
117
  appViews.forEach(appView => {
118
- ibiz.hub.setAppView(appView.id, appSourceModel.id);
118
+ ibiz.hub.setAppView(appView.id, appSourceModel.id, appView.priority);
119
119
  });
120
120
  }
121
121
  if (appSourceModel.getDefaultPSAppIndexView) {
@@ -150,10 +150,12 @@ export class ModelHelper {
150
150
  // 子应用模型相关处理
151
151
  {
152
152
  const { subAppRefs = [] } = app.model;
153
+ const { getAllPSSubAppRefs = [] } = appSourceModel;
153
154
  for (let i = 0; i < subAppRefs.length; i++) {
154
155
  const subApp = subAppRefs[i];
156
+ const sourceSubApp = getAllPSSubAppRefs[i];
155
157
  // eslint-disable-next-line no-await-in-loop
156
- await this.initSubApp(app, subApp);
158
+ await this.initSubApp(app, subApp, sourceSubApp);
157
159
  }
158
160
  }
159
161
  }
@@ -171,11 +173,14 @@ export class ModelHelper {
171
173
  protected async initSubApp(
172
174
  app: IApplication,
173
175
  subApp: ISubAppRef,
176
+ sourceSubApp: IModel,
174
177
  ): Promise<void> {
175
178
  this.subAppRefs.push(subApp);
176
179
  const ids = subApp.appViewIds || [];
177
- ids.forEach(id => {
178
- ibiz.hub.setAppView(id, subApp.id);
180
+ const views = sourceSubApp.getAllPSAppViews || [];
181
+ ids.forEach((id, index) => {
182
+ const view = views[index];
183
+ ibiz.hub.setAppView(id, subApp.id, view.priority);
179
184
  });
180
185
  }
181
186