From d6dd6aa08b0a0a48168713c6eb47988fb9f88ece Mon Sep 17 00:00:00 2001
From: aalizzwell <aalizzwell@126.com>
Date: Tue, 24 Jun 2025 20:34:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature:=20renderer=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E5=AE=9A=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/renderer/src/app.vue | 66 +++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/packages/renderer/src/app.vue b/packages/renderer/src/app.vue
index 5241de58d1a..c1995d5441e 100644
--- a/packages/renderer/src/app.vue
+++ b/packages/renderer/src/app.vue
@@ -1,19 +1,69 @@
 <script setup lang="ts">
 import { provide, ref } from 'vue';
 import router from './router';
-import { createInjector } from '@farris/devkit-vue';
+import { createInjector, HttpClient } from '@farris/devkit-vue';
 import { appProviders } from './providers';
-import { RouteLocationNormalizedGeneric } from 'vue-router';
+import { LocationQuery, LocationQueryValue, RouteLocationNormalizedGeneric } from 'vue-router';
 import { MetadataDataService } from './data-service';
 
+type QueryValueType = LocationQueryValue | LocationQueryValue[];
 const metadata = ref();
-router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
-    const router = to.name;
+function getInjector() {
     const injector = createInjector({
         providers: [
             ...appProviders,
         ]
     });
+    return injector;
+}
+function isOpenFromFramework(isRootMetadata: LocationQueryValue | undefined) {
+    return isRootMetadata === null;
+}
+function beforeNavigate(formMetadataId: string | undefined, dim1: LocationQueryValue | undefined, dim2: LocationQueryValue | undefined, isRootMetadata: LocationQueryValue | undefined | boolean) {
+    if (!dim1) {
+        dim1 = 'public';
+    }
+    if (!dim2) {
+        dim2 = 'public';
+    }
+    if (isRootMetadata && typeof isRootMetadata !== 'boolean') {
+        isRootMetadata = isRootMetadata.toString().toLowerCase() === 'true' ? true : false;
+    }
+
+    const injector = getInjector();
+    const httpClient: HttpClient = injector.get<HttpClient>(HttpClient);
+    return httpClient.get(`/api/runtime/bcc/v1.0/template/suCode/${formMetadataId}`, { responseType: 'text' }).then((suCode: string) => {
+        return httpClient.post(`/api/${suCode}/v1.0/template/check/beforeNavigate`, { dim1, dim2, metadataId: formMetadataId, isDynamic: true, isRootMetadata }, {});
+    });
+}
+function resolveQuery(query: LocationQuery) {
+    const { metadataId, formMetadataId, isRtc, dim1, dim2, isRootMetadata = null } = query;
+    const result = {
+        metadataId: Array.isArray(metadataId) ? metadataId.pop() : metadataId,
+        isRtc: Array.isArray(isRtc) ? isRtc.pop() : isRtc,
+        dim1: Array.isArray(dim1) ? dim1.pop() : dim1,
+        dim2: Array.isArray(dim2) ? dim2.pop() : dim2,
+        formMetadataId: Array.isArray(formMetadataId) ? formMetadataId.pop() : formMetadataId,
+        isRootMetadata: Array.isArray(isRootMetadata) ? isRootMetadata.pop() : isRootMetadata,
+    };
+    return result;
+}
+async function resolveMetadataId(formMetadataId: LocationQueryValue | undefined, metadataId: LocationQueryValue | undefined, dim1: LocationQueryValue | undefined, dim2: LocationQueryValue | undefined, isRootMetadata: LocationQueryValue | undefined, isRtc: LocationQueryValue | undefined) {
+    const isRtcSense = isRtc === '1';
+    if (!isRtcSense) {
+        return formMetadataId;
+    }
+    if (isOpenFromFramework(isRootMetadata)) {
+        // 运行时定制场景,且从框架菜单打开的表单，此时传递给表单的metadataId=扩展表单的元数据id
+        return metadataId;
+    } else {
+        const dimension = await beforeNavigate(formMetadataId?.toString(), dim1, dim2, isRootMetadata);
+        return dimension.metadataId || formMetadataId;
+    }
+}
+router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
+    const router = to.name;
+    const injector = getInjector();
     const metadataService = injector.get<MetadataDataService>(MetadataDataService, undefined);
     if (router === 'preview' || router === 'debug') {
         const { metadataPath, projectPath } = to.query;
@@ -23,17 +73,19 @@ router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
         const metadatas = await metadataService.loadMetadataByPath(projectPath.toString(), metadataPath.toString());
         metadata.value = metadatas;
     } else if (router === 'renderer') {
-        const { metadataId } = to.query;
-        if (!metadataId) {
+        const { metadataId, formMetadataId, isRtc, dim1, dim2, isRootMetadata } = resolveQuery(to.query);
+        const targetMetadataId = await resolveMetadataId(formMetadataId, metadataId, dim1, dim2, isRootMetadata, isRtc);
+        if (!targetMetadataId) {
             return false;
         }
-        const metadatas = await metadataService.loadMetadataById(metadataId.toString());
+        const metadatas = await metadataService.loadMetadataById(targetMetadataId.toString());
         metadata.value = metadatas;
     } else {
         return false;
     }
     return true;
 });
+
 provide('metadata', metadata);
 </script>
 <template>
-- 
Gitee


From d87ff9c816f61649ae6d9906f0e83e48e591f6f9 Mon Sep 17 00:00:00 2001
From: aalizzwell <aalizzwell@126.com>
Date: Wed, 25 Jun 2025 17:46:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E6=8F=90=E5=8F=96=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E8=A1=A8=E5=8D=95=E5=85=83=E6=95=B0=E6=8D=AE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=87=B3=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/navigation.service.ts                 | 63 ++++++++++++-------
 packages/renderer/src/app.vue                 | 52 +++------------
 2 files changed, 48 insertions(+), 67 deletions(-)

diff --git a/packages/command-services/lib/navigation.service.ts b/packages/command-services/lib/navigation.service.ts
index de7c565fc88..4d88e3b2ea7 100644
--- a/packages/command-services/lib/navigation.service.ts
+++ b/packages/command-services/lib/navigation.service.ts
@@ -1,6 +1,6 @@
 import { RuntimeFrameworkService } from './rtf.service';
 import { QuerystringService } from './querystring.service';
-import { ViewModel, Injector, ViewModelState, CommandContext, Command } from '@farris/devkit-vue';
+import { ViewModel, Injector, ViewModelState, CommandContext, Command, HttpClient } from '@farris/devkit-vue';
 import { AppType, BuildFrameworkTabIdOptions } from './types';
 import lodash from 'lodash';
 import { NavigationEventService } from './navigation-event.service';
