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

package/assets/translations/zh-hans.yaml

@@ -3129,6 +3129,8 @@ logging:
     path: 路径
     overwriteExistingPath: 覆盖现有路径
   output:
+    output:
+      label: 输出
     buffer:
       label: 输出缓冲
     selectOutputs: 选择输出
@@ -3152,7 +3154,7 @@ logging:
     azurestorage: Azure Storage
     cloudwatch: Cloudwatch
     datadog: Datadog
-    file: 文件
+    file: File
     gcs: GCS
     kinesisStream: Kinesis Stream
     logdna: LogDNA
@@ -3264,6 +3266,18 @@ members:
     viewClusterCatalogs: 查看集群应用商店
     viewClusterMembers: 查看集群成员
     viewNodes: 查看节点
+    safe-admin:
+      label: 安全管理员
+      description: 负责用户、角色及基础配置管理，保障系统权限与安全策略的合规性。
+    project-tenant:
+      label: 租户
+      description: 租户可管理资源组及其中的虚机、网络等资源。
+    cluster-tenant:
+      label: 租户
+      description: 租户可管理资源组及其中的虚机、网络等资源。
+    tenant:
+      label: 租户
+      description: 租户可管理资源组及其中的虚机、网络等资源。
     owner:
       label: 所有者
       description: 所有者对集群和集群内的所有资源拥有完全的控制权。
@@ -3495,6 +3509,18 @@ monitoringReceiver:
   opsgenie:
     label: Opsgenie
     title: Opsgenie 配置
+  dingding:
+    label: 钉钉
+    title: 钉钉 配置
+  weixin:
+    label: 企业微信
+    title: 企业微信 配置
+  snmp:
+    label: SNMP
+    title: SNMP 配置
+  message:
+    label: 短信
+    title: 短信 配置
   pagerduty:
     label: PagerDuty
     title: PagerDuty 配置
@@ -4490,6 +4516,12 @@ projectMembers:
     description: 控制用户对项目的访问权限
     noDescription: 已创建用户 - 没有描述
     searchForMember: 搜索需要向其提供项目访问权限的成员
+    safe-admin:
+      label: 安全管理员
+      description: 负责用户、角色及基础配置管理，保障系统权限与安全策略的合规性。
+    tenant:
+      label: 租户
+      description: 租户可管理资源组及其中的虚机、网络等资源。
     owner:
       label: 所有者
       description: 所有者对项目和项目内的所有资源拥有完全的控制权限。
@@ -4753,6 +4785,9 @@ rbac:
         description: 无描述
     assignOnlyRole: 已分配该角色
     role:
+      cluster-tenant:
+        label: 租户
+        description: 租户可管理资源组及其中的虚机、网络等资源。
       admin:
         label: 管理员
         description: 管理员可以完全控制整个安装以及所有集群中的所有资源。
@@ -4762,6 +4797,12 @@ rbac:
       user-base:
         label: User-Base 用户
         description: User-Base 用户只拥有登录权限。
+      tenant:
+        label: 租户
+        description: 租户可管理资源组及其中的虚机、网络等资源。
+      safe-admin:
+        label: 安全管理员
+        description: 负责用户、角色及基础配置管理，保障系统权限与安全策略的合规性。
       clusters-create:
         label: 创建集群
         description: 允许用户创建集群，并成为该集群的所有者（owner）。普通用户默认拥有此权限。
@@ -6532,6 +6573,7 @@ model:
       label: Service Account 用户名
   projectMember:
     role:
+      tenant: 租户
       member: 成员
       owner: 所有者
       readonly: 只读用户
