dashboard-shell-shell 3.0.5-tsh.1 → 3.0.5-tsh.10

package/edit/logging.banzaicloud.io.output/providers/syslog.vue

@@ -67,15 +67,15 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-8">
-        <LabeledInput
-          v-model:value="value.host"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.host')"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.host')"
         />
       </div>
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="port"
           :mode="mode"
@@ -92,7 +92,7 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.transport"
@@ -103,16 +103,16 @@ export default {
         />
       </div>
       <div class="col span-6 insecure">
-        <Checkbox
-          v-model:value="value.insecure"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.insecure')"
+        <Checkbox
+          v-model:value="value.insecure"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.insecure')"
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.trusted_ca_path"
           mount-key="mountFrom"
@@ -130,7 +130,7 @@ export default {
         <h3>{{ t('logging.syslog.format.title') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.format.type"
@@ -149,21 +149,21 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.tags"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.tags')"
+        <LabeledInput
+          v-model:value="value.buffer.tags"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.tags')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.chunk_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.chunkLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.chunk_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.chunkLimitSize')"
         />
       </div>
       <div class="col span-6">
@@ -178,49 +178,49 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.total_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.totalLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.total_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.totalLimitSize')"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.flush_interval"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.flushInterval')"
+        <LabeledInput
+          v-model:value="value.buffer.flush_interval"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.flushInterval')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekey')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekey')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey_wait"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyWait')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey_wait"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyWait')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.buffer.timekey_use_utc"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyUseUTC')"
+        <Checkbox
+          v-model:value="value.buffer.timekey_use_utc"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyUseUTC')"
         />
       </div>
     </div>

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -19,32 +19,32 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 export const RECEIVERS_TYPES = [
   {
     name:  'message',
-    label: '短信',
-    title: '短信',
+    label: 'monitoringReceiver.message.label',
+    title: 'monitoringReceiver.message.title',
     info:  'monitoringReceiver.slack.info',
     key:   'slackConfigs',
     logo:  require(`@shell/assets/images/vendor/slack.svg`)
   },
   {
     name:  'dingding',
-    label: '钉钉',
-    title: '钉钉',
+    label: 'monitoringReceiver.dingding.label',
+    title: 'monitoringReceiver.dingding.title',
     info:  'monitoringReceiver.slack.info',
     key:   'dingding',
     logo:  require(`@shell/assets/images/vendor/slack.svg`)
   },
   {
     name:  'work',
-    label: '企业微信',
-    title: '企业微信',
+    label: 'monitoringReceiver.weixin.label',
+    title: 'monitoringReceiver.weixin.title',
     info:  'monitoringReceiver.slack.info',
     key:   'work',
     logo:  require(`@shell/assets/images/vendor/slack.svg`)
   },
   {
     name:  'snmp',
-    label: 'SNMP',
-    title: 'SNMP',
+    label: 'monitoringReceiver.snmp.label',
+    title: 'monitoringReceiver.snmp.title',
     info:  'monitoringReceiver.slack.info',
     key:   'snmp',
     logo:  require(`@shell/assets/images/vendor/slack.svg`)

package/edit/monitoring.coreos.com.alertmanagerconfig/types/dingding.vue

@@ -16,9 +16,17 @@
     </div>
   </div>
 </template>
-<script setup>
-import { ref } from 'vue';
-const id = ref('');
-
-const message = ref('');
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
 </script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/message.vue

@@ -30,10 +30,23 @@
     </div>
   </div>
 </template>
-<script setup>
-import { ref } from 'vue';
-const id = ref('');
-const scret = ref('');
-const message = ref('');
-const templateId = ref('');
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
 </script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/snmp.vue

@@ -23,10 +23,23 @@
     </div>
   </div>
 </template>
-<script setup>
-import { ref } from 'vue';
-const id = ref('');
-const scret = ref('');
-const message = ref('');
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
 
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
 </script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/work.vue

@@ -9,8 +9,23 @@
     </div>
   </div>
 </template>
-<script setup>
-import { ref } from 'vue';
-const message = ref('');
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
 
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-tsh.1",
+  "version": "3.0.5-tsh.10",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/pages/auth/login.vue

@@ -60,11 +60,11 @@ export default {
       customLoginError:   {},
       firstLogin:         false,
       vendor:             getVendor(),
-      imgLeft:         require('~shell/assets/images/login-left.png')
+      imgLeft:            require('~shell/assets/images/login-left.png')
     };
   },
 
-  created () {
+  created() {
     // this.$store.dispatch('i18n/switchTo', 'zh-hans');
   },
 
@@ -173,7 +173,7 @@ export default {
       this.focusSomething();
     });
   },
