Unverified Commit b621d2af authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Optimization-605][web] fix The alias is empty in several places

[Optimization-605][web] fix The alias is empty in several places
parents 03de2a8a df5b2ec1
...@@ -164,7 +164,7 @@ const StudioProcess = (props: any) => { ...@@ -164,7 +164,7 @@ const StudioProcess = (props: any) => {
const getClusterOptions = () => { const getClusterOptions = () => {
let itemList = []; let itemList = [];
for (let item of cluster) { for (let item of cluster) {
let tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias}</>); let tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option value={item.id} label={tag}> itemList.push(<Option value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
......
...@@ -51,7 +51,7 @@ const SessionForm: React.FC<UpdateFormProps> = (props) => { ...@@ -51,7 +51,7 @@ const SessionForm: React.FC<UpdateFormProps> = (props) => {
本地环境 本地环境
</Option>)]; </Option>)];
for(let item of cluster){ for(let item of cluster){
let tag =(<><Tag color={item.enabled?"processing":"error"}>{item.type}</Tag>{item.alias}</>); let tag =(<><Tag color={item.enabled?"processing":"error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option value={item.id} label={tag}> itemList.push(<Option value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
......
...@@ -17,7 +17,7 @@ const StudioJarSetting = (props: any) => { ...@@ -17,7 +17,7 @@ const StudioJarSetting = (props: any) => {
const getClusterConfigurationOptions = () => { const getClusterConfigurationOptions = () => {
const itemList = []; const itemList = [];
for (const item of clusterConfiguration) { for (const item of clusterConfiguration) {
const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias}</>); const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option key={item.id} value={item.id} label={tag}> itemList.push(<Option key={item.id} value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
...@@ -28,7 +28,7 @@ const StudioJarSetting = (props: any) => { ...@@ -28,7 +28,7 @@ const StudioJarSetting = (props: any) => {
const getJarOptions = () => { const getJarOptions = () => {
const itemList = []; const itemList = [];
for (const item of jars) { for (const item of jars) {
const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias}</>); const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option key={item.id} value={item.id} label={tag}> itemList.push(<Option key={item.id} value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
......
...@@ -20,7 +20,7 @@ const StudioSetting = (props: any) => { ...@@ -20,7 +20,7 @@ const StudioSetting = (props: any) => {
const getClusterOptions = () => { const getClusterOptions = () => {
const itemList = []; const itemList = [];
for (const item of sessionCluster) { for (const item of sessionCluster) {
const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias}</>); const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option key={item.id} value={item.id} label={tag}> itemList.push(<Option key={item.id} value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
...@@ -31,7 +31,7 @@ const StudioSetting = (props: any) => { ...@@ -31,7 +31,7 @@ const StudioSetting = (props: any) => {
const getClusterConfigurationOptions = () => { const getClusterConfigurationOptions = () => {
const itemList = []; const itemList = [];
for (const item of clusterConfiguration) { for (const item of clusterConfiguration) {
const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias}</>); const tag = (<><Tag color={item.enabled ? "processing" : "error"}>{item.type}</Tag>{item.alias === "" ? item.name : item.alias}</>);
itemList.push(<Option key={item.id} value={item.id} label={tag}> itemList.push(<Option key={item.id} value={item.id} label={tag}>
{tag} {tag}
</Option>) </Option>)
......
...@@ -91,7 +91,7 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props ...@@ -91,7 +91,7 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
rules={[{required: true, message: '请输入 hadoop 配置文件路径!'}]} rules={[{required: true, message: '请输入 hadoop 配置文件路径!'}]}
help="指定配置文件路径(末尾无/),需要包含以下文件:core-site.xml,hdfs-site.xml,yarn-site.xml" help="指定配置文件路径(末尾无/),需要包含以下文件:core-site.xml,hdfs-site.xml,yarn-site.xml"
> >
<Input placeholder="值如 /usr/local/dlink/conf"/> <Input placeholder="值如 /etc/hadoop/conf"/>
</Form.Item> </Form.Item>
<Divider orientation="left" plain>自定义配置(高优先级)</Divider> <Divider orientation="left" plain>自定义配置(高优先级)</Divider>
{buildConfig(HADOOP_CONFIG_LIST)} {buildConfig(HADOOP_CONFIG_LIST)}
...@@ -182,9 +182,9 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props ...@@ -182,9 +182,9 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
name="flinkConfigPath" name="flinkConfigPath"
label="配置文件路径" label="配置文件路径"
rules={[{required: true, message: '请输入 flink-conf.yaml 路径!'}]} rules={[{required: true, message: '请输入 flink-conf.yaml 路径!'}]}
help="指定 flink-conf.yaml 的具体路径" help="指定 flink-conf.yaml 的路径(末尾无/)"
> >
<Input placeholder="值如 /usr/local/dlink/conf/flink-conf.yaml"/> <Input placeholder="值如 /opt/module/flink/conf"/>
</Form.Item> </Form.Item>
<Divider orientation="left" plain>自定义配置(高优先级)</Divider> <Divider orientation="left" plain>自定义配置(高优先级)</Divider>
{buildConfig(FLINK_CONFIG_LIST)} {buildConfig(FLINK_CONFIG_LIST)}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment