Skip to content

Commit

Permalink
feat(frontend): 资源规格管理新增RedisCluster和Redis主从 #3484
Browse files Browse the repository at this point in the history
  • Loading branch information
3octaves authored and zhangzhw8 committed Mar 8, 2024
1 parent 42aa9a4 commit 3bbddfc
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
1 change: 1 addition & 0 deletions dbm-ui/frontend/src/locales/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -2752,5 +2752,6 @@
"必须大于当前节点数": "必须大于当前节点数",
"当前Shard数量": "当前 Shard 数量",
"目标主机": "目标主机",
"Redis主从": "Redis 主从",
"这行勿动!新增翻译请在上一行添加!": ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export type RedisFunctions =
| 'PredixyTendisplusCluster'
| 'TwemproxyRedisInstance'
| 'TwemproxyTendisSSDInstance'
| 'PredixyRedisCluster'
| 'RedisInstance'
| 'toolbox';
export type BigdataFunctions = 'es' | 'kafka' | 'hdfs' | 'influxdb' | 'pulsar' | 'riak';
export type MonitorFunctions = 'duty_rule' | 'monitor_policy' | 'notice_group';
Expand Down Expand Up @@ -50,7 +52,7 @@ interface ControllerData {
bigdata: ControllerItem<BigdataFunctions>;
monitor: ControllerItem<MonitorFunctions>;
mongodb: ControllerItem<MongoFunctions>;
sqlserver: ControllerItem<SqlServerFunctions>
sqlserver: ControllerItem<SqlServerFunctions>;
}

export type ExtractedControllerDataKeys = Extract<keyof ControllerData, string>;
Expand Down
6 changes: 5 additions & 1 deletion dbm-ui/frontend/src/styles/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@
background-color: #F0F1F5;
}
}

}
}
}
Expand Down Expand Up @@ -716,3 +715,8 @@
}
}

.bk-tab-header-nav::-webkit-scrollbar {
display: unset !important;
width: 4px !important;
height: 4px !important;
}
26 changes: 26 additions & 0 deletions dbm-ui/frontend/src/views/resource-manage/spec/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,32 @@
},
],
},
{
moduleId: 'redis',
label: 'RedisCluster',
name: ClusterTypes.PREDIXY_REDIS_CLUSTER,
children: [
{
label: t('后端存储机型'),
name: 'tendiscache',
},
{
label: t('Proxy机型'),
name: 'predixy',
},
],
},
{
moduleId: 'redis',
label: t('Redis主从'),
name: ClusterTypes.REDIS_INSTANCE,
children: [
{
label: t('后端存储机型'),
name: 'tendiscache',
},
],
},
{
moduleId: 'bigdata',
label: 'ES',
Expand Down

0 comments on commit 3bbddfc

Please sign in to comment.