@@ -127,34 +127,37 @@ export class NavigationService {
         if (destructuring === true) {
             queryStringParams = this.buildParam(params);
         }
-
         // const paramsMap = this.buildParamMap(params);
         queryStringParams.set('dim1', dim1 ? dim1 : 'public');
         queryStringParams.set('dim2', dim2 ? dim2 : 'public');
-        queryStringParams.set('metadataId', metadataId);
+
         queryStringParams.set('isRtc', '1');
         queryStringParams.set('isRootMetadata', 'true');
-        const options: any = {
-            tabId,
-            funcId,
-            appType: AppType.Menu,
-            queryStringParams: queryStringParams,
-            entityParams: queryStringParams,
-            appId: undefined,
-            appEntrance: undefined,
-            isReload: false,
-            tabName: tabName || null
-        };
-        // 启用数据刷新参数为true或者没有定义，则按刷新处理
-        // 没有传递该参数或该参数为空，则认为按照之前的逻辑处理，默认刷新
-        // null false "false" "true" undefined
-        enableRefresh = this.convertToBoolean(enableRefresh, true);
-        if (enableRefresh) {
-            const currentTabId = this.querystrings.tabId || this.querystrings.funcId || this.querystrings.appId;
-            const frameworkTabId = this.buildFrameworkTabId({ funcId, tabId });
-            this.navigationHistoryService.add(currentTabId, frameworkTabId);
-        }
-        this.runtimeFrameworkService.openMenu(options);
+        this.resolveBizMetadataId(metadataId, dim1, dim2).then((response) => {
+            const bizMetadataId = response.metadataId || metadataId;
+            queryStringParams.set('metadataId', bizMetadataId);
+            const options: any = {
+                tabId,
+                funcId,
+                appType: AppType.Menu,
+                queryStringParams: queryStringParams,
+                entityParams: queryStringParams,
+                appId: undefined,
+                appEntrance: undefined,
+                isReload: false,
+                tabName: tabName || null
+            };
+            // 启用数据刷新参数为true或者没有定义，则按刷新处理
+            // 没有传递该参数或该参数为空，则认为按照之前的逻辑处理，默认刷新
+            // null false "false" "true" undefined
+            enableRefresh = this.convertToBoolean(enableRefresh, true);
+            if (enableRefresh) {
+                const currentTabId = this.querystrings.tabId || this.querystrings.funcId || this.querystrings.appId;
+                const frameworkTabId = this.buildFrameworkTabId({ funcId, tabId });
+                this.navigationHistoryService.add(currentTabId, frameworkTabId);
+            }
+            this.runtimeFrameworkService.openMenu(options);
+        });
     }
     /**
      * 打开应用
@@ -251,6 +254,18 @@ export class NavigationService {
     public addEventListener(eventType: string, handler: (options: any) => any): string | null {
         return this.navigationEventService.addEventListener(eventType, handler);
     }
+    private resolveBizMetadataId(baseMetadataId: string, dim1: string, dim2: string) {
+        if (!dim1) {
+            dim1 = 'public';
+        }
+        if (!dim2) {
+            dim2 = 'public';
+        }
+        const httpClient: HttpClient = this.injector.get<HttpClient>(HttpClient);
+        return httpClient.get(`/api/runtime/bcc/v1.0/template/suCode/${baseMetadataId}`, { responseType: 'text' }).then((suCode: string) => {
+            return httpClient.post(`/api/${suCode}/v1.0/template/check/beforeNavigate`, { dim1, dim2, metadataId: baseMetadataId, isDynamic: true, isRootMetadata: true }, {});
+        });
+    }
     private buildFrameworkTabId(options: BuildFrameworkTabIdOptions): string {
         const { appId = '', appEntrance = '', funcId = '', tabId } = options;
         if (appId && appEntrance) {
diff --git a/packages/renderer/src/app.vue b/packages/renderer/src/app.vue
index 76e071c3430..bdc384fae8b 100644
--- a/packages/renderer/src/app.vue
+++ b/packages/renderer/src/app.vue
@@ -1,59 +1,25 @@
 <script setup lang="ts">
-import { RouteLocationNormalizedGeneric, LocationQuery, LocationQueryValue } from 'vue-router';
+import { RouteLocationNormalizedGeneric, LocationQuery } from 'vue-router';
 import { useDevkit } from '@farris/devkit-vue';
 import router from './router';
-import { HttpClient } from '@farris/devkit-vue';
 import { MetadataLoader } from './metadata/index';
 import { provide, ref } from 'vue';
 
-const formMetadataId = ref();
+const bizMetadataId = ref();
 const devkit = useDevkit();
 const devkitInjector = devkit.getInjector();
-
-function isOpenFromFramework(isRootMetadata: LocationQueryValue | undefined) {
-    return isRootMetadata === null;
-}
-function beforeNavigate(formMetadataId: string | undefined, dim1: LocationQueryValue | undefined, dim2: LocationQueryValue | undefined, isRootMetadata: LocationQueryValue | undefined | boolean) {
-    if (!dim1) {
-        dim1 = 'public';
-    }
-    if (!dim2) {
-        dim2 = 'public';
-    }
-    if (isRootMetadata && typeof isRootMetadata !== 'boolean') {
-        isRootMetadata = isRootMetadata.toString().toLowerCase() === 'true' ? true : false;
-    }
-
-    const httpClient: HttpClient = devkitInjector.get<HttpClient>(HttpClient);
-    return httpClient.get(`/api/runtime/bcc/v1.0/template/suCode/${formMetadataId}`, { responseType: 'text' }).then((suCode: string) => {
-        return httpClient.post(`/api/${suCode}/v1.0/template/check/beforeNavigate`, { dim1, dim2, metadataId: formMetadataId, isDynamic: true, isRootMetadata }, {});
-    });
-}
 function resolveQuery(query: LocationQuery) {
-    const { metadataId, formMetadataId, isRtc, dim1, dim2, isRootMetadata = null } = query;
+    const { metadataId, baseMetadataId, isRtc, dim1, dim2, isRootMetadata = null } = query;
     const result = {
         metadataId: Array.isArray(metadataId) ? metadataId.pop() : metadataId,
         isRtc: Array.isArray(isRtc) ? isRtc.pop() : isRtc,
         dim1: Array.isArray(dim1) ? dim1.pop() : dim1,
         dim2: Array.isArray(dim2) ? dim2.pop() : dim2,
-        formMetadataId: Array.isArray(formMetadataId) ? formMetadataId.pop() : formMetadataId,
+        baseMetadataId: Array.isArray(baseMetadataId) ? baseMetadataId.pop() : baseMetadataId,
         isRootMetadata: Array.isArray(isRootMetadata) ? isRootMetadata.pop() : isRootMetadata,
     };
     return result;
 }
-async function resolveMetadataId(formMetadataId: LocationQueryValue | undefined, metadataId: LocationQueryValue | undefined, dim1: LocationQueryValue | undefined, dim2: LocationQueryValue | undefined, isRootMetadata: LocationQueryValue | undefined, isRtc: LocationQueryValue | undefined) {
-    const isRtcSense = isRtc === '1';
-    if (!isRtcSense) {
-        return formMetadataId;
-    }
-    if (isOpenFromFramework(isRootMetadata)) {
-        // 运行时定制场景,且从框架菜单打开的表单，此时传递给表单的metadataId=扩展表单的元数据id
-        return metadataId;
-    } else {
-        const dimension = await beforeNavigate(formMetadataId?.toString(), dim1, dim2, isRootMetadata);
-        return dimension.metadataId || formMetadataId;
-    }
-}
 router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
     const router = to.name;
     const metadataLoader = devkitInjector.get<MetadataLoader>(MetadataLoader, undefined);
@@ -64,15 +30,15 @@ router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
         if (!formMetadataPath || !projectPath) {
             return false;
         }
-        formMetadataId.value = to.query.formMetadataId?.toString();
+        bizMetadataId.value = to.query.baseMetadataId?.toString();
         await metadataLoader.loadMetadataByPath(projectPath, formMetadataPath);
     } else if (router === 'renderer') {
-        const { metadataId, formMetadataId: basicFormMetadataId, isRtc, dim1, dim2, isRootMetadata } = resolveQuery(to.query);
-        const targetMetadataId = await resolveMetadataId(basicFormMetadataId, metadataId, dim1, dim2, isRootMetadata, isRtc);
+        const { metadataId, baseMetadataId } = resolveQuery(to.query);
+        const targetMetadataId = metadataId || baseMetadataId;
         if (!targetMetadataId) {
             return false;
         }
-        formMetadataId.value = targetMetadataId;
+        bizMetadataId.value = targetMetadataId;
         await metadataLoader.loadMetadataById(targetMetadataId);
 
     } else {
@@ -80,7 +46,7 @@ router.beforeResolve(async (to: RouteLocationNormalizedGeneric) => {
     }
     return true;
 });
-provide('metadataId', formMetadataId);
+provide('metadataId', bizMetadataId);
 </script>
 <template>
     <RouterView />
-- 
Gitee