dashboard-shell-shell 3.0.5-test.4 → 3.0.5-test.5

package/components/auth/Principal.vue

@@ -166,7 +166,7 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  $size: 79px;
+  $size: 20px;
 
   .principal {
     display: grid;
@@ -174,7 +174,7 @@ export default {
       "avatar name"
       "avatar description";
     grid-template-columns: $size auto;
-    grid-template-rows: auto math.div($size, 2);
+    // grid-template-rows: auto math.div($size, 2);
     column-gap: 10px;
 
     th {

package/components/breadcrumb/index.vue

@@ -0,0 +1,340 @@
+<script>
+import { KUBERNETES, PROJECT } from '@shell/config/labels-annotations';
+import { FLEET, NAMESPACE, MANAGEMENT, HELM } from '@shell/config/types';
+import ButtonGroup from '@shell/components/ButtonGroup';
+// import { BadgeState } from '@components/BadgeState';
+import DotState from '@shell/components/DotState.vue';
+import { Banner } from '@components/Banner';
+import { get } from '@shell/utils/object';
+import { NAME as FLEET_NAME } from '@shell/config/product/fleet';
+import { HIDE_SENSITIVE } from '@shell/store/prefs';
+import {
+  AS, _DETAIL, _CONFIG, _YAML, MODE, _CREATE, _EDIT, _VIEW, _UNFLAG, _GRAPH
+} from '@shell/config/query-params';
+import { ExtensionPoint, PanelLocation } from '@shell/core/types';
+import ExtensionPanel from '@shell/components/ExtensionPanel';
+import TabTitle from '@shell/components/TabTitle';
+import ActionMenu from '@shell/components/ActionMenuShell.vue';
+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',
+
+  components: {
+    // BadgeState,
+    DotState,
+    Banner,
+    ButtonGroup,
+    ExtensionPanel,
+    TabTitle,
+    ActionMenu,
+  },
+  props: {
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+
+    mode: {
+      type:    String,
+      default: 'view'
+    },
+
+    realMode: {
+      type:    String,
+      default: 'view'
+    },
+
+    as: {
+      type:    String,
+      default: _YAML,
+    },
+
+    storeOverride: {
+      type:    String,
+      default: null,
+    },
+
+    resource: {
+      type:    String,
+      default: null,
+    },
+
+    resourceSubtype: {
+      type:    String,
+      default: null,
+    },
+
+    parentRouteOverride: {
+      type:    String,
+      default: null,
+    },
+
+  },
+
+  setup() {
+    const store = useStore();
+    const { featureDropdownMenu } = useRuntimeFlag(store);
+
+    return { featureDropdownMenu };
+  },
+
+  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 product = this.$store.getters['productId'];
+
+      const resources = this.location?.params?.resource || ''
+
+      const productId = this.$store.getters['type-map/groupForBasicType'](this.$store.getters['productId'], resources);
+
+      if (productId === undefined) {
+        return '';
+      }
+      const parts = productId.split('::');
+      const newString = 'root';
+
+      if (!parts?.includes(newString)) {
+        parts.unshift(newString); // 将字符串添加到数组第一位
+      }
+
+      const partsEn = parts.map((item) => {
+        return this.$store.getters['i18n/t'](`typeLabel."${ item.toLowerCase() }"`);
+      });
+
+      return partsEn;
+    },
+    menuIcon() {
+      const product = this.$store.getters['productId'];
+
+      const resources = this.location?.params?.resource || ''
+
+      return this.$store.getters['type-map/groupsForVirTypes'](product, resources);
+    },
+
+    location() {
+      const { parent } = this;
+
+      return parent?.location;
+    },
+
+  },
+
+  methods: {
+    get,
+  }
+};
+</script>
+
+<template>
+  <div class="masthead">
+    <div class="title">
+      <!-- 创建api密钥不需要面包屑 -->
+      <div
+        v-if="!(parentRouteOverride === 'account' && resource=== 'token')"
+        class="excram-list"
+      >
+        <span
+          v-for="(item,index) in demoDisplay"
+          :key="index"
+        >
+          <span>{{ item }}</span>
+          <span>/</span>
+        </span>
+        <span class="excram-last-name">
+          {{ (realMode === 'view'? '查看': realMode === 'edit' ? '编辑':'创建') + parent.displayName }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<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;
+  }
+  .excram-last-name{
+    color: var(--link);
+  }
+  .valid{
+    color: #d7d7d7;
+    margin: 0px 10px;
+  }
+  .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;
+  }
+  .primary-title{
+    display: flex;
+    align-items: center;
+  }
+  .detailIcon-span-title{
+    font-weight: bold;
+  }
+</style>

package/components/form/LabeledSelect.vue

@@ -326,6 +326,7 @@ export default {
 <template>
   <div style="display: flex;">
     <div
+      v-if="hasLabel"
       :class="{ 'labeled-container': true, raised, empty, [mode]: true, 'is-lable': isLabel }"
       :style="{ border: 'none', width: selectWidth===''?'160px':selectWidth,lineHeight: '32px' }"
     >
@@ -348,7 +349,7 @@ export default {
       ref="select"
       class="labeled-select"
       :class="[
-        $attrs.class,
+        $attrs.class && $attrs.class.replace('mb-20', ''),
         {
           disabled: isView || disabled,
           focused,
@@ -529,7 +530,7 @@ export default {
   // Prevent namespace field from wiggling or changing
   // height when it is toggled from a LabeledInput to a
   // LabeledSelect.
-  padding-bottom: 1px;
+  // padding-bottom: 1px;
   &:deep() .vs__actions:after {
     padding-top: 10px;
   }

package/components/form/Taints.vue

@@ -112,6 +112,7 @@ export default {
 
 <style lang="scss" scoped>
   .compact-select {
-    height: 40px;
+    height: 32px;
+    overflow: hidden;
   }
 </style>