From d2c3b7999ce1d1b7f48f39c896b5f9ef177fc699 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 22:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=89=AA=E8=B4=B4=E6=9D=BF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=BE=E7=89=87=E3=80=81html=E3=80=81rtf=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |   2 +-
 .../composer/common/ArrayEditor.vue           |   8 +-
 .../composer/simulate/KeyEditor.vue           | 116 +++++++++++++++---
 src/components/popup/ResultMenu.vue           |  19 ++-
 src/js/composer/commands/index.js             |   2 +
 src/js/composer/commands/systemCommands.js    |  26 +++-
 src/js/composer/commands/uiCommands.js        |   4 +-
 src/js/composer/commands/userdataCommands.js  |  61 +++++++++
 8 files changed, 203 insertions(+), 35 deletions(-)
 create mode 100644 src/js/composer/commands/userdataCommands.js

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 9c3bc99..9069eb4 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -57,7 +57,7 @@
               v-model="localCommand"
               :class="
                 localCommand.config?.length || localCommand.functionSelector
-                  ? 'col q-mt-sm'
+                  ? 'col q-mt-md'
                   : 'col'
               "
             />
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index 41af7fc..e44639b 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -1,7 +1,7 @@
 <template>
   <component
-    :is="!!label ? 'BorderLabel' : 'div'"
-    :label="label"
+    :is="!!topLabel ? 'BorderLabel' : 'div'"
+    :label="topLabel"
     :icon="icon"
     :model-value="isCollapse"
   >
@@ -143,6 +143,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    topLabel: {
+      type: String,
+      default: "",
+    },
     icon: {
       type: String,
       default: "",
diff --git a/src/components/composer/simulate/KeyEditor.vue b/src/components/composer/simulate/KeyEditor.vue
index 73cba38..89ee876 100644
--- a/src/components/composer/simulate/KeyEditor.vue
+++ b/src/components/composer/simulate/KeyEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="key-editor">
-    <div class="row items-center q-gutter-x-sm full-width">
+    <div class="row items-center q-gutter-x-sm full-width q-mb-sm">
       <!-- 按键选择/输入区域 -->
       <q-select
         ref="mainKeyInput"
@@ -16,20 +16,21 @@
         map-options
         options-dense
         behavior="menu"
-        class="col q-px-sm"
+        class="col"
+        :input-style="{
+          textAlign: 'center',
+        }"
         placeholder="选择或输入按键"
         @update:model-value="handleKeyInput"
         @input="handleInput"
       >
         <template v-slot:prepend>
           <!-- 修饰键 -->
-          <div class="row items-center q-gutter-x-xs no-wrap">
+          <div class="row items-center q-gutter-x-xs no-wrap q-pa-sm">
             <q-chip
               v-for="(active, key) in argvs.modifiers"
               :key="key"
-              :color="active ? 'primary' : 'grey-4'"
-              :text-color="active ? 'white' : 'grey-7'"
-              dense
+              :class="{ 'modifier-chip-active': active }"
               clickable
               class="modifier-chip"
               @click="toggleModifier(key)"
@@ -49,6 +50,9 @@
             {{ mainKeyDisplay }}
           </q-badge>
         </template>
+        <template v-slot:append>
+          
+        </template>
       </q-select>
       <!-- 录制按钮 -->
       <q-btn
@@ -62,17 +66,54 @@
         <q-tooltip>{{ isRecording ? "停止录制" : "开始录制" }}</q-tooltip>
       </q-btn>
     </div>
