dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.9

package/utils/router.js

@@ -1,5 +1,26 @@
 import { INSTALL_REDIRECT_META_KEY } from '@shell/config/router/navigation-guards/install-redirect';
 
+export function harvesterhci2cloud(str) {
+    return str?.replace('harvesterhci.io', 'cloudhci.io')
+}
+
+export function cloud2harvesterhci(str) {
+  // console.log('00099', str)
+  // const regex = /[a-z]+cloud.io.(.+)/;
+  // if (str?.match(regex)) {
+  //   return str;
+  // }
+  return str?.replace('cloudhci.io', 'harvesterhci.io')
+}
+
+export function harvester2cloud(str) {
+    return str?.replace('harvester', 'cloud')
+}
+
+export function cloud2harvester(str) {
+    return str?.replace('cloud', 'harvester')
+}
+
 export function queryParamsFor(current, qp, defaults = {}) {
   const query = Object.assign({}, current || {});
 

package/utils/select.js

@@ -26,8 +26,19 @@ export function onClickOption(option, e) {
 // This is a simpler positionner for the dropdown for a select control
 // We used to use popper for these, but it does not suppotr fractional pixel placements which
 // means the dropdown does not appear aligned to the control when placed in a column-based layout
-export function calculatePosition(dropdownList, component, width, placement) {
+export function calculatePosition(dropdownList, component, width, placement, type, isLabel,leftWidth) {
   const selectEl = component.$parent.$el;
+ 
+  const labeledContainer = selectEl.querySelector('.labeled-container');
+  let labelWidth=0
+  if (labeledContainer) {
+    labelWidth= labeledContainer.offsetWidth;
+  } else {
+    console.warn("未找到类名为 labeled-container 的元素");
+  }
+
+
+  
   const r = selectEl.getBoundingClientRect();
   const p = placement || 'bottom-start';
   const docHeight = document.body.offsetHeight;
@@ -59,7 +70,19 @@ export function calculatePosition(dropdownList, component, width, placement) {
     selectEl.classList.remove('vs__dropdown-up');
   }
 
-  dropdownList.style.left = `${ r.x }px`;
+  // dropdownList.style.left = `${ r.x }px`;
   dropdownList.style.width = 'min-content';
-  dropdownList.style.minWidth = `${ r.width }px`;
+  // const s  = type === 'label'?   `${ r.x }px` :`${ r.x + Number(type.split("px")[0]) }px`
+  dropdownList.style.left = ((type === 'label') && (!isLabel)) ? `${ (r.x) + labelWidth }px` : `${ r.x + (typeof type === 'string' ? parseFloat(type) : 0) }px`;
+  // dropdownList.style.minWidth = type === 'label' ? `${ (r.width) - 160 }px` : `${ r.width }px`;
+  console.log(type);
+  console.log( r.width);
+  if(leftWidth!=='') {
+    dropdownList.style.left = leftWidth
+  }
+  const SelectContainer = selectEl.querySelector('.labeled-select');
+  
+  
+  // dropdownList.style.width = type === 'label' ? '400px' : `${ r.width }px`;
+  dropdownList.style.width = type === 'label' ? `${SelectContainer.offsetWidth}px` : `${ r.width- (typeof type === 'string' ? parseFloat(type) : 0) }px`;
 }

package/utils/string.js

@@ -1,3 +1,5 @@
+import { translateError } from "@shell/utils/error";
+
 export function camelToTitle(str) {
   return dasherize((str || '')).split('-').map((str) => {
     return ucFirst(str);
@@ -161,19 +163,19 @@ export function resourceNames(names, plusMore, t, endString) {
 
   // endString default value
   if (!endString) {
-    endString = endString === false ? ' ' : '.';
+    endString = endString === false ? ' ' : '？';
   }
 
   return names.reduce((res, name, i) => {
     if (i < MAX_NAMES_COUNT) {
-      res += `<b>${ escapeHtml( name ) }</b>`;
+      res += `<span>${ escapeHtml( name ) }</span>`;
 
       if (i === names.length - 1) {
         res += endString;
       } else if (i === names.length - 2) {
-        res += names.length <= 5 ? t('generic.and') : '';
+        res += names.length <= 5 ? ' 和 ' : '';
       } else {
-        res += i < MAX_NAMES_COUNT - 1 ? t('generic.comma') : '';
+        res += i < MAX_NAMES_COUNT - 1 ? ' , ' : '';
       }
     }
 
@@ -282,7 +284,8 @@ export function ensureRegex(strOrRegex, exact = true) {
 }
 
 export function nlToBr(value) {
-  return escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n');
+  
+  return translateError(escapeHtml(value || '').replace(/(\r\n|\r|\n)/g, '<br/>\n'));
 }
 
 const quotedMatch = /[^."']+|"([^"]*)"|'([^']*)'/g;

package/utils/title.ts

@@ -1,3 +1,3 @@
 export function updatePageTitle(...breadcrumb: (string | null | undefined | false)[]): void {
-  document.title = breadcrumb.filter((s) => s).join(' - ');
+  document.title = breadcrumb.filter((s) => s).join(' - ').replace(/<i[^>]*>|<\/i>/g, '').replace('Harvester', 'HCI');
 }

package/vue.config.js

@@ -157,7 +157,7 @@ const getLoaders = (SHELL_ABS) => [
     test:    /\.m?[tj]sx?$/,
     // This excludes no modules except for node_modules/@rancher/... so that plugins can properly compile
     // when referencing @rancher/shell
-    exclude: /node_modules\/(?!(@rancher)\/).*/,
+    exclude: /node_modules\/(?!(dashboard-shell-shell)\/).*/,
     use:     [
       {
         loader:  'cache-loader',