dashboard-shell-shell 3.0.5-test.9 → 3.0.5-tsh-rh02

package/components/auth/RoleDetailEdit.vue

@@ -152,7 +152,7 @@ export default {
       });
     }
 
-    if (this.value?.metadata?.name && !this.value.displayName) {
+    if (this.value?.metadata?.name && !this.value?.displayName) {
       this.value['displayName'] = this.value.metadata.name;
     }
 
@@ -705,12 +705,12 @@ export default {
             <!-- 列表头部 -->
             <template #column-headers>
               <div class="column-headers row">
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.verbs') }}
                     <span class="required">*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">
                     {{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.resources') }}
                     <i
@@ -723,7 +723,7 @@ export default {
                     >*</span>
                   </span>
                 </div>
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <span class="text-label">{{ t('rbac.roletemplate.tabs.grantResources.tableHeaders.apiGroups') }}</span>
                 </div>
                 <div
@@ -740,7 +740,7 @@ export default {
               <div class="columns row mr-20">
 
                 <!-- 动作（verbs）选择 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <!-- Select verbs -->
                   <Select
                     :value="props.row.value.verbs"
@@ -758,7 +758,7 @@ export default {
                 </div>
 
                 <!-- 资源（resources）选择 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <Select
                     style="width: auto;"
                     :value="getRule('resources', props.row.value)"
@@ -776,7 +776,7 @@ export default {
                 </div>
 
                 <!-- API Groups 输入 -->
-                <div :class="ruleClass">
+                <div class="arrayListCls" :class="ruleClass">
                   <LabeledInput
                     :value="getRule('apiGroups', props.row.value)"
                     :disabled="isBuiltin"
@@ -788,6 +788,7 @@ export default {
 
                 <!-- 非命名空间 URL 输入（仅非命名空间模式显示） -->
                 <div
+                  class="arrayListCls"
                   v-if="!isNamespaced"
                   :class="ruleClass"
                 >
@@ -859,6 +860,9 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .arrayListCls {
+    min-width: 360px;
+  }
   .ruleCls {
     margin-right: 10px;
   }

package/components/breadcrumb/index.vue

@@ -1,54 +1,18 @@
 <script>
-import { Banner } from '@components/Banner';
 import { get } from '@shell/utils/object';;
-import {
-  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
-} from '@shell/config/query-params';
-import { ExtensionPoint, PanelLocation } from '@shell/core/types';
 import { useRuntimeFlag } from '@shell/composables/useRuntimeFlag';
 import { useStore } from 'vuex';
 
-// i18n-uses resourceDetail.header.*
-
-/**
- * Resource Detail Masthead component.
- *
- * ToDo: this component seem to be picking up a lot of logic from special cases, could be simplified down to parameters and then customized per use-case via wrapper component
- */
 export default {
 
-  name: 'MastheadResourceDetail',
+  name: 'MastheadBreadcrumb',
 
   components: {
-    // BadgeState,
-    Banner,
   },
   props: {
-    value: {
-      type:    Object,
-      default: () => {
-        return {};
-      }
-    },
-
-    mode: {
-      type:    String,
-      default: 'view'
-    },
-
-    realMode: {
-      type:    String,
-      default: 'view'
-    },
-
-    as: {
+    resourceTypeLabel: {
       type:    String,
-      default: _YAML,
-    },
-
-    storeOverride: {
-      type:    String,
-      default: null,
+      default: ''
     },
 
     resource: {
@@ -56,15 +20,10 @@ export default {
       default: null,
     },
 
-    resourceSubtype: {
-      type:    String,
-      default: null,
-    },
-
-    parentRouteOverride: {
+    realMode: {
       type:    String,
-      default: null,
-    },
+      default: 'view',
+    }
 
   },
 
@@ -77,97 +36,21 @@ export default {
 
   data() {
     return {
-      DETAIL_VIEW:       _DETAIL,
-      extensionType:     ExtensionPoint.PANEL,
-      extensionLocation: PanelLocation.DETAILS_MASTHEAD,
-      Svg:               require('~shell/assets/images/API.svg')
     };
   },
 
   computed: {
-    dev() {
-      return this.$store.getters['prefs/dev'];
-    },
-
-    schema() {
-      const inStore = this.storeOverride || this.$store.getters['currentStore'](this.resource);
-
-      return this.$store.getters[`${ inStore }/schemaFor`]( this.resource );
-    },
-
-    isProjectHelmChart() {
-      return this.schema?.id === HELM.PROJECTHELMCHART;
-    },
-
-    shouldHifenize() {
-      return (this.mode === 'view' || this.mode === 'edit') && this.resourceSubtype?.length && this.value?.nameDisplay?.length;
-    },
-
-    parent() {
-      const displayName = this.value?.parentNameOverride || this.$store.getters['type-map/labelFor'](this.schema);
-      const product = this.$store.getters['currentProduct'].name;
-
-      const defaultLocation = {
-        name:   'c-cluster-product-resource',
-        params: {
-          resource: this.resource,
-          product,
-        }
-      };
-
-      const location = this.value?.parentLocationOverride || defaultLocation;
-
-      if (this.parentRouteOverride) {
-        location.name = this.parentRouteOverride;
-      }
-
-      const typeOptions = this.$store.getters[`type-map/optionsFor`]( this.resource );
-
-      // 转换为中文
-      const displayName_zh_hans = {
-        'GlobalRole': '全局角色',
-        'RoleTemplate': '集群角色',
-      }
-      if (displayName_zh_hans[displayName]) {
-        displayName = displayName_zh_hans[displayName]
-      }
-      
-      if (displayName == '集群角色' && (this.$route.query?.roleContext == 'NAMESPACE' || location.hash == '#NAMESPACE')) {
-        displayName = '项目或资源组角色'
-      }
-
-      const out = {
-        displayName, location, ...typeOptions
-      };
-
-      return out;
-    },
-
-
-    displayName() {
-      let displayName = this.value.nameDisplay;
-
-      if (this.isProjectHelmChart) {
-        displayName = this.value.projectDisplayName;
-      }
-
-      return this.shouldHifenize ? ` - ${ displayName }` : displayName;
-    },
 
     demoDisplay() {
 
       const resources = this.$route.params?.resource || ''
-      
-      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
-      
-      if (productId === undefined) {
-        return '';
-      }
-      const parts = productId.split('::');
+
+      let productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
+      const parts = productId?.split('::') || [];
       const newString = 'root';
 
       if (!parts?.includes(newString)) {
-        parts.unshift(newString); // 将字符串添加到数组第一位
+        parts?.unshift(newString); // 将字符串添加到数组第一位
       }
 
       const partsEn = parts.map((item) => {
@@ -177,12 +60,6 @@ export default {
       return partsEn;
     },
 
-    location() {
-      const { parent } = this;
-
-      return parent?.location;
-    },
-
   },
 
   methods: {
@@ -206,7 +83,7 @@ export default {
           <span>/</span>
         </span>
         <span class="excram-last-name">
-          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + resourceTypeLabel }}
         </span>
       </div>
     </div>
@@ -215,71 +92,6 @@ export default {
 
 <style lang='scss' scoped>
 
-  HEADER {
-    margin: 0;
-  }
-
-  .primaryheader {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    font-size:14px;
-    height: 50px;
-
-    h1 {
-      margin: 0;
-    }
-  }
-
-  .subheader{
-    display: flex;
-    flex-direction: row;
-    color: var(--input-label);
-    & > * {
-      margin: 5px 20px 5px 0px;
-    }
-
-    .live-data {
-      color: var(--body-text)
-    }
-  }
-
-  .state-banner {
-    margin: 3px 0 0 0;
-  }
-
-  .masthead-state {
-    font-size: initial;
-    display: inline-block;
-    position: relative;
-    /* top: -2px; */
-    font-size: 12px;
-    margin-left: 5px;
-  }
-
-  .masthead-istio {
-    .icon {
-      vertical-align: middle;
-      color: var(--primary);
-    }
-  }
-
-  .left-right-split {
-    display: grid;
-    align-items: center;
-
-    .left-half {
-      grid-column: 1;
-    }
-
-    .right-half {
-      grid-column: 2;
-    }
-  }
-
-  .resource-external {
-    font-size: 18px;
-  }
   .excram-list{
     font-size: 14px;
     margin-bottom: 20px;
@@ -287,10 +99,7 @@ export default {
   .excram-last-name{
     color: var(--link);
   }
-  .valid{
-    color: #d7d7d7;
-    margin: 0px 10px;
-  }
+
   .detailIcon-span{
     width: 24px;
     height: 24px;
@@ -306,11 +115,5 @@ export default {
     left: 4px;
     top: -2px;
   }
-  .primary-title{
-    display: flex;
-    align-items: center;
-  }
-  .detailIcon-span-title{
-    font-weight: bold;
-  }
+
 </style>