+    <!-- 按键控制区 -->
+    <div class="row q-gutter-x-sm full-width">
+      <!-- 重复次数 -->
+      <div class="col">
+        <number-input
+          v-model="argvs.repeatCount"
+          label="重复次数"
+          icon="repeat"
+          @update:model-value="(val) => updateValue({ repeatCount: val })"
+        />
+      </div>
+
+      <!-- 重复间隔 -->
+      <div class="col">
+        <number-input
+          v-model="argvs.repeatInterval"
+          label="重复间隔(ms)"
+          icon="timer"
+          :disable="argvs.repeatCount <= 1"
+          @update:model-value="(val) => updateValue({ repeatInterval: val })"
+        />
+      </div>
+
+      <!-- 按键后延迟 -->
+      <div class="col">
+        <number-input
+          v-model="argvs.keyDelay"
+          label="按键后延迟(ms)"
+          icon="hourglass_empty"
+          @update:model-value="(val) => updateValue({ keyDelay: val })"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import { defineComponent } from "vue";
+import NumberInput from "../common/NumberInput.vue";
 
 // 检测操作系统
 const isMac = window.utools.isMacOs();
 
 export default defineComponent({
   name: "KeyEditor",
+  components: {
+    NumberInput,
+  },
   props: {
     modelValue: {
       type: Object,
@@ -91,6 +132,9 @@ export default defineComponent({
           shift: false,
           command: false,
         },
+        repeatCount: 1,
+        repeatInterval: 0,
+        keyDelay: 0,
       },
       modifierLabels: isMac
         ? {
@@ -284,6 +328,19 @@ export default defineComponent({
         .map((key) => (!isMac && key === "command" ? "meta" : key));
 
       const args = [argvs.mainKey, ...activeModifiers];
+
+      // 添加重复次数、间隔和延迟参数
+      const options = {};
+      if (argvs.repeatCount > 1) options.repeatCount = argvs.repeatCount;
+      if (argvs.repeatInterval > 0)
+        options.repeatInterval = argvs.repeatInterval;
+      if (argvs.keyDelay > 0) options.keyDelay = argvs.keyDelay;
+
+      if (Object.keys(options).length > 0) {
+        return `${this.modelValue.value}("${args.join(
+          '","'
+        )}", ${JSON.stringify(options)})`;
+      }
       return `${this.modelValue.value}("${args.join('","')}")`;
     },
     updateValue(argv) {
@@ -302,22 +359,40 @@ export default defineComponent({
       if (!code) return argvs;
       try {
         // 移除 keyTap 和引号
-        const cleanVal = val.replace(/^keyTap\("/, "").replace(/"\)$/, "");
+        const cleanVal = code.replace(/^keyTap\("/, "").replace(/"\)$/, "");
         // 分割并移除每个参数的引号
-        const args = cleanVal
+        const parts = cleanVal.split(/,\s*/);
+        const keyParts = parts[0]
           .split('","')
           .map((arg) => arg.replace(/^"|"$/g, ""));
-        if (args.length > 0) {
-          argvs.mainKey = args[0];
+
+        if (keyParts.length > 0) {
+          argvs.mainKey = keyParts[0];
           Object.keys(argvs.modifiers).forEach((key) => {
             // 在非 Mac 系统上，将 meta 转换为 command
-            const modKey = !isMac && args.includes("meta") ? "command" : key;
-            argvs.modifiers[key] = args.includes(modKey);
+            const modKey =
+              !isMac && keyParts.includes("meta") ? "command" : key;
+            argvs.modifiers[key] = keyParts.includes(modKey);
           });
-          return argvs;
         }
+
+        // 解析选项对象
+        if (parts.length > 1) {
+          try {
+            const options = JSON.parse(parts[1]);
+            if (options.repeatCount) argvs.repeatCount = options.repeatCount;
+            if (options.repeatInterval)
+              argvs.repeatInterval = options.repeatInterval;
+            if (options.keyDelay) argvs.keyDelay = options.keyDelay;
+          } catch (e) {
+            console.warn("Failed to parse key options:", e);
+          }
+        }
+
+        return argvs;
       } catch (e) {
         console.error("Failed to parse key string:", e);
+        return argvs;
       }
     },
     handleKeyInput(val) {
@@ -360,14 +435,21 @@ export default defineComponent({
 </script>
 
 <style scoped>
-.key-editor {
-  padding: 4px 0;
-}
-
 .modifier-chip {
   height: 24px;
   font-size: 13px;
   margin: 0 2px;
+  border-radius: 8px;
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.modifier-chip-active {
+  background-color: var(--q-primary) !important;
+  color: white;
+}
+
+.body--dark .modifier-chip {
+  background-color: rgba(44, 44, 44, 0.5);
 }
 
 .main-key {
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index 0ebcddb..fe734de 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -1,8 +1,13 @@
 <template>
   <q-btn-group :stretch="stretch" class="text-primary">
-    <q-btn icon="image" @click="dataUrlToImg" v-show="imagebtn" dense size="sm"
-      ><q-tooltip v-if="!dense">将 DataUrl 转为图片</q-tooltip></q-btn
-    >
+    <q-btn
+      icon="image"
+      label="转为图片"
+      @click="dataUrlToImg"
+      v-show="imagebtn"
+      dense
+      size="sm"
+    ></q-btn>
     <q-btn
       icon="content_paste"
       @click="copyResult"
@@ -14,13 +19,7 @@
     <q-btn icon="send" size="sm" @click="sendResult" v-show="textbtn" dense
       ><q-tooltip v-if="!dense">发送到活动窗口</q-tooltip></q-btn
     >
-    <q-btn
-      icon="close"
-      v-close-popup
-      v-show="closebtn"
-      dense
-      size="sm"
-    />
+    <q-btn icon="close" v-close-popup v-show="closebtn" dense size="sm" />
   </q-btn-group>
 </template>
 
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 072f2a7..c2f1fe8 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -9,6 +9,7 @@ import { controlCommands } from "./controlCommands";
 import { uiCommands } from "./uiCommands";
 import { codingCommands } from "./codingCommand";
 import { mathCommands } from "./mathCommands";
+import { userdataCommands } from "./userdataCommands";
 
 export const commandCategories = [
   fileCommands,
@@ -21,5 +22,6 @@ export const commandCategories = [
   uiCommands,
   simulateCommands,
   mathCommands,
+  userdataCommands,
   otherCommands,
 ];
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 9e4caf4..62b321a 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -18,10 +18,30 @@ export const systemCommands = {
     {
       value: "electron.clipboard.readText",
       label: "获取剪贴板内容",
-      config: [],
-      outputVariable: "clipboardText",
+      outputVariable: "clipboardContent",
       saveOutput: true,
-      allowEmptyArgv: true,
+      functionSelector: [
+        {
+          value: "electron.clipboard.readText",
+          label: "剪贴板文本",
+          icon: "content_copy",
+        },
+        {
+          value: "quickcommand.readClipboardImage",
+          label: "剪贴板图片",
+          icon: "image",
+        },
+        {
+          value: "electron.clipboard.readRTF",
+          label: "剪贴板RTF",
+          icon: "text_snippet",
+        },
+        {
+          value: "electron.clipboard.readHTML",
+          label: "剪贴板HTML",
+          icon: "web",
+        },
+      ],
     },
     {
       value: "quickcomposer.system.exec",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index fa3ab71..71fc24d 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -13,7 +13,7 @@ export const uiCommands = {
       saveOutput: true,
       config: [
         {
-          label: "按钮组",
+          label: "按钮",
           type: "arrayEditor",
           defaultValue: [
             newVarInputVal("str", "是"),
@@ -55,7 +55,7 @@ export const uiCommands = {
         {
           label: "标题",
           type: "varInput",
-          defaultValue: newVarInputVal("str", "请选择"),
+          defaultValue: newVarInputVal("str"),
           width: 12,
         },
       ],
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
new file mode 100644
index 0000000..d3dbcfd
--- /dev/null
+++ b/src/js/composer/commands/userdataCommands.js
@@ -0,0 +1,61 @@
+export const userdataCommands = {
+  label: "用户数据",
+  icon: "folder_shared",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcommand.userData.get",
+      label: "获取用户数据",
+      icon: "database",
+      config: [
+        {
+          label: "数据标识",
+          type: "input",
+        },
+      ],
+      outputVariable: "userData",
+      saveOutput: true,
+    },
+    {
+      value: "quickcommand.userData.all",
+      label: "获取所有用户数据",
+      icon: "database",
+      outputVariable: "userDatas",
+      saveOutput: true,
+    },
+    {
+      value: "quickcommand.userData.put",
+      label: "设置用户数据",
+      icon: "database",
+      config: [
+        {
+          label: "数据",
+          type: "varInput",
+          width: 7,
+        },
+        {
+          label: "数据标识",
+          type: "input",
+          width: 3,
+        },
+        {
+          label: "不同步",
+          type: "checkbox",
+          defaultValue: true,
+          width: 2,
+        },
+      ],
+    },
+    {
+      value: "quickcommand.userData.del",
+      label: "删除用户数据",
+      icon: "database",
+      config: [
+        {
+          label: "数据标识",
+          type: "input",
+        },
+      ],
+    },
+  ],
+};