-  
+
   methods: {
     async loadInitialSettings() {
       let firstLoginSetting, plSetting, brand;
@@ -262,8 +262,8 @@ export default {
       try {
         // 临时 superadmin 处理
         if (this.username === 'super#Admin') {
-          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin')
-          this.username = 'admin'
+          sessionStorage.setItem('TOPLEVELPERMISSIONS', 'superadmin');
+          this.username = 'admin';
         }
 
         // 登录
@@ -306,15 +306,13 @@ export default {
           $plugin: this.$store.$plugin
         });
 
-
         // 登录跳转
         if (this.firstLogin || user[0]?.mustChangePassword) {
           this.$store.dispatch('auth/setInitialPass', this.password);
           this.$router.push({ name: 'auth-setup' });
         } else {
-          this.$router.push({ name: 'home' });
+          this.$router.push({ name: 'index' });
         }
-
       } catch (err) {
         // 登录失败处理
         this.err = err;
@@ -344,14 +342,16 @@ export default {
       {{ `${vendor} - ${t('login.login')}` }}
     </TabTitle> -->
     <div class="row gutless mb-20">
-      <div class="col span-7 img-left"></div>
+      <div class="col span-7 img-left" />
       <div class="col span-5 p-20">
-
-        <div class="logo-login" :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}">
+        <div
+          class="logo-login"
+          :style="{ 'marginBottom': errorToDisplay? '0px': '30px'}"
+        >
           <img
-          src="../../assets/images/login-logo.svg"
-          alt=""
-        />
+            src="../../assets/images/login-logo.svg"
+            alt=""
+          >
         </div>
         <div
           class="login-messages"
@@ -443,16 +443,16 @@ export default {
             <div class="login-form-display-label">
               <div class="mb-20 login-input-all-svg">
                 <img
+                  v-if="!firstLogin"
                   class="login-svg"
-                   v-if="!firstLogin"
                   src="../../assets/images/login/user.svg"
                   alt=""
                 >
                 <LabeledInput
                   v-if="!firstLogin"
                   ref="username"
-                  :placeholder="'请输入用户名'"
                   v-model:value.trim="username"
+                  :placeholder="'请输入用户名'"
                   data-testid="local-login-username"
                   :label="t('login.username')"
                   autocomplete="username"
@@ -466,8 +466,8 @@ export default {
                 >
                 <Password
                   ref="password"
-                  :placeholder="'请输入密码'"
                   v-model:value="password"
+                  :placeholder="'请输入密码'"
                   data-testid="local-login-password"
                   :label="t('login.password')"
                   autocomplete="current-password"
@@ -488,7 +488,6 @@ export default {
             </div>
             <div class="mt-20">
               <div class="col span-12 text-center">
-                
                 <AsyncButton
                   id="submit"
                   data-testid="login-submit"
@@ -499,7 +498,6 @@ export default {
                   :error-label="t('asyncButton.default.error')"
                   @click="loginLocal"
                 />
-                
               </div>
             </div>
           </form>
@@ -536,7 +534,9 @@ export default {
             mode="login"
           /> -->
         </div>
-        <div class="copyright">Copyright 2019-2025 HCI</div>
+        <div class="copyright">
+          Copyright 2019-2025 云翼
+        </div>
       </div>
     </div>
   </div>
@@ -544,7 +544,7 @@ export default {
 
 <style lang="scss" scoped>
   .login-username {
-    
+
   }
   .login {
     overflow: hidden;
@@ -572,7 +572,7 @@ export default {
 
       .banner {
         /* margin: 5px; */
-      
+
       }
       h4 {
         margin: 0;
@@ -665,8 +665,6 @@ export default {
     z-index: -1;
 }
 
-
-
 .login-form-display-label {
   display: flex;
   flex-direction: column;
@@ -682,7 +680,6 @@ export default {
     }
   }
 
-
 .login-input-all {
   &:deep() .labeled-input{
     background-color: #fff;
@@ -717,7 +714,7 @@ export default {
 .remeber-login{
   display: flex;
   justify-content: center
- 
+
 }
 .checkbox-login{
   width: 400px;
@@ -748,7 +745,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 30px;
- 
+
 }
 
 @media only screen and (max-width: 1439px) {
@@ -756,7 +753,7 @@ export default {
   display: flex;
   justify-content: center;
   margin-top: 0px;
- 
+
 }
 }
 </style>

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

@@ -7,6 +7,7 @@ import Loading from '@shell/components/Loading';
 import { SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { NAME } from '@shell/config/product/auth';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { globalRoleFilteringfn, clusterRoleFilteringfn, projectRoleFilteringfn } from '@shell/utils/roleFiltering'
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 const CLUSTER = SUBTYPE_MAPPING.CLUSTER.key;
@@ -99,15 +100,38 @@ export default {
 
   computed: {
     globalResources() {
-      return this.globalRoles;
+
+      let rolesList = globalRoleFilteringfn(this.globalRoles)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = this.globalRoles
+      }
+
+      return rolesList
     },
 
     clusterResources() {
-      return this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.CLUSTER.context);
+      const roleList = this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.CLUSTER.context);
+      
+      let rolesList = clusterRoleFilteringfn(roleList)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = roleList
+      }
+
+      return rolesList
     },
 
     namespaceResources() {
-      return this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.NAMESPACE.context);
+      const roleList = this.roleTemplates.filter((r) => r.context === SUBTYPE_MAPPING.NAMESPACE.context);
+            
+      let rolesList = projectRoleFilteringfn(roleList)
+      
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        rolesList = roleList
+      }
+
+      return rolesList
     },
 
     type() {

package/public/index.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="shortcut icon" type="image/x-icon" href="/favicon.png">
-    <title>HCI</title>
+    <title>云翼云管平台</title>
 </head>
 
 <body>

package/scripts/publish-shell.sh

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

package/types/shell/index.d.ts

@@ -4354,6 +4354,14 @@ export function deferred(name: any): {
 export function setPromiseResult(promise: any, obj: any, key: any, label: any): void;
 }
 
+// @shell/utils/roleFiltering
+
+declare module '@shell/utils/roleFiltering' {
+export function globalRoleFilteringfn(ary: any): any;
+export function clusterRoleFilteringfn(ary: any): any;
+export function projectRoleFilteringfn(ary: any): any;
+}
+
 // @shell/utils/router
 
 declare module '@shell/utils/router' {

package/utils/errorTranslate.json

@@ -1259,6 +1259,22 @@
       "pattern": "schedulevmbackup.cloudhci.io",
       "replacement": "虚拟机备份策略"
     },
+    {
+      "pattern": "clusterflow.logging.banzaicloud.io",
+      "replacement": "集群流"
+    },
+    {
+      "pattern": "clusteroutput.logging.banzaicloud.io",
+      "replacement": "集群输出"
+    },
+    {
+      "pattern": "flow.logging.banzaicloud.io",
+      "replacement": "流"
+    },
+    {
+      "pattern": "output.logging.banzaicloud.io",
+      "replacement": "输出"
+    },
     {
       "pattern": "spec.retain",
       "replacement": "保存数量"
@@ -1672,6 +1688,10 @@
       "pattern": " or ",
       "replacement": "或"
     },
+    {
+      "pattern": "is",
+      "replacement": "是"
+    },
     {
       "pattern": "parameters",
       "replacement": "参数"

package/utils/roleFiltering.js

@@ -0,0 +1,33 @@
+export function globalRoleFilteringfn (ary) {
+  const roleList = ['admin', 'tenant', 'safe-admin']
+  if (ary && ary.length > 0) {
+    return ary.filter(item => { return roleList.includes(item.id) })
+  }
+  return []
+}
+
+export function clusterRoleFilteringfn (ary) {
+  const roleList = ['cluster-tenant']
+  if (ary && ary.length > 0) {
+    ary.map(m => {
+      if (m.id === 'cluster-tenant') {
+        m['displayName'] = '租户'
+      }
+    })
+    return ary.filter(item => { return roleList.includes(item.id) })
+  }
+  return []
+}
+
+export function projectRoleFilteringfn (ary) {
+  const roleList = ['project-tenant']
+  ary.map(m => {
+    if (m.id === 'project-tenant') {
+      m['displayName'] = '租户'
+    }
+  })
+  if (ary && ary.length > 0) {
+    return ary.filter(item => { return roleList.includes(item.id) })
+  }
+  return []
+}