@ibiz-template/full-code-template 0.7.41-rc.7 → 0.7.41-rc.8

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ibiz-template/full-code-template",
-  "version": "0.7.41-rc.7",
+  "version": "0.7.41-rc.8",
   "description": "vue3全代码模版包，根据包内容生成项目代码。",
-  "publicPath": "https://gitee.com/api/v5/repos/iBizModeling/ibiz-fullcode-resources/raw/0.7.41-rc.7.zip?ref=main",
+  "publicPath": "https://gitee.com/api/v5/repos/iBizModeling/ibiz-fullcode-resources/raw/0.7.41-rc.8.zip?ref=main",
   "bin": {
     "code-generator": "src/index.js"
   },

package/static/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ibiz-template/full-code-template",
   "private": true,
-  "version": "0.7.41-rc.7",
+  "version": "0.7.41-rc.8",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,7 +10,7 @@
     "lint": "eslint 'src/**/*.tsx' 'src/**/*.ts' 'src/**/*.vue'",
     "lint:style": "stylelint 'src/**/*.scss'",
     "pub:temp": "publish -p .",
-    "pub:code": "generate -m /home/zpc/workspace/project/plm-model/plm/model -o ./ --app plmweb -tv 0.7.41-rc.7 --local-mode",
+    "pub:code": "generate -m /home/zpc/workspace/project/plm-model/plm/model -o ./ --app plmweb -tv 0.7.41-rc.8 --local-mode",
     "compute:pkg": "ibiz-temp compute-pkg -m /home/zpc/workspace/project/plm-model/plm/model --app plmweb",
     "download:pkg": "ibiz-temp download-pkg",
     "prettier": "prettier --ignore-path '' 'src/publish/**/*.(ts|vue|tsx)' -w",

package/static/src/components/index.ts

@@ -6,7 +6,7 @@ export { IBizViewShell };
 
 export default {
   install(v: App): void {
-    v.component(IBizViewShell.name, IBizViewShell);
-    v.component(IBizSpecialView.name, IBizSpecialView);
+    v.component(IBizViewShell.name!, IBizViewShell);
+    v.component(IBizSpecialView.name!, IBizSpecialView);
   },
 };

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

@@ -1,13 +1,23 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable vue/no-mutating-props */
 import {
+  CTX,
   EventBase,
   IModal,
   IViewProvider,
   IViewShellHooks,
   RedrawViewEvent,
 } from '@ibiz-template/runtime';
-import { defineComponent, h, PropType, ref, Component, Ref, watch } from 'vue';
+import {
+  defineComponent,
+  h,
+  PropType,
+  ref,
+  Component,
+  Ref,
+  watch,
+  provide,
+} from 'vue';
 import { IAppView } from '@ibiz/model-core';
 import './view-shell.scss';
 import { useNamespace } from '@ibiz-template/vue3-util';
@@ -20,6 +30,8 @@ export const IBizViewShell = defineComponent({
     params: { type: Object as PropType<IParams> },
     modelData: { type: Object as PropType<IAppView> },
     viewId: { type: String },
+    // 解决打开浮动容器（模态、抽屉、弹出框）ctx丢失问题
+    ctx: { type: Object as PropType<CTX> },
     viewShellHooks: { type: Object as PropType<IViewShellHooks> },
   },
   setup(props, { attrs }) {
@@ -29,7 +41,9 @@ export const IBizViewShell = defineComponent({
     const provider = ref<IViewProvider>();
     const viewComponent = ref<Component>();
     const viewModel = ref<IModel>();
-
+    if (props.ctx) {
+      provide('ctx', props.ctx);
+    }
     // 当前视图上下文
     const context: Ref<IContext> = ref(props.context);
     // 当前视图参数

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

@@ -411,7 +411,9 @@ export class ModelLoader implements ModelLoaderProvider {
    */
   async getAppDataEntity(appId: string, id: string): Promise<IAppDataEntity> {
     if (!appId || appId === ibiz.env.appId) {
-      return getAppDataEntityModel(id);
+      const appDataEntity = await getAppDataEntityModel(id);
+      this.deepFillSubAppId(appDataEntity, ibiz.env.appId);
+      return appDataEntity;
     }
     const microAppConfig = ibiz.hub.microAppConfigCenter.getMicroApp(appId);
     const module = await System.import(