@@ -6627,6 +6669,10 @@ typeDescription:
   batch.cronjob: CronJob 创建 Job，然后按照重复调度来运行 Pod。该调度以标准的 Unix cron 格式表示，并使用 Kubernetes Control Plane 的时区（通常是 UTC）。
   batch.job: Job 创建一个或多个 Pod。 Job 通过运行 Pod 直到其成功退出，以可靠执行一次性任务。失败的 Pod 会自动被替换，直到达到指定的完成运行次数。Job 还可以并行运行多个 Pod，或作为批处理工作队列。
   pod: Pod 是你可以在 Kubernetes 中创建和管理的最小可部署计算单元。Pod 是一个或多个容器，具有共享的存储和网络资源以及运行容器的规范。
+  harvesterhci.io.logging.clusterflow: 用于配置集群范围内的日志采集与流转规则，可匹配多个资源组的日志，并将日志转发至指定的集群日志外发目标，实现全局级的日志统一管理与路由。
+  harvesterhci.io.logging.clusteroutput: 定义集群范围的日志输出目标，例如 Elasticsearch、Loki、S3、Kafka 等。可被多个集群日志配置引用，用于集中存储与分析集群级日志数据。
+  harvesterhci.io.logging.flow: 用于配置资源组（命名空间）内的日志采集与流转规则，仅作用于当前资源组内的日志，并将日志转发至对应的资源组日志外发目标，便于分组级的日志管理。
+  harvesterhci.io.logging.output: 定义资源组级别的日志输出目标，仅能被同一资源组下的日志配置引用，用于将该资源组内的日志发送至指定的存储或分析系统。
 typeLabel:
   management.cattle.io.project: |-
     {count, plural,
@@ -8075,3 +8121,13 @@ component:
         keyValue:
           noRows: 此资源上没有配置｛propertyName}.
           showConfiguration: 显示配置
+
+
+
+customConversion:
+  Tenant: 租户
+  Cluster Owner: 所有者
+  Project Owner: 项目负责人
+
+
+

package/components/GlobalRoleBindings.vue

