dashboard-shell-shell 3.0.5-test.2 → 3.0.5-test.21

package/pages/account/index.vue

@@ -3,8 +3,7 @@ import BackLink from '@shell/components/BackLink';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import Loading from '@shell/components/Loading';
-// import Principal from '@shell/components/auth/Principal';
-import Principal from './pri.vue';
+import Principal from '@shell/components/auth/Principal';
 import BackRoute from '@shell/mixins/back-link';
 import { mapGetters } from 'vuex';
 
@@ -17,7 +16,7 @@ const API_ENDPOINT = '/v3';
 
 export default {
   components: {
-    CopyToClipboardText, BackLink, Banner, PromptChangePassword, Loading, ResourceTable, Principal, TabTitle
+    CopyToClipboardText, BackLink, Banner, Loading, ResourceTable, Principal, TabTitle
   },
   mixins: [BackRoute],
   async fetch() {
@@ -152,88 +151,39 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <!-- <BackLink :link="backLink" />
-    <h1>
-      <TabTitle breadcrumb="vendor-only">
-        {{ t('accountAndKeys.title') }}
-      </TabTitle>
-    </h1> -->
-    <div class="api-key-title mb-20">
-      {{ t('accountAndKeys.title') }}
+    <div style="display: flex;align-items: center;margin-bottom: 20px;">
+      <!-- <BackLink class="backLinkCls" :link="backLink" /> -->
+      <div style="font-size: 26px;">
+        <TabTitle breadcrumb="vendor-only">
+          {{ t('accountAndKeys.title') }}
+        </TabTitle>
+      </div>
     </div>
 
-    <!-- <h2 v-t="'accountAndKeys.account.title'" /> -->
-    <div class="account">
-      <div class="account-title">
-        {{ t('accountAndKeys.account.title') }}
-      </div>
-      <Principal
-        :value="principal.id"
-        :use-muted="false"
-        :show-labels="true"
-        :isShowPass="true"
-      >
-      <template #edit>
-          <span
+    <div class="account_card mb-20">
+      <h5 v-t="'accountAndKeys.account.title'" />
+      <div class="account">
+        <Principal
+          :userLogoSize="79"
+          :value="principal.id"
+          :use-muted="false"
+          :show-labels="true"
+        />
+        <div>
+          <button
             v-if="canChangePassword"
-            class="edit-pass-txt"
-            @click="$refs.promptChangePassword.show(true)"
-          >修改
-          </span>
-        </template>
-    </Principal>
-      <!-- <div>
-        <button
-          v-if="canChangePassword"
-          role="button"
-          :aria-label="t('accountAndKeys.account.change')"
-          type="button"
-          class="btn role-primary"
-          data-testid="account_change_password"
-          @click="$refs.promptChangePassword.show(true)"
-        >
-          {{ t("accountAndKeys.account.change") }}
-        </button>
-      </div> -->
-    </div>
-    <PromptChangePassword ref="promptChangePassword" />
-
-    <!-- <hr role="none"> -->
-     <div  
-     style=" border: 1px solid #d7d7d7;padding: 20px 20px 0px 20px;"
-     class="mt-20">
-    <div class="keys-header">
-      <div>
-        <!-- <h2 v-t="'accountAndKeys.apiKeys.title'" /> -->
-        <div
-            v-t="'accountAndKeys.apiKeys.title'"
-            class="account-title mb-20"
-          />
-        <div class="api-url">
-          <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
-          <CopyToClipboardText
-            :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
-            :text="apiUrl"
-          />
+            role="button"
+            :aria-label="t('accountAndKeys.account.change')"
+            type="button"
+            class="btn role-primary"
+            data-testid="account_change_password"
+            @click="showChangePasswordDialog"
+          >
+            {{ t("accountAndKeys.account.change") }}
+          </button>
         </div>
       </div>
-    </div>
-    <div
-      v-if="apiKeySchema"
-      class="keys mb-20"
-    >
-      <ResourceTable
-        :schema="apiKeySchema"
-        :rows="apiKeys"
-        :headers="apiKeyheaders"
-        key-field="id"
-        data-testid="api_keys_list"
-        :search="true"
-        :row-actions="true"
-        :table-actions="true"
-      >
-      <template #header-right>
-        <button
+      <!-- <button
         v-if="apiKeySchema"
         role="button"
         :aria-label="t('accountAndKeys.apiKeys.add.label')"
@@ -242,32 +192,82 @@ export default {
         @click="addKey"
       >
         {{ t('accountAndKeys.apiKeys.add.label') }}
-      </button>
-          </template>
-    </ResourceTable>
+      </button> -->
     </div>
-    <div v-else>
-      <Banner
-        color="warning"
-        :label="t('accountAndKeys.apiKeys.notAllowed')"
-      />
+
+    <div class="account_card mb-20">
+      <div class="keys-header">
+        <div>
+          <h5 v-t="'accountAndKeys.apiKeys.title'" />
+          <div class="api-url">
+            <span>{{ t("accountAndKeys.apiKeys.apiEndpoint") }}</span>
+            <CopyToClipboardText
+              :aria-label="t('accountAndKeys.apiKeys.copyApiEnpoint')"
+              :text="apiUrl"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="apiKeySchema"
+        class="keys"
+      >
+        <ResourceTable
+          :schema="apiKeySchema"
+          :rows="apiKeys"
+          :headers="apiKeyheaders"
+          key-field="id"
+          data-testid="api_keys_list"
+          :search="true"
+          :row-actions="true"
+          :table-actions="true"
+        >
+          <template #header-right>
+            <button
+              style="margin-right: 10px;"
+              v-if="apiKeySchema"
+              role="button"
+              :aria-label="t('accountAndKeys.apiKeys.add.label')"
+              class="btn role-primary add"
+              data-testid="account_create_api_keys"
+              @click="addKey"
+            >
+              {{ t('accountAndKeys.apiKeys.add.label') }}
+            </button>
+          </template>
+        </ResourceTable>
+      </div>
+      <div v-else>
+        <Banner
+          color="warning"
+          :label="t('accountAndKeys.apiKeys.notAllowed')"
+        />
+      </div>
     </div>
   </div>
-  </div>
 </template>
 
 <style lang='scss' scoped>
+  .account_card {
+    border: 1px solid #d7d7d7;
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  :deep() .back-link {
+    font-size: 26px;
+    margin: 0 20px 0 0 !important;
+  }
   hr {
     margin: 20px 0;
   }
 
   .account {
-    /* display: flex;
-    justify-content: space-between */
-    border: 1px solid #D7D7D7;
-    padding: 20px;
-    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between
+  }
 
+  .principal  .avatar {
+    width: 287px !important;
   }
 
   .keys-header {
@@ -280,37 +280,17 @@ export default {
   .keys {
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
     .add {
       align-self: flex-end;
-      margin-left: 10px
     }
   }
 
   .api-url {
     display: flex;
+    margin: 20px 0;
 
     > span {
       margin-right: 6px;
     }
   }
-  .api-key-title{
-    font-size: 26px;
-    /* line-height: 20px; */
-    font-weight: 400;
-  }
-
-  .edit-pass-txt{
-    cursor: pointer;
-    color: var(--primary);
-  }
-
-  .table-account{
-    border: 1px solid #d7d7d7;
-  }
-  .account-title{
-      font-size: 14px;
-      line-height: 19px;
-      margin-bottom: 16px;
-    }
 </style>

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);
@@ -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/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() {