fix(connection): show global timeout help on Windows

This commit is contained in:
zipg authored and GitHub committed 2026-08-19 15:08:31 +08:00
1 parent be171e9976
commit ca8f6cd967
2 files changed
+14 -19

No files matched your search

@@ -8154,14 +8154,9 @@ function openExternalUrl(url: string) {
<input id="connect-timeout-global" v-model="form.connect_timeout_inherit" type="radio" name="connect-timeout-scope" :value="true" class="h-3.5 w-3.5 shrink-0 accent-primary" /> <input id="connect-timeout-global" v-model="form.connect_timeout_inherit" type="radio" name="connect-timeout-scope" :value="true" class="h-3.5 w-3.5 shrink-0 accent-primary" />
<div class="flex min-w-0 flex-1 items-center gap-1"> <div class="flex min-w-0 flex-1 items-center gap-1">
<label for="connect-timeout-global" class="min-w-0 cursor-pointer truncate text-xs" :title="t('connection.useGlobalQueryTimeout')">{{ t("connection.useGlobalQueryTimeout") }}</label> <label for="connect-timeout-global" class="min-w-0 cursor-pointer truncate text-xs" :title="t('connection.useGlobalQueryTimeout')">{{ t("connection.useGlobalQueryTimeout") }}</label>
<Tooltip> <HelpTooltip :label="t('connection.globalConnectTimeoutHint')" content-class="max-w-[280px]">
<TooltipTrigger as-child> {{ t("connection.globalConnectTimeoutHint") }}
<CircleHelp class="h-3.5 w-3.5 shrink-0 cursor-help text-muted-foreground hover:text-foreground" /> </HelpTooltip>
</TooltipTrigger>
<TooltipContent side="top" align="center" class="max-w-[280px] text-xs leading-relaxed">
{{ t("connection.globalConnectTimeoutHint") }}
</TooltipContent>
</Tooltip>
</div> </div>
<Input <Input
v-model.number="editGlobalConnectTimeoutSecs" v-model.number="editGlobalConnectTimeoutSecs"
@@ -8204,14 +8199,9 @@ function openExternalUrl(url: string) {
<input id="query-timeout-global" v-model="form.query_timeout_inherit" type="radio" name="query-timeout-scope" :value="true" class="h-3.5 w-3.5 shrink-0 accent-primary" /> <input id="query-timeout-global" v-model="form.query_timeout_inherit" type="radio" name="query-timeout-scope" :value="true" class="h-3.5 w-3.5 shrink-0 accent-primary" />
<div class="flex min-w-0 flex-1 items-center gap-1"> <div class="flex min-w-0 flex-1 items-center gap-1">
<label for="query-timeout-global" class="min-w-0 cursor-pointer truncate text-xs" :title="t('connection.useGlobalQueryTimeout')">{{ t("connection.useGlobalQueryTimeout") }}</label> <label for="query-timeout-global" class="min-w-0 cursor-pointer truncate text-xs" :title="t('connection.useGlobalQueryTimeout')">{{ t("connection.useGlobalQueryTimeout") }}</label>
<Tooltip> <HelpTooltip :label="t('connection.globalQueryTimeoutHint')" content-class="max-w-[280px]">
<TooltipTrigger as-child> {{ t("connection.globalQueryTimeoutHint") }}
<CircleHelp class="h-3.5 w-3.5 shrink-0 cursor-help text-muted-foreground hover:text-foreground" /> </HelpTooltip>
</TooltipTrigger>
<TooltipContent side="top" align="center" class="max-w-[280px] text-xs leading-relaxed">
{{ t("connection.globalQueryTimeoutHint") }}
</TooltipContent>
</Tooltip>
</div> </div>
<Input v-model.number="editGlobalQueryTimeoutSecs" type="number" min="0" :max="MAX_QUERY_TIMEOUT_SECS" step="1" class="col-span-2 h-7 w-full shrink-0 sm:col-span-1 sm:w-20" :disabled="form.query_timeout_inherit !== true" @input="clampQueryTimeoutInput($event, 'global')" /> <Input v-model.number="editGlobalQueryTimeoutSecs" type="number" min="0" :max="MAX_QUERY_TIMEOUT_SECS" step="1" class="col-span-2 h-7 w-full shrink-0 sm:col-span-1 sm:w-20" :disabled="form.query_timeout_inherit !== true" @input="clampQueryTimeoutInput($event, 'global')" />
</div> </div>
@@ -25,8 +25,13 @@ describe("ConnectionDialog timeout controls", () => {
expect(dialogSource).not.toContain("Number(config.connect_timeout_secs)"); expect(dialogSource).not.toContain("Number(config.connect_timeout_secs)");
}); });
it("shows range help beside both global timeout labels", () => { it("uses button-backed help tooltips beside both global timeout labels", () => {
expect(dialogSource).toContain('t("connection.globalConnectTimeoutHint")'); const connectGlobalControl = dialogSource.slice(dialogSource.indexOf('id="connect-timeout-global"'), dialogSource.indexOf('id="connect-timeout-connection"'));
expect(dialogSource).toContain('t("connection.globalQueryTimeoutHint")'); const queryGlobalControl = dialogSource.slice(dialogSource.indexOf('id="query-timeout-global"'), dialogSource.indexOf('id="query-timeout-connection"'));
expect(connectGlobalControl).toContain(`<HelpTooltip :label="t('connection.globalConnectTimeoutHint')"`);
expect(queryGlobalControl).toContain(`<HelpTooltip :label="t('connection.globalQueryTimeoutHint')"`);
expect(connectGlobalControl).not.toContain("<TooltipTrigger");
expect(queryGlobalControl).not.toContain("<TooltipTrigger");
}); });
}); });