@@ -103,21 +103,36 @@ export default {
         this.sortedRoles.global.push(...remainingGlobalRoles);
         // End sort of global roles
 
-        delete this.sortedRoles.builtin
-        delete this.sortedRoles.custom
+        if (!(sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin')) {
+          delete this.sortedRoles.builtin
+          delete this.sortedRoles.custom
+        }
 
         this.update();
       }
     } catch (e) { }
   },
   data() {
-    return {
-      // This not only identifies global roles but the order here is the order we want to display them in the UI
-      globalPermissions: [
+
+    let globalPermissions = [
+        'admin',
+        'safe-admin',
+        'tenant',
+      ]
+
+    if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+      globalPermissions = [
         'admin',
+        'safe-admin',
         'user',
         'user-base',
-      ],
+        'tenant',
+      ]
+    }
+
+    return {
+      // This not only identifies global roles but the order here is the order we want to display them in the UI
+      globalPermissions,
       globalRoleBindings:    null,
       sortedRoles:           null,
       selectedRoles:         [],

package/components/form/Members/ClusterPermissionsEditor.vue

@@ -143,30 +143,46 @@ export default {
       return [this.permissionGroup];
     },
     options() {
+
       const customRoles = this.customRoles.map((role) => ({
         label:       role.nameDisplay,
         description: role.description || role.metadata?.annotations?.[DESCRIPTION] || this.t('members.clusterPermissions.noDescription'),
         value:       role.id
       }));
 
-      return [
-        {
-          label:       this.t('members.clusterPermissions.owner.label'),
-          description: this.t('members.clusterPermissions.owner.description'),
-          value:       'owner'
-        },
-        {
-          label:       this.t('members.clusterPermissions.member.label'),
-          description: this.t('members.clusterPermissions.member.description'),
-          value:       'member'
-        },
-        ...customRoles,
-        // {
-        //   label:       this.t('members.clusterPermissions.custom.label'),
-        //   description: this.t('members.clusterPermissions.custom.description'),
-        //   value:       'custom'
-        // }
-      ];
+      let optionList =  [{
+        label:       this.t('members.clusterPermissions.cluster-tenant.label'),
+        description: this.t('members.clusterPermissions.cluster-tenant.description'),
+        value:       'cluster-tenant'
+      }];
+
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        optionList = [
+          {
+            label:       this.t('members.clusterPermissions.cluster-tenant.label'),
+            description: this.t('members.clusterPermissions.cluster-tenant.description'),
+            value:       'cluster-tenant'
+          },
+          {
+            label:       this.t('members.clusterPermissions.owner.label'),
+            description: this.t('members.clusterPermissions.owner.description'),
+            value:       'owner'
+          },
+          {
+            label:       this.t('members.clusterPermissions.member.label'),
+            description: this.t('members.clusterPermissions.member.description'),
+            value:       'member'
+          },
+          ...customRoles,
+          {
+            label:       this.t('members.clusterPermissions.custom.label'),
+            description: this.t('members.clusterPermissions.custom.description'),
+            value:       'custom'
+          }
+        ];
+      }
+
+      return optionList
     },
     principal() {
       const principalId = this.principalId.replace(/\//g, '%2F');

package/components/form/Members/MembershipEditor.vue

@@ -191,7 +191,7 @@ export default {
           :data-testid="`role-item-${i}`"
           class="col span-6 role"
         >
-          {{ row.value.roleDisplay }}
+          {{ $store.getters['i18n/withFallback'](`customConversion.${row.value.roleDisplay}`, row.value.roleDisplay) }}
         </div>
       </div>
     </template>

package/components/form/NameNsDescription.vue

@@ -176,6 +176,11 @@ export default {
     componentTestid: {
       type:    String,
       default: 'name-ns-description'
+    },
+
+    extraNamespaceOptions: {
+      type:    Array,
+      default: () => []
     }
   },
 
@@ -269,6 +274,16 @@ export default {
         });
       }
 
+      if (props.extraNamespaceOptions && props.extraNamespaceOptions.length > 0) {
+        props.extraNamespaceOptions.map(item => {
+          const objs = {
+            label: item,
+            value: item,
+          }
+          sortedByLabel.push(objs);
+        })
+      }
+
       const createButton = {
         label: t('namespace.createNamespace'),
         value: '',
@@ -514,9 +529,8 @@ export default {
     </div>
 
     <!-- 自定义插槽，可插入额外内容 -->
-     <div :class=" isDialog? 'namespace-item-row mb-20': 'col span-6'">
-       <slot name="customize" />
-     </div>
+    <slot name="customize" />
+
     <!-- <div
       v-show="!descriptionHidden"
       :data-testid="componentTestid + '-description'"

package/components/form/ProjectMemberEditor.vue

@@ -166,29 +166,44 @@ export default {
         value:       this.purifyOption(role.id),
       }));
 
-      return [
-        {
-          label:       this.t('projectMembers.projectPermissions.owner.label'),
-          description: this.t('projectMembers.projectPermissions.owner.description'),
-          value:       'owner'
-        },
-        {
-          label:       this.t('projectMembers.projectPermissions.member.label'),
-          description: this.t('projectMembers.projectPermissions.member.description'),
-          value:       'member'
-        },
-        {
-          label:       this.t('projectMembers.projectPermissions.readOnly.label'),
-          description: this.t('projectMembers.projectPermissions.readOnly.description'),
-          value:       'read-only'
-        },
-        ...customRoles,
-        {
-          label:       this.t('projectMembers.projectPermissions.custom.label'),
-          description: this.t('projectMembers.projectPermissions.custom.description'),
-          value:       'custom'
-        }
-      ];
+      let optionList =  [{
+        label:       this.t('members.clusterPermissions.project-tenant.label'),
+        description: this.t('members.clusterPermissions.project-tenant.description'),
+        value:       'project-tenant'
+      }];
+
+      if (sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+        optionList = [
+          {
+            label:       this.t('members.clusterPermissions.project-tenant.label'),
+            description: this.t('members.clusterPermissions.project-tenant.description'),
+            value:       'project-tenant'
+          },
+          {
+            label:       this.t('projectMembers.projectPermissions.owner.label'),
+            description: this.t('projectMembers.projectPermissions.owner.description'),
+            value:       'owner'
+          },
+          {
+            label:       this.t('projectMembers.projectPermissions.member.label'),
+            description: this.t('projectMembers.projectPermissions.member.description'),
+            value:       'member'
+          },
+          {
+            label:       this.t('projectMembers.projectPermissions.readOnly.label'),
+            description: this.t('projectMembers.projectPermissions.readOnly.description'),
+            value:       'read-only'
+          },
+          ...customRoles,
+          {
+            label:       this.t('projectMembers.projectPermissions.custom.label'),
+            description: this.t('projectMembers.projectPermissions.custom.description'),
+            value:       'custom'
+          }
+        ];
+      }
+
+      return optionList
     },
     customPermissionsUpdate() {
       return this.customPermissions.reduce((acc, customPermissionsItem) => {

package/components/form/SecretSelector.vue

@@ -210,31 +210,32 @@ export default {
 <template>
   <div
     class="secret-selector"
-    :class="{'show-key-selector': showKeySelector}"
   >
-    <div class="input-container">
+    <div :class="{'row': showKeySelector}" class="input-container">
       <!-- key by namespace to ensure label select current page is recreated on ns change -->
-      <ResourceLabeledSelect
-        :key="namespace"
-        v-model:value="name"
-        :disabled="!isView && disabled"
-        :label="secretNameLabel"
-        :mode="mode"
-        :resource-type="SECRET"
-        :in-store="inStore"
-        :paginated-resource-settings="paginateSecretsSetting"
-        :all-resources-settings="allSecretsSettings"
-      />
-      <LabeledSelect
-        v-if="showKeySelector"
-        :key="namespace"
-        v-model:value="key"
-        class="col span-6"
-        :disabled="isKeyDisabled"
-        :options="keys"
-        :label="keyNameLabel"
-        :mode="mode"
-      />
+      <div :class="{'col span-6': showKeySelector}">
+        <ResourceLabeledSelect
+          :key="namespace"
+          v-model:value="name"
+          :disabled="!isView && disabled"
+          :label="secretNameLabel"
+          :mode="mode"
+          :resource-type="SECRET"
+          :in-store="inStore"
+          :paginated-resource-settings="paginateSecretsSetting"
+          :all-resources-settings="allSecretsSettings"
+        />
+      </div>
+      <div v-if="showKeySelector" class="col span-6">
+        <LabeledSelect
+          :key="namespace"
+          v-model:value="key"
+          :disabled="isKeyDisabled"
+          :options="keys"
+          :label="keyNameLabel"
+          :mode="mode"
+        />
+      </div>
     </div>
   </div>
 </template>

package/components/nav/Group.vue

@@ -58,7 +58,8 @@ export default {
       '网络管理': 'icon-networks',
       '镜像管理': 'icon-imagelist',
       '资源管理': 'icon-sorcetype',
-      '运维管理': 'icon-monitoringandlogging'
+      '运维管理': 'icon-monitoringandlogging',
+      '日志管理': 'icon-new-Logging'
     }
     
 

package/components/nav/Header.vue

@@ -80,7 +80,7 @@ export default {
       ctx:                    this,
       showImportModal:        false,
       showSearchModal:        false,
-      userIcon:               require('@shell/assets/images/logo.png'),
+      userIcon:               require('@shell/assets/images/logo.svg'),
     };
   },
 
@@ -277,14 +277,14 @@ export default {
 
   methods: {
 
-    LogOutfn (type) {
-      sessionStorage.removeItem('TOPLEVELPERMISSIONS')
+    LogOutfn(type) {
+      sessionStorage.removeItem('TOPLEVELPERMISSIONS');
       if (type === '1') {
-        this.$router.push({ name: 'account'})
+        this.$router.push({ name: 'account' });
       } else if (type === '2') {
-        this.showSloModal()
+        this.showSloModal();
       } else if (type === '3') {
-        this.$router.push(this.generateLogoutRoute)
+        this.$router.push(this.generateLogoutRoute);
       }
     },
 
@@ -413,14 +413,12 @@ export default {
 </script>
 
 <template>
-
   <!-- 整个页面的顶部 header -->
   <header
     ref="header"
     data-testid="header"
   >
     <div>
-
       <!-- 顶部一级菜单（根据不同产品/集群条件决定是否显示） -->
       <TopLevelMenu v-if="isRancherInHarvester || isMultiCluster || !isSingleProduct" />
     </div>
@@ -432,20 +430,18 @@ export default {
         v-if="isSingleProduct && !isRancherInHarvester"
         :to="singleProductLogoRoute"
       >
-
         <!-- 显示用户头像或 logo 图片 -->
         <img
           :src="userIcon"
         >
       </router-link>
     </div>
-    
+
     <!-- ===== 中间占位符（把左右内容分开） ===== -->
     <div class="spacer" />
 
     <!-- ===== 右侧功能区域 ===== -->
     <div class="rd-header-right">
-
       <!-- 动态插入右侧自定义组件（例如插件扩展的 header） -->
       <component :is="navHeaderRight" />
 
@@ -454,10 +450,9 @@ export default {
         v-if="showFilter"
         class="top"
       >
-
         <!-- 如果集群就绪 + 当前产品支持命名空间过滤器 或 Explorer 模式 -->
         <NamespaceFilter v-if="clusterReady && currentProduct && (currentProduct.showNamespaceFilter || isExplorer)" />
-        
+
         <!-- 否则显示工作空间切换器 -->
         <WorkspaceSwitcher v-else-if="clusterReady && currentProduct && currentProduct.showWorkspaceSwitcher" />
       </div>
@@ -467,10 +462,8 @@ export default {
         v-if="currentCluster && !simple"
         class="header-buttons"
       >
-
         <!-- 如果当前产品支持集群切换器 -->
         <template v-if="currentProduct && currentProduct.showClusterSwitcher">
-
           <!-- 导入 YAML 按钮 -->
           <!-- <button
             v-if="showImportYaml"
@@ -533,7 +526,7 @@ export default {
             :aria-label="t('nav.kubeconfig.copy')"
             @click="copyKubeConfig($event)"
           >
-            
+
             <i
               v-if="kubeConfigCopying"
               class="icon icon-checkmark icon-lg"
@@ -575,8 +568,7 @@ export default {
           :trigger-focus-trap="true"
           return-focus-selector="#header-btn-search"
           @close="hideSearch()"
-        >
-        </app-modal>
+        />
       </div>
 
       <!-- ===== 插件扩展按钮区 ===== -->
@@ -584,30 +576,33 @@ export default {
         v-if="extensionHeaderActions.length"
         class="header-buttons"
       >
-      <template v-for="action, i in extensionHeaderActions" :key="`${action.label}${i}`">
-        <!-- kubectl-explain.action | 2025/9/30隐藏 -->
-        <button
-          v-if="action.labelKey !== 'kubectl-explain.action'"
-          v-clean-tooltip="handleExtensionTooltip(action)"
-          v-shortkey="action.shortcutKey"
-          :disabled="action.enabled ? !action.enabled(ctx) : false"
-          type="button"
-          class="btn header-btn role-tertiary"
-          :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
-          role="button"
-          tabindex="0"
-          :aria-label="action.label"
-          @shortkey="handleExtensionAction(action, $event)"
-          @click="handleExtensionAction(action, $event)"
+        <template
+          v-for="action, i in extensionHeaderActions"
+          :key="`${action.label}${i}`"
         >
-          <IconOrSvg
-            class="icon icon-lg"
-            :icon="action.icon"
-            :src="action.svg"
-            color="header"
-          />
-        </button>
-      </template>
+          <!-- kubectl-explain.action | 2025/9/30隐藏 -->
+          <button
+            v-if="action.labelKey !== 'kubectl-explain.action'"
+            v-clean-tooltip="handleExtensionTooltip(action)"
+            v-shortkey="action.shortcutKey"
+            :disabled="action.enabled ? !action.enabled(ctx) : false"
+            type="button"
+            class="btn header-btn role-tertiary"
+            :data-testid="`extension-header-action-${ action.labelKey || action.label }`"
+            role="button"
+            tabindex="0"
+            :aria-label="action.label"
+            @shortkey="handleExtensionAction(action, $event)"
+            @click="handleExtensionAction(action, $event)"
+          >
+            <IconOrSvg
+              class="icon icon-lg"
+              :icon="action.icon"
+              :src="action.svg"
+              color="header"
+            />
+          </button>
+        </template>
       </div>
 
       <!-- ===== 用户菜单（右上角头像 + 下拉） ===== -->
@@ -618,7 +613,6 @@ export default {
           v-if="showUserMenu"
           :aria-label="t('nav.userMenu.label')"
         >
-          
           <!-- 头像触发按钮 -->
           <rc-dropdown-trigger
             ghost
@@ -638,7 +632,10 @@ export default {
               v-else
               class="icon icon-user icon-3x avatar"
             /> -->
-            <i class="icon icon-usericon" style="padding-bottom: 5px;" />
+            <i
+              class="icon icon-usericon"
+              style="padding-bottom: 5px;"
+            />
             <span class="login-name">{{ principal.loginName }}</span>
           </rc-dropdown-trigger>
 

package/config/private-label.js

@@ -58,8 +58,7 @@ export function matches(pl) {
 }
 
 export function getVendor() {
-
-  return 'HCI';
+  return '云翼云管平台';
 }
 // export function getVendor() {
 //   if ( vendor === SETTING.PL_RANCHER_VALUE ) {
@@ -84,7 +83,7 @@ export function setTitle() {
   if (v === 'Harvester') {
     const ico = require(`~shell/assets/images/pl/harvester.png`);
 
-    document.title = 'HCI';
+    document.title = '云翼云管平台';
     const link = document.createElement('link');
 
     link.hid = 'icon';

package/config/product/uiplugins.js

@@ -5,14 +5,17 @@ export const NAME = 'uiplugins';
 export function init(store) {
   const { product } = DSL(store, NAME);
 
-  // Add a product for UI Plugins - will appear in the top-level menu
-  product({
-    ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
-    inStore:             'management',
-    icon:                'extension',
-    removable:           false,
-    showClusterSwitcher: false,
-    category:            'configuration',
-    weight:              50,
-  });
+  if (sessionStorage.getItem('TOPLEVELPERMISSIONS') && sessionStorage.getItem('TOPLEVELPERMISSIONS') === 'superadmin') {
+    // Add a product for UI Plugins - will appear in the top-level menu
+    product({
+      ifHave:              IF_HAVE.ADMIN, // Only admins can see the UI Plugin Custom Resource by default
+      inStore:             'management',
+      icon:                'extension',
+      removable:           false,
+      showClusterSwitcher: false,
+      category:            'configuration',
+      weight:              50,
+    });
+  }
+
 }

package/edit/logging-flow/index.vue

@@ -418,10 +418,9 @@ export default {
           class="mt-0"
           :label="t('logging.flow.matches.banner')"
         />
-        <div v-if="isHarvester">
+        <div class="mb-20" v-if="isHarvester">
           <LabeledSelect
             v-model:value="loggingType"
-            class="mb-20"
             :options="flowTypeOptions"
             :mode="mode"
             :disabled="!isCreate"