From 036b6fa934af047592b271650a609b996a3bae64 Mon Sep 17 00:00:00 2001 From: fofolee Date: Thu, 9 Jan 2025 16:37:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=80=89=E6=8B=A9=E5=AF=B9=E8=AF=9D=E6=A1=86=EF=BC=8C?= =?UTF-8?q?VarInput=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9ECheckGroup=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/lib/quickcomposer.js | 1 + plugin/lib/quickcomposer/ui/dialog.js | 50 +++++ plugin/lib/quickcomposer/ui/index.js | 6 + src/components/composer/ComposerCard.vue | 1 - src/components/composer/MultiParams.vue | 1 - .../composer/common/ArrayEditor.vue | 35 +++- .../composer/common/BorderLabel.vue | 16 +- src/components/composer/common/CheckGroup.vue | 181 ++++++++++++++++++ src/components/composer/common/DictEditor.vue | 4 + src/components/composer/common/ParamInput.vue | 45 ++--- .../composer/common/VariableInput.vue | 118 ++++++++++-- .../composer/system/SystemCommandEditor.vue | 2 +- src/js/composer/commands/uiCommands.js | 105 ++++++++++ src/js/composer/formatString.js | 2 +- 14 files changed, 507 insertions(+), 60 deletions(-) create mode 100644 plugin/lib/quickcomposer/ui/dialog.js create mode 100644 plugin/lib/quickcomposer/ui/index.js create mode 100644 src/components/composer/common/CheckGroup.vue diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js index bec8553..3c3d650 100644 --- a/plugin/lib/quickcomposer.js +++ b/plugin/lib/quickcomposer.js @@ -6,6 +6,7 @@ const quickcomposer = { network: require("./quickcomposer/network"), coding: require("./quickcomposer/coding"), math: require("./quickcomposer/math"), + ui: require("./quickcomposer/ui"), }; module.exports = quickcomposer; diff --git a/plugin/lib/quickcomposer/ui/dialog.js b/plugin/lib/quickcomposer/ui/dialog.js new file mode 100644 index 0000000..f7e5f09 --- /dev/null +++ b/plugin/lib/quickcomposer/ui/dialog.js @@ -0,0 +1,50 @@ +const showSaveDialog = ( + title, + defaultPath, + buttonLabel, + message, + extensions, + properties +) => { + return window.utools.showSaveDialog({ + title, + defaultPath, + buttonLabel, + message, + properties, + filters: [ + { + name: "文件", + extensions, + }, + ], + }); +}; + +const showOpenDialog = ( + title, + defaultPath, + buttonLabel, + message, + extensions, + properties +) => { + return window.utools.showOpenDialog({ + title, + defaultPath, + buttonLabel, + message, + properties, + filters: [ + { + name: "文件", + extensions, + }, + ], + }); +}; + +module.exports = { + showSaveDialog, + showOpenDialog, +}; diff --git a/plugin/lib/quickcomposer/ui/index.js b/plugin/lib/quickcomposer/ui/index.js new file mode 100644 index 0000000..6f9a811 --- /dev/null +++ b/plugin/lib/quickcomposer/ui/index.js @@ -0,0 +1,6 @@ +const { showSaveDialog, showOpenDialog } = require("./dialog"); + +module.exports = { + showSaveDialog, + showOpenDialog, +}; diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue index bd06483..d24de26 100644 --- a/src/components/composer/ComposerCard.vue +++ b/src/components/composer/ComposerCard.vue @@ -197,7 +197,6 @@ export default defineComponent({ .composer-card .command-item { transition: none !important; transform: none !important; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05) !important; } .command-item { diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue index 9e169d8..b0d0de6 100644 --- a/src/components/composer/MultiParams.vue +++ b/src/components/composer/MultiParams.vue @@ -113,7 +113,6 @@ export default defineComponent({ * 变量模式stringify后,null变成'null', ''保持'' */ const stringifiedArgvs = argvs.map((argv) => stringifyArgv(argv)); - /* 空值处理: * 1. 去掉 undefined,'', null * 2. varInput在字符串模式下,留空为'""',所以不会被处理 diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue index e44639b..d5e27c8 100644 --- a/src/components/composer/common/ArrayEditor.vue +++ b/src/components/composer/common/ArrayEditor.vue @@ -17,9 +17,11 @@ ]" > ({}), }, + placeholder: { + type: String, + default: "", + }, }, emits: ["update:modelValue"], computed: { @@ -169,9 +196,9 @@ export default defineComponent({ return ( this.options?.keys?.map((key) => { return { + ...key, value: key.value || key, label: key.label || key, - width: key.width, }; }) || [] ); diff --git a/src/components/composer/common/BorderLabel.vue b/src/components/composer/common/BorderLabel.vue index bf05328..3bbc9b8 100644 --- a/src/components/composer/common/BorderLabel.vue +++ b/src/components/composer/common/BorderLabel.vue @@ -1,20 +1,18 @@