diff --git a/lerna.json b/lerna.json index 4b62e248573ff6995be8e69482890065ffa8737c..0b80df700e738c259c4ba3d03f17c44e1b3b8762 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.1.11", + "version": "0.1.12", "npmClient": "pnpm", "packages": [ "packages/*" diff --git a/packages/cli/package.json b/packages/cli/package.json index 80d46cddcf193006756253af079dd07ad7269b07..e27dedb6ba82a1d6c41443eb7d4a9d247bc229f3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ibizlab/cli", - "version": "0.1.11", + "version": "0.1.12", "description": "核心代码", "bin": { "ibizlab": "out/bin.js" @@ -19,7 +19,7 @@ }, "license": "MIT", "dependencies": { - "@ibizlab/template": "^0.1.11", - "commander": "^8.3.0" + "@ibizlab/template": "^0.1.12", + "commander": "^9.0.0" } } diff --git a/packages/model/package.json b/packages/model/package.json index 5b7cfa32b23201b2fedf1518995bb239d4fac02c..7e3b34c53eb6e027b9613c4f3a0ab03e7efee484 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -1,6 +1,6 @@ { "name": "@ibizlab/template-model", - "version": "0.1.11", + "version": "0.1.12", "description": "核心代码", "main": "out/index.js", "types": "out/types/index.d.ts", @@ -18,7 +18,7 @@ "author": "chitanda", "license": "MIT", "dependencies": { - "@ibizlab/model": "^0.0.20", + "@ibizlab/model": "^0.0.23", "@ibizlab/template-generator": "^0.1.11", "lodash": "^4.17.21", "pluralize": "^8.0.0" diff --git a/packages/model/src/model/app/app-entity-model.ts b/packages/model/src/model/app/app-entity-model.ts index 4bd065f0a0219e92bc29f4011eb3a254613d3e3a..3813bf6473238a8bedc20d32b3f935d2a2be23a8 100644 --- a/packages/model/src/model/app/app-entity-model.ts +++ b/packages/model/src/model/app/app-entity-model.ts @@ -48,7 +48,7 @@ export class AppEntityModel extends PSAppDataEntityImpl { pathName: pluralizeMinorCoeName, parameterName: minorCoeName.toLowerCase(), }); - resource.deResPaths = deRsPaths; + resource.deResPaths = JSON.stringify(deRsPaths); this._appEntityResources.push(resource); }); } else { @@ -62,7 +62,7 @@ export class AppEntityModel extends PSAppDataEntityImpl { this._appEntityResources.push({ curCodeName: this.codeName.toLowerCase(), path: `${pluralizeCodeName}/:${this.codeName}`.toLowerCase(), - deResPaths, + deResPaths: JSON.stringify(deResPaths), }); } } diff --git a/packages/model/src/template-model.ts b/packages/model/src/template-model.ts index 766d192f22de21673b2fc9107f9ea24195f6811a..18c6731ca0236942c6da972ab47ef372cfe43db4 100644 --- a/packages/model/src/template-model.ts +++ b/packages/model/src/template-model.ts @@ -252,7 +252,6 @@ export class TemplateModel { if (subType && subType !== page.type) { return; } - console.log(page.type); const model = new TemplateModelData(this.globalModel); model.setApp(app); if (page.appModule) { @@ -271,11 +270,12 @@ export class TemplateModel { if (subType && subType !== ctrl.type) { return; } - console.log(ctrl.type); const model = new TemplateModelData(this.globalModel); model.setApp(app); if (page.appEntity) { model.setAppEntity(page.appEntity); + } else { + model.set('appEntities', 'app'); } model.setCtrl(ctrl); model.setType('ctrl'); diff --git a/packages/template/package.json b/packages/template/package.json index dfec0de970538a0920457c70ed77126f8527fbfa..bf0158726c28d977c559cf1bf0c177b4cfb56947 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@ibizlab/template", - "version": "0.1.11", + "version": "0.1.12", "description": "核心代码", "main": "out/index.js", "types": "out/types/index.d.ts", @@ -20,6 +20,6 @@ "@ibizlab/template-core": "^0.1.9", "@ibizlab/template-generator": "^0.1.11", "@ibizlab/template-handlebars": "^0.1.11", - "@ibizlab/template-model": "^0.1.11" + "@ibizlab/template-model": "^0.1.12" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34947e43725c4484cfa6afc8a4bd80dbc25c684f..9e0ebe06ab83f5cf29199f49b83c39e50cc6b30d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -77,11 +77,11 @@ importers: packages/cli: specifiers: - '@ibizlab/template': ^0.1.10 - commander: ^8.3.0 + '@ibizlab/template': ^0.1.12 + commander: ^9.0.0 dependencies: '@ibizlab/template': link:../template - commander: 8.3.0 + commander: 9.0.0 packages/core: specifiers: @@ -111,12 +111,12 @@ importers: packages/model: specifiers: - '@ibizlab/model': ^0.0.20 - '@ibizlab/template-generator': ^0.1.10 + '@ibizlab/model': ^0.0.23 + '@ibizlab/template-generator': ^0.1.11 lodash: ^4.17.21 pluralize: ^8.0.0 dependencies: - '@ibizlab/model': 0.0.20 + '@ibizlab/model': 0.0.23 '@ibizlab/template-generator': link:../generator lodash: 4.17.21 pluralize: 8.0.0 @@ -124,9 +124,9 @@ importers: packages/template: specifiers: '@ibizlab/template-core': ^0.1.9 - '@ibizlab/template-generator': ^0.1.10 - '@ibizlab/template-handlebars': ^0.1.10 - '@ibizlab/template-model': ^0.1.10 + '@ibizlab/template-generator': ^0.1.11 + '@ibizlab/template-handlebars': ^0.1.11 + '@ibizlab/template-model': ^0.1.12 dependencies: '@ibizlab/template-core': link:../core '@ibizlab/template-generator': link:../generator @@ -511,12 +511,13 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@ibizlab/model/0.0.20: - resolution: {integrity: sha512-SrqDZ6neJo7X5io3lbT3sL3ACLPIJLXQOy4MUvWn/PyqUxvNX4q6xMGM7Yr6OiGhn4DbAYt/XOlmAPjZHy3ddQ==} + /@ibizlab/model/0.0.23: + resolution: {integrity: sha512-gPrdwd8X8F8Z/8j3Xv2b1iFYMXBBm3ofYVdDGjUX0FUPLmzlhBPUFqBK5/2I1pl7h/+Zn0Uiklef3qJ0UqUKdw==} dependencies: - fs-extra: 10.0.0 - qx-util: 0.1.0 + fs-extra: 10.0.1 + qx-util: 0.1.2 rimraf: 3.0.2 + tapable: 2.2.1 dev: false /@istanbuljs/load-nyc-config/1.1.0: @@ -2815,9 +2816,9 @@ packages: delayed-stream: 1.0.0 dev: true - /commander/8.3.0: - resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} - engines: {node: '>= 12'} + /commander/9.0.0: + resolution: {integrity: sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==} + engines: {node: ^12.20.0 || >=14} dev: false /compare-func/2.0.0: @@ -3915,6 +3916,15 @@ packages: universalify: 2.0.0 dev: false + /fs-extra/10.0.1: + resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==} + engines: {node: '>=12'} + dependencies: + graceful-fs: 4.2.9 + jsonfile: 6.1.0 + universalify: 2.0.0 + dev: false + /fs-extra/9.1.0: resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} engines: {node: '>=10'} @@ -7089,6 +7099,14 @@ packages: rimraf: 3.0.2 dev: false + /qx-util/0.1.2: + resolution: {integrity: sha512-m+VZTkEwsytb9grYEA+xln+cZYe+Yu4YZWrRU1KY71PPi3qEPW/KNRrQeM3BvzANU0XBxWXs3PFIUkB/eHO5Iw==} + dependencies: + fs-extra: 10.0.1 + ramda: 0.28.0 + rimraf: 3.0.2 + dev: false + /ramda/0.28.0: resolution: {integrity: sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==} dev: false