mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-17 23:45:59 +00:00
fixed command palette
This commit is contained in:
@@ -114,8 +114,8 @@
|
||||
($visibleCommandPalette == 'database'
|
||||
? extractDbItems($databaseInfo, { conid, database }, $connectionList)
|
||||
: parentCommand
|
||||
? parentCommand.getSubCommands()
|
||||
: sortedComands
|
||||
? parentCommand.getSubCommands()
|
||||
: sortedComands
|
||||
).filter(x => !x.isGroupCommand),
|
||||
{
|
||||
extract: x => _tval(x.text),
|
||||
@@ -163,10 +163,10 @@
|
||||
on:clickOutside={() => {
|
||||
$visibleCommandPalette = null;
|
||||
}}
|
||||
data-testid='CommandPalette_main'
|
||||
data-testid="CommandPalette_main"
|
||||
>
|
||||
<div
|
||||
class="overlay"
|
||||
<div
|
||||
class="overlay"
|
||||
on:click={() => {
|
||||
$visibleCommandPalette = null;
|
||||
}}
|
||||
|
||||
@@ -45,7 +45,9 @@ export default function registerCommand(command: GlobalCommand) {
|
||||
[command.id]: {
|
||||
text:
|
||||
isDefferedTranslationResult(command.category) || isDefferedTranslationResult(command.name)
|
||||
? () => `${_tval(command.category)}: ${_tval(command.name)}`
|
||||
? {
|
||||
_transCallback: () => `${_tval(command.category)}: ${_tval(command.name)}`,
|
||||
}
|
||||
: `${command.category}: ${command.name}`,
|
||||
...command,
|
||||
enabled: !testEnabled,
|
||||
|
||||
@@ -84,8 +84,9 @@ export function _t(key: string, options: TranslateOptions): string {
|
||||
}
|
||||
|
||||
export type DefferedTranslationResult = {
|
||||
_transKey: string;
|
||||
_transOptions: TranslateOptions;
|
||||
_transKey?: string;
|
||||
_transOptions?: TranslateOptions;
|
||||
_transCallback?: () => string;
|
||||
};
|
||||
|
||||
export function __t(key: string, options: TranslateOptions): DefferedTranslationResult {
|
||||
@@ -100,6 +101,10 @@ export function _tval(x: string | DefferedTranslationResult): string {
|
||||
if (typeof x?._transKey === 'string') {
|
||||
return _t(x._transKey, x._transOptions);
|
||||
}
|
||||
if (typeof x?._transCallback === 'function') {
|
||||
return x._transCallback();
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
export function isDefferedTranslationResult(
|
||||
|
||||
Reference in New Issue
Block a user