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

package/pages/auth/setup.vue

@@ -21,6 +21,7 @@ import FormValidation from '@shell/mixins/form-validation';
 import isUrl from 'is-url';
 import { isLocalhost } from '@shell/utils/validators/setting';
 import Loading from '@shell/components/Loading';
+import { copyTextToClipboard } from '@shell/utils/clipboard';
 
 const calcIsFirstLogin = (store) => {
   const firstLoginSetting = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.FIRST_LOGIN);
@@ -149,7 +150,7 @@ export default {
     this['isFirstLogin'] = isFirstLogin;
     this['mustChangePassword'] = mustChangePassword;
     // this['current'] = current;
-    this['current'] = 'admin';
+    this['current'] = current || 'admin';
     this['v3User'] = v3User;
     this['serverUrl'] = serverUrl;
     this['mcmEnabled'] = mcmEnabled;
@@ -259,6 +260,14 @@ export default {
       this.$router.replace('/');
     },
 
+    copyPassword(val) {
+      copyTextToClipboard(val).then(() => {
+        console.log('复制成功')
+      }).catch(() => {
+        console.log('复制失败')
+      });
+    },
+
     onServerUrlChange(value) {
       this.serverUrl = value.trim();
     },
@@ -324,13 +333,14 @@ export default {
             >
             <div class="mb-20">
               <RadioGroup
+                class="setupRadioGroupCls"
                 v-model:value="useRandom"
                 data-testid="setup-password-mode"
                 name="password-mode"
                 :options="passwordOptions"
               />
             </div>
-            <div class="mb-20">
+            <div class="setup_radom-password mb-20">
               <LabeledInput
                 v-if="useRandom"
                 ref="password"
@@ -347,13 +357,9 @@ export default {
                 >
                   <div
                     class="addon"
-                    style="padding: 0 0 0 0px;"
+                    style="padding: 4px 0px 0px;"
                   >
-                    <CopyToClipboard
-                      :aria-label="t('setup.copyRandom')"
-                      :text="password"
-                      class="btn-sm"
-                    />
+                    <a @click="copyPassword(password)" href="javascript:;">复制</a>
                   </div>
                 </template>
               </LabeledInput>
@@ -367,15 +373,17 @@ export default {
                 :required="true"
               />
             </div>
-            <Password
-              v-show="!useRandom"
-              v-model:value.trim="confirm"
-              autocomplete="new-password"
-              data-testid="setup-password-confirm"
-               class="setup-password"
-              :label="t('setup.confirmPassword')"
-              :required="true"
-            />
+            <div class="setup_radom-password">
+              <Password
+                v-show="!useRandom"
+                v-model:value.trim="confirm"
+                autocomplete="new-password"
+                data-testid="setup-password-confirm"
+                 class="setup-password"
+                :label="t('setup.confirmPassword')"
+                :required="true"
+              />
+            </div>
           </template>
 
           <template v-if="isFirstLogin">
@@ -467,6 +475,16 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .setup_radom-password {
+    :deep(.label-input-all) LABEL {
+      color: #fff;
+    }
+  }
+  .setupRadioGroupCls {
+    :deep(.radio-label) {
+      color: #fff;
+    }
+  }
   .principal {
     display: block;
     background: var(--box-bg);
@@ -538,6 +556,7 @@ export default {
     }
 
     .setup-title {
+      color: #fff;
       :deep() code {
         font-size: 12px;
         padding: 0;

package/pages/c/_cluster/_product/namespaces.vue

@@ -29,8 +29,8 @@ export default {
   computed: {
     headers() {
       return [
-        STATE,
         NAME,
+        STATE,
         AGE
       ];
     },

package/pages/c/_cluster/auth/roles/index.vue

@@ -162,7 +162,7 @@ export default {
         </h1>
         <div style="margin: 20px 0;">支持管理员创建与管理不同角色‌，每个角色可预设特定权限集合，可简化用户权限分配流程，提升权限管理的灵活性与安全性。</div>
       </div>
-      <div class="actions-container actions-container-box">
+      <!-- <div class="actions-container actions-container-box">
         <div class="actions">
           <router-link
             v-if="canCreate"
@@ -172,7 +172,7 @@ export default {
             {{ createLabel }}
           </router-link>
         </div>
-      </div>
+      </div> -->
     </header>
     <Tabbed>
       <Tab
@@ -184,7 +184,18 @@ export default {
         <ResourceTable
           :schema="tabs[GLOBAL].schema"
           :rows="globalResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -197,7 +208,18 @@ export default {
           :schema="tabs[CLUSTER].schema"
           :headers="tabs[CLUSTER].headers"
           :rows="clusterResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
 
       <Tab
@@ -210,7 +232,18 @@ export default {
           :schema="tabs[PROJECT].schema"
           :headers="tabs[PROJECT].headers"
           :rows="namespaceResources"
-        />
+        >
+          <template #header-right>
+            <router-link
+              v-if="canCreate"
+              :to="createLocation"
+              style="margin-right: 10px;"
+              class="btn role-primary"
+            >
+              {{ createLabel }}
+            </router-link>
+          </template>
+        </ResourceTable>
       </Tab>
     </Tabbed>
   </div>

package/pages/c/_cluster/explorer/ConfigBadge.vue

@@ -49,7 +49,7 @@ export default {
     margin-left: 10px;
 
     &:hover {
-      border-color: var(--lightest);
+      // border-color: var(--lightest);
     }
 
     > I {

package/pages/c/_cluster/explorer/tools/index.vue

@@ -230,7 +230,7 @@ export default {
 
       .name {
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         margin: 0;
       }
@@ -249,7 +249,7 @@ export default {
       .version {
         color: var(--muted);
         white-space: nowrap;
-        overflow: hidden;
+        // overflow: hidden;
         text-overflow: ellipsis;
         font-size: 0.9em;
         margin-top: 4px;
@@ -262,10 +262,10 @@ export default {
       .description-content {
         display: -webkit-box;
         -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
-        line-clamp: 3;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        // -webkit-line-clamp: 3;
+        // line-clamp: 3;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
         color: var(--text-muted);
       }
 

package/pages/home.vue

@@ -486,7 +486,6 @@ export default defineComponent({
 
     <!-- 页签标题组件，不显示子页面标题和面包屑 -->
     <TabTitle
-      v-if="topLevelPermissionsVis"
       :show-child="false"
       :breadcrumb="false"
     >
@@ -496,14 +495,14 @@ export default defineComponent({
     </TabTitle>
 
     <!-- 首页欢迎横幅 -->
-    <BannerGraphic
+    <!-- <BannerGraphic
       v-if="topLevelPermissionsVis"
       :small="true"
       :title="t('landing.welcomeToRancher', {vendor})"
       :pref="HIDE_HOME_PAGE_CARDS"
       pref-key="welcomeBanner"
       data-testid="home-banner-graphic"
-    />
+    /> -->
     <IndentedPanel class="mt-20 mb-20">
 
        <!-- 主面板布局 -->
@@ -548,7 +547,7 @@ export default defineComponent({
                   v-if="canCreateCluster || !!provClusterSchema"
                   #header-right
                 >
-                  <div v-if="topLevelPermissionsVis" class="table-heading">
+                  <div class="table-heading">
                     <router-link
                       v-if="!!provClusterSchema"
                       :to="manageLocation"

package/pkg/tsconfig.json

@@ -27,25 +27,25 @@
     ],
     "paths": {
       "@shell/core/*": [
-        "../../node_modules/@rancher/shell/core/*"
+        "../../node_modules/dashboard-shell-shell/core/*"
       ],
       "@shell/config/*": [
-        "../../node_modules/@rancher/shell/config/*"
+        "../../node_modules/dashboard-shell-shell/config/*"
       ],
       "@shell/store/*": [
-        "../../node_modules/@rancher/shell/store/*"
+        "../../node_modules/dashboard-shell-shell/store/*"
       ],
       "@shell/plugins/*": [
-        "../../node_modules/@rancher/shell/plugins/*"
+        "../../node_modules/dashboard-shell-shell/plugins/*"
       ],
       "@shell/utils/*": [
-        "../../node_modules/@rancher/shell/utils/*"
+        "../../node_modules/dashboard-shell-shell/utils/*"
       ],
       "@shell/models/*": [
-        "../../node_modules/@rancher/shell/models/*"
+        "../../node_modules/dashboard-shell-shell/models/*"
       ],
       "@shell/mixins/*": [
-        "../../node_modules/@rancher/shell/mixins/*"
+        "../../node_modules/dashboard-shell-shell/mixins/*"
       ],
       "@pkg/*": [
         "./*"
@@ -56,8 +56,8 @@
     "**/*.ts",
     "**/*.tsx",
     "**/*.vue",
-    "../../node_modules/@rancher/shell/types/*.d.ts",
-    "../../node_modules/@rancher/shell/core/types.ts"
+    "../../node_modules/dashboard-shell-shell/types/*.d.ts",
+    "../../node_modules/dashboard-shell-shell/core/types.ts"
   ],
   "exclude": [
     "node_modules"

package/pkg/vue.config.js

@@ -117,7 +117,7 @@ module.exports = function(dir) {
         if (p.use) {
           p.use.forEach((u) => {
             if (u.loader.includes('babel-loader')) {
-              p.exclude = /node_modules\/(?!@rancher\/shell\/).*/;
+              p.exclude = /node_modules\/(?!dashboard-shell-shell\/).*/;
             }
           });
         }

package/plugins/dashboard-store/resource-class.js

@@ -913,42 +913,42 @@ export default class Resource {
       {
         action:  this.canUpdate ? 'goToEdit' : 'goToViewConfig',
         label:   this.t(this.canUpdate ? 'action.edit' : 'action.view'),
-        icon:    'icon icon-edit',
+        // icon:    'icon icon-edit',
         enabled: this.canCustomEdit,
       },
-      {
-        action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
-        label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
-        icon:    'icon icon-file',
-        enabled: this.canYaml,
-      },
+      // {
+      //   action:  this.canEditYaml ? 'goToEditYaml' : 'goToViewYaml',
+      //   label:   this.t(this.canEditYaml ? 'action.editYaml' : 'action.viewYaml'),
+      //   icon:    'icon icon-file',
+      //   enabled: this.canYaml,
+      // },
       {
         action:  (this.canCustomEdit ? 'goToClone' : 'cloneYaml'),
         label:   this.t('action.clone'),
-        icon:    'icon icon-copy',
-        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml),
-      },
-      { divider: true },
-      {
-        action:     'download',
-        label:      this.t('action.download'),
-        icon:       'icon icon-download',
-        bulkable:   true,
-        bulkAction: 'downloadBulk',
-        enabled:    this.canYaml,
-        weight:     -9,
-      },
-      {
-        action:  'viewInApi',
-        label:   this.t('action.viewInApi'),
-        icon:    'icon icon-external-link',
-        enabled: this.canViewInApi,
+        // icon:    'icon icon-copy',
+        enabled: this.canClone && this.canCreate && (this.canCustomEdit || this.canYaml)&& this.schema.id!=='event',
       },
+      // { divider: true },
+      // {
+      //   action:     'download',
+      //   label:      this.t('action.download'),
+      //   icon:       'icon icon-download',
+      //   bulkable:   true,
+      //   bulkAction: 'downloadBulk',
+      //   enabled:    this.canYaml,
+      //   weight:     -9,
+      // },
+      // {
+      //   action:  'viewInApi',
+      //   label:   this.t('action.viewInApi'),
+      //   icon:    'icon icon-external-link',
+      //   enabled: this.canViewInApi,
+      // },
       {
         action:     'promptRemove',
         altAction:  'remove',
         label:      this.t('action.remove'),
-        icon:       'icon icon-trash',
+        // icon:       'icon icon-trash',
         bulkable:   true,
         enabled:    this.canDelete,
         bulkAction: 'promptRemove',
@@ -1322,7 +1322,8 @@ export default class Resource {
   }
 
   get detailLocation() {
-    return this._detailLocation;
+    let location = this._detailLocation;
+    return location;
   }
 
   goToDetail() {

package/rancher-components/BadgeState/BadgeState.vue

@@ -63,60 +63,41 @@ export default defineComponent({
 </script>
 
 <template>
-  <span :class="['badge-state', bg]">
-    <i
-      v-if="icon"
-      class="icon"
-      :class="{[icon]: true, 'mr-5': !!msg}"
-    />{{ msg }}
-  </span>
+  <div style="display: flex;flex-direction: row;align-items: center;font-size: 12px;">
+    <div :class="{ [bg]: true }"></div>
+    <span style="margin-left: 5px;">{{ msg }}</span>
+    
+  </div>
 </template>
-
 <style lang="scss" scoped>
-  .badge-state {
-    align-items: center;
-    display: inline-flex;
-    padding: 2px 10px;
-    border: 1px solid transparent;
-    border-radius: 20px;
-
-    &.bg-info {
-      border-color: var(--info);
-    }
-
-    &.bg-error {
-      border-color: var(--error);
-    }
-
-    &.bg-warning {
-      border-color: var(--warning);
-    }
-
-    // Successful states are de-emphasized by using [text-]color instead of background-color
-    &.bg-success {
-      color: var(--success);
-      background: transparent;
-      border-color: var(--success);
-    }
-
-    // Added badge-disabled instead of bg-disabled since bg-disabled is used in other places with !important styling, an investigation is needed to make the naming consistent
-    &.badge-disabled {
-      color: var(--badge-state-disabled-text);
-      background-color: var( --badge-state-disabled-bg);
-      border: 1px solid var(--badge-state-disabled-border);
-    }
+  .bg-error {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
-</style>
-<style lang="scss">
-  // TODO: #6005
-  // Investigate why this is here.. I don't think that styles for sortable table should belong here
-  .sortable-table TD .badge-state {
-    @include clip;
-    display: inline-block;
-    max-width: 100%;
-    position: relative;
-    max-width: 110px;
-    font-size: .85em;
-    vertical-align: middle;
+  .bg-darker {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DD0C17; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-success {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #95F204 !important; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-warning {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #DAC342; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
+  }
+  .bg-info {
+    width: 10px; /* 圆点的宽度 */
+    height: 10px; /* 圆点的高度 */
+    background-color: #1890FF; /* 圆点的颜色 */
+    border-radius: 50%; /* 设置为圆形 */
   }
 </style>

package/rancher-components/Banner/Banner.vue

@@ -78,7 +78,14 @@ export default defineComponent({
      * Return message text as label.
      */
     messageLabel(): string | void {
-      return !(typeof this.label === 'string') ? stringify(this.label) : undefined;
+
+      let labelStr = this.label
+
+      if (labelStr === 'waiting for api to be available') {
+        labelStr = '等待api可用'
+      }
+
+      return !(typeof labelStr === 'string') ? stringify(labelStr) : undefined;
     },
   },
   methods: { nlToBr }
@@ -164,6 +171,7 @@ $icon-size: 24px;
   margin: 0px 0px 20px 0px;
   position: relative;
   width: 100%;
+  min-height: 32px;
   color: var(--body-text);
 
   &__icon {
@@ -201,13 +209,15 @@ $icon-size: 24px;
   }
 
   &__content {
-    padding: 9px 10px; 
+    padding: 2px 10px; 
     transition: all 0.2s ease;
     line-height: 12px;
     width: 100%;
     border-left: solid $left-border-size transparent;
     display: flex;
     gap: 3px;
+    min-height: 32px;
+    align-items: center;
     word-wrap:break-word; 
     word-break:break-all; 
 

package/rancher-components/Form/Radio/RadioGroup.vue

@@ -102,6 +102,11 @@ export default defineComponent({
     row: {
       type:    Boolean,
       default: false
+    },
+
+    flexDirection: {
+      type:    String,
+      default: 'row'
     }
   },
 
@@ -274,7 +279,7 @@ export default defineComponent({
       :aria-describedby="radioGroupAriaDescribedBy"
       :aria-activedescendant="ariaActiveDescendant"
       class="radio-group"
-      :class="{'row':row}"
+      :class="{'row':row, 'flexDirection': flexDirection === 'column'}"
       :tabindex="isDisabled ? -1 : 0"
       :aria-disabled="isDisabled"
       @keydown.down.prevent.stop="clickNext(1)"
@@ -312,6 +317,9 @@ export default defineComponent({
 </template>
 
 <style lang='scss'>
+.flexDirection {
+  flex-direction: column;
+}
 .radio-group {
   &:focus, &:focus-visible {
     border: none;

package/rancher-components/LabeledTooltip/LabeledTooltip.vue

@@ -123,8 +123,8 @@ export default defineComponent({
     &.null {
 
         .status-icon {
-          top: 5px;
-          right: -20px;
+          top: 8px !important;
+          right: 25px !important;
         }
     }
 
@@ -146,6 +146,35 @@ export default defineComponent({
     }
 }
 
+.labeled-select{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 25px !important;
+        }
+    }
+
+    &.error {
+
+        .status-icon {
+          top: 9px !important;
+          right: 20px;
+        }
+    }
+  }
+}
+.labeled-input{
+  .labeled-tooltip{
+    &.null {
+        .status-icon {
+          top: 10px !important;
+          right: 10px !important;
+        }
+    }
+  }
+}
+
 // Ensure code blocks inside tootips don't look awful
 .v-popper__popper.v-popper--theme-tooltip {
   .v-popper__inner {

package/rancher-components/RcDropdown/RcDropdownMenu.vue

@@ -33,10 +33,10 @@ const hasOptions = (options: DropdownOption[]) => {
       :data-testid="dataTestid"
       :aria-label="buttonAriaLabel"
     >
-      <div v-if="showIcon">
-        <i class="icon icon-actions" />
-      </div>
-      <a v-else href="javascript:;">操作</a>
+    <div v-if="showIcon">
+      <i data-v-5db2c2c7="" class="icon icon-actions" alt="More actions icon"></i>
+    </div>
+    <a v-else href="javascript:;">操作</a>
     </rc-dropdown-trigger>
     <template #dropdownCollection>
       <template
@@ -58,15 +58,16 @@ const hasOptions = (options: DropdownOption[]) => {
           </template> -->
           {{ a.label }}
         </rc-dropdown-item>
-        <rc-dropdown-separator
+        <!-- <rc-dropdown-separator
           v-else
-        />
+        /> -->
       </template>
       <rc-dropdown-item
         v-if="!hasOptions(options)"
         disabled
       >
-        暂无可执行的操作。
+        <!-- No actions available -->
+         暂无可执行的操作。
       </rc-dropdown-item>
     </template>
   </rc-dropdown>

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.2-rc.105 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.41 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail