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

package/components/ModalWithCard.vue

@@ -21,7 +21,7 @@ export default {
 
     closeText: {
       type:    String,
-      default: 'Close'
+      default: '关闭'
     },
 
     saveText: {
@@ -66,8 +66,16 @@ export default {
     class="modal"
     data-testid="mvc__card"
     :trigger-focus-trap="true"
-    @close="$emit('finish', $event)"
+    @close="$emit('close', $event)"
   >
+    <!-- <slot name="closeicon">
+      <button
+        class="btn btn-sm role-link hide-icon-dialog-close"
+        @click.prevent="hide"
+      >
+        <i class="icon icon-x" />
+      </button>
+    </slot> -->
     <Card
       class="modal"
       :show-highlight-border="false"
@@ -118,7 +126,7 @@ export default {
 .footer {
   width: 100%;
   display: flex;
-  justify-content: center;
+  justify-content: flex-end;
 }
 
 .banner {
@@ -133,6 +141,7 @@ export default {
 
   &.card-container {
     box-shadow: none;
+    padding: 24px;
   }
 }
 </style>

package/components/PodSecurityAdmission.vue

@@ -216,9 +216,9 @@ export default defineComponent({
     <div
       v-for="(psaControl, level, i) in psaControls"
       :key="i"
-      class="row row--y-center mb-20"
+      class="row row--y-center"
     >
-      <span class="col span-2">
+      <span class="col span-1">
         <Checkbox
           v-if="!labelsAlwaysActive"
           v-model:value="psaControl.active"

package/components/PromptModal.vue

@@ -42,7 +42,7 @@ export default {
     },
     modalWidth() {
       // property set from workload.js to overwrite modal default width of 600px, with fallback value as well
-      return this.modalData?.modalWidth || '600px';
+      return this.modalData?.modalWidth || '610px';
     },
     customClass() {
       return this.modalData?.customClass || undefined;

package/components/PromptRemove.vue

@@ -12,6 +12,7 @@ import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations
 import { CATALOG } from '@shell/config/types';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import AppModal from '@shell/components/AppModal.vue';
+import { translateError } from '@shell/utils/error';
 
 export default {
   name: 'PromptRemove',
@@ -82,6 +83,22 @@ export default {
       return this.$store.getters['type-map/labelFor'](schema, this.toRemove.length);
     },
 
+   typeZh() {
+    const typeLabel = this.type
+
+    const lowerKey = typeLabel.toLowerCase();
+    const i18nKey = `promptRemoveText.${lowerKey}`;
+
+    console.log(i18nKey, ' i18nKey-------------------------');
+    
+
+    if (this.t(i18nKey)) {
+      return this.t(i18nKey);
+    }
+
+    return typeLabel;
+  },
+
     selfLinks() {
       return this.toRemove.map((resource) => {
         return get(resource, 'links.self');
@@ -214,6 +231,7 @@ export default {
   },
 
   methods: {
+    translateError,
     resourceNames,
     escapeHtml,
     close() {
@@ -294,6 +312,12 @@ export default {
         this.done();
       } catch (err) {
         this.error = err.message || err;
+        if (this.error.includes('not supported')) {
+          this.$store.dispatch('growl/error', {
+            title:   '权限不足',
+            message: '当前用户不允许删除集群'
+          }, { root: true });
+        }
         btnCB(false);
       }
     },
@@ -340,7 +364,7 @@ export default {
     v-if="showModal"
     custom-class="remove-modal"
     name="promptRemove"
-    :width="400"
+    :width="460"
     height="auto"
     styles="max-height: 100vh;"
     :trigger-focus-trap="true"
@@ -352,6 +376,11 @@ export default {
     >
       <template #title>
         <h4 class="text-default-text">
+          <img
+          src="@shell/assets/images/promp-yellow.svg"
+          class="img-span"
+          alt=""
+        >
           {{ t('promptRemove.title') }}
         </h4>
       </template>
@@ -373,7 +402,7 @@ export default {
             :needs-confirm="needsConfirm"
             :value="toRemove"
             :names="names"
-            :type="type"
+            :type="typeZh"
             :done-location="doneLocation"
             @errors="e => error = e"
             @done="done"
@@ -383,7 +412,7 @@ export default {
             class="mt-10"
           >
             <span
-              v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) }, true)"
+              v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) })"
             />
           </div>
         </div>
@@ -400,14 +429,14 @@ export default {
             {{ warning }}
           </div>
           <div class="text-error mb-10 mt-10">
-            {{ error }}
+            {{ translateError(error) }}
           </div>
-          <div
+          <!-- <div
             v-if="!needsConfirm"
             class="text-info mt-20"
           >
             {{ protip }}
-          </div>
+          </div> -->
         </LabeledInput>
         <div v-else-if="!hasCustomRemove">
           <div
@@ -420,7 +449,7 @@ export default {
             v-if="error"
             class="text-error mb-10 mt-10"
           >
-            {{ error }}
+          {{ translateError(error) }}
           </div>
         </div>
         <Checkbox
@@ -441,7 +470,7 @@ export default {
         <div class="spacer" />
         <AsyncButton
           mode="delete"
-          class="btn bg-error ml-10"
+          class="btn ml-10"
           :disabled="deleteDisabled"
           :data-testid="componentTestid + '-confirm-button'"
           @click="remove"
@@ -457,20 +486,32 @@ export default {
       box-shadow: none;
     }
     #confirm {
-      width: 90%;
-      margin-left: 3px;
+      width: 100%;
+      // margin-left: 3px;
     }
 
     .actions {
       text-align: right;
     }
 
-    .card-actions {
+    /* .card-actions {
       display: flex;
 
       .spacer {
         flex: 1;
       }
-    }
+    } */
   }
 </style>
+
+<style scoped>
+  .text-default-text{
+    line-height: 20px;
+    margin: 0px;
+    display: flex;
+    align-items: center;
+  }
+  .img-span{
+    margin-right: 8px;
+  }
+</style>

package/components/RelatedResources.vue

@@ -175,5 +175,8 @@ export default {
     <template #cell:state="{row}">
       <BadgeState :value="row" />
     </template>
+    <template #cell:name="{row}">
+      <span>{{ row.name }}</span>
+    </template>
   </ResourceTable>
 </template>

package/components/Resource/Detail/Metadata/IdentifyingInformation/index.vue

@@ -89,12 +89,10 @@ const getRowValueId = (row:Row): string => `value-${ row.label }:${ row.value }`
     flex-direction: column;
 
     .row {
-      margin-bottom: 8px;
-
+      min-height: 40px;
       .value {
         display: flex;
         flex-direction: row;
-        align-items: center;
 
         &, & * {
           max-width: 100%;

package/components/Resource/Detail/Metadata/KeyValue.vue

@@ -53,13 +53,13 @@ const showConfigurationMoreFocusSelector = computed(() => `[data-testid="${ show
 
 <template>
   <div class="key-value">
-    <div class="heading">
+    <div class="heading h40">
       <span class="title text-deemphasized">{{ propertyName }}</span>
       <span class="count">{{ rows.length }}</span>
     </div>
     <div
       v-if="visibleRows.length === 0"
-      class="empty mmt-2 text-deemphasized"
+      class="empty text-deemphasized"
     >
       <div class="no-rows">
         {{ i18n.t('component.resource.detail.metadata.keyValue.noRows', {propertyName: lowercasePropertyName}) }}
@@ -78,7 +78,7 @@ const showConfigurationMoreFocusSelector = computed(() => `[data-testid="${ show
     <div
       v-for="row in visibleRows"
       :key="displayValue(row)"
-      class="row"
+      class="row h40"
     >
       <Rectangle
         v-clean-tooltip="displayValue(row)"
@@ -104,18 +104,22 @@ const showConfigurationMoreFocusSelector = computed(() => `[data-testid="${ show
     display: flex;
     flex-direction: column;
     align-items: flex-start;
+    
+    .h40 {
+        min-height: 40px;
+    }
 
     .count {
         margin-left: 24px;
     }
 
     .heading {
-        margin-bottom: 8px;
     }
 
     .row {
         display: block;
         width: 100%;
+        line-height: 40px;
 
         &:not(:nth-child(2)) {
             margin-top: 4px;

package/components/Resource/Detail/Metadata/index.vue

@@ -31,10 +31,12 @@ const showBothEmpty = computed(() => labels.length === 0 && annotations.length =
 
 <template>
   <SpacedRow
-    class="metadata ppb-3"
+    v-if="false"
+    class="metadata ppb-5"
     v-bind="$attrs"
   >
     <div
+      v-if="identifyingInformation?.length > 0"
       class="identifying-info"
     >
       <IdentifyingInformation :rows="identifyingInformation" />

package/components/Resource/Detail/TitleBar/Title.vue

@@ -1,14 +1,15 @@
 <template>
-  <h1 class="title">
+  <div class="title">
     <slot name="default" />
-  </h1>
+  </div>
 </template>
 
 <style lang="scss" scoped>
-  h1.title {
+  .title {
     display: inline-block;
     align-items: center;
     display: flex;
     flex-direction: row;
+    font-size: 14px;
   }
 </style>

package/components/Resource/Detail/TitleBar/Top.vue

@@ -10,5 +10,7 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
+    height: 50px;
+    margin-bottom: 20px;
   }
 </style>

package/components/Resource/Detail/TitleBar/composables.ts

@@ -14,7 +14,22 @@ export const useDefaultTitleBarProps = (resource: any, resourceSubtype?: Ref<str
     const resourceSubtypeValue = toValue(resourceSubtype);
     const currentStore = store.getters['currentStore'](resourceValue.type);
     const schema = store.getters[`${ currentStore }/schemaFor`](resourceValue.type);
-    const resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+    let resourceTypeLabel = resourceValue.parentNameOverride || store.getters['type-map/labelFor'](schema);
+
+    // 转换为中文
+    const displayName_zh_hans: Record<string, string> = {
+      'GlobalRole': '全局角色',
+      'RoleTemplate': '集群角色',
+    }
+
+    if (displayName_zh_hans[resourceTypeLabel]) {
+      resourceTypeLabel = displayName_zh_hans[resourceTypeLabel]
+    }
+    
+    if (resourceTypeLabel == '集群角色' && (route.query?.roleContext == 'NAMESPACE' || resource?.parentLocationOverride?.hash == '#NAMESPACE')) {
+      resourceTypeLabel = '项目或资源组角色'
+    }
+    
     const resourceName = resourceSubtypeValue ? `${ resourceSubtypeValue } - ${ resourceValue.nameDisplay }` : resourceValue.nameDisplay;
     const resourceTo = resourceValue.listLocation || {
       name:   'c-cluster-product-resource',

package/components/Resource/Detail/TitleBar/index.vue

@@ -13,6 +13,8 @@ import { _CONFIG, _GRAPH, AS } from '@shell/config/query-params';
 import ButtonGroup from '@shell/components/ButtonGroup';
 import { ExtensionPoint, PanelLocation } from '@shell/core/types';
 import ExtensionPanel from '@shell/components/ExtensionPanel.vue';
+import breadcrumb from '@shell/components/breadcrumb/index.vue'
+import { useDefaultConfigTabProps } from '@shell/components/Drawer/ResourceDetailDrawer/composables';
 
 export interface Badge {
   color: 'bg-success' | 'bg-error' | 'bg-warning' | 'bg-info';
@@ -36,6 +38,7 @@ export interface TitleBarProps {
   showViewOptions?: boolean;
 
   onShowConfiguration?: (returnFocusSelector: string) => void;
+  parentRouteOverride?: string;
 }
 
 const showConfigurationIcon = require(`@shell/assets/images/icons/document.svg`);
@@ -43,9 +46,10 @@ const showConfigurationIcon = require(`@shell/assets/images/icons/document.svg`)
 
 <script setup lang="ts">
 const {
-  resource, resourceTypeLabel, resourceTo, resourceName, description, badge, showViewOptions, onShowConfiguration,
+  parentRouteOverride, resource, resourceTypeLabel, resourceTo, resourceName, description, badge, showViewOptions, onShowConfiguration,
 } = defineProps<TitleBarProps>();
 
+
 const store = useStore();
 const i18n = useI18n(store);
 const router = useRouter();
@@ -54,6 +58,10 @@ const emit = defineEmits(['show-configuration']);
 const showConfigurationDataTestId = 'show-configuration-cta';
 const showConfigurationReturnFocusSelector = computed(() => `[data-testid="${ showConfigurationDataTestId }"]`);
 
+
+const configTabProps = useDefaultConfigTabProps(resource);
+
+
 const currentView = ref(router?.currentRoute?.value?.query?.as || _CONFIG);
 const viewOptions = computed(() => {
   if (!showViewOptions) {
@@ -72,6 +80,45 @@ const viewOptions = computed(() => {
   ];
 });
 
+const Svg = require('~shell/assets/images/API.svg')
+
+const parent = computed(() => {
+
+  const product = store.getters['currentProduct'].name;
+
+  const defaultLocation = {
+    name: 'c-cluster-product-resource',
+    params: {
+      resource,
+      product,
+    }
+  };
+
+  const location = resource?.parentLocationOverride || defaultLocation;
+
+  if (parentRouteOverride) {
+    location.name = parentRouteOverride;
+  }
+
+  return { location };
+});
+
+const menuIcon = computed(() => {
+  const product = store.getters['productId'];
+  const resources = parent.value.location?.params?.resource || '';
+  return store.getters['type-map/groupsForVirTypes'](product, resources) || 'default menuIcon';
+});
+
+const hiddenTypes = [
+  'harvesterhci.io.virtualmachinebackup',
+];
+
+const shouldShowConfiguration = computed(() =>
+  onShowConfiguration &&
+  configTabProps &&
+  !hiddenTypes.includes(resource?.type)
+);
+
 watch(
   () => currentView.value,
   () => {
@@ -82,33 +129,58 @@ watch(
 
 <template>
   <div class="title-bar">
+    <breadcrumb :resourceTypeLabel="resourceTypeLabel" :resource="resource"/>
     <Top>
       <Title class="title">
+        <span class="detailIcon-span">
+          <img
+            v-if="parentRouteOverride === 'account' && resource=== 'token'"
+            :src="Svg"
+            style="margin-top: 4px; margin-left: 5px;"
+          >
+          <i
+            v-else
+            :class="'icon-'+ menuIcon + ' detailIcon'"
+          />
+        </span>
+        <div class="resourceTypeLabelCls">
+          {{ resourceTypeLabel }}名称:
+        </div>
+        <span class="resource-name masthead-resource-title">
+          {{ resourceName }}
+        </span>
+        <BadgeState
+          v-if="badge"
+          class="badge-state"
+          :color="badge.color"
+          :label="badge.label"
+        />
+        <span
+          class="valid"
+        >|</span>
         <TabTitle :show-child="false">
-          {{ resourceTypeLabel }}
+          返回
         </TabTitle>
         <router-link
           v-if="resourceTo"
           :to="resourceTo"
           class="resource-link"
         >
-          {{ resourceTypeLabel }}:
+          返回
         </router-link>
         <span
           v-else
           class="resource-text"
         >
-          {{ resourceTypeLabel }}:
-        </span>
-        <span class="resource-name masthead-resource-title">
-          {{ resourceName }}
+          返回
         </span>
-        <BadgeState
-          v-if="badge"
-          class="badge-state"
-          :color="badge.color"
-          :label="badge.label"
-        />
+        <div
+          v-if="description"
+          style="font-size: 12px;margin-left: 16px;"
+          class="bottom description text-deemphasized"
+        >
+          ( {{ description }} )
+        </div>
       </Title>
       <div class="actions">
         <!-- Please don't expand this pattern, this was a quick fix to resolve a conflict between the new masthead and fleet. -->
@@ -118,22 +190,23 @@ watch(
           :options="viewOptions"
         />
         <RcButton
-          v-if="onShowConfiguration"
+          v-if="shouldShowConfiguration"
           :data-testid="showConfigurationDataTestId"
           class="show-configuration"
           :primary="true"
           :aria-label="i18n.t('component.resource.detail.titleBar.ariaLabel.showConfiguration', { resource: resourceName })"
           @click="() => emit('show-configuration', showConfigurationReturnFocusSelector)"
         >
-          <img
+         <!-- <img
             :src="showConfigurationIcon"
             class="mmr-3"
             aria-hidden="true"
-          >
+          > -->
           {{ i18n.t('component.resource.detail.titleBar.showConfiguration') }}
         </RcButton>
         <ActionMenu
           v-if="actionMenuResource"
+          :showIcon="true"
           button-role="multiAction"
           :resource="actionMenuResource"
           data-testid="masthead-action-menu"
@@ -141,12 +214,6 @@ watch(
         />
       </div>
     </Top>
-    <div
-      v-if="description"
-      class="bottom description text-deemphasized"
-    >
-      {{ description }}
-    </div>
     <ExtensionPanel
       :resource="resource"
       :type="ExtensionPoint.PANEL"
@@ -156,12 +223,39 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+
+.detailIcon-span{
+  width: 24px;
+  height: 24px;
+  display: inline-block;
+  position: relative;
+  background: var(--primary);
+  margin-right: 10px;
+}
+.detailIcon{
+  position: absolute;
+  color: #fff;
+  font-size: 38px;
+  left: 4px;
+  top: -2px;
+}
+
+.detailIcon-span-title{
+  font-weight: bold;
+}
+.resourceTypeLabelCls {
+  font-weight: 700;
+}
+.valid{
+  color: #d7d7d7;
+  margin: 0px 10px;
+}
 .title-bar {
   min-width: 740px;
 
   .badge-state {
     font-size: 16px;
-    margin-left: 12px;
+    margin-left: 5px;
     position: relative;
   }
 
@@ -170,15 +264,19 @@ watch(
   }
 
   &:deep() button[data-testid="masthead-action-menu"] {
-    border-radius: 4px;
-    width: 35px;
-    height: 40px;
-    margin-left: 16px;
+    border-radius: 2px;
+    width: 32px;
+    height: 32px;
+    margin-left: 10px;
 
     display: inline-flex;
     flex-direction: row;
     justify-content: center;
     align-items: center;
+
+    a{
+      color: #fff;
+    }
   }
 
   .description {

package/components/ResourceDetail/Masthead/index.vue

@@ -60,6 +60,6 @@ const showLatestMasthead = computed(() => isNewDetailPageEnabled.value && isView
 <style lang="scss" scoped>
 .new.state-banner {
   margin: 0;
-  margin-top: 16px;
+  margin-bottom: 20px;
 }
 </style>

package/components/ResourceDetail/Masthead/latest.vue

@@ -39,6 +39,6 @@ const bannerProps = useResourceDetailBannerProps(props.value);
 <style lang="scss" scoped>
 .new.state-banner {
   margin: 0;
-  margin-top: 16px;
+  margin-bottom: 20px;
 }
 </style>