dashboard-shell-shell 3.0.5-logtest.2 → 3.0.5-order.1

package/pages/auth/login.vue

@@ -19,7 +19,7 @@ import { configType } from '@shell/models/management.cattle.io.authconfig';
 import { mapGetters } from 'vuex';
 import { markRaw } from 'vue';
 import { _MULTI } from '@shell/plugins/dashboard-store/actions';
-import { MANAGEMENT, NORMAN } from '@shell/config/types';
+import { CAPI, MANAGEMENT, NORMAN } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { LOGIN_ERRORS } from '@shell/store/auth';
 import {
@@ -33,6 +33,7 @@ import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import TabTitle from '@shell/components/TabTitle.vue';
 import { AFTER_LOGIN_ROUTE } from '@shell/store/prefs';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export default {
   name:       'Login',
@@ -306,13 +307,21 @@ export default {
           $plugin: this.$store.$plugin
         });
 
+        const routerParmas = {
+          name:       'c-cluster-product-resource',
+          params: {
+            cluster:  BLANK_CLUSTER,
+            product:  'manager',
+            resource: CAPI.RANCHER_CLUSTER
+          }
+        }
 
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
-          this.$router.push({ name: 'index' });
+          this.$router.push(routerParmas);
         }
 
       } catch (err) {

package/pages/csm/ServiceMarket-iframe.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-page">
+    <iframe
+      width="100%"
+      height="100%"
+      :src="Data.iframeSrc"
+      frameborder="0"
+      id="IframeDo"
+      allowfullscreen="true"
+      ></iframe>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+
+const Data = reactive({
+  iframeSrc: 'https://10.21.255.163:8011/Cloud/securityServiceMarket?accessToken=source=rancher;sessionid_rem=123123;account=zhjtest&username=zhjtest&password=cloudmap&AccountType=tenant',
+})
+
+onMounted(()=>{
+})
+
+</script>
+
+<style scoped>
+.iframe-page {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+</style>

package/pages/csm/order-iframe.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-page">
+    <iframe
+      width="100%"
+      height="100%"
+      :src="Data.iframeSrc"
+      frameborder="0"
+      id="IframeDo"
+      allowfullscreen="true"
+      ></iframe>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+
+const Data = reactive({
+  iframeSrc: 'https://10.21.255.163:8011/Cloud/orderManagement?accessToken=source=rancher;sessionid_rem=123123;account=admin&username=admin&password=cloudmap&AccountType=admin',
+})
+
+onMounted(()=>{
+})
+
+</script>
+
+<style scoped>
+.iframe-page {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+</style>

package/pages/csm/orderInfo-iframe.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-page">
+    <iframe
+      width="100%"
+      height="100%"
+      :src="Data.iframeSrc"
+      frameborder="0"
+      id="IframeDo"
+      allowfullscreen="true"
+      ></iframe>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+
+const Data = reactive({
+  iframeSrc: 'https://10.21.255.163:8011/Cloud/orderingInformation?accessToken=source=rancher;sessionid_rem=123123;account=zhjtest&username=zhjtest&password=cloudmap&AccountType=tenant',
+})
+
+onMounted(()=>{
+})
+
+</script>
+
+<style scoped>
+.iframe-page {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+</style>

package/pages/csm/shelfist-iframe.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-page">
+    <iframe
+      width="100%"
+      height="100%"
+      :src="Data.iframeSrc"
+      frameborder="0"
+      id="IframeDo"
+      allowfullscreen="true"
+      ></iframe>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+
+const Data = reactive({
+  iframeSrc: 'https://10.21.255.163:8011/Cloud/shelfistManagement?accessToken=source=rancher;sessionid_rem=123123;account=admin&username=admin&password=cloudmap&AccountType=admin',
+})
+
+onMounted(()=>{
+})
+
+</script>
+
+<style scoped>
+.iframe-page {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+</style>

package/pages/csm/tenant-iframe.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-page">
+    <iframe
+      width="100%"
+      height="100%"
+      :src="Data.iframeSrc"
+      frameborder="0"
+      id="IframeDo"
+      allowfullscreen="true"
+      ></iframe>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, reactive } from 'vue'
+
+const Data = reactive({
+  iframeSrc: 'https://10.21.255.163:8011/Cloud/tenantManagement?accessToken=source=rancher;sessionid_rem=123123;account=admin&username=admin&password=cloudmap&AccountType=admin',
+})
+
+onMounted(()=>{
+})
+
+</script>
+
+<style scoped>
+.iframe-page {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+}
+</style>

package/pages/home.vue

@@ -502,7 +502,7 @@ export default defineComponent({
         <div class="col main-panel">
           <h2 class="mb-20">
             <!-- {{ t('landing.clusters.title') }} -->
-              首页
+              <!-- 首页 -->
           </h2>
 
           <!-- 集群列表面板 -->

package/rancher-components/Accordion/Accordion.vue

@@ -70,14 +70,16 @@ export default defineComponent({
   border: 1px solid var(--border)
 }
 .accordion-header {
+  cursor: pointer;
   padding: 16px 16px 16px 11px;
   display: flex;
   align-items: center;
   &>*{
+    font-size: 14px;
     padding: 5px 0px 5px 0px;
   }
   I {
-    margin: 0px 10px 0px 10px;
+    margin-right: 10px;
   }
 }
 .accordion-body {

package/rancher-components/RcDropdown/RcDropdown.vue

@@ -150,7 +150,7 @@ const applyShow = () => {
 
   .dropdownTarget {
     overflow: auto;
-    padding: 3px 0; // Need padding at top and bottom in order to show the focus border for the notification
+    padding: 10px 0; // Need padding at top and bottom in order to show the focus border for the notification
 
     &:focus-visible, &:focus {
       outline: none;

package/scripts/publish-shell.sh

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

package/store/index.js

@@ -519,10 +519,10 @@ export const getters = {
              (!isAll && filteredMap && filteredMap[out] );
     }
 
-    // out = rootGetters['prefs/get'](LAST_NAMESPACE);
-    // if ( isOk() ) {
-    //   return out;
-    // }
+    out = rootGetters['prefs/get'](LAST_NAMESPACE);
+    if ( isOk() ) {
+      return out;
+    }
 
     out = 'default';
     if ( isOk() ) {

package/store/type-map.js

@@ -218,6 +218,7 @@ export const IF_HAVE = {
   MULTI_CLUSTER:            'multi-cluster',
   NEUVECTOR_NAMESPACE:      'neuvector-namespace',
   ADMIN:                    'admin-user',
+  TENANT:                   'tenant-user',
   MCM_DISABLED:             'mcm-disabled',
   NOT_STANDALONE_HARVESTER: 'not-standalone-harvester',
 };
@@ -1950,6 +1951,9 @@ function ifHave(getters, option) {
   case IF_HAVE.NOT_STANDALONE_HARVESTER: {
     return !getters['isStandaloneHarvester'];
   }
+  case IF_HAVE.TENANT: {
+    return !isAdminUser(getters);
+  }
   default:
     return false;
   }