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

package/components/breadcrumb/index.vue

@@ -0,0 +1,316 @@
+<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',
+
+  components: {
+    // BadgeState,
+    Banner,
+  },
+  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 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('::');
+      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;
+    },
+
+    location() {
+      const { parent } = this;
+
+      return parent?.location;
+    },
+
+  },
+
+  methods: {
+    get,
+  }
+};
+</script>
+
+<template>
+  <div class="masthead">
+    <div class="title">
+      <!-- 标题区域 -->
+      <div
+        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/ArrayList.vue

@@ -287,6 +287,33 @@ export default {
     </div>
 
     <div>
+      <div
+        v-if="showAdd && !isView"
+        class="footer mmt-6"
+      >
+        <slot
+          v-if="showAdd"
+          name="add"
+          :add="add"
+        >
+          <button
+            type="button"
+            class="btn role-tertiary add"
+            :class="[addClass]"
+            :disabled="loading || disableAdd"
+            :data-testid="`${componentTestid}-button`"
+            :aria-label="_addLabel"
+            role="button"
+            @click="add()"
+          >
+            <i
+              class="mr-5 icon"
+              :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
+            />
+            {{ _addLabel }}
+          </button>
+        </slot>
+      </div>
       <template v-if="rows.length">
         <div
           v-if="showHeader"
@@ -403,33 +430,6 @@ export default {
           </div>
         </slot>
       </div>
-      <div
-        v-if="showAdd && !isView"
-        class="footer mmt-6"
-      >
-        <slot
-          v-if="showAdd"
-          name="add"
-          :add="add"
-        >
-          <button
-            type="button"
-            class="btn role-tertiary add"
-            :class="[addClass]"
-            :disabled="loading || disableAdd"
-            :data-testid="`${componentTestid}-button`"
-            :aria-label="_addLabel"
-            role="button"
-            @click="add()"
-          >
-            <i
-              class="mr-5 icon"
-              :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
-            />
-            {{ _addLabel }}
-          </button>
-        </slot>
-      </div>
     </div>
   </div>
 </template>
@@ -451,19 +451,20 @@ export default {
     .value {
       flex: 1;
       INPUT {
-        height: $unlabeled-input-height;
+        height: $input-height;
+        border: solid var(--border-width) var(--input-border);
+        padding: 4px 11px;
+        &:hover{
+          box-shadow: 0 4px 6px 0 var(--input-border-box-shadow);
+        }
       }
     }
   }
-
-  .box.hide-remove-is-view {
-    grid-template-columns: auto;
-  }
-
   .remove {
     text-align: right;
   }
   .footer {
+    margin-bottom: 24px;
     .protip {
       float: right;
       padding: 5px 0;
@@ -473,4 +474,11 @@ export default {
   .required {
     color: var(--error);
   }
+  :deep() .labeled-input.compact-input{
+    padding: 0px;
+  }
+  :deep() .box{
+    margin-bottom: 10px;
+  }
+    
 </style>

package/components/form/ArrayListGrouped.vue

@@ -127,8 +127,16 @@ export default {
       & > .remove {
         position: absolute;
 
-        top: 0;
-        right: 0;
+        top: 10px;
+        right: 10px;
+        & > .close{
+          width: 32px;
+          min-width: 32px !important;
+          color: var(--body-text);
+          &:hover{
+            color: var(--link);
+          }
+        }
       }
 
       & > .info-box {

package/components/form/ArrayListSelect.vue

@@ -98,6 +98,6 @@ export default {
 
 <style lang="scss" scoped>
 :deep() .unlabeled-select {
-  height: 61px;
+  height: 30px;
   }
 </style>

package/components/form/BannerSettings.vue

@@ -117,7 +117,7 @@ export default ({
 
 <template>
   <div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <ColorInput
           v-model:value="value[bannerType].color"
@@ -137,7 +137,7 @@ export default ({
         />
       </div>
     </div>
-    <div class="row pb-10">
+    <div class="row mb-20">
       <ToggleSwitch
         v-model:value="isHtml"
         :aria-label="`${t(`banner.${bannerType}`)} ${t('banner.toggleTextHtml')}`"
@@ -147,71 +147,76 @@ export default ({
         :on-label="t('banner.type.html')"
       />
     </div>
-    <div
-      v-if="!isHtml"
-      class="row"
-    >
-      <p
-        :id="bannerTitleId"
-        class="sr-only"
+    <div v-if="!isHtml">
+      <div
+        class="row"
       >
-        {{ t(`banner.${bannerType}`) }}
-      </p>
-      <div class="col span-6">
-        <LabeledInput
-          v-model:value="value[bannerType].text"
-          :disabled="isUiDisabled"
-          :label="t('banner.text')"
-          type="multiline"
-          :aria-describedby="bannerTitleId"
-        />
         <p
-          v-if="isConsentBanner"
-          class="banner-input-footnote mt-5 mb-20"
+          :id="bannerTitleId"
+          class="sr-only"
         >
-          {{ t('banner.consentFootnote') }}
+          {{ t(`banner.${bannerType}`) }}
         </p>
+        <div class="col span-6">
+          <LabeledInput
+            v-model:value="value[bannerType].text"
+            :disabled="isUiDisabled"
+            :label="t('banner.text')"
+            type="multiline"
+            :aria-describedby="bannerTitleId"
+          />
+          <p
+            v-if="isConsentBanner"
+            class="banner-input-footnote mt-5 mb-20"
+          >
+            {{ t('banner.consentFootnote') }}
+          </p>
+        </div>
+        <div class="col span-6">
+          <LabeledSelect
+            v-model:value="value[bannerType].fontSize"
+            :data-testid="`banner_font_size_options${bannerType}`"
+            :disabled="isUiDisabled"
+            :label="t('banner.bannerFontSize.label')"
+            :options="uiBannerFontSizeOptions"
+            :aria-describedby="bannerTitleId"
+          />
+        </div>
       </div>
-      <div class="col span-2">
-        <RadioGroup
-          v-model:value="value[bannerType].textAlignment"
-          name="bannerAlignment"
-          :data-testid="`banner_alignment_radio_options${bannerType}`"
-          :label="t('banner.bannerAlignment.label')"
-          :options="radioOptions.options"
-          :labels="radioOptions.labels"
-          :mode="mode"
-          :aria-label="`${t(`banner.${bannerType}`)} ${t('banner.bannerAlignment.label')}`"
-        />
-      </div>
-      <div class="col span-2">
-        <h3 id="decoration-banner-title-id">
-          {{ t('banner.bannerDecoration.label') }}
-        </h3>
-        <div
-          v-for="(o, i) in textDecorationOptions"
-          :key="i"
-        >
-          <Checkbox
-            v-model:value="value[bannerType][o.style]"
-            name="bannerDecoration"
-            :data-testid="`banner_decoration_checkbox${bannerType}${o.label}`"
-            class="banner-decoration-checkbox"
+      <div class="row">
+        <div class="col span-6">
+          <RadioGroup
+            v-model:value="value[bannerType].textAlignment"
+            name="bannerAlignment"
+            :data-testid="`banner_alignment_radio_options${bannerType}`"
+            :label="t('banner.bannerAlignment.label')"
+            :options="radioOptions.options"
+            :labels="radioOptions.labels"
             :mode="mode"
-            :label="o.label"
-            :aria-describedby="`${bannerTitleId} decoration-banner-title-id`"
+            :aria-label="`${t(`banner.${bannerType}`)} ${t('banner.bannerAlignment.label')}`"
           />
         </div>
-      </div>
-      <div class="col span-2">
-        <LabeledSelect
-          v-model:value="value[bannerType].fontSize"
-          :data-testid="`banner_font_size_options${bannerType}`"
-          :disabled="isUiDisabled"
-          :label="t('banner.bannerFontSize.label')"
-          :options="uiBannerFontSizeOptions"
-          :aria-describedby="bannerTitleId"
-        />
+        <div style="display: flex;" class="col span-6">
+          <p style="width: 160px;" id="decoration-banner-title-id">
+            {{ t('banner.bannerDecoration.label') }}
+          </p>
+          <div style="display: flex;">
+            <div
+              v-for="(o, i) in textDecorationOptions"
+              :key="i"
+            >
+              <Checkbox
+                v-model:value="value[bannerType][o.style]"
+                name="bannerDecoration"
+                :data-testid="`banner_decoration_checkbox${bannerType}${o.label}`"
+                class="banner-decoration-checkbox"
+                :mode="mode"
+                :label="o.label"
+                :aria-describedby="`${bannerTitleId} decoration-banner-title-id`"
+              />
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div

package/components/form/ChangePassword.vue

@@ -355,7 +355,7 @@ export default {
           v-if="isRandomGenerated"
           :class="{'row': isCreateEdit}"
         >
-          <div :class="{'col': isCreateEdit, 'span-8': isCreateEdit}">
+          <div :class="{'col': isCreateEdit, 'span-6': isCreateEdit}">
             <Password
               v-model:value="passwordGen"
               class="mt-10"
@@ -370,7 +370,7 @@ export default {
           class="userGen"
           :class="{'row': isCreateEdit}"
         >
-          <div :class="{'col': isCreateEdit, 'span-4': isCreateEdit}">
+          <div :class="{'col': isCreateEdit, 'span-6': isCreateEdit}">
             <Password
               v-model:value="passwordNew"
               data-testid="account__new_password"
@@ -380,7 +380,7 @@ export default {
               :ignore-password-managers="!isChange"
             />
           </div>
-          <div :class="{'col': isCreateEdit, 'span-4': isCreateEdit}">
+          <div :class="{'col': isCreateEdit, 'span-6': isCreateEdit}">
             <Password
               v-model:value="passwordConfirm"
               data-testid="account__confirm_password"
@@ -405,7 +405,7 @@ export default {
       class="text-error"
       :class="{'row': isCreateEdit}"
     >
-      <div :class="{'col': isCreateEdit, 'span-8': isCreateEdit}">
+      <div :class="{'col': isCreateEdit, 'span-6': isCreateEdit}">
         <Banner
           v-for="(err, i) in errorMessages"
           :key="i"