update：更新

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/helper/app-func/app-func-config.ts.hbs

@@ -9,6 +9,7 @@ export const FuncConfig = [
     {{/if}}
     {{#if (eq func.appFuncType 'APPVIEW')}}
     openMode: "{{func.openMode}}",
+    viewName: "{{func.psAppView.name}}",
     viewCodeName: "{{func.psAppView.codeName}}",
     {{/if}}
     navParam: {

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/helper/app-func/app-func-service.ts

-import { IParam, FuncConfig } from "@ibiz-core";
+import { IParam, FuncConfig, IContext } from "@ibiz-core";
 import { App } from "@service";
 
 export class AppFuncService {
@@ -28,7 +28,7 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  executeAppFunc(menu: IParam, context: IParam, viewParams: IParam) {
+  executeAppFunc(menu: IParam, context: IContext, viewParams: IParam) {
     const appFunc = FuncConfig.find((func: IParam)=> Object.is(func.funcTag, menu.funcTag));
     if (appFunc) {
       switch (appFunc.appFuncType) {
@@ -57,7 +57,7 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  executeCustomFunc(appFunc: IParam, context: IParam, viewParams: IParam) {
+  private executeCustomFunc(appFunc: IParam, context: IContext, viewParams: IParam) {
     console.warn(`${appFunc.appFuncType} 类型应用功能暂未支持`);
   }
 
@@ -68,7 +68,7 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  executeJavaScript(appFunc: IParam, context: IParam, viewParams: IParam) {
+  private executeJavaScript(appFunc: IParam, context: IContext, viewParams: IParam) {
     console.warn(`${appFunc.appFuncType} 类型应用功能暂未支持`);
   }
 
@@ -80,7 +80,7 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  executePresetFunc(appFunc: IParam, context: IParam, viewParams: IParam) {
+  private executePresetFunc(appFunc: IParam, context: IContext, viewParams: IParam) {
     console.warn(`${appFunc.appFuncType} 类型应用功能暂未支持`);
   }
 
@@ -91,7 +91,7 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  openHtmlPage(appFunc: IParam, context: IParam, viewParams: IParam) {
+  private openHtmlPage(appFunc: IParam, context: IContext, viewParams: IParam) {
     window.open(appFunc.htmlPageUrl, '_blank');
   }
 
@@ -102,8 +102,9 @@ export class AppFuncService {
    * @param {IParam} viewParams 视图参数
    * @memberof AppFuncService
    */
-  openAppView(appFunc: IParam, context: IParam, viewParams: IParam) {
+  private openAppView(appFunc: IParam, context: IContext, viewParams: IParam) {
     const view = {
+      name: appFunc.viewName,
       codeName: appFunc.viewCodeName,
       openMode: appFunc.openMode,
     }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/modules/views/view-base/view-prop-base.ts

 import { Subject } from "rxjs";
-import { IActionParam, IParam } from "@ibiz-core";
+import { IActionParam, IParam, IContext } from "@ibiz-core";
 
 /**
  * @description 视图props的基类
@@ -13,7 +13,7 @@ export interface ViewPropsBase {
    * @type {IParam}
    * @memberof ViewPropsBase
    */
-  context?: IParam;
+  context?: IContext;
 
   /**
    * @description 视图参数(外部传入)

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/modules/views/view-base/view-state-base.ts

 import { Subject } from "rxjs";
-import { IActionParam, IParam } from '@ibiz-core';
+import { IActionParam, IParam, IContext } from '@ibiz-core';
 
 /**
  * @description 视图基类状态
@@ -24,10 +24,10 @@ export interface ViewStateBase {
 
   /**
    * @description 上下文参数
-   * @type {IParam}
+   * @type {IContext}
    * @memberof ViewStateBase
    */
-  context: IParam;
+  context: IContext;
 
   /**
    * @description 视图参数

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/modules/widgets/control-base/control-prop-base.ts

 import { Subject } from "rxjs";
-import { IActionParam, IParam } from "@ibiz-core";
+import { IActionParam, IParam, IContext } from "@ibiz-core";
 
 /**
  * @description 部件props的基类
@@ -10,10 +10,10 @@ export interface ControlPropsBase {
   
   /**
    * @description 上下文参数(外部传入)
-   * @type {IParam}
+   * @type {IContext}
    * @memberof ControlPropsBase
    */
-  context?: IParam;
+  context?: IContext;
 
   /**
    * @description 视图参数(外部传入)

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ibiz-core/modules/widgets/control-base/control-state-base.ts

-import { IActionParam, IParam } from "@ibiz-core";
+import { IActionParam, IParam, IContext } from "@ibiz-core";
 import { Subject } from "rxjs";
 
 /**
@@ -27,7 +27,7 @@ export interface ControlStateBase {
    * @type {IParam}
    * @memberof ControlStateBase
    */
-  context: IParam;
+  context: IContext;
 
   /**
    * @description 视图参数

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@APPMENU}}-menu/{{ctrls@APPMENU}}-menu.vue.hbs

 <script setup lang="ts">
 import { Subject } from "rxjs";
 import { CtrlConfig } from "./{{spinalCase ctrl.codeName}}-menu-config";
-import { IParam, IActionParam, MenuControl } from "@ibiz-core";
+import { IParam, IActionParam, MenuControl, IContext } from "@ibiz-core";
 interface Props{
-  context: IParam;
+  context: IContext;
   defaultView: string;
   collapsed: boolean;
   menuAlign: "LEFT" | "TOP" | "CENTER" | "TABEXP_LEFT" | "TABEXP_TOP" | "TABEXP_RIGHT" | "TABEXP_BOTTOM" | "NONE";

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@FORM}}-form/{{ctrls@FORM}}-form.vue.hbs

@@ -2,10 +2,10 @@
 <script setup lang="ts">
 import { Subject } from 'rxjs';
 import { CtrlConfig } from './{{spinalCase ctrl.codeName}}-form-config';
-import { FormControl, IActionParam, IParam, ControlAction } from '@ibiz-core';
+import { FormControl, IActionParam, IParam, ControlAction, IContext } from '@ibiz-core';
 
 interface Props {
-  context: IParam;
+  context: IContext;
   viewParams?: IParam;
   controlAction: ControlAction;
   showBusyIndicator?: boolean;

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid.vue.hbs

@@ -2,10 +2,10 @@
 <script setup lang="ts">
 import { Subject } from 'rxjs';
 import { CtrlConfig } from './{{spinalCase ctrl.codeName}}-grid-config';
-import { GridControl, IActionParam, IParam, ControlAction, deepCopy } from '@ibiz-core';
+import { GridControl, IActionParam, IParam, IContext, ControlAction, deepCopy } from '@ibiz-core';
 
 interface Props {
-  context: IParam;
+  context: IContext;
   multiple: boolean;
   rowEditState: boolean;
   rowActiveMode: 0 | 1 | 2;

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@PICKUPVIEWPANEL}}-pickupviewpanel/{{ctrls@PICKUPVIEWPANEL}}-pickupviewpanel.vue.hbs

 <script setup lang="ts">
-	import { Subject } from 'rxjs';
-	import { IActionParam, IParam, ControlAction, PickupViewPanelControl } from '@ibiz-core';
-	import { CtrlConfig } from './{{ctrl.codeName.spinalCase}}-pickupviewpanel-config';
-
-	interface Props {
-		context: IParam;
-		viewParams?: IParam;
-		controlAction: ControlAction;
-		showBusyIndicator?: boolean;
-		isSingleSelect?: boolean;
-		viewMode?: number;
-		selectedData?: string;
-		isShowButton?: boolean;
-		viewSubject: Subject<IActionParam>;
-	}
-
-	const props = withDefaults(defineProps < Props > (), {
-		viewSubject: () => new Subject < IActionParam > (),
-		viewMode: 0,
-		isSingleSelect: false,
-		isShowButton: true,
-		showBusyIndicator: true,
-	})
-
-	// emit声明
-	interface CtrlEmit {
-		(name: "ctrlEvent", value: IActionParam): void;
-	}
-
-	const emit = defineEmits < CtrlEmit > ();
-
-	// 安装功能模块，提供状态和能力方法
-	const { state, inited, viewdata, viewparam } = new PickupViewPanelControl(CtrlConfig).moduleInstall(props);
+import { Subject } from 'rxjs';
+import { IActionParam, IParam, ControlAction, PickupViewPanelControl, IContext } from '@ibiz-core';
+import { CtrlConfig } from './{{ctrl.codeName.spinalCase}}-pickupviewpanel-config';
+
+interface Props {
+  context: IContext;
+  viewParams?: IParam;
+  controlAction: ControlAction;
+  showBusyIndicator?: boolean;
+  isSingleSelect?: boolean;
+  viewMode?: number;
+  selectedData?: string;
+  isShowButton?: boolean;
+  viewSubject: Subject<IActionParam>;
+}
+
+const props = withDefaults(defineProps < Props > (), {
+  viewSubject: () => new Subject < IActionParam > (),
+  viewMode: 0,
+  isSingleSelect: false,
+  isShowButton: true,
+  showBusyIndicator: true,
+})
+
+// emit声明
+interface CtrlEmit {
+  (name: "ctrlEvent", value: IActionParam): void;
+}
+
+const emit = defineEmits < CtrlEmit > ();
+
+// 安装功能模块，提供状态和能力方法
+const { state, inited, viewdata, viewparam } = new PickupViewPanelControl(CtrlConfig).moduleInstall(props);
 
 
 </script>
 
 <template>
-	<div class="ibiz-pickupviewpanel">
-		<component
-			v-if="inited && state.embeddedView && state.embeddedView.viewName"
-			:if="state.embeddedView.viewName"
-			:viewdata="viewdata"
-			:viewparam="viewparam"
-			:isSingleSelect="state.isSingleSelect"
-			:isShowButton="state.isShowButton"
-			:selectedData="state.selectedData"
-		></component>
-	</div>
+  <div class="ibiz-pickupviewpanel">
+    <component
+      v-if="inited && state.embeddedView && state.embeddedView.viewName"
+      :if="state.embeddedView.viewName"
+      :viewdata="viewdata"
+      :viewparam="viewparam"
+      :isSingleSelect="state.isSingleSelect"
+      :isShowButton="state.isShowButton"
+      :selectedData="state.selectedData"
+    ></component>
+  </div>
 </template>
\ No newline at end of file