@ibiz-template/full-code-template 0.7.41-alpha.2 → 0.7.41-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/full-code-template",
-  "version": "0.7.41-alpha.2",
+  "version": "0.7.41-alpha.3",
   "description": "vue3全代码模版包，根据包内容生成项目代码。",
   "bin": {
     "code-generator": "src/index.js"
@@ -16,7 +16,7 @@
   "author": "ibiz",
   "license": "MIT",
   "dependencies": {
-    "@ibizlab/cli": "^0.2.25",
+    "@ibizlab/cli": "^0.2.26",
     "commander": "^12.0.0",
     "prettier": "^3.2.5"
   }

package/src/index.js

@@ -33,5 +33,6 @@ execSync(
   `${binPath}/ibizlab pub -m ${modelPath} -t ${templatePath} -o ${outputPath}/src/publish --app ${app} && ${binPath}/prettier --ignore-path '' '${outputPath}/src/publish/**/*.(ts|vue|tsx)' -w`,
 );
 copyFiles(`${outputPath}/src/publish/app`, `${outputPath}/public/static/app`);
+fs.rmSync(`${outputPath}/src/publish/app`, { recursive: true, force: true }); // 递归删除目录及其内容
 
 console.log(`发布模板成功，模型路径：${modelPath}，发布应用代码标识：${app}，模板路径：${templatePath}，输出路径：${outputPath}/src/publish`);

package/static/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ibiz-template/full-code-template",
   "private": true,
-  "version": "0.7.41-alpha.2",
+  "version": "0.7.41-alpha.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -60,7 +60,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.8.0",
     "@commitlint/config-conventional": "^17.8.0",
-    "@ibizlab/cli": "^0.2.25",
+    "@ibizlab/cli": "^0.2.26",
     "@types/lodash-es": "^4.17.10",
     "@types/node": "^20.8.7",
     "@types/nprogress": "^0.2.2",

package/static/pnpm-lock.yaml

@@ -131,8 +131,8 @@ devDependencies:
     specifier: ^17.8.0
     version: 17.8.0
   '@ibizlab/cli':
-    specifier: ^0.2.25
-    version: 0.2.25(@ibizlab/model@0.2.15)
+    specifier: ^0.2.26
+    version: 0.2.26(@ibizlab/model@0.2.15)
   '@types/lodash-es':
     specifier: ^4.17.10
     version: 4.17.10
@@ -4221,11 +4221,11 @@ packages:
   /@ibiz/rt-model-api@0.2.73:
     resolution: {integrity: sha512-lrJzvrwqeXGuGcE+3WML4O4d2oty+cD35cA7XdTtNVX9XrmJdpYmSAGb2s2BKuNxrrIsfiJJhKblKLdwGywMwA==}
 
-  /@ibizlab/cli@0.2.25(@ibizlab/model@0.2.15):
-    resolution: {integrity: sha512-lKLU+i0VRmBJjVU9JmBru3gRAwn5e7uloa3zEfgnwOlc3IldWlALqJ+0SDE27Ou6MPXY3ll14GP2Beh+1OtF8Q==}
+  /@ibizlab/cli@0.2.26(@ibizlab/model@0.2.15):
+    resolution: {integrity: sha512-2+Ea35ziD7B0xub4ND89ln5VAWzA1sKi1/OWGVAzgF2QQ1LyWbw+DNMdw11PJb+dum4lH2ElAw++Awbj3sZB1g==}
     hasBin: true
     dependencies:
-      '@ibizlab/template': 0.2.25(@ibizlab/model@0.2.15)
+      '@ibizlab/template': 0.2.26(@ibizlab/model@0.2.15)
       chalk: 4.1.2
       commander: 11.1.0
       fs-extra: 11.2.0
@@ -4272,8 +4272,8 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /@ibizlab/template-model@0.2.25(@ibizlab/model@0.2.15):
-    resolution: {integrity: sha512-nhMfcMN5zAUhQ6zHUYPmq4xNu7n2Ki/gfE512GNWfI+8pwx/RYIGXp3tROZnV38jTybDy3JQWb8spR5J2pxaFQ==}
+  /@ibizlab/template-model@0.2.26(@ibizlab/model@0.2.15):
+    resolution: {integrity: sha512-hhBOpE2fXUkAIIhbzaGjMO73NJtCFfYIhpfoEK72dRTQL7QCExTEspDVK4Ks2wyMiDpJz5Zk/jqqkbF7W5yCBQ==}
     peerDependencies:
       '@ibizlab/model': ^0.2.15
     dependencies:
@@ -4286,8 +4286,8 @@ packages:
       qx-util: 0.4.8
     dev: true
 
-  /@ibizlab/template@0.2.25(@ibizlab/model@0.2.15):
-    resolution: {integrity: sha512-ooqiCGKxs4WV5LuwFvgle+0r+H/0iHiG8t6e3qsZurvifImxp1PZsR2wqFfrAggArcmtvN4An0UFxyO/VunArQ==}
+  /@ibizlab/template@0.2.26(@ibizlab/model@0.2.15):
+    resolution: {integrity: sha512-lnhNNyWbdLNJUxJMfIPyQXq8pGWfi5Ib2/l19TV9B/keMB3TutIkuVJ6RQfexdo3LhojHA2vSdc6zUeNJaIgdw==}
     peerDependencies:
       '@ibizlab/model': ^0.2.14
     dependencies:
@@ -4295,7 +4295,7 @@ packages:
       '@ibizlab/template-core': 0.2.2
       '@ibizlab/template-generator': 0.2.4
       '@ibizlab/template-handlebars': 0.2.4
-      '@ibizlab/template-model': 0.2.25(@ibizlab/model@0.2.15)
+      '@ibizlab/template-model': 0.2.26(@ibizlab/model@0.2.15)
       chokidar: 3.6.0
       fs-extra: 11.2.0
       qx-util: 0.4.8

package/static/src/components/view-shell/view-shell.tsx

@@ -25,8 +25,11 @@ export const IBizViewShell = defineComponent({
     // 初始化方法
     const init = async (): Promise<void> => {
       const viewId = props.modelData ? props.modelData.id! : props.viewId!;
-      viewComponent.value = await getAppViewComponent(viewId);
       viewModel.value = await ibiz.hub.getAppView(viewId);
+      viewComponent.value = await getAppViewComponent(
+        viewId,
+        viewModel.value.appId,
+      );
       if (!viewComponent.value) {
         errMsg.value = `未找到${viewId}对应的视图组件`;
       }

package/static/src/model/model-loader.ts

@@ -15,6 +15,7 @@ import {
   ModelLoaderProvider,
 } from '@ibiz-template/runtime';
 import { kebabCase } from 'lodash-es';
+import { clone } from 'ramda';
 import {
   getAppDataEntityModel,
   getAppViewModel,
@@ -154,12 +155,14 @@ export class ModelLoader implements ModelLoaderProvider {
       }
     });
     // 子应用模型相关处理
-    const microApps = ibiz.hub.microAppConfigCenter.getMicroApps();
-    if (microApps && microApps.length > 0) {
-      for (let i = 0; i < microApps.length; i++) {
-        const microApp = microApps[i];
-        // eslint-disable-next-line no-await-in-loop
-        await this.initSubApp(appService, microApp);
+    if (!appId || appId === ibiz.env.appId) {
+      const microApps = ibiz.hub.microAppConfigCenter.getMicroApps();
+      if (microApps && microApps.length > 0) {
+        for (let i = 0; i < microApps.length; i++) {
+          const microApp = microApps[i];
+          // eslint-disable-next-line no-await-in-loop
+          await this.initSubApp(appService, microApp);
+        }
       }
     }
     return true;
@@ -205,6 +208,8 @@ export class ModelLoader implements ModelLoaderProvider {
     app: IAppService,
     microAppConfig: IMicroAppConfig,
   ): Promise<void> {
+    const targetSubAppRef = await this.getSubAppRef(microAppConfig.name);
+    if (targetSubAppRef) return;
     const res = await ibiz.net.axios({
       method: 'get',
       headers: { 'Access-Control-Allow-Origin': '*' },
@@ -215,7 +220,12 @@ export class ModelLoader implements ModelLoaderProvider {
       const subApp = this.dsl.subAppRef(sourceSubApp);
       subApp.appId = microAppConfig.name;
       subApp.serviceId = microAppConfig?.baseUrl;
-      this.subAppRefs.push(subApp as ISubAppRef);
+      if (subApp.appMenuModel) {
+        this.deepFillSubAppId(subApp.appMenuModel, microAppConfig.name);
+      }
+      if (!targetSubAppRef) {
+        this.subAppRefs.push(subApp as ISubAppRef);
+      }
       // 设置视图到hub中
       const views = sourceSubApp.getAllPSAppViews || [];
       views.forEach((view: IModel) => {
@@ -234,6 +244,7 @@ export class ModelLoader implements ModelLoaderProvider {
         sourceSubApp.getAllPSDEDRControls || [],
       );
       drCtrls.forEach((drCtrl: IModel) => {
+        this.deepFillSubAppId(drCtrl, microAppConfig.name);
         ibiz.hub.registerSubAppDrControls(
           microAppConfig.name || ibiz.env.appId,
           drCtrl,
@@ -374,17 +385,17 @@ export class ModelLoader implements ModelLoaderProvider {
    */
   async getAppView(appId: string, codeName: string): Promise<IAppView> {
     if (appId === ibiz.env.appId) {
-      const dsl = await getAppViewModel(codeName);
+      const viewModel = await getAppViewModel(codeName);
+      const dsl = clone(viewModel);
       this.deepFillSubAppId(dsl, appId);
       this.calcAppViewSubAppModel(dsl);
       return dsl;
     }
     const microAppConfig = ibiz.hub.microAppConfigCenter.getMicroApp(appId);
     const module = await System.import(
-      `${microAppConfig!.entry}/static/js/model/views/${codeName.replaceAll(
-        '_',
-        '-',
-      )}-legacy.js`,
+      `${microAppConfig!.entry}/static/js/model/views/${kebabCase(
+        codeName,
+      ).toLowerCase()}-legacy.js`,
     );
     this.deepFillSubAppId(module.default, appId);
     return module.default;
@@ -403,9 +414,9 @@ export class ModelLoader implements ModelLoaderProvider {
     }
     const microAppConfig = ibiz.hub.microAppConfigCenter.getMicroApp(appId);
     const module = await System.import(
-      `${microAppConfig!.entry}/static/js/model/entities/${id
-        .split('.')[1]
-        .replaceAll('_', '-')}-legacy.js`,
+      `${microAppConfig!.entry}/static/js/model/entities/${
+        id.indexOf('.') !== -1 ? kebabCase(id.split('.')[1]).toLowerCase() : id
+      }-legacy.js`,
     );
     this.deepFillSubAppId(module.default, appId);
     return module.default;

package/template/pages/index.ts.hbs

@@ -11,10 +11,13 @@ function calcAppViewId(tag: string): string {
   return id;
 }
 
-export async function getAppViewComponent(name: string): Promise<Component> {
-    const _name = calcAppViewId(name).toLowerCase();
-    // 子应用视图
-    if (name.split('.')[0] !== ibiz.env.appId.split('__')[1]) {
+export async function getAppViewComponent(
+  name: string,
+  appId: string,
+): Promise<Component> {
+  const _name = calcAppViewId(name).toLowerCase();
+  // 子应用视图
+  if (appId !== ibiz.env.appId) {
       return defineAsyncComponent(
         () => import('../../components/sub-app-view/sub-app-view.vue'),
       );