dashboard-shell-shell 1.0.1000000118 → 1.0.10000011121

package/components/form/KeyValue.vue

@@ -388,17 +388,6 @@ export default {
         });
       }
 
-      rows = rows.map((item) => {
-        if (item.key.includes('harvester')) {
-          item.key = item.key.replace('harvester', 'cloud');
-        }
-        if (item.value.includes('harvester')) {
-          item.value = item.value.replace('harvester', 'cloud');
-        }
-
-        return item;
-      });
-
       return rows;
     },
 
@@ -409,8 +398,6 @@ export default {
         [this.valueName]: value,
       };
 
-      obj.key = obj.key.replace('harvester', 'cloud');
-      obj.value = obj.value.replace('harvester', 'cloud');
       obj.binary = false;
       obj.canEncode = this.handleBase64;
       obj.supported = true;
@@ -484,8 +471,8 @@ export default {
           // let value = (row[valueName] || '');
           // const key = (row[keyName] || '').trim();
 
-          const key = (row[keyName].replace('cloud', 'harvester') || '').trim();
-          let value = (row[valueName].replace('cloud', 'harvester') || '').trim();
+          const key = (row[keyName] || '').trim();
+          let value = (row[valueName] || '').trim();
 
           if (value && typeOf(value) === 'object') {
             out[key] = JSON.parse(JSON.stringify(value));

package/components/form/MatchExpressions.vue

@@ -289,7 +289,7 @@ export default {
         :data-testid="`input-match-type-field-${index}`"
       >
         <div v-if="isView">
-          {{ row.matching.replace('harvester', 'cloud') }}
+          {{ row.matching }}
           <!-- {{ row.matching }} -->
         </div>
         <LabeledSelect
@@ -305,7 +305,7 @@ export default {
         :data-testid="`input-match-expression-key-${index}`"
       >
         <div v-if="isView" class="view-item-value">
-          {{ row.key.replace('harvester', 'cloud') }}
+          {{ row.key }}
         </div>
         <input
           v-else-if="!hasKeySelectOptions"

package/components/form/NameNsDescription.vue

@@ -252,7 +252,7 @@ export default {
       const options = namespaces
         .map((namespace) => ({ nameDisplay: namespace, id: namespace }))
         .map(props.namespaceMapper || ((obj) => ({
-          label: obj.nameDisplay.replace('harvester', 'cloud'),
+          label: obj.nameDisplay,
           value: obj.id,
         })));
 

package/components/nav/NamespaceFilter.vue

@@ -756,7 +756,7 @@ export default {
           :data-testid="`namespaces-value-${j}`"
           class="ns-value"
         >
-          <div>{{ ns.label.replace('harvester', 'cloud') }}</div>
+          <div>{{ ns.label }}</div>
           <!-- block user from removing the last selection if ns forced filtering is on -->
           <i
             v-if="!namespaceFilterMode || value.length > 1"
@@ -867,7 +867,7 @@ export default {
               v-if="opt.kind === NAMESPACE_FILTER_KINDS.NAMESPACE"
               class="icon icon-folder"
             />
-            <div>{{ opt.label.replace('harvester', 'cloud') }}</div>
+            <div>{{ opt.label }}</div>
             <i
               v-if="opt.selected"
               class="icon icon-checkmark"

package/config/router/navigation-guards/index.js

@@ -64,14 +64,22 @@ export function installNavigationGuards(router, context) {
 
   // 🔹 最后执行：只改地址栏，不改内部
   router.afterEach((to) => {
+    const base = router.options.history?.base || ''; // 获取 router base，防止丢失
+    let cloudPath = to.fullPath.replace(/harvester/g, 'cloud');
 
-    const cloudPath = to.fullPath
-      .replace(/harvester/g, 'cloud')
+    // fullPath 可能已经不带 base，需要拼回去
+    if (!cloudPath.startsWith(base)) {
+      cloudPath = base + cloudPath;
+    }
+
+    // 获取当前地址栏完整 URL（path + search + hash）
+    const currentLocation = window.location.pathname + window.location.search + window.location.hash;
 
-    if (cloudPath !== to.fullPath) {
+    // 只有在地址栏实际不同的时候才替换，避免死循环
+    if (cloudPath !== currentLocation) {
+      console.info('[URL Replace] Updating address bar:', currentLocation, '→', cloudPath);
       window.history.replaceState({}, '', cloudPath);
     }
-
   });
 }
 

package/config/table-headers.js

@@ -162,7 +162,7 @@ export const NAMESPACE = {
   name:        'namespace',
   labelKey:    'tableHeaders.namespace',
   value:       'namespace',
-  getValue:    row => row && row.namespace && row.namespace.replace('harvester', 'cloud'),
+  getValue:    row => row && row.namespace && row.namespace,
   sort:        'namespace',
   dashIfEmpty: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "1.0.1000000118",
+  "version": "1.0.10000011121",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/types/shell/index.d.ts

@@ -4162,7 +4162,7 @@ export function setPromiseResult(promise: any, obj: any, key: any, label: any):
 
 declare module '@shell/utils/router' {
 export function harvesterhci2cloud(str: any): any;
-export function str: any: any;
+export function cloud2harvesterhci(str: any): any;
 export function harvester2cloud(str: any): any;
 export function cloud2harvester(str: any): any;
 export function queryParamsFor(current: any, qp: any, defaults?: {}): any;