diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 6321231..3eb3c8b 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -51,14 +51,14 @@
:is="command.component"
v-model="argvLocal"
:command="command"
- class="col"
+ class="col q-mt-sm"
v-bind="command.componentProps || {}"
/>
-
@@ -71,7 +71,7 @@
import { defineComponent, inject } from "vue";
import { validateVariableName } from "js/common/variableValidator";
import VariableInput from "./ui/VariableInput.vue";
-import MultiParamInput from "./ui/MultiParamInput.vue";
+import MultiParams from "./ui/MultiParams.vue";
import CommandHead from "./card/CommandHead.vue";
import * as CardComponents from "js/composer/cardComponents";
@@ -79,7 +79,7 @@ export default defineComponent({
name: "ComposerCard",
components: {
VariableInput,
- MultiParamInput,
+ MultiParams,
CommandHead,
...CardComponents,
},
@@ -362,7 +362,6 @@ export default defineComponent({
display: grid;
grid-template-rows: 1fr;
transition: grid-template-rows 0.2s cubic-bezier(0.4, 0, 0.2, 1);
- margin-top: 8px;
}
.command-content {
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 3a21672..f1907e9 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -5,6 +5,8 @@
:icon="isAllCollapsed ? 'unfold_more' : 'unfold_less'"
dense
flat
+ rounded
+ size="9px"
@click="$emit('action', isAllCollapsed ? 'expandAll' : 'collapseAll')"
>
{{ isAllCollapsed ? "展开所有" : "折叠所有" }}
diff --git a/src/components/composer/ui/FunctionSelector.vue b/src/components/composer/ui/FunctionSelector.vue
deleted file mode 100644
index 656b7fb..0000000
--- a/src/components/composer/ui/FunctionSelector.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
diff --git a/src/components/composer/ui/MultiParamInput.vue b/src/components/composer/ui/MultiParamInput.vue
deleted file mode 100644
index 5436eb3..0000000
--- a/src/components/composer/ui/MultiParamInput.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/composer/ui/MultiParams.vue b/src/components/composer/ui/MultiParams.vue
new file mode 100644
index 0000000..01ec09c
--- /dev/null
+++ b/src/components/composer/ui/MultiParams.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index 6baf159..da20447 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -4,9 +4,6 @@ import { defineAsyncComponent } from "vue";
export const KeyEditor = defineAsyncComponent(() =>
import("components/composer/ui/KeyEditor.vue")
);
-export const FunctionSelector = defineAsyncComponent(() =>
- import("components/composer/ui/FunctionSelector.vue")
-);
// Control Flow Components
export const ConditionalJudgment = defineAsyncComponent(() =>
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index fdb1e10..9355b21 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -4,7 +4,7 @@ import { systemCommands } from "./systemCommands";
import { notifyCommands } from "./notifyCommands";
import { textProcessingCommands } from "./textProcessingCommands";
import { otherCommands } from "./otherCommands";
-import { keyCommands } from "./keyCommands";
+import { simulateCommands } from "./simulateCommands";
import { controlCommands } from "./controlCommands";
export const commandCategories = [
@@ -15,5 +15,5 @@ export const commandCategories = [
textProcessingCommands,
controlCommands,
otherCommands,
- keyCommands,
+ simulateCommands,
];
diff --git a/src/js/composer/commands/keyCommands.js b/src/js/composer/commands/keyCommands.js
deleted file mode 100644
index 40e4275..0000000
--- a/src/js/composer/commands/keyCommands.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const keyCommands = {
- label: "按键操作",
- icon: "keyboard",
- defaultOpened: false,
- commands: [
- {
- value: "keyTap",
- label: "模拟按键",
- config: [],
- component: "KeyEditor",
- },
- ],
-};
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
new file mode 100644
index 0000000..e271b9a
--- /dev/null
+++ b/src/js/composer/commands/simulateCommands.js
@@ -0,0 +1,81 @@
+export const simulateCommands = {
+ label: "模拟操作",
+ icon: "keyboard",
+ defaultOpened: false,
+ commands: [
+ {
+ value: "keyTap",
+ label: "模拟按键",
+ config: [],
+ component: "KeyEditor",
+ },
+ {
+ value: "utools",
+ label: "鼠标点击",
+ allowEmptyArgv: true,
+ config: [
+ {
+ label: "X坐标(留空则原地点击)",
+ icon: "drag_handle",
+ type: "input",
+ inputType: "number",
+ width: 8,
+ },
+ {
+ label: "Y坐标(留空则原地点击)",
+ icon: "drag_handle",
+ type: "input",
+ inputType: "number",
+ width: 8,
+ },
+ ],
+ functionSelector: {
+ selectLabel: "鼠标动作",
+ options: [
+ {
+ label: "单击",
+ value: "utools.simulateMouseClick",
+ },
+ {
+ label: "右击",
+ value: "utools.simulateMouseRightClick",
+ },
+ {
+ label: "双击",
+ value: "utools.simulateMouseDoubleClick",
+ },
+ ],
+ width: 2,
+ allowEmptyArgv: true,
+ },
+ },
+ {
+ value: "utools.simulateMouseMove",
+ label: "鼠标移动",
+ config: [
+ {
+ label: "X坐标",
+ icon: "drag_handle",
+ defaultValue: 0,
+ type: "input",
+ inputType: "number",
+ width: 8,
+ },
+ {
+ label: "Y坐标",
+ icon: "drag_handle",
+ defaultValue: 0,
+ type: "input",
+ inputType: "number",
+ width: 8,
+ },
+ ],
+ },
+ {
+ value: "utools.getCursorScreenPoint",
+ label: "获取鼠标坐标",
+ config: [],
+ allowEmptyArgv: true,
+ },
+ ],
+};
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index ca63678..b5ba46b 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -33,7 +33,7 @@ export const systemCommands = {
value: "electron.clipboard.readText",
label: "获取剪贴板内容",
config: [],
- icon: "content_copy",
+ allowEmptyArgv: true,
},
],
};
diff --git a/src/js/composer/commands/textProcessingCommands.js b/src/js/composer/commands/textProcessingCommands.js
index aaa62ac..6f815d3 100644
--- a/src/js/composer/commands/textProcessingCommands.js
+++ b/src/js/composer/commands/textProcessingCommands.js
@@ -8,9 +8,15 @@ export const textProcessingCommands = {
label: "编解码",
desc: "文本编解码",
icon: "code",
- component: "FunctionSelector",
- componentProps: {
- inputLabel: "要编解码的文本",
+ config: [
+ {
+ label: "要编解码的文本",
+ icon: "text_fields",
+ type: "input",
+ width: 8,
+ },
+ ],
+ functionSelector: {
selectLabel: "编解码方式",
options: [
{
@@ -40,6 +46,7 @@ export const textProcessingCommands = {
value: "quickcomposer.textProcessing.htmlDecode",
},
],
+ width: 3,
},
},
{
@@ -57,9 +64,15 @@ export const textProcessingCommands = {
label: "哈希计算",
desc: "计算文本的哈希值",
icon: "enhanced_encryption",
- component: "FunctionSelector",
- componentProps: {
- inputLabel: "要计算哈希的文本",
+ config: [
+ {
+ label: "要计算哈希的文本",
+ icon: "text_fields",
+ type: "input",
+ width: 8,
+ },
+ ],
+ functionSelector: {
selectLabel: "哈希算法",
options: [
{ label: "MD5", value: "quickcomposer.textProcessing.md5Hash" },
@@ -69,6 +82,7 @@ export const textProcessingCommands = {
{ label: "SM3", value: "quickcomposer.textProcessing.sm3Hash" },
],
},
+ width: 3,
},
{
value: "quickcomposer.textProcessing.reverseString",