@ibiz-template/full-code-template 0.7.41-rc.1 → 0.7.41-rc.10

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

@@ -4,6 +4,7 @@ import {
   IAppBIScheme,
   IAppCodeList,
   IAppDataEntity,
+  IAppLan,
   IAppView,
   IApplication,
   ISubAppRef,
@@ -23,6 +24,7 @@ import {
   getAppModel,
   registerCodeList,
 } from '@/publish/model';
+import locale from '@/publish/locale';
 import { mergeUIActions } from './merge-ui-action';
 
 /**
@@ -411,7 +413,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(
@@ -449,6 +453,16 @@ export class ModelLoader implements ModelLoaderProvider {
     throw new Error('Method not implemented.');
   }
 
+  async getPSAppLang(
+    language: string,
+    appId: string | IObject | undefined,
+  ): Promise<IAppLan | null> {
+    if ((!appId || appId === ibiz.env.appId) && (locale as IData)[language]) {
+      return (locale as IData)[language];
+    }
+    return null;
+  }
+
   async translationModelToDsl(
     data: IData,
     type: 'APP' | 'VIEW' | 'CTRL' | 'APPENTITY' | 'APPBIREPORT',

package/template/locale/index.ts.hbs

@@ -0,0 +1,6 @@
+/* eslint-disable prettier/prettier */
+{{#each app.appLans as |appLan|}}
+import {{appLan.language}} from './{{spinalCase appLan.language}}';
+{{/each}}
+
+export default { {{#each app.appLans as |appLan|}}{{appLan.language}}{{#unless @last}},{{/unless}} {{/each}} };

package/template/locale/{{appLans}}.ts.hbs

@@ -0,0 +1,2 @@
+/* eslint-disable prettier/prettier */
+export default {{jsonStringify appLan.DSL 2}}

package/template/model/view-config/{{pages}}.ts.hbs

@@ -3,8 +3,8 @@ export default {
   codeName: '{{page.codeName}}',
   openMode: {{#if page.openMode }}'{{page.openMode}}'{{else}}'INDEXVIEWTAB'{{/if}},
   viewType: '{{page.viewType}}',
-  width: {{page.width}},
-  height: {{page.height}},
+  width: {{#if page.width }}{{page.width}}{{else}}undefined{{/if}},
+  height: {{#if page.height }}{{page.height}}{{else}}undefined{{/if}},
   appDataEntityId: {{#if page.appEntity }}'{{page.appEntity.DSL.id}}'{{else}}undefined{{/if}},
   redirectView: {{page.redirectView}},
   modalOption:{{jsonStringify page.modalOption 2}},