已合并
【修改描述】双主机增加tooltip提示 #223
duyuanyuan创建于 2025年11月20日
【修改描述】双主机增加tooltip提示 #223
已合并
从已删除 :main合入到openUBMC/webuimain
共 2 个文件变更+98-17
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "webui", | 2 | "name": "webui", |
| 3 | "type": "configuration", | 3 | "type": "configuration", |
| 4 | - "version": "1.90.83", | 4 | + "version": "1.90.84", |
| 5 | "author": "Huawei", | 5 | "author": "Huawei", |
| 6 | "license": "Mulan PSL v2", | 6 | "license": "Mulan PSL v2", |
| 7 | "dependencies": { | 7 | "dependencies": { |
| @@ -121,7 +121,9 @@ function virtualClick(id: string, host?: number) { | |||
| 121 | if (host === 1 || host === 2) { | 121 | if (host === 1 || host === 2) { |
| 122 | openKVM('Exclusive', host); | 122 | openKVM('Exclusive', host); |
| 123 | } | 123 | } |
| 124 | - } else if (!isPrivateDisabledTwo()) { | 124 | + } |
| 125 | + } else if (id === VirtualBtnId.h5Only2) { | ||
| 126 | + if (!isPrivateDisabledTwo()) { | ||
| 125 | if (host === 1 || host === 2) { | 127 | if (host === 1 || host === 2) { |
| 126 | openKVM('Exclusive', host); | 128 | openKVM('Exclusive', host); |
| 127 | } | 129 | } |
| @@ -140,7 +142,9 @@ function virtualClick(id: string, host?: number) { | |||
| 140 | if (host === 1 || host === 2) { | 142 | if (host === 1 || host === 2) { |
| 141 | openKVM('Shared', host); | 143 | openKVM('Shared', host); |
| 142 | } | 144 | } |
| 143 | - } else if (!isSharedDisabledTwo()) { | 145 | + } |
| 146 | + } else if (id === VirtualBtnId.h5Share2) { | ||
| 147 | + if (!isSharedDisabledTwo()) { | ||
| 144 | if (host === 1 || host === 2) { | 148 | if (host === 1 || host === 2) { |
| 145 | openKVM('Shared', host); | 149 | openKVM('Shared', host); |
| 146 | } | 150 | } |
| @@ -365,7 +369,13 @@ function searchKvmActiveStatus(): void { | |||
| 365 | <div id="html5Console" class="html virtual-item"> | 369 | <div id="html5Console" class="html virtual-item"> |
| 366 | <div class="console-img html5-img" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? '' : 'margin'"></div> | 370 | <div class="console-img html5-img" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? '' : 'margin'"></div> |
| 367 | <el-divider class="console-divider" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? 'mv-20' : 'mr-24'" direction="vertical"></el-divider> | 371 | <el-divider class="console-divider" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? 'mv-20' : 'mr-24'" direction="vertical"></el-divider> |
| 368 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 372 | + <el-tooltip |
| 373 | + v-if="SystemIds.length === 2" | ||
| 374 | + :content="$t('HOME_HOST_0')" | ||
| 375 | + placement="top" | ||
| 376 | + trigger-keys> | ||
| 377 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 378 | + </el-tooltip> | ||
| 369 | <div class="console-select"> | 379 | <div class="console-select"> |
| 370 | <el-tooltip | 380 | <el-tooltip |
| 371 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 381 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -406,7 +416,12 @@ function searchKvmActiveStatus(): void { | |||
| 406 | <div id="html5Console2" class="html virtual-item"> | 416 | <div id="html5Console2" class="html virtual-item"> |
| 407 | <div class="console-img html5-img" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? '' : 'margin'"></div> | 417 | <div class="console-img html5-img" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? '' : 'margin'"></div> |
| 408 | <el-divider class="console-divider" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? 'mv-20' : 'mr-24'" direction="vertical"></el-divider> | 418 | <el-divider class="console-divider" :class="SystemIds.length === 2 && virtualOptions.java[0].show ? 'mv-20' : 'mr-24'" direction="vertical"></el-divider> |
| 409 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 419 | + <el-tooltip |
| 420 | + :content="$t('HOME_HOST_1')" | ||
| 421 | + placement="top" | ||
| 422 | + trigger-keys> | ||
| 423 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 424 | + </el-tooltip> | ||
| 410 | <div class="console-select"> | 425 | <div class="console-select"> |
| 411 | <el-select | 426 | <el-select |
| 412 | v-addId.select="'html5Select'" | 427 | v-addId.select="'html5Select'" |
| @@ -516,7 +531,13 @@ function searchKvmActiveStatus(): void { | |||
| 516 | <div id="html5ConsoleStandardSm" class="html virtual-item"> | 531 | <div id="html5ConsoleStandardSm" class="html virtual-item"> |
| 517 | <div class="console-img home-style-icon-HTML standard-icon-style"></div> | 532 | <div class="console-img home-style-icon-HTML standard-icon-style"></div> |
| 518 | <el-divider class="console-divider" direction="vertical"></el-divider> | 533 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 519 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 534 | + <el-tooltip |
| 535 | + v-if="SystemIds.length === 2" | ||
| 536 | + :content="$t('HOME_HOST_0')" | ||
| 537 | + placement="top" | ||
| 538 | + trigger-keys> | ||
| 539 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 540 | + </el-tooltip> | ||
| 520 | <div class="console-select"> | 541 | <div class="console-select"> |
| 521 | <el-tooltip | 542 | <el-tooltip |
| 522 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 543 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -557,7 +578,12 @@ function searchKvmActiveStatus(): void { | |||
| 557 | <div id="html5Console2" class="html virtual-item"> | 578 | <div id="html5Console2" class="html virtual-item"> |
| 558 | <div class="console-img home-style-icon-HTML standard-icon-style"></div> | 579 | <div class="console-img home-style-icon-HTML standard-icon-style"></div> |
| 559 | <el-divider class="console-divider" direction="vertical"></el-divider> | 580 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 560 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 581 | + <el-tooltip |
| 582 | + :content="$t('HOME_HOST_1')" | ||
| 583 | + placement="top" | ||
| 584 | + trigger-keys> | ||
| 585 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 586 | + </el-tooltip> | ||
| 561 | <div class="console-select"> | 587 | <div class="console-select"> |
| 562 | <el-select | 588 | <el-select |
| 563 | v-addId.select="'html5Select'" | 589 | v-addId.select="'html5Select'" |
| @@ -669,7 +695,13 @@ function searchKvmActiveStatus(): void { | |||
| 669 | <div id="html5Console" class="html virtual-item"> | 695 | <div id="html5Console" class="html virtual-item"> |
| 670 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> | 696 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> |
| 671 | <el-divider class="console-divider" direction="vertical"></el-divider> | 697 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 672 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 698 | + <el-tooltip |
| 699 | + v-if="SystemIds.length === 2" | ||
| 700 | + :content="$t('HOME_HOST_0')" | ||
| 701 | + placement="top" | ||
| 702 | + trigger-keys> | ||
| 703 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 704 | + </el-tooltip> | ||
| 673 | <div class="console-select"> | 705 | <div class="console-select"> |
| 674 | <el-tooltip | 706 | <el-tooltip |
| 675 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 707 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -710,7 +742,12 @@ function searchKvmActiveStatus(): void { | |||
| 710 | <div id="html5Console2" class="html virtual-item"> | 742 | <div id="html5Console2" class="html virtual-item"> |
| 711 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> | 743 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> |
| 712 | <el-divider class="console-divider" direction="vertical"></el-divider> | 744 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 713 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 745 | + <el-tooltip |
| 746 | + :content="$t('HOME_HOST_1')" | ||
| 747 | + placement="top" | ||
| 748 | + trigger-keys> | ||
| 749 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 750 | + </el-tooltip> | ||
| 714 | <div class="console-select"> | 751 | <div class="console-select"> |
| 715 | <el-select | 752 | <el-select |
| 716 | v-addId.select="'html5Select'" | 753 | v-addId.select="'html5Select'" |
| @@ -820,7 +857,13 @@ function searchKvmActiveStatus(): void { | |||
| 820 | <div id="html5Console" class="html virtual-item"> | 857 | <div id="html5Console" class="html virtual-item"> |
| 821 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> | 858 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> |
| 822 | <el-divider class="console-divider" direction="vertical"></el-divider> | 859 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 823 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 860 | + <el-tooltip |
| 861 | + v-if="SystemIds.length === 2" | ||
| 862 | + :content="$t('HOME_HOST_0')" | ||
| 863 | + placement="top" | ||
| 864 | + trigger-keys> | ||
| 865 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 866 | + </el-tooltip> | ||
| 824 | <div class="console-select"> | 867 | <div class="console-select"> |
| 825 | <el-tooltip | 868 | <el-tooltip |
| 826 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 869 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -861,7 +904,12 @@ function searchKvmActiveStatus(): void { | |||
| 861 | <div id="html5Console2" class="html virtual-item"> | 904 | <div id="html5Console2" class="html virtual-item"> |
| 862 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> | 905 | <div class="console-img home-style-icon-HTML ibma-icon-style"></div> |
| 863 | <el-divider class="console-divider" direction="vertical"></el-divider> | 906 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 864 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 907 | + <el-tooltip |
| 908 | + :content="$t('HOME_HOST_1')" | ||
| 909 | + placement="top" | ||
| 910 | + trigger-keys> | ||
| 911 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 912 | + </el-tooltip> | ||
| 865 | <div class="console-select"> | 913 | <div class="console-select"> |
| 866 | <el-select | 914 | <el-select |
| 867 | v-addId.select="'html5Select'" | 915 | v-addId.select="'html5Select'" |
| @@ -972,7 +1020,13 @@ function searchKvmActiveStatus(): void { | |||
| 972 | <div id="html5Console" class="html virtual-item"> | 1020 | <div id="html5Console" class="html virtual-item"> |
| 973 | <div class="console-img home-style-icon-HTML simple-icon-style"></div> | 1021 | <div class="console-img home-style-icon-HTML simple-icon-style"></div> |
| 974 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1022 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 975 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 1023 | + <el-tooltip |
| 1024 | + v-if="SystemIds.length === 2" | ||
| 1025 | + :content="$t('HOME_HOST_0')" | ||
| 1026 | + placement="top" | ||
| 1027 | + trigger-keys> | ||
| 1028 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 1029 | + </el-tooltip> | ||
| 976 | <div class="console-select"> | 1030 | <div class="console-select"> |
| 977 | <el-tooltip | 1031 | <el-tooltip |
| 978 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 1032 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -1013,7 +1067,12 @@ function searchKvmActiveStatus(): void { | |||
| 1013 | <div id="html5Console2" class="html virtual-item"> | 1067 | <div id="html5Console2" class="html virtual-item"> |
| 1014 | <div class="console-img home-style-icon-HTML simple-icon-style"></div> | 1068 | <div class="console-img home-style-icon-HTML simple-icon-style"></div> |
| 1015 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1069 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 1016 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 1070 | + <el-tooltip |
| 1071 | + :content="$t('HOME_HOST_1')" | ||
| 1072 | + placement="top" | ||
| 1073 | + trigger-keys> | ||
| 1074 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 1075 | + </el-tooltip> | ||
| 1017 | <div class="console-select"> | 1076 | <div class="console-select"> |
| 1018 | <el-select | 1077 | <el-select |
| 1019 | v-addId.select="'html5Select'" | 1078 | v-addId.select="'html5Select'" |
| @@ -1123,7 +1182,13 @@ function searchKvmActiveStatus(): void { | |||
| 1123 | <div id="html5Console" class="html virtual-item"> | 1182 | <div id="html5Console" class="html virtual-item"> |
| 1124 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> | 1183 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> |
| 1125 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1184 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 1126 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 1185 | + <el-tooltip |
| 1186 | + v-if="SystemIds.length === 2" | ||
| 1187 | + :content="$t('HOME_HOST_0')" | ||
| 1188 | + placement="top" | ||
| 1189 | + trigger-keys> | ||
| 1190 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 1191 | + </el-tooltip> | ||
| 1127 | <div class="console-select"> | 1192 | <div class="console-select"> |
| 1128 | <el-tooltip | 1193 | <el-tooltip |
| 1129 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 1194 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -1164,7 +1229,12 @@ function searchKvmActiveStatus(): void { | |||
| 1164 | <div id="html5Console2" class="html virtual-item"> | 1229 | <div id="html5Console2" class="html virtual-item"> |
| 1165 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> | 1230 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> |
| 1166 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1231 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 1167 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 1232 | + <el-tooltip |
| 1233 | + :content="$t('HOME_HOST_1')" | ||
| 1234 | + placement="top" | ||
| 1235 | + trigger-keys> | ||
| 1236 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 1237 | + </el-tooltip> | ||
| 1168 | <div class="console-select"> | 1238 | <div class="console-select"> |
| 1169 | <el-select | 1239 | <el-select |
| 1170 | v-addId.select="'html5Select'" | 1240 | v-addId.select="'html5Select'" |
| @@ -1254,7 +1324,13 @@ function searchKvmActiveStatus(): void { | |||
| 1254 | <div id="html5Console" class="html virtual-item"> | 1324 | <div id="html5Console" class="html virtual-item"> |
| 1255 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> | 1325 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> |
| 1256 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1326 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 1257 | - <p v-if="SystemIds.length === 2" class="console-host">{{ $t('HOME_HOST_0') }}</p> | 1327 | + <el-tooltip |
| 1328 | + v-if="SystemIds.length === 2" | ||
| 1329 | + :content="$t('HOME_HOST_0')" | ||
| 1330 | + placement="top" | ||
| 1331 | + trigger-keys> | ||
| 1332 | + <p class="console-host">{{ $t('HOME_HOST_0') }}</p> | ||
| 1333 | + </el-tooltip> | ||
| 1258 | <div class="console-select"> | 1334 | <div class="console-select"> |
| 1259 | <el-tooltip | 1335 | <el-tooltip |
| 1260 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" | 1336 | v-if="SystemIds.length !== 2 || (SystemIds.length !== 2 && virtualOptions.java[0].show)" |
| @@ -1295,7 +1371,12 @@ function searchKvmActiveStatus(): void { | |||
| 1295 | <div id="html5Console2" class="html virtual-item"> | 1371 | <div id="html5Console2" class="html virtual-item"> |
| 1296 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> | 1372 | <div class="console-img home-style-icon-HTML beautiful-icon-style"></div> |
| 1297 | <el-divider class="console-divider" direction="vertical"></el-divider> | 1373 | <el-divider class="console-divider" direction="vertical"></el-divider> |
| 1298 | - <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | 1374 | + <el-tooltip |
| 1375 | + :content="$t('HOME_HOST_1')" | ||
| 1376 | + placement="top" | ||
| 1377 | + trigger-keys> | ||
| 1378 | + <p class="console-host">{{ $t('HOME_HOST_1') }}</p> | ||
| 1379 | + </el-tooltip> | ||
| 1299 | <div class="console-select"> | 1380 | <div class="console-select"> |
| 1300 | <el-select | 1381 | <el-select |
| 1301 | v-addId.select="'html5Select'" | 1382 | v-addId.select="'html5Select'" |