From bfa0f58956db25d70fdf089bddf7fbcc0cc29a29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Dec 2024 04:28:25 +0000
Subject: [PATCH 001/332] Bump braces from 3.0.2 to 3.0.3

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d7375ee..b92d00aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3174,12 +3174,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -5316,9 +5316,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -13528,12 +13528,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browserslist": {
@@ -15136,9 +15136,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"

From a13580d53f5c8ef44a5a18c970eece91c26fdd5f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 7 Jan 2025 17:50:13 +0800
Subject: [PATCH 002/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E4=B8=BA=E7=A9=BA=E5=92=8C=E4=BC=A0=E9=80=92=E7=A9=BA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       |  82 ++++-
 .../composer/common/NumberInput.vue           |   8 +-
 src/components/composer/common/ParamInput.vue |  16 +
 src/js/composer/commands/dataCommands.js      | 288 +++++++++---------
 src/js/composer/commands/simulateCommands.js  |  37 ++-
 src/js/composer/formatString.js               |  29 +-
 ...\347\233\256\350\257\264\346\230\216.json" |  14 +-
 7 files changed, 275 insertions(+), 199 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index c0324b68..7904ba67 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -4,7 +4,7 @@
       v-if="hasFunctionSelector"
       :model-value="funcName"
       @update:model-value="funcName = $event"
-      :options="localCommand.functionSelector?.options"
+      :options="localCommand.functionSelector"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
   </div>
@@ -40,17 +40,22 @@ export default defineComponent({
     },
     // 特定函数独有参数配置
     functionConfig() {
-      return (
-        this.modelValue.functionSelector?.options.find(
-          (item) => item.value === this.funcName
-        )?.config || []
-      );
+      return this.getSelectFunction()?.config || [];
     },
     localConfig() {
       return [...this.commonConfig, ...this.functionConfig].map((item) => {
+        const value =
+          item.type === "varInput"
+            ? item.defaultValue || {
+                value: "",
+                isString: true,
+                __varInputVal__: true,
+              }
+            : // 其他类型情况复杂，不做判断，没有默认值返回undefined
+              item.defaultValue;
         return {
           ...item,
-          value: item.defaultValue,
+          value,
         };
       });
     },
@@ -62,7 +67,20 @@ export default defineComponent({
         return this.modelValue.value;
       },
       set(value) {
-        this.updateModelValue(value, this.defaultArgvs);
+        // 构建新的参数数组
+        const newArgvs = [];
+
+        // 保留通用配置的参数值
+        this.commonConfig.forEach((_, index) => {
+          newArgvs[index] = this.argvs[index];
+        });
+
+        // 使用新选择的函数独有配置的默认值
+        this.getSelectFunction(value)?.config?.forEach((config, index) => {
+          newArgvs[this.commonConfig.length + index] = config.defaultValue;
+        });
+
+        this.updateModelValue(value, newArgvs);
       },
     },
     argvs() {
@@ -75,6 +93,11 @@ export default defineComponent({
     },
   },
   methods: {
+    getSelectFunction(funcName = this.funcName) {
+      return this.modelValue.functionSelector?.find(
+        (item) => item.value === funcName
+      );
+    },
     updateArgv(index, value) {
       const newArgvs = [...this.argvs];
       newArgvs[index] = value;
@@ -82,10 +105,41 @@ export default defineComponent({
       this.updateModelValue(this.funcName, newArgvs);
     },
     generateCode(funcName, argvs) {
-      const newArgvs = argvs
-        .map((argv) => stringifyArgv(argv))
-        .filter((item) => item != null && item !== "");
-      return `${funcName}(${newArgvs.join(",")})`;
+      console.log("argvs", argvs);
+      /**
+       * 字符串模式stringfiy后，null会变成'"null"', ''变成'""'
+       * 变量模式stringify后，null变成'null', ''保持''
+       */
+      const stringifiedArgvs = argvs.map((argv) => stringifyArgv(argv));
+
+      /* 空值处理：
+       * 1. 去掉 undefined，'', null
+       * 2. varInput在字符串模式下，留空为'""'，所以不会被处理
+       * 3. 变量模式下，留空是'', 会被过滤
+       * 4. 如果想传递空字符串，将varInput切为字符串模式并留空
+       * 5. 如果不想传递对应参数，将varInput切为变量模式并留空
+       * 6. 如果想传递空参数，将varInput切为变量模式并设置为null或undefined
+
+       * [undefined, undefined] -> funcName()
+       * [undefined, 1] -> ''
+       * [1, undefined] -> funcName(1)
+       * [null, 1] -> funcName(null, 1)
+       * [1, 字符串模式下varInput留空] -> funcName(1, "")
+       * [1, 变量模式下varInput留空] -> funcName(1)
+       * [1, 变量模式下varInput设置为null] -> funcName(1, null)
+       */
+      // 空参数后面跟着非空参数，不生成代码
+      const isEmpty = (v) => v === undefined || v === "" || v === null;
+      for (let i = 0; i < stringifiedArgvs.length - 1; i++) {
+        if (isEmpty(stringifiedArgvs[i]) && !isEmpty(stringifiedArgvs[i + 1])) {
+          return "";
+        }
+      }
+
+      // 过滤空参数，由于前面已经对处于非空参数中间的空参数做了处理，这里直接过滤空参数不会对参数顺序造成影响
+      const finalArgvs = stringifiedArgvs.filter((v) => !isEmpty(v));
+
+      return `${funcName}(${finalArgvs.join(",")})`;
     },
     parseCodeToArgvs(code) {
       let argvs = window.lodashM.cloneDeep(this.defaultArgvs);
@@ -110,9 +164,7 @@ export default defineComponent({
     },
     getSummary(argvs) {
       // 虽然header里对溢出做了处理，但是这里截断主要是为了节省存储空间
-      const funcNameLabel = this.localCommand.functionSelector?.options.find(
-        (option) => option.value === this.funcName
-      )?.label;
+      const funcNameLabel = this.getSelectFunction()?.label;
       const subFeature = funcNameLabel ? `${funcNameLabel} ` : "";
       const allArgvs = argvs
         .filter((item) => item != null && item != "")
diff --git a/src/components/composer/common/NumberInput.vue b/src/components/composer/common/NumberInput.vue
index 4645d973..17a74d3c 100644
--- a/src/components/composer/common/NumberInput.vue
+++ b/src/components/composer/common/NumberInput.vue
@@ -67,13 +67,17 @@ export default defineComponent({
         return this.modelValue;
       },
       set(value) {
-        this.$emit("update:modelValue", value);
+        if (value === null || value === undefined || value === "") {
+          this.$emit("update:modelValue", null);
+        } else {
+          this.$emit("update:modelValue", value);
+        }
       },
     },
   },
   methods: {
     updateNumber(delta) {
-      this.$emit("update:modelValue", this.localValue + delta);
+      this.$emit("update:modelValue", (this.localValue || 0) + delta);
     },
   },
 });
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 29fbf954..9f9ba04b 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -43,6 +43,8 @@
       <q-select
         v-else-if="config.type === 'select'"
         filled
+        emit-value
+        map-options
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
         :options="config.options"
@@ -113,9 +115,16 @@ export default defineComponent({
   emits: ["update"],
   methods: {
     getColumnStyle(width = 12) {
+      if (width === "auto") {
+        return {
+          flex: "1 1 0%",
+          minWidth: "0",
+        };
+      }
       const columnWidth = (width / 12) * 100;
       return {
         width: `calc(${columnWidth}% - var(--grid-gap))`,
+        flex: "0 0 auto",
       };
     },
   },
@@ -134,11 +143,18 @@ export default defineComponent({
 .grid-item {
   min-width: 50px;
   margin-bottom: 0;
+  display: flex;
+}
+
+.grid-item > * {
+  flex: 1;
+  min-width: 0;
 }
 
 @media (max-width: 600px) {
   .grid-item {
     width: 100% !important;
+    flex: 1 1 100% !important;
   }
 }
 </style>
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 41f72f0d..10678d71 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -17,50 +17,48 @@ export const dataCommands = {
           type: "varInput",
         },
       ],
-      functionSelector: {
-        options: [
-          {
-            label: "Base64编码",
-            value: "quickcomposer.data.base64Encode",
-            icon: "title",
-          },
-          {
-            label: "Base64解码",
-            value: "quickcomposer.data.base64Decode",
-            icon: "title",
-          },
-          {
-            label: "十六进制编码",
-            value: "quickcomposer.data.hexEncode",
-            icon: "code",
-          },
-          {
-            label: "十六进制解码",
-            value: "quickcomposer.data.hexDecode",
-            icon: "code",
-          },
-          {
-            label: "URL编码",
-            value: "quickcomposer.data.urlEncode",
-            icon: "link",
-          },
-          {
-            label: "URL解码",
-            value: "quickcomposer.data.urlDecode",
-            icon: "link",
-          },
-          {
-            label: "HTML编码",
-            value: "quickcomposer.data.htmlEncode",
-            icon: "html",
-          },
-          {
-            label: "HTML解码",
-            value: "quickcomposer.data.htmlDecode",
-            icon: "html",
-          },
-        ],
-      },
+      functionSelector: [
+        {
+          label: "Base64编码",
+          value: "quickcomposer.data.base64Encode",
+          icon: "title",
+        },
+        {
+          label: "Base64解码",
+          value: "quickcomposer.data.base64Decode",
+          icon: "title",
+        },
+        {
+          label: "十六进制编码",
+          value: "quickcomposer.data.hexEncode",
+          icon: "code",
+        },
+        {
+          label: "十六进制解码",
+          value: "quickcomposer.data.hexDecode",
+          icon: "code",
+        },
+        {
+          label: "URL编码",
+          value: "quickcomposer.data.urlEncode",
+          icon: "link",
+        },
+        {
+          label: "URL解码",
+          value: "quickcomposer.data.urlDecode",
+          icon: "link",
+        },
+        {
+          label: "HTML编码",
+          value: "quickcomposer.data.htmlEncode",
+          icon: "html",
+        },
+        {
+          label: "HTML解码",
+          value: "quickcomposer.data.htmlDecode",
+          icon: "html",
+        },
+      ],
     },
     {
       value: "quickcomposer.data.symmetricCrypto",
@@ -90,35 +88,33 @@ export const dataCommands = {
           type: "varInput",
         },
       ],
-      functionSelector: {
-        options: [
-          {
-            label: "MD5",
-            value: "quickcomposer.data.md5Hash",
-            icon: "functions",
-          },
-          {
-            label: "SHA1",
-            value: "quickcomposer.data.sha1Hash",
-            icon: "functions",
-          },
-          {
-            label: "SHA256",
-            value: "quickcomposer.data.sha256Hash",
-            icon: "functions",
-          },
-          {
-            label: "SHA512",
-            value: "quickcomposer.data.sha512Hash",
-            icon: "functions",
-          },
-          {
-            label: "SM3",
-            value: "quickcomposer.data.sm3Hash",
-            icon: "functions",
-          },
-        ],
-      },
+      functionSelector: [
+        {
+          label: "MD5",
+          value: "quickcomposer.data.md5Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA1",
+          value: "quickcomposer.data.sha1Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA256",
+          value: "quickcomposer.data.sha256Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA512",
+          value: "quickcomposer.data.sha512Hash",
+          icon: "functions",
+        },
+        {
+          label: "SM3",
+          value: "quickcomposer.data.sm3Hash",
+          icon: "functions",
+        },
+      ],
     },
     {
       value: "Math.sin",
@@ -134,80 +130,78 @@ export const dataCommands = {
           type: "numInput",
         },
       ],
-      functionSelector: {
-        options: [
-          {
-            label: "正弦(sin)",
-            value: "Math.sin",
-            icon: "functions",
-          },
-          {
-            label: "余弦(cos)",
-            value: "Math.cos",
-            icon: "functions",
-          },
-          {
-            label: "正切(tan)",
-            value: "Math.tan",
-            icon: "functions",
-          },
-          {
-            label: "反正弦(asin)",
-            value: "Math.asin",
-            icon: "functions",
-          },
-          {
-            label: "反余弦(acos)",
-            value: "Math.acos",
-            icon: "functions",
-          },
-          {
-            label: "反正切(atan)",
-            value: "Math.atan",
-            icon: "functions",
-          },
-          {
-            label: "平方根(sqrt)",
-            value: "Math.sqrt",
-            icon: "functions",
-          },
-          {
-            label: "自然对数(ln)",
-            value: "Math.log",
-            icon: "functions",
-          },
-          {
-            label: "10对数(log10)",
-            value: "Math.log10",
-            icon: "functions",
-          },
-          {
-            label: "绝对值(abs)",
-            value: "Math.abs",
-            icon: "functions",
-          },
-          {
-            label: "向上取整(ceil)",
-            value: "Math.ceil",
-            icon: "functions",
-          },
-          {
-            label: "向下取整(floor)",
-            value: "Math.floor",
-            icon: "functions",
-          },
-          {
-            label: "四舍五入(round)",
-            value: "Math.round",
-            icon: "functions",
-          },
-          {
-            label: "幂运算(pow)",
-            value: "Math.pow",
-            icon: "functions",
-          },
-        ],
-      },
+      functionSelector: [
+        {
+          label: "正弦(sin)",
+          value: "Math.sin",
+          icon: "functions",
+        },
+        {
+          label: "余弦(cos)",
+          value: "Math.cos",
+          icon: "functions",
+        },
+        {
+          label: "正切(tan)",
+          value: "Math.tan",
+          icon: "functions",
+        },
+        {
+          label: "反正弦(asin)",
+          value: "Math.asin",
+          icon: "functions",
+        },
+        {
+          label: "反余弦(acos)",
+          value: "Math.acos",
+          icon: "functions",
+        },
+        {
+          label: "反正切(atan)",
+          value: "Math.atan",
+          icon: "functions",
+        },
+        {
+          label: "平方根(sqrt)",
+          value: "Math.sqrt",
+          icon: "functions",
+        },
+        {
+          label: "自然对数(ln)",
+          value: "Math.log",
+          icon: "functions",
+        },
+        {
+          label: "10对数(log10)",
+          value: "Math.log10",
+          icon: "functions",
+        },
+        {
+          label: "绝对值(abs)",
+          value: "Math.abs",
+          icon: "functions",
+        },
+        {
+          label: "向上取整(ceil)",
+          value: "Math.ceil",
+          icon: "functions",
+        },
+        {
+          label: "向下取整(floor)",
+          value: "Math.floor",
+          icon: "functions",
+        },
+        {
+          label: "四舍五入(round)",
+          value: "Math.round",
+          icon: "functions",
+        },
+        {
+          label: "幂运算(pow)",
+          value: "Math.pow",
+          icon: "functions",
+        },
+      ],
     },
     {
       value: "quickcomposer.data.random",
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index f7930658..646661c7 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -27,26 +27,23 @@ export const simulateCommands = {
           width: 6,
         },
       ],
-      functionSelector: {
-        options: [
-          {
-            label: "单击",
-            value: "utools.simulateMouseClick",
-            icon: "mouse",
-          },
-          {
-            label: "右击",
-            value: "utools.simulateMouseRightClick",
-            icon: "mouse",
-          },
-          {
-            label: "双击",
-            value: "utools.simulateMouseDoubleClick",
-            icon: "mouse",
-          },
-        ],
-        allowEmptyArgv: true,
-      },
+      functionSelector: [
+        {
+          label: "单击",
+          value: "utools.simulateMouseClick",
+          icon: "mouse",
+        },
+        {
+          label: "右击",
+          value: "utools.simulateMouseRightClick",
+          icon: "mouse",
+        },
+        {
+          label: "双击",
+          value: "utools.simulateMouseDoubleClick",
+          icon: "mouse",
+        },
+      ],
     },
     {
       value: "utools.simulateMouseMove",
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index ba792140..63602390 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -103,15 +103,19 @@ const stringifyObject = (jsonObj) => {
  * @returns {string} 格式化后的字符串
  */
 export const stringifyArgv = (argv) => {
-  // 处理普通字符串
+  // 普通字符串加上引号
   if (typeof argv === "string") {
     return `"${argv}"`;
   }
-  // 处理对象
+  // null类型是Object，需要单独处理，返回原值
+  if (argv === null) {
+    return null;
+  }
+  // 对象通过stringifyObject处理
   if (typeof argv === "object") {
     return stringifyObject(argv);
   }
-  // 处理其他类型
+  // 其他类型返回原值
   return argv;
 };
 
@@ -270,12 +274,25 @@ export const parseFunction = (functionStr, options = {}) => {
           return shouldUseVariableFormat
             ? { value: node.value, isString: true, __varInputVal__: true }
             : node.value;
+        // 数字、布尔
         case "NumericLiteral":
-          return node.value;
         case "BooleanLiteral":
-          return node.value;
+          return shouldUseVariableFormat
+            ? {
+                value: JSON.stringify(node.value),
+                isString: false,
+                __varInputVal__: true,
+              }
+            : node.value;
+        // null
         case "NullLiteral":
-          return null;
+          return shouldUseVariableFormat
+            ? {
+                value: "null",
+                isString: false,
+                __varInputVal__: true,
+              }
+            : null;
         case "Identifier":
           // 标识符（变量）总是不带引号的
           return shouldUseVariableFormat
diff --git "a/\351\241\271\347\233\256\350\257\264\346\230\216.json" "b/\351\241\271\347\233\256\350\257\264\346\230\216.json"
index a3daf465..3db461b2 100644
--- "a/\351\241\271\347\233\256\350\257\264\346\230\216.json"
+++ "b/\351\241\271\347\233\256\350\257\264\346\230\216.json"
@@ -28,15 +28,11 @@
                 }
               },
               "functionSelector": {
-                "描述": "可选，函数选择器，用于选择函数，如果存在则使用MultiParams组件，用于一类参数类似，但函数名不同的命令",
-                "options": {
-                  "描述": "必选，选项，一个数组，每个元素是一个对象，包含以下属性：",
-                  "配置项属性": {
-                    "label": "必选，显示的名称",
-                    "value": "必选，生成代码时使用的函数名",
-                    "icon": "可选，图标",
-                    "config": "可选，特定函数独有参数配置，和MultiParams组件的config一样"
-                  }
+                "配置项属性": {
+                  "label": "必选，显示的名称",
+                  "value": "必选，生成代码时使用的函数名",
+                  "icon": "可选，图标",
+                  "config": "可选，特定函数独有参数配置，和MultiParams组件的config一样"
                 },
                 "value": "必选，默认值"
               }

From 807da38e2eb18d03ce3f6a2402e793cdeec8d172 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 7 Jan 2025 18:19:25 +0800
Subject: [PATCH 003/332] =?UTF-8?q?=E4=BF=AE=E6=94=B9DNS=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/network/dns.js       |   4 +-
 src/components/composer/MultiParams.vue       |  10 +-
 src/components/composer/network/DnsEditor.vue | 241 ------------------
 src/js/composer/cardComponents.js             |   3 -
 src/js/composer/commands/networkCommands.js   |  86 ++++++-
 src/js/composer/commonComponentGuide.js       | 127 +++++++++
 src/js/composer/customComponentGuide.js       |   1 -
 7 files changed, 221 insertions(+), 251 deletions(-)
 delete mode 100644 src/components/composer/network/DnsEditor.vue
 create mode 100644 src/js/composer/commonComponentGuide.js

diff --git a/plugin/lib/quickcomposer/network/dns.js b/plugin/lib/quickcomposer/network/dns.js
index 8e00ad23..46e91ba6 100644
--- a/plugin/lib/quickcomposer/network/dns.js
+++ b/plugin/lib/quickcomposer/network/dns.js
@@ -13,9 +13,9 @@ const resolveCname = promisify(dns.resolveCname);
 const reverse = promisify(dns.reverse);
 
 // 解析主机名
-async function lookupHost(hostname, options = {}) {
+async function lookupHost(hostname, family = 0, all = false) {
   try {
-    return await lookup(hostname, options);
+    return await lookup(hostname, { family, all });
   } catch (error) {
     throw new Error(`DNS查询失败: ${error.message}`);
   }
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 7904ba67..40a7b893 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -36,9 +36,15 @@ export default defineComponent({
     },
     // 通用参数配置
     commonConfig() {
-      return this.modelValue.config || [];
+      return (
+        // 过滤掉特定函数排除的参数, excludeConfig格式为[要排除的参数索引]
+        this.modelValue.config?.filter(
+          (_, index) =>
+            !this.getSelectFunction()?.excludeConfig?.includes(index)
+        ) || []
+      );
     },
-    // 特定函数独有参数配置
+    // 特定函数独有参数配置，config格式和通用的config一致
     functionConfig() {
       return this.getSelectFunction()?.config || [];
     },
diff --git a/src/components/composer/network/DnsEditor.vue b/src/components/composer/network/DnsEditor.vue
deleted file mode 100644
index ecc35dac..00000000
--- a/src/components/composer/network/DnsEditor.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<template>
-  <div class="dns-editor">
-    <!-- 操作类型选择 -->
-    <OperationCard
-      :model-value="argvs.operation"
-      @update:model-value="(val) => updateArgvs('operation', val)"
-      :options="operations"
-    />
-
-    <!-- 操作配置 -->
-    <div class="operation-options">
-      <div class="options-container row">
-        <!-- 主机名输入 -->
-        <VariableInput
-          :model-value="argvs.hostname"
-          @update:model-value="(val) => updateArgvs('hostname', val)"
-          label="主机名"
-          icon="dns"
-          class="col"
-        />
-
-        <!-- IP地址输入 -->
-        <VariableInput
-          :model-value="argvs.ip"
-          @update:model-value="(val) => updateArgvs('ip', val)"
-          label="IP地址"
-          icon="router"
-          v-if="argvs.operation === 'reverseResolve'"
-        />
-
-        <!-- lookup 选项 -->
-        <div
-          class="row items-center col-5"
-          v-if="argvs.operation === 'lookupHost'"
-        >
-          <div class="col-6">
-            <q-select
-              :model-value="argvs.options.family"
-              @update:model-value="(val) => updateArgvs('options.family', val)"
-              :options="families"
-              label="IP版本"
-              dense
-              filled
-              emit-value
-              map-options
-              options-dense
-            />
-          </div>
-          <div class="col-6 q-px-sm">
-            <q-toggle
-              :model-value="argvs.options.all"
-              @update:model-value="(val) => updateArgvs('options.all', val)"
-              label="返回所有地址"
-              dense
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import OperationCard from "components/composer/common/OperationCard.vue";
-export default defineComponent({
-  name: "DnsEditor",
-  components: {
-    VariableInput,
-    OperationCard,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      operations: [
-        { value: "lookupHost", label: "DNS查询", icon: "search" },
-        { value: "resolveAll", label: "解析所有记录", icon: "all_inclusive" },
-        { value: "resolveIpv4", label: "解析IPv4", icon: "filter_4" },
-        { value: "resolveIpv6", label: "解析IPv6", icon: "filter_6" },
-        { value: "resolveMxRecords", label: "解析MX记录", icon: "mail" },
-        {
-          value: "resolveTxtRecords",
-          label: "解析TXT记录",
-          icon: "text_fields",
-        },
-        { value: "resolveNsRecords", label: "解析NS记录", icon: "dns" },
-        { value: "resolveCnameRecords", label: "解析CNAME记录", icon: "link" },
-        { value: "reverseResolve", label: "反向解析", icon: "swap_horiz" },
-      ],
-      families: [
-        { label: "自动", value: 0 },
-        { label: "IPv4", value: 4 },
-        { label: "IPv6", value: 6 },
-      ],
-      defaultArgvs: {
-        operation: "lookupHost",
-        hostname: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        ip: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        options: {
-          family: 0,
-          all: false,
-        },
-      },
-    };
-  },
-  computed: {
-    argvs: {
-      get() {
-        return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
-        );
-      },
-      set(value) {
-        this.updateModelValue(value);
-      },
-    },
-    needsHostname() {
-      return this.argvs.operation !== "reverseResolve";
-    },
-  },
-  methods: {
-    generateCode(argvs = this.argvs) {
-      switch (argvs.operation) {
-        case "lookupHost":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.hostname
-          )}, ${stringifyArgv(argvs.options)})`;
-
-        case "reverseResolve":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.ip
-          )})`;
-
-        default:
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.hostname
-          )})`;
-      }
-    },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        // 定义需要使用variable格式的路径
-        const variableFormatPaths = [
-          "arg0", // 主机名/IP参数
-          "arg1.**", // options对象的所有属性
-        ];
-
-        // 使用 parseFunction 解析代码
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const operation = result.name.split(".").pop();
-        const [firstArg, secondArg] = result.argvs;
-
-        const newArgvs = {
-          ...this.defaultArgvs,
-          operation,
-        };
-
-        if (operation === "reverseResolve") {
-          newArgvs.ip = firstArg;
-        } else {
-          newArgvs.hostname = firstArg;
-          if (operation === "lookupHost" && secondArg) {
-            newArgvs.options = {
-              family: secondArg.family ?? this.defaultArgvs.options.family,
-              all: secondArg.all ?? this.defaultArgvs.options.all,
-            };
-          }
-        }
-
-        return newArgvs;
-      } catch (e) {
-        console.error("解析DNS参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
-    updateArgvs(key, value) {
-      this.argvs = {
-        ...this.argvs,
-        [key]: value,
-      };
-    },
-    getSummary(argvs) {
-      const op = this.operations.find(
-        (op) => op.value === argvs.operation
-      )?.label;
-      return op === "反向解析"
-        ? "反向解析 " + argvs.ip.value
-        : op + " " + argvs.hostname.value;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        summary: this.getSummary(argvs),
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.dns-editor {
-  display: flex;
-  flex-direction: column;
-}
-
-.options-container {
-  min-height: 32px;
-  gap: 8px;
-  padding-top: 8px;
-}
-</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index fe998217..f6fa48af 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -73,9 +73,6 @@ export const ZlibEditor = defineAsyncComponent(() =>
 export const UrlEditor = defineAsyncComponent(() =>
   import("components/composer/network/UrlEditor.vue")
 );
-export const DnsEditor = defineAsyncComponent(() =>
-  import("components/composer/network/DnsEditor.vue")
-);
 export const BufferEditor = defineAsyncComponent(() =>
   import("src/components/composer/data/BufferEditor.vue")
 );
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index 94b2f9af..a9ac8ca7 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -54,12 +54,94 @@ export const networkCommands = {
       icon: "link",
     },
     {
-      value: "quickcomposer.network.dns",
+      value: "quickcomposer.network.dns.lookupHost",
       label: "DNS操作",
       desc: "DNS解析和查询",
-      component: "DnsEditor",
       icon: "dns",
       isAsync: true,
+      config: [
+        {
+          label: "要查询的域名",
+          icon: "dns",
+          type: "varInput",
+          width: "auto",
+        },
+      ],
+      functionSelector: [
+        {
+          label: "DNS查询",
+          value: "quickcomposer.network.dns.lookupHost",
+          icon: "search",
+          config: [
+            {
+              label: "IP版本",
+              icon: "settings_ethernet",
+              type: "select",
+              options: [
+                { label: "自动", value: 0 },
+                { label: "IPv4", value: 4 },
+                { label: "IPv6", value: 6 },
+              ],
+              defaultValue: 0,
+              width: 2.5,
+            },
+            {
+              label: "返回所有地址",
+              type: "checkbox",
+              defaultValue: false,
+              width: 2.5,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.dns.resolveAll",
+          label: "解析所有记录",
+          icon: "all_inclusive",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveIpv4",
+          label: "解析IPv4",
+          icon: "filter_4",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveIpv6",
+          label: "解析IPv6",
+          icon: "filter_6",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveMxRecords",
+          label: "解析MX记录",
+          icon: "mail",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveTxtRecords",
+          label: "解析TXT记录",
+          icon: "text_fields",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveNsRecords",
+          label: "解析NS记录",
+          icon: "dns",
+        },
+        {
+          value: "quickcomposer.network.dns.resolveCnameRecords",
+          label: "解析CNAME记录",
+          icon: "link",
+        },
+        {
+          value: "quickcomposer.network.dns.reverseResolve",
+          label: "反向解析",
+          icon: "swap_horiz",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "IP地址",
+              icon: "router",
+              type: "varInput",
+            },
+          ],
+        },
+      ],
     },
   ],
 };
diff --git a/src/js/composer/commonComponentGuide.js b/src/js/composer/commonComponentGuide.js
new file mode 100644
index 00000000..fb1c8503
--- /dev/null
+++ b/src/js/composer/commonComponentGuide.js
@@ -0,0 +1,127 @@
+/**
+ * Common Component Creation Guide
+ * 通用组件创建指南 - 使用 MultiParams 组件
+ */
+const commonComponentGuide = {
+  description: "创建使用 MultiParams 组件的命令的完整流程",
+  important: "创建过程中严禁删除、修改任何已有的函数或对象",
+  steps: {
+    "1. Backend Interface": {
+      location: "plugin/lib/quickcomposer/xxx/yyy.js",
+      description: "创建具体功能实现",
+      requirements: {
+        functionDefinition: "使用独立函数而非对象方法",
+        asyncHandling: "使用 async/await 处理异步操作",
+        errorHandling: "合理的错误捕获和提示",
+        paramValidation: "检查必要参数是否存在",
+      },
+    },
+    "2. Interface Export": {
+      location: "plugin/lib/quickcomposer/xxx/index.js",
+      description: "导出接口给quickcomposer使用",
+      examples: {
+        singleFunction: "module.exports = { operation }",
+        multipleFunctions: "module.exports = { ...encoder, ...hash }",
+      },
+    },
+    "3. Interface Registration": {
+      location: "plugin/lib/quickcomposer.js",
+      description: "将接口注册到quickcomposer对象",
+      format: "quickcomposer.xxx = require('./quickcomposer/xxx')",
+    },
+    "4. Command Configuration": {
+      location: "src/js/composer/commands/xxxCommands.js",
+      description: "配置命令参数，使用 MultiParams 组件",
+      requiredFields: {
+        value: "必选，生成代码时使用的函数名，如 quickcomposer.xxx.yyy",
+        label: "必选，命令的显示名称",
+        config: {
+          description: "必选，通用参数配置数组，每个元素是一个对象",
+          properties: {
+            label: "必选，参数标签",
+            type: "必选，参数类型(varInput/numInput/select/checkbox等)",
+            icon: "必选，参数图标",
+            width: "可选，参数占用宽度(1-12或auto)",
+            defaultValue: "可选，参数默认值",
+            options: "可选，select等类型的选项",
+          },
+          example: `
+            config: [
+              {
+                label: "域名",
+                type: "varInput",
+                icon: "dns",
+                width: "auto"
+              }
+            ]
+          `,
+        },
+        functionSelector: {
+          description:
+            "可选，函数选择器配置，用于一个命令包含多个相关函数的情况",
+          properties: {
+            value: "必选，函数名",
+            label: "必选，显示名称",
+            icon: "可选，图标",
+            config: "可选，函数特有的参数配置，格式同通用config",
+            excludeConfig: "可选，要排除的通用参数索引数组",
+          },
+          example: `
+            functionSelector: [
+              {
+                label: "DNS查询",
+                value: "quickcomposer.network.dns.lookupHost",
+                icon: "search",
+                config: [
+                  {
+                    label: "IP版本",
+                    type: "select",
+                    options: [
+                      { label: "自动", value: 0 },
+                      { label: "IPv4", value: 4 }
+                    ],
+                    defaultValue: 0
+                  }
+                ]
+              },
+              {
+                value: "quickcomposer.network.dns.reverseResolve",
+                label: "反向解析",
+                icon: "swap_horiz",
+                excludeConfig: [0],  // 排除第一个通用参数
+                config: [
+                  {
+                    label: "IP地址",
+                    type: "varInput",
+                    icon: "router"
+                  }
+                ]
+              }
+            ]
+          `,
+        },
+      },
+      optionalFields: {
+        desc: "命令描述",
+        isAsync: "是否异步命令",
+        icon: "命令图标",
+      },
+    },
+  },
+  notes: {
+    bestPractices: {
+      description: "最佳实践",
+      tips: [
+        "合理使用 width 属性布局参数",
+        "相关参数尽量放在同一行",
+        "使用 excludeConfig 禁用掉不需要的参数配置",
+        "合理设置 defaultValue",
+        "使用语义化的图标",
+        "保持参数标签简洁明了",
+      ],
+    },
+  },
+  examples: {
+    multiFunctionCommand: "多函数命令，如DNS操作",
+  },
+};
diff --git a/src/js/composer/customComponentGuide.js b/src/js/composer/customComponentGuide.js
index 4c0e5b24..cf61a53b 100644
--- a/src/js/composer/customComponentGuide.js
+++ b/src/js/composer/customComponentGuide.js
@@ -272,7 +272,6 @@ const customComponentGuide = {
         desc: "命令描述",
         isAsync: "是否异步命令",
         isControlFlow: "是否控制流命令",
-        allowEmptyArgv: "是否允许空参数",
       },
     },
   },

From e23d3e5e11d56d96098193d0f6193d1e9fcb826e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 7 Jan 2025 19:28:14 +0800
Subject: [PATCH 004/332] =?UTF-8?q?OS/URL/PATH/BUFFER=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/network/url.js       |  57 +-
 plugin/lib/quickcomposer/system/os.js         |   8 +-
 plugin/lib/quickcomposer/system/path.js       |  27 +-
 src/components/composer/ComposerCard.vue      |   6 +-
 src/components/composer/MultiParams.vue       |   1 -
 .../composer/common/ButtonGroup.vue           |  70 ++
 src/components/composer/common/ParamInput.vue |   8 +
 src/components/composer/data/BufferEditor.vue | 695 ------------------
 src/components/composer/network/UrlEditor.vue | 455 ------------
 src/components/composer/system/OsEditor.vue   | 368 ----------
 src/components/composer/system/PathEditor.vue | 438 -----------
 src/js/composer/cardComponents.js             |  12 -
 src/js/composer/commands/dataCommands.js      | 348 ++++++++-
 src/js/composer/commands/networkCommands.js   | 174 ++++-
 src/js/composer/commands/systemCommands.js    | 248 ++++++-
 15 files changed, 902 insertions(+), 2013 deletions(-)
 create mode 100644 src/components/composer/common/ButtonGroup.vue
 delete mode 100644 src/components/composer/data/BufferEditor.vue
 delete mode 100644 src/components/composer/network/UrlEditor.vue
 delete mode 100644 src/components/composer/system/OsEditor.vue
 delete mode 100644 src/components/composer/system/PathEditor.vue

diff --git a/plugin/lib/quickcomposer/network/url.js b/plugin/lib/quickcomposer/network/url.js
index f9174805..bef341d3 100644
--- a/plugin/lib/quickcomposer/network/url.js
+++ b/plugin/lib/quickcomposer/network/url.js
@@ -1,32 +1,57 @@
 const url = require("url");
 
 // URL 解析
-function parse(urlString, parseQueryString = false) {
-  return url.parse(urlString, parseQueryString);
+function parse(urlString) {
+  try {
+    return url.parse(urlString, false);
+  } catch (error) {
+    throw new Error(`URL解析失败: ${error.message}`);
+  }
 }
 
-// URL 格式化
-function format(urlObject) {
-  return url.format(urlObject);
+// 格式化 URL
+function format(protocol, auth, hostname, port, pathname, search, hash) {
+  try {
+    const urlObject = {
+      protocol,
+      auth,
+      hostname,
+      port,
+      pathname,
+      search,
+      hash,
+    };
+    return url.format(urlObject);
+  } catch (error) {
+    throw new Error(`URL格式化失败: ${error.message}`);
+  }
 }
 
 // 解析查询字符串
-function parseQuery(query) {
-  const searchParams = new URLSearchParams(query);
-  const result = {};
-  for (const [key, value] of searchParams) {
-    result[key] = value;
+function parseQuery(queryString) {
+  try {
+    const searchParams = new URLSearchParams(queryString);
+    const result = {};
+    for (const [key, value] of searchParams) {
+      result[key] = value;
+    }
+    return result;
+  } catch (error) {
+    throw new Error(`查询字符串解析失败: ${error.message}`);
   }
-  return result;
 }
 
 // 格式化查询字符串
-function formatQuery(queryObject) {
-  const searchParams = new URLSearchParams();
-  for (const [key, value] of Object.entries(queryObject)) {
-    searchParams.append(key, value);
+function formatQuery(queryParams) {
+  try {
+    const searchParams = new URLSearchParams();
+    for (const [key, value] of Object.entries(queryParams)) {
+      searchParams.append(key, value);
+    }
+    return searchParams.toString();
+  } catch (error) {
+    throw new Error(`查询字符串格式化失败: ${error.message}`);
   }
-  return searchParams.toString();
 }
 
 // 解析路径名
diff --git a/plugin/lib/quickcomposer/system/os.js b/plugin/lib/quickcomposer/system/os.js
index 83f390e7..2260c2da 100644
--- a/plugin/lib/quickcomposer/system/os.js
+++ b/plugin/lib/quickcomposer/system/os.js
@@ -6,7 +6,7 @@ function arch() {
 }
 
 // 获取CPU信息
-function cpus({ format = "full" } = {}) {
+function cpus(format = "full") {
   const cpuInfo = os.cpus();
   if (format === "simple") {
     return cpuInfo.map(({ model, speed }) => ({ model, speed }));
@@ -15,7 +15,7 @@ function cpus({ format = "full" } = {}) {
 }
 
 // 获取内存信息
-function memory({ type = "totalmem" } = {}) {
+function memory(type = "totalmem") {
   switch (type) {
     case "totalmem":
       return os.totalmem();
@@ -27,7 +27,7 @@ function memory({ type = "totalmem" } = {}) {
 }
 
 // 获取网络信息
-function network({ type = "hostname", internal = false } = {}) {
+function network(type = "hostname", internal = false) {
   switch (type) {
     case "hostname":
       return os.hostname();
@@ -50,7 +50,7 @@ function network({ type = "hostname", internal = false } = {}) {
 }
 
 // 获取平台信息
-function platform({ type = "platform" } = {}) {
+function platform(type = "platform") {
   switch (type) {
     case "platform":
       return os.platform();
diff --git a/plugin/lib/quickcomposer/system/path.js b/plugin/lib/quickcomposer/system/path.js
index b30a1c6a..7c59cc57 100644
--- a/plugin/lib/quickcomposer/system/path.js
+++ b/plugin/lib/quickcomposer/system/path.js
@@ -5,7 +5,7 @@ const path = require("path");
  * @param {string} p 要规范化的路径
  * @returns {string} 规范化后的路径
  */
-async function normalize(p) {
+function normalize(p) {
   try {
     return path.normalize(p);
   } catch (error) {
@@ -18,7 +18,7 @@ async function normalize(p) {
  * @param {...string} paths 路径片段
  * @returns {string} 连接后的路径
  */
-async function join(...paths) {
+function join(...paths) {
   try {
     return path.join(...paths);
   } catch (error) {
@@ -31,7 +31,7 @@ async function join(...paths) {
  * @param {string} p 要解析的路径
  * @returns {Object} 解析结果，包含 root, dir, base, ext, name
  */
-async function parse(p) {
+function parse(p) {
   try {
     return path.parse(p);
   } catch (error) {
@@ -44,7 +44,7 @@ async function parse(p) {
  * @param {string} p 路径
  * @returns {string} 目录名
  */
-async function dirname(p) {
+function dirname(p) {
   try {
     return path.dirname(p);
   } catch (error) {
@@ -58,7 +58,7 @@ async function dirname(p) {
  * @param {string} [ext] 可选的扩展名，如果提供则从结果中移除
  * @returns {string} 文件名
  */
-async function basename(p, ext) {
+function basename(p, ext = undefined) {
   try {
     return path.basename(p, ext);
   } catch (error) {
@@ -71,7 +71,7 @@ async function basename(p, ext) {
  * @param {string} p 路径
  * @returns {string} 扩展名
  */
-async function extname(p) {
+function extname(p) {
   try {
     return path.extname(p);
   } catch (error) {
@@ -84,7 +84,7 @@ async function extname(p) {
  * @param {string} p 路径
  * @returns {boolean} 是否为绝对路径
  */
-async function isAbsolute(p) {
+function isAbsolute(p) {
   try {
     return path.isAbsolute(p);
   } catch (error) {
@@ -98,7 +98,7 @@ async function isAbsolute(p) {
  * @param {string} to 目标路径
  * @returns {string} 相对路径
  */
-async function relative(from, to) {
+function relative(from, to) {
   try {
     return path.relative(from, to);
   } catch (error) {
@@ -111,7 +111,7 @@ async function relative(from, to) {
  * @param {...string} paths 路径片段
  * @returns {string} 解析后的绝对路径
  */
-async function resolve(...paths) {
+function resolve(...paths) {
   try {
     return path.resolve(...paths);
   } catch (error) {
@@ -121,11 +121,16 @@ async function resolve(...paths) {
 
 /**
  * 格式化路径对象为路径字符串
- * @param {Object} pathObject 路径对象，包含 dir, root, base, name, ext
+ * @param {string} root 根路径
+ * @param {string} dir 目录
+ * @param {string} base 基本名称
+ * @param {string} name 文件名
+ * @param {string} ext 扩展名
  * @returns {string} 格式化后的路径
  */
-async function format(pathObject) {
+function format(root, dir, base, name, ext) {
   try {
+    const pathObject = { root, dir, base, name, ext };
     return path.format(pathObject);
   } catch (error) {
     throw new Error(`格式化路径失败: ${error.message}`);
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 67622410..9c3bc993 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -55,7 +55,11 @@
             <MultiParams
               v-else
               v-model="localCommand"
-              :class="localCommand.config?.length ? 'col q-mt-sm' : 'col'"
+              :class="
+                localCommand.config?.length || localCommand.functionSelector
+                  ? 'col q-mt-sm'
+                  : 'col'
+              "
             />
           </div>
         </div>
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 40a7b893..19c8ddb0 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -111,7 +111,6 @@ export default defineComponent({
       this.updateModelValue(this.funcName, newArgvs);
     },
     generateCode(funcName, argvs) {
-      console.log("argvs", argvs);
       /**
        * 字符串模式stringfiy后，null会变成'"null"', ''变成'""'
        * 变量模式stringify后，null变成'null', ''保持''
diff --git a/src/components/composer/common/ButtonGroup.vue b/src/components/composer/common/ButtonGroup.vue
new file mode 100644
index 00000000..c2b406fe
--- /dev/null
+++ b/src/components/composer/common/ButtonGroup.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="button-group">
+    <div
+      v-for="opt in options"
+      :key="opt.value"
+      :class="['button-item', { active: modelValue === opt.value }]"
+      @click="$emit('update:modelValue', opt.value)"
+    >
+      {{ opt.label }}
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "ButtonGroup",
+  props: {
+    modelValue: {
+      required: true,
+    },
+    options: {
+      type: Array,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+});
+</script>
+
+<style scoped>
+.button-group {
+  display: flex;
+  width: 100%;
+  flex-wrap: wrap;
+  gap: 6px;
+  padding: 10px;
+  border-radius: 6px;
+}
+
+.button-item {
+  flex: 1;
+  min-width: 80px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 26px;
+  padding: 0 12px;
+  font-size: 12px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  background: var(--q-primary-opacity-5);
+  border: 1px solid var(--q-primary-opacity-5);
+  color: var(--q-primary);
+  white-space: nowrap;
+  user-select: none;
+}
+
+.button-item:hover {
+  transform: translateY(-1px);
+}
+
+.button-item.active {
+  color: white;
+  background: var(--q-primary);
+  border-color: var(--q-primary);
+}
+</style>
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 9f9ba04b..2324960b 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -72,6 +72,12 @@
         :label="config.label"
         :icon="config.icon"
       />
+      <ButtonGroup
+        v-else-if="config.type === 'buttonGroup'"
+        :model-value="values[index]"
+        @update:model-value="$emit('update', index, $event)"
+        :options="config.options"
+      />
     </div>
   </div>
 </template>
@@ -82,6 +88,7 @@ import VariableInput from "./VariableInput.vue";
 import NumberInput from "./NumberInput.vue";
 import ArrayEditor from "./ArrayEditor.vue";
 import DictEditor from "./DictEditor.vue";
+import ButtonGroup from "./ButtonGroup.vue";
 
 /**
  * 参数输入组件
@@ -101,6 +108,7 @@ export default defineComponent({
     NumberInput,
     ArrayEditor,
     DictEditor,
+    ButtonGroup,
   },
   props: {
     configs: {
diff --git a/src/components/composer/data/BufferEditor.vue b/src/components/composer/data/BufferEditor.vue
deleted file mode 100644
index cd3c9dd8..00000000
--- a/src/components/composer/data/BufferEditor.vue
+++ /dev/null
@@ -1,695 +0,0 @@
-<template>
-  <div class="buffer-editor">
-    <!-- 操作类型选择 -->
-    <OperationCard
-      :model-value="argvs.operation"
-      @update:model-value="(val) => updateArgvs('operation', val)"
-      :options="operations"
-    />
-    <!-- 操作配置 -->
-    <div class="operation-options q-mt-sm">
-      <div class="options-container">
-        <!-- 创建 Buffer -->
-        <div v-if="argvs.operation === 'from'" class="row q-col-gutter-sm">
-          <VariableInput
-            :model-value="argvs.data"
-            @update:model-value="(val) => updateArgvs('data', val)"
-            label="数据"
-            icon="text_fields"
-            class="col"
-          />
-          <q-select
-            :model-value="argvs.encoding"
-            @update:model-value="(val) => updateArgvs('encoding', val)"
-            :options="encodings"
-            label="编码"
-            dense
-            filled
-            emit-value
-            map-options
-            options-dense
-            class="col-3"
-          />
-        </div>
-
-        <!-- 转换为字符串 -->
-        <div
-          v-if="argvs.operation === 'toString'"
-          class="column q-col-gutter-sm"
-        >
-          <VariableInput
-            :model-value="argvs.buffer"
-            @update:model-value="(val) => updateArgvs('buffer', val)"
-            label="Buffer"
-            icon="memory"
-          />
-          <div class="row q-col-gutter-sm">
-            <div class="col-12 col-sm-4">
-              <q-select
-                :model-value="argvs.encoding"
-                @update:model-value="(val) => updateArgvs('encoding', val)"
-                :options="encodings"
-                label="编码"
-                dense
-                filled
-                emit-value
-                map-options
-                options-dense
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <NumberInput
-                :model-value="argvs.start"
-                @update:model-value="(val) => updateArgvs('start', val)"
-                label="起始位置"
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <NumberInput
-                :model-value="argvs.end"
-                @update:model-value="(val) => updateArgvs('end', val)"
-                label="结束位置"
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 写入数据 -->
-        <div v-if="argvs.operation === 'write'" class="column q-col-gutter-sm">
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              :model-value="argvs.buffer"
-              @update:model-value="(val) => updateArgvs('buffer', val)"
-              label="Buffer"
-              icon="memory"
-              class="col"
-            />
-            <VariableInput
-              :model-value="argvs.string"
-              @update:model-value="(val) => updateArgvs('string', val)"
-              label="要写入的字符串"
-              icon="edit"
-              class="col"
-            />
-          </div>
-          <div class="row q-col-gutter-sm">
-            <div class="col-4">
-              <NumberInput
-                :model-value="argvs.offset"
-                @update:model-value="(val) => updateArgvs('offset', val)"
-                label="偏移量"
-              />
-            </div>
-            <div class="col-4">
-              <NumberInput
-                :model-value="argvs.length"
-                @update:model-value="(val) => updateArgvs('length', val)"
-                label="长度"
-              />
-            </div>
-            <div class="col-4">
-              <q-select
-                :model-value="argvs.encoding"
-                @update:model-value="(val) => updateArgvs('encoding', val)"
-                :options="encodings"
-                label="编码"
-                dense
-                filled
-                emit-value
-                map-options
-                options-dense
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 填充数据 -->
-        <div v-if="argvs.operation === 'fill'" class="column q-col-gutter-sm">
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              :model-value="argvs.buffer"
-              @update:model-value="(val) => updateArgvs('buffer', val)"
-              label="Buffer"
-              icon="memory"
-              class="col"
-            />
-            <VariableInput
-              :model-value="argvs.value"
-              @update:model-value="(val) => updateArgvs('value', val)"
-              label="填充值"
-              icon="format_color_fill"
-              class="col"
-            />
-          </div>
-          <div class="row q-col-gutter-sm">
-            <div class="col-4">
-              <NumberInput
-                :model-value="argvs.offset"
-                @update:model-value="(val) => updateArgvs('offset', val)"
-                label="起始位置"
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <NumberInput
-                :model-value="argvs.end"
-                @update:model-value="(val) => updateArgvs('end', val)"
-                label="结束位置"
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <q-select
-                :model-value="argvs.encoding"
-                @update:model-value="(val) => updateArgvs('encoding', val)"
-                :options="encodings"
-                label="编码"
-                dense
-                filled
-                emit-value
-                map-options
-                options-dense
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 复制数据 -->
-        <div v-if="argvs.operation === 'copy'" class="column q-col-gutter-sm">
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              :model-value="argvs.source"
-              @update:model-value="(val) => updateArgvs('source', val)"
-              label="源Buffer"
-              icon="content_copy"
-              class="col"
-            />
-            <VariableInput
-              :model-value="argvs.target"
-              @update:model-value="(val) => updateArgvs('target', val)"
-              label="目标Buffer"
-              icon="save"
-              class="col"
-            />
-          </div>
-          <div class="row q-col-gutter-sm">
-            <div class="col-4">
-              <NumberInput
-                :model-value="argvs.targetStart"
-                @update:model-value="(val) => updateArgvs('targetStart', val)"
-                label="目标起始位置"
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <NumberInput
-                :model-value="argvs.sourceStart"
-                @update:model-value="(val) => updateArgvs('sourceStart', val)"
-                label="源起始位置"
-              />
-            </div>
-            <div class="col-12 col-sm-4">
-              <NumberInput
-                :model-value="argvs.sourceEnd"
-                @update:model-value="(val) => updateArgvs('sourceEnd', val)"
-                label="源结束位置"
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 比较数据 -->
-        <div
-          v-if="argvs.operation === 'compare'"
-          class="column q-col-gutter-sm"
-        >
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              :model-value="argvs.buf1"
-              @update:model-value="(val) => updateArgvs('buf1', val)"
-              label="Buffer 1"
-              icon="memory"
-              class="col"
-            />
-            <VariableInput
-              :model-value="argvs.buf2"
-              @update:model-value="(val) => updateArgvs('buf2', val)"
-              label="Buffer 2"
-              icon="memory"
-              class="col"
-            />
-          </div>
-        </div>
-
-        <!-- 连接 Buffer -->
-        <div v-if="argvs.operation === 'concat'" class="column q-gutter-sm">
-          <ArrayEditor
-            :model-value="argvs.buffers"
-            @update:model-value="(val) => updateArgvs('buffers', val)"
-            label="Buffer"
-            icon="memory"
-          />
-          <NumberInput
-            :model-value="argvs.totalLength"
-            @update:model-value="(val) => updateArgvs('totalLength', val)"
-            label="总长度（可选）"
-          />
-        </div>
-
-        <!-- 查找数据 -->
-        <div
-          v-if="argvs.operation === 'indexOf'"
-          class="column q-col-gutter-sm"
-        >
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              :model-value="argvs.buffer"
-              @update:model-value="(val) => updateArgvs('buffer', val)"
-              label="Buffer"
-              icon="memory"
-              class="col"
-            />
-            <VariableInput
-              :model-value="argvs.value"
-              @update:model-value="(val) => updateArgvs('value', val)"
-              label="要查找的值"
-              icon="search"
-              class="col"
-            />
-          </div>
-          <div class="row q-col-gutter-sm">
-            <div class="col-12 col-sm-6">
-              <NumberInput
-                :model-value="argvs.byteOffset"
-                @update:model-value="(val) => updateArgvs('byteOffset', val)"
-                label="起始位置"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <q-select
-                :model-value="argvs.encoding"
-                @update:model-value="(val) => updateArgvs('encoding', val)"
-                :options="encodings"
-                label="编码"
-                dense
-                filled
-                emit-value
-                map-options
-                options-dense
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 切片数据 -->
-        <div v-if="argvs.operation === 'slice'" class="row q-col-gutter-sm">
-          <VariableInput
-            :model-value="argvs.buffer"
-            @update:model-value="(val) => updateArgvs('buffer', val)"
-            label="Buffer"
-            icon="memory"
-            class="col"
-          />
-          <NumberInput
-            :model-value="argvs.start"
-            @update:model-value="(val) => updateArgvs('start', val)"
-            label="起始位置"
-            class="col"
-          />
-          <NumberInput
-            :model-value="argvs.end"
-            @update:model-value="(val) => updateArgvs('end', val)"
-            label="结束位置"
-            class="col"
-          />
-        </div>
-
-        <!-- 交换字节序 -->
-        <div v-if="argvs.operation === 'swap'" class="row q-col-gutter-sm">
-          <VariableInput
-            :model-value="argvs.buffer"
-            @update:model-value="(val) => updateArgvs('buffer', val)"
-            label="Buffer"
-            class="col"
-            icon="memory"
-          />
-          <q-select
-            :model-value="argvs.size"
-            @update:model-value="(val) => updateArgvs('size', val)"
-            :options="swapSizes"
-            label="字节大小"
-            class="col-3"
-            dense
-            filled
-            emit-value
-            map-options
-            options-dense
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import NumberInput from "components/composer/common/NumberInput.vue";
-import ArrayEditor from "components/composer/common/ArrayEditor.vue";
-import OperationCard from "components/composer/common/OperationCard.vue";
-
-export default defineComponent({
-  name: "BufferEditor",
-  components: {
-    VariableInput,
-    NumberInput,
-    ArrayEditor,
-    OperationCard,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      operations: [
-        { value: "from", label: "创建Buffer", icon: "add_box" },
-        { value: "toString", label: "转换字符串", icon: "text_fields" },
-        { value: "write", label: "写入数据", icon: "edit" },
-        { value: "fill", label: "填充数据", icon: "format_color_fill" },
-        { value: "copy", label: "复制数据", icon: "content_copy" },
-        { value: "compare", label: "比较数据", icon: "compare" },
-        { value: "concat", label: "连接Buffer", icon: "merge" },
-        { value: "indexOf", label: "查找数据", icon: "search" },
-        { value: "slice", label: "切片数据", icon: "content_cut" },
-        { value: "swap", label: "交换字节序", icon: "swap_horiz" },
-      ],
-      encodings: [
-        { label: "UTF-8", value: "utf8" },
-        { label: "UTF-16LE", value: "utf16le" },
-        { label: "Latin1", value: "latin1" },
-        { label: "Base64", value: "base64" },
-        { label: "Hex", value: "hex" },
-        { label: "ASCII", value: "ascii" },
-        { label: "Binary", value: "binary" },
-        { label: "UCS-2", value: "ucs2" },
-      ],
-      swapSizes: [
-        { label: "16位", value: 16 },
-        { label: "32位", value: 32 },
-        { label: "64位", value: 64 },
-      ],
-      defaultArgvs: {
-        operation: "from",
-        data: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        buffer: {
-          value: "",
-          isString: false,
-          __varInputVal__: true,
-        },
-        encoding: "utf8",
-        start: 0,
-        end: 0,
-        string: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        offset: 0,
-        length: 0,
-        value: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        source: {
-          value: "",
-          isString: false,
-          __varInputVal__: true,
-        },
-        target: {
-          value: "",
-          isString: false,
-          __varInputVal__: true,
-        },
-        targetStart: 0,
-        sourceStart: 0,
-        sourceEnd: 0,
-        buf1: {
-          value: "",
-          isString: false,
-          __varInputVal__: true,
-        },
-        buf2: {
-          value: "",
-          isString: false,
-          __varInputVal__: true,
-        },
-        buffers: [
-          {
-            value: "",
-            isString: false,
-            __varInputVal__: true,
-          },
-        ],
-        totalLength: undefined,
-        byteOffset: 0,
-        size: 16,
-      },
-    };
-  },
-  computed: {
-    argvs: {
-      get() {
-        return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
-        );
-      },
-      set(value) {
-        this.updateModelValue(value);
-      },
-    },
-  },
-  methods: {
-    generateCode(argvs = this.argvs) {
-      switch (argvs.operation) {
-        case "from":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.data
-          )}, "${argvs.encoding}")`;
-
-        case "toString":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, "${argvs.encoding}", ${argvs.start}, ${argvs.end})`;
-
-        case "write":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, ${stringifyArgv(argvs.string)}, ${argvs.offset}, ${
-            argvs.length
-          }, "${argvs.encoding}")`;
-
-        case "fill":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, ${stringifyArgv(argvs.value)}, ${argvs.offset}, ${argvs.end}, "${
-            argvs.encoding
-          }")`;
-
-        case "copy":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.source
-          )}, ${stringifyArgv(argvs.target)}, ${argvs.targetStart}, ${
-            argvs.sourceStart
-          }, ${argvs.sourceEnd})`;
-
-        case "compare":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buf1
-          )}, ${stringifyArgv(argvs.buf2)})`;
-
-        case "concat":
-          const buffersStr = argvs.buffers
-            .map((buf) => stringifyArgv(buf))
-            .join(", ");
-          return `${this.modelValue.value}.${argvs.operation}([${buffersStr}]${
-            argvs.totalLength !== undefined ? `, ${argvs.totalLength}` : ""
-          })`;
-
-        case "indexOf":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, ${stringifyArgv(argvs.value)}, ${argvs.byteOffset}, "${
-            argvs.encoding
-          }")`;
-
-        case "slice":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, ${argvs.start}, ${argvs.end})`;
-
-        case "swap":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.buffer
-          )}, ${argvs.size})`;
-
-        default:
-          return `${this.modelValue.value}.${argvs.operation}()`;
-      }
-    },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        // 定义需要使用variable格式的路径
-        const variableFormatPaths = ["arg0", "arg0[*]"];
-
-        const subFunc = code.match(/buffer\.(\w+)\((.*)\)/);
-
-        switch (subFunc[1]) {
-          case "write":
-          case "fill":
-          case "copy":
-          case "compare":
-          case "indexOf":
-            variableFormatPaths.push("arg1");
-            break;
-        }
-
-        // 使用 parseFunction 解析代码
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const operation = result.name.split(".").pop();
-        const args = result.argvs;
-
-        const newArgvs = {
-          ...this.defaultArgvs,
-          operation,
-        };
-
-        switch (operation) {
-          case "from":
-            newArgvs.data = args[0];
-            newArgvs.encoding = args[1]?.value || "utf8";
-            break;
-
-          case "toString":
-            newArgvs.buffer = args[0];
-            newArgvs.encoding = args[1]?.value || "utf8";
-            newArgvs.start = args[2] ?? 0;
-            newArgvs.end = args[3] ?? 0;
-            break;
-
-          case "write":
-            newArgvs.buffer = args[0];
-            newArgvs.string = args[1];
-            newArgvs.offset = args[2] ?? 0;
-            newArgvs.length = args[3] ?? 0;
-            newArgvs.encoding = args[4]?.value || "utf8";
-            break;
-
-          case "fill":
-            newArgvs.buffer = args[0];
-            newArgvs.value = args[1];
-            newArgvs.offset = args[2] ?? 0;
-            newArgvs.end = args[3] ?? 0;
-            newArgvs.encoding = args[4]?.value || "utf8";
-            break;
-
-          case "copy":
-            newArgvs.source = args[0];
-            newArgvs.target = args[1];
-            newArgvs.targetStart = args[2] ?? 0;
-            newArgvs.sourceStart = args[3] ?? 0;
-            newArgvs.sourceEnd = args[4] ?? 0;
-            break;
-
-          case "compare":
-            newArgvs.buf1 = args[0];
-            newArgvs.buf2 = args[1];
-            break;
-
-          case "concat":
-            if (Array.isArray(args[0])) {
-              newArgvs.buffers = args[0];
-            }
-            newArgvs.totalLength = args[1];
-            break;
-
-          case "indexOf":
-            newArgvs.buffer = args[0];
-            newArgvs.value = args[1];
-            newArgvs.byteOffset = args[2] ?? 0;
-            newArgvs.encoding = args[3]?.value || "utf8";
-            break;
-
-          case "slice":
-            newArgvs.buffer = args[0];
-            newArgvs.start = args[1] ?? 0;
-            newArgvs.end = args[2] ?? 0;
-            break;
-
-          case "swap":
-            newArgvs.buffer = args[0];
-            newArgvs.size = args[1] ?? 16;
-            break;
-        }
-
-        return newArgvs;
-      } catch (e) {
-        console.error("解析Buffer参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
-    updateArgvs(key, value) {
-      this.argvs = {
-        ...this.argvs,
-        [key]: value,
-      };
-    },
-    getSummary(argvs) {
-      const op = this.operations.find(
-        (op) => op.value === argvs.operation
-      )?.label;
-      return op;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        summary: this.getSummary(argvs),
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.buffer-editor {
-  display: flex;
-  flex-direction: column;
-}
-
-.options-container {
-  min-height: 32px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-</style>
diff --git a/src/components/composer/network/UrlEditor.vue b/src/components/composer/network/UrlEditor.vue
deleted file mode 100644
index 1422f340..00000000
--- a/src/components/composer/network/UrlEditor.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<template>
-  <div class="url-editor">
-    <!-- 操作类型选择 -->
-    <OperationCard
-      :model-value="argvs.operation"
-      @update:model-value="(val) => updateArgvs('operation', val)"
-      :options="operations"
-    />
-
-    <!-- 操作配置 -->
-    <div class="operation-options q-mt-sm">
-      <div class="options-container">
-        <!-- URL 输入 -->
-        <template v-if="needsUrlInput">
-          <VariableInput
-            :model-value="argvs.url"
-            @update:model-value="(val) => updateArgvs('url', val)"
-            label="URL"
-            icon="link"
-          />
-        </template>
-
-        <!-- 查询字符串输入 -->
-        <template
-          v-if="
-            argvs.operation === 'parseQuery' ||
-            argvs.operation === 'formatQuery'
-          "
-        >
-          <template v-if="argvs.operation === 'parseQuery'">
-            <VariableInput
-              :model-value="argvs.query"
-              @update:model-value="(val) => updateArgvs('query', val)"
-              label="查询字符串"
-              icon="search"
-            />
-          </template>
-          <template v-else>
-            <DictEditor
-              :model-value="argvs.queryParams"
-              @update:model-value="(val) => updateArgvs('queryParams', val)"
-            />
-          </template>
-        </template>
-
-        <!-- 参数操作的参数输入 -->
-        <template
-          v-if="
-            ['getQueryParam', 'addQueryParam', 'removeQueryParam'].includes(
-              argvs.operation
-            )
-          "
-        >
-          <VariableInput
-            :model-value="argvs.param"
-            @update:model-value="(val) => updateArgvs('param', val)"
-            label="参数名"
-            icon="key"
-            class="q-mt-sm"
-          />
-          <template v-if="argvs.operation === 'addQueryParam'">
-            <div class="q-mt-sm">
-              <VariableInput
-                :model-value="argvs.value"
-                @update:model-value="(val) => updateArgvs('value', val)"
-                label="参数值"
-                icon="text_fields"
-              />
-            </div>
-          </template>
-        </template>
-
-        <!-- 主机名输入 -->
-        <template v-if="argvs.operation === 'parseHost'">
-          <VariableInput
-            :model-value="argvs.host"
-            @update:model-value="(val) => updateArgvs('host', val)"
-            label="主机名"
-            icon="dns"
-          />
-        </template>
-
-        <!-- 路径输入 -->
-        <template v-if="argvs.operation === 'parsePath'">
-          <VariableInput
-            :model-value="argvs.path"
-            @update:model-value="(val) => updateArgvs('path', val)"
-            label="路径"
-            icon="folder"
-          />
-        </template>
-
-        <!-- URL 对象输入 -->
-        <template v-if="argvs.operation === 'format'">
-          <div class="row q-col-gutter-sm">
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.protocol"
-                @update:model-value="(val) => updateUrlObject('protocol', val)"
-                label="协议"
-                icon="security"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.auth"
-                @update:model-value="(val) => updateUrlObject('auth', val)"
-                label="认证信息"
-                icon="person"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.hostname"
-                @update:model-value="(val) => updateUrlObject('hostname', val)"
-                label="主机名"
-                icon="dns"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.port"
-                @update:model-value="(val) => updateUrlObject('port', val)"
-                label="端口"
-                icon="settings_ethernet"
-              />
-            </div>
-            <div class="col-12">
-              <VariableInput
-                :model-value="argvs.urlObject.pathname"
-                @update:model-value="(val) => updateUrlObject('pathname', val)"
-                label="路径"
-                icon="folder"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.search"
-                @update:model-value="(val) => updateUrlObject('search', val)"
-                label="查询字符串"
-                icon="search"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.urlObject.hash"
-                @update:model-value="(val) => updateUrlObject('hash', val)"
-                label="锚点"
-                icon="tag"
-              />
-            </div>
-          </div>
-        </template>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import DictEditor from "components/composer/common/DictEditor.vue";
-import OperationCard from "components/composer/common/OperationCard.vue";
-
-export default defineComponent({
-  name: "UrlEditor",
-  components: {
-    VariableInput,
-    DictEditor,
-    OperationCard,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      operations: [
-        { value: "parse", label: "解析URL", icon: "link_off" },
-        { value: "format", label: "格式化URL", icon: "link" },
-        { value: "parseQuery", label: "解析查询字符串", icon: "search" },
-        { value: "formatQuery", label: "格式化查询字符串", icon: "edit" },
-        { value: "parsePath", label: "解析路径", icon: "folder_open" },
-        { value: "parseHost", label: "解析主机名", icon: "dns" },
-        { value: "getQueryParam", label: "获取参数", icon: "find_in_page" },
-        { value: "addQueryParam", label: "添加参数", icon: "add_circle" },
-        { value: "removeQueryParam", label: "移除参数", icon: "remove_circle" },
-        { value: "isAbsolute", label: "检查绝对URL", icon: "check_circle" },
-        { value: "parseComponents", label: "解析组成部分", icon: "category" },
-      ],
-      defaultArgvs: {
-        operation: "parse",
-        url: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        query: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        queryParams: {},
-        param: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        value: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        host: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        path: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        urlObject: {
-          protocol: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          auth: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          hostname: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          port: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          pathname: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          search: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          hash: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-        },
-      },
-    };
-  },
-  computed: {
-    argvs: {
-      get() {
-        return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
-        );
-      },
-      set(value) {
-        this.updateModelValue(value);
-      },
-    },
-    needsUrlInput() {
-      return [
-        "parse",
-        "getQueryParam",
-        "addQueryParam",
-        "removeQueryParam",
-        "isAbsolute",
-        "parseComponents",
-      ].includes(this.argvs.operation);
-    },
-  },
-  methods: {
-    generateCode(argvs = this.argvs) {
-      switch (argvs.operation) {
-        case "parse":
-        case "isAbsolute":
-        case "parseComponents":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.url
-          )})`;
-
-        case "format":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.urlObject
-          )})`;
-
-        case "parseQuery":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.query
-          )})`;
-
-        case "formatQuery":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.queryParams
-          )})`;
-
-        case "parsePath":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.path
-          )})`;
-
-        case "parseHost":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.host
-          )})`;
-
-        case "getQueryParam":
-        case "removeQueryParam":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.url
-          )}, ${stringifyArgv(argvs.param)})`;
-
-        case "addQueryParam":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.url
-          )}, ${stringifyArgv(argvs.param)}, ${stringifyArgv(argvs.value)})`;
-
-        default:
-          return `${this.modelValue.value}.${argvs.operation}()`;
-      }
-    },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        const variableFormatPaths = ["arg*", "arg*.**"];
-
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const operation = result.name.split(".").pop();
-        const [firstArg, secondArg, thirdArg] = result.argvs;
-
-        const newArgvs = {
-          ...this.defaultArgvs,
-          operation,
-        };
-
-        switch (operation) {
-          case "parse":
-          case "isAbsolute":
-          case "parseComponents":
-            newArgvs.url = firstArg;
-            break;
-
-          case "format":
-            newArgvs.urlObject = firstArg || this.defaultArgvs.urlObject;
-            break;
-
-          case "parseQuery":
-            newArgvs.query = firstArg;
-            break;
-
-          case "formatQuery":
-            if (firstArg) {
-              newArgvs.queryParams = firstArg;
-            }
-            break;
-
-          case "parsePath":
-            newArgvs.path = firstArg;
-            break;
-
-          case "parseHost":
-            newArgvs.host = firstArg;
-            break;
-
-          case "getQueryParam":
-          case "removeQueryParam":
-            newArgvs.url = firstArg;
-            newArgvs.param = secondArg;
-            break;
-
-          case "addQueryParam":
-            newArgvs.url = firstArg;
-            newArgvs.param = secondArg;
-            newArgvs.value = thirdArg;
-            break;
-        }
-
-        return newArgvs;
-      } catch (e) {
-        console.error("解析URL参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
-    updateArgvs(key, value) {
-      this.argvs = {
-        ...this.argvs,
-        [key]: value,
-      };
-    },
-    updateUrlObject(key, value) {
-      this.updateArgvs("urlObject", {
-        ...this.argvs.urlObject,
-        [key]: value,
-      });
-    },
-    getSummary(argvs) {
-      const op = this.operations.find(
-        (op) => op.value === argvs.operation
-      )?.label;
-      return op + " " + argvs.url.value;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        summary: this.getSummary(argvs),
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.url-editor {
-  display: flex;
-  flex-direction: column;
-}
-
-.options-container {
-  min-height: 32px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-</style>
diff --git a/src/components/composer/system/OsEditor.vue b/src/components/composer/system/OsEditor.vue
deleted file mode 100644
index 6ece904c..00000000
--- a/src/components/composer/system/OsEditor.vue
+++ /dev/null
@@ -1,368 +0,0 @@
-<template>
-  <div class="os-editor">
-    <!-- 操作类型选择 -->
-    <OperationCard
-      :model-value="argvs.operation"
-      @update:model-value="(val) => updateArgvs('operation', val)"
-      :options="operations"
-    />
-
-    <!-- 操作配置 -->
-    <div class="operation-options q-mt-sm" v-if="hasOptions">
-      <div class="bubble-pointer" :style="pointerStyle"></div>
-      <!-- CPU信息配置 -->
-      <div v-if="argvs.operation === 'cpus'" class="options-container">
-        <div class="row items-center q-gutter-x-sm">
-          <div
-            v-for="opt in formatOptions"
-            :key="opt.value"
-            :class="['custom-btn', { active: argvs.format === opt.value }]"
-            @click="updateArgvs('format', opt.value)"
-          >
-            {{ opt.label }}
-          </div>
-        </div>
-      </div>
-
-      <!-- 内存信息配置 -->
-      <div v-if="argvs.operation === 'memory'" class="options-container">
-        <div class="row items-center q-gutter-x-sm">
-          <div
-            v-for="opt in memoryOptions"
-            :key="opt.value"
-            :class="['custom-btn', { active: argvs.type === opt.value }]"
-            @click="updateArgvs('type', opt.value)"
-          >
-            {{ opt.label }}
-          </div>
-        </div>
-      </div>
-
-      <!-- 网络信息配置 -->
-      <div v-if="argvs.operation === 'network'" class="options-container">
-        <div class="row items-center q-gutter-x-sm">
-          <div
-            v-for="opt in networkOptions"
-            :key="opt.value"
-            :class="['custom-btn', { active: argvs.type === opt.value }]"
-            @click="updateArgvs('type', opt.value)"
-          >
-            {{ opt.label }}
-          </div>
-        </div>
-        <div class="q-mt-xs" v-if="argvs.type === 'networkInterfaces'">
-          <q-checkbox
-            :model-value="argvs.internal"
-            @update:model-value="(val) => updateArgvs('internal', val)"
-            label="包含内部接口"
-            dense
-            class="text-caption"
-          />
-        </div>
-      </div>
-
-      <!-- 平台信息配置 -->
-      <div v-if="argvs.operation === 'platform'" class="options-container">
-        <div class="row items-center q-gutter-x-sm wrap">
-          <div
-            v-for="opt in platformOptions"
-            :key="opt.value"
-            :class="['custom-btn', { active: argvs.type === opt.value }]"
-            @click="updateArgvs('type', opt.value)"
-          >
-            {{ opt.label }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import OperationCard from "components/composer/common/OperationCard.vue";
-export default defineComponent({
-  name: "OsEditor",
-  components: {
-    OperationCard,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      operations: [
-        { value: "arch", label: "系统架构", icon: "memory" },
-        { value: "cpus", label: "CPU信息", icon: "developer_board" },
-        { value: "memory", label: "内存信息", icon: "storage" },
-        { value: "network", label: "网络信息", icon: "wifi" },
-        { value: "platform", label: "平台信息", icon: "computer" },
-      ],
-      formatOptions: [
-        { label: "完整信息", value: "full" },
-        { label: "仅型号和速度", value: "simple" },
-      ],
-      memoryOptions: [
-        { label: "总内存", value: "totalmem" },
-        { label: "空闲内存", value: "freemem" },
-      ],
-      networkOptions: [
-        { label: "主机名", value: "hostname" },
-        { label: "网络接口", value: "networkInterfaces" },
-      ],
-      platformOptions: [
-        { label: "操作系统名称", value: "platform" },
-        { label: "操作系统类型", value: "type" },
-        { label: "操作系统版本", value: "release" },
-        { label: "操作系统架构", value: "arch" },
-        { label: "CPU字节序", value: "endianness" },
-        { label: "系统临时目录", value: "tmpdir" },
-        { label: "主目录", value: "homedir" },
-        { label: "系统正常运行时间", value: "uptime" },
-        { label: "用户信息", value: "userInfo" },
-      ],
-      defaultArgvs: {
-        operation: "arch",
-        format: "full",
-        type: "platform",
-        internal: false,
-      },
-    };
-  },
-  computed: {
-    argvs: {
-      get() {
-        return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
-        );
-      },
-      set(value) {
-        // 根据操作类型重置相关参数
-        const newValue = { ...value };
-        if (value.operation !== this.argvs.operation) {
-          switch (value.operation) {
-            case "cpus":
-              newValue.format = "full";
-              delete newValue.type;
-              delete newValue.internal;
-              break;
-            case "memory":
-              newValue.type = "totalmem";
-              delete newValue.format;
-              delete newValue.internal;
-              break;
-            case "network":
-              newValue.type = "hostname";
-              delete newValue.format;
-              break;
-            case "platform":
-              newValue.type = "platform";
-              delete newValue.format;
-              delete newValue.internal;
-              break;
-            default:
-              delete newValue.format;
-              delete newValue.type;
-              delete newValue.internal;
-          }
-        }
-
-        this.updateModelValue(newValue);
-      },
-    },
-    hasOptions() {
-      return ["cpus", "memory", "network", "platform"].includes(
-        this.argvs.operation
-      );
-    },
-    pointerStyle() {
-      const activeIndex = this.operations.findIndex(
-        (op) => op.value === this.argvs.operation
-      );
-      if (activeIndex === -1) return {};
-
-      // 获取操作卡片容器的宽度
-      const container = document.querySelector(".operation-cards");
-      if (!container) return {};
-
-      const containerWidth = container.offsetWidth;
-      const cardCount = this.operations.length;
-
-      // 计算每个卡片的位置
-      const cardWidth = 100; // 卡片宽度
-      const pointerWidth = 12; // 尖角宽度
-
-      // 计算卡片之间的间距
-      const totalGapWidth = containerWidth - cardWidth * cardCount;
-      const gapWidth = totalGapWidth / (cardCount - 1);
-
-      // 计算当前选中卡片的中心位置
-      const leftOffset =
-        (cardWidth + gapWidth) * activeIndex + cardWidth / 2 - pointerWidth / 2;
-
-      return {
-        left: `${leftOffset}px`,
-      };
-    },
-  },
-  methods: {
-    generateCode(argvs = this.argvs) {
-      const params = {};
-
-      // 根据不同操作类型添加特定参数
-      switch (argvs.operation) {
-        case "cpus":
-          params.format = argvs.format;
-          break;
-        case "memory":
-          params.type = argvs.type;
-          break;
-        case "network":
-          params.type = argvs.type;
-          if (argvs.type === "networkInterfaces") {
-            params.internal = argvs.internal;
-          }
-          break;
-        case "platform":
-          params.type = argvs.type;
-          break;
-      }
-
-      // 如果没有参数，直接调用函数
-      if (Object.keys(params).length === 0) {
-        return `${this.modelValue.value}.${argvs.operation}()`;
-      }
-
-      return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-        params
-      )})`;
-    },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        // 使用 parseFunction 解析代码
-        const result = parseFunction(code);
-        if (!result) return this.defaultArgvs;
-
-        // 获取操作名称（方法名）
-        const operation = result.name.split(".").pop();
-        const [params = {}] = result.argvs;
-
-        return {
-          ...this.defaultArgvs,
-          operation,
-          ...params,
-        };
-      } catch (e) {
-        console.error("解析OS参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
-    updateArgvs(key, value) {
-      this.argvs = {
-        ...this.argvs,
-        [key]: value,
-      };
-    },
-    getSummary(argvs) {
-      return this.operations.find((op) => op.value === argvs.operation).label;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        summary: this.getSummary(argvs),
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.os-editor {
-  display: flex;
-  flex-direction: column;
-}
-
-.operation-options {
-  position: relative;
-  background: #f8f8f8;
-  border-radius: 4px;
-  padding: 12px;
-  margin-top: 12px !important;
-  z-index: 0;
-}
-
-.options-container {
-  min-height: 32px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.bubble-pointer {
-  position: absolute;
-  top: -6px;
-  width: 12px;
-  height: 12px;
-  background: #f8f8f8;
-  transform: rotate(45deg);
-  transition: left 0.3s ease;
-  z-index: 1;
-}
-
-.body--dark .operation-options,
-.body--dark .bubble-pointer {
-  background: rgba(0, 0, 0, 0.1);
-}
-
-.custom-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  height: 24px;
-  padding: 0 8px;
-  font-size: 12px;
-  border-radius: 3px;
-  cursor: pointer;
-  transition: all 0.2s ease;
-  color: var(--q-primary);
-  background: transparent;
-  white-space: nowrap;
-}
-
-.custom-btn:hover {
-  background: var(--q-primary-opacity-1);
-}
-
-.custom-btn.active {
-  color: white;
-  background: var(--q-primary);
-}
-
-/* 覆盖command-composer的样式 */
-.command-composer .operation-cards {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.command-composer .operation-card {
-  width: 100px;
-}
-</style>
diff --git a/src/components/composer/system/PathEditor.vue b/src/components/composer/system/PathEditor.vue
deleted file mode 100644
index 649b07f2..00000000
--- a/src/components/composer/system/PathEditor.vue
+++ /dev/null
@@ -1,438 +0,0 @@
-<template>
-  <div class="path-editor">
-    <!-- 操作类型选择 -->
-    <OperationCard
-      :model-value="argvs.operation"
-      @update:model-value="(val) => updateArgvs('operation', val)"
-      :options="operations"
-    />
-
-    <!-- 操作配置 -->
-    <div class="operation-options q-mt-sm">
-      <!-- 通用路径输入 -->
-      <div class="options-container">
-        <template
-          v-if="
-            [
-              'normalize',
-              'parse',
-              'dirname',
-              'basename',
-              'extname',
-              'isAbsolute',
-            ].includes(argvs.operation)
-          "
-        >
-          <VariableInput
-            :model-value="argvs.path"
-            @update:model-value="(val) => updateArgvs('path', val)"
-            label="路径"
-            icon="folder"
-          />
-          <!-- basename 的扩展名参数 -->
-          <div v-if="argvs.operation === 'basename'" class="q-mt-sm">
-            <VariableInput
-              :model-value="argvs.ext"
-              @update:model-value="(val) => updateArgvs('ext', val)"
-              label="要移除的扩展名（可选）"
-              icon="extension"
-            />
-          </div>
-        </template>
-
-        <!-- join 和 resolve 的多路径输入 -->
-        <template v-if="['join', 'resolve'].includes(argvs.operation)">
-          <div
-            v-for="(path, index) in argvs.paths"
-            :key="index"
-            class="q-mb-sm"
-          >
-            <div class="row items-center q-gutter-sm">
-              <div class="col">
-                <VariableInput
-                  :model-value="path"
-                  @update:model-value="(val) => updatePathAtIndex(index, val)"
-                  :label="'路径片段 ' + (index + 1)"
-                  icon="folder"
-                />
-              </div>
-              <q-btn
-                v-if="index === argvs.paths.length - 1"
-                flat
-                round
-                dense
-                icon="add"
-                size="sm"
-                color="primary"
-                @click="addPath"
-              />
-              <q-btn
-                v-if="argvs.paths.length > 1"
-                flat
-                round
-                dense
-                icon="remove"
-                color="negative"
-                size="sm"
-                @click="removePath(index)"
-              />
-            </div>
-          </div>
-        </template>
-
-        <!-- relative 的起始和目标路径 -->
-        <template v-if="argvs.operation === 'relative'">
-          <VariableInput
-            :model-value="argvs.from"
-            @update:model-value="(val) => updateArgvs('from', val)"
-            label="起始路径"
-            icon="folder"
-          />
-          <div class="q-mt-sm">
-            <VariableInput
-              :model-value="argvs.to"
-              @update:model-value="(val) => updateArgvs('to', val)"
-              label="目标路径"
-              icon="folder"
-            />
-          </div>
-        </template>
-
-        <!-- format 的路径对象 -->
-        <template v-if="argvs.operation === 'format'">
-          <div class="row q-col-gutter-sm">
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.pathObject.root"
-                @update:model-value="(val) => updatePathObject('root', val)"
-                label="根路径"
-                icon="folder"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.pathObject.dir"
-                @update:model-value="(val) => updatePathObject('dir', val)"
-                label="目录"
-                icon="folder"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.pathObject.base"
-                @update:model-value="(val) => updatePathObject('base', val)"
-                label="基本名称"
-                icon="description"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.pathObject.name"
-                @update:model-value="(val) => updatePathObject('name', val)"
-                label="文件名"
-                icon="insert_drive_file"
-              />
-            </div>
-            <div class="col-12 col-sm-6">
-              <VariableInput
-                :model-value="argvs.pathObject.ext"
-                @update:model-value="(val) => updatePathObject('ext', val)"
-                label="扩展名"
-                icon="extension"
-              />
-            </div>
-          </div>
-        </template>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import OperationCard from "components/composer/common/OperationCard.vue";
-export default defineComponent({
-  name: "PathEditor",
-  components: {
-    VariableInput,
-    OperationCard,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      operations: [
-        { value: "normalize", label: "规范化路径", icon: "straighten" },
-        { value: "join", label: "连接路径", icon: "add_link" },
-        { value: "parse", label: "解析路径", icon: "account_tree" },
-        { value: "dirname", label: "获取目录名", icon: "folder" },
-        { value: "basename", label: "获取文件名", icon: "description" },
-        { value: "extname", label: "获取扩展名", icon: "extension" },
-        { value: "isAbsolute", label: "判断绝对路径", icon: "check_circle" },
-        { value: "relative", label: "计算相对路径", icon: "compare_arrows" },
-        { value: "resolve", label: "解析绝对路径", icon: "assistant_direction" },
-        { value: "format", label: "格式化路径", icon: "format_shapes" },
-      ],
-      defaultArgvs: {
-        operation: "normalize",
-        path: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        paths: [
-          {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-        ],
-        from: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        to: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        ext: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        pathObject: {
-          root: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          dir: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          base: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          ext: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-        },
-      },
-    };
-  },
-  computed: {
-    argvs: {
-      get() {
-        return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
-        );
-      },
-      set(value) {
-        this.updateModelValue(value);
-      },
-    },
-    pointerStyle() {
-      const activeIndex = this.operations.findIndex(
-        (op) => op.value === this.argvs.operation
-      );
-      if (activeIndex === -1) return {};
-
-      const cardWidth = 80;
-      const gap = 4;
-      const pointerWidth = 12;
-      const leftOffset =
-        (cardWidth + gap) * activeIndex + cardWidth / 2 - pointerWidth / 2;
-
-      return {
-        left: `${leftOffset}px`,
-      };
-    },
-  },
-  methods: {
-    generateCode(argvs = this.argvs) {
-      switch (argvs.operation) {
-        case "normalize":
-        case "parse":
-        case "dirname":
-        case "extname":
-        case "isAbsolute":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.path
-          )})`;
-
-        case "basename":
-          if (argvs.ext && argvs.ext.value) {
-            return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-              argvs.path
-            )}, ${stringifyArgv(argvs.ext)})`;
-          }
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.path
-          )})`;
-
-        case "join":
-        case "resolve":
-          return `${this.modelValue.value}.${argvs.operation}(${argvs.paths
-            .map((p) => stringifyArgv(p))
-            .join(", ")})`;
-
-        case "relative":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.from
-          )}, ${stringifyArgv(argvs.to)})`;
-
-        case "format":
-          return `${this.modelValue.value}.${argvs.operation}(${stringifyArgv(
-            argvs.pathObject
-          )})`;
-
-        default:
-          return `${this.modelValue.value}.${argvs.operation}()`;
-      }
-    },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        // 定义需要使用variable格式的路径
-        const variableFormatPaths = [
-          "arg*", // 所有参数
-          "arg*.**", // 所有参数的所有嵌套属性
-        ];
-
-        // 使用 parseFunction 解析代码
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const operation = result.name.split(".").pop();
-        const [firstArg, secondArg] = result.argvs;
-
-        const newArgvs = {
-          ...this.defaultArgvs,
-          operation,
-        };
-
-        switch (operation) {
-          case "normalize":
-          case "parse":
-          case "dirname":
-          case "extname":
-          case "isAbsolute":
-            newArgvs.path = firstArg;
-            break;
-
-          case "basename":
-            newArgvs.path = firstArg;
-            if (secondArg) {
-              newArgvs.ext = secondArg;
-            }
-            break;
-
-          case "join":
-          case "resolve":
-            newArgvs.paths = result.argvs.map((arg) => arg);
-            break;
-
-          case "relative":
-            newArgvs.from = firstArg;
-            newArgvs.to = secondArg;
-            break;
-
-          case "format":
-            newArgvs.pathObject = firstArg;
-            break;
-        }
-
-        return newArgvs;
-      } catch (e) {
-        console.error("解析Path参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
-    updateArgvs(key, value) {
-      this.argvs = {
-        ...this.argvs,
-        [key]: value,
-      };
-    },
-    updatePathAtIndex(index, value) {
-      const newPaths = [...this.argvs.paths];
-      newPaths[index] = value;
-      this.updateArgvs("paths", newPaths);
-    },
-    updatePathObject(key, value) {
-      this.updateArgvs("pathObject", {
-        ...this.argvs.pathObject,
-        [key]: value,
-      });
-    },
-    addPath() {
-      this.updateArgvs("paths", [
-        ...this.argvs.paths,
-        {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-      ]);
-    },
-    removePath(index) {
-      const newPaths = [...this.argvs.paths];
-      newPaths.splice(index, 1);
-      this.updateArgvs("paths", newPaths);
-    },
-    getSummary(argvs) {
-      return this.operations.find((op) => op.value === argvs.operation)?.label;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        summary: this.getSummary(argvs),
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.path-editor {
-  display: flex;
-  flex-direction: column;
-}
-
-.options-container {
-  min-height: 32px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index f6fa48af..fc0da7cf 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -60,19 +60,7 @@ export const SystemCommandEditor = defineAsyncComponent(() =>
   import("components/composer/system/SystemCommandEditor.vue")
 );
 
-export const OsEditor = defineAsyncComponent(() =>
-  import("components/composer/system/OsEditor.vue")
-);
 
-export const PathEditor = defineAsyncComponent(() =>
-  import("components/composer/system/PathEditor.vue")
-);
 export const ZlibEditor = defineAsyncComponent(() =>
   import("src/components/composer/data/ZlibEditor.vue")
 );
-export const UrlEditor = defineAsyncComponent(() =>
-  import("components/composer/network/UrlEditor.vue")
-);
-export const BufferEditor = defineAsyncComponent(() =>
-  import("src/components/composer/data/BufferEditor.vue")
-);
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 10678d71..864b13da 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -312,11 +312,355 @@ export const dataCommands = {
       saveOutput: true,
     },
     {
-      value: "quickcomposer.data.buffer",
+      value: "quickcomposer.data.buffer.from",
       label: "Buffer操作",
       desc: "Buffer创建、转换和操作",
-      component: "BufferEditor",
+      config: [],
       icon: "memory",
+      functionSelector: [
+        {
+          value: "quickcomposer.data.buffer.from",
+          label: "创建Buffer",
+          icon: "add_box",
+          config: [
+            {
+              label: "数据",
+              type: "varInput",
+              icon: "text_fields",
+              width: 9,
+            },
+            {
+              label: "编码",
+              type: "select",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 3,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.toString",
+          label: "转换字符串",
+          icon: "text_fields",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 12,
+            },
+            {
+              label: "编码",
+              type: "select",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
+            },
+            {
+              label: "起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "结束位置",
+              type: "numInput",
+              icon: "last_page",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.write",
+          label: "写入数据",
+          icon: "edit",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 6,
+            },
+            {
+              label: "要写入的字符串",
+              type: "varInput",
+              icon: "edit",
+              width: 6,
+            },
+            {
+              label: "偏移量",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "长度",
+              type: "numInput",
+              icon: "straighten",
+              width: 4,
+            },
+            {
+              label: "编码",
+              type: "select",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.fill",
+          label: "填充数据",
+          icon: "format_color_fill",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 6,
+            },
+            {
+              label: "填充值",
+              type: "varInput",
+              icon: "format_color_fill",
+              width: 6,
+            },
+            {
+              label: "起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "结束位置",
+              type: "numInput",
+              icon: "last_page",
+              width: 4,
+            },
+            {
+              label: "编码",
+              type: "select",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.copy",
+          label: "复制数据",
+          icon: "content_copy",
+          config: [
+            {
+              label: "源Buffer",
+              type: "varInput",
+              icon: "content_copy",
+              width: 6,
+            },
+            {
+              label: "目标Buffer",
+              type: "varInput",
+              icon: "save",
+              width: 6,
+            },
+            {
+              label: "目标起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "源起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "源结束位置",
+              type: "numInput",
+              icon: "last_page",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.compare",
+          label: "比较数据",
+          icon: "compare",
+          config: [
+            {
+              label: "Buffer 1",
+              type: "varInput",
+              icon: "memory",
+              width: 6,
+            },
+            {
+              label: "Buffer 2",
+              type: "varInput",
+              icon: "memory",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.concat",
+          label: "连接Buffer",
+          icon: "merge",
+          config: [
+            {
+              label: "Buffer列表",
+              type: "arrayEditor",
+              icon: "memory",
+              width: 12,
+              defaultValue: [
+                {
+                  value: "",
+                  isString: false,
+                  __varInputVal__: true,
+                },
+              ],
+            },
+            {
+              label: "总长度（可选）",
+              type: "numInput",
+              icon: "straighten",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.slice",
+          label: "切片数据",
+          icon: "content_cut",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 12,
+            },
+            {
+              label: "起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 6,
+            },
+            {
+              label: "结束位置",
+              type: "numInput",
+              icon: "last_page",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.indexOf",
+          label: "查找数据",
+          icon: "search",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 12,
+            },
+            {
+              label: "要查找的值",
+              type: "varInput",
+              icon: "search",
+              width: 4,
+            },
+            {
+              label: "起始位置",
+              type: "numInput",
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "编码",
+              type: "select",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.swap",
+          label: "交换字节序",
+          icon: "swap_horiz",
+          config: [
+            {
+              label: "Buffer",
+              type: "varInput",
+              icon: "memory",
+              width: 9,
+            },
+            {
+              label: "字节大小",
+              type: "select",
+              icon: "memory",
+              options: [
+                { label: "16位", value: 16 },
+                { label: "32位", value: 32 },
+                { label: "64位", value: 64 },
+              ],
+              defaultValue: 16,
+              width: 3,
+            },
+          ],
+        },
+      ],
     },
     {
       value: "quickcomposer.data.zlib",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index a9ac8ca7..ab7dd501 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -47,11 +47,181 @@ export const networkCommands = {
       saveOutput: true,
     },
     {
-      value: "quickcomposer.network.url",
+      value: "quickcomposer.network.url.parse",
       label: "URL操作",
       desc: "URL解析、格式化和参数处理",
-      component: "UrlEditor",
       icon: "link",
+      config: [
+        {
+          label: "URL",
+          type: "varInput",
+          icon: "link",
+          width: "auto",
+        },
+      ],
+      functionSelector: [
+        {
+          value: "quickcomposer.network.url.parse",
+          label: "解析URL",
+          icon: "link_off",
+        },
+        {
+          value: "quickcomposer.network.url.format",
+          label: "格式化URL",
+          icon: "link",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "协议",
+              type: "varInput",
+              icon: "security",
+              width: 6,
+            },
+            {
+              label: "认证信息",
+              type: "varInput",
+              icon: "person",
+              width: 6,
+            },
+            {
+              label: "主机名",
+              type: "varInput",
+              icon: "dns",
+              width: 6,
+            },
+            {
+              label: "端口",
+              type: "varInput",
+              icon: "settings_ethernet",
+              width: 6,
+            },
+            {
+              label: "路径",
+              type: "varInput",
+              icon: "folder",
+            },
+            {
+              label: "查询字符串",
+              type: "varInput",
+              icon: "search",
+              width: 6,
+            },
+            {
+              label: "锚点",
+              type: "varInput",
+              icon: "tag",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.parseQuery",
+          label: "解析查询字符串",
+          icon: "search",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "查询字符串",
+              type: "varInput",
+              icon: "search",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.formatQuery",
+          label: "格式化查询字符串",
+          icon: "edit",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "参数",
+              type: "dictEditor",
+              icon: "edit",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.parsePath",
+          label: "解析路径",
+          icon: "folder_open",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "路径",
+              type: "varInput",
+              icon: "folder",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.parseHost",
+          label: "解析主机名",
+          icon: "dns",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "主机名",
+              type: "varInput",
+              icon: "dns",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.getQueryParam",
+          label: "获取参数",
+          icon: "find_in_page",
+          config: [
+            {
+              label: "参数名",
+              type: "varInput",
+              icon: "key",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.addQueryParam",
+          label: "添加参数",
+          icon: "add_circle",
+          config: [
+            {
+              label: "参数名",
+              type: "varInput",
+              icon: "key",
+              width: "auto",
+            },
+            {
+              label: "参数值",
+              type: "varInput",
+              icon: "text_fields",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.removeQueryParam",
+          label: "移除参数",
+          icon: "remove_circle",
+          config: [
+            {
+              label: "参数名",
+              type: "varInput",
+              icon: "key",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.network.url.isAbsolute",
+          label: "检查绝对URL",
+          icon: "check_circle",
+        },
+        {
+          value: "quickcomposer.network.url.parseComponents",
+          label: "解析组成部分",
+          icon: "category",
+        },
+      ],
     },
     {
       value: "quickcomposer.network.dns.lookupHost",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index cb6a6251..9e4caf4f 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -32,20 +32,252 @@ export const systemCommands = {
       isAsync: true,
     },
     {
-      value: "quickcomposer.system.os",
+      value: "quickcomposer.system.os.arch",
       label: "系统信息",
       desc: "获取操作系统相关信息",
-      component: "OsEditor",
       icon: "computer",
-      isAsync: true,
+      config: [],
+      functionSelector: [
+        {
+          value: "quickcomposer.system.os.arch",
+          label: "系统架构",
+          icon: "memory",
+        },
+        {
+          value: "quickcomposer.system.os.cpus",
+          label: "CPU信息",
+          icon: "developer_board",
+          config: [
+            {
+              label: "信息格式",
+              type: "buttonGroup",
+              options: [
+                { label: "完整信息", value: "full" },
+                { label: "仅型号和速度", value: "simple" },
+              ],
+              defaultValue: "full",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.os.memory",
+          label: "内存信息",
+          icon: "storage",
+          config: [
+            {
+              label: "内存类型",
+              type: "buttonGroup",
+              options: [
+                { label: "总内存", value: "totalmem" },
+                { label: "空闲内存", value: "freemem" },
+              ],
+              defaultValue: "totalmem",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.os.network",
+          label: "网络信息",
+          icon: "wifi",
+          config: [
+            {
+              label: "网络信息类型",
+              type: "buttonGroup",
+              options: [
+                { label: "主机名", value: "hostname" },
+                { label: "网络接口", value: "networkInterfaces" },
+              ],
+              defaultValue: "hostname",
+              width: 12,
+            },
+            {
+              label: "包含内部接口",
+              type: "checkbox",
+              defaultValue: false,
+              width: 12,
+              condition: "values[0] === 'networkInterfaces'",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.os.platform",
+          label: "平台信息",
+          icon: "computer",
+          config: [
+            {
+              label: "平台信息类型",
+              type: "buttonGroup",
+              options: [
+                { label: "操作系统名称", value: "platform" },
+                { label: "操作系统类型", value: "type" },
+                { label: "操作系统版本", value: "release" },
+                { label: "操作系统架构", value: "arch" },
+                { label: "CPU字节序", value: "endianness" },
+                { label: "系统临时目录", value: "tmpdir" },
+                { label: "主目录", value: "homedir" },
+                { label: "系统正常运行时间", value: "uptime" },
+                { label: "用户信息", value: "userInfo" },
+              ],
+              defaultValue: "platform",
+              width: 12,
+            },
+          ],
+        },
+      ],
     },
     {
-      value: "quickcomposer.system.path",
+      value: "quickcomposer.system.path.normalize",
       label: "路径操作",
-      desc: "路径操作",
-      component: "PathEditor",
-      icon: "folder_path",
-      isAsync: true,
+      desc: "路径解析和处理",
+      icon: "folder",
+      config: [
+        {
+          label: "路径",
+          type: "varInput",
+          icon: "folder",
+          width: "auto",
+        },
+      ],
+      functionSelector: [
+        {
+          value: "quickcomposer.system.path.normalize",
+          label: "规范化路径",
+          icon: "straighten",
+        },
+        {
+          value: "quickcomposer.system.path.parse",
+          label: "解析路径",
+          icon: "account_tree",
+        },
+        {
+          value: "quickcomposer.system.path.dirname",
+          label: "获取目录名",
+          icon: "folder",
+        },
+        {
+          value: "quickcomposer.system.path.basename",
+          label: "获取文件名",
+          icon: "description",
+          config: [
+            {
+              label: "要移除的扩展名",
+              type: "varInput",
+              icon: "extension",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.path.extname",
+          label: "获取扩展名",
+          icon: "extension",
+        },
+        {
+          value: "quickcomposer.system.path.isAbsolute",
+          label: "判断绝对路径",
+          icon: "check_circle",
+        },
+        {
+          value: "quickcomposer.system.path.join",
+          label: "连接路径",
+          icon: "add_link",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "路径片段",
+              type: "varInput",
+              icon: "folder",
+              width: "auto",
+            },
+            {
+              label: "路径片段",
+              type: "varInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.path.resolve",
+          label: "解析绝对路径",
+          icon: "assistant_direction",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "路径片段",
+              type: "varInput",
+              icon: "folder",
+              width: "auto",
+            },
+            {
+              label: "路径片段",
+              type: "varInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.path.relative",
+          label: "计算相对路径",
+          icon: "compare_arrows",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "起始路径",
+              type: "varInput",
+              icon: "folder",
+              width: 6,
+            },
+            {
+              label: "目标路径",
+              type: "varInput",
+              icon: "folder",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.system.path.format",
+          label: "格式化路径",
+          icon: "format_shapes",
+          excludeConfig: [0],
+          config: [
+            {
+              label: "根路径",
+              type: "varInput",
+              icon: "folder",
+              width: 6,
+            },
+            {
+              label: "目录",
+              type: "varInput",
+              icon: "folder",
+              width: 6,
+            },
+            {
+              label: "基本名称",
+              type: "varInput",
+              icon: "description",
+              width: 6,
+            },
+            {
+              label: "文件名",
+              type: "varInput",
+              icon: "insert_drive_file",
+              width: 6,
+            },
+            {
+              label: "扩展名",
+              type: "varInput",
+              icon: "extension",
+              width: 6,
+            },
+          ],
+        },
+      ],
     },
   ],
 };

From f742e6f121583e548fe47164ec640bdcb8c5b6ae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 00:54:51 +0800
Subject: [PATCH 005/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/ArrayEditor.vue           |  42 ++-
 .../composer/common/OperationCard.vue         |  12 +-
 src/components/composer/common/ParamInput.vue |   1 +
 .../composer/ui/SelectListEditor.vue          | 346 ++++++++++++++++++
 src/js/composer/cardComponents.js             |   5 +-
 src/js/composer/commands/dataCommands.js      |   2 +-
 src/js/composer/commands/index.js             |   2 +-
 .../commands/{uiCommand.js => uiCommands.js}  |   7 +
 8 files changed, 398 insertions(+), 19 deletions(-)
 create mode 100644 src/components/composer/ui/SelectListEditor.vue
 rename src/js/composer/commands/{uiCommand.js => uiCommands.js} (87%)

diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index ea6d64c6..71683a69 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -1,17 +1,19 @@
 <template>
   <div class="array-editor">
     <div v-for="(item, index) in items" :key="index" class="row items-center">
-      <template v-if="options.keys">
+      <template v-if="optionsKeys.length">
         <div
-          v-for="key in options.keys"
-          :key="key"
-          :class="['col', options.keys.length > 1 ? 'q-pr-sm' : '']"
+          v-for="key in optionsKeys"
+          :key="key.value"
+          :class="['col', optionsKeys.length > 1 ? 'q-pr-sm' : '']"
         >
           <VariableInput
-            :model-value="item[key.value || key]"
-            :label="key.label || key"
+            :model-value="item[key.value]"
+            :label="key.label"
             :icon="icon || 'code'"
-            @update:model-value="(val) => updateItemKeyValue(index, key, val)"
+            @update:model-value="
+              (val) => updateItemKeyValue(index, key.value, val)
+            "
           />
         </div>
       </template>
@@ -147,15 +149,25 @@ export default defineComponent({
     items() {
       return this.modelValue.length ? this.modelValue : this.initializeItems();
     },
+    optionsKeys() {
+      return (
+        this.options?.keys?.map((key) => {
+          return {
+            value: key.value || key,
+            label: key.label || key,
+          };
+        }) || []
+      );
+    },
   },
   methods: {
     initializeItems() {
-      if (this.options.keys) {
+      if (this.optionsKeys?.length) {
         const item = {};
-        this.options.keys.forEach((key) => {
+        this.optionsKeys.forEach((key) => {
           item[key] = {
             value: "",
-            isString: false,
+            isString: true,
             __varInputVal__: true,
           };
         });
@@ -165,7 +177,7 @@ export default defineComponent({
       return [
         {
           value: "",
-          isString: false,
+          isString: true,
           __varInputVal__: true,
         },
       ];
@@ -181,7 +193,7 @@ export default defineComponent({
         this.options.keys.forEach((key) => {
           newItem[key] = {
             value: "",
-            isString: false,
+            isString: true,
             __varInputVal__: true,
           };
         });
@@ -191,7 +203,7 @@ export default defineComponent({
           ...this.items,
           {
             value: "",
-            isString: false,
+            isString: true,
             __varInputVal__: true,
           },
         ];
@@ -211,7 +223,7 @@ export default defineComponent({
           this.options.keys.forEach((key) => {
             newItem[key] = {
               value: "",
-              isString: false,
+              isString: true,
               __varInputVal__: true,
             };
           });
@@ -219,7 +231,7 @@ export default defineComponent({
         } else {
           newItems.push({
             value: "",
-            isString: false,
+            isString: true,
             __varInputVal__: true,
           });
         }
diff --git a/src/components/composer/common/OperationCard.vue b/src/components/composer/common/OperationCard.vue
index e6cafe39..8103ad54 100644
--- a/src/components/composer/common/OperationCard.vue
+++ b/src/components/composer/common/OperationCard.vue
@@ -7,6 +7,10 @@
           :key="option.value"
           :class="['operation-card', { active: modelValue === option.value }]"
           :data-value="option.value"
+          :style="{
+            borderRadius: square ? '5px' : '16px',
+            height: height ? height : '',
+          }"
           @click="$emit('update:modelValue', option.value)"
         >
           <q-icon
@@ -36,6 +40,13 @@ export default {
       type: String,
       default: "80px",
     },
+    square: {
+      type: Boolean,
+      default: false,
+    },
+    height: {
+      type: String,
+    },
   },
   computed: {
     containerStyle() {
@@ -105,7 +116,6 @@ export default {
   cursor: pointer;
   transition: all 0.2s ease;
   border: 1px solid transparent;
-  border-radius: 16px;
   background: rgba(0, 0, 0, 0.03);
   display: flex;
   align-items: center;
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 2324960b..04e89b1c 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -25,6 +25,7 @@
         v-else-if="config.type === 'arrayEditor'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
+        :label="config.label"
         :options="config.options"
       />
       <DictEditor
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
new file mode 100644
index 00000000..2d4f0ebc
--- /dev/null
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="row q-col-gutter-sm">
+    <!-- 控制区 -->
+    <div class="col-12">
+      <div class="row items-center q-gutter-sm">
+        <!-- 选项类型选择 -->
+        <div class="col model-type-select">
+          <OperationCard
+            v-model="argvs.optionType"
+            :options="[
+              { label: '纯文本', value: 'plaintext', icon: 'text_fields' },
+              { label: 'HTML', value: 'html', icon: 'code' },
+              { label: 'JSON', value: 'json', icon: 'data_object' },
+            ]"
+            square
+            height="36px"
+            @update:model-value="updateArgvs('optionType', $event)"
+          />
+        </div>
+
+        <!-- 输入模式切换 -->
+        <div class="col-2.5 input-mode-select">
+          <q-select
+            :model-value="argvs.inputMode"
+            @update:model-value="updateArgvs('inputMode', $event)"
+            :options="[
+              {
+                label: '手动输入',
+                value: 'manual',
+                icon: 'edit',
+              },
+              {
+                label: '变量输入',
+                value: 'variable',
+                icon: 'functions',
+              },
+            ]"
+            dense
+            filled
+            emit-value
+            map-options
+            option-value="value"
+            option-label="label"
+          >
+            <template v-slot:selected>
+              <div class="row items-center">
+                <q-icon
+                  :name="argvs.inputMode === 'manual' ? 'edit' : 'functions'"
+                  size="16px"
+                  class="q-mr-xs"
+                />
+                {{ argvs.inputMode === "manual" ? "手动输入" : "变量输入" }}
+              </div>
+            </template>
+          </q-select>
+        </div>
+
+        <!-- 设置按钮 -->
+        <div class="col-auto">
+          <q-btn
+            flat
+            round
+            dense
+            icon="settings"
+            color="primary"
+            @click="showSettings = !showSettings"
+          >
+            <q-tooltip>高级设置</q-tooltip>
+          </q-btn>
+        </div>
+      </div>
+    </div>
+
+    <!-- 设置面板 -->
+    <q-slide-transition>
+      <div v-show="showSettings" class="row q-col-gutter-sm">
+        <!-- 搜索框占位符 -->
+        <div class="col">
+          <VariableInput
+            :disabled="!argvs.enableSearch"
+            :model-value="argvs.placeholder"
+            label="搜索框占位符"
+            icon="search"
+            dense
+            @update:model-value="updateArgvs('placeholder', $event)"
+          />
+        </div>
+
+        <!-- 开关选项 -->
+        <div class="col-auto items-center row">
+          <div class="row q-col-gutter-x-md">
+            <q-checkbox
+              :model-value="argvs.enableSearch"
+              label="启用搜索"
+              dense
+              class="toggle-option"
+              @update:model-value="updateArgvs('enableSearch', $event)"
+            />
+            <q-checkbox
+              :model-value="argvs.showCancelButton"
+              label="关闭按钮"
+              dense
+              class="toggle-option"
+              @update:model-value="updateArgvs('showCancelButton', $event)"
+            />
+            <q-checkbox
+              :model-value="argvs.closeOnSelect"
+              label="选择后关闭"
+              dense
+              class="toggle-option"
+              @update:model-value="updateArgvs('closeOnSelect', $event)"
+            />
+          </div>
+        </div>
+      </div>
+    </q-slide-transition>
+
+    <!-- 变量输入模式 -->
+    <div v-if="argvs.inputMode === 'variable'" class="col-12">
+      <VariableInput
+        :model-value="argvs.selects"
+        label="选项列表"
+        icon="list"
+        @update:model-value="updateArgvs('selects', $event)"
+      />
+    </div>
+
+    <!-- 手动输入模式 -->
+    <div v-else class="col-12">
+      <template v-if="argvs.optionType === 'json'">
+        <ArrayEditor
+          :model-value="argvs.selects"
+          :options="{
+            keys: [
+              {
+                value: 'title',
+                label: '标题',
+              },
+              {
+                value: 'description',
+                label: '描述',
+              },
+            ],
+          }"
+          @update:model-value="updateArgvs('selects', $event)"
+        >
+          <template #header>
+            <div class="text-caption q-px-sm q-py-xs bg-grey-2">
+              JSON选项列表
+            </div>
+          </template>
+        </ArrayEditor>
+      </template>
+      <template v-else>
+        <ArrayEditor
+          :model-value="argvs.selects"
+          @update:model-value="updateArgvs('selects', $event)"
+        >
+          <template #header>
+            <div class="text-caption q-px-sm q-py-xs bg-grey-2">
+              {{ argvs.optionType === "html" ? "HTML" : "文本" }}选项列表
+            </div>
+          </template>
+        </ArrayEditor>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import VariableInput from "../common/VariableInput.vue";
+import ArrayEditor from "../common/ArrayEditor.vue";
+import OperationCard from "../common/OperationCard.vue";
+import { parseFunction, stringifyArgv } from "js/composer/formatString";
+
+const jsonDefaultSelects = {
+  selects: new Array(3).fill({
+    title: {
+      value: "",
+      isString: true,
+      __varInputVal__: true,
+    },
+    description: {
+      value: "",
+      isString: true,
+      __varInputVal__: true,
+    },
+  }),
+};
+
+const textDefaultSelects = {
+  selects: new Array(3).fill({
+    value: "",
+    isString: true,
+    __varInputVal__: true,
+  }),
+};
+
+const defaultSelects = {
+  json: jsonDefaultSelects,
+  plaintext: textDefaultSelects,
+  html: textDefaultSelects,
+};
+
+export default defineComponent({
+  name: "SelectListEditor",
+  components: {
+    VariableInput,
+    ArrayEditor,
+    OperationCard,
+  },
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  data() {
+    return {
+      showSettings: false,
+      optionTypes: [
+        { label: "纯文本", value: "plaintext" },
+        { label: "HTML", value: "html" },
+        { label: "JSON", value: "json" },
+      ],
+      defaultArgvs: {
+        inputMode: "manual",
+        selects: defaultSelects.json,
+        optionType: "json",
+        placeholder: {
+          value: "搜索...",
+          isString: true,
+          __varInputVal__: true,
+        },
+        enableSearch: true,
+        showCancelButton: false,
+        closeOnSelect: true,
+      },
+    };
+  },
+  computed: {
+    argvs() {
+      return (
+        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+      );
+    },
+  },
+  methods: {
+    updateArgvs(key, value) {
+      const argvs = { ...this.argvs };
+      const keys = key.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((obj, key) => obj[key], argvs);
+      target[lastKey] = value;
+      this.updateModelValue(argvs);
+    },
+    generateCode(argvs = this.argvs) {
+      const {
+        selects,
+        optionType,
+        placeholder,
+        enableSearch,
+        showCancelButton,
+        closeOnSelect,
+      } = argvs;
+
+      // 构建选项对象
+      const options = {
+        ...(enableSearch && placeholder?.value && { placeholder: placeholder }),
+        ...(optionType !== "plaintext" && { optionType }),
+        ...(enableSearch !== true && { enableSearch }),
+        ...(showCancelButton && { showCancelButton }),
+        ...(closeOnSelect !== true && { closeOnSelect }),
+      };
+
+      // 生成代码
+      return `${this.modelValue.value}(${stringifyArgv(selects)}${
+        Object.keys(options).length ? `, ${stringifyArgv(options)}` : ""
+      })`;
+    },
+    parseCodeToArgvs(code) {
+      if (!code) return this.defaultArgvs;
+
+      try {
+        const result = parseFunction(code, {
+          variableFormatPaths: ["arg0", "arg1.placeholder"],
+        });
+        if (!result) return this.defaultArgvs;
+
+        const [selects, options = {}] = result.argvs;
+        return {
+          ...this.defaultArgvs,
+          selects,
+          ...options,
+        };
+      } catch (e) {
+        console.warn("选择列表参数解析失败:", code);
+        return this.defaultArgvs;
+      }
+    },
+    getSummary(argvs) {
+      const count = Array.isArray(argvs.selects) ? argvs.selects.length : "?";
+      return `显示${count}个${
+        argvs.optionType === "json"
+          ? "JSON"
+          : argvs.optionType === "html"
+          ? "HTML"
+          : "文本"
+      }选项`;
+    },
+    updateModelValue(argvs) {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        summary: this.getSummary(argvs),
+        code: this.generateCode(argvs),
+        argvs,
+      });
+    },
+  },
+  mounted() {
+    if (!this.modelValue.argvs && !this.modelValue.code) {
+      this.updateModelValue(this.defaultArgvs);
+    }
+  },
+  watch: {
+    "argvs.optionType": {
+      immediate: true,
+      handler(newVal) {
+        this.argvs.selects = defaultSelects[newVal];
+      },
+    },
+  },
+});
+</script>
+
+<style scoped>
+.toggle-option {
+  font-size: 12px;
+}
+
+.toggle-option :deep(.q-toggle__label) {
+  font-size: inherit;
+}
+</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index fc0da7cf..ef8a13c1 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -60,7 +60,10 @@ export const SystemCommandEditor = defineAsyncComponent(() =>
   import("components/composer/system/SystemCommandEditor.vue")
 );
 
-
 export const ZlibEditor = defineAsyncComponent(() =>
   import("src/components/composer/data/ZlibEditor.vue")
 );
+
+export const SelectListEditor = defineAsyncComponent(() =>
+  import("components/composer/ui/SelectListEditor.vue")
+);
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 864b13da..b3fc0a4f 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -548,7 +548,7 @@ export const dataCommands = {
           icon: "merge",
           config: [
             {
-              label: "Buffer列表",
+              label: "Buffer",
               type: "arrayEditor",
               icon: "memory",
               width: 12,
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index c3189b2b..75a67abd 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -6,7 +6,7 @@ import { dataCommands } from "./dataCommands";
 import { otherCommands } from "./otherCommands";
 import { simulateCommands } from "./simulateCommands";
 import { controlCommands } from "./controlCommands";
-import { uiCommands } from "./uiCommand";
+import { uiCommands } from "./uiCommands";
 
 export const commandCategories = [
   fileCommands,
diff --git a/src/js/composer/commands/uiCommand.js b/src/js/composer/commands/uiCommands.js
similarity index 87%
rename from src/js/composer/commands/uiCommand.js
rename to src/js/composer/commands/uiCommands.js
index fd3535af..aa48f8b7 100644
--- a/src/js/composer/commands/uiCommand.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -68,5 +68,12 @@ export const uiCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.showSelectList",
+      label: "选择列表",
+      desc: "显示一个支持搜索的选项列表，可以动态更新选项",
+      component: "SelectListEditor",
+      isAsync: true,
+    },
   ],
 };

From b528cfa97d67106d6592e948d06c5c1b05f96797 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 11:52:28 +0800
Subject: [PATCH 006/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=87=E6=8D=A2=E4=B8=8D=E5=90=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=97=B6=E7=9A=84=E9=80=89=E9=A1=B9=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/ArrayEditor.vue           |   8 +-
 .../composer/common/VariableInput.vue         |   3 +-
 .../composer/ui/SelectListEditor.vue          | 115 ++++++++++++------
 src/js/composer/formatString.js               |  34 +++++-
 4 files changed, 117 insertions(+), 43 deletions(-)

diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index 71683a69..a11b71e1 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -5,12 +5,15 @@
         <div
           v-for="key in optionsKeys"
           :key="key.value"
-          :class="['col', optionsKeys.length > 1 ? 'q-pr-sm' : '']"
+          :class="[
+            key.width ? `col-${key.width}` : 'col',
+            optionsKeys.length > 1 ? 'q-pr-sm' : '',
+          ]"
         >
           <VariableInput
             :model-value="item[key.value]"
             :label="key.label"
-            :icon="icon || 'code'"
+            :no-icon="true"
             @update:model-value="
               (val) => updateItemKeyValue(index, key.value, val)
             "
@@ -155,6 +158,7 @@ export default defineComponent({
           return {
             value: key.value || key,
             label: key.label || key,
+            width: key.width,
           };
         }) || []
       );
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index e81a1738..17d8b8da 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -131,7 +131,7 @@
       </q-btn-dropdown>
     </template>
     <template v-slot:prepend>
-      <q-icon :name="icon || 'code'" />
+      <q-icon v-if="!noIcon" :name="icon || 'code'" />
     </template>
   </q-input>
 </template>
@@ -187,6 +187,7 @@ export default defineComponent({
     },
     label: String,
     icon: String,
+    noIcon: Boolean,
     options: {
       type: Object,
       default: () => ({}),
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 2d4f0ebc..15a2ab59 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -6,7 +6,7 @@
         <!-- 选项类型选择 -->
         <div class="col model-type-select">
           <OperationCard
-            v-model="argvs.optionType"
+            :model-value="argvs.optionType"
             :options="[
               { label: '纯文本', value: 'plaintext', icon: 'text_fields' },
               { label: 'HTML', value: 'html', icon: 'code' },
@@ -14,7 +14,7 @@
             ]"
             square
             height="36px"
-            @update:model-value="updateArgvs('optionType', $event)"
+            @update:model-value="handleOptionTypeChange"
           />
         </div>
 
@@ -22,7 +22,7 @@
         <div class="col-2.5 input-mode-select">
           <q-select
             :model-value="argvs.inputMode"
-            @update:model-value="updateArgvs('inputMode', $event)"
+            @update:model-value="handleInputModeChange"
             :options="[
               {
                 label: '手动输入',
@@ -132,6 +132,11 @@
           :model-value="argvs.selects"
           :options="{
             keys: [
+              {
+                value: 'id',
+                label: 'id',
+                width: 3,
+              },
               {
                 value: 'title',
                 label: '标题',
@@ -174,29 +179,23 @@ import ArrayEditor from "../common/ArrayEditor.vue";
 import OperationCard from "../common/OperationCard.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
 
-const jsonDefaultSelects = {
-  selects: new Array(3).fill({
-    title: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
-    description: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
-  }),
-};
-
-const textDefaultSelects = {
-  selects: new Array(3).fill({
-    value: "",
-    isString: true,
+const newVarInputVal = (type = "str", val = "") => {
+  if (typeof val !== "string") val = JSON.stringify(val);
+  return {
+    value: val,
+    isString: type === "str",
     __varInputVal__: true,
-  }),
+  };
 };
 
+const jsonDefaultSelects = new Array(3).fill().map((_, index) => ({
+  id: newVarInputVal("var", index),
+  title: newVarInputVal("str"),
+  description: newVarInputVal("str"),
+}));
+
+const textDefaultSelects = new Array(3).fill(newVarInputVal("str"));
+
 const defaultSelects = {
   json: jsonDefaultSelects,
   plaintext: textDefaultSelects,
@@ -248,12 +247,25 @@ export default defineComponent({
     },
   },
   methods: {
-    updateArgvs(key, value) {
+    /**
+     * 更新参数
+     * @param {string|string[]} keys - 键名
+     * @param {string|string[]} values - 值
+     */
+    updateArgvs(keys, values) {
+      if (typeof keys === "string") {
+        keys = [keys];
+        values = [values];
+      }
       const argvs = { ...this.argvs };
-      const keys = key.split(".");
-      const lastKey = keys.pop();
-      const target = keys.reduce((obj, key) => obj[key], argvs);
-      target[lastKey] = value;
+      // 更新每一个键
+      keys.forEach((key, index) => {
+        // 支持嵌套对象的键值
+        const subKeys = key.split(".");
+        const lastKey = subKeys.pop();
+        const target = subKeys.reduce((obj, key) => obj[key], argvs);
+        target[lastKey] = values[index];
+      });
       this.updateModelValue(argvs);
     },
     generateCode(argvs = this.argvs) {
@@ -285,13 +297,16 @@ export default defineComponent({
 
       try {
         const result = parseFunction(code, {
-          variableFormatPaths: ["arg0", "arg1.placeholder"],
+          variableFormatPaths: ["arg0", "arg0[*]", "arg1.placeholder"],
         });
+
         if (!result) return this.defaultArgvs;
 
         const [selects, options = {}] = result.argvs;
+        const inputMode = selects.__varInputVal__ ? "variable" : "manual";
         return {
           ...this.defaultArgvs,
+          inputMode,
           selects,
           ...options,
         };
@@ -318,20 +333,46 @@ export default defineComponent({
         argvs,
       });
     },
+    handleOptionTypeChange(newOptionType) {
+      const oldOptionType = this.argvs.optionType;
+      // 原地点击不处理
+      if (oldOptionType === newOptionType) return;
+      // 变量输入模式不需要处理 selects
+      if (this.argvs.inputMode === "variable") {
+        this.updateArgvs("optionType", newOptionType);
+        return;
+      }
+      const oldSelects = this.argvs.selects;
+      let newSelects = oldSelects;
+      // 从JSON转换为非JSON时，取title或description
+      if (oldOptionType === "json") {
+        newSelects = oldSelects.map(
+          (item) => item.title || item.description || newVarInputVal("str")
+        );
+      } else if (newOptionType === "json") {
+        // 从非JSON转换为JSON时，添加title和description
+        newSelects = oldSelects.map((item) => ({
+          title: item,
+          description: item,
+        }));
+      }
+      this.updateArgvs(["optionType", "selects"], [newOptionType, newSelects]);
+    },
+    handleInputModeChange(newInputMode) {
+      let newSelects = this.argvs.selects;
+      if (newInputMode === "variable") {
+        newSelects = newVarInputVal("var");
+      } else {
+        newSelects = defaultSelects[this.argvs.optionType];
+      }
+      this.updateArgvs(["inputMode", "selects"], [newInputMode, newSelects]);
+    },
   },
   mounted() {
     if (!this.modelValue.argvs && !this.modelValue.code) {
       this.updateModelValue(this.defaultArgvs);
     }
   },
-  watch: {
-    "argvs.optionType": {
-      immediate: true,
-      handler(newVal) {
-        this.argvs.selects = defaultSelects[newVal];
-      },
-    },
-  },
 });
 </script>
 
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 63602390..1f531cdf 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -306,9 +306,37 @@ export const parseFunction = (functionStr, options = {}) => {
             return obj;
           }, {});
         case "ArrayExpression":
-          return node.elements.map((element, index) =>
-            processNode(element, `${currentPath}[${index}]`)
-          );
+          return node.elements.map((element, index) => {
+            const elementPath = `${currentPath}[${index}]`;
+            const processedElement = processNode(element, elementPath);
+
+            if (
+              shouldUseVariableFormat &&
+              typeof processedElement === "object"
+            ) {
+              return Object.entries(processedElement).reduce(
+                (acc, [key, value]) => {
+                  // 如果值已经是 varInputVal 格式，直接使用
+                  if (value?.__varInputVal__) {
+                    acc[key] = value;
+                  } else {
+                    // 否则转换为 varInputVal 格式
+                    acc[key] = {
+                      value:
+                        typeof value === "string"
+                          ? value
+                          : JSON.stringify(value),
+                      isString: typeof value === "string",
+                      __varInputVal__: true,
+                    };
+                  }
+                  return acc;
+                },
+                {}
+              );
+            }
+            return processedElement;
+          });
         case "ObjectProperty":
           return processNode(node.value, currentPath);
         case "MemberExpression":

From 7a43695e2d280eca05e60ee65dfcf9dd810a047c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 14:39:08 +0800
Subject: [PATCH 007/332] =?UTF-8?q?=E7=BB=9F=E4=B8=80VarInput=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E7=9A=84=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       |   7 +-
 .../composer/common/ArrayEditor.vue           |  62 ++-----
 src/components/composer/common/DictEditor.vue |  25 +--
 .../composer/common/VariableInput.vue         |  44 +----
 .../composer/data/AsymmetricCryptoEditor.vue  |   8 +-
 .../composer/data/SymmetricCryptoEditor.vue   |   7 +-
 src/components/composer/data/ZlibEditor.vue   |   8 +-
 .../composer/data/regex/RegexEditor.vue       |  13 +-
 .../composer/data/regex/RegexTester.vue       |  13 +-
 .../composer/file/FileOperationEditor.vue     |   7 +-
 .../composer/network/AxiosConfigEditor.vue    |  61 ++-----
 .../composer/system/SystemCommandEditor.vue   |  23 +--
 .../composer/ubrowser/UBrowserBasic.vue       |   8 +-
 .../operations/UBrowserCookieList.vue         |  38 +---
 .../operations/UBrowserDeviceName.vue         |   8 +-
 .../ubrowser/operations/UBrowserFileList.vue  |   8 +-
 .../operations/UBrowserNamedParamList.vue     |  29 +---
 .../composer/ui/SelectListEditor.vue          |  17 +-
 src/js/composer/commands/dataCommands.js      |  10 +-
 src/js/composer/commands/uiCommands.js        |  26 +--
 src/js/composer/customComponentGuide.js       |   5 +-
 src/js/composer/formatString.js               |  74 +++-----
 src/js/composer/ubrowserConfig.js             | 164 ++++--------------
 src/js/composer/varInputValManager.js         |  41 +++++
 24 files changed, 190 insertions(+), 516 deletions(-)
 create mode 100644 src/js/composer/varInputValManager.js

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 19c8ddb0..08d6d6d3 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -15,6 +15,7 @@ import { defineComponent } from "vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
 import ParamInput from "components/composer/common/ParamInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "MultiParams",
@@ -52,11 +53,7 @@ export default defineComponent({
       return [...this.commonConfig, ...this.functionConfig].map((item) => {
         const value =
           item.type === "varInput"
-            ? item.defaultValue || {
-                value: "",
-                isString: true,
-                __varInputVal__: true,
-              }
+            ? item.defaultValue || newVarInputVal("str")
             : // 其他类型情况复杂，不做判断，没有默认值返回undefined
               item.defaultValue;
         return {
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index a11b71e1..c5f536e6 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -94,35 +94,30 @@
  * @example
  * // 基础数组
  * [
- *   {
- *     value: "张三",
- *     isString: true,
- *     __varInputVal__: true
- *   }
+ *   newVarInputVal("str", "张三")
  * ]
  *
  * // 多键对象数组
  * options.keys = ['name', 'age', 'email']
  * [
  *   {
- *     name: { value: "张三", isString: true, __varInputVal__: true },
- *     age: { value: "18", isString: false, __varInputVal__: true },
- *     email: { value: "zhangsan@example.com", isString: true, __varInputVal__: true }
+ *     name: newVarInputVal("str", "张三"),
+ *     age: newVarInputVal("str", "18"),
+ *     email: newVarInputVal("str", "zhangsan@example.com")
  *   }
  * ]
  *
  * // 下拉选择模式
  * options.items = ['选项1', '选项2', '选项3']
  * [
- *   {
- *     value: "选项1",
- *     isString: true,
- *     __varInputVal__: true
- *   }
+ *   newVarInputVal("str", "选项1"),
+ *   newVarInputVal("str", "选项2"),
+ *   newVarInputVal("str", "选项3")
  * ]
  */
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "ArrayEditor",
@@ -169,22 +164,12 @@ export default defineComponent({
       if (this.optionsKeys?.length) {
         const item = {};
         this.optionsKeys.forEach((key) => {
-          item[key] = {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          };
+          item[key] = newVarInputVal("str");
         });
         return [item];
       }
 
-      return [
-        {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-      ];
+      return [newVarInputVal("str")];
     },
     /**
      * 添加新的数组项
@@ -195,22 +180,11 @@ export default defineComponent({
       if (this.options.keys) {
         const newItem = {};
         this.options.keys.forEach((key) => {
-          newItem[key] = {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          };
+          newItem[key] = newVarInputVal("str");
         });
         newItems = [...this.items, newItem];
       } else {
-        newItems = [
-          ...this.items,
-          {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-        ];
+        newItems = [...this.items, newVarInputVal("str")];
       }
       this.$emit("update:modelValue", newItems);
     },
@@ -225,19 +199,11 @@ export default defineComponent({
         if (this.options.keys) {
           const newItem = {};
           this.options.keys.forEach((key) => {
-            newItem[key] = {
-              value: "",
-              isString: true,
-              __varInputVal__: true,
-            };
+            newItem[key] = newVarInputVal("str");
           });
           newItems.push(newItem);
         } else {
-          newItems.push({
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          });
+          newItems.push(newVarInputVal("str"));
         }
       }
       this.$emit("update:modelValue", newItems);
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index ce513056..2514b7aa 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -95,6 +95,7 @@
 
 <script>
 import { defineComponent } from "vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 
 /**
@@ -108,21 +109,15 @@ import VariableInput from "components/composer/common/VariableInput.vue";
  * @example
  * // 基础字典对象
  * {
- *   key: {
- *     value: "", // 输入框的值
- *     isString: true, // 是否是字符串
- *     __varInputVal__: true // 用于标识是变量输入框
- *   }
+ *   key: newVarInputVal("str"),
  * }
  *
  * // 下拉选择模式
  * options.items = ['User-Agent', 'Content-Type', 'Accept']
  * {
- *   "User-Agent": {
- *     value: "Mozilla/5.0",
- *     isString: true,
- *     __varInputVal__: true
- *   }
+ *   "User-Agent": newVarInputVal("str", "Mozilla/5.0"),
+ *   "Content-Type": newVarInputVal("str", "text/html"),
+ *   "Accept": newVarInputVal("str", "text/html")
  * }
  */
 export default defineComponent({
@@ -149,11 +144,7 @@ export default defineComponent({
         : [
             {
               key: "",
-              value: {
-                value: "",
-                isString: true,
-                __varInputVal__: true,
-              },
+              value: newVarInputVal("str"),
             },
           ],
       filterOptions: this.options?.items || [],
@@ -183,7 +174,7 @@ export default defineComponent({
         ...this.items,
         {
           key: "",
-          value: { value: "", isString: true, __varInputVal__: true },
+          value: newVarInputVal("str"),
         },
       ];
     },
@@ -193,7 +184,7 @@ export default defineComponent({
       if (newItems.length === 0) {
         newItems.push({
           key: "",
-          value: { value: "", isString: true, __varInputVal__: true },
+          value: newVarInputVal("str"),
         });
       }
       this.items = newItems;
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 17d8b8da..b0e00133 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -138,7 +138,7 @@
 
 <script>
 import { defineComponent, inject } from "vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 /**
  * 变量输入框组件
  * @description 支持变量选择和字符串输入的输入框组件
@@ -179,11 +179,7 @@ export default defineComponent({
     modelValue: {
       type: Object,
       required: true,
-      default: () => ({
-        value: "",
-        isString: true,
-        __varInputVal__: true,
-      }),
+      default: () => newVarInputVal("str"),
     },
     label: String,
     icon: String,
@@ -265,22 +261,14 @@ export default defineComponent({
     insertVariable(variable) {
       this.selectedVariable = variable;
       this.isString = false; // 变量模式下不需要字符串处理
-      this.$emit("update:modelValue", {
-        isString: false,
-        value: variable.name,
-        __varInputVal__: true,
-      });
+      this.$emit("update:modelValue", newVarInputVal("var", variable.name));
     },
 
     // 清除变量时的处理
     clearVariable() {
       this.selectedVariable = null;
       this.isString = true; // 恢复到字符串模式
-      this.$emit("update:modelValue", {
-        isString: true,
-        value: "",
-        __varInputVal__: true,
-      });
+      this.$emit("update:modelValue", newVarInputVal("str"));
     },
 
     // 切换类型
@@ -301,11 +289,7 @@ export default defineComponent({
 
     selectItem(option) {
       const value = this.getItemValue(option);
-      this.$emit("update:modelValue", {
-        value,
-        isString: true,
-        __varInputVal__: true,
-      });
+      this.$emit("update:modelValue", newVarInputVal("str", value));
     },
     escapePath(paths) {
       if (!paths) return null;
@@ -319,26 +303,14 @@ export default defineComponent({
         const files = this.escapePath(utools.showOpenDialog(options));
         if (!files) return;
         if (files.length > 1) {
-          this.$emit("update:modelValue", {
-            value: files,
-            isString: false,
-            __varInputVal__: true,
-          });
+          this.$emit("update:modelValue", newVarInputVal("var", files));
         } else if (files.length === 1) {
-          this.$emit("update:modelValue", {
-            value: files[0],
-            isString: true,
-            __varInputVal__: true,
-          });
+          this.$emit("update:modelValue", newVarInputVal("str", files[0]));
         }
       } else {
         const file = this.escapePath(utools.showSaveDialog(options));
         if (!file) return;
-        this.$emit("update:modelValue", {
-          value: file,
-          isString: true,
-          __varInputVal__: true,
-        });
+        this.$emit("update:modelValue", newVarInputVal("str", file));
       }
     },
   },
diff --git a/src/components/composer/data/AsymmetricCryptoEditor.vue b/src/components/composer/data/AsymmetricCryptoEditor.vue
index 363b3f74..8c3a6f74 100644
--- a/src/components/composer/data/AsymmetricCryptoEditor.vue
+++ b/src/components/composer/data/AsymmetricCryptoEditor.vue
@@ -186,7 +186,7 @@
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "AsymmetricCryptoEditor",
   components: {
@@ -200,11 +200,7 @@ export default defineComponent({
     return {
       defaultArgvs: {
         operation: "encrypt",
-        text: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        text: newVarInputVal("str"),
         algorithm: "RSA",
         keyLength: 1024,
         padding: "RSAES-PKCS1-V1_5",
diff --git a/src/components/composer/data/SymmetricCryptoEditor.vue b/src/components/composer/data/SymmetricCryptoEditor.vue
index 69c39bde..9f21bac0 100644
--- a/src/components/composer/data/SymmetricCryptoEditor.vue
+++ b/src/components/composer/data/SymmetricCryptoEditor.vue
@@ -186,6 +186,7 @@
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "SymmetricCryptoEditor",
@@ -200,11 +201,7 @@ export default defineComponent({
     return {
       defaultArgvs: {
         operation: "encrypt",
-        text: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        text: newVarInputVal("str"),
         algorithm: "AES",
         keyLength: 128,
         mode: "CBC",
diff --git a/src/components/composer/data/ZlibEditor.vue b/src/components/composer/data/ZlibEditor.vue
index 38906274..3751d868 100644
--- a/src/components/composer/data/ZlibEditor.vue
+++ b/src/components/composer/data/ZlibEditor.vue
@@ -132,6 +132,8 @@ import { stringifyArgv, parseFunction } from "js/composer/formatString";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export default defineComponent({
   name: "ZlibEditor",
   components: {
@@ -188,11 +190,7 @@ export default defineComponent({
       defaultArgvs: {
         operation: "compressData",
         method: "gzip",
-        data: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        data: newVarInputVal("str"),
         options: {
           level: -1,
           memLevel: 8,
diff --git a/src/components/composer/data/regex/RegexEditor.vue b/src/components/composer/data/regex/RegexEditor.vue
index 36f5801a..327ecd78 100644
--- a/src/components/composer/data/regex/RegexEditor.vue
+++ b/src/components/composer/data/regex/RegexEditor.vue
@@ -98,6 +98,7 @@ import RegexInput from "./RegexInput.vue";
 import RegexBuilder from "./RegexBuilder.vue";
 import RegexTester from "./RegexTester.vue";
 import { parseToHasType } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "RegexEditor",
@@ -122,17 +123,9 @@ export default defineComponent({
       },
       showBuilder: false,
       defaultArgvs: {
-        textValue: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        textValue: newVarInputVal("str"),
         regexValue: "",
-        replaceValue: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        replaceValue: newVarInputVal("str"),
         isReplace: false,
         flags: {
           ignoreCase: false,
diff --git a/src/components/composer/data/regex/RegexTester.vue b/src/components/composer/data/regex/RegexTester.vue
index 9f253a15..d88a0296 100644
--- a/src/components/composer/data/regex/RegexTester.vue
+++ b/src/components/composer/data/regex/RegexTester.vue
@@ -43,17 +43,14 @@
 
 <script>
 import { defineComponent } from "vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "RegexTester",
   props: {
     text: {
       type: Object,
-      default: () => ({
-        value: "",
-        isString: false,
-        __varInputVal__: true,
-      }),
+      default: () => newVarInputVal("var"),
     },
     regex: {
       type: String,
@@ -65,11 +62,7 @@ export default defineComponent({
     },
     replace: {
       type: Object,
-      default: () => ({
-        value: "",
-        isString: false,
-        __varInputVal__: true,
-      }),
+      default: () => newVarInputVal("var"),
     },
     isReplace: {
       type: Boolean,
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index baaac9a4..9320ff00 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -383,6 +383,7 @@ import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 // 静态选项数据
 const ENCODING_OPTIONS = [
@@ -463,11 +464,7 @@ export default defineComponent({
       manageOperationOptions: MANAGE_OPERATION_OPTIONS,
       defaultArgvs: {
         operation: "read",
-        filePath: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        filePath: newVarInputVal("str"),
         encoding: "utf8",
         readMode: "all",
         readFlag: "async",
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index 5a2d4993..2cc9617f 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -162,6 +162,7 @@ import {
   methods,
   responseTypes,
 } from "js/options/httpOptions";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "AxiosConfigEditor",
@@ -187,18 +188,10 @@ export default defineComponent({
         .map((h) => h.value),
       activeTab: "headers",
       defaultArgvs: {
-        url: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        url: newVarInputVal("str"),
         method: "GET",
         headers: {
-          "User-Agent": {
-            value: userAgent[0].value,
-            isString: true,
-            __varInputVal__: true,
-          },
+          "User-Agent": newVarInputVal("str", userAgent[0].value),
           "Content-Type": contentTypes[0].value,
         },
         otherHeaders: {},
@@ -208,36 +201,16 @@ export default defineComponent({
         maxRedirects: 5,
         responseType: "json",
         auth: {
-          username: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          password: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          username: newVarInputVal("str"),
+          password: newVarInputVal("str"),
         },
-        proxy: {
-          host: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          port: null,
-          auth: {
-            username: {
-              value: "",
-              isString: true,
-              __varInputVal__: true,
-            },
-            password: {
-              value: "",
-              isString: true,
-              __varInputVal__: true,
-            },
-          },
+      },
+      proxy: {
+        host: newVarInputVal("str"),
+        port: null,
+        auth: {
+          username: newVarInputVal("str"),
+          password: newVarInputVal("str"),
         },
       },
       commonPanels: [
@@ -483,9 +456,7 @@ export default defineComponent({
       const formattedHeaders = Object.entries(headers).reduce(
         (acc, [key, value]) => {
           acc[key] =
-            typeof value === "string"
-              ? { value, isString: true, __varInputVal__: true }
-              : value;
+            typeof value === "string" ? newVarInputVal("str", value) : value;
           return acc;
         },
         {}
@@ -501,11 +472,7 @@ export default defineComponent({
       this.updateArgvs("headers", newHeaders);
     },
     setUserAgent(value) {
-      this.updateArgvs("headers.User-Agent", {
-        value,
-        isString: true,
-        __varInputVal__: true,
-      });
+      this.updateArgvs("headers.User-Agent", newVarInputVal("str", value));
     },
     getFieldValue(path) {
       return path.split(".").reduce((obj, key) => obj?.[key], this.argvs);
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 47b81d17..8b9143a5 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -132,6 +132,7 @@
 <script>
 import { defineComponent } from "vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import DictEditor from "components/composer/common/DictEditor.vue";
@@ -164,30 +165,18 @@ export default defineComponent({
         { label: "Base64", value: "base64" },
       ],
       defaultArgvs: {
-        command: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
+        command: newVarInputVal("str"),
         },
         options: {
-          cwd: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          cwd: newVarInputVal("str"),
           env: {},
           autoEncoding: true,
           encoding: "buffer",
           timeout: 0,
           maxBuffer: 1024 * 1024, // 1MB
-          shell: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          windowsHide: true,
-        },
-      },
+        shell: newVarInputVal("str"),
+        windowsHide: true,
+      },  
     };
   },
   computed: {
diff --git a/src/components/composer/ubrowser/UBrowserBasic.vue b/src/components/composer/ubrowser/UBrowserBasic.vue
index f5db468d..c0394576 100644
--- a/src/components/composer/ubrowser/UBrowserBasic.vue
+++ b/src/components/composer/ubrowser/UBrowserBasic.vue
@@ -71,7 +71,7 @@ import { defineComponent, ref, computed } from "vue";
 import { userAgent } from "js/options/httpOptions";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "UBrowserBasic",
   components: {
@@ -109,11 +109,7 @@ export default defineComponent({
       if (!newConfigs.goto.headers) {
         newConfigs.goto.headers = {};
       }
-      newConfigs.goto.headers.userAgent = {
-        value: val,
-        isString: true,
-        __varInputVal__: true,
-      };
+      newConfigs.goto.headers.userAgent = newVarInputVal("str", val);
       emit("update:configs", newConfigs);
       selectedUA.value = null;
     };
diff --git a/src/components/composer/ubrowser/operations/UBrowserCookieList.vue b/src/components/composer/ubrowser/operations/UBrowserCookieList.vue
index 8faacf2d..d2208648 100644
--- a/src/components/composer/ubrowser/operations/UBrowserCookieList.vue
+++ b/src/components/composer/ubrowser/operations/UBrowserCookieList.vue
@@ -55,7 +55,7 @@
 <script>
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "UBrowserCookieList",
   components: {
@@ -66,16 +66,8 @@ export default defineComponent({
       type: Array,
       default: () => [
         {
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          value: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          name: newVarInputVal("str"),
+          value: newVarInputVal("str"),
         },
       ],
     },
@@ -86,16 +78,8 @@ export default defineComponent({
       const newValue = [
         ...this.modelValue,
         {
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          value: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          name: newVarInputVal("str"),
+          value: newVarInputVal("str"),
         },
       ];
       this.$emit("update:modelValue", newValue);
@@ -105,16 +89,8 @@ export default defineComponent({
       newValue.splice(index, 1);
       if (newValue.length === 0) {
         newValue.push({
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          value: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          name: newVarInputVal("str"),
+          value: newVarInputVal("str"),
         });
       }
       this.$emit("update:modelValue", newValue);
diff --git a/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue b/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
index 91fab791..4c45a436 100644
--- a/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
+++ b/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
@@ -33,7 +33,7 @@
 import { defineComponent } from "vue";
 import { deviceName } from "js/options/httpOptions";
 import VariableInput from "components/composer/common/VariableInput.vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "UBrowserDeviceName",
   components: {
@@ -42,11 +42,7 @@ export default defineComponent({
   props: {
     modelValue: {
       type: Object,
-      default: () => ({
-        value: "",
-        isString: true,
-        __varInputVal__: true,
-      }),
+      default: () => newVarInputVal("str"),
     },
     label: {
       type: String,
diff --git a/src/components/composer/ubrowser/operations/UBrowserFileList.vue b/src/components/composer/ubrowser/operations/UBrowserFileList.vue
index 8a3268fb..12e20eac 100644
--- a/src/components/composer/ubrowser/operations/UBrowserFileList.vue
+++ b/src/components/composer/ubrowser/operations/UBrowserFileList.vue
@@ -43,7 +43,7 @@
 <script>
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "UBrowserFileList",
   components: {
@@ -60,11 +60,7 @@ export default defineComponent({
     addFile() {
       const newValue = [
         ...(this.modelValue || []),
-        {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        newVarInputVal("str"),
       ];
       this.$emit("update:modelValue", newValue);
     },
diff --git a/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue b/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
index caef3992..f99a4efc 100644
--- a/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
+++ b/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
@@ -47,7 +47,7 @@
 <script>
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
-
+import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "UBrowserNamedParamList",
   components: {
@@ -56,20 +56,7 @@ export default defineComponent({
   props: {
     modelValue: {
       type: Array,
-      default: () => [
-        {
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          value: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-        },
-      ],
+      default: () => [newVarInputVal("str"), newVarInputVal("str")],
     },
     label: String,
   },
@@ -79,16 +66,8 @@ export default defineComponent({
       const newValue = [
         ...(this.modelValue || []),
         {
-          name: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
-          value: {
-            value: "",
-            isString: true,
-            __varInputVal__: true,
-          },
+          name: newVarInputVal("str"),
+          value: newVarInputVal("str"),
         },
       ];
       this.$emit("update:modelValue", newValue);
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 15a2ab59..99069380 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -178,15 +178,8 @@ import VariableInput from "../common/VariableInput.vue";
 import ArrayEditor from "../common/ArrayEditor.vue";
 import OperationCard from "../common/OperationCard.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { newVarInputVal, isVarInputVal} from "js/composer/varInputValManager";
 
-const newVarInputVal = (type = "str", val = "") => {
-  if (typeof val !== "string") val = JSON.stringify(val);
-  return {
-    value: val,
-    isString: type === "str",
-    __varInputVal__: true,
-  };
-};
 
 const jsonDefaultSelects = new Array(3).fill().map((_, index) => ({
   id: newVarInputVal("var", index),
@@ -228,11 +221,7 @@ export default defineComponent({
         inputMode: "manual",
         selects: defaultSelects.json,
         optionType: "json",
-        placeholder: {
-          value: "搜索...",
-          isString: true,
-          __varInputVal__: true,
-        },
+        placeholder: newVarInputVal("str", "搜索..."),
         enableSearch: true,
         showCancelButton: false,
         closeOnSelect: true,
@@ -303,7 +292,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const [selects, options = {}] = result.argvs;
-        const inputMode = selects.__varInputVal__ ? "variable" : "manual";
+        const inputMode = isVarInputVal(selects) ? "variable" : "manual";
         return {
           ...this.defaultArgvs,
           inputMode,
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index b3fc0a4f..539642fb 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const dataCommands = {
   label: "数据处理",
   icon: "format_color_text",
@@ -552,13 +554,7 @@ export const dataCommands = {
               type: "arrayEditor",
               icon: "memory",
               width: 12,
-              defaultValue: [
-                {
-                  value: "",
-                  isString: false,
-                  __varInputVal__: true,
-                },
-              ],
+              defaultValue: [newVarInputVal("var")],
             },
             {
               label: "总长度（可选）",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index aa48f8b7..f55100a9 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const uiCommands = {
   label: "UI操作",
   icon: "web",
@@ -14,16 +16,8 @@ export const uiCommands = {
           label: "按钮组",
           type: "arrayEditor",
           defaultValue: [
-            {
-              value: "是",
-              isString: true,
-              __varInputVal__: true,
-            },
-            {
-              value: "否",
-              isString: true,
-              __varInputVal__: true,
-            },
+            newVarInputVal("str", "是"),
+            newVarInputVal("str", "否"),
           ],
         },
       ],
@@ -53,16 +47,8 @@ export const uiCommands = {
           },
           defaultValue: [
             {
-              label: {
-                value: "请输入",
-                isString: true,
-                __varInputVal__: true,
-              },
-              value: {
-                value: "",
-                isString: true,
-                __varInputVal__: true,
-              },
+              label: newVarInputVal("str", "请输入"),
+              value: newVarInputVal("str"),
             },
           ],
         },
diff --git a/src/js/composer/customComponentGuide.js b/src/js/composer/customComponentGuide.js
index cf61a53b..afe4821b 100644
--- a/src/js/composer/customComponentGuide.js
+++ b/src/js/composer/customComponentGuide.js
@@ -249,8 +249,7 @@ const customComponentGuide = {
           parseToHasType: {
             description: "将字符串解析为带类型的值",
             usage: "用于解析 VariableInput 类型的值",
-            example:
-              "将 '\"text\"' 解析为 {value: 'text', isString: true, __varInputVal__: true,}",
+            example: "将 '\"text\"' 解析为 newVarInputVal('str', 'text')",
           },
         },
       },
@@ -292,7 +291,7 @@ const customComponentGuide = {
           description: "变量输入组件",
           usage: "用于输入可能包含变量的字符串",
           props: [
-            "model-value - 输入值，需要包含 value、isString、__varInputVal__ 属性",
+            "model-value - 输入值，需要包含 value、isString、__varInputVal__ 属性, 通过 varInputValManager 的 newVarInputVal 创建",
             "label - 输入框标签",
             "icon - 输入框图标",
           ],
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 1f531cdf..bfc9b9f1 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -1,13 +1,9 @@
 import { parse } from "@babel/parser";
-
-/**
- * 处理带有 __varInputVal__ 属性的对象
- * @param {Object} argv 要处理的对象
- * @returns {string} 处理后的字符串
- */
-const stringifyVarInputVal = (argv) => {
-  return argv.isString ? `"${argv.value}"` : argv.value;
-};
+import {
+  stringifyVarInputVal,
+  isVarInputVal,
+  newVarInputVal,
+} from "./varInputValManager";
 
 /**
  * 递归移除对象中的空值
@@ -17,12 +13,10 @@ const stringifyVarInputVal = (argv) => {
 const removeEmptyValues = (obj) => {
   return window.lodashM.omitBy(obj, (value) => {
     // 如果value是VariableInput的输出，则取其value值
-    const realValue = value?.hasOwnProperty("__varInputVal__")
-      ? value.value
-      : value;
+    const realValue = isVarInputVal(value) ? value.value : value;
     if (window.lodashM.isNil(realValue) || realValue === "") return true;
     // 如果value是对象，并且不是VariableInput的输出，则递归移除空值
-    if (typeof value === "object" && !value.hasOwnProperty("__varInputVal__"))
+    if (typeof value === "object" && !isVarInputVal(value))
       return window.lodashM.isEmpty(removeEmptyValues(value));
     return false;
   });
@@ -38,7 +32,7 @@ const processObject = (obj, parentPath = "") => {
   // 移除空值
   obj = removeEmptyValues(obj);
   // 如果是 VariableInput 的输出，直接用 stringifyVarInputVal 处理
-  if (obj?.hasOwnProperty("__varInputVal__")) {
+  if (isVarInputVal(obj)) {
     return stringifyVarInputVal(obj);
   }
 
@@ -51,7 +45,7 @@ const processObject = (obj, parentPath = "") => {
     // 处理对象类型
     if (value && typeof value === "object") {
       // 如果是 VariableInput 的输出，直接用 stringifyVarInputVal 处理
-      if (value.hasOwnProperty("__varInputVal__")) {
+      if (isVarInputVal(value)) {
         valueStr = stringifyVarInputVal(value);
       } else {
         valueStr = processObject(value, parentPath + "  ");
@@ -83,7 +77,7 @@ const processObject = (obj, parentPath = "") => {
  * @returns {string} 格式化后的JSON字符串
  */
 const stringifyObject = (jsonObj) => {
-  if (jsonObj?.hasOwnProperty("__varInputVal__")) {
+  if (isVarInputVal(jsonObj)) {
     return stringifyVarInputVal(jsonObj);
   }
   if (jsonObj instanceof Array) {
@@ -126,23 +120,11 @@ export const stringifyArgv = (argv) => {
  */
 export const parseToHasType = (str) => {
   if (!str) {
-    return {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    };
+    return newVarInputVal("str", "");
   }
   return str.startsWith('"') && str.endsWith('"')
-    ? {
-        value: str.slice(1, -1),
-        isString: true,
-        __varInputVal__: true,
-      }
-    : {
-        value: str,
-        isString: false,
-        __varInputVal__: true,
-      };
+    ? newVarInputVal("str", str.slice(1, -1))
+    : newVarInputVal("var", str);
 };
 
 /**
@@ -272,31 +254,23 @@ export const parseFunction = (functionStr, options = {}) => {
         case "StringLiteral":
           // 字符串字面量总是带引号的
           return shouldUseVariableFormat
-            ? { value: node.value, isString: true, __varInputVal__: true }
+            ? newVarInputVal("str", node.value)
             : node.value;
         // 数字、布尔
         case "NumericLiteral":
         case "BooleanLiteral":
           return shouldUseVariableFormat
-            ? {
-                value: JSON.stringify(node.value),
-                isString: false,
-                __varInputVal__: true,
-              }
+            ? newVarInputVal("var", JSON.stringify(node.value))
             : node.value;
         // null
         case "NullLiteral":
           return shouldUseVariableFormat
-            ? {
-                value: "null",
-                isString: false,
-                __varInputVal__: true,
-              }
+            ? newVarInputVal("var", "null")
             : null;
         case "Identifier":
           // 标识符（变量）总是不带引号的
           return shouldUseVariableFormat
-            ? { value: node.name, isString: false, __varInputVal__: true }
+            ? newVarInputVal("var", node.name)
             : node.name;
         case "ObjectExpression":
           return node.properties.reduce((obj, prop) => {
@@ -317,18 +291,14 @@ export const parseFunction = (functionStr, options = {}) => {
               return Object.entries(processedElement).reduce(
                 (acc, [key, value]) => {
                   // 如果值已经是 varInputVal 格式，直接使用
-                  if (value?.__varInputVal__) {
+                  if (isVarInputVal(value)) {
                     acc[key] = value;
                   } else {
                     // 否则转换为 varInputVal 格式
-                    acc[key] = {
-                      value:
-                        typeof value === "string"
-                          ? value
-                          : JSON.stringify(value),
-                      isString: typeof value === "string",
-                      __varInputVal__: true,
-                    };
+                    acc[key] = newVarInputVal(
+                      typeof value === "string" ? "str" : "var",
+                      typeof value === "string" ? value : JSON.stringify(value)
+                    );
                   }
                   return acc;
                 },
diff --git a/src/js/composer/ubrowserConfig.js b/src/js/composer/ubrowserConfig.js
index 31cc3c42..f12cc74c 100644
--- a/src/js/composer/ubrowserConfig.js
+++ b/src/js/composer/ubrowserConfig.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 // ubrowser 浏览器操作配置
 export const ubrowserOperationConfigs = [
   {
@@ -565,22 +567,10 @@ const defaultUBrowserRunConfigs = {
 export const defaultUBrowserConfigs = {
   // 基础参数
   goto: {
-    url: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    url: newVarInputVal("str"),
     headers: {
-      Referer: {
-        value: "",
-        isString: true,
-        __varInputVal__: true,
-      },
-      userAgent: {
-        value: "",
-        isString: true,
-        __varInputVal__: true,
-      },
+      Referer: newVarInputVal("str"),
+      userAgent: newVarInputVal("str"),
     },
     timeout: 60000,
   },
@@ -590,183 +580,87 @@ export const defaultUBrowserConfigs = {
     timeout: 60000,
   },
   click: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
   },
   css: {
-    value: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    value: newVarInputVal("str"),
   },
   press: {
-    key: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    key: newVarInputVal("str"),
     modifiers: [],
   },
   paste: {
-    text: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    text: newVarInputVal("str"),
   },
   screenshot: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
     rect: { x: 0, y: 0, width: 0, height: 0 },
-    savePath: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    savePath: newVarInputVal("str"),
   },
   pdf: {
     options: {
       marginsType: 0,
       pageSize: "A4",
     },
-    savePath: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    savePath: newVarInputVal("str"),
   },
   device: {
     size: { width: 1280, height: 800 },
-    useragent: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    useragent: newVarInputVal("str"),
   },
   cookies: {
-    name: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    name: newVarInputVal("str"),
   },
   setCookies: {
     items: [
       {
-        name: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
-        value: {
-          value: "",
-          isString: true,
-          __varInputVal__: true,
-        },
+        name: newVarInputVal("str"),
+        value: newVarInputVal("str"),
       },
     ],
   },
   removeCookies: {
-    name: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    name: newVarInputVal("str"),
   },
   clearCookies: {
-    url: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    url: newVarInputVal("str"),
   },
   evaluate: {
     function: "",
     params: [],
   },
   when: {
-    condition: {
-      value: "",
-      isString: false,
-      __varInputVal__: true,
-    },
+    condition: newVarInputVal("var"),
   },
   mousedown: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
   },
   mouseup: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
   },
   file: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
     files: [],
   },
   value: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
-    value: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
+    value: newVarInputVal("str"),
   },
   check: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
     checked: false,
   },
   focus: {
-    selector: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    selector: newVarInputVal("str"),
   },
   scroll: {
-    target: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    target: newVarInputVal("str"),
     x: 0,
     y: 0,
   },
   download: {
-    url: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
-    savePath: {
-      value: "",
-      isString: true,
-      __varInputVal__: true,
-    },
+    url: newVarInputVal("str"),
+    savePath: newVarInputVal("str"),
   },
   // 运行参数
   run: defaultUBrowserRunConfigs,
diff --git a/src/js/composer/varInputValManager.js b/src/js/composer/varInputValManager.js
new file mode 100644
index 00000000..f07614f3
--- /dev/null
+++ b/src/js/composer/varInputValManager.js
@@ -0,0 +1,41 @@
+/**
+ * 创建一个 VariableInput 对象
+ * @param {string} type - 变量类型，默认为 "str"
+ * @param {string} val - 变量值
+ * @returns {Object} VariableInput 对象
+ */
+export const newVarInputVal = (type = "str", val = "") => {
+  if (typeof val !== "string") val = JSON.stringify(val);
+  return {
+    value: val,
+    isString: type === "str",
+    __varInputVal__: true,
+  };
+};
+
+/**
+ * 检查一个对象是否是 VariableInput 对象
+ * @param {Object} val - 要检查的对象
+ * @returns {boolean} 是否是 VariableInput 对象
+ */
+export const isVarInputVal = (val) => {
+  return val && val.__varInputVal__;
+};
+
+/**
+ * 创建一个空的 VariableInput 对象
+ * @param {string} type - 变量类型，默认为 "str"
+ * @returns {Object} 空的 VariableInput 对象
+ */
+export const newEmptyVarInputVal = (type = "str") => {
+  return newVarInputVal(type, "");
+};
+
+/**
+ * 处理带有 __varInputVal__ 属性的对象
+ * @param {Object} argv 要处理的对象
+ * @returns {string} 处理后的字符串
+ */
+export const stringifyVarInputVal = (argv) => {
+  return argv.isString ? `"${argv.value}"` : argv.value;
+};

From 6af4a15e2a00eca6392b89016c83b2fc8f673f91 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 15:05:21 +0800
Subject: [PATCH 008/332] =?UTF-8?q?=E5=B0=86=E5=8F=91=E9=80=81=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E4=BB=8E=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E6=A8=A1=E6=8B=9F=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E6=8B=9F=E7=B2=98=E8=B4=B4=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/simulate/index.js    |  2 +
 plugin/lib/quickcomposer/simulate/sendText.js | 11 +++
 src/js/composer/commands/notifyCommands.js    | 14 +---
 src/js/composer/commands/simulateCommands.js  | 69 +++++++++++++------
 4 files changed, 62 insertions(+), 34 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/simulate/sendText.js

diff --git a/plugin/lib/quickcomposer/simulate/index.js b/plugin/lib/quickcomposer/simulate/index.js
index e191b838..f7a38474 100644
--- a/plugin/lib/quickcomposer/simulate/index.js
+++ b/plugin/lib/quickcomposer/simulate/index.js
@@ -1,7 +1,9 @@
 const { findImage } = require("./imageFinder");
 const { captureScreen } = require("./screenCapture");
+const sendText = require("./sendText");
 
 module.exports = {
   findImage,
   captureScreen,
+  sendText,
 };
diff --git a/plugin/lib/quickcomposer/simulate/sendText.js b/plugin/lib/quickcomposer/simulate/sendText.js
new file mode 100644
index 00000000..fc839908
--- /dev/null
+++ b/plugin/lib/quickcomposer/simulate/sendText.js
@@ -0,0 +1,11 @@
+const sendText = (text, simulateCopy = false) => {
+  if (simulateCopy) {
+    window.utools.copyText(text);
+    quickcommand.sleep(200);
+    quickcommand.simulatePaste();
+  } else {
+    window.utools.hideMainWindowTypeString(text);
+  }
+};
+
+module.exports = sendText;
diff --git a/src/js/composer/commands/notifyCommands.js b/src/js/composer/commands/notifyCommands.js
index a7413749..09a9675c 100644
--- a/src/js/composer/commands/notifyCommands.js
+++ b/src/js/composer/commands/notifyCommands.js
@@ -5,7 +5,7 @@ export const notifyCommands = {
   commands: [
     {
       value: "console.log",
-      label: "打印消息",
+      label: "显示消息",
       config: [
         {
           key: "log",
@@ -27,17 +27,5 @@ export const notifyCommands = {
         },
       ],
     },
-    {
-      value: "utools.hideMainWindowTypeString",
-      label: "发送文本到活动窗口",
-      config: [
-        {
-          key: "text",
-          label: "要发送到窗口的文本内容",
-          type: "varInput",
-          icon: "send",
-        },
-      ],
-    },
   ],
 };
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 646661c7..2eb3e524 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -9,10 +9,33 @@ export const simulateCommands = {
       config: [],
       component: "KeyEditor",
     },
+    {
+      value: "quickcomposer.simulate.sendText",
+      label: "发送文本",
+      config: [
+        {
+          key: "text",
+          label: "要发送的文本内容",
+          type: "varInput",
+          icon: "send",
+          width: 9,
+        },
+        {
+          label: "发送方式",
+          type: "select",
+          defaultValue: false,
+          icon: "keyboard",
+          options: [
+            { label: "模拟输入", value: false },
+            { label: "模拟粘贴", value: true },
+          ],
+          width: 3,
+        },
+      ],
+    },
     {
       value: "utools.simulateMouseClick",
       label: "鼠标点击",
-      allowEmptyArgv: true,
       config: [
         {
           label: "X坐标（留空则原地点击）",
@@ -47,32 +70,36 @@ export const simulateCommands = {
     },
     {
       value: "utools.simulateMouseMove",
-      label: "鼠标移动",
-      config: [
+      label: "鼠标位置",
+      functionSelector: [
         {
-          label: "X坐标",
-          icon: "drag_handle",
-          defaultValue: 0,
-          type: "numInput",
-          width: 6,
+          label: "移动到坐标",
+          value: "utools.simulateMouseMove",
+          icon: "mouse",
+          config: [
+            {
+              label: "X坐标",
+              icon: "drag_handle",
+              defaultValue: 0,
+              type: "numInput",
+              width: 6,
+            },
+            {
+              label: "Y坐标",
+              icon: "drag_handle",
+              defaultValue: 0,
+              type: "numInput",
+              width: 6,
+            },
+          ],
         },
         {
-          label: "Y坐标",
-          icon: "drag_handle",
-          defaultValue: 0,
-          type: "numInput",
-          width: 6,
+          label: "获取坐标",
+          value: "utools.getCursorScreenPoint",
+          icon: "mouse",
         },
       ],
     },
-    {
-      value: "utools.getCursorScreenPoint",
-      label: "获取鼠标坐标",
-      outputVariable: "{x:curX,y:curY}",
-      saveOutput: true,
-      config: [],
-      allowEmptyArgv: true,
-    },
     {
       value: "quickcomposer.simulate.findImage",
       label: "屏幕找图",

From 430466c38c3e4e5b11ab5733e0c8cdbfa2b38a3b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 15:25:56 +0800
Subject: [PATCH 009/332] =?UTF-8?q?=E7=BC=96=E6=8E=92UI=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8showConfirmBox=E3=80=81showMessageBox?=
 =?UTF-8?q?=E3=80=81showTextArea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/NumberInput.vue           |  5 +
 src/components/composer/common/ParamInput.vue | 12 +++
 .../composer/common/VariableInput.vue         |  2 +
 src/js/composer/commands/uiCommands.js        | 91 +++++++++++++++++++
 4 files changed, 110 insertions(+)

diff --git a/src/components/composer/common/NumberInput.vue b/src/components/composer/common/NumberInput.vue
index 17a74d3c..c8e070d6 100644
--- a/src/components/composer/common/NumberInput.vue
+++ b/src/components/composer/common/NumberInput.vue
@@ -5,6 +5,7 @@
     dense
     filled
     :label="label"
+    :placeholder="placeholder"
     class="number-input"
   >
     <template v-slot:prepend>
@@ -55,6 +56,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    placeholder: {
+      type: String,
+      default: "",
+    },
     icon: {
       type: String,
       default: "",
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 04e89b1c..1b43341f 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -11,6 +11,7 @@
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
         :label="config.label"
+        :placeholder="config.placeholder"
         :icon="config.icon"
         :options="config.options"
       />
@@ -20,6 +21,7 @@
         @update:model-value="$emit('update', index, $event)"
         :label="config.label"
         :icon="config.icon"
+        :placeholder="config.placeholder"
       />
       <ArrayEditor
         v-else-if="config.type === 'arrayEditor'"
@@ -61,6 +63,7 @@
         @update:model-value="$emit('update', index, $event)"
         :label="config.label"
         :icon="config.icon"
+        :placeholder="config.placeholder"
       >
         <template v-slot:prepend>
           <q-icon :name="config.icon || 'code'" />
@@ -153,6 +156,8 @@ export default defineComponent({
   min-width: 50px;
   margin-bottom: 0;
   display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .grid-item > * {
@@ -160,6 +165,13 @@ export default defineComponent({
   min-width: 0;
 }
 
+/* 让开关、复选框和按钮组居中显示 */
+.grid-item > .q-toggle,
+.grid-item > .q-checkbox,
+.grid-item > .q-btn-group {
+  flex: 0 1 auto;
+}
+
 @media (max-width: 600px) {
   .grid-item {
     width: 100% !important;
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index b0e00133..d1617d1b 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -4,6 +4,7 @@
     dense
     filled
     :label="label"
+    :placeholder="placeholder"
     class="variable-input"
   >
     <template v-slot:append>
@@ -182,6 +183,7 @@ export default defineComponent({
       default: () => newVarInputVal("str"),
     },
     label: String,
+    placeholder: String,
     icon: String,
     noIcon: Boolean,
     options: {
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index f55100a9..f69e5408 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -61,5 +61,96 @@ export const uiCommands = {
       component: "SelectListEditor",
       isAsync: true,
     },
+    {
+      value: "quickcommand.showTextArea",
+      label: "文本框",
+      desc: "显示一个文本框，可以输入多行文本",
+      isAsync: true,
+      outputVariable: "textareaValue",
+      saveOutput: true,
+      config: [
+        {
+          label: "文本框占位符",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "请输入"),
+          width: 6,
+        },
+        {
+          label: "文本框默认值",
+          type: "varInput",
+          defaultValue: newVarInputVal("str"),
+          width: 6,
+        },
+      ],
+    },
+    {
+      value: "quickcommand.showMessageBox",
+      label: "消息提示",
+      desc: "显示一个自动消失的提示框",
+      isAsync: true,
+      config: [
+        {
+          label: "提示内容",
+          type: "varInput",
+          icon: "info",
+          defaultValue: newVarInputVal("str", "这是一条提示消息"),
+          width: 12,
+        },
+        {
+          label: "图标类型",
+          type: "select",
+          defaultValue: "success",
+          icon: "lightbulb",
+          width: 6,
+          options: [
+            { label: "成功", value: "success" },
+            { label: "错误", value: "error" },
+            { label: "警告", value: "warning" },
+            { label: "信息", value: "info" },
+          ],
+        },
+        {
+          label: "显示时间(ms)",
+          type: "numInput",
+          width: 6,
+          placeholder: "0为手动关闭，留空按文本长度调整",
+        },
+      ],
+    },
+    {
+      value: "quickcommand.showConfirmBox",
+      label: "确认框",
+      desc: "显示一个确认框，返回是否点击了确认",
+      isAsync: true,
+      outputVariable: "confirmed",
+      saveOutput: true,
+      config: [
+        {
+          label: "提示内容",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "确认要执行此操作吗？"),
+          width: 12,
+        },
+        {
+          label: "标题",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "提示"),
+          width: 7,
+        },
+        {
+          label: "支持HTML",
+          type: "switch",
+          defaultValue: false,
+          width: 2,
+        },
+        {
+          label: "宽度",
+          type: "numInput",
+          defaultValue: 450,
+          width: 3,
+          placeholder: "对话框宽度",
+        },
+      ],
+    },
   ],
 };

From 8003497e719f8c5bdcff5f93b0c20c66d8b567f6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 16:13:50 +0800
Subject: [PATCH 010/332] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=8A=A0=E5=AF=86=E3=80=81=E6=95=B0=E5=AD=A6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                   |   2 +
 .../quickcomposer/{data => coding}/crypto.js  |   0
 .../quickcomposer/{data => coding}/encoder.js |   0
 .../quickcomposer/{data => coding}/hash.js    |   0
 plugin/lib/quickcomposer/coding/index.js      |   9 +
 .../quickcomposer/{data => coding}/utils.js   |   0
 plugin/lib/quickcomposer/data/index.js        |   8 -
 plugin/lib/quickcomposer/math/index.js        |   5 +
 .../quickcomposer/{data => math}/random.js    |   0
 .../AsymmetricCryptoEditor.vue                |   0
 .../SymmetricCryptoEditor.vue                 |   0
 src/js/composer/cardComponents.js             |   4 +-
 src/js/composer/commands/codingCommand.js     | 120 ++++++++++
 src/js/composer/commands/dataCommands.js      | 226 ------------------
 src/js/composer/commands/index.js             |   4 +
 src/js/composer/commands/mathCommands.js      | 120 ++++++++++
 src/js/composer/commands/notifyCommands.js    |   4 +-
 src/js/composer/commands/uiCommands.js        |   8 +-
 18 files changed, 271 insertions(+), 239 deletions(-)
 rename plugin/lib/quickcomposer/{data => coding}/crypto.js (100%)
 rename plugin/lib/quickcomposer/{data => coding}/encoder.js (100%)
 rename plugin/lib/quickcomposer/{data => coding}/hash.js (100%)
 create mode 100644 plugin/lib/quickcomposer/coding/index.js
 rename plugin/lib/quickcomposer/{data => coding}/utils.js (100%)
 create mode 100644 plugin/lib/quickcomposer/math/index.js
 rename plugin/lib/quickcomposer/{data => math}/random.js (100%)
 rename src/components/composer/{data => coding}/AsymmetricCryptoEditor.vue (100%)
 rename src/components/composer/{data => coding}/SymmetricCryptoEditor.vue (100%)
 create mode 100644 src/js/composer/commands/codingCommand.js
 create mode 100644 src/js/composer/commands/mathCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index f19007c5..bec8553f 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -4,6 +4,8 @@ const quickcomposer = {
   file: require("./quickcomposer/file"),
   system: require("./quickcomposer/system"),
   network: require("./quickcomposer/network"),
+  coding: require("./quickcomposer/coding"),
+  math: require("./quickcomposer/math"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/data/crypto.js b/plugin/lib/quickcomposer/coding/crypto.js
similarity index 100%
rename from plugin/lib/quickcomposer/data/crypto.js
rename to plugin/lib/quickcomposer/coding/crypto.js
diff --git a/plugin/lib/quickcomposer/data/encoder.js b/plugin/lib/quickcomposer/coding/encoder.js
similarity index 100%
rename from plugin/lib/quickcomposer/data/encoder.js
rename to plugin/lib/quickcomposer/coding/encoder.js
diff --git a/plugin/lib/quickcomposer/data/hash.js b/plugin/lib/quickcomposer/coding/hash.js
similarity index 100%
rename from plugin/lib/quickcomposer/data/hash.js
rename to plugin/lib/quickcomposer/coding/hash.js
diff --git a/plugin/lib/quickcomposer/coding/index.js b/plugin/lib/quickcomposer/coding/index.js
new file mode 100644
index 00000000..ec0f41c2
--- /dev/null
+++ b/plugin/lib/quickcomposer/coding/index.js
@@ -0,0 +1,9 @@
+const crypto = require("./crypto");
+const hash = require("./hash");
+const encoder = require("./encoder");
+
+module.exports = {
+  ...crypto,
+  ...hash,
+  ...encoder,
+};
diff --git a/plugin/lib/quickcomposer/data/utils.js b/plugin/lib/quickcomposer/coding/utils.js
similarity index 100%
rename from plugin/lib/quickcomposer/data/utils.js
rename to plugin/lib/quickcomposer/coding/utils.js
diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index 5a828938..7349068f 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -1,17 +1,9 @@
-const encoder = require("./encoder");
-const hash = require("./hash");
 const string = require("./string");
-const crypto = require("./crypto");
 const buffer = require("./buffer");
 const zlib = require("./zlib");
-const random = require("./random");
 
 module.exports = {
-  ...encoder,
-  ...hash,
   ...string,
-  ...crypto,
   buffer,
   zlib,
-  random,
 };
diff --git a/plugin/lib/quickcomposer/math/index.js b/plugin/lib/quickcomposer/math/index.js
new file mode 100644
index 00000000..382c85b2
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/index.js
@@ -0,0 +1,5 @@
+const random = require("./random");
+
+module.exports = {
+  random,
+};
diff --git a/plugin/lib/quickcomposer/data/random.js b/plugin/lib/quickcomposer/math/random.js
similarity index 100%
rename from plugin/lib/quickcomposer/data/random.js
rename to plugin/lib/quickcomposer/math/random.js
diff --git a/src/components/composer/data/AsymmetricCryptoEditor.vue b/src/components/composer/coding/AsymmetricCryptoEditor.vue
similarity index 100%
rename from src/components/composer/data/AsymmetricCryptoEditor.vue
rename to src/components/composer/coding/AsymmetricCryptoEditor.vue
diff --git a/src/components/composer/data/SymmetricCryptoEditor.vue b/src/components/composer/coding/SymmetricCryptoEditor.vue
similarity index 100%
rename from src/components/composer/data/SymmetricCryptoEditor.vue
rename to src/components/composer/coding/SymmetricCryptoEditor.vue
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index ef8a13c1..1ed87326 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -44,10 +44,10 @@ export const RegexEditor = defineAsyncComponent(() =>
 
 // Crypto Components
 export const SymmetricCryptoEditor = defineAsyncComponent(() =>
-  import("src/components/composer/data/SymmetricCryptoEditor.vue")
+  import("src/components/composer/coding/SymmetricCryptoEditor.vue")
 );
 export const AsymmetricCryptoEditor = defineAsyncComponent(() =>
-  import("src/components/composer/data/AsymmetricCryptoEditor.vue")
+  import("src/components/composer/coding/AsymmetricCryptoEditor.vue")
 );
 
 // File Components
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
new file mode 100644
index 00000000..40a699a8
--- /dev/null
+++ b/src/js/composer/commands/codingCommand.js
@@ -0,0 +1,120 @@
+export const codingCommands = {
+  label: "编码加密",
+  icon: "lock",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.coding.base64Encode",
+      label: "编解码",
+      desc: "文本编解码",
+      icon: "code",
+      outputVariable: "processedText",
+      saveOutput: true,
+      config: [
+        {
+          label: "要编解码的文本",
+          icon: "text_fields",
+          type: "varInput",
+        },
+      ],
+      functionSelector: [
+        {
+          label: "Base64编码",
+          value: "quickcomposer.coding.base64Encode",
+          icon: "title",
+        },
+        {
+          label: "Base64解码",
+          value: "quickcomposer.coding.base64Decode",
+          icon: "title",
+        },
+        {
+          label: "十六进制编码",
+          value: "quickcomposer.coding.hexEncode",
+          icon: "code",
+        },
+        {
+          label: "十六进制解码",
+          value: "quickcomposer.coding.hexDecode",
+          icon: "code",
+        },
+        {
+          label: "URL编码",
+          value: "quickcomposer.coding.urlEncode",
+          icon: "link",
+        },
+        {
+          label: "URL解码",
+          value: "quickcomposer.coding.urlDecode",
+          icon: "link",
+        },
+        {
+          label: "HTML编码",
+          value: "quickcomposer.coding.htmlEncode",
+          icon: "html",
+        },
+        {
+          label: "HTML解码",
+          value: "quickcomposer.coding.htmlDecode",
+          icon: "html",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.coding.symmetricCrypto",
+      label: "对称加解密",
+      component: "SymmetricCryptoEditor",
+      outputVariable: "processedText",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.coding.asymmetricCrypto",
+      label: "非对称加解密",
+      component: "AsymmetricCryptoEditor",
+      outputVariable: "processedText",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.coding.md5Hash",
+      label: "哈希计算",
+      desc: "计算文本的哈希值",
+      icon: "enhanced_encryption",
+      outputVariable: "hashValue",
+      saveOutput: true,
+      config: [
+        {
+          label: "要计算哈希的文本",
+          icon: "text_fields",
+          type: "varInput",
+        },
+      ],
+      functionSelector: [
+        {
+          label: "MD5",
+          value: "quickcomposer.coding.md5Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA1",
+          value: "quickcomposer.coding.sha1Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA256",
+          value: "quickcomposer.coding.sha256Hash",
+          icon: "functions",
+        },
+        {
+          label: "SHA512",
+          value: "quickcomposer.coding.sha512Hash",
+          icon: "functions",
+        },
+        {
+          label: "SM3",
+          value: "quickcomposer.coding.sm3Hash",
+          icon: "functions",
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 539642fb..bfda4f34 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -5,232 +5,6 @@ export const dataCommands = {
   icon: "format_color_text",
   defaultOpened: false,
   commands: [
-    {
-      value: "quickcomposer.data.base64Encode",
-      label: "编解码",
-      desc: "文本编解码",
-      icon: "code",
-      outputVariable: "processedText",
-      saveOutput: true,
-      config: [
-        {
-          label: "要编解码的文本",
-          icon: "text_fields",
-          type: "varInput",
-        },
-      ],
-      functionSelector: [
-        {
-          label: "Base64编码",
-          value: "quickcomposer.data.base64Encode",
-          icon: "title",
-        },
-        {
-          label: "Base64解码",
-          value: "quickcomposer.data.base64Decode",
-          icon: "title",
-        },
-        {
-          label: "十六进制编码",
-          value: "quickcomposer.data.hexEncode",
-          icon: "code",
-        },
-        {
-          label: "十六进制解码",
-          value: "quickcomposer.data.hexDecode",
-          icon: "code",
-        },
-        {
-          label: "URL编码",
-          value: "quickcomposer.data.urlEncode",
-          icon: "link",
-        },
-        {
-          label: "URL解码",
-          value: "quickcomposer.data.urlDecode",
-          icon: "link",
-        },
-        {
-          label: "HTML编码",
-          value: "quickcomposer.data.htmlEncode",
-          icon: "html",
-        },
-        {
-          label: "HTML解码",
-          value: "quickcomposer.data.htmlDecode",
-          icon: "html",
-        },
-      ],
-    },
-    {
-      value: "quickcomposer.data.symmetricCrypto",
-      label: "对称加解密",
-      component: "SymmetricCryptoEditor",
-      outputVariable: "processedText",
-      saveOutput: true,
-    },
-    {
-      value: "quickcomposer.data.asymmetricCrypto",
-      label: "非对称加解密",
-      component: "AsymmetricCryptoEditor",
-      outputVariable: "processedText",
-      saveOutput: true,
-    },
-    {
-      value: "quickcomposer.data.md5Hash",
-      label: "哈希计算",
-      desc: "计算文本的哈希值",
-      icon: "enhanced_encryption",
-      outputVariable: "hashValue",
-      saveOutput: true,
-      config: [
-        {
-          label: "要计算哈希的文本",
-          icon: "text_fields",
-          type: "varInput",
-        },
-      ],
-      functionSelector: [
-        {
-          label: "MD5",
-          value: "quickcomposer.data.md5Hash",
-          icon: "functions",
-        },
-        {
-          label: "SHA1",
-          value: "quickcomposer.data.sha1Hash",
-          icon: "functions",
-        },
-        {
-          label: "SHA256",
-          value: "quickcomposer.data.sha256Hash",
-          icon: "functions",
-        },
-        {
-          label: "SHA512",
-          value: "quickcomposer.data.sha512Hash",
-          icon: "functions",
-        },
-        {
-          label: "SM3",
-          value: "quickcomposer.data.sm3Hash",
-          icon: "functions",
-        },
-      ],
-    },
-    {
-      value: "Math.sin",
-      label: "数学计算",
-      desc: "数学函数计算",
-      icon: "calculate",
-      outputVariable: "calculatedText",
-      saveOutput: true,
-      config: [
-        {
-          label: "要计算的数值",
-          icon: "numbers",
-          type: "numInput",
-        },
-      ],
-      functionSelector: [
-        {
-          label: "正弦(sin)",
-          value: "Math.sin",
-          icon: "functions",
-        },
-        {
-          label: "余弦(cos)",
-          value: "Math.cos",
-          icon: "functions",
-        },
-        {
-          label: "正切(tan)",
-          value: "Math.tan",
-          icon: "functions",
-        },
-        {
-          label: "反正弦(asin)",
-          value: "Math.asin",
-          icon: "functions",
-        },
-        {
-          label: "反余弦(acos)",
-          value: "Math.acos",
-          icon: "functions",
-        },
-        {
-          label: "反正切(atan)",
-          value: "Math.atan",
-          icon: "functions",
-        },
-        {
-          label: "平方根(sqrt)",
-          value: "Math.sqrt",
-          icon: "functions",
-        },
-        {
-          label: "自然对数(ln)",
-          value: "Math.log",
-          icon: "functions",
-        },
-        {
-          label: "10对数(log10)",
-          value: "Math.log10",
-          icon: "functions",
-        },
-        {
-          label: "绝对值(abs)",
-          value: "Math.abs",
-          icon: "functions",
-        },
-        {
-          label: "向上取整(ceil)",
-          value: "Math.ceil",
-          icon: "functions",
-        },
-        {
-          label: "向下取整(floor)",
-          value: "Math.floor",
-          icon: "functions",
-        },
-        {
-          label: "四舍五入(round)",
-          value: "Math.round",
-          icon: "functions",
-        },
-        {
-          label: "幂运算(pow)",
-          value: "Math.pow",
-          icon: "functions",
-        },
-      ],
-    },
-    {
-      value: "quickcomposer.data.random",
-      label: "随机数",
-      config: [
-        {
-          label: "整数",
-          type: "switch",
-          defaultValue: false,
-          width: 2,
-        },
-        {
-          label: "起始值",
-          icon: "last_page",
-          type: "numInput",
-          width: 5,
-        },
-        {
-          label: "结束值",
-          icon: "first_page",
-          type: "numInput",
-          width: 5,
-        },
-      ],
-      outputVariable: "randomNumber",
-      saveOutput: true,
-    },
     {
       value: "quickcomposer.data.reverseString",
       label: "字符串反转",
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 75a67abd..072f2a71 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -7,6 +7,8 @@ import { otherCommands } from "./otherCommands";
 import { simulateCommands } from "./simulateCommands";
 import { controlCommands } from "./controlCommands";
 import { uiCommands } from "./uiCommands";
+import { codingCommands } from "./codingCommand";
+import { mathCommands } from "./mathCommands";
 
 export const commandCategories = [
   fileCommands,
@@ -14,8 +16,10 @@ export const commandCategories = [
   systemCommands,
   notifyCommands,
   dataCommands,
+  codingCommands,
   controlCommands,
   uiCommands,
   simulateCommands,
+  mathCommands,
   otherCommands,
 ];
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
new file mode 100644
index 00000000..6ec7dcae
--- /dev/null
+++ b/src/js/composer/commands/mathCommands.js
@@ -0,0 +1,120 @@
+export const mathCommands = {
+  label: "数学计算",
+  icon: "calculate",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "Math.sin",
+      label: "数学计算",
+      desc: "数学函数计算",
+      icon: "calculate",
+      outputVariable: "calculatedText",
+      saveOutput: true,
+      config: [
+        {
+          label: "要计算的数值",
+          icon: "numbers",
+          type: "numInput",
+        },
+      ],
+      functionSelector: [
+        {
+          label: "正弦(sin)",
+          value: "Math.sin",
+          icon: "functions",
+        },
+        {
+          label: "余弦(cos)",
+          value: "Math.cos",
+          icon: "functions",
+        },
+        {
+          label: "正切(tan)",
+          value: "Math.tan",
+          icon: "functions",
+        },
+        {
+          label: "反正弦(asin)",
+          value: "Math.asin",
+          icon: "functions",
+        },
+        {
+          label: "反余弦(acos)",
+          value: "Math.acos",
+          icon: "functions",
+        },
+        {
+          label: "反正切(atan)",
+          value: "Math.atan",
+          icon: "functions",
+        },
+        {
+          label: "平方根(sqrt)",
+          value: "Math.sqrt",
+          icon: "functions",
+        },
+        {
+          label: "自然对数(ln)",
+          value: "Math.log",
+          icon: "functions",
+        },
+        {
+          label: "10对数(log10)",
+          value: "Math.log10",
+          icon: "functions",
+        },
+        {
+          label: "绝对值(abs)",
+          value: "Math.abs",
+          icon: "functions",
+        },
+        {
+          label: "向上取整(ceil)",
+          value: "Math.ceil",
+          icon: "functions",
+        },
+        {
+          label: "向下取整(floor)",
+          value: "Math.floor",
+          icon: "functions",
+        },
+        {
+          label: "四舍五入(round)",
+          value: "Math.round",
+          icon: "functions",
+        },
+        {
+          label: "幂运算(pow)",
+          value: "Math.pow",
+          icon: "functions",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.math.random",
+      label: "随机数",
+      config: [
+        {
+          label: "整数",
+          type: "switch",
+          defaultValue: false,
+          width: 2,
+        },
+        {
+          label: "起始值",
+          icon: "last_page",
+          type: "numInput",
+          width: 5,
+        },
+        {
+          label: "结束值",
+          icon: "first_page",
+          type: "numInput",
+          width: 5,
+        },
+      ],
+      outputVariable: "randomNumber",
+      saveOutput: true,
+    },
+  ],
+};
diff --git a/src/js/composer/commands/notifyCommands.js b/src/js/composer/commands/notifyCommands.js
index 09a9675c..b7e4245a 100644
--- a/src/js/composer/commands/notifyCommands.js
+++ b/src/js/composer/commands/notifyCommands.js
@@ -1,6 +1,6 @@
 export const notifyCommands = {
-  label: "消息通知",
-  icon: "chat_bubble_outline",
+  label: "输出消息",
+  icon: "output",
   defaultOpened: false,
   commands: [
     {
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index f69e5408..fa3ab719 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -1,7 +1,7 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
 
 export const uiCommands = {
-  label: "UI操作",
+  label: "用户交互",
   icon: "web",
   defaultOpened: false,
   commands: [
@@ -52,6 +52,12 @@ export const uiCommands = {
             },
           ],
         },
+        {
+          label: "标题",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "请选择"),
+          width: 12,
+        },
       ],
     },
     {

From ebbc7b7661e9486a98c69c8277f6b50aa1536dfd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 16:40:18 +0800
Subject: [PATCH 011/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DparseVarInput?=
 =?UTF-8?q?=E5=9C=A8=E5=A4=84=E7=90=86=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/VariableInput.vue | 9 ++-------
 src/js/composer/varInputValManager.js            | 7 ++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index d1617d1b..a98cfed3 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -293,16 +293,11 @@ export default defineComponent({
       const value = this.getItemValue(option);
       this.$emit("update:modelValue", newVarInputVal("str", value));
     },
-    escapePath(paths) {
-      if (!paths) return null;
-      if (typeof paths === "string") return paths.replace(/\\/g, "\\\\");
-      return paths.map((path) => path.replace(/\\/g, "\\\\"));
-    },
     handleFileOpen(dialog) {
       let { type, options } = window.lodashM.cloneDeep(dialog);
       if (!type) type = "open";
       if (type === "open") {
-        const files = this.escapePath(utools.showOpenDialog(options));
+        const files = utools.showOpenDialog(options);
         if (!files) return;
         if (files.length > 1) {
           this.$emit("update:modelValue", newVarInputVal("var", files));
@@ -310,7 +305,7 @@ export default defineComponent({
           this.$emit("update:modelValue", newVarInputVal("str", files[0]));
         }
       } else {
-        const file = this.escapePath(utools.showSaveDialog(options));
+        const file = utools.showSaveDialog(options);
         if (!file) return;
         this.$emit("update:modelValue", newVarInputVal("str", file));
       }
diff --git a/src/js/composer/varInputValManager.js b/src/js/composer/varInputValManager.js
index f07614f3..698589aa 100644
--- a/src/js/composer/varInputValManager.js
+++ b/src/js/composer/varInputValManager.js
@@ -37,5 +37,10 @@ export const newEmptyVarInputVal = (type = "str") => {
  * @returns {string} 处理后的字符串
  */
 export const stringifyVarInputVal = (argv) => {
-  return argv.isString ? `"${argv.value}"` : argv.value;
+  if (!argv.isString) return argv.value;
+  try {
+    return JSON.stringify(argv.value);
+  } catch (e) {
+    return `"${argv.value}"`;
+  }
 };

From 01183d06e89e74ef6fa35b5f9ee15e2409c32294 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 17:35:27 +0800
Subject: [PATCH 012/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=96=B0=E5=A2=9EHTM?=
 =?UTF-8?q?L=E8=A7=A3=E6=9E=90=E3=80=81=E4=B8=8A=E4=BC=A0=E3=80=81?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                    |   9 +-
 plugin/lib/quickcomposer/data/htmlParser.js   |  14 ++
 plugin/lib/quickcomposer/data/index.js        |   2 +
 .../composer/common/ArrayEditor.vue           | 160 +++++++-------
 .../composer/common/BorderLabel.vue           |  16 +-
 src/components/composer/common/DictEditor.vue | 200 ++++++++++--------
 src/components/composer/common/ParamInput.vue |   5 +
 .../composer/system/SystemCommandEditor.vue   |  22 +-
 src/js/composer/commands/dataCommands.js      |  38 ++++
 src/js/composer/commands/networkCommands.js   |  60 ++++++
 10 files changed, 346 insertions(+), 180 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/data/htmlParser.js

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 1bb294d3..37c29393 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -4,6 +4,7 @@ const fs = require("fs");
 const kill = require("tree-kill");
 const iconv = require("iconv-lite");
 const path = require("path");
+const axios = require("axios");
 
 const getQuickcommandTempFile = require("./getQuickcommandTempFile");
 const getCommandToLaunchTerminal = require("./getCommandToLaunchTerminal");
@@ -72,9 +73,9 @@ const quickcommand = {
   },
 
   // 下载文件
-  downloadFile: function (url, file = {}) {
+  downloadFile: function (url, file) {
     return new Promise((reslove, reject) => {
-      if (file instanceof Object)
+      if (!file || file instanceof Object)
         file = window.utools.showSaveDialog(JSON.parse(JSON.stringify(file)));
       axios({
         method: "get",
@@ -95,13 +96,13 @@ const quickcommand = {
   },
 
   // 上传文件
-  uploadFile: function (url, file = {}, name = "file", formData = {}) {
+  uploadFile: function (url, file, name = "file", formData = {}) {
     return new Promise((reslove, reject) => {
       var objfile;
       if (file instanceof File) {
         objfile = file;
       } else {
-        if (file instanceof Object)
+        if (!file || file instanceof Object)
           file = window.utools.showOpenDialog(
             JSON.parse(JSON.stringify(file))
           )[0];
diff --git a/plugin/lib/quickcomposer/data/htmlParser.js b/plugin/lib/quickcomposer/data/htmlParser.js
new file mode 100644
index 00000000..ba4d2b0e
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/htmlParser.js
@@ -0,0 +1,14 @@
+const htmlParser = (html, selector = "", attr = "") => {
+  const parser = new DOMParser();
+  const doc = parser.parseFromString(html, "text/html");
+  if (!selector) return doc;
+  const elements = doc.querySelectorAll(selector);
+  if (!attr) return elements;
+  let result = Array.from(elements).map((element) => element[attr]);
+  if (result.length === 1) return result[0];
+  return result;
+};
+
+module.exports = {
+  htmlParser,
+};
diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index 7349068f..6241c922 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -1,9 +1,11 @@
 const string = require("./string");
 const buffer = require("./buffer");
 const zlib = require("./zlib");
+const htmlParser = require("./htmlParser");
 
 module.exports = {
   ...string,
+  ...htmlParser,
   buffer,
   zlib,
 };
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index c5f536e6..41af7fcb 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -1,82 +1,89 @@
 <template>
-  <div class="array-editor">
-    <div v-for="(item, index) in items" :key="index" class="row items-center">
-      <template v-if="optionsKeys.length">
-        <div
-          v-for="key in optionsKeys"
-          :key="key.value"
-          :class="[
-            key.width ? `col-${key.width}` : 'col',
-            optionsKeys.length > 1 ? 'q-pr-sm' : '',
-          ]"
-        >
-          <VariableInput
-            :model-value="item[key.value]"
-            :label="key.label"
-            :no-icon="true"
-            @update:model-value="
-              (val) => updateItemKeyValue(index, key.value, val)
-            "
-          />
-        </div>
-      </template>
-      <template v-else>
-        <div class="col">
-          <VariableInput
-            :model-value="item"
-            :label="`${label || '项目'} ${index + 1}`"
-            :icon="icon || 'code'"
-            :options="{
-              items: options.items,
-            }"
-            @update:model-value="(val) => updateItemValue(index, val)"
-          />
-        </div>
-      </template>
-      <div class="col-auto">
-        <div class="btn-container">
-          <template v-if="items.length === 1">
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="add"
-              class="center-btn"
-              @click="addItem"
-            />
-          </template>
-          <template v-else-if="index === items.length - 1">
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="remove"
-              class="top-btn"
-              @click="removeItem(index)"
+  <component
+    :is="!!label ? 'BorderLabel' : 'div'"
+    :label="label"
+    :icon="icon"
+    :model-value="isCollapse"
+  >
+    <div class="array-editor">
+      <div v-for="(item, index) in items" :key="index" class="row items-center">
+        <template v-if="optionsKeys.length">
+          <div
+            v-for="key in optionsKeys"
+            :key="key.value"
+            :class="[
+              key.width ? `col-${key.width}` : 'col',
+              optionsKeys.length > 1 ? 'q-pr-sm' : '',
+            ]"
+          >
+            <VariableInput
+              :model-value="item[key.value]"
+              :label="key.label"
+              :no-icon="true"
+              @update:model-value="
+                (val) => updateItemKeyValue(index, key.value, val)
+              "
             />
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="add"
-              class="bottom-btn"
-              @click="addItem"
+          </div>
+        </template>
+        <template v-else>
+          <div class="col">
+            <VariableInput
+              :model-value="item"
+              :label="`${label || '项目'} ${index + 1}`"
+              :icon="icon || 'code'"
+              :options="{
+                items: options.items,
+              }"
+              @update:model-value="(val) => updateItemValue(index, val)"
             />
-          </template>
-          <template v-else>
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="remove"
-              class="center-btn"
-              @click="removeItem(index)"
-            />
-          </template>
+          </div>
+        </template>
+        <div class="col-auto">
+          <div class="btn-container">
+            <template v-if="items.length === 1">
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="add"
+                class="center-btn"
+                @click="addItem"
+              />
+            </template>
+            <template v-else-if="index === items.length - 1">
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="remove"
+                class="top-btn"
+                @click="removeItem(index)"
+              />
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="add"
+                class="bottom-btn"
+                @click="addItem"
+              />
+            </template>
+            <template v-else>
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="remove"
+                class="center-btn"
+                @click="removeItem(index)"
+              />
+            </template>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </component>
 </template>
 
 <script>
@@ -118,16 +125,19 @@
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
 
 export default defineComponent({
   name: "ArrayEditor",
   components: {
     VariableInput,
+    BorderLabel,
   },
   props: {
     modelValue: {
       type: Array,
       required: true,
+      default: () => [],
     },
     label: {
       type: String,
@@ -137,6 +147,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    isCollapse: {
+      type: Boolean,
+      default: true,
+    },
     options: {
       type: Object,
       default: () => ({}),
diff --git a/src/components/composer/common/BorderLabel.vue b/src/components/composer/common/BorderLabel.vue
index d3b6c39a..bf053286 100644
--- a/src/components/composer/common/BorderLabel.vue
+++ b/src/components/composer/common/BorderLabel.vue
@@ -1,12 +1,20 @@
 <template>
   <div class="border-label" :class="{ collapsed }" :data-label="label">
-    <div class="label-header" @click="toggleCollapse">
+    <div class="label-header row items-center" @click="toggleCollapse">
       <q-icon
         :name="collapsed ? 'expand_more' : 'expand_less'"
         size="16px"
         class="collapse-icon"
       />
-      <span class="label-text">{{ label }}</span>
+      <div class="label-text row items-center">
+        <q-icon
+          v-if="icon"
+          :name="icon"
+          size="16px"
+          class="collapse-icon q-pl-sm"
+        />
+        <div class="label-text">{{ label }}</div>
+      </div>
     </div>
     <div class="content" :class="{ collapsed }">
       <slot></slot>
@@ -33,6 +41,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    icon: {
+      type: String,
+      default: "",
+    },
   },
   emits: ["update:modelValue"],
   data() {
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index 2514b7aa..e4ac3d2f 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -1,102 +1,110 @@
 <template>
-  <div class="dict-editor">
-    <div
-      v-for="(item, index) in items"
-      :key="index"
-      class="row q-col-gutter-sm items-center"
-    >
-      <div class="col-4">
-        <q-select
-          v-if="options?.items"
-          :model-value="item.key"
-          :options="options.items"
-          label="名称"
-          dense
-          filled
-          use-input
-          input-debounce="0"
-          :hide-selected="!!inputValue"
-          @filter="filterFn"
-          @update:model-value="(val) => handleSelect(val, index)"
-          @input-value="(val) => handleInput(val, index)"
-          @blur="handleBlur"
-        >
-          <template v-slot:prepend>
-            <q-icon name="code" />
-          </template>
-        </q-select>
-        <q-input
-          v-else
-          :model-value="item.key"
-          label="名称"
-          dense
-          filled
-          @update:model-value="(val) => updateItemKey(val, index)"
-        >
-          <template v-slot:prepend>
-            <q-icon name="code" />
-          </template>
-        </q-input>
-      </div>
-      <div class="col">
-        <VariableInput
-          :model-value="item.value"
-          label="值"
-          icon="code"
-          class="col-grow"
-          @update:model-value="(val) => updateItemValue(val, index)"
-        />
-      </div>
-      <div class="col-auto">
-        <div class="btn-container">
-          <template v-if="items.length === 1">
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="add"
-              class="center-btn"
-              @click="addItem"
-            />
-          </template>
-          <template v-else-if="index === items.length - 1">
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="remove"
-              class="top-btn"
-              @click="removeItem(index)"
-            />
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="add"
-              class="bottom-btn"
-              @click="addItem"
-            />
-          </template>
-          <template v-else>
-            <q-btn
-              flat
-              dense
-              size="sm"
-              icon="remove"
-              class="center-btn"
-              @click="removeItem(index)"
-            />
-          </template>
+  <component
+    :is="!!label ? 'BorderLabel' : 'div'"
+    :label="label"
+    :icon="icon"
+    :model-value="isCollapse"
+  >
+    <div class="dict-editor">
+      <div
+        v-for="(item, index) in items"
+        :key="index"
+        class="row q-col-gutter-sm items-center"
+      >
+        <div class="col-4">
+          <q-select
+            v-if="options?.items"
+            :model-value="item.key"
+            :options="options.items"
+            label="名称"
+            dense
+            filled
+            use-input
+            input-debounce="0"
+            :hide-selected="!!inputValue"
+            @filter="filterFn"
+            @update:model-value="(val) => handleSelect(val, index)"
+            @input-value="(val) => handleInput(val, index)"
+            @blur="handleBlur"
+          >
+            <template v-slot:prepend>
+              <q-icon name="code" />
+            </template>
+          </q-select>
+          <q-input
+            v-else
+            :model-value="item.key"
+            label="名称"
+            dense
+            filled
+            @update:model-value="(val) => updateItemKey(val, index)"
+          >
+            <template v-slot:prepend>
+              <q-icon name="code" />
+            </template>
+          </q-input>
+        </div>
+        <div class="col">
+          <VariableInput
+            :model-value="item.value"
+            label="值"
+            icon="code"
+            class="col-grow"
+            @update:model-value="(val) => updateItemValue(val, index)"
+          />
+        </div>
+        <div class="col-auto">
+          <div class="btn-container">
+            <template v-if="items.length === 1">
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="add"
+                class="center-btn"
+                @click="addItem"
+              />
+            </template>
+            <template v-else-if="index === items.length - 1">
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="remove"
+                class="top-btn"
+                @click="removeItem(index)"
+              />
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="add"
+                class="bottom-btn"
+                @click="addItem"
+              />
+            </template>
+            <template v-else>
+              <q-btn
+                flat
+                dense
+                size="sm"
+                icon="remove"
+                class="center-btn"
+                @click="removeItem(index)"
+              />
+            </template>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </component>
 </template>
 
 <script>
 import { defineComponent } from "vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
 
 /**
  * 字典编辑器组件
@@ -124,16 +132,30 @@ export default defineComponent({
   name: "DictEditor",
   components: {
     VariableInput,
+    BorderLabel,
   },
   props: {
     modelValue: {
       type: Object,
       required: true,
+      default: () => ({}),
     },
     options: {
       type: Object,
       default: () => ({}),
     },
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    isCollapse: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update:modelValue"],
   data() {
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 1b43341f..8490a612 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -29,12 +29,17 @@
         @update:model-value="$emit('update', index, $event)"
         :label="config.label"
         :options="config.options"
+        :icon="config.icon"
+        :is-collapse="config.isCollapse"
       />
       <DictEditor
         v-else-if="config.type === 'dictEditor'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
+        :label="config.label"
         :options="config.options"
+        :icon="config.icon"
+        :is-collapse="config.isCollapse"
       />
       <q-toggle
         v-else-if="config.type === 'switch'"
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 8b9143a5..4251d378 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -116,12 +116,12 @@
 
           <!-- 环境变量 -->
           <div class="col-12">
-            <BorderLabel label="环境变量">
-              <DictEditor
-                :model-value="argvs.options.env"
-                @update:model-value="(val) => updateArgvs('options.env', val)"
-              />
-            </BorderLabel>
+            <DictEditor
+              :model-value="argvs.options.env"
+              @update:model-value="(val) => updateArgvs('options.env', val)"
+              label="环境变量"
+              icon="environment"
+            />
           </div>
         </div>
       </q-slide-transition>
@@ -136,7 +136,6 @@ import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import DictEditor from "components/composer/common/DictEditor.vue";
-import BorderLabel from "components/composer/common/BorderLabel.vue";
 
 export default defineComponent({
   name: "SystemCommandEditor",
@@ -144,7 +143,6 @@ export default defineComponent({
     VariableInput,
     NumberInput,
     DictEditor,
-    BorderLabel,
   },
   props: {
     modelValue: {
@@ -166,7 +164,6 @@ export default defineComponent({
       ],
       defaultArgvs: {
         command: newVarInputVal("str"),
-        },
         options: {
           cwd: newVarInputVal("str"),
           env: {},
@@ -174,9 +171,10 @@ export default defineComponent({
           encoding: "buffer",
           timeout: 0,
           maxBuffer: 1024 * 1024, // 1MB
-        shell: newVarInputVal("str"),
-        windowsHide: true,
-      },  
+          shell: newVarInputVal("str"),
+          windowsHide: true,
+        },
+      },
     };
   },
   computed: {
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index bfda4f34..67783957 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -440,5 +440,43 @@ export const dataCommands = {
       icon: "compress",
       isAsync: true,
     },
+    {
+      value: "quickcomposer.data.htmlParser",
+      label: "HTML解析",
+      desc: "解析 HTML 字符串",
+      icon: "html",
+      config: [
+        {
+          label: "要解析的 HTML",
+          type: "varInput",
+          icon: "html",
+          placeholder: "例如：<div>Hello, World!</div>",
+          width: 12,
+        },
+        {
+          label: "CSS选择器",
+          type: "varInput",
+          icon: "css",
+          placeholder: "例如：.class",
+          width: 7,
+        },
+        {
+          label: "属性",
+          type: "varInput",
+          icon: "colorize",
+          options: {
+            items: [
+              { label: "innerText", value: "innerText" },
+              { label: "innerHTML", value: "innerHTML" },
+              { label: "href", value: "href" },
+              { label: "src", value: "src" },
+              { label: "value", value: "value" },
+            ],
+          },
+          defaultValue: newVarInputVal("str"),
+          width: 5,
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index ab7dd501..f59b7901 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "../varInputValManager";
+
 export const networkCommands = {
   label: "网络操作",
   icon: "language",
@@ -313,5 +315,63 @@ export const networkCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.downloadFile",
+      label: "下载文件",
+      desc: "下载文件",
+      icon: "file_download",
+      isAsync: true,
+      config: [
+        {
+          label: "文件URL",
+          type: "varInput",
+          icon: "link",
+          defaultValue: newVarInputVal("str", "https://"),
+          width: 12,
+        },
+        {
+          label: "保存路径",
+          type: "varInput",
+          icon: "folder",
+          width: 12,
+          placeholder: "留空则弹出对话框选择保存路径",
+        },
+      ],
+    },
+    {
+      value: "quickcommand.uploadFile",
+      label: "上传文件",
+      desc: "上传文件",
+      icon: "file_upload",
+      isAsync: true,
+      config: [
+        {
+          label: "上传接口地址",
+          type: "varInput",
+          icon: "link",
+          defaultValue: newVarInputVal("str", "https://"),
+          width: 12,
+        },
+        {
+          label: "文件路径",
+          type: "varInput",
+          icon: "file_present",
+          width: 12,
+          placeholder: "留空则弹出对话框选择文件",
+        },
+        {
+          label: "文件名",
+          type: "varInput",
+          icon: "text_fields",
+          defaultValue: newVarInputVal("str", "file"),
+          width: 12,
+        },
+        {
+          label: "额外表单数据（可选）",
+          type: "dictEditor",
+          width: 12,
+        },
+      ],
+    },
   ],
 };

From cdd7b89e7254bd5a5ceda7895b42776a2559c188 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 8 Jan 2025 17:36:07 +0800
Subject: [PATCH 013/332] bugfix

---
 src/components/composer/common/VariableInput.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index a98cfed3..a51d986c 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -354,7 +354,7 @@ export default defineComponent({
 }
 
 .variable-item:hover {
-  backg: var(--q-primary-opacity-10);
+  background-color: var(--q-primary-opacity-10);
 }
 
 .variable-label {
@@ -395,12 +395,12 @@ export default defineComponent({
 }
 
 .option-item:hover {
-  backg: var(--q-primary-opacity-10);
+  background-color: var(--q-primary-opacity-10);
 }
 
 /* 暗色模式适配 */
 .body--dark .option-item:hover {
-  backg: rgba(255, 255, 255, 0.1);
+  background-color: rgba(255, 255, 255, 0.1);
 }
 
 .empty-variables-tip {

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 014/332] =?UTF-8?q?=E8=AF=BB=E5=89=AA=E8=B4=B4=E6=9D=BF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9B=BE=E7=89=87=E3=80=81html=E3=80=81rtf?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=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 9c3bc993..9069eb4b 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 41af7fcb..e44639b0 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 73cba381..89ee876e 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 0ebcddbc..fe734de2 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 072f2a71..c2f1fe8d 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 9e4caf4f..62b321a7 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 fa3ab719..71fc24df 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 00000000..d3dbcfd1
--- /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",
+        },
+      ],
+    },
+  ],
+};

From b676801b9ada65ffca57880198282a73b7ad3354 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 01:01:15 +0800
Subject: [PATCH 015/332] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=B8=E7=94=A8=E6=8C=89=E9=94=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=93=8D=E4=BD=9C=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE=E5=BA=8F=E5=88=97=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=96=B0=E5=A2=9E=E5=85=B3=E9=97=AD=E8=BF=9B=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9EuTools=E5=8A=9F=E8=83=BD=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/simulate/index.js    |   3 +
 .../lib/quickcomposer/simulate/keyboardTap.js |  34 +
 .../composer/simulate/KeyEditor.vue           | 372 +++++++--
 .../composer/simulate/KeySequenceEditor.vue   | 761 ++++++++++++++++++
 src/js/composer/cardComponents.js             |  26 +-
 src/js/composer/commands/index.js             |   2 +
 src/js/composer/commands/otherCommands.js     |  12 -
 src/js/composer/commands/simulateCommands.js  |  25 +-
 src/js/composer/commands/systemCommands.js    |  23 +
 src/js/composer/commands/utoolsCommand.js     |  87 ++
 10 files changed, 1277 insertions(+), 68 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/simulate/keyboardTap.js
 create mode 100644 src/components/composer/simulate/KeySequenceEditor.vue
 create mode 100644 src/js/composer/commands/utoolsCommand.js

diff --git a/plugin/lib/quickcomposer/simulate/index.js b/plugin/lib/quickcomposer/simulate/index.js
index f7a38474..e4bce25f 100644
--- a/plugin/lib/quickcomposer/simulate/index.js
+++ b/plugin/lib/quickcomposer/simulate/index.js
@@ -1,9 +1,12 @@
 const { findImage } = require("./imageFinder");
 const { captureScreen } = require("./screenCapture");
 const sendText = require("./sendText");
+const { keyboardTap, keySequence } = require("./keyboardTap");
 
 module.exports = {
   findImage,
   captureScreen,
   sendText,
+  keyboardTap,
+  keySequence,
 };
diff --git a/plugin/lib/quickcomposer/simulate/keyboardTap.js b/plugin/lib/quickcomposer/simulate/keyboardTap.js
new file mode 100644
index 00000000..3b239bf7
--- /dev/null
+++ b/plugin/lib/quickcomposer/simulate/keyboardTap.js
@@ -0,0 +1,34 @@
+const keyboardTap = (keys, options = {}) => {
+  const { repeatCount = 1, repeatInterval = 0, keyDelay = 0 } = options;
+
+  // 执行重复操作
+  const repeat = () => {
+    for (let i = 0; i < repeatCount; i++) {
+      // 执行按键操作
+      window.utools.simulateKeyboardTap(...keys);
+
+      // 如果有重复间隔且不是最后一次，则等待
+      if (repeatInterval > 0 && i < repeatCount - 1) {
+        quickcommand.sleep(repeatInterval);
+      }
+    }
+
+    // 如果有按键后延迟，则等待
+    if (keyDelay > 0) {
+      quickcommand.sleep(keyDelay);
+    }
+  };
+
+  return repeat();
+};
+
+const keySequence = (sequence, { interval = 100 } = {}) => {
+  sequence.forEach((keys, index) => {
+    keyboardTap(keys);
+    if (index < sequence.length - 1) {
+      quickcommand.sleep(interval);
+    }
+  });
+};
+
+module.exports = { keyboardTap, keySequence };
diff --git a/src/components/composer/simulate/KeyEditor.vue b/src/components/composer/simulate/KeyEditor.vue
index 89ee876e..9371ff46 100644
--- a/src/components/composer/simulate/KeyEditor.vue
+++ b/src/components/composer/simulate/KeyEditor.vue
@@ -51,7 +51,52 @@
           </q-badge>
         </template>
         <template v-slot:append>
-          
+          <q-btn
+            flat
+            dense
+            round
+            icon="more_vert"
+            color="primary"
+            class="q-ml-sm"
+            @click.stop
+          >
+            <q-menu anchor="bottom right" self="top right">
+              <q-list style="min-width: 200px">
+                <template
+                  v-for="(shortcut, index) in commonShortcuts"
+                  :key="index"
+                >
+                  <template v-if="shortcut.header">
+                    <q-item-label
+                      v-if="shortcut.show === undefined || shortcut.show"
+                      header
+                      class="q-mt-sm"
+                    >
+                      {{ shortcut.label }}
+                    </q-item-label>
+                    <q-separator
+                      v-if="shortcut.show === undefined || shortcut.show"
+                    />
+                  </template>
+                  <q-item
+                    v-else-if="shortcut.show === undefined || shortcut.show"
+                    clickable
+                    v-close-popup
+                    @click="applyShortcut(shortcut)"
+                  >
+                    <q-item-section>
+                      <q-item-label>{{ shortcut.label }}</q-item-label>
+                    </q-item-section>
+                    <q-item-section side>
+                      <q-item-label caption>
+                        {{ formatShortcut(shortcut) }}
+                      </q-item-label>
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-list>
+            </q-menu>
+          </q-btn>
         </template>
       </q-select>
       <!-- 录制按钮 -->
@@ -104,11 +149,250 @@
 
 <script>
 import { defineComponent } from "vue";
-import NumberInput from "../common/NumberInput.vue";
+import NumberInput from "components/composer/common/NumberInput.vue";
+import { parseFunction } from "js/composer/formatString";
 
 // 检测操作系统
 const isMac = window.utools.isMacOs();
 
+// 常用按键列表
+const commonKeys = [
+  { label: "Enter ↵", value: "enter" },
+  { label: "Tab ⇥", value: "tab" },
+  { label: "Space", value: "space" },
+  { label: "Backspace ⌫", value: "backspace" },
+  { label: "Delete ⌦", value: "delete" },
+  { label: "Escape ⎋", value: "escape" },
+  { label: "↑", value: "up" },
+  { label: "↓", value: "down" },
+  { label: "←", value: "left" },
+  { label: "→", value: "right" },
+  { label: "Home", value: "home" },
+  { label: "End", value: "end" },
+  { label: "Page Up", value: "pageup" },
+  { label: "Page Down", value: "pagedown" },
+];
+
+// 常用快捷键列表
+const commonShortcuts = [
+  // Windows 快捷键
+  {
+    label: "Windows 快捷键",
+    header: true,
+    show: !isMac,
+  },
+  {
+    label: "任务管理器",
+    mainKey: "delete",
+    modifiers: { control: true, shift: true, alt: true },
+    show: !isMac,
+  },
+  {
+    label: "运行",
+    mainKey: "r",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+  {
+    label: "切换到地址栏",
+    mainKey: "l",
+    modifiers: { control: true },
+    show: !isMac,
+  },
+  {
+    label: "切换窗口",
+    mainKey: "tab",
+    modifiers: { alt: true },
+    show: !isMac,
+  },
+  {
+    label: "锁定电脑",
+    mainKey: "l",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+  {
+    label: "显示桌面",
+    mainKey: "d",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+  {
+    label: "文件资源管理器",
+    mainKey: "e",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+  {
+    label: "快速访问设置",
+    mainKey: "a",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+  {
+    label: "打开开始菜单",
+    mainKey: "escape",
+    modifiers: { control: true },
+    show: !isMac,
+  },
+  {
+    label: "系统属性",
+    mainKey: "pause",
+    modifiers: { command: true },
+    show: !isMac,
+  },
+
+  // macOS 快捷键
+  {
+    label: "macOS 快捷键",
+    header: true,
+    show: isMac,
+  },
+  {
+    label: "强制退出",
+    mainKey: "escape",
+    modifiers: { command: true, alt: true },
+    show: isMac,
+  },
+  {
+    label: "截图",
+    mainKey: "3",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "区域截图",
+    mainKey: "4",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "前往文件夹",
+    mainKey: "g",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "新建文件夹",
+    mainKey: "n",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "显示隐藏文件",
+    mainKey: ".",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "访达偏好设置",
+    mainKey: ",",
+    modifiers: { command: true },
+    show: isMac,
+  },
+  {
+    label: "清空废纸篓",
+    mainKey: "backspace",
+    modifiers: { command: true, shift: true },
+    show: isMac,
+  },
+  {
+    label: "排序方式",
+    mainKey: "j",
+    modifiers: { command: true },
+    show: isMac,
+  },
+  {
+    label: "显示简介",
+    mainKey: "i",
+    modifiers: { command: true },
+    show: isMac,
+  },
+  {
+    label: "最小化所有窗口",
+    mainKey: "m",
+    modifiers: { command: true, alt: true },
+    show: isMac,
+  },
+  {
+    label: "调度中心",
+    mainKey: "up",
+    modifiers: { control: true },
+    show: isMac,
+  },
+
+  // 通用快捷键（所有系统）
+  {
+    label: "通用操作",
+    header: true,
+  },
+  {
+    label: "复制",
+    mainKey: "c",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "粘贴",
+    mainKey: "v",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "剪切",
+    mainKey: "x",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "撤销",
+    mainKey: "z",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "重做",
+    mainKey: isMac ? "z" : "y",
+    modifiers: isMac ? { command: true, shift: true } : { control: true },
+  },
+  {
+    label: "全选",
+    mainKey: "a",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "保存",
+    mainKey: "s",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "查找",
+    mainKey: "f",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "关闭窗口",
+    mainKey: isMac ? "w" : "f4",
+    modifiers: isMac ? { command: true } : { alt: true },
+  },
+  {
+    label: "刷新",
+    mainKey: "r",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "新建",
+    mainKey: "n",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "打印",
+    mainKey: "p",
+    modifiers: isMac ? { command: true } : { control: true },
+  },
+  {
+    label: "删除",
+    mainKey: "delete",
+    modifiers: {},
+  },
+];
+
 export default defineComponent({
   name: "KeyEditor",
   components: {
@@ -149,22 +433,6 @@ export default defineComponent({
             shift: "Shift",
             command: "Win",
           },
-      commonKeys: [
-        { label: "Enter ↵", value: "enter" },
-        { label: "Tab ⇥", value: "tab" },
-        { label: "Space", value: "space" },
-        { label: "Backspace ⌫", value: "backspace" },
-        { label: "Delete ⌦", value: "delete" },
-        { label: "Escape ⎋", value: "escape" },
-        { label: "↑", value: "up" },
-        { label: "↓", value: "down" },
-        { label: "←", value: "left" },
-        { label: "→", value: "right" },
-        { label: "Home", value: "home" },
-        { label: "End", value: "end" },
-        { label: "Page Up", value: "pageup" },
-        { label: "Page Down", value: "pagedown" },
-      ],
     };
   },
   computed: {
@@ -196,6 +464,12 @@ export default defineComponent({
             this.argvs.mainKey.slice(1))
       );
     },
+    commonKeys() {
+      return commonKeys;
+    },
+    commonShortcuts() {
+      return commonShortcuts;
+    },
   },
   methods: {
     toggleModifier(key) {
@@ -327,7 +601,7 @@ export default defineComponent({
         // 在非 Mac 系统上，将 command 换为 meta
         .map((key) => (!isMac && key === "command" ? "meta" : key));
 
-      const args = [argvs.mainKey, ...activeModifiers];
+      const keys = [argvs.mainKey, ...activeModifiers];
 
       // 添加重复次数、间隔和延迟参数
       const options = {};
@@ -337,11 +611,11 @@ export default defineComponent({
       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}(${JSON.stringify(
+          keys
+        )}, ${JSON.stringify(options)})`;
       }
-      return `${this.modelValue.value}("${args.join('","')}")`;
+      return `${this.modelValue.value}(${JSON.stringify(keys)})`;
     },
     updateValue(argv) {
       const newArgvs = {
@@ -358,35 +632,27 @@ export default defineComponent({
       const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
       if (!code) return argvs;
       try {
-        // 移除 keyTap 和引号
-        const cleanVal = code.replace(/^keyTap\("/, "").replace(/"\)$/, "");
-        // 分割并移除每个参数的引号
-        const parts = cleanVal.split(/,\s*/);
-        const keyParts = parts[0]
-          .split('","')
-          .map((arg) => arg.replace(/^"|"$/g, ""));
+        const result = parseFunction(code);
+        if (!result || !result.argvs || !result.argvs[0]) return argvs;
 
-        if (keyParts.length > 0) {
-          argvs.mainKey = keyParts[0];
+        const keys = result.argvs[0];
+        const options = result.argvs[1] || {};
+
+        if (keys.length > 0) {
+          argvs.mainKey = keys[0];
           Object.keys(argvs.modifiers).forEach((key) => {
             // 在非 Mac 系统上，将 meta 转换为 command
-            const modKey =
-              !isMac && keyParts.includes("meta") ? "command" : key;
-            argvs.modifiers[key] = keyParts.includes(modKey);
+            const modKey = !isMac && key === "command" ? "meta" : key;
+            argvs.modifiers[key] = keys.slice(1).includes(modKey);
           });
         }
 
         // 解析选项对象
-        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);
-          }
+        if (options) {
+          if (options.repeatCount) argvs.repeatCount = options.repeatCount;
+          if (options.repeatInterval)
+            argvs.repeatInterval = options.repeatInterval;
+          if (options.keyDelay) argvs.keyDelay = options.keyDelay;
         }
 
         return argvs;
@@ -421,6 +687,22 @@ export default defineComponent({
         this.updateValue({ mainKey: val.data });
       }
     },
+    applyShortcut(shortcut) {
+      this.updateValue({
+        mainKey: shortcut.mainKey,
+        modifiers: {
+          ...this.defaultArgvs.modifiers,
+          ...shortcut.modifiers,
+        },
+      });
+    },
+    formatShortcut(shortcut) {
+      const modifiers = Object.entries(shortcut.modifiers)
+        .filter(([_, active]) => active)
+        .map(([key]) => this.modifierLabels[key])
+        .join(" + ");
+      return `${modifiers} + ${shortcut.mainKey}`;
+    },
   },
   mounted() {
     if (!this.modelValue.code && !this.modelValue.argvs) {
diff --git a/src/components/composer/simulate/KeySequenceEditor.vue b/src/components/composer/simulate/KeySequenceEditor.vue
new file mode 100644
index 00000000..afe683b6
--- /dev/null
+++ b/src/components/composer/simulate/KeySequenceEditor.vue
@@ -0,0 +1,761 @@
+<template>
+  <div class="key-sequence-editor">
+    <!-- 录制控制区 -->
+    <div class="row items-center justify-between q-mb-sm">
+      <div class="row items-center q-gutter-sm">
+        <q-btn
+          :color="isRecording ? 'negative' : 'primary'"
+          :icon="isRecording ? 'stop' : 'fiber_manual_record'"
+          :label="isRecording ? '停止' : '录制'"
+          dense
+          size="sm"
+          class="recording-btn"
+          @click="toggleRecording"
+          :style="{
+            height: '36px',
+          }"
+        >
+          <q-tooltip>{{
+            isRecording ? "停止录制" : "开始录制按键序列"
+          }}</q-tooltip>
+        </q-btn>
+        <q-btn-group
+          unelevated
+          :style="{
+            height: '36px',
+          }"
+        >
+          <!-- 通用快捷键 -->
+          <q-btn size="sm" flat color="primary" icon="keyboard">
+            <q-tooltip>通用快捷键</q-tooltip>
+            <q-menu anchor="bottom left" self="top left" :offset="[0, 4]">
+              <q-list style="min-width: 150px">
+                <q-item-label header class="text-primary"
+                  >通用快捷键</q-item-label
+                >
+                <q-item
+                  v-for="item in commonShortcuts"
+                  :key="item.label"
+                  clickable
+                  dense
+                  @click="appendSequence(item.sequence)"
+                >
+                  <q-item-section>{{ item.label }}</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+
+          <!-- Vim快捷键 -->
+          <q-btn size="sm" flat color="primary" icon="code">
+            <q-tooltip>Vim快捷键</q-tooltip>
+            <q-menu anchor="bottom left" self="top left" :offset="[0, 4]">
+              <q-list style="min-width: 150px">
+                <q-item-label header class="text-primary"
+                  >Vim快捷键</q-item-label
+                >
+                <q-item
+                  v-for="item in vimShortcuts"
+                  :key="item.label"
+                  clickable
+                  dense
+                  @click="appendSequence(item.sequence)"
+                >
+                  <q-item-section>{{ item.label }}</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+
+          <!-- Tmux快捷键 -->
+          <q-btn size="sm" flat color="primary" icon="terminal">
+            <q-tooltip>Tmux快捷键</q-tooltip>
+            <q-menu anchor="bottom left" self="top left" :offset="[0, 4]">
+              <q-list style="min-width: 150px">
+                <q-item-label header class="text-primary"
+                  >Tmux快捷键</q-item-label
+                >
+                <q-item
+                  v-for="item in tmuxShortcuts"
+                  :key="item.label"
+                  clickable
+                  dense
+                  @click="appendSequence(item.sequence)"
+                >
+                  <q-item-section>{{ item.label }}</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+
+          <!-- Chrome快捷键 -->
+          <q-btn size="sm" flat color="primary" icon="public">
+            <q-tooltip>Chrome快捷键</q-tooltip>
+            <q-menu anchor="bottom left" self="top left" :offset="[0, 4]">
+              <q-list style="min-width: 150px">
+                <q-item-label header class="text-primary"
+                  >Chrome快捷键</q-item-label
+                >
+                <q-item
+                  v-for="item in chromeShortcuts"
+                  :key="item.label"
+                  clickable
+                  v-close-popup
+                  dense
+                  @click="appendSequence(item.sequence)"
+                >
+                  <q-item-section>{{ item.label }}</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+        </q-btn-group>
+
+        <number-input
+          v-if="argvs.sequence.length > 1"
+          :model-value="argvs.interval"
+          label="间隔(ms)"
+          icon="timer"
+          class="q-ml-md interval-input"
+          @update:model-value="updateInterval"
+        />
+      </div>
+
+      <div class="row items-center" v-if="argvs.sequence.length > 0">
+        <q-badge color="primary" text-color="white" class="q-mr-xs">
+          {{ argvs.sequence.length }}
+        </q-badge>
+        <span class="text-grey-7 text-caption">个按键</span>
+        <q-btn
+          flat
+          dense
+          round
+          size="sm"
+          color="grey-7"
+          icon="clear_all"
+          class="q-ml-xs"
+          @click="clearSequence"
+        >
+          <q-tooltip>清空序列</q-tooltip>
+        </q-btn>
+      </div>
+    </div>
+
+    <!-- 序列显示区 -->
+    <div v-if="argvs.sequence.length > 0" class="sequence-list q-mb-sm">
+      <div class="row q-col-gutter-sm">
+        <draggable
+          v-model="argvs.sequence"
+          item-key="id"
+          handle=".drag-handle"
+          :animation="200"
+          ghost-class="ghost"
+          class="row full-width"
+          @change="updateValue"
+        >
+          <template #item="{ element, index }">
+            <div class="col-4 q-py-xs">
+              <div
+                class="row items-center justify-center no-wrap hover-show-actions sequence-item"
+              >
+                <!-- 拖拽手柄 -->
+                <div class="col-auto q-mr-xs cursor-move drag-handle">
+                  <q-icon name="drag_indicator" size="14px" color="grey-7" />
+                </div>
+                <!-- 序号 -->
+                <div class="col-auto q-mr-xs text-grey-7 sequence-number">
+                  {{ index + 1 }}.
+                </div>
+                <!-- 按键显示 -->
+                <div class="row items-center justify-center no-wrap">
+                  <!-- 修饰键 -->
+                  <template
+                    v-for="(active, key) in element.modifiers"
+                    :key="key"
+                  >
+                    <q-chip v-if="active" dense square class="modifier-chip">
+                      {{ modifierLabels[key] }}
+                    </q-chip>
+                  </template>
+                  <!-- 主按键 -->
+                  <q-chip
+                    color="primary"
+                    text-color="white"
+                    dense
+                    square
+                    class="main-key"
+                  >
+                    {{ formatMainKey(element.mainKey) }}
+                  </q-chip>
+                </div>
+                <!-- 操作按钮 -->
+                <div class="col-auto action-buttons">
+                  <q-btn
+                    flat
+                    round
+                    dense
+                    size="xs"
+                    color="grey-7"
+                    icon="close"
+                    @click="removeKey(index)"
+                  >
+                    <q-tooltip>删除此按键</q-tooltip>
+                  </q-btn>
+                </div>
+              </div>
+            </div>
+          </template>
+        </draggable>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import NumberInput from "../common/NumberInput.vue";
+import draggable from "vuedraggable";
+import { parseFunction } from "js/composer/formatString";
+
+// 检测操作系统
+const isMac = window.utools.isMacOs();
+
+// 通用快捷键
+const commonShortcuts = [
+  {
+    label: "复制",
+    sequence: [{ mainKey: "c", modifiers: { command: true } }],
+  },
+  {
+    label: "粘贴",
+    sequence: [{ mainKey: "v", modifiers: { command: true } }],
+  },
+  {
+    label: "剪切",
+    sequence: [{ mainKey: "x", modifiers: { command: true } }],
+  },
+  {
+    label: "全选",
+    sequence: [{ mainKey: "a", modifiers: { command: true } }],
+  },
+  {
+    label: "撤销",
+    sequence: [{ mainKey: "z", modifiers: { command: true } }],
+  },
+  {
+    label: "重做",
+    sequence: [{ mainKey: "z", modifiers: { command: true, shift: true } }],
+  },
+  {
+    label: "保存",
+    sequence: [{ mainKey: "s", modifiers: { command: true } }],
+  },
+  {
+    label: "查找",
+    sequence: [{ mainKey: "f", modifiers: { command: true } }],
+  },
+  {
+    label: "替换",
+    sequence: [{ mainKey: "h", modifiers: { command: true } }],
+  },
+  {
+    label: "关闭窗口",
+    sequence: [{ mainKey: "w", modifiers: { command: true } }],
+  },
+];
+
+// Vim快捷键
+const vimShortcuts = [
+  {
+    label: "保存",
+    sequence: [
+      { mainKey: "escape", modifiers: {} },
+      { mainKey: ":", modifiers: { shift: true } },
+      { mainKey: "w", modifiers: {} },
+      { mainKey: "enter", modifiers: {} },
+    ],
+  },
+  {
+    label: "退出",
+    sequence: [
+      { mainKey: "escape", modifiers: {} },
+      { mainKey: ":", modifiers: { shift: true } },
+      { mainKey: "q", modifiers: {} },
+      { mainKey: "enter", modifiers: {} },
+    ],
+  },
+  {
+    label: "强制退出",
+    sequence: [
+      { mainKey: "escape", modifiers: {} },
+      { mainKey: ":", modifiers: { shift: true } },
+      { mainKey: "q", modifiers: {} },
+      { mainKey: "!", modifiers: { shift: true } },
+      { mainKey: "enter", modifiers: {} },
+    ],
+  },
+  {
+    label: "删除整行",
+    sequence: [
+      { mainKey: "d", modifiers: {} },
+      { mainKey: "d", modifiers: {} },
+    ],
+  },
+  {
+    label: "复制整行",
+    sequence: [
+      { mainKey: "y", modifiers: {} },
+      { mainKey: "y", modifiers: {} },
+    ],
+  },
+  {
+    label: "粘贴",
+    sequence: [{ mainKey: "p", modifiers: {} }],
+  },
+  {
+    label: "行首",
+    sequence: [{ mainKey: "0", modifiers: {} }],
+  },
+  {
+    label: "行尾",
+    sequence: [{ mainKey: "$", modifiers: { shift: true } }],
+  },
+  {
+    label: "文件头",
+    sequence: [
+      { mainKey: "g", modifiers: {} },
+      { mainKey: "g", modifiers: {} },
+    ],
+  },
+  {
+    label: "文件尾",
+    sequence: [
+      { mainKey: "g", modifiers: {} },
+      { mainKey: "g", modifiers: {} },
+    ],
+  },
+];
+
+// Tmux快捷键
+const tmuxShortcuts = [
+  {
+    label: "新建窗口",
+    sequence: [
+      { mainKey: "b", modifiers: { control: true } },
+      { mainKey: "c", modifiers: {} },
+    ],
+  },
+  {
+    label: "水平分割",
+    sequence: [
+      { mainKey: "b", modifiers: { control: true } },
+      { mainKey: '"', modifiers: { shift: true } },
+    ],
+  },
+  {
+    label: "垂直分割",
+    sequence: [
+      { mainKey: "b", modifiers: { control: true } },
+      { mainKey: "%", modifiers: { shift: true } },
+    ],
+  },
+  {
+    label: "切换窗口",
+    sequence: [
+      { mainKey: "b", modifiers: { control: true } },
+      { mainKey: "n", modifiers: {} },
+    ],
+  },
+  {
+    label: "关闭面板",
+    sequence: [
+      { mainKey: "b", modifiers: { control: true } },
+      { mainKey: "x", modifiers: {} },
+    ],
+  },
+];
+
+// Chrome快捷键
+const chromeShortcuts = [
+  {
+    label: "新标签页",
+    sequence: [{ mainKey: "t", modifiers: { command: true } }],
+  },
+  {
+    label: "关闭标签页",
+    sequence: [{ mainKey: "w", modifiers: { command: true } }],
+  },
+  {
+    label: "重新打开关闭的标签页",
+    sequence: [{ mainKey: "t", modifiers: { command: true, shift: true } }],
+  },
+  {
+    label: "切换到下一个标签页",
+    sequence: [{ mainKey: "tab", modifiers: { control: true } }],
+  },
+  {
+    label: "切换到上一个标签页",
+    sequence: [{ mainKey: "tab", modifiers: { control: true, shift: true } }],
+  },
+];
+
+export default defineComponent({
+  name: "KeySequenceEditor",
+  components: {
+    NumberInput,
+    draggable,
+  },
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isRecording: false,
+      defaultArgvs: {
+        sequence: [],
+        interval: 100,
+      },
+      modifierLabels: isMac
+        ? {
+            control: "⌃",
+            alt: "⌥",
+            shift: "⇧",
+            command: "⌘",
+          }
+        : {
+            control: "Ctrl",
+            alt: "Alt",
+            shift: "Shift",
+            command: "Win",
+          },
+      commonShortcuts,
+      vimShortcuts,
+      tmuxShortcuts,
+      chromeShortcuts,
+    };
+  },
+  computed: {
+    argvs() {
+      return (
+        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+      );
+    },
+  },
+  methods: {
+    toggleRecording() {
+      if (!this.isRecording) {
+        this.startRecording();
+      } else {
+        this.stopRecording();
+      }
+    },
+    startRecording() {
+      this.isRecording = true;
+
+      this.recordEvent = (event) => {
+        event.preventDefault();
+
+        // 创建新的按键记录
+        const keyRecord = {
+          mainKey: "",
+          modifiers: {
+            control: false,
+            alt: false,
+            shift: false,
+            command: false,
+          },
+          id: Date.now() + Math.random(),
+        };
+
+        // 设置修饰键状态
+        if (isMac) {
+          if (event.metaKey) keyRecord.modifiers.command = true;
+          if (event.ctrlKey) keyRecord.modifiers.control = true;
+        } else {
+          if (event.ctrlKey) keyRecord.modifiers.control = true;
+          if (event.metaKey || event.winKey) keyRecord.modifiers.command = true;
+        }
+        if (event.altKey) keyRecord.modifiers.alt = true;
+        if (event.shiftKey) keyRecord.modifiers.shift = true;
+
+        // 设置主按键
+        let key = null;
+
+        // 处理字母键
+        if (event.code.startsWith("Key")) {
+          key = event.code.slice(-1).toLowerCase();
+        }
+        // 处理数字键
+        else if (event.code.startsWith("Digit")) {
+          key = event.code.slice(-1);
+        }
+        // 处理功能键
+        else if (event.code.startsWith("F") && !isNaN(event.code.slice(1))) {
+          key = event.code.toLowerCase();
+        }
+        // 处理其他特殊键
+        else {
+          const keyMap = {
+            ArrowUp: "up",
+            ArrowDown: "down",
+            ArrowLeft: "left",
+            ArrowRight: "right",
+            Enter: "enter",
+            Space: "space",
+            Escape: "escape",
+            Delete: "delete",
+            Backspace: "backspace",
+            Tab: "tab",
+            Home: "home",
+            End: "end",
+            PageUp: "pageup",
+            PageDown: "pagedown",
+          };
+          key = keyMap[event.code] || event.key.toLowerCase();
+        }
+
+        // 忽略单独的修饰键
+        if (!["control", "alt", "shift", "command", "meta"].includes(key)) {
+          keyRecord.mainKey = key;
+          this.argvs.sequence.push(keyRecord);
+          this.updateValue();
+        }
+      };
+
+      document.addEventListener("keydown", this.recordEvent);
+    },
+    stopRecording() {
+      this.isRecording = false;
+      document.removeEventListener("keydown", this.recordEvent);
+    },
+    removeKey(index) {
+      this.argvs.sequence.splice(index, 1);
+      this.updateValue();
+    },
+    clearSequence() {
+      this.argvs.sequence = [];
+      this.updateValue();
+    },
+    updateInterval(value) {
+      this.argvs.interval = value;
+      this.updateValue();
+    },
+    formatMainKey(key) {
+      if (!key) return "";
+      // 特殊按键映射表
+      const specialKeyMap = {
+        enter: "↵",
+        tab: "⇥",
+        space: "␣",
+        backspace: "⌫",
+        delete: "⌦",
+        escape: "⎋",
+        up: "↑",
+        down: "↓",
+        left: "←",
+        right: "→",
+      };
+      return (
+        specialKeyMap[key] ||
+        (key.length === 1
+          ? key.toUpperCase()
+          : key.charAt(0).toUpperCase() + key.slice(1))
+      );
+    },
+    generateCode() {
+      if (this.argvs.sequence.length === 0) return;
+
+      // 将每个按键记录转换为按键数组
+      const keySequence = this.argvs.sequence.map((item) => {
+        const activeModifiers = Object.entries(item.modifiers)
+          .filter(([_, active]) => active)
+          .map(([key]) => key)
+          // 在非 Mac 系统上，将 command 换为 meta
+          .map((key) => (!isMac && key === "command" ? "meta" : key));
+
+        return [item.mainKey, ...activeModifiers];
+      });
+
+      // 生成代码
+      const options =
+        this.argvs.sequence.length > 1 ? { interval: this.argvs.interval } : {};
+      if (Object.keys(options).length > 0) {
+        return `${this.modelValue.value}(${JSON.stringify(
+          keySequence
+        )}, ${JSON.stringify(options)})`;
+      }
+      return `${this.modelValue.value}(${JSON.stringify(keySequence)})`;
+    },
+    updateValue() {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        argvs: this.argvs,
+        code: this.generateCode(),
+      });
+    },
+    appendSequence(newSequence) {
+      const startId = Date.now();
+      this.argvs.sequence.push(
+        ...newSequence.map((item, index) => ({
+          ...item,
+          id: startId + index,
+        }))
+      );
+      this.updateValue();
+    },
+    parseCodeToArgvs(code) {
+      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
+      if (!code) return argvs;
+      try {
+        const match = code.match(/\((.*)\)/s);
+        if (match) {
+          const args = eval(`[${match[1]}]`);
+          if (Array.isArray(args[0])) {
+            argvs.sequence = args[0].map((keys) => {
+              const mainKey = keys[0];
+              const modifiers = {
+                control: keys.includes("control"),
+                alt: keys.includes("alt"),
+                shift: keys.includes("shift"),
+                command:
+                  !isMac && keys.includes("meta")
+                    ? true
+                    : keys.includes("command"),
+              };
+              return { mainKey, modifiers, id: Date.now() + Math.random() };
+            });
+            if (args[1] && args[1].interval) {
+              argvs.interval = args[1].interval;
+            }
+          }
+        }
+      } catch (e) {
+        console.error("Failed to parse existing code:", e);
+      }
+      return argvs;
+    },
+  },
+  mounted() {
+    if (!this.modelValue.code && !this.modelValue.argvs) {
+      this.updateValue();
+    }
+  },
+});
+</script>
+
+<style scoped>
+.key-sequence-editor {
+  padding: 4px;
+}
+
+.recording-btn {
+  min-width: 70px;
+  height: 28px;
+  font-size: 14px;
+}
+
+.recording-btn :deep(.q-icon.on-left) {
+  margin-right: 2px;
+}
+
+.sequence-list {
+  border: 1px solid var(--q-primary);
+  border-radius: 4px;
+  padding: 4px;
+  max-height: 300px;
+  overflow-y: auto;
+}
+
+.sequence-item {
+  user-select: none;
+  padding: 2px 4px;
+  border-radius: 4px;
+  transition: background-color 0.2s;
+  min-height: 28px;
+}
+
+.sequence-item > div {
+  flex: 0 0 auto;
+}
+
+.sequence-item > .row {
+  flex: 1 1 auto;
+}
+
+.sequence-item:hover {
+  background-color: rgba(0, 0, 0, 0.03);
+}
+
+.body--dark .sequence-item:hover {
+  background-color: rgba(255, 255, 255, 0.03);
+}
+
+.sequence-number {
+  font-size: 11px;
+  min-width: 14px;
+  opacity: 0.7;
+}
+
+.modifier-chip {
+  height: 16px;
+  font-size: 11px;
+  margin: 0 1px;
+  background-color: var(--q-primary);
+  color: white;
+  min-width: 32px;
+  padding: 0 4px;
+}
+
+.main-key {
+  height: 16px;
+  font-size: 11px;
+  margin: 0 1px;
+  min-width: 32px;
+  padding: 0 4px;
+}
+
+.modifier-chip :deep(.q-chip__content),
+.main-key :deep(.q-chip__content) {
+  justify-content: center;
+  text-align: center;
+}
+
+.hover-show-actions .action-buttons {
+  opacity: 0;
+  transition: opacity 0.2s;
+}
+
+.hover-show-actions:hover .action-buttons {
+  opacity: 1;
+}
+
+.ghost {
+  opacity: 0.5;
+  background: var(--q-primary) !important;
+}
+
+/* 滚动条样式 */
+.sequence-list::-webkit-scrollbar {
+  width: 4px;
+}
+
+.sequence-list::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.sequence-list::-webkit-scrollbar-thumb {
+  background: var(--q-primary);
+  border-radius: 2px;
+}
+
+.interval-input {
+  width: 130px;
+}
+
+.drag-handle {
+  cursor: grab;
+}
+</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index 1ed87326..c919a921 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -1,14 +1,17 @@
 import { defineAsyncComponent } from "vue";
 
-// UI Components
+// 模拟操作组件
 export const KeyEditor = defineAsyncComponent(() =>
   import("src/components/composer/simulate/KeyEditor.vue")
 );
 export const ImageSearchEditor = defineAsyncComponent(() =>
   import("components/composer/simulate/ImageSearchEditor.vue")
 );
+export const KeySequenceEditor = defineAsyncComponent(() =>
+  import("src/components/composer/simulate/KeySequenceEditor.vue")
+);
 
-// Control Flow Components
+// 控制流组件
 export const ConditionalJudgment = defineAsyncComponent(() =>
   import("components/composer/control/ConditionalJudgment.vue")
 );
@@ -31,18 +34,24 @@ export const TryCatchControl = defineAsyncComponent(() =>
   import("components/composer/control/TryCatchControl.vue")
 );
 
-// Editor Components
+// 网络组件
 export const UBrowserEditor = defineAsyncComponent(() =>
   import("components/composer/ubrowser/UBrowserEditor.vue")
 );
 export const AxiosConfigEditor = defineAsyncComponent(() =>
   import("src/components/composer/network/AxiosConfigEditor.vue")
 );
+
+// 数据组件
 export const RegexEditor = defineAsyncComponent(() =>
   import("components/composer/data/regex/RegexEditor.vue")
 );
 
-// Crypto Components
+export const ZlibEditor = defineAsyncComponent(() =>
+  import("src/components/composer/data/ZlibEditor.vue")
+);
+
+// 加密组件
 export const SymmetricCryptoEditor = defineAsyncComponent(() =>
   import("src/components/composer/coding/SymmetricCryptoEditor.vue")
 );
@@ -50,20 +59,17 @@ export const AsymmetricCryptoEditor = defineAsyncComponent(() =>
   import("src/components/composer/coding/AsymmetricCryptoEditor.vue")
 );
 
-// File Components
+// 文件组件
 export const FileOperationEditor = defineAsyncComponent(() =>
   import("components/composer/file/FileOperationEditor.vue")
 );
 
-// System Components
+// 系统组件
 export const SystemCommandEditor = defineAsyncComponent(() =>
   import("components/composer/system/SystemCommandEditor.vue")
 );
 
-export const ZlibEditor = defineAsyncComponent(() =>
-  import("src/components/composer/data/ZlibEditor.vue")
-);
-
+// UI组件
 export const SelectListEditor = defineAsyncComponent(() =>
   import("components/composer/ui/SelectListEditor.vue")
 );
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index c2f1fe8d..41d362d4 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -10,12 +10,14 @@ import { uiCommands } from "./uiCommands";
 import { codingCommands } from "./codingCommand";
 import { mathCommands } from "./mathCommands";
 import { userdataCommands } from "./userdataCommands";
+import { utoolsCommands } from "./utoolsCommand";
 
 export const commandCategories = [
   fileCommands,
   networkCommands,
   systemCommands,
   notifyCommands,
+  utoolsCommands,
   dataCommands,
   codingCommands,
   controlCommands,
diff --git a/src/js/composer/commands/otherCommands.js b/src/js/composer/commands/otherCommands.js
index 510066f5..b7edf869 100644
--- a/src/js/composer/commands/otherCommands.js
+++ b/src/js/composer/commands/otherCommands.js
@@ -3,18 +3,6 @@ export const otherCommands = {
   icon: "more_horiz",
   defaultOpened: false,
   commands: [
-    {
-      value: "utools.redirect",
-      label: "转至指定插件",
-      config: [
-        {
-          key: "pluginName",
-          label: "要跳转至的插件名称",
-          type: "varInput",
-          icon: "alt_route",
-        },
-      ],
-    },
     {
       value: "quickcommand.sleep",
       label: "添加延时",
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 2eb3e524..e3dc6835 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -4,11 +4,34 @@ export const simulateCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "utools.simulateKeyboardTap",
+      value: "quickcomposer.simulate.keyboardTap",
       label: "模拟按键",
       config: [],
       component: "KeyEditor",
     },
+    {
+      value: "quickcomposer.simulate.keySequence",
+      label: "按键序列",
+      description: "按顺序执行多个按键操作",
+      component: "KeySequenceEditor",
+    },
+    {
+      value: "quickcommand.simulateCopy",
+      label: "模拟复制粘贴",
+      config: [],
+      functionSelector: [
+        {
+          value: "quickcommand.simulateCopy",
+          label: "复制",
+          icon: "content_copy",
+        },
+        {
+          value: "quickcommand.simulatePaste",
+          label: "粘贴",
+          icon: "content_paste",
+        },
+      ],
+    },
     {
       value: "quickcomposer.simulate.sendText",
       label: "发送文本",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 62b321a7..64b1b4ab 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const systemCommands = {
   label: "系统操作",
   icon: "computer",
@@ -299,5 +301,26 @@ export const systemCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.kill",
+      label: "关闭进程",
+      desc: "关闭指定进程",
+      icon: "dangerous",
+      config: [
+        {
+          label: "进程ID",
+          type: "numInput",
+          icon: "developer_board",
+          width: 6,
+        },
+        {
+          label: "信号",
+          type: "varInput",
+          icon: "signal_cellular_alt",
+          defaultValue: newVarInputVal("str", "SIGTERM"),
+          width: 6,
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
new file mode 100644
index 00000000..518afcf5
--- /dev/null
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -0,0 +1,87 @@
+export const utoolsCommands = {
+  label: "uTools功能",
+  icon: "insights",
+  commands: [
+    {
+      value: "utools.hideMainWindow",
+      label: "隐藏主窗口",
+      desc: "隐藏主窗口",
+      icon: "visibility_off",
+    },
+    {
+      value: "quickcommand.wakeUtools",
+      label: "唤醒uTools",
+      desc: "唤醒uTools",
+      icon: "visibility",
+    },
+    {
+      value: "utools.setExpendHeight",
+      label: "设置uTools高度",
+      desc: "设置uTools高度",
+      icon: "height",
+      config: [
+        {
+          key: "height",
+          label: "高度",
+          type: "numInput",
+          icon: "straighten",
+          width: 12,
+        },
+      ],
+    },
+    {
+      value: "utools.outPlugin",
+      label: "退出插件",
+      desc: "退出插件",
+      icon: "exit_to_app",
+      config: [
+        {
+          key: "isKill",
+          type: "select",
+          options: [
+            { label: "杀死插件进程", value: true },
+            { label: "插件隐藏到后台", value: false },
+          ],
+          defaultValue: false,
+          icon: "logout",
+        },
+      ],
+    },
+    {
+      value: "utools.isDarkColors",
+      label: "是否深色模式",
+      desc: "是否深色模式",
+      icon: "dark_mode",
+      outputVariable: "isDark",
+      saveOutput: true,
+    },
+    {
+      value: "utools.getUser",
+      label: "获取用户信息",
+      desc: "获取用户信息",
+      icon: "person",
+      outputVariable: "{avatar,nickname,type}",
+      saveOutput: true,
+    },
+    {
+      value: "utools.redirect",
+      label: "转至指定插件",
+      config: [
+        {
+          key: "pluginName",
+          label: "要跳转至的插件名称",
+          type: "varInput",
+          icon: "alt_route",
+          width: 6,
+        },
+        {
+          key: "payload",
+          label: "传递给插件的文本",
+          type: "varInput",
+          icon: "alt_route",
+          width: 6,
+        },
+      ],
+    },
+  ],
+};

From f50bad59abfe9e6f725080a6356db05f34a6be29 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 10:11:39 +0800
Subject: [PATCH 016/332] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9E=84=E9=80=A0=E6=8E=A7=E5=88=B6=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=91=BD=E4=BB=A4=EF=BC=8C=E8=A7=84=E8=8C=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |   7 +-
 src/components/composer/MultiParams.vue       |  10 +-
 src/components/composer/card/CommandHead.vue  |   3 +-
 src/components/composer/common/ParamInput.vue |  12 +-
 .../composer/control/ConditionalJudgment.vue  | 211 ----------
 .../composer/control/ControlCommand.vue       | 262 +++++++++++++
 .../composer/control/ForEachControl.vue       | 226 -----------
 .../composer/control/ForInControl.vue         | 223 -----------
 .../composer/control/LoopControl.vue          | 230 -----------
 .../composer/control/SwitchControl.vue        | 219 -----------
 .../composer/control/TryCatchControl.vue      | 203 ----------
 .../composer/control/WhileControl.vue         | 205 ----------
 src/js/composer/cardComponents.js             |  23 --
 src/js/composer/commands/codingCommand.js     |   4 +-
 src/js/composer/commands/controlCommands.js   | 321 ++++++++++++++-
 src/js/composer/commands/dataCommands.js      |   2 +-
 src/js/composer/commands/mathCommands.js      |   2 +-
 src/js/composer/commands/networkCommands.js   |   4 +-
 src/js/composer/commands/simulateCommands.js  |   6 +-
 src/js/composer/commands/systemCommands.js    |   6 +-
 src/js/composer/commonComponentGuide.js       |   4 +-
 ...\347\233\256\350\257\264\346\230\216.json" | 369 ------------------
 22 files changed, 612 insertions(+), 1940 deletions(-)
 delete mode 100644 src/components/composer/control/ConditionalJudgment.vue
 create mode 100644 src/components/composer/control/ControlCommand.vue
 delete mode 100644 src/components/composer/control/ForEachControl.vue
 delete mode 100644 src/components/composer/control/ForInControl.vue
 delete mode 100644 src/components/composer/control/LoopControl.vue
 delete mode 100644 src/components/composer/control/SwitchControl.vue
 delete mode 100644 src/components/composer/control/TryCatchControl.vue
 delete mode 100644 src/components/composer/control/WhileControl.vue
 delete mode 100644 "\351\241\271\347\233\256\350\257\264\346\230\216.json"

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 9069eb4b..bd06483c 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -23,8 +23,7 @@
         >
           <!-- 控制流程组件，直接把组件放在head中 -->
           <template v-if="localCommand.isControlFlow">
-            <component
-              :is="localCommand.component"
+            <ControlCommand
               v-model="localCommand"
               v-bind="localCommand.componentProps || {}"
               class="control-component"
@@ -56,7 +55,7 @@
               v-else
               v-model="localCommand"
               :class="
-                localCommand.config?.length || localCommand.functionSelector
+                localCommand.config?.length || localCommand.subCommands
                   ? 'col q-mt-md'
                   : 'col'
               "
@@ -75,6 +74,7 @@ import MultiParams from "components/composer/MultiParams.vue";
 import CommandHead from "components/composer/card/CommandHead.vue";
 import * as CardComponents from "js/composer/cardComponents";
 import { processVariable } from "js/composer/variableManager";
+import ControlCommand from "components/composer/control/ControlCommand.vue";
 
 export default defineComponent({
   name: "ComposerCard",
@@ -82,6 +82,7 @@ export default defineComponent({
     VariableInput,
     MultiParams,
     CommandHead,
+    ControlCommand,
     ...CardComponents,
   },
   props: {
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 08d6d6d3..9e169d86 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="multi-params">
     <OperationCard
-      v-if="hasFunctionSelector"
+      v-if="hasSubCommands"
       :model-value="funcName"
       @update:model-value="funcName = $event"
-      :options="localCommand.functionSelector"
+      :options="localCommand.subCommands"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
   </div>
@@ -91,13 +91,13 @@ export default defineComponent({
         this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
       );
     },
-    hasFunctionSelector() {
-      return !!this.localCommand.functionSelector;
+    hasSubCommands() {
+      return !!this.localCommand.subCommands;
     },
   },
   methods: {
     getSelectFunction(funcName = this.funcName) {
-      return this.modelValue.functionSelector?.find(
+      return this.modelValue.subCommands?.find(
         (item) => item.value === funcName
       );
     },
diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index eafd9891..5c2fe108 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -129,7 +129,8 @@ export default {
   transition: all 0.3s ease;
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
+  margin-right: 8px;
 }
 
 .command-label:hover {
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 8490a612..66180ed8 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -6,8 +6,16 @@
       class="grid-item"
       :style="getColumnStyle(config.width)"
     >
+      <ControlInput
+        v-if="config.type === 'controlInput'"
+        :model-value="values[index]"
+        @update:model-value="$emit('update', index, $event)"
+        :label="config.label"
+        :placeholder="config.placeholder"
+        :icon="config.icon"
+      />
       <VariableInput
-        v-if="config.type === 'varInput'"
+        v-else-if="config.type === 'varInput'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
         :label="config.label"
@@ -98,6 +106,7 @@ import NumberInput from "./NumberInput.vue";
 import ArrayEditor from "./ArrayEditor.vue";
 import DictEditor from "./DictEditor.vue";
 import ButtonGroup from "./ButtonGroup.vue";
+import ControlInput from "./ControlInput.vue";
 
 /**
  * 参数输入组件
@@ -118,6 +127,7 @@ export default defineComponent({
     ArrayEditor,
     DictEditor,
     ButtonGroup,
+    ControlInput,
   },
   props: {
     configs: {
diff --git a/src/components/composer/control/ConditionalJudgment.vue b/src/components/composer/control/ConditionalJudgment.vue
deleted file mode 100644
index b4d26424..00000000
--- a/src/components/composer/control/ConditionalJudgment.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <div class="conditional-judgment-wrapper">
-    <div class="conditional-judgment">
-      <!-- 类型标签 -->
-      <div class="control-type-label">
-        <template v-if="type === 'if'">如果</template>
-        <template v-else-if="type === 'else'"> 否则 </template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 条件输入区域 -->
-      <div class="condition-settings">
-        <template v-if="showCondition">
-          <ControlInput
-            :model-value="argvs.condition"
-            @update:model-value="updateArgvs('condition', $event)"
-            label="条件"
-            placeholder="表达式"
-            class="condition-input"
-          />
-        </template>
-      </div>
-
-      <!-- if类型显示添加按钮 -->
-      <q-btn
-        v-if="type === 'if'"
-        flat
-        dense
-        icon="add"
-        size="sm"
-        class="control-btn"
-        @click="
-          $emit('addBranch', {
-            chainId: this.modelValue.chainId,
-            commandType: 'else',
-            value: this.modelValue.value,
-          })
-        "
-      >
-        <q-tooltip>添加条件分支</q-tooltip>
-      </q-btn>
-
-      <!-- mid类型显示切换按钮 -->
-      <q-btn
-        v-if="type === 'else'"
-        flat
-        dense
-        size="sm"
-        :icon="argvs.showMidCondition ? 'remove' : 'add'"
-        class="control-btn"
-        @click="toggleCondition"
-      >
-        <q-tooltip>{{
-          argvs.showMidCondition ? "隐藏条件" : "显示条件"
-        }}</q-tooltip>
-      </q-btn>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "ConditionalJudgment",
-  components: {
-    ControlInput,
-  },
-  props: {
-    modelValue: Object,
-  },
-  emits: ["update:modelValue", "addBranch"],
-  data() {
-    return {
-      defaultArgvs: {
-        condition: "",
-        showMidCondition: false,
-      },
-    };
-  },
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-    showCondition() {
-      return (
-        this.type === "if" ||
-        (this.type === "else" && this.argvs.showMidCondition)
-      );
-    },
-  },
-  methods: {
-    toggleCondition() {
-      this.argvs.showMidCondition = !this.argvs.showMidCondition;
-      if (this.argvs.showMidCondition === false) this.argvs.condition = "";
-      this.updateModelValue(this.argvs);
-    },
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs) {
-      switch (this.type) {
-        case "if":
-          return `if(${argvs.condition || "true"}){`;
-        case "else":
-          return argvs.showMidCondition && argvs.condition
-            ? `}else if(${argvs.condition}){`
-            : "}else{";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      switch (this.type) {
-        case "if":
-          const ifMatch = code.match(/^if\((.*?)\)\{$/);
-          if (ifMatch) {
-            argvs.condition = ifMatch[1] === "true" ? "" : ifMatch[1];
-          }
-          break;
-        case "else":
-          const elseIfMatch = code.match(/^}else if\((.*?)\)\{$/);
-          if (elseIfMatch) {
-            argvs.condition = elseIfMatch[1];
-            argvs.showMidCondition = true;
-          }
-          break;
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.conditional-judgment-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.conditional-judgment {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.condition-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.condition-input {
-  flex: 1;
-  min-width: 0;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
new file mode 100644
index 00000000..ab97d8b6
--- /dev/null
+++ b/src/components/composer/control/ControlCommand.vue
@@ -0,0 +1,262 @@
+<template>
+  <div class="control-command-wrapper">
+    <div class="control-command">
+      <!-- 类型标签 -->
+      <div class="control-type-label">
+        {{ currentFunction?.label || modelValue.commandType }}
+      </div>
+
+      <!-- 输入区域 -->
+      <div v-if="currentFunction?.config" class="control-settings">
+        <ParamInput
+          :configs="currentFunction.config"
+          :values="values"
+          @update="handleInputUpdate"
+        />
+      </div>
+
+      <!-- 操作按钮 -->
+      <q-btn-dropdown
+        v-if="showBranchButton"
+        flat
+        dense
+        dropdown-icon="add"
+        size="sm"
+        no-icon-animation
+        class="control-btn"
+      >
+        <q-list>
+          <q-item
+            v-for="func in branchOptions"
+            :key="func.value"
+            v-close-popup
+            clickable
+            @click="addBranch(func.value)"
+            class="row items-center no-wrap q-py-none"
+          >
+            <q-icon :name="func.icon" class="q-mr-md" />
+            <q-item-label>{{ func.label }}</q-item-label>
+          </q-item>
+        </q-list>
+      </q-btn-dropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import ParamInput from "components/composer/common/ParamInput.vue";
+
+export default defineComponent({
+  name: "ControlCommand",
+  components: {
+    ParamInput,
+  },
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue", "addBranch"],
+  data() {
+    return {
+      defaultArgvs: {},
+    };
+  },
+  computed: {
+    currentFunction() {
+      return this.modelValue.subCommands?.find(
+        (f) => f.value === this.modelValue.commandType
+      );
+    },
+    values() {
+      if (!this.currentFunction?.config) return [];
+      return this.currentFunction.config.map(
+        (input) => this.argvs[input.key] || ""
+      );
+    },
+    showBranchButton() {
+      return (
+        this.modelValue.subCommands?.length > 2 &&
+        this.modelValue.subCommands?.[0]?.value === this.modelValue.commandType
+      );
+    },
+    branchOptions() {
+      return this.modelValue.subCommands?.slice(1, -1);
+    },
+    argvs() {
+      return (
+        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+      );
+    },
+  },
+  methods: {
+    handleInputUpdate(index, value) {
+      const input = this.currentFunction.config[index];
+      this.updateArgvs(input.key, value);
+    },
+    updateArgvs(key, value) {
+      const argvs = {
+        ...this.argvs,
+        [key]: value,
+      };
+      this.updateModelValue(argvs);
+    },
+    addBranch(type) {
+      this.$emit("addBranch", {
+        chainId: this.modelValue.chainId,
+        commandType: type,
+        value: this.modelValue.value,
+      });
+      this.updateModelValue(this.argvs || {});
+    },
+    generateCode(argvs) {
+      if (!this.currentFunction?.codeTemplate) return "";
+
+      let code = this.currentFunction.codeTemplate;
+
+      const variablePattern = /\${(\w+)}/g;
+      code = code.replace(variablePattern, (_, key) => {
+        return argvs[key] || "";
+      });
+
+      return code;
+    },
+    parseCodeToArgvs(code) {
+      if (!code) return this.defaultArgvs;
+      if (!this.currentFunction?.codeTemplate) return {};
+
+      const template = this.currentFunction.codeTemplate;
+      const argvs = {};
+
+      // 如果没有变量模板，直接返回空对象
+      if (!template.includes("${")) return {};
+
+      // 将模板转换为正则表达式
+      const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      let pattern = escapeRegExp(template);
+
+      // 收集所有变量名
+      const variables = [];
+      const variablePattern = /\${(\w+)}/g;
+      let match;
+
+      while ((match = variablePattern.exec(template)) !== null) {
+        variables.push(match[1]);
+        pattern = pattern.replace(escapeRegExp(`\${${match[1]}}`), "([^}]*?)");
+      }
+
+      // 创建正则表达式并匹配代码
+      const regex = new RegExp(`^${pattern}$`);
+      const matches = code.match(regex);
+
+      if (matches) {
+        // 从第二个元素开始，依次赋值给变量
+        variables.forEach((variable, index) => {
+          argvs[variable] = matches[index + 1] || "";
+        });
+        return argvs;
+      }
+
+      return this.defaultArgvs;
+    },
+    updateModelValue(argvs) {
+      const code = this.generateCode(argvs);
+
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        argvs,
+        code,
+      });
+    },
+  },
+  created() {
+    // 初始化默认值
+    if (this.currentFunction?.config) {
+      this.currentFunction.config.forEach((config) => {
+        this.defaultArgvs[config.key] = config.defaultValue || "";
+      });
+    }
+  },
+  mounted() {
+    if (!this.modelValue.code) {
+      this.updateModelValue(this.defaultArgvs);
+    }
+  },
+});
+</script>
+
+<style scoped>
+.control-command-wrapper {
+  width: 100%;
+  display: flex;
+}
+
+.control-command {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.control-type-label {
+  font-size: 13px;
+  font-weight: 500;
+  white-space: nowrap;
+  opacity: 0.9;
+  user-select: none;
+  flex-shrink: 0;
+}
+
+.control-settings {
+  display: flex;
+  flex: 1;
+  min-width: 0;
+  margin-right: auto;
+}
+
+/* ParamInput 容器样式 */
+.control-settings :deep(.param-grid) {
+  display: flex;
+  flex-wrap: wrap;
+  gap: var(--grid-gap);
+  width: 100%;
+  --grid-gap: 8px;
+}
+
+/* 输入项容器样式 */
+.control-settings :deep(.grid-item) {
+  min-width: 50px;
+  margin: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* 输入框样式 */
+.control-settings :deep(.grid-item > *) {
+  flex: 1;
+  min-width: 0;
+}
+
+.control-btn {
+  opacity: 0.7;
+  flex-shrink: 0;
+  margin-left: auto;
+}
+
+.control-btn:hover {
+  opacity: 1;
+  transform: scale(1.1);
+}
+
+/* 暗色模式适配 */
+.body--dark .control-btn {
+  color: rgba(255, 255, 255, 0.7);
+}
+
+.body--dark .control-btn:hover {
+  color: var(--q-primary);
+}
+</style>
diff --git a/src/components/composer/control/ForEachControl.vue b/src/components/composer/control/ForEachControl.vue
deleted file mode 100644
index 652272f2..00000000
--- a/src/components/composer/control/ForEachControl.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<template>
-  <div class="loop-control-wrapper" v-bind="$attrs">
-    <div class="loop-control row items-center no-wrap">
-      <!-- 类型标签和按钮区域 -->
-      <div class="control-type-label">
-        <template v-if="type === 'forEach'">开始</template>
-        <template v-else-if="type === 'continue'">继续</template>
-        <template v-else-if="type === 'break'">终止</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 遍历设置区域 -->
-      <div v-if="type === 'forEach'" class="loop-settings">
-        <ControlInput
-          :model-value="argvs.itemVar"
-          @update:model-value="updateArgvs('itemVar', $event)"
-          label="元素"
-          :is-variable="true"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.indexVar"
-          @update:model-value="updateArgvs('indexVar', $event)"
-          label="索引"
-          :is-variable="true"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.arrayVar"
-          @update:model-value="updateArgvs('arrayVar', $event)"
-          label="数组"
-          class="loop-input array-input"
-        />
-      </div>
-
-      <!-- 只在循环开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'forEach'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'continue',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加继续循环</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'break',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加终止循环</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "ForEachControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  emits: ["update:modelValue", "addBranch"],
-  data() {
-    return {
-      defaultArgvs: {
-        itemVar: "item",
-        indexVar: "index",
-        arrayVar: "array",
-      },
-    };
-  },
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "forEach":
-          const item = argvs.itemVar || "item";
-          const index = argvs.indexVar || "index";
-          const array = argvs.arrayVar || "array";
-          return `for(let [${index}, ${item}] of ${array}.entries()){`;
-        case "continue":
-          return "continue;";
-        case "break":
-          return "break;";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      if (this.type === "forEach") {
-        const match = code.match(
-          /^(\w+)\.forEach\(\((\w+),\s*(\w+)\)\s*=>\s*\{$/
-        );
-        if (match) {
-          argvs.arrayVar = match[1];
-          argvs.itemVar = match[2];
-          argvs.indexVar = match[3];
-        }
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.loop-control-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.loop-control {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.loop-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.loop-input {
-  width: 80px;
-}
-
-.array-input {
-  width: 120px;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/ForInControl.vue b/src/components/composer/control/ForInControl.vue
deleted file mode 100644
index e6511909..00000000
--- a/src/components/composer/control/ForInControl.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div class="loop-control-wrapper" v-bind="$attrs">
-    <div class="loop-control row items-center no-wrap">
-      <!-- 类型标签和按钮区域 -->
-      <div class="control-type-label">
-        <template v-if="type === 'forIn'">开始</template>
-        <template v-else-if="type === 'continue'">继续</template>
-        <template v-else-if="type === 'break'">终止</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 遍历设置区域 -->
-      <div v-if="type === 'forIn'" class="loop-settings">
-        <ControlInput
-          :model-value="argvs.keyVar"
-          @update:model-value="updateArgvs('keyVar', $event)"
-          label="键名"
-          :is-variable="true"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.valueVar"
-          @update:model-value="updateArgvs('valueVar', $event)"
-          label="值"
-          :is-variable="true"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.objectVar"
-          @update:model-value="updateArgvs('objectVar', $event)"
-          label="对象"
-          class="loop-input object-input"
-        />
-      </div>
-
-      <!-- 只在循环开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'forIn'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'continue',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加继续循环</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'break',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加终止循环</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "ForInControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  data() {
-    return {
-      defaultArgvs: {
-        keyVar: "key",
-        valueVar: "value",
-        objectVar: "obj",
-      },
-    };
-  },
-  emits: ["update:modelValue", "addBranch"],
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "forIn":
-          const key = argvs.keyVar || "key";
-          const value = argvs.valueVar || "value";
-          const obj = argvs.objectVar || "obj";
-          return `for(const ${key} in ${obj}){const ${value}=${obj}[${key}];`;
-        case "continue":
-          return "continue;";
-        case "break":
-          return "break;";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      if (this.type === "forIn") {
-        const match = code.match(/^for\(const\s+(\w+)\s+in\s+(\w+)\)\{$/);
-        if (match) {
-          argvs.keyVar = match[1];
-          argvs.objectVar = match[2];
-        }
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.loop-control-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.loop-control {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.loop-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.loop-input {
-  width: 80px;
-}
-
-.object-input {
-  width: 120px;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/LoopControl.vue b/src/components/composer/control/LoopControl.vue
deleted file mode 100644
index b2f42f5f..00000000
--- a/src/components/composer/control/LoopControl.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <div class="loop-control-wrapper" v-bind="$attrs">
-    <div class="loop-control row items-center no-wrap">
-      <!-- 类型标签和按钮区域 -->
-      <div class="control-type-label">
-        <template v-if="type === 'loop'">开始</template>
-        <template v-else-if="type === 'continue'">继续</template>
-        <template v-else-if="type === 'break'">终止</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 循环设置区域 -->
-      <div v-if="type === 'loop'" class="loop-settings">
-        <ControlInput
-          :model-value="argvs.indexVar"
-          @update:model-value="updateArgvs('indexVar', $event)"
-          label="变量"
-          :is-variable="true"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.startValue"
-          @update:model-value="updateArgvs('startValue', $event)"
-          label="从"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.endValue"
-          @update:model-value="updateArgvs('endValue', $event)"
-          label="到"
-          class="loop-input"
-        />
-        <ControlInput
-          :model-value="argvs.stepValue"
-          @update:model-value="updateArgvs('stepValue', $event)"
-          label="步进"
-          class="loop-input"
-        />
-      </div>
-
-      <!-- 只在循环开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'loop'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'continue',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加继续循环</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'break',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加终止循环</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "LoopControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  emits: ["update:modelValue", "addBranch"],
-  data() {
-    return {
-      defaultArgvs: {
-        indexVar: "i",
-        startValue: 0,
-        endValue: 10,
-        stepValue: 1,
-      },
-    };
-  },
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "loop":
-          const index = argvs.indexVar || "i";
-          const start = argvs.startValue || 0;
-          const end = argvs.endValue || 10;
-          const step = argvs.stepValue || 1;
-          return `for(let ${index}=${start};${index}<${end};${index}+=${step}){`;
-        case "continue":
-          return "continue;";
-        case "break":
-          return "break;";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      if (this.type === "loop") {
-        const match = code.match(
-          /^for\(let\s+(\w+)=(\d+);.*?<(\d+);.*?\+=(\d+)\)\{$/
-        );
-        if (match) {
-          argvs.indexVar = match[1];
-          argvs.startValue = parseInt(match[2]);
-          argvs.endValue = parseInt(match[3]);
-          argvs.stepValue = parseInt(match[4]);
-        }
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.loop-control-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.loop-control {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.loop-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.loop-input {
-  width: 80px;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/SwitchControl.vue b/src/components/composer/control/SwitchControl.vue
deleted file mode 100644
index fadcf733..00000000
--- a/src/components/composer/control/SwitchControl.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <div class="switch-control-wrapper">
-    <div class="switch-control">
-      <!-- 类型标签 -->
-      <div class="control-type-label">
-        <template v-if="type === 'switch'">选择</template>
-        <template v-else-if="type === 'case'">匹配</template>
-        <template v-else-if="type === 'default'">默认</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 条件输入区域 -->
-      <div class="switch-settings">
-        <template v-if="type === 'switch'">
-          <ControlInput
-            :model-value="argvs.expression"
-            @update:model-value="updateArgvs('expression', $event)"
-            label="变量"
-            placeholder="变量或表达式"
-            class="switch-input"
-          />
-        </template>
-        <template v-else-if="type === 'case'">
-          <ControlInput
-            :model-value="argvs.value"
-            @update:model-value="updateArgvs('value', $event)"
-            label="值"
-            placeholder="匹配值"
-            class="switch-input"
-          />
-        </template>
-      </div>
-
-      <!-- 只在switch开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'switch'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'case',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加匹配分支</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'default',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加默认分支</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "SwitchControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  data() {
-    return {
-      defaultArgvs: {
-        expression: "",
-        value: "",
-      },
-    };
-  },
-  emits: ["update:modelValue", "addBranch"],
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "switch":
-          return `switch(${argvs.expression || "value"}){`;
-        case "case":
-          return `case ${argvs.value}:`;
-        case "default":
-          return "default:";
-        case "end":
-          return "}";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      switch (this.type) {
-        case "switch":
-          const switchMatch = code.match(/^switch\((.*?)\)\{$/);
-          if (switchMatch) {
-            argvs.expression = switchMatch[1] === "value" ? "" : switchMatch[1];
-          }
-          break;
-        case "case":
-          const caseMatch = code.match(/^case\s+(.*?):$/);
-          if (caseMatch) {
-            argvs.value = caseMatch[1];
-          }
-          break;
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.switch-control-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.switch-control {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.switch-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.switch-input {
-  flex: 1;
-  min-width: 0;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/TryCatchControl.vue b/src/components/composer/control/TryCatchControl.vue
deleted file mode 100644
index fb508ab1..00000000
--- a/src/components/composer/control/TryCatchControl.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <div class="try-catch-wrapper">
-    <div class="try-catch">
-      <!-- 类型标签 -->
-      <div class="control-type-label">
-        <template v-if="type === 'try'">尝试</template>
-        <template v-else-if="type === 'catch'">捕获</template>
-        <template v-else-if="type === 'finally'">最后</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 错误变量输入区域 -->
-      <div class="try-catch-settings">
-        <template v-if="type === 'catch'">
-          <ControlInput
-            :model-value="argvs.errorVar"
-            @update:model-value="updateArgvs('errorVar', $event)"
-            label="错误"
-            placeholder="错误变量名"
-            class="error-input"
-          />
-        </template>
-      </div>
-
-      <!-- 只在try开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'try'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'catch',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加捕获分支</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'finally',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加最后分支</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "TryCatchControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  emits: ["update:modelValue", "addBranch"],
-  data() {
-    return {
-      defaultArgvs: {
-        errorVar: "error",
-      },
-    };
-  },
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "try":
-          return "try{";
-        case "catch":
-          return `}catch(${argvs.errorVar || "error"}){`;
-        case "finally":
-          return "}finally{";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      if (this.type === "catch") {
-        const match = code.match(/^\}catch\((\w+)\)\{$/);
-        if (match) {
-          argvs.errorVar = match[1];
-        }
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.try-catch-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.try-catch {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.try-catch-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.error-input {
-  flex: 1;
-  min-width: 0;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/components/composer/control/WhileControl.vue b/src/components/composer/control/WhileControl.vue
deleted file mode 100644
index 6c129c70..00000000
--- a/src/components/composer/control/WhileControl.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-  <div class="loop-control-wrapper">
-    <div class="loop-control">
-      <!-- 类型标签 -->
-      <div class="control-type-label">
-        <template v-if="type === 'while'">满足</template>
-        <template v-else-if="type === 'continue'">继续</template>
-        <template v-else-if="type === 'break'">终止</template>
-        <template v-else>结束</template>
-      </div>
-
-      <!-- 循环条件区域 -->
-      <div class="loop-settings">
-        <template v-if="type === 'while'">
-          <ControlInput
-            :model-value="argvs.condition"
-            @update:model-value="updateArgvs('condition', $event)"
-            label="条件"
-            placeholder="表达式"
-            class="condition-input"
-          />
-        </template>
-      </div>
-
-      <!-- 只在循环开始时显示添加按钮 -->
-      <q-btn-dropdown
-        v-if="type === 'while'"
-        flat
-        dense
-        dropdown-icon="add"
-        no-icon-animation
-        size="sm"
-        class="control-btn"
-      >
-        <q-list>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'continue',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加继续循环</q-item-label>
-            </q-item-section>
-          </q-item>
-          <q-item
-            clickable
-            v-close-popup
-            @click="
-              $emit('addBranch', {
-                chainId: this.modelValue.chainId,
-                commandType: 'break',
-                value: this.modelValue.value,
-              })
-            "
-          >
-            <q-item-section>
-              <q-item-label>添加终止循环</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import ControlInput from "components/composer/common/ControlInput.vue";
-
-export default defineComponent({
-  name: "WhileControl",
-  components: {
-    ControlInput,
-  },
-  inheritAttrs: false,
-  props: {
-    modelValue: Object,
-  },
-  emits: ["update:modelValue", "addBranch"],
-  data() {
-    return {
-      defaultArgvs: {
-        condition: "true",
-      },
-    };
-  },
-  computed: {
-    type() {
-      return this.modelValue.commandType;
-    },
-    argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-  },
-  methods: {
-    updateArgvs(key, value) {
-      const argvs = { ...this.argvs, [key]: value };
-      this.updateModelValue(argvs);
-    },
-    generateCode(argvs = this.argvs) {
-      switch (this.type) {
-        case "while":
-          return `while(${argvs.condition || "true"}){`;
-        case "continue":
-          return "continue;";
-        case "break":
-          return "break;";
-        case "end":
-          return "}";
-        default:
-          return "";
-      }
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      switch (this.type) {
-        case "while":
-          const whileMatch = code.match(/^while\((.*?)\)\{$/);
-          if (whileMatch) {
-            argvs.condition = whileMatch[1] === "true" ? "" : whileMatch[1];
-          }
-          break;
-      }
-      return argvs;
-    },
-    updateModelValue(argvs) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs,
-        code: this.generateCode(argvs),
-      });
-    },
-  },
-  mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
-  },
-});
-</script>
-
-<style scoped>
-.loop-control-wrapper {
-  width: 100%;
-  display: flex;
-}
-
-.loop-control {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.control-type-label {
-  font-size: 13px;
-  font-weight: 500;
-  white-space: nowrap;
-  opacity: 0.9;
-  user-select: none;
-}
-
-.control-btn {
-  width: 21px;
-  height: 21px;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.control-btn:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
-.loop-settings {
-  display: flex;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-
-.condition-input {
-  flex: 1;
-  min-width: 0;
-}
-
-/* 暗色模式适配 */
-.body--dark .control-btn {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.body--dark .control-btn:hover {
-  color: var(--q-primary);
-}
-</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index c919a921..d9f8933c 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -11,29 +11,6 @@ export const KeySequenceEditor = defineAsyncComponent(() =>
   import("src/components/composer/simulate/KeySequenceEditor.vue")
 );
 
-// 控制流组件
-export const ConditionalJudgment = defineAsyncComponent(() =>
-  import("components/composer/control/ConditionalJudgment.vue")
-);
-export const LoopControl = defineAsyncComponent(() =>
-  import("components/composer/control/LoopControl.vue")
-);
-export const ForEachControl = defineAsyncComponent(() =>
-  import("components/composer/control/ForEachControl.vue")
-);
-export const ForInControl = defineAsyncComponent(() =>
-  import("components/composer/control/ForInControl.vue")
-);
-export const WhileControl = defineAsyncComponent(() =>
-  import("components/composer/control/WhileControl.vue")
-);
-export const SwitchControl = defineAsyncComponent(() =>
-  import("components/composer/control/SwitchControl.vue")
-);
-export const TryCatchControl = defineAsyncComponent(() =>
-  import("components/composer/control/TryCatchControl.vue")
-);
-
 // 网络组件
 export const UBrowserEditor = defineAsyncComponent(() =>
   import("components/composer/ubrowser/UBrowserEditor.vue")
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
index 40a699a8..f75a7820 100644
--- a/src/js/composer/commands/codingCommand.js
+++ b/src/js/composer/commands/codingCommand.js
@@ -17,7 +17,7 @@ export const codingCommands = {
           type: "varInput",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           label: "Base64编码",
           value: "quickcomposer.coding.base64Encode",
@@ -88,7 +88,7 @@ export const codingCommands = {
           type: "varInput",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           label: "MD5",
           value: "quickcomposer.coding.md5Hash",
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 5735e860..191f532e 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -5,51 +5,358 @@ export const controlCommands = {
     {
       value: "condition",
       label: "条件判断",
-      component: "ConditionalJudgment",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["if", "end"],
+      subCommands: [
+        {
+          label: "如果满足",
+          value: "if",
+          codeTemplate: "if (${condition}) {",
+          config: [
+            {
+              key: "condition",
+              label: "条件",
+              type: "controlInput",
+              placeholder: "表达式",
+              defaultValue: "true",
+            },
+          ],
+        },
+        {
+          label: "否则",
+          value: "else",
+          icon: "fork_left",
+          codeTemplate: "} else {",
+        },
+        {
+          label: "否则满足",
+          value: "else if",
+          icon: "fork_left",
+          codeTemplate: "} else if (${condition}) {",
+          config: [
+            {
+              key: "condition",
+              label: "条件",
+              type: "controlInput",
+              placeholder: "表达式",
+            },
+          ],
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "loop",
       label: "循环执行",
-      component: "LoopControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["loop", "end"],
+      subCommands: [
+        {
+          label: "循环执行",
+          value: "loop",
+          icon: "loop",
+          codeTemplate:
+            "for (let ${indexVar} = ${startValue}; ${indexVar} <= ${endValue}; ${indexVar} += ${stepValue}) {",
+          config: [
+            {
+              key: "indexVar",
+              label: "变量",
+              type: "controlInput",
+              defaultValue: "i",
+              width: 3,
+            },
+            {
+              key: "startValue",
+              label: "从",
+              type: "controlInput",
+              icon: "first_page",
+              defaultValue: "0",
+              width: 3,
+            },
+            {
+              key: "endValue",
+              label: "到",
+              type: "controlInput",
+              icon: "last_page",
+              defaultValue: "10",
+              width: 3,
+            },
+            {
+              key: "stepValue",
+              label: "步进",
+              type: "controlInput",
+              icon: "trending_up",
+              defaultValue: "1",
+              width: 3,
+            },
+          ],
+        },
+        {
+          label: "继续循环",
+          value: "continue",
+          icon: "skip_next",
+          codeTemplate: "continue;",
+        },
+        {
+          label: "终止循环",
+          value: "break",
+          icon: "stop",
+          codeTemplate: "break;",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "forEach",
       label: "遍历数组",
-      component: "ForEachControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["forEach", "end"],
+      subCommands: [
+        {
+          label: "遍历数组",
+          value: "forEach",
+          icon: "list",
+          codeTemplate:
+            "for (let [${indexVar}, ${itemVar}] of ${arrayVar}.entries()) {",
+          config: [
+            {
+              key: "itemVar",
+              label: "元素",
+              type: "controlInput",
+              defaultValue: "item",
+              width: 4,
+            },
+            {
+              key: "indexVar",
+              label: "索引",
+              type: "controlInput",
+              defaultValue: "i",
+              width: 4,
+            },
+            {
+              key: "arrayVar",
+              label: "数组",
+              type: "controlInput",
+              icon: "list",
+              defaultValue: "array",
+              width: 4,
+            },
+          ],
+        },
+        {
+          label: "继续循环",
+          value: "continue",
+          icon: "skip_next",
+          codeTemplate: "continue;",
+        },
+        {
+          label: "终止循环",
+          value: "break",
+          icon: "stop",
+          codeTemplate: "break;",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "forIn",
       label: "遍历对象",
-      component: "ForInControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["forIn", "end"],
+      subCommands: [
+        {
+          label: "遍历对象",
+          value: "forIn",
+          icon: "data_object",
+          codeTemplate:
+            "for (const ${keyVar} in ${objectVar}) { const ${valueVar} = ${objectVar}[${keyVar}];",
+          config: [
+            {
+              key: "keyVar",
+              label: "键名",
+              type: "controlInput",
+              defaultValue: "key",
+              width: 4,
+            },
+            {
+              key: "valueVar",
+              label: "值",
+              type: "controlInput",
+              defaultValue: "value",
+              width: 4,
+            },
+            {
+              key: "objectVar",
+              label: "对象",
+              type: "controlInput",
+              defaultValue: "object",
+              width: 4,
+            },
+          ],
+        },
+        {
+          label: "继续循环",
+          value: "continue",
+          icon: "skip_next",
+          codeTemplate: "continue;",
+        },
+        {
+          label: "终止循环",
+          value: "break",
+          icon: "stop",
+          codeTemplate: "break;",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "while",
       label: "条件循环",
-      component: "WhileControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["while", "end"],
+      subCommands: [
+        {
+          label: "条件循环",
+          value: "while",
+          icon: "loop",
+          codeTemplate: "while (${condition}) {",
+          config: [
+            {
+              key: "condition",
+              label: "条件",
+              type: "controlInput",
+              placeholder: "表达式",
+              defaultValue: "true",
+            },
+          ],
+        },
+        {
+          label: "继续循环",
+          value: "continue",
+          icon: "skip_next",
+          codeTemplate: "continue;",
+        },
+        {
+          label: "终止循环",
+          value: "break",
+          icon: "stop",
+          codeTemplate: "break;",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "switch",
       label: "条件分支",
-      component: "SwitchControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["switch", "case", "end"],
+      subCommands: [
+        {
+          label: "条件分支",
+          value: "switch",
+          icon: "call_split",
+          codeTemplate: "switch (${expression}) {",
+          config: [
+            {
+              key: "expression",
+              label: "变量",
+              type: "controlInput",
+              placeholder: "变量或表达式",
+              defaultValue: "expression",
+            },
+          ],
+        },
+        {
+          label: "匹配分支",
+          value: "case",
+          icon: "check",
+          codeTemplate: "case ${value}:",
+          config: [
+            {
+              key: "value",
+              label: "值",
+              type: "controlInput",
+            },
+          ],
+        },
+        {
+          label: "默认分支",
+          value: "default",
+          icon: "last_page",
+          codeTemplate: "default:",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
     {
       value: "tryCatch",
       label: "异常处理",
-      component: "TryCatchControl",
+      component: "ControlCommand",
       isControlFlow: true,
       commandChain: ["try", "catch", "end"],
+      subCommands: [
+        {
+          label: "尝试执行",
+          value: "try",
+          icon: "play_circle",
+          codeTemplate: "try {",
+        },
+        {
+          label: "捕获异常",
+          value: "catch",
+          icon: "error",
+          codeTemplate: "} catch (${errorVar}) {",
+          config: [
+            {
+              key: "errorVar",
+              label: "错误",
+              type: "controlInput",
+              defaultValue: "error",
+            },
+          ],
+        },
+        {
+          label: "最后执行",
+          value: "finally",
+          icon: "done_all",
+          codeTemplate: "} finally {",
+        },
+        {
+          label: "结束",
+          value: "end",
+          codeTemplate: "}",
+        },
+      ],
     },
   ],
 };
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 67783957..c269fd70 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -93,7 +93,7 @@ export const dataCommands = {
       desc: "Buffer创建、转换和操作",
       config: [],
       icon: "memory",
-      functionSelector: [
+      subCommands: [
         {
           value: "quickcomposer.data.buffer.from",
           label: "创建Buffer",
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 6ec7dcae..550d0a22 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -17,7 +17,7 @@ export const mathCommands = {
           type: "numInput",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           label: "正弦(sin)",
           value: "Math.sin",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index f59b7901..7933b393 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -61,7 +61,7 @@ export const networkCommands = {
           width: "auto",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           value: "quickcomposer.network.url.parse",
           label: "解析URL",
@@ -239,7 +239,7 @@ export const networkCommands = {
           width: "auto",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           label: "DNS查询",
           value: "quickcomposer.network.dns.lookupHost",
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index e3dc6835..aeecd195 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -19,7 +19,7 @@ export const simulateCommands = {
       value: "quickcommand.simulateCopy",
       label: "模拟复制粘贴",
       config: [],
-      functionSelector: [
+      subCommands: [
         {
           value: "quickcommand.simulateCopy",
           label: "复制",
@@ -73,7 +73,7 @@ export const simulateCommands = {
           width: 6,
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           label: "单击",
           value: "utools.simulateMouseClick",
@@ -94,7 +94,7 @@ export const simulateCommands = {
     {
       value: "utools.simulateMouseMove",
       label: "鼠标位置",
-      functionSelector: [
+      subCommands: [
         {
           label: "移动到坐标",
           value: "utools.simulateMouseMove",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 64b1b4ab..138fa21f 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -22,7 +22,7 @@ export const systemCommands = {
       label: "获取剪贴板内容",
       outputVariable: "clipboardContent",
       saveOutput: true,
-      functionSelector: [
+      subCommands: [
         {
           value: "electron.clipboard.readText",
           label: "剪贴板文本",
@@ -59,7 +59,7 @@ export const systemCommands = {
       desc: "获取操作系统相关信息",
       icon: "computer",
       config: [],
-      functionSelector: [
+      subCommands: [
         {
           value: "quickcomposer.system.os.arch",
           label: "系统架构",
@@ -162,7 +162,7 @@ export const systemCommands = {
           width: "auto",
         },
       ],
-      functionSelector: [
+      subCommands: [
         {
           value: "quickcomposer.system.path.normalize",
           label: "规范化路径",
diff --git a/src/js/composer/commonComponentGuide.js b/src/js/composer/commonComponentGuide.js
index fb1c8503..ad7dca71 100644
--- a/src/js/composer/commonComponentGuide.js
+++ b/src/js/composer/commonComponentGuide.js
@@ -56,7 +56,7 @@ const commonComponentGuide = {
             ]
           `,
         },
-        functionSelector: {
+        subCommands: {
           description:
             "可选，函数选择器配置，用于一个命令包含多个相关函数的情况",
           properties: {
@@ -67,7 +67,7 @@ const commonComponentGuide = {
             excludeConfig: "可选，要排除的通用参数索引数组",
           },
           example: `
-            functionSelector: [
+            subCommands: [
               {
                 label: "DNS查询",
                 value: "quickcomposer.network.dns.lookupHost",
diff --git "a/\351\241\271\347\233\256\350\257\264\346\230\216.json" "b/\351\241\271\347\233\256\350\257\264\346\230\216.json"
deleted file mode 100644
index 3db461b2..00000000
--- "a/\351\241\271\347\233\256\350\257\264\346\230\216.json"
+++ /dev/null
@@ -1,369 +0,0 @@
-{
-  "项目结构说明": {
-    "src": {
-      "描述": "源代码目录",
-      "js": {
-        "描述": "存放JS代码",
-        "composer": {
-          "描述": "存放可视化编排相关的JS代码",
-          "commands": {
-            "描述": "存放生成组件的配置文件，一个分类一个文件",
-            "命令配置字段说明": {
-              "value": "必选，当使用MultiParams组件且未启用functionSelector时，表示生成代码时使用的函数名",
-              "label": "必选，命令的显示的名称",
-              "component": "可选，存在则表示使用自定义组件，否则根据config使用MultiParams组件",
-              "isControlFlow": "可选，是否是流程控制命令",
-              "commandChain": "可选，命令链，流程控制命令使用",
-              "allowEmptyArgv": "可选，是否允许空参数",
-              "isAsync": "可选，是否是异步命令",
-              "config": {
-                "描述": "可选，命令的配置，用来在MultiParams组件中显示，是一个数组，每个元素是一个对象",
-                "配置项属性": {
-                  "key": "必选，键",
-                  "label": "必选，标签",
-                  "type": "必选，类型，varInput则使用VariableInput组件,numInput则使用NumberInput组件,其他类型则使用qurasr对应组件",
-                  "defaultValue": "可选，默认值",
-                  "icon": "必选，图标",
-                  "width": "可选，flex布局的相对比例"
-                }
-              },
-              "functionSelector": {
-                "配置项属性": {
-                  "label": "必选，显示的名称",
-                  "value": "必选，生成代码时使用的函数名",
-                  "icon": "可选，图标",
-                  "config": "可选，特定函数独有参数配置，和MultiParams组件的config一样"
-                },
-                "value": "必选，默认值"
-              }
-            }
-          },
-          "cardComponents.js": {
-            "描述": "自定义的组件要在这里导入",
-            "主要功能": {
-              "导入组件": "导入并注册自定义的命令卡片组件",
-              "导出组件": "导出所有注册的组件供CommandComposer使用"
-            }
-          },
-          "customComponentGuide.js": {
-            "描述": "自定义组件创建指南"
-          },
-          "formatString.js": {
-            "描述": "处理字符串格式化的工具函数，主要用于处理对象序列化和类型转换",
-            "主要功能": {
-              "parseFunction": "解析函数字符串，返回函数名和参数",
-              "stringifyArgv": "格式化参数为字符串，根据值的类型决定是否添加引号"
-            }
-          }
-        }
-      },
-      "components": {
-        "描述": "存放Vue组件",
-        "composer": {
-          "描述": "存放可视化编排相关的组件",
-          "file": {
-            "描述": "存放文件操作相关的组件",
-            "组件列表": {
-              "FileOperationEditor.vue": {
-                "描述": "文件操作编辑器组件",
-                "主要功能": {
-                  "文件读取": {
-                    "编码支持": "UTF-8、ASCII、Base64、二进制、十六进制",
-                    "读取模式": "全部读取、指定位置读取",
-                    "参数配置": "起始位置、读取长度"
-                  },
-                  "文件写入": {
-                    "编码支持": "UTF-8、ASCII、Base64、二进制、十六进制",
-                    "写入模式": "覆盖写入、追加写入",
-                    "内容输入": "支持变量和文本输入"
-                  },
-                  "文件删除": {
-                    "删除选项": "递归删除、强制删除"
-                  },
-                  "文件管理": {
-                    "重命名/移动": "支持文件重命名和移动",
-                    "权限管理": "支持修改文件权限，支持递归修改",
-                    "所有者管理": "支持修改文件所有者和组，支持递归修改"
-                  }
-                }
-              }
-            }
-          },
-          "ui": {
-            "描述": "基础UI组件",
-            "组件列表": {
-              "VariableInput.vue": {
-                "描述": "统一处理变量输入和输出组件",
-                "主要功能": {
-                  "变量输入": "支持各种类型的变量输入",
-                  "引号处理": "自动处理返回值的引号",
-                  "类型转换": "支持不同类型间的转换"
-                }
-              },
-              "MultiParams.vue": {
-                "描述": "统一处理多参数输入和输出组件",
-                "主要功能": {
-                  "参数配置": "根据config配置显示不同的参数输入",
-                  "代码生成": "生成完整的命令代码",
-                  "参数验证": "验证参数的完整性和正确性"
-                }
-              },
-              "DictionaryEditor.vue": {
-                "描述": "统一处理字典输入和输出组件",
-                "主要功能": {
-                  "键值对编辑": "支持编辑字典的键值对",
-                  "对象转换": "自动处理对象的序列化和反序列化"
-                }
-              }
-            }
-          },
-          "control": {
-            "描述": "存放控制流程的组件",
-            "ConditionalJudgment.vue": "条件判断组件，用于if/else等流程控制",
-            "LoopControl.vue": "循环控制组件，用于for/while等循环控制",
-            "ForEachControl.vue": "foreach循环控制组件，用于foreach循环控制",
-            "ForInControl.vue": "forin循环控制组件，用于forin循环控制",
-            "WhileControl.vue": "while循环控制组件，用于while循环控制",
-            "SwitchControl.vue": "switch控制组件，用于switch控制"
-          },
-          "simulate": {
-            "描述": "存放模拟操作的组件",
-            "ImageSearchEditor.vue": "图片搜索组件，用于搜索图片"
-          },
-          "crypto": {
-            "描述": "存放加解密的组件",
-            "SymmetricCryptoEditor.vue": "对称加解密组件，用于对称加解密",
-            "AsymmetricCryptoEditor.vue": "非对称加解密组件，用于非对称加解密"
-          },
-          "card": {
-            "描述": "存放ComposerCard子组件",
-            "CommandHead.vue": "命令卡片的头部组件，包含命令名称、折叠、删除等功能",
-            "CommandButtons.vue": "命令卡片的按钮组件，包含运行、保存等功能"
-          },
-          "flow": {
-            "描述": "存放ComposerFlow子组件",
-            "ComposerButtons.vue": "流程操作按钮组件，包含运行、保存等功能",
-            "ChainStyles.vue": "控制流程链样式组件",
-            "DropArea.vue": "在命令流程下面显示一个拖拽区域，用于拖拽命令到流程编辑器",
-            "EmptyFlow.vue": "没有流程时显示的组件"
-          },
-          "http": {
-            "描述": "存放http请求的组件",
-            "AxiosConfigEditor.vue": "Axios请求配置编辑器"
-          },
-          "regex": {
-            "描述": "存放正则相关的组件"
-          },
-          "CommandComposer.vue": {
-            "描述": "命令编辑器主组件",
-            "主要功能": {
-              "变量管理": "管理命令间的变量传递",
-              "命令流程": "管理命令的执行顺序",
-              "代码生成": "生成最终的执行代码"
-            },
-            "子组件": {
-              "ComposerList": "左侧命令列表",
-              "ComposerFlow": "右侧流程编辑器"
-            }
-          },
-          "ComposerCard.vue": {
-            "描述": "命令卡片组件，用于显示和编辑单个命令",
-            "主要功能": {
-              "参数编辑": "根据命令配置显示不同的参数编辑器",
-              "变量输出": "管理命令的输出变量",
-              "折叠控制": "控制命令卡片的折叠状态"
-            }
-          },
-          "ComposerFlow.vue": {
-            "描述": "命令流程编辑器，管理命令的执行顺序",
-            "主要功能": {
-              "拖拽排序": "通过拖拽调整命令顺序",
-              "链式命令": "管理if/else等控制流程命令",
-              "折叠管理": "控制命令链的折叠状态"
-            }
-          },
-          "ComposerList.vue": {
-            "描述": "命令列表组件，显示可用的命令",
-            "主要功能": {
-              "命令分类": "按类别显示命令",
-              "搜索过滤": "支持拼音搜索命令",
-              "拖拽添加": "拖拽命令到流程编辑器"
-            }
-          }
-        },
-        "quickcommandUI": {
-          "描述": "存放quickcommand的UI组件，提供各种交互界面",
-          "组件列表": {
-            "QuickCommand.vue": {
-              "描述": "UI组件的主入口",
-              "主要功能": {
-                "对话框管理": {
-                  "showInputBox": "显示输入框对话框，支持多个输入框",
-                  "showButtonBox": "显示按钮对话框，支持多个按钮",
-                  "showConfirmBox": "显示确认对话框，支持HTML内容",
-                  "showMessageBox": "显示消息提示框，支持不同图标和位置",
-                  "showTextArea": "显示文本编辑框，支持大段文本输入",
-                  "showSelectList": "显示选择列表，支持搜索和快捷键"
-                },
-                "按钮管理": {
-                  "showWaitButton": "显示等待按钮",
-                  "closeWaitButton": "关闭等待按钮"
-                },
-                "事件管理": {
-                  "listenKeydown": "添加键盘事件监听",
-                  "removeListener": "移除键盘事件监听"
-                }
-              }
-            },
-            "子组件": {
-              "InputBox.vue": {
-                "描述": "输入框对话框组件",
-                "功能": {
-                  "多输入框": "支持显示多个输入框",
-                  "提示文本": "支持设置标签和提示文本",
-                  "默认值": "支持设置默认值"
-                }
-              },
-              "ButtonBox.vue": {
-                "描述": "按钮对话框组件",
-                "功能": {
-                  "多按钮": "支持显示多个按钮",
-                  "返回值": "返回点击的按钮索引和文本"
-                }
-              },
-              "ConfirmBox.vue": {
-                "描述": "确认对话框组件",
-                "功能": {
-                  "HTML内容": "支持显示HTML格式的内容",
-                  "自定义宽度": "支持设置对话框宽度"
-                }
-              },
-              "TextArea.vue": {
-                "描述": "文本编辑框组件",
-                "功能": {
-                  "大文本输入": "支持输入和编辑大段文本",
-                  "占位文本": "支持设置占位文本",
-                  "默认值": "支持设置默认值"
-                }
-              },
-              "SelectList.vue": {
-                "描述": "选择列表组件",
-                "功能": {
-                  "虚拟滚动": "使用虚拟滚动优化大量数据的显示",
-                  "拼音搜索": "支持拼音搜索过滤",
-                  "键盘导航": "支持键盘上下键导航",
-                  "快捷键选择": "支持Alt/Command+数字快速选择",
-                  "多种显示模式": {
-                    "plaintext": "纯文本模式",
-                    "json": "带图标和描述的JSON模式",
-                    "html": "HTML内容模式"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "plugin": {
-      "描述": "插件相关代码",
-      "lib": {
-        "描述": "存放核心功能代码",
-        "文件列表": {
-          "quickcomposer": {
-            "描述": "命令生成器的核心功能",
-            "命名规则": "quickcomposer.xxx.yyy.js 对应 quickcomposer.xxx.yyy 接口，xxx 为分类，和src/js/composer/commands里分类对应",
-            "功能分类": {
-              "系统命令": "系统相关的命令",
-              "控制命令": "流程控制相关的命令",
-              "模拟命令": "模拟操作相关的命令"
-            }
-          },
-          "quickcommand.js": {
-            "描述": "定义preload.js中quickcommand的接口，UI相关的接口在src/components/quickcommandUI中",
-            "主要功能": {
-              "模拟操作": {
-                "simulateCopy": "模拟复制操作",
-                "simulatePaste": "模拟粘贴操作"
-              },
-              "剪贴板": {
-                "readClipboard": "读取剪贴板文本",
-                "writeClipboard": "写入剪贴板文本",
-                "readClipboardImage": "读取剪贴板图片"
-              },
-              "文件操作": {
-                "downloadFile": "下载文件",
-                "uploadFile": "上传文件",
-                "loadRemoteScript": "载入在线资源"
-              },
-              "系统操作": {
-                "sleep": "同步延时",
-                "setTimeout": "异步延时",
-                "kill": "关闭进程",
-                "wakeUtools": "唤醒uTools",
-                "runInTerminal": "在终端中执行命令(非Linux)"
-              },
-              "平台特定": {
-                "Windows": {
-                  "runVbs": "运行VBS脚本",
-                  "runPowerShell": "运行PowerShell脚本",
-                  "runCsharp": "运行C#脚本"
-                },
-                "MacOS": {
-                  "runAppleScript": "运行AppleScript脚本"
-                }
-              }
-            }
-          },
-          "getQuickcommandTempFile.js": {
-            "描述": "获取临时文件路径",
-            "参数": {
-              "ext": "文件扩展名",
-              "name": "可选，文件名，默认为时间戳",
-              "dir": "可选，临时目录名，默认为quickcommandTempDir"
-            }
-          },
-          "lodashMini.js": {
-            "描述": "lodash的精简版，提供常用的工具函数",
-            "主要函数": {
-              "数组操作": {
-                "concat": "连接数组",
-                "pull": "移除数组中的指定值",
-                "union": "创建去重数组",
-                "without": "创建不包含指定值的数组"
-              },
-              "对象操作": {
-                "cloneDeep": "深拷贝",
-                "pick": "选取对象属性",
-                "omitBy": "过滤对象属性",
-                "values": "获取对象的所有值"
-              },
-              "集合操作": {
-                "filter": "过滤集合",
-                "forIn": "遍历对象的可枚举属性"
-              },
-              "类型判断": {
-                "isArray": "是否为数组",
-                "isBuffer": "是否为Buffer",
-                "isEmpty": "是否为空",
-                "isNil": "是否为null或undefined",
-                "isObject": "是否为对象"
-              },
-              "字符串操作": {
-                "truncate": "截断字符串"
-              }
-            }
-          }
-        }
-      },
-      "preload.js": {
-        "描述": "预加载脚本",
-        "主要功能": {
-          "接口暴露": "暴露接口给渲染进程",
-          "沙箱环境": "提供安全的代码执行环境",
-          "全局变量": "管理全局变量和工具函数"
-        }
-      }
-    }
-  }
-}

From fe26f98809b98c80e27d98101b63a9bd4f2a7201 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 11:01:25 +0800
Subject: [PATCH 017/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=9C=A8windows=E4=B8=8B=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/simulate/KeySequenceEditor.vue   | 239 +++++++++++-------
 1 file changed, 152 insertions(+), 87 deletions(-)

diff --git a/src/components/composer/simulate/KeySequenceEditor.vue b/src/components/composer/simulate/KeySequenceEditor.vue
index afe683b6..645a02a9 100644
--- a/src/components/composer/simulate/KeySequenceEditor.vue
+++ b/src/components/composer/simulate/KeySequenceEditor.vue
@@ -143,21 +143,23 @@
 
     <!-- 序列显示区 -->
     <div v-if="argvs.sequence.length > 0" class="sequence-list q-mb-sm">
-      <div class="row q-col-gutter-sm">
-        <draggable
-          v-model="argvs.sequence"
-          item-key="id"
-          handle=".drag-handle"
-          :animation="200"
-          ghost-class="ghost"
-          class="row full-width"
-          @change="updateValue"
-        >
-          <template #item="{ element, index }">
-            <div class="col-4 q-py-xs">
-              <div
-                class="row items-center justify-center no-wrap hover-show-actions sequence-item"
-              >
+      <draggable
+        v-model="argvs.sequence"
+        item-key="id"
+        handle=".drag-handle"
+        :animation="200"
+        ghost-class="ghost"
+        class="row"
+        style="column-gap: 8px"
+        @change="updateValue"
+      >
+        <template #item="{ element, index }">
+          <div class="q-py-xs" style="flex: 1">
+            <div
+              class="row items-center justify-between no-wrap hover-show-actions sequence-item"
+            >
+              <!-- 左侧区域 -->
+              <div class="row items-center no-wrap">
                 <!-- 拖拽手柄 -->
                 <div class="col-auto q-mr-xs cursor-move drag-handle">
                   <q-icon name="drag_indicator" size="14px" color="grey-7" />
@@ -166,47 +168,52 @@
                 <div class="col-auto q-mr-xs text-grey-7 sequence-number">
                   {{ index + 1 }}.
                 </div>
-                <!-- 按键显示 -->
-                <div class="row items-center justify-center no-wrap">
-                  <!-- 修饰键 -->
-                  <template
-                    v-for="(active, key) in element.modifiers"
-                    :key="key"
-                  >
-                    <q-chip v-if="active" dense square class="modifier-chip">
-                      {{ modifierLabels[key] }}
-                    </q-chip>
-                  </template>
-                  <!-- 主按键 -->
-                  <q-chip
-                    color="primary"
-                    text-color="white"
-                    dense
-                    square
-                    class="main-key"
-                  >
-                    {{ formatMainKey(element.mainKey) }}
-                  </q-chip>
-                </div>
-                <!-- 操作按钮 -->
-                <div class="col-auto action-buttons">
-                  <q-btn
-                    flat
-                    round
-                    dense
-                    size="xs"
-                    color="grey-7"
-                    icon="close"
-                    @click="removeKey(index)"
-                  >
-                    <q-tooltip>删除此按键</q-tooltip>
-                  </q-btn>
-                </div>
+              </div>
+
+              <!-- 中间区域 - 按键显示 -->
+              <div class="row items-center justify-center no-wrap flex-1">
+                <!-- 修饰键 - 始终显示所有修饰键 -->
+                <q-chip
+                  v-for="(active, key) in element.modifiers"
+                  :key="key"
+                  dense
+                  square
+                  :class="['modifier-chip', { 'modifier-inactive': !active }]"
+                  @click.stop.prevent="toggleModifier(index, key)"
+                  clickable
+                >
+                  {{ modifierLabels[key] }}
+                </q-chip>
+                <!-- 主按键 -->
+                <q-chip
+                  color="primary"
+                  text-color="white"
+                  dense
+                  square
+                  class="main-key"
+                >
+                  {{ formatMainKey(element.mainKey) }}
+                </q-chip>
+              </div>
+
+              <!-- 右侧区域 - 操作按钮 -->
+              <div class="col-auto action-buttons">
+                <q-btn
+                  flat
+                  round
+                  dense
+                  size="xs"
+                  color="grey-7"
+                  icon="close"
+                  @click="removeKey(index)"
+                >
+                  <q-tooltip>删除此按键</q-tooltip>
+                </q-btn>
               </div>
             </div>
-          </template>
-        </draggable>
-      </div>
+          </div>
+        </template>
+      </draggable>
     </div>
   </div>
 </template>
@@ -215,52 +222,64 @@
 import { defineComponent } from "vue";
 import NumberInput from "../common/NumberInput.vue";
 import draggable from "vuedraggable";
-import { parseFunction } from "js/composer/formatString";
 
 // 检测操作系统
 const isMac = window.utools.isMacOs();
 
-// 通用快捷键
+// 通用修饰键配置
+const getDefaultModifier = (extraModifiers = {}) => {
+  const baseModifiers = isMac ? { command: true } : { control: true };
+  return { ...baseModifiers, ...extraModifiers };
+};
+
+// 通用快捷键 - 根据操作系统设置不同的快捷键
 const commonShortcuts = [
   {
     label: "复制",
-    sequence: [{ mainKey: "c", modifiers: { command: true } }],
+    sequence: [{ mainKey: "c", modifiers: getDefaultModifier() }],
   },
   {
     label: "粘贴",
-    sequence: [{ mainKey: "v", modifiers: { command: true } }],
+    sequence: [{ mainKey: "v", modifiers: getDefaultModifier() }],
   },
   {
     label: "剪切",
-    sequence: [{ mainKey: "x", modifiers: { command: true } }],
+    sequence: [{ mainKey: "x", modifiers: getDefaultModifier() }],
   },
   {
     label: "全选",
-    sequence: [{ mainKey: "a", modifiers: { command: true } }],
+    sequence: [{ mainKey: "a", modifiers: getDefaultModifier() }],
   },
   {
     label: "撤销",
-    sequence: [{ mainKey: "z", modifiers: { command: true } }],
+    sequence: [{ mainKey: "z", modifiers: getDefaultModifier() }],
   },
   {
     label: "重做",
-    sequence: [{ mainKey: "z", modifiers: { command: true, shift: true } }],
+    sequence: [
+      { mainKey: "z", modifiers: getDefaultModifier({ shift: true }) },
+    ],
   },
   {
     label: "保存",
-    sequence: [{ mainKey: "s", modifiers: { command: true } }],
+    sequence: [{ mainKey: "s", modifiers: getDefaultModifier() }],
   },
   {
     label: "查找",
-    sequence: [{ mainKey: "f", modifiers: { command: true } }],
+    sequence: [{ mainKey: "f", modifiers: getDefaultModifier() }],
   },
   {
     label: "替换",
-    sequence: [{ mainKey: "h", modifiers: { command: true } }],
+    sequence: [{ mainKey: "h", modifiers: getDefaultModifier() }],
   },
   {
     label: "关闭窗口",
-    sequence: [{ mainKey: "w", modifiers: { command: true } }],
+    sequence: [
+      {
+        mainKey: isMac ? "w" : "f4",
+        modifiers: isMac ? { command: true } : { alt: true },
+      },
+    ],
   },
 ];
 
@@ -565,11 +584,11 @@ export default defineComponent({
           : key.charAt(0).toUpperCase() + key.slice(1))
       );
     },
-    generateCode() {
-      if (this.argvs.sequence.length === 0) return;
+    generateCode(argvs = this.argvs) {
+      if (!argvs.sequence.length) return;
 
       // 将每个按键记录转换为按键数组
-      const keySequence = this.argvs.sequence.map((item) => {
+      const keySequence = argvs.sequence.map((item) => {
         const activeModifiers = Object.entries(item.modifiers)
           .filter(([_, active]) => active)
           .map(([key]) => key)
@@ -581,7 +600,7 @@ export default defineComponent({
 
       // 生成代码
       const options =
-        this.argvs.sequence.length > 1 ? { interval: this.argvs.interval } : {};
+        argvs.sequence.length > 1 ? { interval: argvs.interval } : {};
       if (Object.keys(options).length > 0) {
         return `${this.modelValue.value}(${JSON.stringify(
           keySequence
@@ -589,12 +608,14 @@ export default defineComponent({
       }
       return `${this.modelValue.value}(${JSON.stringify(keySequence)})`;
     },
-    updateValue() {
-      this.$emit("update:modelValue", {
+    updateValue(newArgvs) {
+      const updatedModelValue = {
         ...this.modelValue,
-        argvs: this.argvs,
-        code: this.generateCode(),
-      });
+        argvs: newArgvs || this.argvs,
+        code: this.generateCode(newArgvs || this.argvs),
+      };
+
+      this.$emit("update:modelValue", updatedModelValue);
     },
     appendSequence(newSequence) {
       const startId = Date.now();
@@ -637,6 +658,24 @@ export default defineComponent({
       }
       return argvs;
     },
+    toggleModifier(index, key) {
+      // 创建新的 argvs 对象
+      const newArgvs = {
+        sequence: [...this.argvs.sequence],
+        interval: this.argvs.interval,
+      };
+
+      // 修改对应按键的修饰键状态
+      newArgvs.sequence[index] = {
+        ...newArgvs.sequence[index],
+        modifiers: {
+          ...newArgvs.sequence[index].modifiers,
+          [key]: !newArgvs.sequence[index].modifiers[key],
+        },
+      };
+      // 更新 modelValue
+      this.updateValue(newArgvs);
+    },
   },
   mounted() {
     if (!this.modelValue.code && !this.modelValue.argvs) {
@@ -648,7 +687,7 @@ export default defineComponent({
 
 <style scoped>
 .key-sequence-editor {
-  padding: 4px;
+  padding: 8px;
 }
 
 .recording-btn {
@@ -664,39 +703,47 @@ export default defineComponent({
 .sequence-list {
   border: 1px solid var(--q-primary);
   border-radius: 4px;
-  padding: 4px;
+  padding: 8px;
   max-height: 300px;
   overflow-y: auto;
 }
 
+/* 移除多余的嵌套 row */
+.sequence-list :deep(.row.q-col-gutter-sm) {
+  margin: -4px -8px;
+  width: 100%;
+}
+
+.sequence-list :deep(.row.q-col-gutter-sm) > * {
+  padding: 4px 8px;
+}
+
 .sequence-item {
   user-select: none;
-  padding: 2px 4px;
+  padding: 4px 8px;
   border-radius: 4px;
   transition: background-color 0.2s;
   min-height: 28px;
+  background-color: rgba(0, 0, 0, 0.02);
 }
 
-.sequence-item > div {
-  flex: 0 0 auto;
-}
-
-.sequence-item > .row {
-  flex: 1 1 auto;
+.body--dark .sequence-item {
+  background-color: rgba(255, 255, 255, 0.02);
 }
 
 .sequence-item:hover {
-  background-color: rgba(0, 0, 0, 0.03);
+  background-color: rgba(0, 0, 0, 0.05);
 }
 
 .body--dark .sequence-item:hover {
-  background-color: rgba(255, 255, 255, 0.03);
+  background-color: rgba(255, 255, 255, 0.05);
 }
 
 .sequence-number {
   font-size: 11px;
   min-width: 14px;
   opacity: 0.7;
+  margin-right: 8px;
 }
 
 .modifier-chip {
@@ -707,6 +754,23 @@ export default defineComponent({
   color: white;
   min-width: 32px;
   padding: 0 4px;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.modifier-inactive {
+  background-color: rgba(0, 0, 0, 0.1);
+  color: rgba(0, 0, 0, 0.7);
+}
+
+.body--dark .modifier-inactive {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: rgba(255, 255, 255, 0.7);
+}
+
+.modifier-chip:hover {
+  opacity: 0.9;
+  transform: scale(1.05);
 }
 
 .main-key {
@@ -734,7 +798,7 @@ export default defineComponent({
 
 .ghost {
   opacity: 0.5;
-  background: var(--q-primary) !important;
+  background: var(--q-primary-opacity-20) !important;
 }
 
 /* 滚动条样式 */
@@ -757,5 +821,6 @@ export default defineComponent({
 
 .drag-handle {
   cursor: grab;
+  margin-right: 8px;
 }
 </style>

From 036b6fa934af047592b271650a609b996a3bae64 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 16:37:41 +0800
Subject: [PATCH 018/332] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=AF=B9=E8=AF=9D=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8CVarInput=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=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           |  33 +++-
 .../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, 506 insertions(+), 59 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 bec8553f..3c3d6508 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 00000000..f7e5f093
--- /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 00000000..6f9a8113
--- /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 bd06483c..d24de261 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 9e169d86..b0d0de6f 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 e44639b0..d5e27c87 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -17,9 +17,11 @@
             ]"
           >
             <VariableInput
-              :model-value="item[key.value]"
+              :model-value="item[key.value] || key.defaultValue"
               :label="key.label"
               :no-icon="true"
+              :placeholder="key.placeholder"
+              :options="key.options"
               @update:model-value="
                 (val) => updateItemKeyValue(index, key.value, val)
               "
@@ -32,6 +34,7 @@
               :model-value="item"
               :label="`${label || '项目'} ${index + 1}`"
               :icon="icon || 'code'"
+              :placeholder="placeholder"
               :options="{
                 items: options.items,
               }"
@@ -95,9 +98,16 @@
  * @property {String} label - 输入框标签
  * @property {String} icon - 输入框图标
  * @property {Object} options - 配置选项
+ *
  * @property {String[]} [options.keys] - 多键对象模式的键名列表
- * @property {String[]} [options.items] - 下拉选择模式的选项列表
+ * @property {String[]} [options.keys.value] - 元素为对象时，对象的键名
+ * @property {String[]} [options.keys.label] - 对应varInput的label
+ * @property {String[]} [options.keys.placeholder] - 对应varInput的placeholder
+ * @property {String[]} [options.keys.defaultValue] - 对应varInput的defaultValue
+ * @property {Object} [options.keys.options] - 对应varInput的options
  *
+ * @property {String[]} [options.items] - 下拉选择模式的选项列表
+ * @property {Object} [options.defaultValue] - 初始化时，默认的值，决定显示几个元素，对应元素内容
  * @example
  * // 基础数组
  * [
@@ -106,6 +116,19 @@
  *
  * // 多键对象数组
  * options.keys = ['name', 'age', 'email']
+ *
+ * options.keys= [
+ *   {
+ *     label: "姓名",
+ *     value: "name",
+ *     placeholder: "姓名",
+ *     options: {
+ *       items: ["张三", "李四", "王五"],
+ *       multiSelect: true,
+ *     },
+ *   }
+ * ]
+ *
  * [
  *   {
  *     name: newVarInputVal("str", "张三"),
@@ -159,6 +182,10 @@ export default defineComponent({
       type: Object,
       default: () => ({}),
     },
+    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 bf053286..3bbc9b84 100644
--- a/src/components/composer/common/BorderLabel.vue
+++ b/src/components/composer/common/BorderLabel.vue
@@ -1,20 +1,18 @@
 <template>
   <div class="border-label" :class="{ collapsed }" :data-label="label">
     <div class="label-header row items-center" @click="toggleCollapse">
+      <q-icon
+        v-if="icon"
+        :name="icon"
+        size="16px"
+        class="collapse-icon"
+      />
+      <div class="label-text">{{ label }}</div>
       <q-icon
         :name="collapsed ? 'expand_more' : 'expand_less'"
         size="16px"
         class="collapse-icon"
       />
-      <div class="label-text row items-center">
-        <q-icon
-          v-if="icon"
-          :name="icon"
-          size="16px"
-          class="collapse-icon q-pl-sm"
-        />
-        <div class="label-text">{{ label }}</div>
-      </div>
     </div>
     <div class="content" :class="{ collapsed }">
       <slot></slot>
diff --git a/src/components/composer/common/CheckGroup.vue b/src/components/composer/common/CheckGroup.vue
new file mode 100644
index 00000000..db7ca742
--- /dev/null
+++ b/src/components/composer/common/CheckGroup.vue
@@ -0,0 +1,181 @@
+<template>
+  <component
+    :is="!!label ? 'BorderLabel' : 'div'"
+    :label="label"
+    :icon="icon"
+    :model-value="isCollapse"
+  >
+    <div class="check-btn-group">
+      <q-btn
+        v-for="option in options"
+        :key="option.value"
+        :color="isSelected(option.value) ? 'primary' : 'grey-7'"
+        :flat="!isSelected(option.value)"
+        :outline="isSelected(option.value)"
+        dense
+        :class="[
+          'check-btn',
+          { 'check-btn--selected': isSelected(option.value) },
+        ]"
+        :style="{
+          flex: `1 0 ${100 / options.length}%`,
+        }"
+        @click="toggleOption(option.value)"
+      >
+        <template #default>
+          <div class="row items-center full-width">
+            <div class="check-btn-content">
+              <div class="check-btn-label">{{ option.label }}</div>
+            </div>
+            <q-icon
+              :name="
+                isSelected(option.value)
+                  ? 'check_circle'
+                  : 'radio_button_unchecked'
+              "
+              size="14px"
+              class="q-ml-xs check-btn-icon"
+            />
+          </div>
+          <q-tooltip v-if="option.tooltip">{{ option.tooltip }}</q-tooltip>
+        </template>
+      </q-btn>
+    </div>
+  </component>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
+
+export default defineComponent({
+  name: "CheckGroup",
+  components: { BorderLabel },
+  props: {
+    modelValue: {
+      type: Array,
+      default: () => [],
+    },
+    options: {
+      type: Array,
+      required: true,
+      validator: (options) =>
+        options.every((opt) => opt.label && opt.value !== undefined),
+    },
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    isCollapse: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:model-value"],
+  methods: {
+    isSelected(value) {
+      return this.modelValue.includes(value);
+    },
+    toggleOption(value) {
+      const newValue = [...this.modelValue];
+      const index = newValue.indexOf(value);
+      if (index === -1) {
+        newValue.push(value);
+      } else {
+        newValue.splice(index, 1);
+      }
+      this.$emit("update:model-value", newValue);
+    },
+  },
+});
+</script>
+
+<style scoped>
+.check-btn-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  width: 100%;
+}
+
+.check-btn {
+  min-width: fit-content !important;
+  max-width: 100% !important;
+  height: auto !important;
+  min-height: 32px;
+  font-size: 12px;
+  padding: 4px 12px;
+  border-radius: 4px !important;
+  transition: all 0.3s;
+  background-color: rgba(0, 0, 0, 0.03);
+}
+
+.check-btn :deep(.q-btn__content) {
+  min-width: 0;
+  height: auto;
+  white-space: normal;
+}
+
+.check-btn-content {
+  flex: 1;
+  min-width: 0;
+  margin-right: 4px;
+}
+
+.check-btn-label {
+  text-align: center;
+  line-height: 1.2;
+  word-break: break-word;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.check-btn-icon {
+  flex: none;
+  opacity: 0.8;
+  transition: all 0.3s;
+  margin-top: 2px;
+}
+
+.check-btn--selected .check-btn-icon {
+  opacity: 1;
+  transform: scale(1.1);
+}
+
+/* 移除按钮组默认的边框合并样式 */
+.check-btn:hover {
+  opacity: 0.9;
+  transform: translateY(-1px);
+  border-color: var(--q-primary);
+}
+
+/* 暗色模式适配 */
+.body--dark .check-btn {
+  background-color: rgba(255, 255, 255, 0.03);
+}
+
+.check-btn--selected {
+  background-color: transparent !important;
+  border-color: var(--q-primary) !important;
+}
+
+.check-btn.q-btn--flat {
+  color: var(--q-primary);
+  opacity: 0.8;
+}
+
+.body--dark .check-btn.q-btn--flat {
+  color: rgba(255, 255, 255, 0.9);
+}
+
+/* 选中状态的按钮样式 */
+.check-btn.q-btn--outline {
+  opacity: 1;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index e4ac3d2f..a95f6ce9 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -152,6 +152,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    placeholder: {
+      type: String,
+      default: "",
+    },
     isCollapse: {
       type: Boolean,
       default: true,
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 66180ed8..6084c646 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -10,51 +10,37 @@
         v-if="config.type === 'controlInput'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :placeholder="config.placeholder"
-        :icon="config.icon"
+        v-bind="config"
       />
       <VariableInput
         v-else-if="config.type === 'varInput'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :placeholder="config.placeholder"
-        :icon="config.icon"
-        :options="config.options"
+        v-bind="config"
       />
       <NumberInput
         v-else-if="config.type === 'numInput'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :icon="config.icon"
-        :placeholder="config.placeholder"
+        v-bind="config"
       />
       <ArrayEditor
         v-else-if="config.type === 'arrayEditor'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :options="config.options"
-        :icon="config.icon"
-        :is-collapse="config.isCollapse"
+        v-bind="config"
       />
       <DictEditor
         v-else-if="config.type === 'dictEditor'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :options="config.options"
-        :icon="config.icon"
-        :is-collapse="config.isCollapse"
+        v-bind="config"
       />
       <q-toggle
         v-else-if="config.type === 'switch'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :icon="config.icon"
+        v-bind="config"
       />
       <q-select
         v-else-if="config.type === 'select'"
@@ -63,7 +49,7 @@
         map-options
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :options="config.options"
+        v-bind="config"
       >
         <template v-slot:prepend>
           <q-icon :name="config.icon || 'code'" />
@@ -74,9 +60,7 @@
         filled
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :icon="config.icon"
-        :placeholder="config.placeholder"
+        v-bind="config"
       >
         <template v-slot:prepend>
           <q-icon :name="config.icon || 'code'" />
@@ -86,14 +70,19 @@
         v-else-if="config.type === 'checkbox'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :label="config.label"
-        :icon="config.icon"
+        v-bind="config"
       />
       <ButtonGroup
         v-else-if="config.type === 'buttonGroup'"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        :options="config.options"
+        v-bind="config"
+      />
+      <CheckGroup
+        v-else-if="config.type === 'checkGroup'"
+        :model-value="values[index]"
+        @update:model-value="$emit('update', index, $event)"
+        v-bind="config"
       />
     </div>
   </div>
@@ -107,6 +96,7 @@ import ArrayEditor from "./ArrayEditor.vue";
 import DictEditor from "./DictEditor.vue";
 import ButtonGroup from "./ButtonGroup.vue";
 import ControlInput from "./ControlInput.vue";
+import CheckGroup from "./CheckGroup.vue";
 
 /**
  * 参数输入组件
@@ -128,6 +118,7 @@ export default defineComponent({
     DictEditor,
     ButtonGroup,
     ControlInput,
+    CheckGroup,
   },
   props: {
     configs: {
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index a51d986c..76513ca4 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -45,18 +45,47 @@
         class="options-dropdown prepend-btn"
       >
         <q-list class="options-item-list">
-          <q-item
-            v-for="item in normalizedItems"
-            :key="getItemValue(item)"
-            clickable
-            v-close-popup
-            @click="selectItem(item)"
-            class="option-item"
-          >
-            <q-item-section>
-              {{ getItemLabel(item) }}
-            </q-item-section>
-          </q-item>
+          <template v-if="options.multiSelect">
+            <q-item
+              v-for="item in normalizedItems"
+              :key="getItemValue(item)"
+              clickable
+              class="option-item"
+              @click="toggleSelectItem(item)"
+            >
+              <q-checkbox
+                size="xs"
+                :model-value="isItemSelected(item)"
+                @update:model-value="toggleSelectItem(item)"
+              />
+              <div class="option-item-label">{{ getItemLabel(item) }}</div>
+            </q-item>
+            <q-separator />
+            <q-item
+              clickable
+              class="option-item"
+              @click="confirmMultiSelect"
+              v-close-popup
+            >
+              <q-item-section class="text-primary">
+                确定 (已选择 {{ selectedItems.length }} 项)
+              </q-item-section>
+            </q-item>
+          </template>
+          <template v-else>
+            <q-item
+              v-for="item in normalizedItems"
+              :key="getItemValue(item)"
+              clickable
+              v-close-popup
+              @click="selectItem(item)"
+              class="option-item"
+            >
+              <q-item-section>
+                {{ getItemLabel(item) }}
+              </q-item-section>
+            </q-item>
+          </template>
         </q-list>
       </q-btn-dropdown>
       <q-btn
@@ -147,8 +176,11 @@ import { newVarInputVal } from "js/composer/varInputValManager";
  * @property {Object} modelValue - 输入框的值对象
  * @property {String} label - 输入框标签
  * @property {String} icon - 输入框图标
+ *
  * @property {Object} [options] - 可选的配置对象
- * @property {Array} [options.items] - 选项列表
+ * @property {Array} [options.items] - 选项列表，默认单选，选中后，插入值且设置为字符模式
+ * @property {Boolean} [options.multiSelect] - 选项列表支持多选，选中后，插入选择的数组且设置为变量模式
+ *
  * @property {Boolean} [options.dialog] - 是否显示文件选择对话框
  * @property {Object} [options.dialog] - 文件选择对话框配置
  * @property {String} [options.dialog.type] - 对话框类型，open 或 save
@@ -213,6 +245,7 @@ export default defineComponent({
     return {
       selectedVariable: null,
       variables: [],
+      selectedItems: [],
     };
   },
 
@@ -290,8 +323,12 @@ export default defineComponent({
     },
 
     selectItem(option) {
-      const value = this.getItemValue(option);
-      this.$emit("update:modelValue", newVarInputVal("str", value));
+      if (this.options.multiSelect) {
+        this.toggleSelectItem(option);
+      } else {
+        const value = this.getItemValue(option);
+        this.$emit("update:modelValue", newVarInputVal("str", value));
+      }
     },
     handleFileOpen(dialog) {
       let { type, options } = window.lodashM.cloneDeep(dialog);
@@ -310,6 +347,40 @@ export default defineComponent({
         this.$emit("update:modelValue", newVarInputVal("str", file));
       }
     },
+
+    // 新增：判断选项是否被选中
+    isItemSelected(item) {
+      return this.selectedItems.includes(this.getItemValue(item));
+    },
+
+    // 新增：切换选项选中状态
+    toggleSelectItem(item) {
+      const value = this.getItemValue(item);
+      const index = this.selectedItems.indexOf(value);
+      if (index === -1) {
+        this.selectedItems.push(value);
+      } else {
+        this.selectedItems.splice(index, 1);
+      }
+    },
+
+    // 新增：确认多选
+    confirmMultiSelect() {
+      if (this.selectedItems.length === 0) return;
+      this.$emit(
+        "update:modelValue",
+        newVarInputVal(
+          "var",
+          JSON.stringify(this.selectedItems).replace(/,/g, ", ")
+        )
+      );
+      this.selectedItems = []; // 清空选择
+    },
+  },
+
+  // 在组件销毁时清空选择
+  beforeUnmount() {
+    this.selectedItems = [];
   },
 });
 </script>
@@ -333,7 +404,6 @@ export default defineComponent({
 
 .prepend-btn:hover {
   opacity: 1;
-  transform: scale(1.05);
 }
 
 .clear-btn:hover {
@@ -398,6 +468,11 @@ export default defineComponent({
   background-color: var(--q-primary-opacity-10);
 }
 
+.option-item-label {
+  text-align: center;
+  flex: 1;
+}
+
 /* 暗色模式适配 */
 .body--dark .option-item:hover {
   background-color: rgba(255, 255, 255, 0.1);
@@ -413,4 +488,15 @@ export default defineComponent({
 .empty-variables-tip:hover {
   opacity: 1;
 }
+
+/* 多选确认按钮样式 */
+.option-item.text-primary {
+  justify-content: center;
+  font-weight: 500;
+}
+
+/* 多选项样式 */
+.option-item .q-checkbox {
+  margin-right: 4px;
+}
 </style>
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 4251d378..38ae6a6c 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -120,7 +120,7 @@
               :model-value="argvs.options.env"
               @update:model-value="(val) => updateArgvs('options.env', val)"
               label="环境变量"
-              icon="environment"
+              icon="attach_money"
             />
           </div>
         </div>
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 71fc24df..5619488b 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -158,5 +158,110 @@ export const uiCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.ui.showOpenDialog",
+      label: "文件选择框",
+      desc: "显示一个文件选择框，返回选择的文件路径",
+      outputVariable: "filePaths",
+      saveOutput: true,
+      config: [
+        {
+          label: "标题",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "请选择文件"),
+          width: 6,
+        },
+        {
+          label: "默认路径",
+          type: "varInput",
+          defaultValue: newVarInputVal("str"),
+          width: 6,
+          placeholder: "默认打开的路径",
+        },
+        {
+          label: "按钮文本",
+          type: "varInput",
+          defaultValue: newVarInputVal("str", "选择"),
+          width: 3,
+        },
+        {
+          label: "提示信息",
+          type: "varInput",
+          defaultValue: newVarInputVal("str"),
+          width: 3,
+          placeholder: "对话框底部的提示信息",
+          defaultValue: newVarInputVal("str", "请选择"),
+        },
+        {
+          label: "扩展名",
+          type: "varInput",
+          width: 6,
+          options: {
+            items: ["*", "jpg", "png", "gif", "txt", "json", "exe"],
+            multiSelect: true,
+          },
+          defaultValue: newVarInputVal("var", '["*"]'),
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.ui.showOpenDialog",
+          label: "打开文件对话框",
+          desc: "打开文件对话框",
+          icon: "folder_open",
+          config: [
+            {
+              label: "选择选项",
+              type: "checkGroup",
+              icon: "settings",
+              width: 12,
+              options: [
+                { label: "选择文件", value: "openFile" },
+                { label: "选择文件夹", value: "openDirectory" },
+                { label: "允许多选", value: "multiSelections" },
+                { label: "显示隐藏文件", value: "showHiddenFiles" },
+                { label: "提示新建路径（Win）", value: "promptToCreate" },
+                { label: "不添加到最近（Win）", value: "dontAddToRecent" },
+                { label: "允许创建文件夹（Mac）", value: "createDirectory" },
+                { label: "不解析符号链接（Mac）", value: "noResolveAliases" },
+                {
+                  label: "将.App作为目录（Mac）",
+                  value: "treatPackageAsDirectory",
+                },
+              ],
+              defaultValue: ["openFile", "showHiddenFiles"],
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.ui.showSaveDialog",
+          label: "保存文件对话框",
+          desc: "保存文件对话框",
+          icon: "save",
+          config: [
+            {
+              label: "选择选项",
+              type: "checkGroup",
+              icon: "settings",
+              width: 12,
+              options: [
+                { label: "显示隐藏文件", value: "showHiddenFiles" },
+                { label: "允许创建文件夹（Mac）", value: "createDirectory" },
+                {
+                  label: "将.App作为目录（Mac）",
+                  value: "treatPackageAsDirectory",
+                },
+                {
+                  label: "显示覆盖确认（Linux）",
+                  value: "showOverwriteConfirmation",
+                },
+                { label: "不添加到最近（Win）", value: "dontAddToRecent" },
+              ],
+              defaultValue: ["showHiddenFiles"],
+            },
+          ],
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index bfc9b9f1..5c167f99 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -81,7 +81,7 @@ const stringifyObject = (jsonObj) => {
     return stringifyVarInputVal(jsonObj);
   }
   if (jsonObj instanceof Array) {
-    return `[${jsonObj.map((item) => stringifyObject(item)).join(",")}]`;
+    return `[${jsonObj.map((item) => stringifyArgv(item)).join(",")}]`;
   }
   try {
     return processObject(jsonObj);

From 682f6d0bcd9eb281eb8eb2e146b5ca99917a9fe9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 17:55:50 +0800
Subject: [PATCH 019/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E8=A1=A5=E9=BD=90uto?=
 =?UTF-8?q?ols=E7=AA=97=E5=8F=A3=E4=BA=A4=E4=BA=92=E5=92=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=BE=93=E5=85=A5=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/simulate/index.js    |   2 -
 plugin/lib/quickcomposer/simulate/sendText.js |  11 -
 src/components/composer/common/DictEditor.vue | 254 ++++++++++++------
 .../composer/network/AxiosConfigEditor.vue    |   2 +-
 src/js/composer/commands/simulateCommands.js  |  73 ++++-
 src/js/composer/commands/utoolsCommand.js     |  92 +++++++
 src/plugins/monaco/types/utools.api.d.ts      |   4 +
 7 files changed, 337 insertions(+), 101 deletions(-)
 delete mode 100644 plugin/lib/quickcomposer/simulate/sendText.js

diff --git a/plugin/lib/quickcomposer/simulate/index.js b/plugin/lib/quickcomposer/simulate/index.js
index e4bce25f..cb17c036 100644
--- a/plugin/lib/quickcomposer/simulate/index.js
+++ b/plugin/lib/quickcomposer/simulate/index.js
@@ -1,12 +1,10 @@
 const { findImage } = require("./imageFinder");
 const { captureScreen } = require("./screenCapture");
-const sendText = require("./sendText");
 const { keyboardTap, keySequence } = require("./keyboardTap");
 
 module.exports = {
   findImage,
   captureScreen,
-  sendText,
   keyboardTap,
   keySequence,
 };
diff --git a/plugin/lib/quickcomposer/simulate/sendText.js b/plugin/lib/quickcomposer/simulate/sendText.js
deleted file mode 100644
index fc839908..00000000
--- a/plugin/lib/quickcomposer/simulate/sendText.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const sendText = (text, simulateCopy = false) => {
-  if (simulateCopy) {
-    window.utools.copyText(text);
-    quickcommand.sleep(200);
-    quickcommand.simulatePaste();
-  } else {
-    window.utools.hideMainWindowTypeString(text);
-  }
-};
-
-module.exports = sendText;
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index a95f6ce9..650bf306 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -7,42 +7,69 @@
   >
     <div class="dict-editor">
       <div
-        v-for="(item, index) in items"
-        :key="index"
+        v-for="(item, index) in allItems"
+        :key="`${item.type}-${index}`"
         class="row q-col-gutter-sm items-center"
       >
         <div class="col-4">
-          <q-select
-            v-if="options?.items"
-            :model-value="item.key"
-            :options="options.items"
-            label="名称"
-            dense
-            filled
-            use-input
-            input-debounce="0"
-            :hide-selected="!!inputValue"
-            @filter="filterFn"
-            @update:model-value="(val) => handleSelect(val, index)"
-            @input-value="(val) => handleInput(val, index)"
-            @blur="handleBlur"
-          >
-            <template v-slot:prepend>
-              <q-icon name="code" />
-            </template>
-          </q-select>
-          <q-input
-            v-else
-            :model-value="item.key"
-            label="名称"
-            dense
-            filled
-            @update:model-value="(val) => updateItemKey(val, index)"
-          >
-            <template v-slot:prepend>
-              <q-icon name="code" />
-            </template>
-          </q-input>
+          <template v-if="item.type === 'fixed'">
+            <q-input
+              :model-value="item.key"
+              :label="getKeyLabel(item.key)"
+              dense
+              filled
+              readonly
+              disable
+            >
+              <template v-slot:prepend>
+                <q-icon name="lock" />
+              </template>
+            </q-input>
+          </template>
+          <template v-else>
+            <q-select
+              v-if="options?.optionKeys"
+              :model-value="item.key"
+              :options="normalizedOptionKeys"
+              label="名称"
+              dense
+              filled
+              use-input
+              input-debounce="0"
+              :hide-selected="!!inputValue"
+              @filter="filterFn"
+              @update:model-value="
+                (val) => handleSelect(val, getEditableIndex(index))
+              "
+              @input-value="(val) => handleInput(val, getEditableIndex(index))"
+              @blur="handleBlur"
+            >
+              <template v-slot:prepend>
+                <q-icon name="code" />
+              </template>
+              <template v-slot:option="scope">
+                <q-item v-bind="scope.itemProps">
+                  <q-item-section>
+                    {{ getKeyLabel(scope.opt) }}
+                  </q-item-section>
+                </q-item>
+              </template>
+            </q-select>
+            <q-input
+              v-else
+              :model-value="item.key"
+              label="名称"
+              dense
+              filled
+              @update:model-value="
+                (val) => updateItemKey(val, getEditableIndex(index))
+              "
+            >
+              <template v-slot:prepend>
+                <q-icon name="code" />
+              </template>
+            </q-input>
+          </template>
         </div>
         <div class="col">
           <VariableInput
@@ -50,12 +77,14 @@
             label="值"
             icon="code"
             class="col-grow"
-            @update:model-value="(val) => updateItemValue(val, index)"
+            @update:model-value="
+              (val) => updateItemValue(val, index, item.type === 'fixed')
+            "
           />
         </div>
-        <div class="col-auto">
+        <div v-if="item.type !== 'fixed'" class="col-auto">
           <div class="btn-container">
-            <template v-if="items.length === 1">
+            <template v-if="editableItems.length === 1">
               <q-btn
                 flat
                 dense
@@ -65,14 +94,16 @@
                 @click="addItem"
               />
             </template>
-            <template v-else-if="index === items.length - 1">
+            <template
+              v-else-if="getEditableIndex(index) === editableItems.length - 1"
+            >
               <q-btn
                 flat
                 dense
                 size="sm"
                 icon="remove"
                 class="top-btn"
-                @click="removeItem(index)"
+                @click="removeItem(getEditableIndex(index))"
               />
               <q-btn
                 flat
@@ -90,7 +121,7 @@
                 size="sm"
                 icon="remove"
                 class="center-btn"
-                @click="removeItem(index)"
+                @click="removeItem(getEditableIndex(index))"
               />
             </template>
           </div>
@@ -112,7 +143,8 @@ import BorderLabel from "components/composer/common/BorderLabel.vue";
  *
  * @property {Object} modelValue - 绑定的字典对象
  * @property {Object} options - 配置选项
- * @property {String[]} [options.items] - 键名的下拉选择选项
+ * @property {String[]|Object[]} [options.optionKeys] - 可选键名
+ * @property {String[]|Object[]} [options.fixedKeys] - 固定键名
  *
  * @example
  * // 基础字典对象
@@ -164,40 +196,105 @@ export default defineComponent({
   emits: ["update:modelValue"],
   data() {
     const modelEntries = Object.entries(this.modelValue || {});
+    const fixedKeys = this.normalizeKeys(this.options?.fixedKeys || []);
+    const fixedKeyValues = fixedKeys.map((key) => ({
+      type: "fixed",
+      key: key.value,
+      value:
+        modelEntries.find(([k]) => k === key.value)?.[1] ||
+        newVarInputVal("str"),
+    }));
+
+    const editableEntries = modelEntries.filter(
+      ([key]) => !fixedKeys.some((k) => k.value === key)
+    );
+
     return {
-      localItems: modelEntries.length
-        ? modelEntries.map(([key, value]) => ({ key, value }))
-        : [
-            {
-              key: "",
-              value: newVarInputVal("str"),
-            },
-          ],
-      filterOptions: this.options?.items || [],
+      fixedItems: fixedKeyValues,
+      localItems: editableEntries.length
+        ? editableEntries.map(([key, value]) => ({
+            type: "editable",
+            key,
+            value,
+          }))
+        : [{ type: "editable", key: "", value: newVarInputVal("str") }],
+      filterOptions: this.normalizeKeys(this.options?.optionKeys || []),
       inputValue: "",
     };
   },
   computed: {
-    items: {
+    editableItems: {
       get() {
         return this.localItems;
       },
       set(newItems) {
         this.localItems = newItems;
-        const dict = {};
-        newItems.forEach((item) => {
-          if (item.key) {
-            dict[item.key] = item.value;
-          }
-        });
-        this.$emit("update:modelValue", dict);
+        this.updateModelValue();
       },
     },
+    allItems() {
+      return [...this.fixedItems, ...this.localItems];
+    },
+    normalizedOptionKeys() {
+      return this.filterOptions;
+    },
   },
   methods: {
+    normalizeKeys(keys) {
+      return keys.map((key) => {
+        if (typeof key === "string") {
+          return { value: key, label: key };
+        }
+        return key;
+      });
+    },
+
+    getKeyLabel(key) {
+      if (typeof key === "object") return key.label;
+      const allKeys = [
+        ...this.normalizeKeys(this.options?.fixedKeys || []),
+        ...this.normalizeKeys(this.options?.optionKeys || []),
+      ];
+      return allKeys.find((k) => k.value === key)?.label || key;
+    },
+
+    getEditableIndex(index) {
+      return index - this.fixedItems.length;
+    },
+
+    updateModelValue() {
+      const dict = {};
+      // 先添加固定键
+      this.fixedItems.forEach((item) => {
+        if (item.key) {
+          dict[item.key] = item.value;
+        }
+      });
+      // 再添加可编辑键
+      this.localItems.forEach((item) => {
+        if (item.key) {
+          dict[item.key] = item.value;
+        }
+      });
+      this.$emit("update:modelValue", dict);
+    },
+
+    updateItemValue(val, index, isFixed = false) {
+      if (isFixed) {
+        const newItems = [...this.fixedItems];
+        newItems[index].value = val;
+        this.fixedItems = newItems;
+      } else {
+        const newItems = [...this.localItems];
+        newItems[index].value = val;
+        this.localItems = newItems;
+      }
+      this.updateModelValue();
+    },
+
     addItem() {
-      this.items = [
-        ...this.items,
+      this.localItems = [
+        ...this.localItems,
         {
           key: "",
           value: newVarInputVal("str"),
@@ -205,7 +302,7 @@ export default defineComponent({
       ];
     },
     removeItem(index) {
-      const newItems = [...this.items];
+      const newItems = [...this.localItems];
       newItems.splice(index, 1);
       if (newItems.length === 0) {
         newItems.push({
@@ -213,45 +310,46 @@ export default defineComponent({
           value: newVarInputVal("str"),
         });
       }
-      this.items = newItems;
+      this.localItems = newItems;
     },
     updateItemKey(val, index) {
-      const newItems = [...this.items];
+      const newItems = [...this.localItems];
       newItems[index].key = val;
-      this.items = newItems;
-    },
-    updateItemValue(val, index) {
-      const newItems = [...this.items];
-      newItems[index].value = val;
-      this.items = newItems;
+      this.localItems = newItems;
     },
     handleInput(val, index) {
       this.inputValue = val;
-      if (val && !this.filterOptions.includes(val)) {
-        const newItems = [...this.items];
+      if (val) {
+        const newItems = [...this.localItems];
         newItems[index].key = val;
-        this.items = newItems;
+        this.localItems = newItems;
+        this.updateModelValue();
       }
     },
     handleSelect(val, index) {
       this.inputValue = "";
-      const newItems = [...this.items];
-      newItems[index].key = val;
-      this.items = newItems;
+      const newItems = [...this.localItems];
+      newItems[index].key = val.value || val;
+      this.localItems = newItems;
+      this.updateModelValue();
     },
     handleBlur() {
       this.inputValue = "";
     },
     filterFn(val, update) {
-      if (!this.options?.items) return;
+      if (!this.options?.optionKeys) return;
 
       update(() => {
         if (val === "") {
-          this.filterOptions = this.options.items;
+          this.filterOptions = this.normalizeKeys(this.options.optionKeys);
         } else {
           const needle = val.toLowerCase();
-          this.filterOptions = this.options.items.filter(
-            (v) => v.toLowerCase().indexOf(needle) > -1
+          this.filterOptions = this.normalizeKeys(
+            this.options.optionKeys
+          ).filter(
+            (v) =>
+              v.label.toLowerCase().indexOf(needle) > -1 ||
+              v.value.toLowerCase().indexOf(needle) > -1
           );
         }
       });
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index 2cc9617f..b0a16092 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -102,7 +102,7 @@
               <DictEditor
                 v-model="argvs.otherHeaders"
                 :options="{
-                  items: commonHeaderOptions,
+                  optionKeys: commonHeaderOptions,
                 }"
                 @update:model-value="updateHeaders"
               />
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index aeecd195..fa2a4ffd 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -33,7 +33,7 @@ export const simulateCommands = {
       ],
     },
     {
-      value: "quickcomposer.simulate.sendText",
+      value: "utools.hideMainWindowTypeString",
       label: "发送文本",
       config: [
         {
@@ -41,18 +41,73 @@ export const simulateCommands = {
           label: "要发送的文本内容",
           type: "varInput",
           icon: "send",
-          width: 9,
+          width: 12,
         },
+      ],
+      subCommands: [
         {
-          label: "发送方式",
-          type: "select",
-          defaultValue: false,
+          value: "utools.hideMainWindowTypeString",
+          label: "模拟输入",
           icon: "keyboard",
-          options: [
-            { label: "模拟输入", value: false },
-            { label: "模拟粘贴", value: true },
+        },
+        {
+          value: "utools.hideMainWindowPasteText",
+          label: "模拟粘贴",
+          icon: "content_paste",
+        },
+      ],
+    },
+    {
+      value: "utools.hideMainWindowPasteFile",
+      label: "模拟粘贴文件/图片",
+      icon: "file_copy",
+      subCommands: [
+        {
+          value: "utools.hideMainWindowPasteFile",
+          label: "粘贴文件",
+          icon: "file_copy",
+          config: [
+            {
+              key: "file",
+              label: "文件路径",
+              type: "varInput",
+              icon: "description",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择文件",
+                    properties: [
+                      "openFile",
+                      "multiSelections",
+                      "showHiddenFiles",
+                    ],
+                  },
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "utools.hideMainWindowPasteImage",
+          label: "粘贴图片",
+          icon: "image",
+          config: [
+            {
+              key: "image",
+              label: "图片路径/base64",
+              type: "varInput",
+              icon: "image",
+              width: 12,
+              options: {
+                dialog: {
+                  title: "选择图片",
+                  properties: ["openFile", "showHiddenFiles"],
+                },
+              },
+            },
           ],
-          width: 3,
         },
       ],
     },
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 518afcf5..b7cc89da 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const utoolsCommands = {
   label: "uTools功能",
   icon: "insights",
@@ -83,5 +85,95 @@ export const utoolsCommands = {
         },
       ],
     },
+    {
+      value: "utools.findInPage",
+      label: "插件内查找",
+      desc: "插件内查找",
+      icon: "search",
+      subCommands: [
+        {
+          value: "utools.findInPage",
+          label: "查找文本",
+          desc: "查找文本",
+          icon: "search",
+          config: [
+            {
+              key: "text",
+              label: "文本",
+              type: "varInput",
+              icon: "search",
+              width: 12,
+            },
+            {
+              key: "options",
+              label: "选项",
+              type: "dictEditor",
+              icon: "settings",
+              options: {
+                fixedKeys: [
+                  {
+                    value: "forward",
+                    label: "向前查找",
+                  },
+                  {
+                    value: "findNext",
+                    label: "查找下一个",
+                  },
+                  {
+                    value: "matchCase",
+                    label: "区分大小写",
+                  },
+                  {
+                    value: "wordStart",
+                    label: "单词开头",
+                  },
+                  {
+                    value: "medialCapitalAsWordStart",
+                    label: "中缀大写作为单词开头",
+                  },
+                ],
+              },
+              defaultValue: {
+                forward: newVarInputVal("var", "true"),
+                findNext: newVarInputVal("var", "false"),
+                matchCase: newVarInputVal("var", "false"),
+                wordStart: newVarInputVal("var", "false"),
+                medialCapitalAsWordStart: newVarInputVal("var", "false"),
+              },
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "utools.stopFindInPage",
+          label: "停止查找",
+          desc: "停止查找",
+          icon: "stop",
+          config: [
+            {
+              key: "action",
+              label: "动作",
+              type: "buttonGroup",
+              icon: "settings",
+              width: 12,
+              options: [
+                { label: "清除选择", value: "clearSelection" },
+                { label: "保持选择", value: "keepSelection" },
+                { label: "激活选择", value: "activateSelection" },
+              ],
+              defaultValue: "clearSelection",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "utools.getWindowType",
+      label: "获取当前窗口类型",
+      desc: "获取当前窗口类型",
+      icon: "window",
+      outputVariable: "windowType",
+      saveOutput: true,
+    },
   ],
 };
diff --git a/src/plugins/monaco/types/utools.api.d.ts b/src/plugins/monaco/types/utools.api.d.ts
index c794ad91..0d6e3789 100644
--- a/src/plugins/monaco/types/utools.api.d.ts
+++ b/src/plugins/monaco/types/utools.api.d.ts
@@ -424,6 +424,10 @@ interface UToolsApi {
    * 拖拽文件
    */
   startDrag(file: string | string[]): void;
+  /**
+   * 获取当前窗口类型
+   */
+  getWindowType(): "main" | "detach" | "browser";
   /**
    * 屏幕取色
    */

From 378ae7f92ff9cad5fd96cc7f01481b4a4a594365 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 9 Jan 2025 22:43:33 +0800
Subject: [PATCH 020/332] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E3=80=81=E5=B1=8F=E5=B9=95=E5=8F=96=E8=89=B2?=
 =?UTF-8?q?=E3=80=81=E8=8E=B7=E5=8F=96=E6=98=BE=E7=A4=BA=E5=99=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E5=89=AA=E8=B4=B4=E6=9D=BF=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/simulate/index.js    |   7 +-
 .../quickcomposer/simulate/screenCapture.js   |  41 ++++-
 .../quickcomposer/simulate/screenColorPick.js |  11 ++
 src/components/composer/MultiParams.vue       |  14 +-
 src/components/composer/common/DictEditor.vue | 141 ++++++++++--------
 src/js/composer/commands/index.js             |   2 +
 src/js/composer/commands/screenCommands.js    | 126 ++++++++++++++++
 src/js/composer/commands/simulateCommands.js  |  86 +++++++++++
 src/js/composer/commands/systemCommands.js    |  74 ++++++++-
 src/js/composer/commands/utoolsCommand.js     |   1 +
 10 files changed, 420 insertions(+), 83 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/simulate/screenColorPick.js
 create mode 100644 src/js/composer/commands/screenCommands.js

diff --git a/plugin/lib/quickcomposer/simulate/index.js b/plugin/lib/quickcomposer/simulate/index.js
index cb17c036..f8bc9f9d 100644
--- a/plugin/lib/quickcomposer/simulate/index.js
+++ b/plugin/lib/quickcomposer/simulate/index.js
@@ -1,10 +1,13 @@
 const { findImage } = require("./imageFinder");
-const { captureScreen } = require("./screenCapture");
 const { keyboardTap, keySequence } = require("./keyboardTap");
+const { screenColorPick } = require("./screenColorPick");
+const screenCapture = require("./screenCapture");
 
 module.exports = {
   findImage,
-  captureScreen,
+  screenCapture,
   keyboardTap,
   keySequence,
+  screenColorPick,
+  ...screenCapture,
 };
diff --git a/plugin/lib/quickcomposer/simulate/screenCapture.js b/plugin/lib/quickcomposer/simulate/screenCapture.js
index 62ee22e3..14c4eaea 100644
--- a/plugin/lib/quickcomposer/simulate/screenCapture.js
+++ b/plugin/lib/quickcomposer/simulate/screenCapture.js
@@ -187,7 +187,7 @@ async function captureLinuxScreen() {
 }
 
 // 统一的截图接口
-async function captureScreen() {
+async function captureFullScreen() {
   try {
     if (process.platform === "darwin") {
       return await captureMacScreen();
@@ -202,4 +202,41 @@ async function captureScreen() {
   return null;
 }
 
-module.exports = { captureScreen };
+function captureAreaScreen() {
+  return new Promise((resolve) => {
+    window.utools.screenCapture((data) => {
+      resolve(data);
+    });
+  });
+}
+
+async function captureScreen(range = "fullscreen") {
+  return range === "fullscreen"
+    ? await captureFullScreen()
+    : await captureAreaScreen();
+}
+
+async function captureScreenToFile(range = "fullscreen", path = null) {
+  if (!path) return null;
+  const result = await captureScreen(range);
+  if (!result) return null;
+  fs.writeFileSync(
+    path,
+    result.replace("data:image/png;base64,", ""),
+    "base64"
+  );
+  return result;
+}
+
+async function captureScreenToClipboard(range = "fullscreen") {
+  const result = await captureScreen(range);
+  if (!result) return null;
+  window.utools.copyImage(result);
+  return result;
+}
+
+module.exports = {
+  captureScreen,
+  captureScreenToFile,
+  captureScreenToClipboard,
+};
diff --git a/plugin/lib/quickcomposer/simulate/screenColorPick.js b/plugin/lib/quickcomposer/simulate/screenColorPick.js
new file mode 100644
index 00000000..cfc7522c
--- /dev/null
+++ b/plugin/lib/quickcomposer/simulate/screenColorPick.js
@@ -0,0 +1,11 @@
+const screenColorPick = () => {
+  return new Promise((resolve) => {
+    utools.screenColorPick((color) => {
+      resolve(color);
+    });
+  });
+};
+
+module.exports = {
+  screenColorPick,
+};
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index b0d0de6f..2eed4d24 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -41,16 +41,16 @@ export default defineComponent({
         // 过滤掉特定函数排除的参数, excludeConfig格式为[要排除的参数索引]
         this.modelValue.config?.filter(
           (_, index) =>
-            !this.getSelectFunction()?.excludeConfig?.includes(index)
+            !this.getSelectSubCommand()?.excludeConfig?.includes(index)
         ) || []
       );
     },
     // 特定函数独有参数配置，config格式和通用的config一致
-    functionConfig() {
-      return this.getSelectFunction()?.config || [];
+    subCommandConfig() {
+      return this.getSelectSubCommand()?.config || [];
     },
     localConfig() {
-      return [...this.commonConfig, ...this.functionConfig].map((item) => {
+      return [...this.commonConfig, ...this.subCommandConfig].map((item) => {
         const value =
           item.type === "varInput"
             ? item.defaultValue || newVarInputVal("str")
@@ -79,7 +79,7 @@ export default defineComponent({
         });
 
         // 使用新选择的函数独有配置的默认值
-        this.getSelectFunction(value)?.config?.forEach((config, index) => {
+        this.getSelectSubCommand(value)?.config?.forEach((config, index) => {
           newArgvs[this.commonConfig.length + index] = config.defaultValue;
         });
 
@@ -96,7 +96,7 @@ export default defineComponent({
     },
   },
   methods: {
-    getSelectFunction(funcName = this.funcName) {
+    getSelectSubCommand(funcName = this.funcName) {
       return this.modelValue.subCommands?.find(
         (item) => item.value === funcName
       );
@@ -165,7 +165,7 @@ export default defineComponent({
     },
     getSummary(argvs) {
       // 虽然header里对溢出做了处理，但是这里截断主要是为了节省存储空间
-      const funcNameLabel = this.getSelectFunction()?.label;
+      const funcNameLabel = this.getSelectSubCommand()?.label;
       const subFeature = funcNameLabel ? `${funcNameLabel} ` : "";
       const allArgvs = argvs
         .filter((item) => item != null && item != "")
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index 650bf306..f999e9df 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -82,7 +82,10 @@
             "
           />
         </div>
-        <div v-if="item.type !== 'fixed'" class="col-auto">
+        <div
+          v-if="item.type !== 'fixed' && !options?.disableAdd"
+          class="col-auto"
+        >
           <div class="btn-container">
             <template v-if="editableItems.length === 1">
               <q-btn
@@ -145,6 +148,7 @@ import BorderLabel from "components/composer/common/BorderLabel.vue";
  * @property {Object} options - 配置选项
  * @property {String[]|Object[]} [options.optionKeys] - 可选键名
  * @property {String[]|Object[]} [options.fixedKeys] - 固定键名
+ * @property {Boolean} [options.disableAdd] - 禁止添加新的键值对
  *
  * @example
  * // 基础字典对象
@@ -195,30 +199,7 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   data() {
-    const modelEntries = Object.entries(this.modelValue || {});
-    const fixedKeys = this.normalizeKeys(this.options?.fixedKeys || []);
-    const fixedKeyValues = fixedKeys.map((key) => ({
-      type: "fixed",
-      key: key.value,
-      value:
-        modelEntries.find(([k]) => k === key.value)?.[1] ||
-        newVarInputVal("str"),
-    }));
-
-    const editableEntries = modelEntries.filter(
-      ([key]) => !fixedKeys.some((k) => k.value === key)
-    );
-
     return {
-      fixedItems: fixedKeyValues,
-      localItems: editableEntries.length
-        ? editableEntries.map(([key, value]) => ({
-            type: "editable",
-            key,
-            value,
-          }))
-        : [{ type: "editable", key: "", value: newVarInputVal("str") }],
-      filterOptions: this.normalizeKeys(this.options?.optionKeys || []),
       inputValue: "",
     };
   },
@@ -232,11 +213,49 @@ export default defineComponent({
         this.updateModelValue();
       },
     },
+    normalizedOptionKeys() {
+      return this.filterOptions;
+    },
+    // 规范化的固定键列表
+    normalizedFixedKeys() {
+      return this.normalizeKeys(this.options?.fixedKeys || []);
+    },
+    // 从 modelValue 中提取的所有条目
+    modelEntries() {
+      return Object.entries(this.modelValue || {});
+    },
+    // 固定键项
+    fixedItems() {
+      return this.normalizedFixedKeys.map((key) => ({
+        type: "fixed",
+        key: key.value,
+        value:
+          this.modelEntries.find(([k]) => k === key.value)?.[1] ||
+          newVarInputVal("str"),
+      }));
+    },
+    // 可编辑项
+    localItems() {
+      // 过滤出不在固定键中的条目
+      const editableEntries = this.modelEntries.filter(
+        ([key]) => !this.normalizedFixedKeys.some((k) => k.value === key)
+      );
+
+      return editableEntries.length || this.options?.disableAdd
+        ? editableEntries.map(([key, value]) => ({
+            type: "editable",
+            key,
+            value,
+          }))
+        : [{ type: "editable", key: "", value: newVarInputVal("str") }];
+    },
+    // 所有项目的组合
     allItems() {
       return [...this.fixedItems, ...this.localItems];
     },
-    normalizedOptionKeys() {
-      return this.filterOptions;
+    // 过滤选项
+    filterOptions() {
+      return this.normalizeKeys(this.options?.optionKeys || []);
     },
   },
   methods: {
@@ -251,10 +270,7 @@ export default defineComponent({
 
     getKeyLabel(key) {
       if (typeof key === "object") return key.label;
-      const allKeys = [
-        ...this.normalizeKeys(this.options?.fixedKeys || []),
-        ...this.normalizeKeys(this.options?.optionKeys || []),
-      ];
+      const allKeys = [...this.normalizedFixedKeys, ...this.filterOptions];
       return allKeys.find((k) => k.value === key)?.label || key;
     },
 
@@ -280,62 +296,57 @@ export default defineComponent({
     },
 
     updateItemValue(val, index, isFixed = false) {
-      if (isFixed) {
-        const newItems = [...this.fixedItems];
-        newItems[index].value = val;
-        this.fixedItems = newItems;
-      } else {
-        const newItems = [...this.localItems];
-        newItems[index].value = val;
-        this.localItems = newItems;
+      const dict = { ...this.modelValue };
+      const item = this.allItems[index];
+      if (item.key) {
+        dict[item.key] = val;
+        this.$emit("update:modelValue", dict);
       }
-      this.updateModelValue();
     },
 
     addItem() {
-      this.localItems = [
-        ...this.localItems,
-        {
-          key: "",
-          value: newVarInputVal("str"),
-        },
-      ];
+      if (this.options?.disableAdd) return;
+      const dict = { ...this.modelValue };
+      dict[""] = newVarInputVal("str");
+      this.$emit("update:modelValue", dict);
     },
+
     removeItem(index) {
-      const newItems = [...this.localItems];
-      newItems.splice(index, 1);
-      if (newItems.length === 0) {
-        newItems.push({
-          key: "",
-          value: newVarInputVal("str"),
-        });
+      if (this.options?.disableAdd) return;
+      const dict = { ...this.modelValue };
+      const item = this.localItems[index];
+      if (item.key) {
+        delete dict[item.key];
+        this.$emit("update:modelValue", dict);
       }
-      this.localItems = newItems;
     },
+
     updateItemKey(val, index) {
-      const newItems = [...this.localItems];
-      newItems[index].key = val;
-      this.localItems = newItems;
+      const dict = { ...this.modelValue };
+      const oldItem = this.localItems[index];
+      if (oldItem.key) {
+        delete dict[oldItem.key];
+      }
+      dict[val] = oldItem.value;
+      this.$emit("update:modelValue", dict);
     },
+
     handleInput(val, index) {
       this.inputValue = val;
       if (val) {
-        const newItems = [...this.localItems];
-        newItems[index].key = val;
-        this.localItems = newItems;
-        this.updateModelValue();
+        this.updateItemKey(val, index);
       }
     },
+
     handleSelect(val, index) {
       this.inputValue = "";
-      const newItems = [...this.localItems];
-      newItems[index].key = val.value || val;
-      this.localItems = newItems;
-      this.updateModelValue();
+      this.updateItemKey(val.value || val, index);
     },
+
     handleBlur() {
       this.inputValue = "";
     },
+
     filterFn(val, update) {
       if (!this.options?.optionKeys) return;
 
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 41d362d4..bf7c44cd 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -11,6 +11,7 @@ import { codingCommands } from "./codingCommand";
 import { mathCommands } from "./mathCommands";
 import { userdataCommands } from "./userdataCommands";
 import { utoolsCommands } from "./utoolsCommand";
+import { screenCommands } from "./screenCommands";
 
 export const commandCategories = [
   fileCommands,
@@ -25,5 +26,6 @@ export const commandCategories = [
   simulateCommands,
   mathCommands,
   userdataCommands,
+  screenCommands,
   otherCommands,
 ];
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
new file mode 100644
index 00000000..8e0c9d50
--- /dev/null
+++ b/src/js/composer/commands/screenCommands.js
@@ -0,0 +1,126 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+const XY_DICT_EDITOR = {
+  label: "坐标",
+  type: "dictEditor",
+  icon: "transform",
+  isCollapse: false,
+  width: 12,
+  defaultValue: {
+    x: newVarInputVal("var", "0"),
+    y: newVarInputVal("var", "0"),
+  },
+  options: {
+    fixedKeys: [
+      { value: "x", label: "X坐标" },
+      { value: "y", label: "Y坐标" },
+    ],
+    disableAdd: true,
+  },
+};
+
+const RECT_DICT_EDITOR = {
+  label: "区域",
+  type: "dictEditor",
+  icon: "transform",
+  isCollapse: false,
+  width: 12,
+  defaultValue: {
+    x: newVarInputVal("var", "0"),
+    y: newVarInputVal("var", "0"),
+    width: newVarInputVal("var", "100"),
+    height: newVarInputVal("var", "100"),
+  },
+  options: {
+    fixedKeys: [
+      { value: "x", label: "X坐标" },
+      { value: "y", label: "Y坐标" },
+      { value: "width", label: "宽度" },
+      { value: "height", label: "高度" },
+    ],
+    disableAdd: true,
+  },
+};
+
+export const screenCommands = {
+  label: "显示器",
+  icon: "screenshot_monitor",
+  commands: [
+    {
+      value: "utools.getPrimaryDisplay",
+      label: "获取显示器信息",
+      desc: "获取显示器信息",
+      icon: "monitor",
+      outputVariable: "display",
+      saveOutput: true,
+      subCommands: [
+        {
+          value: "utools.getPrimaryDisplay",
+          label: "获取主显示器",
+          icon: "monitor",
+        },
+        {
+          value: "utools.getAllDisplays",
+          label: "获取所有显示器",
+          icon: "desktop_windows",
+        },
+        {
+          value: "utools.getDisplayNearestPoint",
+          label: "获取位置所在显示器",
+          icon: "gps_fixed",
+          config: [XY_DICT_EDITOR],
+        },
+        {
+          value: "utools.getDisplayMatching",
+          label: "获取矩形所在显示器",
+          icon: "crop_square",
+          config: [RECT_DICT_EDITOR],
+        },
+      ],
+    },
+    {
+      value: "utools.screenToDipPoint",
+      label: "物理/DIP坐标转换",
+      desc: "屏幕物理坐标和 DIP 坐标转换",
+      icon: "transform",
+      outputVariable: "{x,y}",
+      saveOutput: true,
+      config: [XY_DICT_EDITOR],
+      subCommands: [
+        {
+          value: "utools.screenToDipPoint",
+          label: "物理坐标转DIP坐标",
+          icon: "transform",
+        },
+        {
+          value: "utools.dipToScreenPoint",
+          label: "DIP坐标转物理坐标",
+          icon: "transform",
+        },
+      ],
+    },
+    {
+      value: "utools.screenToDipRect",
+      label: "物理/DIP区域转换",
+      desc: "屏幕物理区域和 DIP 区域转换",
+      icon: "transform",
+      outputVariable: "{x,y,width,height}",
+      saveOutput: true,
+      config: [RECT_DICT_EDITOR],
+      subCommands: [
+        {
+          value: "utools.screenToDipRect",
+          label: "物理区域转DIP区域",
+          desc: "屏幕物理区域转 DIP 区域",
+          icon: "transform",
+        },
+        {
+          value: "utools.dipToScreenRect",
+          label: "DIP区域转物理区域",
+          desc: "DIP 区域转屏幕物理区域",
+          icon: "transform",
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index fa2a4ffd..2057ea62 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const simulateCommands = {
   label: "模拟操作",
   icon: "ads_click",
@@ -185,5 +187,89 @@ export const simulateCommands = {
       config: [],
       isAsync: true,
     },
+    {
+      value: "quickcomposer.simulate.screenColorPick",
+      label: "屏幕取色",
+      desc: "获取用户选择的颜色，会弹出一个系统取色器",
+      icon: "colorize",
+      isAsync: true,
+      outputVariable: "{hex,rgb}",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.simulate.captureScreen",
+      label: "屏幕截图",
+      desc: "屏幕截图，进行区域截图或全屏截图",
+      icon: "screenshot_monitor",
+      isAsync: true,
+      outputVariable: "base64Data",
+      saveOutput: true,
+      config: [
+        {
+          key: "range",
+          label: "截图范围",
+          type: "buttonGroup",
+          options: [
+            {
+              label: "全屏截图",
+              value: "fullscreen",
+            },
+            {
+              label: "区域截图",
+              value: "area",
+            },
+          ],
+          defaultValue: "fullscreen",
+          width: 12,
+        },
+      ],
+      subCommands: [
+        {
+          label: "保存到dataUrl",
+          value: "quickcomposer.simulate.captureScreen",
+          icon: "link",
+        },
+        {
+          label: "保存到文件",
+          value: "quickcomposer.simulate.captureScreenToFile",
+          icon: "file_copy",
+          config: [
+            {
+              key: "path",
+              label: "截图保存路径",
+              type: "varInput",
+              defaultValue: newVarInputVal(
+                "str",
+                `${window.utools.getPath("desktop")}${
+                  utools.isWindows() ? "\\" : "/"
+                }quickcommand_screenshot.png`
+              ),
+              options: {
+                dialog: {
+                  type: "save",
+                  options: {
+                    title: "选择保存路径",
+                    properties: ["openFile", "showHiddenFiles"],
+                    filters: [
+                      {
+                        name: "PNG",
+                        extensions: ["png"],
+                      },
+                    ],
+                  },
+                },
+              },
+              icon: "description",
+              width: 12,
+            },
+          ],
+        },
+        {
+          label: "复制到剪贴板",
+          value: "quickcomposer.simulate.captureScreenToClipboard",
+          icon: "content_copy",
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 138fa21f..de2ba117 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -6,20 +6,75 @@ export const systemCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "electron.clipboard.writeText",
-      label: "将内容写入剪贴板",
-      config: [
+      value: "utools.copyText",
+      label: "写入剪贴板",
+      subCommands: [
         {
-          key: "content",
-          label: "要写入剪切板的内容",
-          type: "varInput",
+          value: "utools.copyText",
+          label: "写入文本",
           icon: "content_copy",
+          config: [
+            {
+              key: "content",
+              label: "要写入剪切板的内容",
+              type: "varInput",
+              icon: "content_copy",
+            },
+          ],
+        },
+        {
+          value: "utools.copyImage",
+          label: "写入图片",
+          icon: "image",
+          config: [
+            {
+              key: "image",
+              label: "图片路径/base64",
+              type: "varInput",
+              icon: "image",
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择图片",
+                    properties: ["openFile", "showHiddenFiles"],
+                  },
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "utools.copyFile",
+          label: "写入文件",
+          icon: "file_copy",
+          config: [
+            {
+              key: "file",
+              label: "文件路径",
+              type: "varInput",
+              icon: "file_copy",
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择文件",
+                    properties: [
+                      "openFile",
+                      "showHiddenFiles",
+                      "multiSelections",
+                    ],
+                  },
+                },
+              },
+            },
+          ],
         },
       ],
     },
     {
       value: "electron.clipboard.readText",
-      label: "获取剪贴板内容",
+      label: "读取剪贴板",
       outputVariable: "clipboardContent",
       saveOutput: true,
       subCommands: [
@@ -33,6 +88,11 @@ export const systemCommands = {
           label: "剪贴板图片",
           icon: "image",
         },
+        {
+          value: "utools.getCopyedFiles",
+          label: "剪贴板文件",
+          icon: "file_copy",
+        },
         {
           value: "electron.clipboard.readRTF",
           label: "剪贴板RTF",
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index b7cc89da..a7d0267a 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -110,6 +110,7 @@ export const utoolsCommands = {
               type: "dictEditor",
               icon: "settings",
               options: {
+                disableAdd: true,
                 fixedKeys: [
                   {
                     value: "forward",

From f9a1aefff625f3c56be8ac6f72cc98dc15c81771 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 00:07:41 +0800
Subject: [PATCH 021/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=9F=B3=E9=A2=91=E5=88=86=E7=B1=BB=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9C=97=E8=AF=BB=E6=96=87=E6=9C=AC=E3=80=81=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E9=9F=B3=E9=A2=91=E3=80=81=E5=BD=95=E5=88=B6=E9=9F=B3=E9=A2=91?=
 =?UTF-8?q?=E3=80=81=E6=92=AD=E6=94=BE=E7=B3=BB=E7=BB=9F=E9=9F=B3=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                   |   1 +
 plugin/lib/quickcomposer/audio/index.js       |   9 +
 plugin/lib/quickcomposer/audio/media.js       | 164 +++++++++++++
 plugin/lib/quickcomposer/audio/record.js      |  44 ++++
 plugin/lib/quickcomposer/audio/speech.js      |  59 +++++
 src/components/composer/common/ParamInput.vue |   2 +
 src/js/composer/commands/audioCommands.js     | 227 ++++++++++++++++++
 src/js/composer/commands/fileCommands.js      |  19 ++
 src/js/composer/commands/index.js             |   3 +
 src/js/composer/commands/systemCommands.js    |  15 +-
 10 files changed, 539 insertions(+), 4 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/audio/index.js
 create mode 100644 plugin/lib/quickcomposer/audio/media.js
 create mode 100644 plugin/lib/quickcomposer/audio/record.js
 create mode 100644 plugin/lib/quickcomposer/audio/speech.js
 create mode 100644 src/js/composer/commands/audioCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index 3c3d6508..bdc60832 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -7,6 +7,7 @@ const quickcomposer = {
   coding: require("./quickcomposer/coding"),
   math: require("./quickcomposer/math"),
   ui: require("./quickcomposer/ui"),
+  audio: require("./quickcomposer/audio"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/audio/index.js b/plugin/lib/quickcomposer/audio/index.js
new file mode 100644
index 00000000..0ddb2621
--- /dev/null
+++ b/plugin/lib/quickcomposer/audio/index.js
@@ -0,0 +1,9 @@
+const speech = require("./speech");
+const media = require("./media");
+const record = require("./record");
+
+module.exports = {
+  speech,
+  media,
+  ...record,
+};
diff --git a/plugin/lib/quickcomposer/audio/media.js b/plugin/lib/quickcomposer/audio/media.js
new file mode 100644
index 00000000..dd4c0d1c
--- /dev/null
+++ b/plugin/lib/quickcomposer/audio/media.js
@@ -0,0 +1,164 @@
+const { spawn } = require("child_process");
+const fs = require("fs");
+
+// 存储当前播放的音频实例
+let currentAudio = null;
+
+// 系统音效映射
+const SYSTEM_SOUNDS = {
+  beep: {
+    win: "Beep",
+    mac: "Ping.aiff",
+  },
+  error: {
+    win: "Asterisk",
+    mac: "Basso.aiff",
+  },
+  warning: {
+    win: "Exclamation",
+    mac: "Sosumi.aiff",
+  },
+  notification: {
+    win: "Notification",
+    mac: "Glass.aiff",
+  },
+  complete: {
+    win: "SystemAsterisk",
+    mac: "Hero.aiff",
+  },
+  click: {
+    win: "MenuCommand",
+    mac: "Tink.aiff",
+  },
+};
+
+/**
+ * 播放音频文件
+ * @param {string} file 音频文件路径
+ * @param {number} volume 音量 (0-1)
+ * @param {boolean} loop 是否循环播放
+ * @param {boolean} autoplay 是否自动播放
+ */
+async function play(file, volume = 1, loop = false, autoplay = true) {
+  // 停止当前音频
+  stop();
+
+  // 检查文件是否存在
+  if (!fs.existsSync(file)) {
+    throw new Error(`音频文件不存在: ${file}`);
+  }
+
+  // 创建新的音频实例
+  const audio = new Audio();
+  audio.src = `file://${file}`;
+  audio.volume = parseFloat(volume) || 1;
+  audio.loop = !!loop;
+
+  // 保存当前实例
+  currentAudio = audio;
+
+  // 如果设置了自动播放
+  if (autoplay !== false) {
+    audio.play();
+  }
+
+  // 返回 Promise，在播放结束时 resolve
+  return new Promise((resolve, reject) => {
+    audio.onended = () => {
+      if (!audio.loop) {
+        currentAudio = null;
+        resolve();
+      }
+    };
+    audio.onerror = (error) => {
+      currentAudio = null;
+      reject(error);
+    };
+  });
+}
+
+/**
+ * 播放系统音效
+ * @param {string} type 音效类型
+ * @param {number} volume 音量 (0-1)
+ */
+async function beep(type = "beep", volume = 1) {
+  // 在 Windows 上使用 PowerShell 播放系统音效
+  if (process.platform === "win32") {
+    const soundName = SYSTEM_SOUNDS[type]?.win || SYSTEM_SOUNDS.beep.win;
+    // 使用系统音效
+    const script = `[System.Media.SystemSounds]::${soundName}.Play()`;
+
+    return new Promise((resolve, reject) => {
+      const ps = spawn("powershell", ["-Command", script]);
+      ps.on("close", (code) => {
+        if (code === 0) resolve();
+        else reject(new Error(`PowerShell 命令执行失败，退出码: ${code}`));
+      });
+    });
+  }
+  // 在 macOS 上使用 afplay 播放系统音效
+  else if (process.platform === "darwin") {
+    const soundName = SYSTEM_SOUNDS[type]?.mac || SYSTEM_SOUNDS.beep.mac;
+    volume = parseFloat(volume) || 1;
+    return new Promise((resolve, reject) => {
+      const afplay = spawn("afplay", [
+        `/System/Library/Sounds/${soundName}`,
+        "-v",
+        volume,
+      ]);
+      afplay.on("close", (code) => {
+        if (code === 0) resolve();
+        else reject(new Error(`afplay 命令执行失败，退出码: ${code}`));
+      });
+    });
+  }
+  // 在其他平台上使用 utools.shellBeep
+  else {
+    utools.shellBeep();
+    return Promise.resolve();
+  }
+}
+
+/**
+ * 停止音频播放
+ */
+function stop() {
+  if (currentAudio) {
+    currentAudio.pause();
+    currentAudio.currentTime = 0;
+    currentAudio = null;
+  }
+}
+
+/**
+ * 分析音频文件
+ * @param {string} file 音频文件路径
+ * @returns {Promise<Object>} 音频信息
+ */
+async function analyze(file) {
+  if (!fs.existsSync(file)) {
+    throw new Error(`音频文件不存在: ${file}`);
+  }
+
+  const audio = new Audio();
+  audio.src = `file://${file}`;
+
+  return new Promise((resolve, reject) => {
+    audio.onloadedmetadata = () => {
+      resolve({
+        duration: audio.duration,
+        channels: audio.mozChannels || 2,
+        sampleRate: audio.mozSampleRate || 44100,
+      });
+    };
+    audio.onerror = reject;
+  });
+}
+
+module.exports = {
+  play,
+  beep,
+  stop,
+  analyze,
+};
diff --git a/plugin/lib/quickcomposer/audio/record.js b/plugin/lib/quickcomposer/audio/record.js
new file mode 100644
index 00000000..64ec1cb6
--- /dev/null
+++ b/plugin/lib/quickcomposer/audio/record.js
@@ -0,0 +1,44 @@
+const fs = require("fs");
+
+/**
+ * 录制音频
+ * @param {number} duration 录制时长(ms)
+ * @param {string} savePath 保存路径
+ */
+async function record(duration = 5000, savePath) {
+  const format = "audio/webm";
+
+  const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
+  const mediaRecorder = new MediaRecorder(stream, { mimeType: format });
+  const chunks = [];
+
+  return new Promise((resolve, reject) => {
+    mediaRecorder.ondataavailable = (e) => chunks.push(e.data);
+    mediaRecorder.onstop = async () => {
+      try {
+        const blob = new Blob(chunks, { type: format });
+        if (savePath) {
+          // 使用 FileReader 读取 blob 数据
+          const reader = new FileReader();
+          reader.onload = () => {
+            const buffer = Buffer.from(reader.result);
+            fs.writeFileSync(savePath, buffer);
+          };
+          reader.readAsArrayBuffer(blob);
+        }
+        stream.getTracks().forEach((track) => track.stop());
+        resolve(blob);
+      } catch (error) {
+        reject(error);
+      }
+    };
+    mediaRecorder.onerror = reject;
+
+    mediaRecorder.start();
+    setTimeout(() => mediaRecorder.stop(), duration);
+  });
+}
+
+module.exports = {
+  record,
+};
diff --git a/plugin/lib/quickcomposer/audio/speech.js b/plugin/lib/quickcomposer/audio/speech.js
new file mode 100644
index 00000000..508025bb
--- /dev/null
+++ b/plugin/lib/quickcomposer/audio/speech.js
@@ -0,0 +1,59 @@
+// 存储当前朗读实例
+let currentSpeech = null;
+
+/**
+ * 朗读文本
+ * @param {string} text 要朗读的文本
+ * @param {Object} options 朗读选项
+ * @param {number} options.rate 语速 (0.1-10)
+ * @param {number} options.pitch 音调 (0-2)
+ * @param {number} options.volume 音量 (0-1)
+ * @param {string} options.lang 语言
+ */
+async function speak(text, options = {}) {
+  // 停止当前朗读
+  stop();
+
+  // 创建新的语音合成实例
+  const speech = new window.SpeechSynthesisUtterance();
+  speech.text = text;
+  speech.rate = parseFloat(options.rate) || 1;
+  speech.pitch = parseFloat(options.pitch) || 1;
+  speech.volume = parseFloat(options.volume) || 1;
+  speech.lang = options.lang || "zh-CN";
+
+  // 保存当前实例
+  currentSpeech = speech;
+
+  // 开始朗读
+  window.speechSynthesis.speak(speech);
+
+  // 返回 Promise，在朗读结束时 resolve
+  return new Promise((resolve, reject) => {
+    speech.onend = () => {
+      currentSpeech = null;
+      resolve();
+    };
+    speech.onerror = (error) => {
+      currentSpeech = null;
+      reject(error);
+    };
+  });
+}
+
+/**
+ * 停止文本朗读
+ */
+function stop() {
+  if (window.speechSynthesis) {
+    window.speechSynthesis.cancel();
+  }
+  if (currentSpeech) {
+    currentSpeech = null;
+  }
+}
+
+module.exports = {
+  speak,
+  stop,
+};
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index 6084c646..dbcbe055 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -45,6 +45,7 @@
       <q-select
         v-else-if="config.type === 'select'"
         filled
+        dense
         emit-value
         map-options
         :model-value="values[index]"
@@ -58,6 +59,7 @@
       <q-input
         v-else-if="config.type === 'input'"
         filled
+        dense
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
         v-bind="config"
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
new file mode 100644
index 00000000..7f9a9cdd
--- /dev/null
+++ b/src/js/composer/commands/audioCommands.js
@@ -0,0 +1,227 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+// 系统音效选项
+const SYSTEM_SOUNDS = [
+  { label: "提示音", value: "beep" },
+  { label: "错误音", value: "error" },
+  { label: "警告音", value: "warning" },
+  { label: "通知音", value: "notification" },
+  { label: "完成音", value: "complete" },
+  { label: "点击音", value: "click" },
+];
+
+// 语音朗读配置
+const SPEECH_CONFIG = {
+  label: "朗读配置",
+  type: "dictEditor",
+  icon: "settings",
+  width: 12,
+  defaultValue: {
+    rate: newVarInputVal("var", "1"),
+    pitch: newVarInputVal("var", "1"),
+    volume: newVarInputVal("var", "1"),
+    lang: newVarInputVal("str", "zh-CN"),
+  },
+  options: {
+    fixedKeys: [
+      { value: "rate", label: "语速(0.1-10)" },
+      { value: "pitch", label: "音调(0-2)" },
+      { value: "volume", label: "音量(0-1)" },
+      { value: "lang", label: "语言" },
+    ],
+    disableAdd: true,
+  },
+};
+
+export const audioCommands = {
+  label: "音频操作",
+  icon: "volume_up",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.audio.speech.speak",
+      label: "文本朗读",
+      desc: "系统语音朗读",
+      icon: "record_voice_over",
+      subCommands: [
+        {
+          value: "quickcomposer.audio.speech.speak",
+          label: "朗读文本",
+          icon: "record_voice_over",
+          config: [
+            {
+              label: "朗读文本",
+              type: "varInput",
+              icon: "text_fields",
+              width: 12,
+            },
+            SPEECH_CONFIG,
+          ],
+        },
+        {
+          value: "quickcomposer.audio.speech.stop",
+          label: "停止朗读",
+          icon: "voice_over_off",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.audio.media.play",
+      label: "音频播放",
+      desc: "播放音频文件",
+      icon: "music_note",
+      subCommands: [
+        {
+          value: "quickcomposer.audio.media.play",
+          label: "播放音频",
+          icon: "play_circle",
+          config: [
+            {
+              label: "音频文件路径",
+              type: "varInput",
+              icon: "audio_file",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择音频文件",
+                    filters: [
+                      {
+                        name: "音频文件",
+                        extensions: ["mp3", "wav", "ogg", "m4a", "aac"],
+                      },
+                    ],
+                    properties: ["openFile", "showHiddenFiles"],
+                  },
+                },
+              },
+            },
+            {
+              label: "音量",
+              type: "numInput",
+              icon: "volume_up",
+              width: 4,
+              defaultValue: 1,
+              min: 0,
+              max: 1,
+              step: 0.1,
+            },
+            {
+              label: "循环播放",
+              type: "switch",
+              icon: "repeat",
+              width: 4,
+              defaultValue: false,
+            },
+            {
+              label: "自动播放",
+              type: "switch",
+              icon: "play_circle",
+              width: 4,
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.audio.media.stop",
+          label: "停止播放",
+          icon: "stop",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.audio.record",
+      label: "音频录制",
+      desc: "录制系统音频",
+      icon: "mic",
+      config: [
+        {
+          label: "录制时长(ms)",
+          type: "numInput",
+          icon: "timer",
+          width: 6,
+          defaultValue: 5000,
+          min: 1000,
+          step: 1000,
+        },
+        {
+          label: "保存路径",
+          type: "varInput",
+          icon: "save",
+          width: 6,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存录音",
+                filters: [
+                  {
+                    name: "音频文件",
+                    extensions: ["webm"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.audio.media.beep",
+      label: "系统音效",
+      desc: "播放系统内置音效",
+      icon: "notifications_active",
+      config: [
+        {
+          label: "音效类型",
+          type: "select",
+          icon: "music_note",
+          width: 6,
+          options: SYSTEM_SOUNDS,
+          defaultValue: "beep",
+        },
+        {
+          label: "音量",
+          type: "numInput",
+          icon: "volume_up",
+          width: 6,
+          defaultValue: 1,
+          min: 0,
+          max: 1,
+          step: 0.1,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.audio.media.analyze",
+      label: "音频信息",
+      desc: "分析音频文件信息",
+      icon: "analytics",
+      isAsync: true,
+      config: [
+        {
+          label: "音频文件",
+          type: "varInput",
+          icon: "audio_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择音频文件",
+                filters: [
+                  {
+                    name: "音频文件",
+                    extensions: ["mp3", "wav", "ogg", "m4a", "aac"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index a06579e7..c7c743a6 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -67,5 +67,24 @@ export const fileCommands = {
         },
       ],
     },
+    {
+      value: "utools.shellTrashItem",
+      label: "删除文件到回收站",
+      icon: "delete",
+      config: [
+        {
+          key: "path",
+          label: "文件或文件夹的绝对路径",
+          type: "varInput",
+          icon: "folder_open",
+          options: {
+            dialog: {
+              type: "open",
+              options: {},
+            },
+          },
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index bf7c44cd..a52abaa6 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -12,11 +12,14 @@ import { mathCommands } from "./mathCommands";
 import { userdataCommands } from "./userdataCommands";
 import { utoolsCommands } from "./utoolsCommand";
 import { screenCommands } from "./screenCommands";
+import { audioCommands } from "./audioCommands";
+console.log(audioCommands);
 
 export const commandCategories = [
   fileCommands,
   networkCommands,
   systemCommands,
+  audioCommands,
   notifyCommands,
   utoolsCommands,
   dataCommands,
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index de2ba117..f5ee53b5 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -371,14 +371,21 @@ export const systemCommands = {
           label: "进程ID",
           type: "numInput",
           icon: "developer_board",
-          width: 6,
+          width: 7,
         },
         {
           label: "信号",
-          type: "varInput",
+          type: "select",
           icon: "signal_cellular_alt",
-          defaultValue: newVarInputVal("str", "SIGTERM"),
-          width: 6,
+          options: [
+            { label: "正常终止 (15)", value: "SIGTERM" },
+            { label: "强制终止 (9)", value: "SIGKILL" },
+            { label: "中断进程 (2)", value: "SIGINT" },
+            { label: "退出信号 (3)", value: "SIGQUIT" },
+            { label: "挂起信号 (1)", value: "SIGHUP" },
+          ],
+          defaultValue: "SIGKILL",
+          width: 5,
         },
       ],
     },

From 4c279e8309282699ba70e2ff96a5e5960b13a334 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 01:37:38 +0800
Subject: [PATCH 022/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=86=E7=B1=BB=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8F=E3=80=81=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=E3=80=81=E8=A3=81?=
 =?UTF-8?q?=E5=89=AA=E3=80=81=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2=E3=80=81?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF=E3=80=81png2ico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                   |   1 +
 plugin/lib/quickcomposer/image/image.js       | 492 +++++++++++++++
 plugin/lib/quickcomposer/image/index.js       |   7 +
 plugin/lib/quickcomposer/image/png2icon.js    |  36 ++
 plugin/package-lock.json                      |  27 +
 plugin/package.json                           |   2 +
 .../composer/common/NumberInput.vue           |  36 +-
 src/js/composer/commands/dataCommands.js      |   6 +
 src/js/composer/commands/imageCommands.js     | 572 ++++++++++++++++++
 src/js/composer/commands/index.js             |   3 +-
 src/js/composer/commands/otherCommands.js     |   2 +
 src/js/composer/commands/simulateCommands.js  |   8 +
 src/js/composer/commands/systemCommands.js    |   2 +
 src/js/composer/commands/uiCommands.js        |   4 +
 src/js/composer/commands/utoolsCommand.js     |   2 +
 15 files changed, 1195 insertions(+), 5 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/image/image.js
 create mode 100644 plugin/lib/quickcomposer/image/index.js
 create mode 100644 plugin/lib/quickcomposer/image/png2icon.js
 create mode 100644 src/js/composer/commands/imageCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index bdc60832..c705bf8b 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -8,6 +8,7 @@ const quickcomposer = {
   math: require("./quickcomposer/math"),
   ui: require("./quickcomposer/ui"),
   audio: require("./quickcomposer/audio"),
+  image: require("./quickcomposer/image"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/image/image.js b/plugin/lib/quickcomposer/image/image.js
new file mode 100644
index 00000000..215640b5
--- /dev/null
+++ b/plugin/lib/quickcomposer/image/image.js
@@ -0,0 +1,492 @@
+const fs = require("fs");
+const exif = require("exif-reader");
+
+/**
+ * 加载图片
+ * @param {string} file 图片文件路径
+ * @returns {Promise<HTMLImageElement>} 图片元素
+ */
+async function loadImage(file) {
+  if (!fs.existsSync(file)) {
+    throw new Error(`图片文件不存在: ${file}`);
+  }
+
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.onload = () => resolve(img);
+    img.onerror = reject;
+    img.src = `file://${file}`;
+  });
+}
+
+/**
+ * 读取EXIF信息
+ * @param {string} file 图片文件路径
+ * @returns {Promise<Object>} EXIF信息
+ */
+async function readExif(file) {
+  try {
+    const buffer = fs.readFileSync(file);
+
+    // 检查是否是JPEG文件
+    if (buffer[0] !== 0xff || buffer[1] !== 0xd8) {
+      console.warn("不是JPEG文件");
+      return null;
+    }
+
+    // 查找APP1段
+    let offset = 2;
+    while (offset < buffer.length) {
+      if (buffer[offset] === 0xff && buffer[offset + 1] === 0xe1) {
+        // 获取段长度
+        const segmentLength = buffer[offset + 2] * 256 + buffer[offset + 3];
+
+        // 提取EXIF数据
+        const exifData = buffer.slice(offset + 4, offset + 2 + segmentLength);
+
+        // 检查是否是EXIF数据
+        if (exifData.slice(0, 6).toString() === "Exif\0\0") {
+          try {
+            // 提取实际的EXIF数据（跳过Exif\0\0）
+            const metadata = exif(exifData.slice(6));
+            return metadata;
+          } catch (e) {
+            console.warn("解析EXIF数据失败:", e);
+            return null;
+          }
+        }
+      }
+      offset++;
+    }
+
+    console.warn("未找到EXIF数据");
+    return null;
+  } catch (error) {
+    console.warn("读取EXIF信息失败:", error);
+    return null;
+  }
+}
+
+/**
+ * 获取图片颜色信息
+ * @param {HTMLImageElement} img 图片元素
+ * @returns {Object} 颜色信息
+ */
+function getColorInfo(img) {
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+  canvas.width = img.width;
+  canvas.height = img.height;
+  ctx.drawImage(img, 0, 0);
+
+  const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+  const data = imageData.data;
+  let r = 0,
+    g = 0,
+    b = 0,
+    a = 0;
+
+  // 计算平均颜色
+  for (let i = 0; i < data.length; i += 4) {
+    r += data[i];
+    g += data[i + 1];
+    b += data[i + 2];
+    a += data[i + 3];
+  }
+
+  const pixels = data.length / 4;
+  return {
+    averageColor: {
+      r: Math.round(r / pixels),
+      g: Math.round(g / pixels),
+      b: Math.round(b / pixels),
+      a: Math.round(a / pixels) / 255,
+    },
+    isTransparent: Math.round(a / pixels) < 255,
+    hasAlphaChannel: true, // Canvas总是包含alpha通道
+  };
+}
+
+/**
+ * 分析图片信息
+ * @param {string} file 图片文件路径
+ * @returns {Promise<Object>} 图片信息
+ */
+async function analyze(file) {
+  const img = await loadImage(file);
+  const stats = fs.statSync(file);
+  const ext = file.split(".").pop().toLowerCase();
+  const exifData = await readExif(file);
+  const colorInfo = getColorInfo(img);
+
+  // 计算图片大小的可读格式
+  const formatSize = (bytes) => {
+    if (bytes < 1024) return bytes + " B";
+    if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
+    return (bytes / (1024 * 1024)).toFixed(2) + " MB";
+  };
+
+  // 获取图片类型
+  const getImageType = (ext) => {
+    const types = {
+      jpg: "JPEG图片",
+      jpeg: "JPEG图片",
+      png: "PNG图片",
+      webp: "WebP图片",
+      gif: "GIF图片",
+      bmp: "BMP图片",
+    };
+    return types[ext] || "未知类型";
+  };
+
+  // 格式化EXIF信息
+  const formatExif = (exif) => {
+    if (!exif) return null;
+    return {
+      相机信息: {
+        制造商: exif.Image?.Make,
+        型号: exif.Image?.Model,
+        软件: exif.Image?.Software,
+        方向: exif.Image?.Orientation,
+        分辨率: {
+          X: exif.Image?.XResolution,
+          Y: exif.Image?.YResolution,
+          单位: exif.Image?.ResolutionUnit,
+        },
+      },
+      拍摄信息: {
+        拍摄时间: exif.Photo?.DateTimeOriginal,
+        曝光时间: exif.Photo?.ExposureTime,
+        光圈值: exif.Photo?.FNumber,
+        ISO感光度: exif.Photo?.ISOSpeedRatings,
+        焦距: exif.Photo?.FocalLength,
+        焦距35mm: exif.Photo?.FocalLengthIn35mmFilm,
+        闪光灯: exif.Photo?.Flash,
+        白平衡: exif.Photo?.WhiteBalance,
+        曝光程序: exif.Photo?.ExposureProgram,
+        曝光补偿: exif.Photo?.ExposureBiasValue,
+        测光模式: exif.Photo?.MeteringMode,
+        亮度值: exif.Photo?.BrightnessValue,
+        场景类型: exif.Photo?.SceneCaptureType,
+        镜头信息: {
+          制造商: exif.Photo?.LensMake,
+          型号: exif.Photo?.LensModel,
+        },
+      },
+      GPS信息: exif.GPSInfo
+        ? {
+            纬度: {
+              参考: exif.GPSInfo.GPSLatitudeRef,
+              值: exif.GPSInfo.GPSLatitude,
+            },
+            经度: {
+              参考: exif.GPSInfo.GPSLongitudeRef,
+              值: exif.GPSInfo.GPSLongitude,
+            },
+            海拔: {
+              参考: exif.GPSInfo.GPSAltitudeRef,
+              值: exif.GPSInfo.GPSAltitude,
+            },
+            时间戳: exif.GPSInfo.GPSTimeStamp,
+            日期戳: exif.GPSInfo.GPSDateStamp,
+            方向: {
+              参考: exif.GPSInfo.GPSImgDirectionRef,
+              值: exif.GPSInfo.GPSImgDirection,
+            },
+          }
+        : null,
+      缩略图信息: exif.Thumbnail
+        ? {
+            宽度: exif.Thumbnail.ImageWidth,
+            高度: exif.Thumbnail.ImageLength,
+            压缩: exif.Thumbnail.Compression,
+            方向: exif.Thumbnail.Orientation,
+            分辨率: {
+              X: exif.Thumbnail.XResolution,
+              Y: exif.Thumbnail.YResolution,
+              单位: exif.Thumbnail.ResolutionUnit,
+            },
+          }
+        : null,
+      其他信息: {
+        描述: exif.Image?.ImageDescription,
+        作者: exif.Image?.Artist,
+        版权: exif.Image?.Copyright,
+        创建时间: exif.Photo?.DateTimeDigitized,
+        修改时间: exif.Image?.DateTime,
+        色彩空间: exif.Photo?.ColorSpace,
+        图像处理: exif.Photo?.CustomRendered,
+        对比度: exif.Photo?.Contrast,
+        饱和度: exif.Photo?.Saturation,
+        锐度: exif.Photo?.Sharpness,
+      },
+    };
+  };
+
+  return {
+    // 基本信息
+    width: img.width, // 宽度(像素)
+    height: img.height, // 高度(像素)
+    aspectRatio: img.width / img.height, // 宽高比
+    resolution: img.width * img.height, // 分辨率(总像素)
+
+    // 文件信息
+    type: getImageType(ext), // 图片类型
+    format: ext.toUpperCase(), // 文件格式
+    size: formatSize(stats.size), // 文件大小
+    bytes: stats.size, // 字节数
+
+    // 时间信息
+    createTime: stats.birthtime, // 创建时间
+    modifyTime: stats.mtime, // 修改时间
+    accessTime: stats.atime, // 访问时间
+
+    // 路径信息
+    path: file, // 完整路径
+    filename: file.split("/").pop(), // 文件名
+
+    // 颜色信息
+    colorInfo: {
+      averageColor: colorInfo.averageColor, // 平均颜色
+      isTransparent: colorInfo.isTransparent, // 是否包含透明
+      hasAlphaChannel: colorInfo.hasAlphaChannel, // 是否有Alpha通道
+    },
+
+    // EXIF信息
+    exif: formatExif(exifData),
+    rawExif: exifData, // 原始EXIF数据
+
+    // 其他信息
+    naturalWidth: img.naturalWidth, // 原始宽度
+    naturalHeight: img.naturalHeight, // 原始高度
+  };
+}
+
+/**
+ * 调整图片大小
+ * @param {string} inputFile 输入文件路径
+ * @param {string} outputFile 输出文件路径
+ * @param {number} width 宽度
+ * @param {number} height 高度
+ * @param {boolean} keepAspectRatio 保持宽高比
+ * @param {number} quality 图片质量 (0-1)
+ */
+async function resize(
+  inputFile,
+  outputFile,
+  width = null,
+  height = null,
+  keepAspectRatio = true,
+  quality = 0.92
+) {
+  const img = await loadImage(inputFile);
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+
+  if (keepAspectRatio) {
+    if (width && !height) {
+      height = width * (img.height / img.width);
+    } else if (height && !width) {
+      width = height * (img.width / img.height);
+    }
+  }
+
+  canvas.width = width || img.width;
+  canvas.height = height || img.height;
+
+  // 绘制调整大小后的图片
+  ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+
+  // 获取图片数据
+  const format = outputFile.split(".").pop() || "jpeg";
+  const dataURL = canvas.toDataURL(`image/${format}`, quality);
+
+  // 保存文件
+  const base64Data = dataURL.replace(/^data:image\/\w+;base64,/, "");
+  fs.writeFileSync(outputFile, Buffer.from(base64Data, "base64"));
+}
+
+/**
+ * 旋转图片
+ * @param {string} inputFile 输入文件路径
+ * @param {string} outputFile 输出文件路径
+ * @param {number} angle 旋转角度
+ * @param {number} quality 图片质量
+ */
+async function rotate(inputFile, outputFile, angle = 90, quality = 0.92) {
+  const img = await loadImage(inputFile);
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+
+  const angleRad = (angle * Math.PI) / 180;
+  const sin = Math.abs(Math.sin(angleRad));
+  const cos = Math.abs(Math.cos(angleRad));
+
+  // 计算旋转后的画布大小
+  canvas.width = img.width * cos + img.height * sin;
+  canvas.height = img.width * sin + img.height * cos;
+
+  // 移动到画布中心并旋转
+  ctx.translate(canvas.width / 2, canvas.height / 2);
+  ctx.rotate(angleRad);
+  ctx.drawImage(img, -img.width / 2, -img.height / 2);
+
+  // 保存文件
+  const format = outputFile.split(".").pop() || "jpeg";
+  const dataURL = canvas.toDataURL(`image/${format}`, quality);
+
+  const base64Data = dataURL.replace(/^data:image\/\w+;base64,/, "");
+  fs.writeFileSync(outputFile, Buffer.from(base64Data, "base64"));
+}
+
+/**
+ * 裁剪图片
+ * @param {string} inputFile 输入文件路径
+ * @param {string} outputFile 输出文件路径
+ * @param {number} x 起始X坐标
+ * @param {number} y 起始Y坐标
+ * @param {number} width 裁剪宽度
+ * @param {number} height 裁剪高度
+ * @param {number} quality 图片质量
+ */
+async function crop(
+  inputFile,
+  outputFile,
+  x = 0,
+  y = 0,
+  width = null,
+  height = null,
+  quality = 0.92
+) {
+  const img = await loadImage(inputFile);
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+
+  width = width || img.width;
+  height = height || img.height;
+
+  canvas.width = width;
+  canvas.height = height;
+
+  // 绘制裁剪区域
+  ctx.drawImage(img, x, y, width, height, 0, 0, width, height);
+
+  // 保存文件
+  const format = outputFile.split(".").pop() || "jpeg";
+  const dataURL = canvas.toDataURL(`image/${format}`, quality);
+
+  const base64Data = dataURL.replace(/^data:image\/\w+;base64,/, "");
+  fs.writeFileSync(outputFile, Buffer.from(base64Data, "base64"));
+}
+
+/**
+ * 添加水印
+ * @param {string} inputFile 输入文件路径
+ * @param {string} outputFile 输出文件路径
+ * @param {string} text 水印文字
+ * @param {string} font 字体设置
+ * @param {string} color 文字颜色
+ * @param {string} position 位置(topLeft/topRight/bottomLeft/bottomRight/center)
+ * @param {number} margin 边距
+ * @param {number} opacity 不透明度
+ * @param {number} quality 图片质量
+ */
+async function watermark(
+  inputFile,
+  outputFile,
+  text = "水印文字",
+  font = "24px Arial",
+  color = "rgba(255, 255, 255, 0.5)",
+  position = "bottomRight",
+  margin = 20,
+  opacity = 0.5,
+  quality = 0.92
+) {
+  const img = await loadImage(inputFile);
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+
+  canvas.width = img.width;
+  canvas.height = img.height;
+
+  // 绘制原图
+  ctx.drawImage(img, 0, 0);
+
+  // 设置水印样式
+  ctx.font = font;
+  ctx.fillStyle = color;
+  ctx.globalAlpha = opacity;
+
+  const metrics = ctx.measureText(text);
+  const textWidth = metrics.width;
+  const textHeight = parseInt(ctx.font); // 近似值
+
+  // 计算水印位置
+  let x, y;
+  switch (position) {
+    case "topLeft":
+      x = margin;
+      y = margin + textHeight;
+      break;
+    case "topRight":
+      x = canvas.width - textWidth - margin;
+      y = margin + textHeight;
+      break;
+    case "bottomLeft":
+      x = margin;
+      y = canvas.height - margin;
+      break;
+    case "bottomRight":
+      x = canvas.width - textWidth - margin;
+      y = canvas.height - margin;
+      break;
+    case "center":
+    default:
+      x = (canvas.width - textWidth) / 2;
+      y = (canvas.height + textHeight) / 2;
+  }
+
+  // 绘制水印
+  ctx.fillText(text, x, y);
+
+  // 保存文件
+  const format = outputFile.split(".").pop() || "jpeg";
+  const dataURL = canvas.toDataURL(`image/${format}`, quality);
+
+  const base64Data = dataURL.replace(/^data:image\/\w+;base64,/, "");
+  fs.writeFileSync(outputFile, Buffer.from(base64Data, "base64"));
+}
+
+/**
+ * 转换图片格式
+ * @param {string} inputFile 输入文件路径
+ * @param {string} outputFile 输出文件路径
+ * @param {string} format 输出格式
+ * @param {number} quality 图片质量
+ */
+async function convert(inputFile, outputFile, format = "jpeg", quality = 0.92) {
+  const img = await loadImage(inputFile);
+  const canvas = document.createElement("canvas");
+  const ctx = canvas.getContext("2d");
+
+  canvas.width = img.width;
+  canvas.height = img.height;
+
+  // 绘制图片
+  ctx.drawImage(img, 0, 0);
+
+  // 保存为新格式
+  const dataURL = canvas.toDataURL(`image/${format}`, quality);
+
+  const base64Data = dataURL.replace(/^data:image\/\w+;base64,/, "");
+  fs.writeFileSync(outputFile, Buffer.from(base64Data, "base64"));
+}
+
+module.exports = {
+  analyze,
+  resize,
+  rotate,
+  crop,
+  watermark,
+  convert,
+};
diff --git a/plugin/lib/quickcomposer/image/index.js b/plugin/lib/quickcomposer/image/index.js
new file mode 100644
index 00000000..0cc779c9
--- /dev/null
+++ b/plugin/lib/quickcomposer/image/index.js
@@ -0,0 +1,7 @@
+const image = require("./image");
+const png2icon = require("./png2icon");
+
+module.exports = {
+  ...image,
+  ...png2icon,
+};
diff --git a/plugin/lib/quickcomposer/image/png2icon.js b/plugin/lib/quickcomposer/image/png2icon.js
new file mode 100644
index 00000000..d8f29454
--- /dev/null
+++ b/plugin/lib/quickcomposer/image/png2icon.js
@@ -0,0 +1,36 @@
+const png2icons = require("png2icons");
+const fs = require("fs");
+const path = require("path");
+
+const pngToIcon = (input, outputDir, type = "ico") => {
+  if (input instanceof Array) {
+    input.forEach((input) => {
+      pngToIcon(input, outputDir, type);
+    });
+    return;
+  }
+  let icon, outputFile, basename;
+  console.log(input);
+  if (input.startsWith("data:image/png;base64,")) {
+    input = Buffer.from(input.split(",")[1], "base64");
+    basename = new Date().getTime().toString();
+  } else {
+    basename = path.basename(input, ".png");
+    input = fs.readFileSync(input);
+  }
+  if (type == "ico") {
+    icon = png2icons.createICO(input, png2icons.BICUBIC, 0, false);
+    outputFile = path.join(outputDir, basename + ".ico");
+  } else {
+    icon = png2icons.createICNS(input, png2icons.BILINEAR, 0);
+    outputFile = path.join(outputDir, basename + ".icns");
+  }
+  if (!icon) return;
+  fs.writeFile(outputFile, icon, (err) => {
+    if (err) throw err;
+  });
+};
+
+module.exports = {
+  pngToIcon,
+};
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index fd2c2009..4aae12c5 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -7,8 +7,10 @@
             "dependencies": {
                 "axios": "^1.7.9",
                 "crypto-js": "^4.2.0",
+                "exif-reader": "^2.0.1",
                 "iconv-lite": "^0.6.3",
                 "node-forge": "^1.3.1",
+                "png2icons": "^2.0.1",
                 "ses": "^1.10.0",
                 "sm-crypto": "^0.3.13",
                 "tree-kill": "^1.2.2"
@@ -64,6 +66,12 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/exif-reader": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
+            "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g==",
+            "license": "MIT"
+        },
         "node_modules/follow-redirects": {
             "version": "1.15.9",
             "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -145,6 +153,15 @@
                 "node": ">= 6.13.0"
             }
         },
+        "node_modules/png2icons": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
+            "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA==",
+            "license": "MIT",
+            "bin": {
+                "png2icons": "png2icons-cli.js"
+            }
+        },
         "node_modules/proxy-from-env": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -222,6 +239,11 @@
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
         },
+        "exif-reader": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
+            "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g=="
+        },
         "follow-redirects": {
             "version": "1.15.9",
             "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -268,6 +290,11 @@
             "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
             "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
         },
+        "png2icons": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
+            "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA=="
+        },
         "proxy-from-env": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 620ae80f..8a1b6200 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -2,8 +2,10 @@
     "dependencies": {
         "axios": "^1.7.9",
         "crypto-js": "^4.2.0",
+        "exif-reader": "^2.0.1",
         "iconv-lite": "^0.6.3",
         "node-forge": "^1.3.1",
+        "png2icons": "^2.0.1",
         "ses": "^1.10.0",
         "sm-crypto": "^0.3.13",
         "tree-kill": "^1.2.2"
diff --git a/src/components/composer/common/NumberInput.vue b/src/components/composer/common/NumberInput.vue
index c8e070d6..c917771a 100644
--- a/src/components/composer/common/NumberInput.vue
+++ b/src/components/composer/common/NumberInput.vue
@@ -6,6 +6,8 @@
     filled
     :label="label"
     :placeholder="placeholder"
+    :max="max"
+    :min="min"
     class="number-input"
   >
     <template v-slot:prepend>
@@ -20,7 +22,7 @@
           icon="keyboard_arrow_up"
           size="xs"
           class="number-btn"
-          @click="updateNumber(100)"
+          @click="updateNumber(step)"
         />
         <q-btn
           flat
@@ -28,7 +30,7 @@
           icon="keyboard_arrow_down"
           size="xs"
           class="number-btn"
-          @click="updateNumber(-100)"
+          @click="updateNumber(-step)"
         />
       </div>
     </template>
@@ -64,6 +66,18 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    max: {
+      type: Number,
+      default: 1000000000,
+    },
+    min: {
+      type: Number,
+      default: -1000000000,
+    },
+    step: {
+      type: Number,
+      default: 1,
+    },
   },
   emits: ["update:modelValue"],
   computed: {
@@ -75,14 +89,28 @@ export default defineComponent({
         if (value === null || value === undefined || value === "") {
           this.$emit("update:modelValue", null);
         } else {
-          this.$emit("update:modelValue", value);
+          const numValue = Number(value);
+          if (numValue > this.max) {
+            this.$emit("update:modelValue", this.max);
+          } else if (numValue < this.min) {
+            this.$emit("update:modelValue", this.min);
+          } else {
+            this.$emit("update:modelValue", numValue);
+          }
         }
       },
     },
   },
   methods: {
     updateNumber(delta) {
-      this.$emit("update:modelValue", (this.localValue || 0) + delta);
+      const newValue = (this.localValue || 0) + delta;
+      if (newValue > this.max) {
+        this.$emit("update:modelValue", this.max);
+      } else if (newValue < this.min) {
+        this.$emit("update:modelValue", this.min);
+      } else {
+        this.$emit("update:modelValue", newValue);
+      }
     },
   },
 });
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index c269fd70..22597d36 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -63,6 +63,8 @@ export const dataCommands = {
           key: "start",
           label: "起始位置",
           type: "numInput",
+          min: 0,
+          step: 1,
           icon: "first_page",
           width: 3,
         },
@@ -71,6 +73,8 @@ export const dataCommands = {
           label: "结束位置",
           type: "numInput",
           icon: "last_page",
+          min: 0,
+          step: 1,
           width: 3,
         },
       ],
@@ -155,6 +159,7 @@ export const dataCommands = {
             {
               label: "起始位置",
               type: "numInput",
+              step: 1,
               icon: "first_page",
               width: 4,
             },
@@ -162,6 +167,7 @@ export const dataCommands = {
               label: "结束位置",
               type: "numInput",
               icon: "last_page",
+              step: 1,
               width: 4,
             },
           ],
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
new file mode 100644
index 00000000..18a7ace2
--- /dev/null
+++ b/src/js/composer/commands/imageCommands.js
@@ -0,0 +1,572 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+// 图片格式选项
+const IMAGE_FORMATS = [
+  { label: "JPEG", value: "jpeg" },
+  { label: "PNG", value: "png" },
+  { label: "WebP", value: "webp" },
+];
+
+// 水印位置选项
+const WATERMARK_POSITIONS = [
+  { label: "左上角", value: "topLeft" },
+  { label: "右上角", value: "topRight" },
+  { label: "左下角", value: "bottomLeft" },
+  { label: "右下角", value: "bottomRight" },
+  { label: "居中", value: "center" },
+];
+
+export const imageCommands = {
+  label: "图片操作",
+  icon: "image",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.image.analyze",
+      label: "图片信息",
+      desc: "分析图片基本信息",
+      icon: "analytics",
+      isAsync: true,
+      config: [
+        {
+          key: "file",
+          label: "图片文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.resize",
+      label: "调整大小",
+      desc: "调整图片尺寸",
+      icon: "aspect_ratio",
+      isAsync: true,
+      config: [
+        {
+          key: "inputFile",
+          label: "输入文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputFile",
+          label: "输出文件",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          key: "width",
+          label: "宽度(像素)",
+          type: "numInput",
+          icon: "compare_arrows",
+          width: 6,
+          min: 1,
+          step: 10,
+          defaultValue: "",
+        },
+        {
+          key: "height",
+          label: "高度(像素)",
+          type: "numInput",
+          icon: "height",
+          width: 6,
+          min: 1,
+          step: 10,
+          defaultValue: "",
+        },
+        {
+          key: "keepAspectRatio",
+          label: "保持宽高比",
+          type: "select",
+          icon: "aspect_ratio",
+          width: 6,
+          defaultValue: "true",
+          options: [
+            { label: "是", value: "true" },
+            { label: "否", value: "false" },
+          ],
+        },
+        {
+          key: "quality",
+          label: "图片质量(0-1)",
+          type: "numInput",
+          icon: "high_quality",
+          width: 6,
+          max: 1,
+          min: 0,
+          step: 0.05,
+          defaultValue: 0.92,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.rotate",
+      label: "旋转图片",
+      desc: "旋转图片角度",
+      icon: "rotate_right",
+      isAsync: true,
+      config: [
+        {
+          key: "inputFile",
+          label: "输入文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputFile",
+          label: "输出文件",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          key: "angle",
+          label: "旋转角度",
+          type: "numInput",
+          icon: "rotate_right",
+          width: 6,
+          step: 90,
+          defaultValue: 90,
+        },
+        {
+          key: "quality",
+          label: "图片质量(0-1)",
+          type: "numInput",
+          icon: "high_quality",
+          width: 6,
+          max: 1,
+          min: 0,
+          step: 0.05,
+          defaultValue: 0.92,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.crop",
+      label: "裁剪图片",
+      desc: "裁剪图片区域",
+      icon: "crop",
+      isAsync: true,
+      config: [
+        {
+          key: "inputFile",
+          label: "输入文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputFile",
+          label: "输出文件",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          key: "x",
+          label: "起始X坐标",
+          type: "numInput",
+          icon: "arrow_right",
+          width: 6,
+          min: 0,
+          step: 10,
+          defaultValue: 0,
+        },
+        {
+          key: "y",
+          label: "起始Y坐标",
+          type: "numInput",
+          icon: "arrow_downward",
+          width: 6,
+          min: 0,
+          step: 10,
+          defaultValue: 0,
+        },
+        {
+          key: "width",
+          label: "裁剪宽度",
+          type: "numInput",
+          icon: "compare_arrows",
+          width: 6,
+          min: 1,
+          step: 10,
+          defaultValue: "",
+        },
+        {
+          key: "height",
+          label: "裁剪高度",
+          type: "numInput",
+          icon: "height",
+          width: 6,
+          min: 1,
+          step: 10,
+          defaultValue: "",
+        },
+        {
+          key: "quality",
+          label: "图片质量(0-1)",
+          type: "numInput",
+          icon: "high_quality",
+          width: 6,
+          max: 1,
+          min: 0,
+          step: 0.05,
+          defaultValue: 0.92,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.watermark",
+      label: "添加水印",
+      desc: "添加文字水印",
+      icon: "format_color_text",
+      isAsync: true,
+      config: [
+        {
+          key: "inputFile",
+          label: "输入文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputFile",
+          label: "输出文件",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          key: "text",
+          label: "水印文字",
+          type: "varInput",
+          icon: "text_fields",
+          width: 12,
+          defaultValue: newVarInputVal("var", "水印文字"),
+        },
+        {
+          key: "font",
+          label: "字体设置",
+          type: "varInput",
+          icon: "font_download",
+          width: 6,
+          defaultValue: newVarInputVal("var", "24px Arial"),
+        },
+        {
+          key: "color",
+          label: "文字颜色",
+          type: "varInput",
+          icon: "format_color_text",
+          width: 6,
+          defaultValue: newVarInputVal("var", "rgba(255, 255, 255, 0.5)"),
+        },
+        {
+          key: "position",
+          label: "位置",
+          type: "select",
+          icon: "place",
+          width: 6,
+          defaultValue: "bottomRight",
+          options: WATERMARK_POSITIONS,
+        },
+        {
+          key: "margin",
+          label: "边距",
+          type: "numInput",
+          icon: "space_bar",
+          min: 0,
+          step: 10,
+          width: 6,
+          defaultValue: 20,
+        },
+        {
+          key: "opacity",
+          label: "不透明度(0-1)",
+          type: "numInput",
+          icon: "opacity",
+          max: 1,
+          min: 0,
+          step: 0.05,
+          width: 6,
+          defaultValue: 0.5,
+        },
+        {
+          key: "quality",
+          label: "图片质量(0-1)",
+          type: "numInput",
+          icon: "high_quality",
+          max: 1,
+          min: 0,
+          step: 0.05,
+          width: 6,
+          defaultValue: 0.92,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.convert",
+      label: "格式转换",
+      desc: "转换图片格式",
+      icon: "transform",
+      isAsync: true,
+      config: [
+        {
+          key: "inputFile",
+          label: "输入文件",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputFile",
+          label: "输出文件",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["jpg", "jpeg", "png", "webp"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          key: "format",
+          label: "输出格式",
+          type: "select",
+          icon: "transform",
+          width: 6,
+          defaultValue: "jpeg",
+          options: IMAGE_FORMATS,
+        },
+        {
+          key: "quality",
+          label: "图片质量(0-1)",
+          type: "numInput",
+          icon: "high_quality",
+          width: 6,
+          max: 1,
+          min: 0,
+          step: 0.05,
+          defaultValue: 0.92,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.image.pngToIcon",
+      label: "PNG转图标",
+      desc: "将PNG图片转换为图标",
+      icon: "transform",
+      config: [
+        {
+          key: "inputFile",
+          label: "PNG路径/Base64",
+          type: "varInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["png"],
+                  },
+                ],
+                properties: ["openFile", "multiSelections"],
+              },
+            },
+          },
+        },
+        {
+          key: "outputDir",
+          label: "输出目录",
+          type: "varInput",
+          icon: "save",
+          width: 9,
+          defaultValue: newVarInputVal("str", window.utools.getPath("desktop")),
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "选择输出目录",
+                defaultPath: ".",
+                properties: ["openDirectory"],
+              },
+            },
+          },
+        },
+        {
+          key: "type",
+          label: "输出格式",
+          type: "select",
+          icon: "transform",
+          width: 3,
+          defaultValue: "ico",
+          options: ["ico", "icns"],
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index a52abaa6..5c671197 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -13,13 +13,14 @@ import { userdataCommands } from "./userdataCommands";
 import { utoolsCommands } from "./utoolsCommand";
 import { screenCommands } from "./screenCommands";
 import { audioCommands } from "./audioCommands";
-console.log(audioCommands);
+import { imageCommands } from "./imageCommands";
 
 export const commandCategories = [
   fileCommands,
   networkCommands,
   systemCommands,
   audioCommands,
+  imageCommands,
   notifyCommands,
   utoolsCommands,
   dataCommands,
diff --git a/src/js/composer/commands/otherCommands.js b/src/js/composer/commands/otherCommands.js
index b7edf869..937b7b11 100644
--- a/src/js/composer/commands/otherCommands.js
+++ b/src/js/composer/commands/otherCommands.js
@@ -11,6 +11,8 @@ export const otherCommands = {
           key: "ms",
           label: "延迟的毫秒数",
           type: "numInput",
+          min: 0,
+          step: 100,
           icon: "schedule",
           defaultValue: 500,
         },
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 2057ea62..f5a68319 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -121,12 +121,16 @@ export const simulateCommands = {
           label: "X坐标（留空则原地点击）",
           icon: "drag_handle",
           type: "numInput",
+          min: 0,
+          step: 10,
           width: 6,
         },
         {
           label: "Y坐标（留空则原地点击）",
           icon: "drag_handle",
           type: "numInput",
+          min: 0,
+          step: 10,
           width: 6,
         },
       ],
@@ -162,6 +166,8 @@ export const simulateCommands = {
               icon: "drag_handle",
               defaultValue: 0,
               type: "numInput",
+              min: 0,
+              step: 10,
               width: 6,
             },
             {
@@ -169,6 +175,8 @@ export const simulateCommands = {
               icon: "drag_handle",
               defaultValue: 0,
               type: "numInput",
+              min: 0,
+              step: 10,
               width: 6,
             },
           ],
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index f5ee53b5..a2142017 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -370,6 +370,8 @@ export const systemCommands = {
         {
           label: "进程ID",
           type: "numInput",
+          min: 0,
+          step: 100,
           icon: "developer_board",
           width: 7,
         },
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 5619488b..0d440434 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -118,6 +118,8 @@ export const uiCommands = {
         {
           label: "显示时间(ms)",
           type: "numInput",
+          min: 0,
+          step: 100,
           width: 6,
           placeholder: "0为手动关闭，留空按文本长度调整",
         },
@@ -152,6 +154,8 @@ export const uiCommands = {
         {
           label: "宽度",
           type: "numInput",
+          min: 0,
+          step: 100,
           defaultValue: 450,
           width: 3,
           placeholder: "对话框宽度",
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index a7d0267a..42d8915a 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -26,6 +26,8 @@ export const utoolsCommands = {
           key: "height",
           label: "高度",
           type: "numInput",
+          min: 0,
+          step: 100,
           icon: "straighten",
           width: 12,
         },

From ada0d2b968e3da6cd438b1ece53f242c528da830 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 02:14:36 +0800
Subject: [PATCH 023/332] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=8B=E7=BC=A9=E8=A7=A3=E5=8E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E5=AD=A6=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E5=87=A0=E4=BD=95=E3=80=81=E4=B8=89=E8=A7=92?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E4=BD=8D=E6=8D=A2=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/file/archive.js      | 131 +++++++
 plugin/lib/quickcomposer/file/index.js        |   2 +
 plugin/lib/quickcomposer/math/basic.js        | 165 ++++++++
 plugin/lib/quickcomposer/math/conversion.js   | 198 ++++++++++
 plugin/lib/quickcomposer/math/geometry.js     |  96 +++++
 plugin/lib/quickcomposer/math/index.js        |  10 +
 plugin/lib/quickcomposer/math/random.js       |  70 +++-
 plugin/lib/quickcomposer/math/statistics.js   | 140 +++++++
 plugin/lib/quickcomposer/math/trigonometry.js | 143 +++++++
 src/js/composer/commands/fileCommands.js      |  62 +++
 src/js/composer/commands/mathCommands.js      | 366 ++++++++++++++----
 11 files changed, 1303 insertions(+), 80 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/file/archive.js
 create mode 100644 plugin/lib/quickcomposer/math/basic.js
 create mode 100644 plugin/lib/quickcomposer/math/conversion.js
 create mode 100644 plugin/lib/quickcomposer/math/geometry.js
 create mode 100644 plugin/lib/quickcomposer/math/statistics.js
 create mode 100644 plugin/lib/quickcomposer/math/trigonometry.js

diff --git a/plugin/lib/quickcomposer/file/archive.js b/plugin/lib/quickcomposer/file/archive.js
new file mode 100644
index 00000000..a4457bbc
--- /dev/null
+++ b/plugin/lib/quickcomposer/file/archive.js
@@ -0,0 +1,131 @@
+const { spawn } = require("child_process");
+const path = require("path");
+const os = require("os");
+
+/**
+ * 压缩文件和目录
+ * @param {string} operation 操作类型 (compress/extract)
+ * @param {string} format 归档格式 (zip/tar/gzip)
+ * @param {string|Array<string>} source 源文件/文件夹路径
+ * @param {string} destination 目标路径
+ * @returns {Promise<void>}
+ */
+async function archive(
+  operation = "compress",
+  format = "zip",
+  source,
+  destination
+) {
+  // 处理参数
+  const sources = Array.isArray(source) ? source : [source];
+  const isWindows = os.platform() === "win32";
+
+  // 验证必要参数
+  if (!source || !destination) {
+    throw new Error("源文件和目标路径不能为空");
+  }
+
+  return new Promise((resolve, reject) => {
+    let command, args;
+
+    if (operation === "compress") {
+      if (format === "zip") {
+        if (isWindows) {
+          // Windows使用PowerShell的Compress-Archive
+          command = "powershell.exe";
+          const sourceList = sources.map((s) => `'${s}'`).join(",");
+          args = [
+            "-NoProfile",
+            "-NonInteractive",
+            "-Command",
+            `Compress-Archive -Path ${sourceList} -DestinationPath '${destination}' -Force`,
+          ];
+        } else {
+          // Unix系统使用zip命令
+          command = "zip";
+          args = ["-r", destination, ...sources];
+        }
+      } else if (format === "tar") {
+        if (isWindows) {
+          reject(new Error("Windows系统不支持TAR格式"));
+          return;
+        }
+        command = "tar";
+        args = ["-czf", destination, ...sources];
+      } else if (format === "gzip") {
+        if (sources.length > 1) {
+          reject(new Error("GZIP格式只支持单个文件"));
+          return;
+        }
+        if (isWindows) {
+          reject(new Error("Windows系统不支持GZIP格式"));
+          return;
+        }
+        command = "gzip";
+        args = ["-c", sources[0]];
+      }
+    } else if (operation === "extract") {
+      if (format === "zip") {
+        if (isWindows) {
+          // Windows使用PowerShell的Expand-Archive
+          command = "powershell.exe";
+          args = [
+            "-NoProfile",
+            "-NonInteractive",
+            "-Command",
+            `Expand-Archive -Path '${sources[0]}' -DestinationPath '${destination}' -Force`,
+          ];
+        } else {
+          // Unix系统使用unzip命令
+          command = "unzip";
+          args = ["-o", sources[0], "-d", destination];
+        }
+      } else if (format === "tar") {
+        if (isWindows) {
+          reject(new Error("Windows系统不支持TAR格式"));
+          return;
+        }
+        command = "tar";
+        args = ["-xzf", sources[0], "-C", destination];
+      } else if (format === "gzip") {
+        if (isWindows) {
+          reject(new Error("Windows系统不支持GZIP格式"));
+          return;
+        }
+        command = "gunzip";
+        args = ["-c", sources[0]];
+      }
+    }
+
+    if (!command || !args) {
+      reject(new Error(`不支持的操作或格式: ${operation} ${format}`));
+      return;
+    }
+
+    const proc = spawn(command, args);
+
+    proc.stdout.on("data", (data) => {
+      console.log(`归档输出: ${data}`);
+    });
+
+    proc.stderr.on("data", (data) => {
+      console.error(`归档错误: ${data}`);
+    });
+
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`归档操作失败，退出码: ${code}`));
+      }
+    });
+
+    proc.on("error", (err) => {
+      reject(new Error(`执行归档命令失败: ${err.message}`));
+    });
+  });
+}
+
+module.exports = {
+  archive,
+};
diff --git a/plugin/lib/quickcomposer/file/index.js b/plugin/lib/quickcomposer/file/index.js
index 34e535d9..5a4281a2 100644
--- a/plugin/lib/quickcomposer/file/index.js
+++ b/plugin/lib/quickcomposer/file/index.js
@@ -1,5 +1,7 @@
 const operation = require("./operation");
+const archive = require("./archive");
 
 module.exports = {
   operation: operation.operation,
+  archive: archive.archive,
 };
diff --git a/plugin/lib/quickcomposer/math/basic.js b/plugin/lib/quickcomposer/math/basic.js
new file mode 100644
index 00000000..8e642cf4
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/basic.js
@@ -0,0 +1,165 @@
+/**
+ * 基本算术运算
+ * @param {string} expression 算术表达式
+ * @returns {number} 计算结果
+ */
+function evaluate(expression) {
+  // 移除所有空白字符
+  expression = expression.replace(/\s+/g, "");
+
+  // 检查表达式是否为空
+  if (!expression) {
+    throw new Error("表达式不能为空");
+  }
+
+  // 检查表达式是否包含非法字符
+  if (!/^[0-9+\-*/().]+$/.test(expression)) {
+    throw new Error("表达式包含非法字符");
+  }
+
+  // 检查括号是否匹配
+  let bracketCount = 0;
+  for (const char of expression) {
+    if (char === "(") bracketCount++;
+    if (char === ")") bracketCount--;
+    if (bracketCount < 0) {
+      throw new Error("括号不匹配");
+    }
+  }
+  if (bracketCount !== 0) {
+    throw new Error("括号不匹配");
+  }
+
+  try {
+    // 使用 Function 构造函数创建一个安全的计算环境
+    const result = new Function(`return ${expression}`)();
+
+    // 检查结果是否为有限数
+    if (!Number.isFinite(result)) {
+      throw new Error("计算结果无效");
+    }
+
+    return result;
+  } catch (error) {
+    throw new Error("表达式计算错误: " + error.message);
+  }
+}
+
+/**
+ * 计算阶乘
+ * @param {number} n 非负整数
+ * @returns {number} 阶乘结果
+ */
+function factorial(n) {
+  if (!Number.isInteger(n)) {
+    throw new Error("阶乘只能计算整数");
+  }
+  if (n < 0) {
+    throw new Error("阶乘不能计算负数");
+  }
+  if (n > 170) {
+    throw new Error("数字过大，可能导致溢出");
+  }
+
+  let result = 1;
+  for (let i = 2; i <= n; i++) {
+    result *= i;
+  }
+  return result;
+}
+
+/**
+ * 计算绝对值
+ * @param {number} x 数字
+ * @returns {number} 绝对值
+ */
+function abs(x) {
+  return Math.abs(x);
+}
+
+/**
+ * 向上取整
+ * @param {number} x 数字
+ * @returns {number} 向上取整结果
+ */
+function ceil(x) {
+  return Math.ceil(x);
+}
+
+/**
+ * 向下取整
+ * @param {number} x 数字
+ * @returns {number} 向下取整结果
+ */
+function floor(x) {
+  return Math.floor(x);
+}
+
+/**
+ * 四舍五入
+ * @param {number} x 数字
+ * @param {number} [decimals=0] 保留小数位数
+ * @returns {number} 四舍五入结果
+ */
+function round(x, decimals = 0) {
+  if (!Number.isInteger(decimals) || decimals < 0) {
+    throw new Error("小数位数必须是非负整数");
+  }
+  const factor = Math.pow(10, decimals);
+  return Math.round(x * factor) / factor;
+}
+
+/**
+ * 计算平方根
+ * @param {number} x 非负数
+ * @returns {number} 平方根
+ */
+function sqrt(x) {
+  if (x < 0) {
+    throw new Error("不能计算负数的平方根");
+  }
+  return Math.sqrt(x);
+}
+
+/**
+ * 计算幂
+ * @param {number} base 底数
+ * @param {number} exponent 指数
+ * @returns {number} 幂运算结果
+ */
+function pow(base, exponent) {
+  const result = Math.pow(base, exponent);
+  if (!Number.isFinite(result)) {
+    throw new Error("计算结果超出范围");
+  }
+  return result;
+}
+
+/**
+ * 计算对数
+ * @param {number} x 正数
+ * @param {number} [base=Math.E] 底数
+ * @returns {number} 对数值
+ */
+function log(x, base = Math.E) {
+  if (x <= 0) {
+    throw new Error("对数只能计算正数");
+  }
+  if (base <= 0 || base === 1) {
+    throw new Error("对数的底数必须是大于0且不等于1的数");
+  }
+
+  return base === Math.E ? Math.log(x) : Math.log(x) / Math.log(base);
+}
+
+module.exports = {
+  evaluate,
+  factorial,
+  abs,
+  ceil,
+  floor,
+  round,
+  sqrt,
+  pow,
+  log,
+};
diff --git a/plugin/lib/quickcomposer/math/conversion.js b/plugin/lib/quickcomposer/math/conversion.js
new file mode 100644
index 00000000..6eb00d0f
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/conversion.js
@@ -0,0 +1,198 @@
+/**
+ * 长度单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function length(value, fromUnit, toUnit) {
+  const units = {
+    mm: 0.001, // 毫米
+    cm: 0.01, // 厘米
+    dm: 0.1, // 分米
+    m: 1, // 米（基准单位）
+    km: 1000, // 千米
+    in: 0.0254, // 英寸
+    ft: 0.3048, // 英尺
+    yd: 0.9144, // 码
+    mi: 1609.344, // 英里
+  };
+
+  if (!(fromUnit in units)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in units)) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  // 先转换为米，再转换为目标单位
+  return (value * units[fromUnit]) / units[toUnit];
+}
+
+/**
+ * 重量单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function weight(value, fromUnit, toUnit) {
+  const units = {
+    mg: 0.001, // 毫克
+    g: 1, // 克（基准单位）
+    kg: 1000, // 千克
+    t: 1000000, // 吨
+    oz: 28.3495, // 盎司
+    lb: 453.592, // 磅
+  };
+
+  if (!(fromUnit in units)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in units)) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  // 先转换为克，再转换为目标单位
+  return (value * units[fromUnit]) / units[toUnit];
+}
+
+/**
+ * 面积单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function area(value, fromUnit, toUnit) {
+  const units = {
+    mm2: 0.000001, // 平方毫米
+    cm2: 0.0001, // 平方厘米
+    dm2: 0.01, // 平方分米
+    m2: 1, // 平方米（基准单位）
+    km2: 1000000, // 平方千米
+    ha: 10000, // 公顷
+    in2: 0.00064516, // 平方英寸
+    ft2: 0.092903, // 平方英尺
+    yd2: 0.836127, // 平方码
+    ac: 4046.86, // 英亩
+    mi2: 2589988.11, // 平方英里
+  };
+
+  if (!(fromUnit in units)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in units)) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  // 先转换为平方米，再转换为目标单位
+  return (value * units[fromUnit]) / units[toUnit];
+}
+
+/**
+ * 体积单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function volume(value, fromUnit, toUnit) {
+  const units = {
+    ml: 0.001, // 毫升
+    l: 1, // 升（基准单位）
+    m3: 1000, // 立方米
+    cm3: 0.001, // 立方厘米
+    mm3: 0.000001, // 立方毫米
+    gal: 3.78541, // 加仑（美制）
+    qt: 0.946353, // 夸脱（美制）
+    pt: 0.473176, // 品脱（美制）
+    cup: 0.236588, // 杯（美制）
+    floz: 0.0295735, // 液量盎司（美制）
+  };
+
+  if (!(fromUnit in units)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in units)) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  // 先转换为升，再转换为目标单位
+  return (value * units[fromUnit]) / units[toUnit];
+}
+
+/**
+ * 温度单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function temperature(value, fromUnit, toUnit) {
+  const conversions = {
+    C: {
+      F: (v) => (v * 9) / 5 + 32,
+      K: (v) => v + 273.15,
+      C: (v) => v,
+    },
+    F: {
+      C: (v) => ((v - 32) * 5) / 9,
+      K: (v) => ((v - 32) * 5) / 9 + 273.15,
+      F: (v) => v,
+    },
+    K: {
+      C: (v) => v - 273.15,
+      F: (v) => ((v - 273.15) * 9) / 5 + 32,
+      K: (v) => v,
+    },
+  };
+
+  if (!(fromUnit in conversions)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in conversions[fromUnit])) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  return conversions[fromUnit][toUnit](value);
+}
+
+/**
+ * 时间单位转换
+ * @param {number} value 数值
+ * @param {string} fromUnit 源单位
+ * @param {string} toUnit 目标单位
+ * @returns {number} 转换结果
+ */
+function time(value, fromUnit, toUnit) {
+  const units = {
+    ms: 0.001, // 毫秒
+    s: 1, // 秒（基准单位）
+    min: 60, // 分钟
+    h: 3600, // 小时
+    d: 86400, // 天
+    w: 604800, // 周
+    mo: 2592000, // 月（按30天计算）
+    y: 31536000, // 年（按365天计算）
+  };
+
+  if (!(fromUnit in units)) {
+    throw new Error(`不支持的源单位: ${fromUnit}`);
+  }
+  if (!(toUnit in units)) {
+    throw new Error(`不支持的目标单位: ${toUnit}`);
+  }
+
+  // 先转换为秒，再转换为目标单位
+  return (value * units[fromUnit]) / units[toUnit];
+}
+
+module.exports = {
+  length,
+  weight,
+  area,
+  volume,
+  temperature,
+  time,
+};
diff --git a/plugin/lib/quickcomposer/math/geometry.js b/plugin/lib/quickcomposer/math/geometry.js
new file mode 100644
index 00000000..fcfd16d1
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/geometry.js
@@ -0,0 +1,96 @@
+/**
+ * 圆形计算
+ * @param {number} radius 半径
+ * @returns {Object} 计算结果
+ */
+function circle(radius) {
+  if (radius < 0) {
+    throw new Error("半径不能为负数");
+  }
+
+  return {
+    area: Math.PI * radius * radius, // 面积
+    perimeter: 2 * Math.PI * radius, // 周长
+    diameter: 2 * radius, // 直径
+  };
+}
+
+/**
+ * 矩形计算
+ * @param {number} width 宽度
+ * @param {number} height 高度
+ * @returns {Object} 计算结果
+ */
+function rectangle(width, height) {
+  if (width < 0 || height < 0) {
+    throw new Error("长度不能为负数");
+  }
+
+  return {
+    area: width * height, // 面积
+    perimeter: 2 * (width + height), // 周长
+    diagonal: Math.sqrt(width * width + height * height), // 对角线长度
+  };
+}
+
+/**
+ * 三角形计算
+ * @param {number} a 边长a
+ * @param {number} b 边长b
+ * @param {number} c 边长c
+ * @returns {Object} 计算结果
+ */
+function triangle(a, b, c) {
+  if (a < 0 || b < 0 || c < 0) {
+    throw new Error("边长不能为负数");
+  }
+
+  // 检查三角形是否合法（任意两边之和大于第三边）
+  if (a + b <= c || b + c <= a || a + c <= b) {
+    throw new Error("不能构成三角形");
+  }
+
+  // 半周长
+  const s = (a + b + c) / 2;
+
+  // 使用海伦公式计算面积
+  const area = Math.sqrt(s * (s - a) * (s - b) * (s - c));
+
+  // 计算三个角的角度（弧度）
+  const angleA = Math.acos((b * b + c * c - a * a) / (2 * b * c));
+  const angleB = Math.acos((a * a + c * c - b * b) / (2 * a * c));
+  const angleC = Math.acos((a * a + b * b - c * c) / (2 * a * b));
+
+  // 判断三角形类型
+  const angles = [angleA, angleB, angleC].map(
+    (angle) => (angle * 180) / Math.PI
+  );
+  let type;
+  if (angles.some((angle) => Math.abs(angle - 90) < 0.000001)) {
+    type = "直角三角形";
+  } else if (angles.some((angle) => angle > 90)) {
+    type = "钝角三角形";
+  } else {
+    type = "锐角三角形";
+  }
+
+  return {
+    area, // 面积
+    perimeter: a + b + c, // 周长
+    angles: {
+      // 三个角的度数
+      A: angles[0],
+      B: angles[1],
+      C: angles[2],
+    },
+    type, // 三角形类型
+    inradius: area / s, // 内切圆半径
+    circumradius: (a * b * c) / (4 * area), // 外接圆半径
+  };
+}
+
+module.exports = {
+  circle,
+  rectangle,
+  triangle,
+};
diff --git a/plugin/lib/quickcomposer/math/index.js b/plugin/lib/quickcomposer/math/index.js
index 382c85b2..a56ef92b 100644
--- a/plugin/lib/quickcomposer/math/index.js
+++ b/plugin/lib/quickcomposer/math/index.js
@@ -1,5 +1,15 @@
+const basic = require("./basic");
+const statistics = require("./statistics");
+const geometry = require("./geometry");
+const trigonometry = require("./trigonometry");
+const conversion = require("./conversion");
 const random = require("./random");
 
 module.exports = {
+  basic,
+  statistics,
+  geometry,
+  trigonometry,
+  conversion,
   random,
 };
diff --git a/plugin/lib/quickcomposer/math/random.js b/plugin/lib/quickcomposer/math/random.js
index 0a335b6c..9f646647 100644
--- a/plugin/lib/quickcomposer/math/random.js
+++ b/plugin/lib/quickcomposer/math/random.js
@@ -1,23 +1,63 @@
-const randomInt = (start, end) => {
-  return Math.round(Math.random() * (end - start) + start);
-};
+/**
+ * 生成随机数
+ * @param {number} min 最小值
+ * @param {number} max 最大值
+ * @param {number} count 生成数量
+ * @param {number} decimals 小数位数
+ * @returns {number|number[]} 随机数或随机数数组
+ */
+function number(min = 0, max = 100, count = 1, decimals = 0) {
+  if (min >= max) {
+    throw new Error("最小值必须小于最大值");
+  }
+  if (count < 1) {
+    throw new Error("生成数量必须大于0");
+  }
+  if (decimals < 0) {
+    throw new Error("小数位数不能为负数");
+  }
+
+  const factor = Math.pow(10, decimals);
+  const generate = () => {
+    const random = Math.random() * (max - min) + min;
+    return Math.round(random * factor) / factor;
+  };
 
-const random = (isInt = false, start, end) => {
-  if (!start && !end) {
-    return isInt ? randomInt(0, 1000000) : Math.random();
+  if (count === 1) {
+    return generate();
   }
 
-  if (!end) {
-    end = Math.abs(randomInt(0, 1000000) - start);
+  return Array.from({ length: count }, generate);
+}
+
+/**
+ * 生成随机整数
+ * @param {number} min 最小值
+ * @param {number} max 最大值
+ * @param {number} count 生成数量
+ * @returns {number|number[]} 随机整数或随机整数数组
+ */
+function integer(min = 0, max = 100, count = 1) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+
+  if (min >= max) {
+    throw new Error("最小值必须小于最大值");
+  }
+  if (count < 1) {
+    throw new Error("生成数量必须大于0");
   }
 
-  if (!start) {
-    start = 0;
+  const generate = () => Math.floor(Math.random() * (max - min + 1)) + min;
+
+  if (count === 1) {
+    return generate();
   }
 
-  // 有start和end：返回区间随机数
-  const random = Math.random() * (end - start) + start;
-  return isInt ? Math.round(random) : random;
-};
+  return Array.from({ length: count }, generate);
+}
 
-module.exports = random;
+module.exports = {
+  number,
+  integer,
+};
diff --git a/plugin/lib/quickcomposer/math/statistics.js b/plugin/lib/quickcomposer/math/statistics.js
new file mode 100644
index 00000000..77435ce2
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/statistics.js
@@ -0,0 +1,140 @@
+/**
+ * 计算数组的平均值
+ * @param {number[]} numbers 数字数组
+ * @returns {number} 平均值
+ */
+function mean(numbers) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+  return numbers.reduce((sum, num) => sum + num, 0) / numbers.length;
+}
+
+/**
+ * 计算数组的中位数
+ * @param {number[]} numbers 数字数组
+ * @returns {number} 中位数
+ */
+function median(numbers) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+
+  const sorted = [...numbers].sort((a, b) => a - b);
+  const mid = Math.floor(sorted.length / 2);
+
+  if (sorted.length % 2 === 0) {
+    return (sorted[mid - 1] + sorted[mid]) / 2;
+  }
+  return sorted[mid];
+}
+
+/**
+ * 计算数组的众数
+ * @param {number[]} numbers 数字数组
+ * @returns {number[]} 众数数组（可能有多个）
+ */
+function mode(numbers) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+
+  const frequency = new Map();
+  let maxFreq = 0;
+
+  // 计算每个数字出现的频率
+  for (const num of numbers) {
+    const freq = (frequency.get(num) || 0) + 1;
+    frequency.set(num, freq);
+    maxFreq = Math.max(maxFreq, freq);
+  }
+
+  // 找出所有出现频率最高的数字
+  return Array.from(frequency.entries())
+    .filter(([_, freq]) => freq === maxFreq)
+    .map(([num]) => num)
+    .sort((a, b) => a - b);
+}
+
+/**
+ * 计算数组的方差
+ * @param {number[]} numbers 数字数组
+ * @param {boolean} [population=true] 是否为总体方差
+ * @returns {number} 方差
+ */
+function variance(numbers, population = true) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+
+  const avg = mean(numbers);
+  const squaredDiffs = numbers.map((num) => Math.pow(num - avg, 2));
+  const divisor = population ? numbers.length : numbers.length - 1;
+
+  return squaredDiffs.reduce((sum, diff) => sum + diff, 0) / divisor;
+}
+
+/**
+ * 计算数组的标准差
+ * @param {number[]} numbers 数字数组
+ * @param {boolean} [population=true] 是否为总体标准差
+ * @returns {number} 标准差
+ */
+function standardDeviation(numbers, population = true) {
+  return Math.sqrt(variance(numbers, population));
+}
+
+/**
+ * 计算数组的范围
+ * @param {number[]} numbers 数字数组
+ * @returns {Object} 包含最小值、最大值和范围的对象
+ */
+function range(numbers) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+
+  const min = Math.min(...numbers);
+  const max = Math.max(...numbers);
+
+  return {
+    min, // 最小值
+    max, // 最大值
+    range: max - min, // 范围
+  };
+}
+
+/**
+ * 计算数组的四分位数
+ * @param {number[]} numbers 数字数组
+ * @returns {Object} 包含四分位数的对象
+ */
+function quartiles(numbers) {
+  if (!Array.isArray(numbers) || numbers.length === 0) {
+    throw new Error("输入必须是非空数组");
+  }
+
+  const sorted = [...numbers].sort((a, b) => a - b);
+  const mid = Math.floor(sorted.length / 2);
+
+  const q2 = median(sorted);
+  const q1 = median(sorted.slice(0, mid));
+  const q3 = median(sorted.slice(sorted.length % 2 ? mid + 1 : mid));
+
+  return {
+    q1, // 第一四分位数
+    q2, // 第二四分位数（中位数）
+    q3, // 第三四分位数
+    iqr: q3 - q1, // 四分位距
+  };
+}
+
+module.exports = {
+  mean,
+  median,
+  mode,
+  variance,
+  standardDeviation,
+  range,
+  quartiles,
+};
diff --git a/plugin/lib/quickcomposer/math/trigonometry.js b/plugin/lib/quickcomposer/math/trigonometry.js
new file mode 100644
index 00000000..b6b57dee
--- /dev/null
+++ b/plugin/lib/quickcomposer/math/trigonometry.js
@@ -0,0 +1,143 @@
+/**
+ * 角度转弧度
+ * @param {number} degrees 角度
+ * @returns {number} 弧度
+ */
+function degreesToRadians(degrees) {
+  return (degrees * Math.PI) / 180;
+}
+
+/**
+ * 弧度转角度
+ * @param {number} radians 弧度
+ * @returns {number} 角度
+ */
+function radiansToDegrees(radians) {
+  return (radians * 180) / Math.PI;
+}
+
+/**
+ * 正弦函数
+ * @param {number} angle 角度
+ * @param {boolean} [useRadians=false] 是否使用弧度
+ * @returns {number} 正弦值
+ */
+function sin(angle, useRadians = false) {
+  const rad = useRadians ? angle : degreesToRadians(angle);
+  return Math.sin(rad);
+}
+
+/**
+ * 余弦函数
+ * @param {number} angle 角度
+ * @param {boolean} [useRadians=false] 是否使用弧度
+ * @returns {number} 余弦值
+ */
+function cos(angle, useRadians = false) {
+  const rad = useRadians ? angle : degreesToRadians(angle);
+  return Math.cos(rad);
+}
+
+/**
+ * 正切函数
+ * @param {number} angle 角度
+ * @param {boolean} [useRadians=false] 是否使用弧度
+ * @returns {number} 正切值
+ */
+function tan(angle, useRadians = false) {
+  const rad = useRadians ? angle : degreesToRadians(angle);
+  return Math.tan(rad);
+}
+
+/**
+ * 反正弦函数
+ * @param {number} value 正弦值
+ * @param {boolean} [returnRadians=false] 是否返回弧度
+ * @returns {number} 角度或弧度
+ */
+function asin(value, returnRadians = false) {
+  if (value < -1 || value > 1) {
+    throw new Error("反正弦函数的输入值必须在 [-1, 1] 范围内");
+  }
+  const rad = Math.asin(value);
+  return returnRadians ? rad : radiansToDegrees(rad);
+}
+
+/**
+ * 反余弦函数
+ * @param {number} value 余弦值
+ * @param {boolean} [returnRadians=false] 是否返回弧度
+ * @returns {number} 角度或弧度
+ */
+function acos(value, returnRadians = false) {
+  if (value < -1 || value > 1) {
+    throw new Error("反余弦函数的输入值必须在 [-1, 1] 范围内");
+  }
+  const rad = Math.acos(value);
+  return returnRadians ? rad : radiansToDegrees(rad);
+}
+
+/**
+ * 反正切函数
+ * @param {number} value 正切值
+ * @param {boolean} [returnRadians=false] 是否返回弧度
+ * @returns {number} 角度或弧度
+ */
+function atan(value, returnRadians = false) {
+  const rad = Math.atan(value);
+  return returnRadians ? rad : radiansToDegrees(rad);
+}
+
+/**
+ * 双参数反正切函数
+ * @param {number} y y坐标
+ * @param {number} x x坐标
+ * @param {boolean} [returnRadians=false] 是否返回弧度
+ * @returns {number} 角度或弧度
+ */
+function atan2(y, x, returnRadians = false) {
+  const rad = Math.atan2(y, x);
+  return returnRadians ? rad : radiansToDegrees(rad);
+}
+
+/**
+ * 双曲正弦函数
+ * @param {number} x 输入值
+ * @returns {number} 双曲正弦值
+ */
+function sinh(x) {
+  return Math.sinh(x);
+}
+
+/**
+ * 双曲余弦函数
+ * @param {number} x 输入值
+ * @returns {number} 双曲余弦值
+ */
+function cosh(x) {
+  return Math.cosh(x);
+}
+
+/**
+ * 双曲正切函数
+ * @param {number} x 输入值
+ * @returns {number} 双曲正切值
+ */
+function tanh(x) {
+  return Math.tanh(x);
+}
+
+module.exports = {
+  degreesToRadians,
+  radiansToDegrees,
+  sin,
+  cos,
+  tan,
+  asin,
+  acos,
+  atan,
+  atan2,
+  sinh,
+  cosh,
+  tanh,
+};
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index c7c743a6..b4a35d49 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -67,6 +67,68 @@ export const fileCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.file.archive",
+      label: "文件归档",
+      desc: "压缩和解压文件",
+      icon: "archive",
+      isAsync: true,
+      config: [
+        {
+          key: "operation",
+          label: "操作类型",
+          type: "select",
+          icon: "settings",
+          width: 6,
+          defaultValue: "compress",
+          options: [
+            { label: "压缩", value: "compress" },
+            { label: "解压", value: "extract" },
+          ],
+        },
+        {
+          key: "format",
+          label: "归档格式",
+          type: "select",
+          icon: "format_shapes",
+          width: 6,
+          defaultValue: "zip",
+          options: [
+            { label: "ZIP", value: "zip" },
+            { label: "TAR", value: "tar" },
+            { label: "GZIP", value: "gzip" },
+          ],
+        },
+        {
+          key: "source",
+          label: "源文件/文件夹",
+          type: "varInput",
+          icon: "folder_open",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                properties: ["openFile", "openDirectory", "multiSelections"],
+              },
+            },
+          },
+        },
+        {
+          key: "destination",
+          label: "目标路径",
+          type: "varInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {},
+            },
+          },
+        },
+      ],
+    },
     {
       value: "utools.shellTrashItem",
       label: "删除文件到回收站",
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 550d0a22..d5d25567 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -4,117 +4,353 @@ export const mathCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "Math.sin",
-      label: "数学计算",
-      desc: "数学函数计算",
-      icon: "calculate",
-      outputVariable: "calculatedText",
-      saveOutput: true,
+      value: "quickcomposer.math.basic.evaluate",
+      label: "基础运算",
+      desc: "基础数学运算",
+      icon: "exposure",
       config: [
         {
-          label: "要计算的数值",
-          icon: "numbers",
-          type: "numInput",
+          key: "expression",
+          label: "表达式",
+          type: "varInput",
+          icon: "functions",
+          width: 12,
         },
       ],
       subCommands: [
         {
-          label: "正弦(sin)",
-          value: "Math.sin",
-          icon: "functions",
+          value: "quickcomposer.math.basic.evaluate",
+          label: "计算表达式",
+          icon: "calculate",
         },
         {
-          label: "余弦(cos)",
-          value: "Math.cos",
-          icon: "functions",
+          value: "quickcomposer.math.basic.round",
+          label: "四舍五入",
+          icon: "exposure",
+          config: [
+            {
+              key: "decimals",
+              label: "小数位数",
+              type: "numInput",
+              icon: "pin",
+              width: 6,
+              min: 0,
+              defaultValue: 2,
+            },
+          ],
         },
         {
-          label: "正切(tan)",
-          value: "Math.tan",
-          icon: "functions",
+          value: "quickcomposer.math.basic.floor",
+          label: "向下取整",
+          icon: "arrow_downward",
         },
         {
-          label: "反正弦(asin)",
-          value: "Math.asin",
-          icon: "functions",
+          value: "quickcomposer.math.basic.ceil",
+          label: "向上取整",
+          icon: "arrow_upward",
         },
         {
-          label: "反余弦(acos)",
-          value: "Math.acos",
-          icon: "functions",
+          value: "quickcomposer.math.basic.abs",
+          label: "绝对值",
+          icon: "unfold_more",
         },
         {
-          label: "反正切(atan)",
-          value: "Math.atan",
+          value: "quickcomposer.math.basic.factorial",
+          label: "阶乘",
           icon: "functions",
         },
+      ],
+    },
+    {
+      value: "quickcomposer.math.random.number",
+      label: "随机数",
+      desc: "生成随机数",
+      icon: "casino",
+      config: [
         {
-          label: "平方根(sqrt)",
-          value: "Math.sqrt",
-          icon: "functions",
+          key: "min",
+          label: "最小值",
+          type: "numInput",
+          icon: "arrow_downward",
+          width: 6,
+          defaultValue: 0,
         },
         {
-          label: "自然对数(ln)",
-          value: "Math.log",
-          icon: "functions",
+          key: "max",
+          label: "最大值",
+          type: "numInput",
+          icon: "arrow_upward",
+          width: 6,
+          defaultValue: 100,
         },
         {
-          label: "10对数(log10)",
-          value: "Math.log10",
-          icon: "functions",
+          key: "count",
+          label: "生成数量",
+          type: "numInput",
+          icon: "format_list_numbered",
+          width: 6,
+          min: 1,
+          defaultValue: 1,
         },
         {
-          label: "绝对值(abs)",
-          value: "Math.abs",
-          icon: "functions",
+          key: "decimals",
+          label: "小数位数",
+          type: "numInput",
+          icon: "pin",
+          width: 6,
+          min: 0,
+          defaultValue: 0,
         },
+      ],
+      subCommands: [
         {
-          label: "向上取整(ceil)",
-          value: "Math.ceil",
-          icon: "functions",
+          value: "quickcomposer.math.random.number",
+          label: "随机数",
+          icon: "casino",
         },
         {
-          label: "向下取整(floor)",
-          value: "Math.floor",
-          icon: "functions",
+          value: "quickcomposer.math.random.integer",
+          label: "随机整数",
+          icon: "casino",
         },
+      ],
+    },
+    {
+      value: "quickcomposer.math.statistics",
+      label: "统计计算",
+      desc: "统计学相关计算",
+      icon: "bar_chart",
+      config: [
         {
-          label: "四舍五入(round)",
-          value: "Math.round",
-          icon: "functions",
+          key: "numbers",
+          label: "数据集合",
+          type: "varInput",
+          icon: "dataset",
+          width: 12,
+          placeholder: "用逗号分隔的数字，如: 1,2,3,4,5",
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.math.statistics.mean",
+          label: "平均值",
+          icon: "horizontal_rule",
         },
         {
-          label: "幂运算(pow)",
-          value: "Math.pow",
-          icon: "functions",
+          value: "quickcomposer.math.statistics.median",
+          label: "中位数",
+          icon: "align_vertical_center",
+        },
+        {
+          value: "quickcomposer.math.statistics.mode",
+          label: "众数",
+          icon: "stacked_bar_chart",
+        },
+        {
+          value: "quickcomposer.math.statistics.variance",
+          label: "方差",
+          icon: "analytics",
+        },
+        {
+          value: "quickcomposer.math.statistics.stddev",
+          label: "标准差",
+          icon: "ssid_chart",
+        },
+        {
+          value: "quickcomposer.math.statistics.sum",
+          label: "求和",
+          icon: "add",
+        },
+        {
+          value: "quickcomposer.math.statistics.product",
+          label: "求积",
+          icon: "close",
+        },
+        {
+          value: "quickcomposer.math.statistics.max",
+          label: "最大值",
+          icon: "keyboard_double_arrow_up",
+        },
+        {
+          value: "quickcomposer.math.statistics.min",
+          label: "最小值",
+          icon: "keyboard_double_arrow_down",
+        },
+        {
+          value: "quickcomposer.math.statistics.range",
+          label: "极差",
+          icon: "height",
         },
       ],
     },
     {
-      value: "quickcomposer.math.random",
-      label: "随机数",
-      config: [
+      value: "quickcomposer.math.geometry.circle",
+      label: "几何计算",
+      desc: "几何图形计算",
+      icon: "architecture",
+      subCommands: [
         {
-          label: "整数",
-          type: "switch",
-          defaultValue: false,
-          width: 2,
+          value: "quickcomposer.math.geometry.circle",
+          label: "圆形计算",
+          icon: "circle",
+          config: [
+            {
+              key: "radius",
+              label: "半径",
+              type: "numInput",
+              icon: "radio_button_checked",
+              width: 12,
+              min: 0,
+            },
+          ],
         },
         {
-          label: "起始值",
-          icon: "last_page",
+          value: "quickcomposer.math.geometry.rectangle",
+          label: "矩形计算",
+          icon: "rectangle",
+          config: [
+            {
+              key: "width",
+              label: "宽度",
+              type: "numInput",
+              icon: "width",
+              width: 6,
+              min: 0,
+            },
+            {
+              key: "height",
+              label: "高度",
+              type: "numInput",
+              icon: "height",
+              width: 6,
+              min: 0,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.math.geometry.triangle",
+          label: "三角形计算",
+          icon: "change_history",
+          config: [
+            {
+              key: "a",
+              label: "边长a",
+              type: "numInput",
+              icon: "straighten",
+              width: 4,
+              min: 0,
+            },
+            {
+              key: "b",
+              label: "边长b",
+              type: "numInput",
+              icon: "straighten",
+              width: 4,
+              min: 0,
+            },
+            {
+              key: "c",
+              label: "边长c",
+              type: "numInput",
+              icon: "straighten",
+              width: 4,
+              min: 0,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.math.trigonometry.sin",
+      label: "三角函数",
+      desc: "三角函数计算",
+      icon: "show_chart",
+      config: [
+        {
+          key: "angle",
+          label: "角度值",
           type: "numInput",
-          width: 5,
+          icon: "rotate_right",
+          width: 12,
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.math.trigonometry.sin",
+          label: "正弦(sin)",
+          icon: "show_chart",
+        },
+        {
+          value: "quickcomposer.math.trigonometry.cos",
+          label: "余弦(cos)",
+          icon: "show_chart",
+        },
+        {
+          value: "quickcomposer.math.trigonometry.tan",
+          label: "正切(tan)",
+          icon: "show_chart",
+        },
+        {
+          value: "quickcomposer.math.trigonometry.asin",
+          label: "反正弦(arcsin)",
+          icon: "show_chart",
+        },
+        {
+          value: "quickcomposer.math.trigonometry.acos",
+          label: "反余弦(arccos)",
+          icon: "show_chart",
         },
         {
-          label: "结束值",
-          icon: "first_page",
+          value: "quickcomposer.math.trigonometry.atan",
+          label: "反正切(arctan)",
+          icon: "show_chart",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.math.conversion.decimal",
+      label: "单位换算",
+      desc: "数学单位换算",
+      icon: "swap_horiz",
+      config: [
+        {
+          key: "value",
+          label: "数值",
           type: "numInput",
-          width: 5,
+          icon: "pin",
+          width: 12,
+        },
+        {
+          key: "from",
+          label: "从",
+          type: "select",
+          icon: "input",
+          width: 6,
+          options: [
+            { label: "十进制", value: "decimal" },
+            { label: "二进制", value: "binary" },
+            { label: "八进制", value: "octal" },
+            { label: "十六进制", value: "hex" },
+            { label: "度", value: "degrees" },
+            { label: "弧度", value: "radians" },
+          ],
+        },
+        {
+          key: "to",
+          label: "到",
+          type: "select",
+          icon: "output",
+          width: 6,
+          options: [
+            { label: "十进制", value: "decimal" },
+            { label: "二进制", value: "binary" },
+            { label: "八进制", value: "octal" },
+            { label: "十六进制", value: "hex" },
+            { label: "度", value: "degrees" },
+            { label: "弧度", value: "radians" },
+          ],
         },
       ],
-      outputVariable: "randomNumber",
-      saveOutput: true,
     },
   ],
 };

From 41b350194503b662fb519c4bb54deed44845c4c3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 12:15:04 +0800
Subject: [PATCH 024/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OptionEditor=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/audio/media.js       |  68 +++++----
 plugin/lib/quickcomposer/math/basic.js        |  79 +++++++++-
 src/components/composer/MultiParams.vue       |  26 +++-
 .../composer/common/ArrayEditor.vue           |   6 +
 .../composer/common/NumberInput.vue           |   2 +-
 .../composer/common/OptionEditor.vue          | 144 ++++++++++++++++++
 src/components/composer/common/ParamInput.vue |  85 ++---------
 .../composer/common/VariableInput.vue         |  10 +-
 src/js/composer/commands/audioCommands.js     | 131 ++++++++++------
 src/js/composer/commands/codingCommand.js     |   4 +-
 src/js/composer/commands/controlCommands.js   |  32 ++--
 src/js/composer/commands/dataCommands.js      |  89 +++++------
 src/js/composer/commands/fileCommands.js      |  16 +-
 src/js/composer/commands/imageCommands.js     |  76 ++++-----
 src/js/composer/commands/mathCommands.js      |  50 +++---
 src/js/composer/commands/networkCommands.js   |  56 +++----
 src/js/composer/commands/notifyCommands.js    |   4 +-
 src/js/composer/commands/otherCommands.js     |   2 +-
 src/js/composer/commands/screenCommands.js    |  65 +++++---
 src/js/composer/commands/simulateCommands.js  |  18 +--
 src/js/composer/commands/systemCommands.js    |  46 +++---
 src/js/composer/commands/uiCommands.js        |  39 ++---
 src/js/composer/commands/userdataCommands.js  |  10 +-
 src/js/composer/commands/utoolsCommand.js     |  79 +++++-----
 src/js/composer/commonComponentGuide.js       |   6 +-
 src/js/composer/ubrowserConfig.js             |  99 +++++++-----
 26 files changed, 764 insertions(+), 478 deletions(-)
 create mode 100644 src/components/composer/common/OptionEditor.vue

diff --git a/plugin/lib/quickcomposer/audio/media.js b/plugin/lib/quickcomposer/audio/media.js
index dd4c0d1c..bb0952cd 100644
--- a/plugin/lib/quickcomposer/audio/media.js
+++ b/plugin/lib/quickcomposer/audio/media.js
@@ -7,27 +7,27 @@ let currentAudio = null;
 // 系统音效映射
 const SYSTEM_SOUNDS = {
   beep: {
-    win: "Beep",
+    win: "Windows Ding",
     mac: "Ping.aiff",
   },
   error: {
-    win: "Asterisk",
+    win: "Windows Critical Stop",
     mac: "Basso.aiff",
   },
   warning: {
-    win: "Exclamation",
+    win: "Windows Exclamation",
     mac: "Sosumi.aiff",
   },
   notification: {
-    win: "Notification",
+    win: "Windows Notify",
     mac: "Glass.aiff",
   },
   complete: {
-    win: "SystemAsterisk",
+    win: "Windows Print complete",
     mac: "Hero.aiff",
   },
   click: {
-    win: "MenuCommand",
+    win: "Windows Navigation Start",
     mac: "Tink.aiff",
   },
 };
@@ -40,7 +40,7 @@ const SYSTEM_SOUNDS = {
  * @param {boolean} autoplay 是否自动播放
  */
 async function play(file, volume = 1, loop = false, autoplay = true) {
-  // 停止当前音频
+  // 先停止当前音频
   stop();
 
   // 检查文件是否存在
@@ -50,6 +50,8 @@ async function play(file, volume = 1, loop = false, autoplay = true) {
 
   // 创建新的音频实例
   const audio = new Audio();
+
+  // 设置音频属性
   audio.src = `file://${file}`;
   audio.volume = parseFloat(volume) || 1;
   audio.loop = !!loop;
@@ -59,22 +61,33 @@ async function play(file, volume = 1, loop = false, autoplay = true) {
 
   // 如果设置了自动播放
   if (autoplay !== false) {
-    audio.play();
+    try {
+      await audio.play();
+    } catch (error) {
+      console.warn("播放失败:", error);
+      currentAudio = null;
+      throw error;
+    }
   }
 
-  // 返回 Promise，在播放结束时 resolve
-  return new Promise((resolve, reject) => {
-    audio.onended = () => {
-      if (!audio.loop) {
-        currentAudio = null;
-        resolve();
-      }
-    };
-    audio.onerror = (error) => {
+  // 立即返回，不等待播放完成
+  return Promise.resolve();
+}
+
+/**
+ * 停止音频播放
+ */
+function stop() {
+  if (currentAudio) {
+    try {
+      currentAudio.pause();
+      currentAudio.currentTime = 0;
+    } catch (error) {
+      console.warn("停止播放时发生错误:", error);
+    } finally {
       currentAudio = null;
-      reject(error);
-    };
-  });
+    }
+  }
 }
 
 /**
@@ -86,8 +99,8 @@ async function beep(type = "beep", volume = 1) {
   // 在 Windows 上使用 PowerShell 播放系统音效
   if (process.platform === "win32") {
     const soundName = SYSTEM_SOUNDS[type]?.win || SYSTEM_SOUNDS.beep.win;
-    // 使用系统音效
-    const script = `[System.Media.SystemSounds]::${soundName}.Play()`;
+    // 使用 PowerShell 播放 Windows 系统音效
+    const script = `(New-Object System.Media.SoundPlayer "C:\\Windows\\Media\\${soundName}.wav").PlaySync()`;
 
     return new Promise((resolve, reject) => {
       const ps = spawn("powershell", ["-Command", script]);
@@ -120,17 +133,6 @@ async function beep(type = "beep", volume = 1) {
   }
 }
 
-/**
- * 停止音频播放
- */
-function stop() {
-  if (currentAudio) {
-    currentAudio.pause();
-    currentAudio.currentTime = 0;
-    currentAudio = null;
-  }
-}
-
 /**
  * 分析音频文件
  * @param {string} file 音频文件路径
diff --git a/plugin/lib/quickcomposer/math/basic.js b/plugin/lib/quickcomposer/math/basic.js
index 8e642cf4..0e933d02 100644
--- a/plugin/lib/quickcomposer/math/basic.js
+++ b/plugin/lib/quickcomposer/math/basic.js
@@ -5,7 +5,7 @@
  */
 function evaluate(expression) {
   // 移除所有空白字符
-  expression = expression.replace(/\s+/g, "");
+  expression = expression.toString().replace(/\s+/g, "");
 
   // 检查表达式是否为空
   if (!expression) {
@@ -31,20 +31,87 @@ function evaluate(expression) {
   }
 
   try {
+    // 将表达式中的数字转换为整数计算，使用固定精度
+    const scale = Math.pow(10, 15); // 使用固定的15位精度
+    const processedExpression = expression.replace(/\d*\.?\d+/g, (match) => {
+      const num = parseFloat(match);
+      return Math.round(num * scale);
+    });
+
     // 使用 Function 构造函数创建一个安全的计算环境
-    const result = new Function(`return ${expression}`)();
+    const result = new Function(`return ${processedExpression}`)();
 
     // 检查结果是否为有限数
     if (!Number.isFinite(result)) {
       throw new Error("计算结果无效");
     }
 
-    return result;
+    // 还原小数位数
+    return result / scale;
   } catch (error) {
     throw new Error("表达式计算错误: " + error.message);
   }
 }
 
+/**
+ * 处理两个数的加法，避免浮点数精度问题
+ * @param {number} a 第一个数
+ * @param {number} b 第二个数
+ * @returns {number} 计算结果
+ */
+function add(a, b) {
+  const precision = Math.max(
+    (a.toString().split(".")[1] || "").length,
+    (b.toString().split(".")[1] || "").length
+  );
+  const scale = Math.pow(10, precision);
+  return (Math.round(a * scale) + Math.round(b * scale)) / scale;
+}
+
+/**
+ * 处理两个数的减法，避免浮点数精度问题
+ * @param {number} a 第一个数
+ * @param {number} b 第二个数
+ * @returns {number} 计算结果
+ */
+function subtract(a, b) {
+  const precision = Math.max(
+    (a.toString().split(".")[1] || "").length,
+    (b.toString().split(".")[1] || "").length
+  );
+  const scale = Math.pow(10, precision);
+  return (Math.round(a * scale) - Math.round(b * scale)) / scale;
+}
+
+/**
+ * 处理两个数的乘法，避免浮点数精度问题
+ * @param {number} a 第一个数
+ * @param {number} b 第二个数
+ * @returns {number} 计算结果
+ */
+function multiply(a, b) {
+  const precision =
+    (a.toString().split(".")[1] || "").length +
+    (b.toString().split(".")[1] || "").length;
+  const scale = Math.pow(10, precision);
+  return (Math.round(a * scale) * Math.round(b * scale)) / (scale * scale);
+}
+
+/**
+ * 处理两个数的除法，避免浮点数精度问题
+ * @param {number} a 第一个数
+ * @param {number} b 第二个数
+ * @param {number} [precision=10] 精度
+ * @returns {number} 计算结果
+ */
+function divide(a, b, precision = 10) {
+  if (b === 0) {
+    throw new Error("除数不能为零");
+  }
+  const scale = Math.pow(10, precision);
+  return Math.round(a * scale) / Math.round(b * scale);
+}
+
 /**
  * 计算阶乘
  * @param {number} n 非负整数
@@ -74,7 +141,11 @@ function factorial(n) {
  * @returns {number} 绝对值
  */
 function abs(x) {
-  return Math.abs(x);
+  // 将数字转换为整数计算，使用固定精度
+  const scale = Math.pow(10, 15); // 使用固定的15位精度
+  const num = parseFloat(x.toString());
+  const result = Math.abs(Math.round(num * scale));
+  return result / scale;
 }
 
 /**
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 2eed4d24..20281f03 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -52,7 +52,7 @@ export default defineComponent({
     localConfig() {
       return [...this.commonConfig, ...this.subCommandConfig].map((item) => {
         const value =
-          item.type === "varInput"
+          item.component === "VariableInput"
             ? item.defaultValue || newVarInputVal("str")
             : // 其他类型情况复杂，不做判断，没有默认值返回undefined
               item.defaultValue;
@@ -147,15 +147,27 @@ export default defineComponent({
       if (!code) return argvs;
 
       const variableFormatPaths = [];
+
+      const addVariableFormatPath = (prefix, config) => {
+        if (config.component === "VariableInput") {
+          variableFormatPaths.push(prefix);
+        } else if (config.component === "ArrayEditor") {
+          variableFormatPaths.push(`${prefix}[*]`);
+        } else if (config.component === "DictEditor") {
+          variableFormatPaths.push(`${prefix}.**`);
+        }
+      };
+
       this.localConfig.forEach((item, index) => {
-        if (item.type === "varInput") {
-          variableFormatPaths.push(`arg${index}`);
-        } else if (item.type === "arrayEditor") {
-          variableFormatPaths.push(`arg${index}[*]`);
-        } else if (item.type === "dictEditor") {
-          variableFormatPaths.push(`arg${index}.**`);
+        if (item.component === "OptionEditor") {
+          Object.entries(item.options).forEach(([key, config]) => {
+            addVariableFormatPath(`arg${index}.${key}`, config);
+          });
+        } else {
+          addVariableFormatPath(`arg${index}`, item);
         }
       });
+
       try {
         argvs = parseFunction(code, { variableFormatPaths }).argvs;
       } catch (e) {
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index d5e27c87..a5f65c18 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -22,6 +22,7 @@
               :no-icon="true"
               :placeholder="key.placeholder"
               :options="key.options"
+              :disable-toggle-type="key.disableToggleType"
               @update:model-value="
                 (val) => updateItemKeyValue(index, key.value, val)
               "
@@ -38,6 +39,7 @@
               :options="{
                 items: options.items,
               }"
+              :disable-toggle-type="disableToggleType"
               @update:model-value="(val) => updateItemValue(index, val)"
             />
           </div>
@@ -186,6 +188,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    disableToggleType: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ["update:modelValue"],
   computed: {
diff --git a/src/components/composer/common/NumberInput.vue b/src/components/composer/common/NumberInput.vue
index c917771a..8583c769 100644
--- a/src/components/composer/common/NumberInput.vue
+++ b/src/components/composer/common/NumberInput.vue
@@ -103,7 +103,7 @@ export default defineComponent({
   },
   methods: {
     updateNumber(delta) {
-      const newValue = (this.localValue || 0) + delta;
+      const newValue = +((this.localValue || 0) + delta).toFixed(10);
       if (newValue > this.max) {
         this.$emit("update:modelValue", this.max);
       } else if (newValue < this.min) {
diff --git a/src/components/composer/common/OptionEditor.vue b/src/components/composer/common/OptionEditor.vue
new file mode 100644
index 00000000..77357a46
--- /dev/null
+++ b/src/components/composer/common/OptionEditor.vue
@@ -0,0 +1,144 @@
+<template>
+  <component
+    :is="!!label ? 'BorderLabel' : 'div'"
+    :label="label"
+    :icon="icon"
+    :model-value="isCollapse"
+  >
+    <div class="param-grid">
+      <div
+        v-for="([key, config], index) in Object.entries(options)"
+        :key="`${key}-${index}`"
+        class="grid-item"
+        :style="getColumnStyle(config.width)"
+      >
+        <component
+          :is="config.component"
+          :model-value="localObject[key]"
+          @update:model-value="updateOption(key, $event)"
+          v-bind="config"
+          filled
+          dense
+          :emit-value="config.component === 'q-select'"
+          :map-options="config.component === 'q-select'"
+        >
+          <template v-slot:prepend v-if="shouldShowQIcon(config)">
+            <q-icon :name="config.icon" />
+          </template>
+        </component>
+      </div>
+    </div>
+  </component>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import BorderLabel from "./BorderLabel.vue";
+import VariableInput from "./VariableInput.vue";
+import NumberInput from "./NumberInput.vue";
+import ArrayEditor from "./ArrayEditor.vue";
+import DictEditor from "./DictEditor.vue";
+import ButtonGroup from "./ButtonGroup.vue";
+import ControlInput from "./ControlInput.vue";
+import CheckGroup from "./CheckGroup.vue";
+
+export default defineComponent({
+  name: "OptionEditor",
+  components: {
+    BorderLabel,
+    VariableInput,
+    NumberInput,
+    ArrayEditor,
+    DictEditor,
+    ButtonGroup,
+    ControlInput,
+    CheckGroup,
+  },
+  emits: ["update:modelValue"],
+  props: {
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    modelValue: {
+      type: Object,
+      default: () => ({}),
+    },
+    options: {
+      type: Object,
+      default: () => ({}),
+    },
+    isCollapse: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    localObject() {
+      return this.modelValue;
+    },
+  },
+  methods: {
+    updateOption(key, value) {
+      this.$emit("update:modelValue", { ...this.localObject, [key]: value });
+    },
+    getColumnStyle(width = 12) {
+      if (width === "auto") {
+        return {
+          flex: "1 1 0%",
+          minWidth: "0",
+        };
+      }
+      const columnWidth = (width / 12) * 100;
+      return {
+        width: `calc(${columnWidth}% - var(--grid-gap))`,
+        flex: "0 0 auto",
+      };
+    },
+    shouldShowQIcon(config) {
+      return ["q-input", "q-select"].includes(config.component) && config.icon;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.param-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: var(--grid-gap);
+  width: 100%;
+  --grid-gap: 8px;
+}
+
+.grid-item {
+  min-width: 50px;
+  margin-bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.grid-item > * {
+  flex: 1;
+  min-width: 0;
+}
+
+/* 让开关、复选框和按钮组居中显示 */
+.grid-item > .q-toggle,
+.grid-item > .q-checkbox,
+.grid-item > .q-btn-group {
+  flex: 0 1 auto;
+}
+
+@media (max-width: 600px) {
+  .grid-item {
+    width: 100% !important;
+    flex: 1 1 100% !important;
+  }
+}
+</style>
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index dbcbe055..b733f7d7 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -6,86 +6,20 @@
       class="grid-item"
       :style="getColumnStyle(config.width)"
     >
-      <ControlInput
-        v-if="config.type === 'controlInput'"
+      <component
+        :is="config.component"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
         v-bind="config"
-      />
-      <VariableInput
-        v-else-if="config.type === 'varInput'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <NumberInput
-        v-else-if="config.type === 'numInput'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <ArrayEditor
-        v-else-if="config.type === 'arrayEditor'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <DictEditor
-        v-else-if="config.type === 'dictEditor'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <q-toggle
-        v-else-if="config.type === 'switch'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <q-select
-        v-else-if="config.type === 'select'"
         filled
         dense
-        emit-value
-        map-options
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
+        :emit-value="config.component === 'q-select'"
+        :map-options="config.component === 'q-select'"
       >
-        <template v-slot:prepend>
-          <q-icon :name="config.icon || 'code'" />
+        <template v-slot:prepend v-if="shouldShowQIcon(config)">
+          <q-icon :name="config.icon" />
         </template>
-      </q-select>
-      <q-input
-        v-else-if="config.type === 'input'"
-        filled
-        dense
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      >
-        <template v-slot:prepend>
-          <q-icon :name="config.icon || 'code'" />
-        </template>
-      </q-input>
-      <q-checkbox
-        v-else-if="config.type === 'checkbox'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <ButtonGroup
-        v-else-if="config.type === 'buttonGroup'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
-      <CheckGroup
-        v-else-if="config.type === 'checkGroup'"
-        :model-value="values[index]"
-        @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-      />
+      </component>
     </div>
   </div>
 </template>
@@ -99,6 +33,7 @@ import DictEditor from "./DictEditor.vue";
 import ButtonGroup from "./ButtonGroup.vue";
 import ControlInput from "./ControlInput.vue";
 import CheckGroup from "./CheckGroup.vue";
+import OptionEditor from "./OptionEditor.vue";
 
 /**
  * 参数输入组件
@@ -121,6 +56,7 @@ export default defineComponent({
     ButtonGroup,
     ControlInput,
     CheckGroup,
+    OptionEditor,
   },
   props: {
     configs: {
@@ -147,6 +83,9 @@ export default defineComponent({
         flex: "0 0 auto",
       };
     },
+    shouldShowQIcon(config) {
+      return ["q-input", "q-select"].includes(config.component) && config.icon;
+    },
   },
 });
 </script>
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 76513ca4..6b641042 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -30,8 +30,9 @@
       >
         <q-tooltip>{{
           isString
-            ? "当前类型是：字符串，点击切换"
-            : "当前类型是：变量、数字、表达式等，点击切换"
+            ? "当前类型是：字符串"
+            : "当前类型是：变量、数字、表达式等" +
+              (disableToggleType ? "" : "，点击切换")
         }}</q-tooltip>
       </q-btn>
       <!-- 选项下拉按钮 -->
@@ -222,6 +223,10 @@ export default defineComponent({
       type: Object,
       default: () => ({}),
     },
+    disableToggleType: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   emits: ["update:modelValue"],
@@ -308,6 +313,7 @@ export default defineComponent({
 
     // 切换类型
     toggleType() {
+      if (this.disableToggleType) return;
       this.$emit("update:modelValue", {
         ...this.modelValue,
         isString: !this.modelValue.isString,
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index 7f9a9cdd..3a5ba171 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -10,26 +10,91 @@ const SYSTEM_SOUNDS = [
   { label: "点击音", value: "click" },
 ];
 
+const LANGUAGES = [
+  { label: "中文", value: "zh-CN" },
+  { label: "英文", value: "en-US" },
+  { label: "日语", value: "ja-JP" },
+  { label: "韩语", value: "ko-KR" },
+  { label: "法语", value: "fr-FR" },
+  { label: "德语", value: "de-DE" },
+  { label: "西班牙语", value: "es-ES" },
+];
+
 // 语音朗读配置
 const SPEECH_CONFIG = {
   label: "朗读配置",
-  type: "dictEditor",
+  component: "OptionEditor",
+  icon: "settings",
+  width: 12,
+  defaultValue: {
+    rate: 0.5,
+    pitch: 1,
+    volume: 1,
+    lang: "zh-CN",
+  },
+  options: {
+    rate: {
+      label: "语速(0.1-10)",
+      component: "NumberInput",
+      min: 0,
+      max: 10,
+      step: 0.1,
+      width: 3,
+    },
+    pitch: {
+      label: "音调(0-2)",
+      component: "NumberInput",
+      min: 0,
+      max: 2,
+      step: 0.1,
+      width: 3,
+    },
+    volume: {
+      label: "音量(0-1)",
+      component: "NumberInput",
+      min: 0,
+      max: 1,
+      step: 0.1,
+      width: 3,
+    },
+    lang: {
+      label: "语言",
+      component: "q-select",
+      options: LANGUAGES,
+      width: 3,
+    },
+  },
+};
+
+const MEDIA_PLAY_CONFIG = {
+  label: "播放配置",
+  component: "OptionEditor",
   icon: "settings",
   width: 12,
   defaultValue: {
-    rate: newVarInputVal("var", "1"),
-    pitch: newVarInputVal("var", "1"),
-    volume: newVarInputVal("var", "1"),
-    lang: newVarInputVal("str", "zh-CN"),
+    volume: 1,
+    loop: false,
+    autoPlay: true,
   },
   options: {
-    fixedKeys: [
-      { value: "rate", label: "语速(0.1-10)" },
-      { value: "pitch", label: "音调(0-2)" },
-      { value: "volume", label: "音量(0-1)" },
-      { value: "lang", label: "语言" },
-    ],
-    disableAdd: true,
+    volume: {
+      label: "音量",
+      component: "NumberInput",
+      min: 0,
+      max: 1,
+      step: 0.1,
+      width: 4,
+    },
+    loop: {
+      label: "循环播放",
+      component: "q-toggle",
+      width: 4,
+    },
+    autoPlay: {
+      label: "自动播放",
+      component: "q-toggle",
+      width: 4,
+    },
   },
 };
 
@@ -51,7 +116,7 @@ export const audioCommands = {
           config: [
             {
               label: "朗读文本",
-              type: "varInput",
+              component: "VariableInput",
               icon: "text_fields",
               width: 12,
             },
@@ -70,6 +135,7 @@ export const audioCommands = {
       label: "音频播放",
       desc: "播放音频文件",
       icon: "music_note",
+      isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.audio.media.play",
@@ -78,7 +144,7 @@ export const audioCommands = {
           config: [
             {
               label: "音频文件路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "audio_file",
               width: 12,
               options: {
@@ -97,30 +163,7 @@ export const audioCommands = {
                 },
               },
             },
-            {
-              label: "音量",
-              type: "numInput",
-              icon: "volume_up",
-              width: 4,
-              defaultValue: 1,
-              min: 0,
-              max: 1,
-              step: 0.1,
-            },
-            {
-              label: "循环播放",
-              type: "switch",
-              icon: "repeat",
-              width: 4,
-              defaultValue: false,
-            },
-            {
-              label: "自动播放",
-              type: "switch",
-              icon: "play_circle",
-              width: 4,
-              defaultValue: true,
-            },
+            MEDIA_PLAY_CONFIG,
           ],
         },
         {
@@ -135,10 +178,11 @@ export const audioCommands = {
       label: "音频录制",
       desc: "录制系统音频",
       icon: "mic",
+      isAsync: true,
       config: [
         {
           label: "录制时长(ms)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "timer",
           width: 6,
           defaultValue: 5000,
@@ -147,7 +191,7 @@ export const audioCommands = {
         },
         {
           label: "保存路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 6,
           options: {
@@ -171,11 +215,12 @@ export const audioCommands = {
       value: "quickcomposer.audio.media.beep",
       label: "系统音效",
       desc: "播放系统内置音效",
+      isAsync: true,
       icon: "notifications_active",
       config: [
         {
           label: "音效类型",
-          type: "select",
+          component: "q-select",
           icon: "music_note",
           width: 6,
           options: SYSTEM_SOUNDS,
@@ -183,7 +228,7 @@ export const audioCommands = {
         },
         {
           label: "音量",
-          type: "numInput",
+          component: "NumberInput",
           icon: "volume_up",
           width: 6,
           defaultValue: 1,
@@ -202,7 +247,7 @@ export const audioCommands = {
       config: [
         {
           label: "音频文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "audio_file",
           width: 12,
           options: {
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
index f75a7820..b020706c 100644
--- a/src/js/composer/commands/codingCommand.js
+++ b/src/js/composer/commands/codingCommand.js
@@ -14,7 +14,7 @@ export const codingCommands = {
         {
           label: "要编解码的文本",
           icon: "text_fields",
-          type: "varInput",
+          component: "VariableInput",
         },
       ],
       subCommands: [
@@ -85,7 +85,7 @@ export const codingCommands = {
         {
           label: "要计算哈希的文本",
           icon: "text_fields",
-          type: "varInput",
+          component: "VariableInput",
         },
       ],
       subCommands: [
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 191f532e..e54730f9 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -17,7 +17,7 @@ export const controlCommands = {
             {
               key: "condition",
               label: "条件",
-              type: "controlInput",
+              component: "ControlInput",
               placeholder: "表达式",
               defaultValue: "true",
             },
@@ -38,7 +38,7 @@ export const controlCommands = {
             {
               key: "condition",
               label: "条件",
-              type: "controlInput",
+              component: "ControlInput",
               placeholder: "表达式",
             },
           ],
@@ -67,14 +67,14 @@ export const controlCommands = {
             {
               key: "indexVar",
               label: "变量",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "i",
               width: 3,
             },
             {
               key: "startValue",
               label: "从",
-              type: "controlInput",
+              component: "ControlInput",
               icon: "first_page",
               defaultValue: "0",
               width: 3,
@@ -82,7 +82,7 @@ export const controlCommands = {
             {
               key: "endValue",
               label: "到",
-              type: "controlInput",
+              component: "ControlInput",
               icon: "last_page",
               defaultValue: "10",
               width: 3,
@@ -90,7 +90,7 @@ export const controlCommands = {
             {
               key: "stepValue",
               label: "步进",
-              type: "controlInput",
+              component: "ControlInput",
               icon: "trending_up",
               defaultValue: "1",
               width: 3,
@@ -133,21 +133,21 @@ export const controlCommands = {
             {
               key: "itemVar",
               label: "元素",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "item",
               width: 4,
             },
             {
               key: "indexVar",
               label: "索引",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "i",
               width: 4,
             },
             {
               key: "arrayVar",
               label: "数组",
-              type: "controlInput",
+              component: "ControlInput",
               icon: "list",
               defaultValue: "array",
               width: 4,
@@ -190,21 +190,21 @@ export const controlCommands = {
             {
               key: "keyVar",
               label: "键名",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "key",
               width: 4,
             },
             {
               key: "valueVar",
               label: "值",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "value",
               width: 4,
             },
             {
               key: "objectVar",
               label: "对象",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "object",
               width: 4,
             },
@@ -245,7 +245,7 @@ export const controlCommands = {
             {
               key: "condition",
               label: "条件",
-              type: "controlInput",
+              component: "ControlInput",
               placeholder: "表达式",
               defaultValue: "true",
             },
@@ -286,7 +286,7 @@ export const controlCommands = {
             {
               key: "expression",
               label: "变量",
-              type: "controlInput",
+              component: "ControlInput",
               placeholder: "变量或表达式",
               defaultValue: "expression",
             },
@@ -301,7 +301,7 @@ export const controlCommands = {
             {
               key: "value",
               label: "值",
-              type: "controlInput",
+              component: "ControlInput",
             },
           ],
         },
@@ -340,7 +340,7 @@ export const controlCommands = {
             {
               key: "errorVar",
               label: "错误",
-              type: "controlInput",
+              component: "ControlInput",
               defaultValue: "error",
             },
           ],
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 22597d36..98922fd3 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -12,7 +12,7 @@ export const dataCommands = {
         {
           key: "text",
           label: "要反转的文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "swap_horiz",
         },
       ],
@@ -26,21 +26,21 @@ export const dataCommands = {
         {
           key: "text",
           label: "原始文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "text_fields",
           width: 4,
         },
         {
           key: "oldStr",
           label: "要替换的文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "find_replace",
           width: 4,
         },
         {
           key: "newStr",
           label: "替换为",
-          type: "varInput",
+          component: "VariableInput",
           icon: "text_fields",
           width: 4,
         },
@@ -55,14 +55,14 @@ export const dataCommands = {
         {
           key: "text",
           label: "原始文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "text_fields",
           width: 6,
         },
         {
           key: "start",
           label: "起始位置",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 1,
           icon: "first_page",
@@ -71,7 +71,7 @@ export const dataCommands = {
         {
           key: "end",
           label: "结束位置",
-          type: "numInput",
+          component: "NumberInput",
           icon: "last_page",
           min: 0,
           step: 1,
@@ -105,13 +105,13 @@ export const dataCommands = {
           config: [
             {
               label: "数据",
-              type: "varInput",
+              component: "VariableInput",
               icon: "text_fields",
               width: 9,
             },
             {
               label: "编码",
-              type: "select",
+              component: "q-select",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -135,13 +135,13 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 12,
             },
             {
               label: "编码",
-              type: "select",
+              component: "q-select",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -158,14 +158,14 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              type: "numInput",
+              component: "NumberInput",
               step: 1,
               icon: "first_page",
               width: 4,
             },
             {
               label: "结束位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "last_page",
               step: 1,
               width: 4,
@@ -179,31 +179,31 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 6,
             },
             {
               label: "要写入的字符串",
-              type: "varInput",
+              component: "VariableInput",
               icon: "edit",
               width: 6,
             },
             {
               label: "偏移量",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 4,
             },
             {
               label: "长度",
-              type: "numInput",
+              component: "NumberInput",
               icon: "straighten",
               width: 4,
             },
             {
               label: "编码",
-              type: "select",
+              component: "q-select",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -227,31 +227,31 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 6,
             },
             {
               label: "填充值",
-              type: "varInput",
+              component: "VariableInput",
               icon: "format_color_fill",
               width: 6,
             },
             {
               label: "起始位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 4,
             },
             {
               label: "结束位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "last_page",
               width: 4,
             },
             {
               label: "编码",
-              type: "select",
+              component: "q-select",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -275,31 +275,31 @@ export const dataCommands = {
           config: [
             {
               label: "源Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "content_copy",
               width: 6,
             },
             {
               label: "目标Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "save",
               width: 6,
             },
             {
               label: "目标起始位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 4,
             },
             {
               label: "源起始位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 4,
             },
             {
               label: "源结束位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "last_page",
               width: 4,
             },
@@ -312,13 +312,13 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer 1",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 6,
             },
             {
               label: "Buffer 2",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 6,
             },
@@ -331,14 +331,15 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "arrayEditor",
+              component: "ArrayEditor",
               icon: "memory",
               width: 12,
               defaultValue: [newVarInputVal("var")],
+              disableToggleType: true,
             },
             {
               label: "总长度（可选）",
-              type: "numInput",
+              component: "NumberInput",
               icon: "straighten",
               width: 12,
             },
@@ -351,19 +352,19 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 12,
             },
             {
               label: "起始位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 6,
             },
             {
               label: "结束位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "last_page",
               width: 6,
             },
@@ -376,25 +377,25 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 12,
             },
             {
               label: "要查找的值",
-              type: "varInput",
+              component: "VariableInput",
               icon: "search",
               width: 4,
             },
             {
               label: "起始位置",
-              type: "numInput",
+              component: "NumberInput",
               icon: "first_page",
               width: 4,
             },
             {
               label: "编码",
-              type: "select",
+              component: "q-select",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -418,13 +419,13 @@ export const dataCommands = {
           config: [
             {
               label: "Buffer",
-              type: "varInput",
+              component: "VariableInput",
               icon: "memory",
               width: 9,
             },
             {
               label: "字节大小",
-              type: "select",
+              component: "q-select",
               icon: "memory",
               options: [
                 { label: "16位", value: 16 },
@@ -454,21 +455,21 @@ export const dataCommands = {
       config: [
         {
           label: "要解析的 HTML",
-          type: "varInput",
+          component: "VariableInput",
           icon: "html",
           placeholder: "例如：<div>Hello, World!</div>",
           width: 12,
         },
         {
           label: "CSS选择器",
-          type: "varInput",
+          component: "VariableInput",
           icon: "css",
           placeholder: "例如：.class",
           width: 7,
         },
         {
           label: "属性",
-          type: "varInput",
+          component: "VariableInput",
           icon: "colorize",
           options: {
             items: [
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index b4a35d49..d4659f8a 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -17,7 +17,7 @@ export const fileCommands = {
         {
           key: "path",
           label: "文件、文件夹或软件的绝对路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder_open",
           options: {
             dialog: {
@@ -35,7 +35,7 @@ export const fileCommands = {
         {
           key: "path",
           label: "文件、文件夹或软件的绝对路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "location_on",
           options: {
             dialog: {
@@ -53,7 +53,7 @@ export const fileCommands = {
         {
           key: "path",
           label: "文件或软件的绝对路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder_open",
           options: {
             dialog: {
@@ -77,7 +77,7 @@ export const fileCommands = {
         {
           key: "operation",
           label: "操作类型",
-          type: "select",
+          component: "q-select",
           icon: "settings",
           width: 6,
           defaultValue: "compress",
@@ -89,7 +89,7 @@ export const fileCommands = {
         {
           key: "format",
           label: "归档格式",
-          type: "select",
+          component: "q-select",
           icon: "format_shapes",
           width: 6,
           defaultValue: "zip",
@@ -102,7 +102,7 @@ export const fileCommands = {
         {
           key: "source",
           label: "源文件/文件夹",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder_open",
           width: 12,
           options: {
@@ -117,7 +117,7 @@ export const fileCommands = {
         {
           key: "destination",
           label: "目标路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -137,7 +137,7 @@ export const fileCommands = {
         {
           key: "path",
           label: "文件或文件夹的绝对路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder_open",
           options: {
             dialog: {
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index 18a7ace2..54de9ae7 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -31,7 +31,7 @@ export const imageCommands = {
         {
           key: "file",
           label: "图片文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -62,7 +62,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "输入文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -84,7 +84,7 @@ export const imageCommands = {
         {
           key: "outputFile",
           label: "输出文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -105,7 +105,7 @@ export const imageCommands = {
         {
           key: "width",
           label: "宽度(像素)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "compare_arrows",
           width: 6,
           min: 1,
@@ -115,7 +115,7 @@ export const imageCommands = {
         {
           key: "height",
           label: "高度(像素)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "height",
           width: 6,
           min: 1,
@@ -125,7 +125,7 @@ export const imageCommands = {
         {
           key: "keepAspectRatio",
           label: "保持宽高比",
-          type: "select",
+          component: "q-select",
           icon: "aspect_ratio",
           width: 6,
           defaultValue: "true",
@@ -137,7 +137,7 @@ export const imageCommands = {
         {
           key: "quality",
           label: "图片质量(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "high_quality",
           width: 6,
           max: 1,
@@ -157,7 +157,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "输入文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -179,7 +179,7 @@ export const imageCommands = {
         {
           key: "outputFile",
           label: "输出文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -200,7 +200,7 @@ export const imageCommands = {
         {
           key: "angle",
           label: "旋转角度",
-          type: "numInput",
+          component: "NumberInput",
           icon: "rotate_right",
           width: 6,
           step: 90,
@@ -209,7 +209,7 @@ export const imageCommands = {
         {
           key: "quality",
           label: "图片质量(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "high_quality",
           width: 6,
           max: 1,
@@ -229,7 +229,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "输入文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -251,7 +251,7 @@ export const imageCommands = {
         {
           key: "outputFile",
           label: "输出文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -272,7 +272,7 @@ export const imageCommands = {
         {
           key: "x",
           label: "起始X坐标",
-          type: "numInput",
+          component: "NumberInput",
           icon: "arrow_right",
           width: 6,
           min: 0,
@@ -282,7 +282,7 @@ export const imageCommands = {
         {
           key: "y",
           label: "起始Y坐标",
-          type: "numInput",
+          component: "NumberInput",
           icon: "arrow_downward",
           width: 6,
           min: 0,
@@ -292,7 +292,7 @@ export const imageCommands = {
         {
           key: "width",
           label: "裁剪宽度",
-          type: "numInput",
+          component: "NumberInput",
           icon: "compare_arrows",
           width: 6,
           min: 1,
@@ -302,7 +302,7 @@ export const imageCommands = {
         {
           key: "height",
           label: "裁剪高度",
-          type: "numInput",
+          component: "NumberInput",
           icon: "height",
           width: 6,
           min: 1,
@@ -312,9 +312,9 @@ export const imageCommands = {
         {
           key: "quality",
           label: "图片质量(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "high_quality",
-          width: 6,
+          width: 12,
           max: 1,
           min: 0,
           step: 0.05,
@@ -332,7 +332,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "输入文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -354,7 +354,7 @@ export const imageCommands = {
         {
           key: "outputFile",
           label: "输出文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -375,31 +375,31 @@ export const imageCommands = {
         {
           key: "text",
           label: "水印文字",
-          type: "varInput",
+          component: "VariableInput",
           icon: "text_fields",
           width: 12,
-          defaultValue: newVarInputVal("var", "水印文字"),
+          defaultValue: newVarInputVal("str", "水印文字"),
         },
         {
           key: "font",
           label: "字体设置",
-          type: "varInput",
+          component: "VariableInput",
           icon: "font_download",
           width: 6,
-          defaultValue: newVarInputVal("var", "24px Arial"),
+          defaultValue: newVarInputVal("str", "24px Arial"),
         },
         {
           key: "color",
           label: "文字颜色",
-          type: "varInput",
+          component: "VariableInput",
           icon: "format_color_text",
           width: 6,
-          defaultValue: newVarInputVal("var", "rgba(255, 255, 255, 0.5)"),
+          defaultValue: newVarInputVal("str", "rgba(255, 255, 255, 0.5)"),
         },
         {
           key: "position",
           label: "位置",
-          type: "select",
+          component: "q-select",
           icon: "place",
           width: 6,
           defaultValue: "bottomRight",
@@ -408,7 +408,7 @@ export const imageCommands = {
         {
           key: "margin",
           label: "边距",
-          type: "numInput",
+          component: "NumberInput",
           icon: "space_bar",
           min: 0,
           step: 10,
@@ -418,7 +418,7 @@ export const imageCommands = {
         {
           key: "opacity",
           label: "不透明度(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "opacity",
           max: 1,
           min: 0,
@@ -429,7 +429,7 @@ export const imageCommands = {
         {
           key: "quality",
           label: "图片质量(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "high_quality",
           max: 1,
           min: 0,
@@ -449,7 +449,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "输入文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -471,7 +471,7 @@ export const imageCommands = {
         {
           key: "outputFile",
           label: "输出文件",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 12,
           options: {
@@ -492,7 +492,7 @@ export const imageCommands = {
         {
           key: "format",
           label: "输出格式",
-          type: "select",
+          component: "q-select",
           icon: "transform",
           width: 6,
           defaultValue: "jpeg",
@@ -501,7 +501,7 @@ export const imageCommands = {
         {
           key: "quality",
           label: "图片质量(0-1)",
-          type: "numInput",
+          component: "NumberInput",
           icon: "high_quality",
           width: 6,
           max: 1,
@@ -520,7 +520,7 @@ export const imageCommands = {
         {
           key: "inputFile",
           label: "PNG路径/Base64",
-          type: "varInput",
+          component: "VariableInput",
           icon: "image",
           width: 12,
           options: {
@@ -542,7 +542,7 @@ export const imageCommands = {
         {
           key: "outputDir",
           label: "输出目录",
-          type: "varInput",
+          component: "VariableInput",
           icon: "save",
           width: 9,
           defaultValue: newVarInputVal("str", window.utools.getPath("desktop")),
@@ -560,7 +560,7 @@ export const imageCommands = {
         {
           key: "type",
           label: "输出格式",
-          type: "select",
+          component: "q-select",
           icon: "transform",
           width: 3,
           defaultValue: "ico",
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index d5d25567..5a90d53a 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const mathCommands = {
   label: "数学计算",
   icon: "calculate",
@@ -12,9 +14,11 @@ export const mathCommands = {
         {
           key: "expression",
           label: "表达式",
-          type: "varInput",
+          component: "VariableInput",
           icon: "functions",
-          width: 12,
+          width: "auto",
+          defaultValue: newVarInputVal("var", ""),
+          disableToggleType: true,
         },
       ],
       subCommands: [
@@ -31,9 +35,9 @@ export const mathCommands = {
             {
               key: "decimals",
               label: "小数位数",
-              type: "numInput",
+              component: "NumberInput",
               icon: "pin",
-              width: 6,
+              width: 4,
               min: 0,
               defaultValue: 2,
             },
@@ -70,7 +74,7 @@ export const mathCommands = {
         {
           key: "min",
           label: "最小值",
-          type: "numInput",
+          component: "NumberInput",
           icon: "arrow_downward",
           width: 6,
           defaultValue: 0,
@@ -78,7 +82,7 @@ export const mathCommands = {
         {
           key: "max",
           label: "最大值",
-          type: "numInput",
+          component: "NumberInput",
           icon: "arrow_upward",
           width: 6,
           defaultValue: 100,
@@ -86,7 +90,7 @@ export const mathCommands = {
         {
           key: "count",
           label: "生成数量",
-          type: "numInput",
+          component: "NumberInput",
           icon: "format_list_numbered",
           width: 6,
           min: 1,
@@ -95,7 +99,7 @@ export const mathCommands = {
         {
           key: "decimals",
           label: "小数位数",
-          type: "numInput",
+          component: "NumberInput",
           icon: "pin",
           width: 6,
           min: 0,
@@ -116,7 +120,7 @@ export const mathCommands = {
       ],
     },
     {
-      value: "quickcomposer.math.statistics",
+      value: "quickcomposer.math.statistics.mean",
       label: "统计计算",
       desc: "统计学相关计算",
       icon: "bar_chart",
@@ -124,10 +128,12 @@ export const mathCommands = {
         {
           key: "numbers",
           label: "数据集合",
-          type: "varInput",
+          component: "VariableInput",
           icon: "dataset",
           width: 12,
-          placeholder: "用逗号分隔的数字，如: 1,2,3,4,5",
+          placeholder: "数字数组，如:[1,2,3,4,5]",
+          defaultValue: newVarInputVal("var", ""),
+          disableToggleType: true,
         },
       ],
       subCommands: [
@@ -197,7 +203,7 @@ export const mathCommands = {
             {
               key: "radius",
               label: "半径",
-              type: "numInput",
+              component: "NumberInput",
               icon: "radio_button_checked",
               width: 12,
               min: 0,
@@ -212,15 +218,15 @@ export const mathCommands = {
             {
               key: "width",
               label: "宽度",
-              type: "numInput",
-              icon: "width",
+              component: "NumberInput",
+              icon: "swap_horiz",
               width: 6,
               min: 0,
             },
             {
               key: "height",
               label: "高度",
-              type: "numInput",
+              component: "NumberInput",
               icon: "height",
               width: 6,
               min: 0,
@@ -235,7 +241,7 @@ export const mathCommands = {
             {
               key: "a",
               label: "边长a",
-              type: "numInput",
+              component: "NumberInput",
               icon: "straighten",
               width: 4,
               min: 0,
@@ -243,7 +249,7 @@ export const mathCommands = {
             {
               key: "b",
               label: "边长b",
-              type: "numInput",
+              component: "NumberInput",
               icon: "straighten",
               width: 4,
               min: 0,
@@ -251,7 +257,7 @@ export const mathCommands = {
             {
               key: "c",
               label: "边长c",
-              type: "numInput",
+              component: "NumberInput",
               icon: "straighten",
               width: 4,
               min: 0,
@@ -269,7 +275,7 @@ export const mathCommands = {
         {
           key: "angle",
           label: "角度值",
-          type: "numInput",
+          component: "NumberInput",
           icon: "rotate_right",
           width: 12,
         },
@@ -316,14 +322,14 @@ export const mathCommands = {
         {
           key: "value",
           label: "数值",
-          type: "numInput",
+          component: "NumberInput",
           icon: "pin",
           width: 12,
         },
         {
           key: "from",
           label: "从",
-          type: "select",
+          component: "q-select",
           icon: "input",
           width: 6,
           options: [
@@ -338,7 +344,7 @@ export const mathCommands = {
         {
           key: "to",
           label: "到",
-          type: "select",
+          component: "q-select",
           icon: "output",
           width: 6,
           options: [
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index 7933b393..db605a0d 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -12,7 +12,7 @@ export const networkCommands = {
         {
           key: "visit",
           label: "要访问的网址链接",
-          type: "varInput",
+          component: "VariableInput",
           icon: "language",
         },
       ],
@@ -24,7 +24,7 @@ export const networkCommands = {
         {
           key: "url",
           label: "要访问的网址链接",
-          type: "varInput",
+          component: "VariableInput",
           icon: "public",
         },
       ],
@@ -56,7 +56,7 @@ export const networkCommands = {
       config: [
         {
           label: "URL",
-          type: "varInput",
+          component: "VariableInput",
           icon: "link",
           width: "auto",
         },
@@ -75,42 +75,42 @@ export const networkCommands = {
           config: [
             {
               label: "协议",
-              type: "varInput",
+              component: "VariableInput",
               icon: "security",
               width: 6,
             },
             {
               label: "认证信息",
-              type: "varInput",
+              component: "VariableInput",
               icon: "person",
               width: 6,
             },
             {
               label: "主机名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "dns",
               width: 6,
             },
             {
               label: "端口",
-              type: "varInput",
+              component: "VariableInput",
               icon: "settings_ethernet",
               width: 6,
             },
             {
               label: "路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
             },
             {
               label: "查询字符串",
-              type: "varInput",
+              component: "VariableInput",
               icon: "search",
               width: 6,
             },
             {
               label: "锚点",
-              type: "varInput",
+              component: "VariableInput",
               icon: "tag",
               width: 6,
             },
@@ -124,7 +124,7 @@ export const networkCommands = {
           config: [
             {
               label: "查询字符串",
-              type: "varInput",
+              component: "VariableInput",
               icon: "search",
             },
           ],
@@ -137,7 +137,7 @@ export const networkCommands = {
           config: [
             {
               label: "参数",
-              type: "dictEditor",
+              component: "DictEditor",
               icon: "edit",
             },
           ],
@@ -150,7 +150,7 @@ export const networkCommands = {
           config: [
             {
               label: "路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
             },
           ],
@@ -163,7 +163,7 @@ export const networkCommands = {
           config: [
             {
               label: "主机名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "dns",
             },
           ],
@@ -175,7 +175,7 @@ export const networkCommands = {
           config: [
             {
               label: "参数名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "key",
               width: "auto",
             },
@@ -188,13 +188,13 @@ export const networkCommands = {
           config: [
             {
               label: "参数名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "key",
               width: "auto",
             },
             {
               label: "参数值",
-              type: "varInput",
+              component: "VariableInput",
               icon: "text_fields",
               width: "auto",
             },
@@ -207,7 +207,7 @@ export const networkCommands = {
           config: [
             {
               label: "参数名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "key",
               width: "auto",
             },
@@ -235,7 +235,7 @@ export const networkCommands = {
         {
           label: "要查询的域名",
           icon: "dns",
-          type: "varInput",
+          component: "VariableInput",
           width: "auto",
         },
       ],
@@ -248,7 +248,7 @@ export const networkCommands = {
             {
               label: "IP版本",
               icon: "settings_ethernet",
-              type: "select",
+              component: "q-select",
               options: [
                 { label: "自动", value: 0 },
                 { label: "IPv4", value: 4 },
@@ -259,7 +259,7 @@ export const networkCommands = {
             },
             {
               label: "返回所有地址",
-              type: "checkbox",
+              component: "q-checkbox",
               defaultValue: false,
               width: 2.5,
             },
@@ -309,7 +309,7 @@ export const networkCommands = {
             {
               label: "IP地址",
               icon: "router",
-              type: "varInput",
+              component: "VariableInput",
             },
           ],
         },
@@ -324,14 +324,14 @@ export const networkCommands = {
       config: [
         {
           label: "文件URL",
-          type: "varInput",
+          component: "VariableInput",
           icon: "link",
           defaultValue: newVarInputVal("str", "https://"),
           width: 12,
         },
         {
           label: "保存路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder",
           width: 12,
           placeholder: "留空则弹出对话框选择保存路径",
@@ -347,28 +347,28 @@ export const networkCommands = {
       config: [
         {
           label: "上传接口地址",
-          type: "varInput",
+          component: "VariableInput",
           icon: "link",
           defaultValue: newVarInputVal("str", "https://"),
           width: 12,
         },
         {
           label: "文件路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "file_present",
           width: 12,
           placeholder: "留空则弹出对话框选择文件",
         },
         {
           label: "文件名",
-          type: "varInput",
+          component: "VariableInput",
           icon: "text_fields",
           defaultValue: newVarInputVal("str", "file"),
           width: 12,
         },
         {
           label: "额外表单数据（可选）",
-          type: "dictEditor",
+          component: "DictEditor",
           width: 12,
         },
       ],
diff --git a/src/js/composer/commands/notifyCommands.js b/src/js/composer/commands/notifyCommands.js
index b7e4245a..817afb72 100644
--- a/src/js/composer/commands/notifyCommands.js
+++ b/src/js/composer/commands/notifyCommands.js
@@ -10,7 +10,7 @@ export const notifyCommands = {
         {
           key: "log",
           label: "要打印的消息文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "info",
         },
       ],
@@ -22,7 +22,7 @@ export const notifyCommands = {
         {
           key: "notification",
           label: "要发送的系统消息文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "message",
         },
       ],
diff --git a/src/js/composer/commands/otherCommands.js b/src/js/composer/commands/otherCommands.js
index 937b7b11..92c9e96c 100644
--- a/src/js/composer/commands/otherCommands.js
+++ b/src/js/composer/commands/otherCommands.js
@@ -10,7 +10,7 @@ export const otherCommands = {
         {
           key: "ms",
           label: "延迟的毫秒数",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 100,
           icon: "schedule",
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
index 8e0c9d50..cc1fbdca 100644
--- a/src/js/composer/commands/screenCommands.js
+++ b/src/js/composer/commands/screenCommands.js
@@ -1,44 +1,67 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
+const xy = {
+  x: {
+    label: "X坐标",
+    component: "NumberInput",
+    icon: "arrow_right",
+    width: 6,
+    min: 0,
+    step: 10,
+  },
+  y: {
+    label: "Y坐标",
+    component: "NumberInput",
+    icon: "arrow_down",
+    width: 6,
+    min: 0,
+    step: 10,
+  },
+};
 
 const XY_DICT_EDITOR = {
   label: "坐标",
-  type: "dictEditor",
+  component: "OptionEditor",
   icon: "transform",
   isCollapse: false,
   width: 12,
   defaultValue: {
-    x: newVarInputVal("var", "0"),
-    y: newVarInputVal("var", "0"),
+    x: 0,
+    y: 0,
   },
   options: {
-    fixedKeys: [
-      { value: "x", label: "X坐标" },
-      { value: "y", label: "Y坐标" },
-    ],
-    disableAdd: true,
+    ...xy,
   },
 };
 
 const RECT_DICT_EDITOR = {
   label: "区域",
-  type: "dictEditor",
+  component: "DictEditor",
   icon: "transform",
   isCollapse: false,
   width: 12,
   defaultValue: {
-    x: newVarInputVal("var", "0"),
-    y: newVarInputVal("var", "0"),
-    width: newVarInputVal("var", "100"),
-    height: newVarInputVal("var", "100"),
+    x: 0,
+    y: 0,
+    width: 100,
+    height: 100,
   },
   options: {
-    fixedKeys: [
-      { value: "x", label: "X坐标" },
-      { value: "y", label: "Y坐标" },
-      { value: "width", label: "宽度" },
-      { value: "height", label: "高度" },
-    ],
-    disableAdd: true,
+    ...xy,
+    width: {
+      label: "宽度",
+      component: "NumberInput",
+      icon: "swap_horiz",
+      min: 0,
+      step: 10,
+      width: 6,
+    },
+    height: {
+      label: "高度",
+      component: "NumberInput",
+      icon: "height",
+      min: 0,
+      step: 10,
+      width: 6,
+    },
   },
 };
 
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index f5a68319..54d72079 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -41,7 +41,7 @@ export const simulateCommands = {
         {
           key: "text",
           label: "要发送的文本内容",
-          type: "varInput",
+          component: "VariableInput",
           icon: "send",
           width: 12,
         },
@@ -72,7 +72,7 @@ export const simulateCommands = {
             {
               key: "file",
               label: "文件路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "description",
               width: 12,
               options: {
@@ -99,7 +99,7 @@ export const simulateCommands = {
             {
               key: "image",
               label: "图片路径/base64",
-              type: "varInput",
+              component: "VariableInput",
               icon: "image",
               width: 12,
               options: {
@@ -120,7 +120,7 @@ export const simulateCommands = {
         {
           label: "X坐标（留空则原地点击）",
           icon: "drag_handle",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 10,
           width: 6,
@@ -128,7 +128,7 @@ export const simulateCommands = {
         {
           label: "Y坐标（留空则原地点击）",
           icon: "drag_handle",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 10,
           width: 6,
@@ -165,7 +165,7 @@ export const simulateCommands = {
               label: "X坐标",
               icon: "drag_handle",
               defaultValue: 0,
-              type: "numInput",
+              component: "NumberInput",
               min: 0,
               step: 10,
               width: 6,
@@ -174,7 +174,7 @@ export const simulateCommands = {
               label: "Y坐标",
               icon: "drag_handle",
               defaultValue: 0,
-              type: "numInput",
+              component: "NumberInput",
               min: 0,
               step: 10,
               width: 6,
@@ -216,7 +216,7 @@ export const simulateCommands = {
         {
           key: "range",
           label: "截图范围",
-          type: "buttonGroup",
+          component: "ButtonGroup",
           options: [
             {
               label: "全屏截图",
@@ -245,7 +245,7 @@ export const simulateCommands = {
             {
               key: "path",
               label: "截图保存路径",
-              type: "varInput",
+              component: "VariableInput",
               defaultValue: newVarInputVal(
                 "str",
                 `${window.utools.getPath("desktop")}${
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index a2142017..5f5b609d 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -17,7 +17,7 @@ export const systemCommands = {
             {
               key: "content",
               label: "要写入剪切板的内容",
-              type: "varInput",
+              component: "VariableInput",
               icon: "content_copy",
             },
           ],
@@ -30,7 +30,7 @@ export const systemCommands = {
             {
               key: "image",
               label: "图片路径/base64",
-              type: "varInput",
+              component: "VariableInput",
               icon: "image",
               options: {
                 dialog: {
@@ -52,7 +52,7 @@ export const systemCommands = {
             {
               key: "file",
               label: "文件路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "file_copy",
               options: {
                 dialog: {
@@ -132,7 +132,7 @@ export const systemCommands = {
           config: [
             {
               label: "信息格式",
-              type: "buttonGroup",
+              component: "ButtonGroup",
               options: [
                 { label: "完整信息", value: "full" },
                 { label: "仅型号和速度", value: "simple" },
@@ -149,7 +149,7 @@ export const systemCommands = {
           config: [
             {
               label: "内存类型",
-              type: "buttonGroup",
+              component: "ButtonGroup",
               options: [
                 { label: "总内存", value: "totalmem" },
                 { label: "空闲内存", value: "freemem" },
@@ -166,7 +166,7 @@ export const systemCommands = {
           config: [
             {
               label: "网络信息类型",
-              type: "buttonGroup",
+              component: "ButtonGroup",
               options: [
                 { label: "主机名", value: "hostname" },
                 { label: "网络接口", value: "networkInterfaces" },
@@ -176,7 +176,7 @@ export const systemCommands = {
             },
             {
               label: "包含内部接口",
-              type: "checkbox",
+              component: "q-checkbox",
               defaultValue: false,
               width: 12,
               condition: "values[0] === 'networkInterfaces'",
@@ -190,7 +190,7 @@ export const systemCommands = {
           config: [
             {
               label: "平台信息类型",
-              type: "buttonGroup",
+              component: "ButtonGroup",
               options: [
                 { label: "操作系统名称", value: "platform" },
                 { label: "操作系统类型", value: "type" },
@@ -217,7 +217,7 @@ export const systemCommands = {
       config: [
         {
           label: "路径",
-          type: "varInput",
+          component: "VariableInput",
           icon: "folder",
           width: "auto",
         },
@@ -245,7 +245,7 @@ export const systemCommands = {
           config: [
             {
               label: "要移除的扩展名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "extension",
               width: "auto",
             },
@@ -269,13 +269,13 @@ export const systemCommands = {
           config: [
             {
               label: "路径片段",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: "auto",
             },
             {
               label: "路径片段",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: "auto",
             },
@@ -289,13 +289,13 @@ export const systemCommands = {
           config: [
             {
               label: "路径片段",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: "auto",
             },
             {
               label: "路径片段",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: "auto",
             },
@@ -309,13 +309,13 @@ export const systemCommands = {
           config: [
             {
               label: "起始路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: 6,
             },
             {
               label: "目标路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: 6,
             },
@@ -329,31 +329,31 @@ export const systemCommands = {
           config: [
             {
               label: "根路径",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: 6,
             },
             {
               label: "目录",
-              type: "varInput",
+              component: "VariableInput",
               icon: "folder",
               width: 6,
             },
             {
               label: "基本名称",
-              type: "varInput",
+              component: "VariableInput",
               icon: "description",
               width: 6,
             },
             {
               label: "文件名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "insert_drive_file",
               width: 6,
             },
             {
               label: "扩展名",
-              type: "varInput",
+              component: "VariableInput",
               icon: "extension",
               width: 6,
             },
@@ -369,7 +369,7 @@ export const systemCommands = {
       config: [
         {
           label: "进程ID",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 100,
           icon: "developer_board",
@@ -377,7 +377,7 @@ export const systemCommands = {
         },
         {
           label: "信号",
-          type: "select",
+          component: "q-select",
           icon: "signal_cellular_alt",
           options: [
             { label: "正常终止 (15)", value: "SIGTERM" },
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 0d440434..2514c975 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -14,7 +14,7 @@ export const uiCommands = {
       config: [
         {
           label: "按钮",
-          type: "arrayEditor",
+          component: "ArrayEditor",
           defaultValue: [
             newVarInputVal("str", "是"),
             newVarInputVal("str", "否"),
@@ -31,7 +31,7 @@ export const uiCommands = {
       config: [
         {
           label: "输入框",
-          type: "arrayEditor",
+          component: "ArrayEditor",
           width: 12,
           options: {
             keys: [
@@ -54,7 +54,7 @@ export const uiCommands = {
         },
         {
           label: "标题",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str"),
           width: 12,
         },
@@ -77,13 +77,13 @@ export const uiCommands = {
       config: [
         {
           label: "文本框占位符",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str", "请输入"),
           width: 6,
         },
         {
           label: "文本框默认值",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str"),
           width: 6,
         },
@@ -97,14 +97,14 @@ export const uiCommands = {
       config: [
         {
           label: "提示内容",
-          type: "varInput",
+          component: "VariableInput",
           icon: "info",
           defaultValue: newVarInputVal("str", "这是一条提示消息"),
           width: 12,
         },
         {
           label: "图标类型",
-          type: "select",
+          component: "q-select",
           defaultValue: "success",
           icon: "lightbulb",
           width: 6,
@@ -117,7 +117,7 @@ export const uiCommands = {
         },
         {
           label: "显示时间(ms)",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 100,
           width: 6,
@@ -135,25 +135,25 @@ export const uiCommands = {
       config: [
         {
           label: "提示内容",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str", "确认要执行此操作吗？"),
           width: 12,
         },
         {
           label: "标题",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str", "提示"),
           width: 7,
         },
         {
           label: "支持HTML",
-          type: "switch",
+          component: "q-toggle",
           defaultValue: false,
           width: 2,
         },
         {
           label: "宽度",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 100,
           defaultValue: 450,
@@ -171,26 +171,26 @@ export const uiCommands = {
       config: [
         {
           label: "标题",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str", "请选择文件"),
           width: 6,
         },
         {
           label: "默认路径",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str"),
           width: 6,
           placeholder: "默认打开的路径",
         },
         {
           label: "按钮文本",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str", "选择"),
           width: 3,
         },
         {
           label: "提示信息",
-          type: "varInput",
+          component: "VariableInput",
           defaultValue: newVarInputVal("str"),
           width: 3,
           placeholder: "对话框底部的提示信息",
@@ -198,13 +198,14 @@ export const uiCommands = {
         },
         {
           label: "扩展名",
-          type: "varInput",
+          component: "VariableInput",
           width: 6,
           options: {
             items: ["*", "jpg", "png", "gif", "txt", "json", "exe"],
             multiSelect: true,
           },
           defaultValue: newVarInputVal("var", '["*"]'),
+          disableToggleType: true,
         },
       ],
       subCommands: [
@@ -216,7 +217,7 @@ export const uiCommands = {
           config: [
             {
               label: "选择选项",
-              type: "checkGroup",
+              component: "CheckGroup",
               icon: "settings",
               width: 12,
               options: [
@@ -245,7 +246,7 @@ export const uiCommands = {
           config: [
             {
               label: "选择选项",
-              type: "checkGroup",
+              component: "CheckGroup",
               icon: "settings",
               width: 12,
               options: [
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
index d3dbcfd1..7d6e06ed 100644
--- a/src/js/composer/commands/userdataCommands.js
+++ b/src/js/composer/commands/userdataCommands.js
@@ -10,7 +10,7 @@ export const userdataCommands = {
       config: [
         {
           label: "数据标识",
-          type: "input",
+          component: "q-input",
         },
       ],
       outputVariable: "userData",
@@ -30,17 +30,17 @@ export const userdataCommands = {
       config: [
         {
           label: "数据",
-          type: "varInput",
+          component: "VariableInput",
           width: 7,
         },
         {
           label: "数据标识",
-          type: "input",
+          component: "q-input",
           width: 3,
         },
         {
           label: "不同步",
-          type: "checkbox",
+          component: "q-checkbox",
           defaultValue: true,
           width: 2,
         },
@@ -53,7 +53,7 @@ export const userdataCommands = {
       config: [
         {
           label: "数据标识",
-          type: "input",
+          component: "q-input",
         },
       ],
     },
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 42d8915a..4e0c6c07 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -1,5 +1,3 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
-
 export const utoolsCommands = {
   label: "uTools功能",
   icon: "insights",
@@ -25,7 +23,7 @@ export const utoolsCommands = {
         {
           key: "height",
           label: "高度",
-          type: "numInput",
+          component: "NumberInput",
           min: 0,
           step: 100,
           icon: "straighten",
@@ -41,7 +39,7 @@ export const utoolsCommands = {
       config: [
         {
           key: "isKill",
-          type: "select",
+          component: "q-select",
           options: [
             { label: "杀死插件进程", value: true },
             { label: "插件隐藏到后台", value: false },
@@ -74,14 +72,14 @@ export const utoolsCommands = {
         {
           key: "pluginName",
           label: "要跳转至的插件名称",
-          type: "varInput",
+          component: "VariableInput",
           icon: "alt_route",
           width: 6,
         },
         {
           key: "payload",
           label: "传递给插件的文本",
-          type: "varInput",
+          component: "VariableInput",
           icon: "alt_route",
           width: 6,
         },
@@ -102,46 +100,53 @@ export const utoolsCommands = {
             {
               key: "text",
               label: "文本",
-              type: "varInput",
+              component: "VariableInput",
               icon: "search",
               width: 12,
             },
             {
               key: "options",
               label: "选项",
-              type: "dictEditor",
+              component: "OptionEditor",
               icon: "settings",
               options: {
-                disableAdd: true,
-                fixedKeys: [
-                  {
-                    value: "forward",
-                    label: "向前查找",
-                  },
-                  {
-                    value: "findNext",
-                    label: "查找下一个",
-                  },
-                  {
-                    value: "matchCase",
-                    label: "区分大小写",
-                  },
-                  {
-                    value: "wordStart",
-                    label: "单词开头",
-                  },
-                  {
-                    value: "medialCapitalAsWordStart",
-                    label: "中缀大写作为单词开头",
-                  },
-                ],
+                forward: {
+                  label: "向前查找",
+                  icon: "arrow_right",
+                  width: 2,
+                  component: "q-checkbox",
+                },
+                findNext: {
+                  label: "查找下一个",
+                  icon: "arrow_down",
+                  width: 2,
+                  component: "q-checkbox",
+                },
+                matchCase: {
+                  label: "区分大小写",
+                  icon: "arrow_up",
+                  width: 2,
+                  component: "q-checkbox",
+                },
+                wordStart: {
+                  label: "单词开头",
+                  icon: "arrow_right",
+                  width: 2,
+                  component: "q-checkbox",
+                },
+                medialCapitalAsWordStart: {
+                  label: "中缀大写作为单词开头",
+                  icon: "arrow_right",
+                  width: 4,
+                  component: "q-checkbox",
+                },
               },
               defaultValue: {
-                forward: newVarInputVal("var", "true"),
-                findNext: newVarInputVal("var", "false"),
-                matchCase: newVarInputVal("var", "false"),
-                wordStart: newVarInputVal("var", "false"),
-                medialCapitalAsWordStart: newVarInputVal("var", "false"),
+                forward: true,
+                findNext: false,
+                matchCase: false,
+                wordStart: false,
+                medialCapitalAsWordStart: false,
               },
               width: 12,
             },
@@ -156,7 +161,7 @@ export const utoolsCommands = {
             {
               key: "action",
               label: "动作",
-              type: "buttonGroup",
+              component: "ButtonGroup",
               icon: "settings",
               width: 12,
               options: [
diff --git a/src/js/composer/commonComponentGuide.js b/src/js/composer/commonComponentGuide.js
index ad7dca71..12fbc412 100644
--- a/src/js/composer/commonComponentGuide.js
+++ b/src/js/composer/commonComponentGuide.js
@@ -49,7 +49,7 @@ const commonComponentGuide = {
             config: [
               {
                 label: "域名",
-                type: "varInput",
+                component: "VariableInput",
                 icon: "dns",
                 width: "auto"
               }
@@ -75,7 +75,7 @@ const commonComponentGuide = {
                 config: [
                   {
                     label: "IP版本",
-                    type: "select",
+                    component: "q-select",
                     options: [
                       { label: "自动", value: 0 },
                       { label: "IPv4", value: 4 }
@@ -92,7 +92,7 @@ const commonComponentGuide = {
                 config: [
                   {
                     label: "IP地址",
-                    type: "varInput",
+                    component: "VariableInput",
                     icon: "router"
                   }
                 ]
diff --git a/src/js/composer/ubrowserConfig.js b/src/js/composer/ubrowserConfig.js
index f12cc74c..2840dc31 100644
--- a/src/js/composer/ubrowserConfig.js
+++ b/src/js/composer/ubrowserConfig.js
@@ -21,7 +21,7 @@ export const ubrowserOperationConfigs = [
         key: "time",
         label: "等待时间(ms)",
         icon: "timer",
-        type: "numInput",
+        component: "NumberInput",
         width: 12,
         showWhen: "type",
         showValue: "time",
@@ -30,7 +30,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "等待元素的CSS选择器",
         icon: "find_in_page",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
         showWhen: "type",
         showValue: "selector",
@@ -48,7 +48,7 @@ export const ubrowserOperationConfigs = [
         key: "timeout",
         label: "超时时间(ms)",
         icon: "timer_off",
-        type: "numInput",
+        component: "NumberInput",
         width: 12,
         defaultValue: 60000,
         showWhen: "type",
@@ -65,7 +65,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "点击元素的CSS选择器",
         icon: "mouse",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "mouse",
@@ -78,7 +78,7 @@ export const ubrowserOperationConfigs = [
         key: "value",
         label: "注入的CSS样式",
         icon: "style",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "style",
@@ -91,7 +91,7 @@ export const ubrowserOperationConfigs = [
         key: "key",
         label: "按键",
         icon: "keyboard",
-        type: "varInput",
+        component: "VariableInput",
         width: 5,
       },
       {
@@ -118,7 +118,7 @@ export const ubrowserOperationConfigs = [
         key: "text",
         label: "粘贴内容",
         icon: "content_paste",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "content_paste",
@@ -131,14 +131,14 @@ export const ubrowserOperationConfigs = [
         key: "width",
         label: "视窗宽度",
         icon: "width",
-        type: "numInput",
+        component: "NumberInput",
         width: 6,
       },
       {
         key: "height",
         label: "视窗高度",
         icon: "height",
-        type: "numInput",
+        component: "NumberInput",
         width: 6,
       },
     ],
@@ -148,36 +148,46 @@ export const ubrowserOperationConfigs = [
     value: "screenshot",
     label: "截图",
     config: [
-      { key: "selector", label: "元素选择器", icon: "crop", type: "varInput" },
+      {
+        key: "selector",
+        label: "元素选择器",
+        icon: "crop",
+        component: "VariableInput",
+      },
       {
         key: "rect.x",
         label: "X坐标",
         icon: "drag_handle",
-        type: "numInput",
+        component: "NumberInput",
         width: 3,
       },
       {
         key: "rect.y",
         label: "Y坐标",
         icon: "drag_handle",
-        type: "numInput",
+        component: "NumberInput",
         width: 3,
       },
       {
         key: "rect.width",
         label: "宽度",
         icon: "width",
-        type: "numInput",
+        component: "NumberInput",
         width: 3,
       },
       {
         key: "rect.height",
         label: "高度",
         icon: "height",
-        type: "numInput",
+        component: "NumberInput",
         width: 3,
       },
-      { key: "savePath", label: "保存路径", icon: "save", type: "varInput" },
+      {
+        key: "savePath",
+        label: "保存路径",
+        icon: "save",
+        component: "VariableInput",
+      },
     ],
     icon: "picture_as_pdf",
   },
@@ -188,7 +198,7 @@ export const ubrowserOperationConfigs = [
       {
         key: "options.marginsType",
         label: "边距类型",
-        type: "select",
+        component: "q-select",
         options: [
           { label: "默认边距", value: 0 },
           { label: "无边距", value: 1 },
@@ -199,11 +209,16 @@ export const ubrowserOperationConfigs = [
       {
         key: "options.pageSize",
         label: "页面大小",
-        type: "select",
+        component: "q-select",
         options: ["A3", "A4", "A5", "Legal", "Letter", "Tabloid"],
         width: 6,
       },
-      { key: "savePath", label: "保存路径", icon: "save", type: "varInput" },
+      {
+        key: "savePath",
+        label: "保存路径",
+        icon: "save",
+        component: "VariableInput",
+      },
     ],
     icon: "devices",
   },
@@ -225,7 +240,7 @@ export const ubrowserOperationConfigs = [
         key: "deviceName",
         label: "设备名称",
         icon: "smartphone",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
         showWhen: "type",
         showValue: "preset",
@@ -242,7 +257,7 @@ export const ubrowserOperationConfigs = [
         key: "useragent",
         label: "User-Agent",
         icon: "devices",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
         showWhen: "type",
         showValue: "custom",
@@ -258,7 +273,7 @@ export const ubrowserOperationConfigs = [
         key: "name",
         label: "Cookie名称",
         icon: "cookie",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
       },
     ],
@@ -274,7 +289,12 @@ export const ubrowserOperationConfigs = [
     value: "removeCookies",
     label: "删除Cookie",
     config: [
-      { key: "name", label: "Cookie名称", icon: "cookie", type: "varInput" },
+      {
+        key: "name",
+        label: "Cookie名称",
+        icon: "cookie",
+        component: "VariableInput",
+      },
     ],
     icon: "cookie",
   },
@@ -282,7 +302,12 @@ export const ubrowserOperationConfigs = [
     value: "clearCookies",
     label: "清空Cookie",
     config: [
-      { key: "url", label: "URL(可选)", icon: "link", type: "varInput" },
+      {
+        key: "url",
+        label: "URL(可选)",
+        icon: "link",
+        component: "VariableInput",
+      },
     ],
     icon: "cookie",
   },
@@ -318,7 +343,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "等待元素的CSS选择器",
         icon: "find_in_page",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
         showWhen: "type",
         showValue: "selector",
@@ -336,7 +361,7 @@ export const ubrowserOperationConfigs = [
         key: "timeout",
         label: "超时时间(ms)",
         icon: "timer_off",
-        type: "numInput",
+        component: "NumberInput",
         width: 12,
         defaultValue: 60000,
         showWhen: "type",
@@ -359,7 +384,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "按下元素选择器",
         icon: "mouse",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "mouse",
@@ -372,7 +397,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "释放元素选择器",
         icon: "mouse",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "mouse",
@@ -385,7 +410,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "文件输入框选择器",
         icon: "upload_file",
-        type: "varInput",
+        component: "VariableInput",
       },
       { key: "files", label: "文件列表", type: "file-list", width: 12 },
     ],
@@ -399,14 +424,14 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "元素选择器",
         icon: "varInput",
-        type: "varInput",
+        component: "VariableInput",
         width: 6,
       },
       {
         key: "value",
         label: "设置的值",
         icon: "edit",
-        type: "varInput",
+        component: "VariableInput",
         width: 6,
       },
     ],
@@ -420,7 +445,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "复选框/选框选择器",
         icon: "check_box",
-        type: "varInput",
+        component: "VariableInput",
         width: 8,
       },
       {
@@ -441,7 +466,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "元素选择器",
         icon: "center_focus_strong",
-        type: "varInput",
+        component: "VariableInput",
       },
     ],
     icon: "swap_vert",
@@ -464,7 +489,7 @@ export const ubrowserOperationConfigs = [
         key: "selector",
         label: "目标元素选择器",
         icon: "swap_vert",
-        type: "varInput",
+        component: "VariableInput",
         width: 12,
         showWhen: "type",
         showValue: "element",
@@ -473,7 +498,7 @@ export const ubrowserOperationConfigs = [
         key: "x",
         label: "X坐标",
         icon: "drag_handle",
-        type: "numInput",
+        component: "NumberInput",
         width: 6,
         showWhen: "type",
         showValue: "position",
@@ -482,7 +507,7 @@ export const ubrowserOperationConfigs = [
         key: "y",
         label: "Y坐标",
         icon: "drag_handle",
-        type: "numInput",
+        component: "NumberInput",
         width: 6,
         showWhen: "type",
         showValue: "position",
@@ -498,14 +523,14 @@ export const ubrowserOperationConfigs = [
         key: "url",
         label: "下载URL",
         icon: "link",
-        type: "varInput",
+        component: "VariableInput",
         width: 6,
       },
       {
         key: "savePath",
         label: "保存路径",
         icon: "save",
-        type: "varInput",
+        component: "VariableInput",
         width: 6,
       },
     ],

From 5e70c4c9a0798131ff079c4d8f8a7b8dc6ecd4c4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 18:54:11 +0800
Subject: [PATCH 025/332] =?UTF-8?q?=E4=BC=98=E5=8C=96ArrayDict/DictEditor?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?formatString=E5=A4=84=E7=90=86Array=E6=97=B6=E7=9A=84BUG?=
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/CommandComposer.vue   |   2 +-
 .../composer/common/ArrayEditor.vue           | 287 ++++++++----------
 src/components/composer/common/DictEditor.vue |   2 +-
 .../composer/ui/SelectListEditor.vue          |  44 +--
 src/js/composer/commands/dataCommands.js      |   1 +
 src/js/composer/commands/uiCommands.js        | 220 ++++++++------
 src/js/composer/formatString.js               | 126 +++++---
 10 files changed, 370 insertions(+), 369 deletions(-)
 delete mode 100644 plugin/lib/quickcomposer/ui/dialog.js
 delete mode 100644 plugin/lib/quickcomposer/ui/index.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index c705bf8b..d9c379c7 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -6,7 +6,6 @@ const quickcomposer = {
   network: require("./quickcomposer/network"),
   coding: require("./quickcomposer/coding"),
   math: require("./quickcomposer/math"),
-  ui: require("./quickcomposer/ui"),
   audio: require("./quickcomposer/audio"),
   image: require("./quickcomposer/image"),
 };
diff --git a/plugin/lib/quickcomposer/ui/dialog.js b/plugin/lib/quickcomposer/ui/dialog.js
deleted file mode 100644
index f7e5f093..00000000
--- a/plugin/lib/quickcomposer/ui/dialog.js
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 6f9a8113..00000000
--- a/plugin/lib/quickcomposer/ui/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const { showSaveDialog, showOpenDialog } = require("./dialog");
-
-module.exports = {
-  showSaveDialog,
-  showOpenDialog,
-};
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index a3faa108..54e85d50 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -96,7 +96,7 @@ export default defineComponent({
     },
     saveFlow() {
       const flow = window.lodashM.cloneDeep(this.commandFlow);
-      const uselessProps = ["config", "argvs", "label", "type"];
+      const uselessProps = ["config", "argvs", "label", "component", "subCommands", "options", "defaultValue"];
       // 移除不必要属性
       flow.forEach((cmd) => {
         for (const props of uselessProps) {
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index a5f65c18..7cecbd89 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -6,25 +6,21 @@
     :model-value="isCollapse"
   >
     <div class="array-editor">
-      <div v-for="(item, index) in items" :key="index" class="row items-center">
-        <template v-if="optionsKeys.length">
+      <div v-for="(row, index) in rows" :key="index" class="row items-center">
+        <template v-if="columns">
           <div
-            v-for="key in optionsKeys"
-            :key="key.value"
+            v-for="column in processedColumns"
+            :key="column.key"
             :class="[
-              key.width ? `col-${key.width}` : 'col',
-              optionsKeys.length > 1 ? 'q-pr-sm' : '',
+              column.width ? `col-${column.width}` : 'col',
+              Object.keys(columns).length > 1 ? 'q-pr-sm' : '',
             ]"
           >
             <VariableInput
-              :model-value="item[key.value] || key.defaultValue"
-              :label="key.label"
-              :no-icon="true"
-              :placeholder="key.placeholder"
-              :options="key.options"
-              :disable-toggle-type="key.disableToggleType"
+              :model-value="row[column.key]"
+              v-bind="column"
               @update:model-value="
-                (val) => updateItemKeyValue(index, key.value, val)
+                (val) => updateColumn(index, column.key, val)
               "
             />
           </div>
@@ -32,38 +28,32 @@
         <template v-else>
           <div class="col">
             <VariableInput
-              :model-value="item"
-              :label="`${label || '项目'} ${index + 1}`"
-              :icon="icon || 'code'"
-              :placeholder="placeholder"
-              :options="{
-                items: options.items,
-              }"
-              :disable-toggle-type="disableToggleType"
-              @update:model-value="(val) => updateItemValue(index, val)"
+              :model-value="row"
+              v-bind="$attrs"
+              @update:model-value="(val) => updateValue(index, val)"
             />
           </div>
         </template>
         <div class="col-auto">
           <div class="btn-container">
-            <template v-if="items.length === 1">
+            <template v-if="rows.length === 1">
               <q-btn
                 flat
                 dense
                 size="sm"
                 icon="add"
                 class="center-btn"
-                @click="addItem"
+                @click="addRow"
               />
             </template>
-            <template v-else-if="index === items.length - 1">
+            <template v-else-if="index === rows.length - 1">
               <q-btn
                 flat
                 dense
                 size="sm"
                 icon="remove"
                 class="top-btn"
-                @click="removeItem(index)"
+                @click="removeRow(index)"
               />
               <q-btn
                 flat
@@ -71,7 +61,7 @@
                 size="sm"
                 icon="add"
                 class="bottom-btn"
-                @click="addItem"
+                @click="addRow"
               />
             </template>
             <template v-else>
@@ -81,7 +71,7 @@
                 size="sm"
                 icon="remove"
                 class="center-btn"
-                @click="removeItem(index)"
+                @click="removeRow(index)"
               />
             </template>
           </div>
@@ -94,63 +84,62 @@
 <script>
 /**
  * 数组编辑器组件
- * @description 支持单值数组和多键对象数组的编辑
+ * @description 支持简单数组和对象数组的编辑
  *
  * @property {Array} modelValue - 绑定的数组值
- * @property {String} label - 输入框标签
- * @property {String} icon - 输入框图标
- * @property {Object} options - 配置选项
+ * @property {Object} columns - 列配置（可选）
  *
- * @property {String[]} [options.keys] - 多键对象模式的键名列表
- * @property {String[]} [options.keys.value] - 元素为对象时，对象的键名
- * @property {String[]} [options.keys.label] - 对应varInput的label
- * @property {String[]} [options.keys.placeholder] - 对应varInput的placeholder
- * @property {String[]} [options.keys.defaultValue] - 对应varInput的defaultValue
- * @property {Object} [options.keys.options] - 对应varInput的options
- *
- * @property {String[]} [options.items] - 下拉选择模式的选项列表
- * @property {Object} [options.defaultValue] - 初始化时，默认的值，决定显示几个元素，对应元素内容
- * @example
- * // 基础数组
+ * // 1. 简单数组（不传 columns）
+ * // 值示例：
  * [
- *   newVarInputVal("str", "张三")
+ *   newVarInputVal('str', '选项1'),
+ *   newVarInputVal('str', '选项2')
  * ]
  *
- * // 多键对象数组
- * options.keys = ['name', 'age', 'email']
+ * 属性透传：
+ * ArrayEditor属性全部透传给VariableInput
  *
- * options.keys= [
- *   {
- *     label: "姓名",
- *     value: "name",
- *     placeholder: "姓名",
+ * 初始值：
+ * 使用defaultValue属性设置初始值
+ * 使用defaultRowValue属性设置新增行时的初始值
+ *
+ * // 2. 对象数组（传入 columns）
+ * columns = {
+ *   name: {
+ *     label: '姓名',
+ *     placeholder: '请输入姓名',
+ *     width: 6,
  *     options: {
- *       items: ["张三", "李四", "王五"],
- *       multiSelect: true,
+ *       items: ['张三', '李四', '王五']
  *     },
+ *     defaultValue: newVarInputVal('str', '张三')
+ *   },
+ *   age: {
+ *     label: '年龄',
+ *     placeholder: '请输入年龄',
+ *     width: 4,
+ *     defaultValue: newVarInputVal('str', '18')
  *   }
- * ]
- *
+ * }
+ * // 值示例：
  * [
  *   {
- *     name: newVarInputVal("str", "张三"),
- *     age: newVarInputVal("str", "18"),
- *     email: newVarInputVal("str", "zhangsan@example.com")
+ *     name: newVarInputVal('str', '张三'),
+ *     age: newVarInputVal('str', '18')
  *   }
  * ]
  *
- * // 下拉选择模式
- * options.items = ['选项1', '选项2', '选项3']
- * [
- *   newVarInputVal("str", "选项1"),
- *   newVarInputVal("str", "选项2"),
- *   newVarInputVal("str", "选项3")
- * ]
+ * 属性透传：
+ * columns的每一个对象的值的属性全部透传给VariableInput
+ *
+ * 初始值：
+ * 使用defaultValue属性设置初始的每一行
+ * columns的每一个对象的defaultValue属性设置新增行时的初始值
  */
 import { defineComponent } from "vue";
-import VariableInput from "components/composer/common/VariableInput.vue";
+import VariableInput from "./VariableInput.vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
-import BorderLabel from "components/composer/common/BorderLabel.vue";
+import BorderLabel from "./BorderLabel.vue";
 
 export default defineComponent({
   name: "ArrayEditor",
@@ -164,9 +153,17 @@ export default defineComponent({
       required: true,
       default: () => [],
     },
-    label: {
-      type: String,
-      default: "",
+    columns: {
+      type: Object,
+      default: null,
+    },
+    defaultValue: {
+      type: [Object, Array],
+      default: null,
+    },
+    defaultRowValue: {
+      type: [Object, String],
+      default: null,
     },
     topLabel: {
       type: String,
@@ -180,103 +177,89 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
-    options: {
-      type: Object,
-      default: () => ({}),
-    },
-    placeholder: {
-      type: String,
-      default: "",
-    },
-    disableToggleType: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ["update:modelValue"],
   computed: {
-    items() {
-      return this.modelValue.length ? this.modelValue : this.initializeItems();
+    rows() {
+      return this.modelValue.length ? this.modelValue : this.initializeRow();
     },
-    optionsKeys() {
-      return (
-        this.options?.keys?.map((key) => {
-          return {
-            ...key,
-            value: key.value || key,
-            label: key.label || key,
-          };
-        }) || []
-      );
+    processedColumns() {
+      if (!this.columns) return null;
+
+      return Object.entries(this.columns).map(([key, config]) => ({
+        key,
+        ...config,
+        width: config.width || null,
+        defaultValue: config.defaultValue || newVarInputVal("str"),
+      }));
     },
   },
   methods: {
-    initializeItems() {
-      if (this.optionsKeys?.length) {
-        const item = {};
-        this.optionsKeys.forEach((key) => {
-          item[key] = newVarInputVal("str");
-        });
-        return [item];
+    initializeRow() {
+      if (!this.columns) {
+        // 简单数组模式：使用 defaultValue 或创建新的 VarInputVal
+        return this.defaultValue || [newVarInputVal("str")];
+      }
+
+      // 对象数组模式
+      if (this.defaultValue) {
+        return [this.defaultValue];
       }
 
-      return [newVarInputVal("str")];
+      const row = {};
+      Object.entries(this.columns).forEach(([key, config]) => {
+        row[key] = config.defaultValue || newVarInputVal("str");
+      });
+      return [row];
     },
-    /**
-     * 添加新的数组项
-     * 根据配置创建相应的数据结构
-     */
-    addItem() {
-      let newItems = [];
-      if (this.options.keys) {
-        const newItem = {};
-        this.options.keys.forEach((key) => {
-          newItem[key] = newVarInputVal("str");
-        });
-        newItems = [...this.items, newItem];
-      } else {
-        newItems = [...this.items, newVarInputVal("str")];
+    getNewRowValue() {
+      if (!this.columns) {
+        // 简单数组模式：使用 defaultRowValue 或创建新的 VarInputVal
+        return this.defaultRowValue || newVarInputVal("str");
       }
-      this.$emit("update:modelValue", newItems);
+
+      // 对象数组模式
+      if (this.defaultRowValue) {
+        return this.defaultRowValue;
+      }
+
+      const row = {};
+      Object.entries(this.columns).forEach(([key, config]) => {
+        row[key] = config.defaultValue || newVarInputVal("str");
+      });
+      return row;
     },
-    /**
-     * 移除指定索引的数组项
-     * 如果移除后数组为空，则创建一个新的空项
-     */
-    removeItem(index) {
-      const newItems = [...this.items];
-      newItems.splice(index, 1);
-      if (newItems.length === 0) {
-        if (this.options.keys) {
-          const newItem = {};
-          this.options.keys.forEach((key) => {
-            newItem[key] = newVarInputVal("str");
-          });
-          newItems.push(newItem);
-        } else {
-          newItems.push(newVarInputVal("str"));
-        }
+    addRow() {
+      const newRows = [...this.rows, this.getNewRowValue()];
+      this.$emit("update:modelValue", newRows);
+    },
+    removeRow(index) {
+      const newRows = [...this.rows];
+      newRows.splice(index, 1);
+      if (newRows.length === 0) {
+        newRows.push(this.initializeRow()[0]);
       }
-      this.$emit("update:modelValue", newItems);
+      this.$emit("update:modelValue", newRows);
     },
-    /**
-     * 更新单值模式下的值
-     */
-    updateItemValue(index, value) {
-      const newItems = [...this.items];
-      newItems[index] = value;
-      this.$emit("update:modelValue", newItems);
+    updateValue(index, value) {
+      const newRows = [...this.rows];
+      newRows[index] = value;
+      this.$emit("update:modelValue", newRows);
     },
-    /**
-     * 更新多键模式下指定键的值
-     */
-    updateItemKeyValue(index, key, value) {
-      const newItems = [...this.items];
-      newItems[index] = {
-        ...newItems[index],
-        [key]: value,
-      };
-      this.$emit("update:modelValue", newItems);
+    updateColumn(index, columnKey, value) {
+      // 创建一个新的行数组
+      const newRows = this.rows.map((row, i) => {
+        // 只更新指定索引的行
+        if (i === index) {
+          return {
+            ...row,
+            [columnKey]: value,
+          };
+        }
+        return row;
+      });
+
+      this.$emit("update:modelValue", newRows);
     },
   },
 });
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index f999e9df..38b05af2 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -157,7 +157,7 @@ import BorderLabel from "components/composer/common/BorderLabel.vue";
  * }
  *
  * // 下拉选择模式
- * options.items = ['User-Agent', 'Content-Type', 'Accept']
+ * options.optionKeys = ['User-Agent', 'Content-Type', 'Accept']
  * {
  *   "User-Agent": newVarInputVal("str", "Mozilla/5.0"),
  *   "Content-Type": newVarInputVal("str", "text/html"),
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 99069380..35478f3d 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -130,23 +130,8 @@
       <template v-if="argvs.optionType === 'json'">
         <ArrayEditor
           :model-value="argvs.selects"
-          :options="{
-            keys: [
-              {
-                value: 'id',
-                label: 'id',
-                width: 3,
-              },
-              {
-                value: 'title',
-                label: '标题',
-              },
-              {
-                value: 'description',
-                label: '描述',
-              },
-            ],
-          }"
+          :columns="arrayEditorColumns"
+          :default-row-value="arrayEditorDefaultRowValue"
           @update:model-value="updateArgvs('selects', $event)"
         >
           <template #header>
@@ -178,8 +163,7 @@ import VariableInput from "../common/VariableInput.vue";
 import ArrayEditor from "../common/ArrayEditor.vue";
 import OperationCard from "../common/OperationCard.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
-import { newVarInputVal, isVarInputVal} from "js/composer/varInputValManager";
-
+import { newVarInputVal, isVarInputVal } from "js/composer/varInputValManager";
 
 const jsonDefaultSelects = new Array(3).fill().map((_, index) => ({
   id: newVarInputVal("var", index),
@@ -226,6 +210,28 @@ export default defineComponent({
         showCancelButton: false,
         closeOnSelect: true,
       },
+      arrayEditorDefaultRowValue: {
+        id: newVarInputVal("var"),
+        title: newVarInputVal("str"),
+        description: newVarInputVal("str"),
+      },
+      arrayEditorColumns: {
+        id: {
+          label: "id",
+          width: 3,
+          noIcon: true,
+        },
+        title: {
+          label: "标题",
+          width: 4,
+          noIcon: true,
+        },
+        description: {
+          label: "描述",
+          width: 4,
+          noIcon: true,
+        },
+      },
     };
   },
   computed: {
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 98922fd3..48516c3a 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -335,6 +335,7 @@ export const dataCommands = {
               icon: "memory",
               width: 12,
               defaultValue: [newVarInputVal("var")],
+              defaultRowValue: newVarInputVal("var"),
               disableToggleType: true,
             },
             {
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 2514c975..92b8b33d 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -1,5 +1,109 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
 
+const SAVE_DIALOG_PROPERTIES = {
+  component: "CheckGroup",
+  icon: "settings",
+  label: "选项",
+  width: 12,
+  options: [
+    { label: "显示隐藏文件", value: "showHiddenFiles" },
+    { label: "允许创建文件夹（Mac）", value: "createDirectory" },
+    {
+      label: "将.App作为目录（Mac）",
+      value: "treatPackageAsDirectory",
+    },
+    {
+      label: "显示覆盖确认（Linux）",
+      value: "showOverwriteConfirmation",
+    },
+    { label: "不添加到最近（Win）", value: "dontAddToRecent" },
+  ],
+};
+
+const OPEN_DIALOG_PROPERTIES = {
+  ...SAVE_DIALOG_PROPERTIES,
+  options: [
+    { label: "选择文件", value: "openFile" },
+    { label: "选择文件夹", value: "openDirectory" },
+    { label: "允许多选", value: "multiSelections" },
+    { label: "显示隐藏文件", value: "showHiddenFiles" },
+    { label: "提示新建路径（Win）", value: "promptToCreate" },
+    { label: "不添加到最近（Win）", value: "dontAddToRecent" },
+    { label: "允许创建文件夹（Mac）", value: "createDirectory" },
+    { label: "不解析符号链接（Mac）", value: "noResolveAliases" },
+    {
+      label: "将.App作为目录（Mac）",
+      value: "treatPackageAsDirectory",
+    },
+  ],
+};
+
+const DIALOG_CONFIG = {
+  options: {
+    title: {
+      label: "标题",
+      component: "VariableInput",
+      icon: "title",
+      width: 6,
+    },
+    defaultPath: {
+      label: "默认路径",
+      component: "VariableInput",
+      icon: "folder",
+      width: 6,
+    },
+    buttonLabel: {
+      label: "按钮文本",
+      component: "VariableInput",
+      icon: "text_fields",
+      width: 6,
+    },
+    message: {
+      label: "提示信息",
+      component: "VariableInput",
+      icon: "info",
+      width: 6,
+    },
+    filters: {
+      topLabel: "过滤器",
+      component: "ArrayEditor",
+      icon: "filter_list",
+      width: 12,
+      defaultRowValue: [newVarInputVal("str"), newVarInputVal("var", "")],
+      columns: {
+        name: {
+          label: "文件类型",
+          noIcon: true,
+          width: 4,
+        },
+        extensions: {
+          label: "扩展名",
+          noIcon: true,
+          width: 7,
+          disableToggleType: true,
+          options: {
+            items: ["*", "jpg", "png", "gif", "txt", "json", "exe"],
+            multiSelect: true,
+          },
+        },
+      },
+    },
+  },
+  defaultValue: {
+    title: newVarInputVal("str", "请选择"),
+    defaultPath: newVarInputVal("str"),
+    buttonLabel: newVarInputVal("str", "选择"),
+    message: newVarInputVal("str", "请选择"),
+    filters: [
+      {
+        name: newVarInputVal("str", "file"),
+        extensions: newVarInputVal("var", '["*"]'),
+      },
+    ],
+    properties: ["openFile", "showHiddenFiles"],
+  },
+};
+
 export const uiCommands = {
   label: "用户交互",
   icon: "web",
@@ -19,6 +123,7 @@ export const uiCommands = {
             newVarInputVal("str", "是"),
             newVarInputVal("str", "否"),
           ],
+          defaultRowValue: newVarInputVal("str"),
         },
       ],
     },
@@ -33,17 +138,13 @@ export const uiCommands = {
           label: "输入框",
           component: "ArrayEditor",
           width: 12,
-          options: {
-            keys: [
-              {
-                label: "标签",
-                value: "label",
-              },
-              {
-                label: "默认值",
-                value: "value",
-              },
-            ],
+          columns: {
+            label: {
+              label: "标签",
+            },
+            value: {
+              label: "默认值",
+            },
           },
           defaultValue: [
             {
@@ -163,106 +264,43 @@ export const uiCommands = {
       ],
     },
     {
-      value: "quickcomposer.ui.showOpenDialog",
+      value: "utools.showOpenDialog",
       label: "文件选择框",
       desc: "显示一个文件选择框，返回选择的文件路径",
       outputVariable: "filePaths",
       saveOutput: true,
-      config: [
-        {
-          label: "标题",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "请选择文件"),
-          width: 6,
-        },
-        {
-          label: "默认路径",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str"),
-          width: 6,
-          placeholder: "默认打开的路径",
-        },
-        {
-          label: "按钮文本",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "选择"),
-          width: 3,
-        },
-        {
-          label: "提示信息",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str"),
-          width: 3,
-          placeholder: "对话框底部的提示信息",
-          defaultValue: newVarInputVal("str", "请选择"),
-        },
-        {
-          label: "扩展名",
-          component: "VariableInput",
-          width: 6,
-          options: {
-            items: ["*", "jpg", "png", "gif", "txt", "json", "exe"],
-            multiSelect: true,
-          },
-          defaultValue: newVarInputVal("var", '["*"]'),
-          disableToggleType: true,
-        },
-      ],
       subCommands: [
         {
-          value: "quickcomposer.ui.showOpenDialog",
+          value: "utools.showOpenDialog",
           label: "打开文件对话框",
           desc: "打开文件对话框",
           icon: "folder_open",
           config: [
             {
-              label: "选择选项",
-              component: "CheckGroup",
-              icon: "settings",
-              width: 12,
-              options: [
-                { label: "选择文件", value: "openFile" },
-                { label: "选择文件夹", value: "openDirectory" },
-                { label: "允许多选", value: "multiSelections" },
-                { label: "显示隐藏文件", value: "showHiddenFiles" },
-                { label: "提示新建路径（Win）", value: "promptToCreate" },
-                { label: "不添加到最近（Win）", value: "dontAddToRecent" },
-                { label: "允许创建文件夹（Mac）", value: "createDirectory" },
-                { label: "不解析符号链接（Mac）", value: "noResolveAliases" },
-                {
-                  label: "将.App作为目录（Mac）",
-                  value: "treatPackageAsDirectory",
-                },
-              ],
-              defaultValue: ["openFile", "showHiddenFiles"],
+              label: "选项",
+              component: "OptionEditor",
+              defaultValue: DIALOG_CONFIG.defaultValue,
+              options: {
+                ...DIALOG_CONFIG.options,
+                properties: OPEN_DIALOG_PROPERTIES,
+              },
             },
           ],
         },
         {
-          value: "quickcomposer.ui.showSaveDialog",
+          value: "utools.showSaveDialog",
           label: "保存文件对话框",
           desc: "保存文件对话框",
           icon: "save",
           config: [
             {
-              label: "选择选项",
-              component: "CheckGroup",
-              icon: "settings",
-              width: 12,
-              options: [
-                { label: "显示隐藏文件", value: "showHiddenFiles" },
-                { label: "允许创建文件夹（Mac）", value: "createDirectory" },
-                {
-                  label: "将.App作为目录（Mac）",
-                  value: "treatPackageAsDirectory",
-                },
-                {
-                  label: "显示覆盖确认（Linux）",
-                  value: "showOverwriteConfirmation",
-                },
-                { label: "不添加到最近（Win）", value: "dontAddToRecent" },
-              ],
-              defaultValue: ["showHiddenFiles"],
+              label: "选项",
+              component: "OptionEditor",
+              defaultValue: DIALOG_CONFIG.defaultValue,
+              options: {
+                ...DIALOG_CONFIG.options,
+                properties: SAVE_DIALOG_PROPERTIES,
+              },
             },
           ],
         },
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 5c167f99..60d1a8eb 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -6,69 +6,101 @@ import {
 } from "./varInputValManager";
 
 /**
- * 递归移除对象中的空值
- * @param {Object} obj 要处理的对象
- * @returns {Object} 处理后的对象
+ * 处理单个值，返回格式化后的字符串
  */
-const removeEmptyValues = (obj) => {
-  return window.lodashM.omitBy(obj, (value) => {
-    // 如果value是VariableInput的输出，则取其value值
-    const realValue = isVarInputVal(value) ? value.value : value;
-    if (window.lodashM.isNil(realValue) || realValue === "") return true;
-    // 如果value是对象，并且不是VariableInput的输出，则递归移除空值
-    if (typeof value === "object" && !isVarInputVal(value))
-      return window.lodashM.isEmpty(removeEmptyValues(value));
-    return false;
-  });
+const processValue = (value, parentPath = "") => {
+  if (!value) return value;
+
+  if (typeof value === "object") {
+    if (isVarInputVal(value)) {
+      return stringifyVarInputVal(value);
+    }
+    return processObject(value, parentPath);
+  }
+
+  return typeof value === "string" ? `"${value}"` : value;
+};
+
+/**
+ * 格式化带缩进的值
+ */
+const formatWithIndent = (value, indent, isLast = true) => {
+  return `${indent}${value}${isLast ? "" : ","}`;
 };
 
 /**
  * 递归处理对象的值并格式化成字符串
- * @param {Object} obj 要处理的对象
- * @param {string} parentPath 父路径(用于缩进)
- * @returns {string} 处理后的字符串
  */
 const processObject = (obj, parentPath = "") => {
   // 移除空值
   obj = removeEmptyValues(obj);
-  // 如果是 VariableInput 的输出，直接用 stringifyVarInputVal 处理
+
   if (isVarInputVal(obj)) {
     return stringifyVarInputVal(obj);
   }
 
-  let result = "{\n";
+  const indentLevel = parentPath.split(".").length;
+  const indent = "  ".repeat(indentLevel + 1);
+  const closingIndent = "  ".repeat(indentLevel);
+
+  // 处理数组
+  if (Array.isArray(obj)) {
+    if (obj.length === 0) return "[]";
+
+    const items = obj.map((item, index) =>
+      formatWithIndent(
+        processValue(item, parentPath + "  "),
+        indent,
+        index === obj.length - 1
+      )
+    );
+
+    return `[\n${items.join("\n")}\n${closingIndent}]`;
+  }
+
+  // 处理对象
   const entries = Object.entries(obj);
+  if (entries.length === 0) return "{}";
 
-  entries.forEach(([key, value], index) => {
-    let valueStr = "";
+  const items = entries.map(([key, value], index) =>
+    formatWithIndent(
+      `"${key}": ${processValue(value, parentPath + "  ")}`,
+      indent,
+      index === entries.length - 1
+    )
+  );
 
-    // 处理对象类型
-    if (value && typeof value === "object") {
-      // 如果是 VariableInput 的输出，直接用 stringifyVarInputVal 处理
-      if (isVarInputVal(value)) {
-        valueStr = stringifyVarInputVal(value);
-      } else {
-        valueStr = processObject(value, parentPath + "  ");
-      }
-    }
-    // 处理其他类型
-    else if (value && typeof value === "string") {
-      valueStr = `"${value}"`;
-    } else {
-      valueStr = value;
+  return `{\n${items.join("\n")}\n${closingIndent}}`;
+};
+
+/**
+ * 递归移除对象中的空值
+ */
+const removeEmptyValues = (obj) => {
+  const isEmptyValue = (value) => {
+    const realValue = isVarInputVal(value) ? value.value : value;
+    return window.lodashM.isNil(realValue) || realValue === "";
+  };
+
+  const processObjectValue = (value) => {
+    if (typeof value === "object" && !isVarInputVal(value)) {
+      return removeEmptyValues(value);
     }
+    return value;
+  };
+
+  if (Array.isArray(obj)) {
+    return obj.filter((value) => !isEmptyValue(value)).map(processObjectValue);
+  }
 
-    // 添加缩进
-    const indent = "  ".repeat(parentPath.split(".").length + 1);
-    result += `${indent}"${key}": ${valueStr}`;
-    if (index < entries.length - 1) result += ",";
-    result += "\n";
-  });
-
-  // 闭合括号的缩进
-  const closingIndent = "  ".repeat(parentPath.split(".").length);
-  result += `${closingIndent}}`;
-  return result;
+  return window.lodashM.omitBy(
+    obj,
+    (value) =>
+      isEmptyValue(value) ||
+      (typeof value === "object" &&
+        !isVarInputVal(value) &&
+        window.lodashM.isEmpty(removeEmptyValues(value)))
+  );
 };
 
 /**
@@ -264,9 +296,7 @@ export const parseFunction = (functionStr, options = {}) => {
             : node.value;
         // null
         case "NullLiteral":
-          return shouldUseVariableFormat
-            ? newVarInputVal("var", "null")
-            : null;
+          return shouldUseVariableFormat ? newVarInputVal("var", "null") : null;
         case "Identifier":
           // 标识符（变量）总是不带引号的
           return shouldUseVariableFormat

From dc7a2c90495f74dffa65408c2f477bc95b2cc70e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 19:35:02 +0800
Subject: [PATCH 026/332] =?UTF-8?q?=E6=95=B0=E5=AD=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=88=B6=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/math/conversion.js   | 210 +++---------------
 plugin/lib/quickcomposer/math/index.js        |   2 +-
 src/components/composer/ComposerCard.vue      |   2 +
 .../composer/common/ButtonGroup.vue           |  41 +++-
 src/js/composer/commands/mathCommands.js      |  19 +-
 5 files changed, 70 insertions(+), 204 deletions(-)

diff --git a/plugin/lib/quickcomposer/math/conversion.js b/plugin/lib/quickcomposer/math/conversion.js
index 6eb00d0f..9155d3b9 100644
--- a/plugin/lib/quickcomposer/math/conversion.js
+++ b/plugin/lib/quickcomposer/math/conversion.js
@@ -1,198 +1,40 @@
 /**
- * 长度单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
+ * 进制转换
+ * @param {string|number} value 要转换的值
+ * @param {string} fromBase 源进制
+ * @param {string} toBase 目标进制
+ * @returns {string} 转换结果
  */
-function length(value, fromUnit, toUnit) {
-  const units = {
-    mm: 0.001, // 毫米
-    cm: 0.01, // 厘米
-    dm: 0.1, // 分米
-    m: 1, // 米（基准单位）
-    km: 1000, // 千米
-    in: 0.0254, // 英寸
-    ft: 0.3048, // 英尺
-    yd: 0.9144, // 码
-    mi: 1609.344, // 英里
+function base(value, fromBase, toBase) {
+  const bases = {
+    binary: 2,
+    octal: 8,
+    decimal: 10,
+    hex: 16,
   };
 
-  if (!(fromUnit in units)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
+  if (!(fromBase in bases)) {
+    throw new Error(`不支持的源进制: ${fromBase}`);
   }
-  if (!(toUnit in units)) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
+  if (!(toBase in bases)) {
+    throw new Error(`不支持的目标进制: ${toBase}`);
   }
 
-  // 先转换为米，再转换为目标单位
-  return (value * units[fromUnit]) / units[toUnit];
-}
-
-/**
- * 重量单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
- */
-function weight(value, fromUnit, toUnit) {
-  const units = {
-    mg: 0.001, // 毫克
-    g: 1, // 克（基准单位）
-    kg: 1000, // 千克
-    t: 1000000, // 吨
-    oz: 28.3495, // 盎司
-    lb: 453.592, // 磅
-  };
-
-  if (!(fromUnit in units)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
-  }
-  if (!(toUnit in units)) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
-  }
-
-  // 先转换为克，再转换为目标单位
-  return (value * units[fromUnit]) / units[toUnit];
-}
-
-/**
- * 面积单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
- */
-function area(value, fromUnit, toUnit) {
-  const units = {
-    mm2: 0.000001, // 平方毫米
-    cm2: 0.0001, // 平方厘米
-    dm2: 0.01, // 平方分米
-    m2: 1, // 平方米（基准单位）
-    km2: 1000000, // 平方千米
-    ha: 10000, // 公顷
-    in2: 0.00064516, // 平方英寸
-    ft2: 0.092903, // 平方英尺
-    yd2: 0.836127, // 平方码
-    ac: 4046.86, // 英亩
-    mi2: 2589988.11, // 平方英里
-  };
-
-  if (!(fromUnit in units)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
-  }
-  if (!(toUnit in units)) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
-  }
-
-  // 先转换为平方米，再转换为目标单位
-  return (value * units[fromUnit]) / units[toUnit];
-}
-
-/**
- * 体积单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
- */
-function volume(value, fromUnit, toUnit) {
-  const units = {
-    ml: 0.001, // 毫升
-    l: 1, // 升（基准单位）
-    m3: 1000, // 立方米
-    cm3: 0.001, // 立方厘米
-    mm3: 0.000001, // 立方毫米
-    gal: 3.78541, // 加仑（美制）
-    qt: 0.946353, // 夸脱（美制）
-    pt: 0.473176, // 品脱（美制）
-    cup: 0.236588, // 杯（美制）
-    floz: 0.0295735, // 液量盎司（美制）
-  };
-
-  if (!(fromUnit in units)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
+  // 先转为十进制
+  let decimal;
+  if (fromBase === "decimal") {
+    decimal = Number(value);
+  } else {
+    decimal = parseInt(String(value), bases[fromBase]);
   }
-  if (!(toUnit in units)) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
-  }
-
-  // 先转换为升，再转换为目标单位
-  return (value * units[fromUnit]) / units[toUnit];
-}
 
-/**
- * 温度单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
- */
-function temperature(value, fromUnit, toUnit) {
-  const conversions = {
-    C: {
-      F: (v) => (v * 9) / 5 + 32,
-      K: (v) => v + 273.15,
-      C: (v) => v,
-    },
-    F: {
-      C: (v) => ((v - 32) * 5) / 9,
-      K: (v) => ((v - 32) * 5) / 9 + 273.15,
-      F: (v) => v,
-    },
-    K: {
-      C: (v) => v - 273.15,
-      F: (v) => ((v - 273.15) * 9) / 5 + 32,
-      K: (v) => v,
-    },
-  };
-
-  if (!(fromUnit in conversions)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
-  }
-  if (!(toUnit in conversions[fromUnit])) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
+  // 再转为目标进制
+  if (toBase === "decimal") {
+    return String(decimal);
   }
-
-  return conversions[fromUnit][toUnit](value);
-}
-
-/**
- * 时间单位转换
- * @param {number} value 数值
- * @param {string} fromUnit 源单位
- * @param {string} toUnit 目标单位
- * @returns {number} 转换结果
- */
-function time(value, fromUnit, toUnit) {
-  const units = {
-    ms: 0.001, // 毫秒
-    s: 1, // 秒（基准单位）
-    min: 60, // 分钟
-    h: 3600, // 小时
-    d: 86400, // 天
-    w: 604800, // 周
-    mo: 2592000, // 月（按30天计算）
-    y: 31536000, // 年（按365天计算）
-  };
-
-  if (!(fromUnit in units)) {
-    throw new Error(`不支持的源单位: ${fromUnit}`);
-  }
-  if (!(toUnit in units)) {
-    throw new Error(`不支持的目标单位: ${toUnit}`);
-  }
-
-  // 先转换为秒，再转换为目标单位
-  return (value * units[fromUnit]) / units[toUnit];
+  return decimal.toString(bases[toBase]);
 }
 
 module.exports = {
-  length,
-  weight,
-  area,
-  volume,
-  temperature,
-  time,
+  base,
 };
diff --git a/plugin/lib/quickcomposer/math/index.js b/plugin/lib/quickcomposer/math/index.js
index a56ef92b..75546a47 100644
--- a/plugin/lib/quickcomposer/math/index.js
+++ b/plugin/lib/quickcomposer/math/index.js
@@ -10,6 +10,6 @@ module.exports = {
   statistics,
   geometry,
   trigonometry,
-  conversion,
   random,
+  conversion,
 };
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index d24de261..c0d044f9 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -148,6 +148,8 @@ export default defineComponent({
       }
     },
     runCommand() {
+      if (!this.localCommand.code)
+        return quickcommand.showMessageBox("请检查参数是否正确", "info");
       // 创建一个带临时变量的命令副本
       const tempCommand = {
         ...this.localCommand,
diff --git a/src/components/composer/common/ButtonGroup.vue b/src/components/composer/common/ButtonGroup.vue
index c2b406fe..4afca6cd 100644
--- a/src/components/composer/common/ButtonGroup.vue
+++ b/src/components/composer/common/ButtonGroup.vue
@@ -1,21 +1,32 @@
 <template>
-  <div class="button-group">
-    <div
-      v-for="opt in options"
-      :key="opt.value"
-      :class="['button-item', { active: modelValue === opt.value }]"
-      @click="$emit('update:modelValue', opt.value)"
-    >
-      {{ opt.label }}
+  <component
+    :is="!!label ? 'BorderLabel' : 'div'"
+    :label="label"
+    :icon="icon"
+    :model-value="isCollapse"
+  >
+    <div class="button-group">
+      <div
+        v-for="opt in options"
+        :key="opt.value"
+        :class="['button-item', { active: modelValue === opt.value }]"
+        @click="$emit('update:modelValue', opt.value)"
+      >
+        {{ opt.label }}
+      </div>
     </div>
-  </div>
+  </component>
 </template>
 
 <script>
 import { defineComponent } from "vue";
+import BorderLabel from "./BorderLabel.vue";
 
 export default defineComponent({
   name: "ButtonGroup",
+  components: {
+    BorderLabel,
+  },
   props: {
     modelValue: {
       required: true,
@@ -24,6 +35,18 @@ export default defineComponent({
       type: Array,
       required: true,
     },
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    isCollapse: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ["update:modelValue"],
 });
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 5a90d53a..1d121aca 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -314,22 +314,23 @@ export const mathCommands = {
       ],
     },
     {
-      value: "quickcomposer.math.conversion.decimal",
-      label: "单位换算",
-      desc: "数学单位换算",
+      value: "quickcomposer.math.conversion.base",
+      label: "进制转换",
+      desc: "数字进制转换",
       icon: "swap_horiz",
       config: [
         {
           key: "value",
           label: "数值",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "pin",
           width: 12,
+          defaultValue: newVarInputVal("var", ""),
         },
         {
           key: "from",
           label: "从",
-          component: "q-select",
+          component: "ButtonGroup",
           icon: "input",
           width: 6,
           options: [
@@ -337,14 +338,13 @@ export const mathCommands = {
             { label: "二进制", value: "binary" },
             { label: "八进制", value: "octal" },
             { label: "十六进制", value: "hex" },
-            { label: "度", value: "degrees" },
-            { label: "弧度", value: "radians" },
           ],
+          defaultValue: "decimal",
         },
         {
           key: "to",
           label: "到",
-          component: "q-select",
+          component: "ButtonGroup",
           icon: "output",
           width: 6,
           options: [
@@ -352,9 +352,8 @@ export const mathCommands = {
             { label: "二进制", value: "binary" },
             { label: "八进制", value: "octal" },
             { label: "十六进制", value: "hex" },
-            { label: "度", value: "degrees" },
-            { label: "弧度", value: "radians" },
           ],
+          defaultValue: "hex",
         },
       ],
     },

From 87a2ac3133ba05b290edd8ea0297c0dc9cd1ca5d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 20:54:25 +0800
Subject: [PATCH 027/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewindows=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E3=80=81=E4=BF=AE=E6=94=B9=E9=80=8F=E6=98=8E=E5=BA=A6?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE=E3=80=81=E8=81=9A?=
 =?UTF-8?q?=E7=84=A6=E7=AA=97=E5=8F=A3=E3=80=81=E9=9A=90=E8=97=8F=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E3=80=81=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=97=E5=8F=A3=E8=BE=B9=E6=A1=86=E3=80=81?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=A9=BF=E9=80=8F=E3=80=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                 |   1 +
 plugin/lib/quickcomposer/windows/index.js   |   5 +
 plugin/lib/quickcomposer/windows/window.js  | 559 ++++++++++++++++++++
 src/js/composer/commands/index.js           |  12 +-
 src/js/composer/commands/windowsCommands.js | 207 ++++++++
 5 files changed, 782 insertions(+), 2 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/windows/index.js
 create mode 100644 plugin/lib/quickcomposer/windows/window.js
 create mode 100644 src/js/composer/commands/windowsCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index d9c379c7..edd9f0b1 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -8,6 +8,7 @@ const quickcomposer = {
   math: require("./quickcomposer/math"),
   audio: require("./quickcomposer/audio"),
   image: require("./quickcomposer/image"),
+  windows: require("./quickcomposer/windows"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
new file mode 100644
index 00000000..eec62be1
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -0,0 +1,5 @@
+const window = require("./window");
+
+module.exports = {
+  window,
+};
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
new file mode 100644
index 00000000..af160970
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -0,0 +1,559 @@
+/**
+ * 窗口置顶
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {boolean} isTopMost 是否置顶
+ */
+async function setTopMost(method, value, isTopMost) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+      static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
+      const uint SWP_NOMOVE = 0x0002;
+      const uint SWP_NOSIZE = 0x0001;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          SetWindowPos(hwnd, ${
+            isTopMost ? "HWND_TOPMOST" : "HWND_NOTOPMOST"
+          }, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口透明度
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {number} opacity 透明度 0-100
+ */
+async function setOpacity(method, value, opacity) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
+
+      [DllImport("user32.dll")]
+      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const int GWL_EXSTYLE = -20;
+      const int WS_EX_LAYERED = 0x80000;
+      const uint LWA_ALPHA = 0x2;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          SetWindowLong(hwnd, GWL_EXSTYLE, WS_EX_LAYERED);
+          SetLayeredWindowAttributes(hwnd, 0, (byte)(${opacity} * 2.55), LWA_ALPHA);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口位置和大小
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {number} x X坐标
+ * @param {number} y Y坐标
+ * @param {number} width 宽度
+ * @param {number} height 高度
+ */
+async function setWindowRect(method, value, x, y, width, height) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          MoveWindow(hwnd, ${x}, ${y}, ${width}, ${height}, true);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口状态
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {string} state 状态：normal/maximize/minimize
+ */
+async function setWindowState(method, value, state) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const int SW_NORMAL = 1;
+      const int SW_MAXIMIZE = 3;
+      const int SW_MINIMIZE = 6;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          ShowWindow(hwnd, ${
+            state === "maximize"
+              ? "SW_MAXIMIZE"
+              : state === "minimize"
+              ? "SW_MINIMIZE"
+              : "SW_NORMAL"
+          });
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 关闭窗口
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ */
+async function closeWindow(method, value) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const uint WM_CLOSE = 0x0010;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          PostMessage(hwnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口焦点
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ */
+async function setFocus(method, value) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool SetForegroundWindow(IntPtr hWnd);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          SetForegroundWindow(hwnd);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口边框
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {boolean} hasBorder 是否显示边框
+ */
+async function setBorder(method, value, hasBorder) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+      [DllImport("user32.dll")]
+      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const int GWL_STYLE = -16;
+      const int WS_BORDER = 0x00800000;
+      const int WS_DLGFRAME = 0x00400000;
+      const int WS_CAPTION = WS_BORDER | WS_DLGFRAME;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          int style = GetWindowLong(hwnd, GWL_STYLE);
+          if (${hasBorder}) {
+            style |= WS_CAPTION;
+          } else {
+            style &= ~WS_CAPTION;
+          }
+          SetWindowLong(hwnd, GWL_STYLE, style);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 设置窗口点击穿透
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {boolean} isTransparent 是否点击穿透
+ */
+async function setClickThrough(method, value, isTransparent) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+      [DllImport("user32.dll")]
+      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const int GWL_EXSTYLE = -20;
+      const int WS_EX_TRANSPARENT = 0x00000020;
+      const int WS_EX_LAYERED = 0x80000;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+          exStyle |= WS_EX_LAYERED;
+          if (${isTransparent}) {
+            exStyle |= WS_EX_TRANSPARENT;
+          } else {
+            exStyle &= ~WS_EX_TRANSPARENT;
+          }
+          SetWindowLong(hwnd, GWL_EXSTYLE, exStyle);
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 获取窗口信息
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @returns {Object} 窗口信息
+ */
+async function getWindowInfo(method, value) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Web.Script.Serialization;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+      [DllImport("user32.dll")]
+      static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
+
+      [DllImport("user32.dll")]
+      static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+      [DllImport("user32.dll")]
+      static extern bool IsWindowVisible(IntPtr hWnd);
+
+      [DllImport("user32.dll")]
+      static extern bool IsIconic(IntPtr hWnd);
+
+      [DllImport("user32.dll")]
+      static extern bool IsZoomed(IntPtr hWnd);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      [DllImport("user32.dll")]
+      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+      [DllImport("user32.dll")]
+      static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+      [StructLayout(LayoutKind.Sequential)]
+      public struct RECT {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+      }
+
+      const int GWL_STYLE = -16;
+      const int GWL_EXSTYLE = -20;
+      const int WS_BORDER = 0x00800000;
+      const int WS_CAPTION = 0x00C00000;
+      const int WS_CHILD = 0x40000000;
+      const int WS_POPUP = unchecked((int)0x80000000);
+      const int WS_SYSMENU = 0x00080000;
+      const int WS_MINIMIZEBOX = 0x00020000;
+      const int WS_MAXIMIZEBOX = 0x00010000;
+      const int WS_EX_TOPMOST = 0x00000008;
+      const int WS_EX_TRANSPARENT = 0x00000020;
+      const int WS_EX_TOOLWINDOW = 0x00000080;
+      const int WS_EX_LAYERED = 0x00080000;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          var windowRect = new RECT();
+          GetWindowRect(hwnd, out windowRect);
+
+          var clientRect = new RECT();
+          GetClientRect(hwnd, out clientRect);
+
+          var titleText = new StringBuilder(256);
+          GetWindowText(hwnd, titleText, 256);
+
+          var className = new StringBuilder(256);
+          GetClassName(hwnd, className, 256);
+
+          uint processId = 0;
+          GetWindowThreadProcessId(hwnd, out processId);
+
+          string processName = "";
+          string processPath = "";
+          try {
+            Process process = Process.GetProcessById((int)processId);
+            processName = process.ProcessName;
+
+            var startInfo = new ProcessStartInfo {
+              FileName = "wmic",
+              Arguments = string.Format("process where ProcessId={0} get ExecutablePath /value", processId),
+              UseShellExecute = false,
+              RedirectStandardOutput = true,
+              CreateNoWindow = true
+            };
+            using (var proc = Process.Start(startInfo)) {
+              string output = proc.StandardOutput.ReadToEnd();
+              if (!string.IsNullOrEmpty(output)) {
+                string[] lines = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string line in lines) {
+                  if (line.StartsWith("ExecutablePath=")) {
+                    processPath = line.Substring("ExecutablePath=".Length);
+                    break;
+                  }
+                }
+              }
+            }
+          } catch {}
+
+          int style = GetWindowLong(hwnd, GWL_STYLE);
+          int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+
+          var data = new {
+            handle = hwnd.ToInt64(),
+            processId = processId,
+            process = new {
+              name = processName,
+              path = processPath
+            },
+            title = titleText.ToString(),
+            className = className.ToString(),
+            window = new {
+              x = windowRect.Left,
+              y = windowRect.Top,
+              width = windowRect.Right - windowRect.Left,
+              height = windowRect.Bottom - windowRect.Top
+            },
+            client = new {
+              width = clientRect.Right - clientRect.Left,
+              height = clientRect.Bottom - clientRect.Top
+            },
+            state = new {
+              visible = IsWindowVisible(hwnd),
+              minimized = IsIconic(hwnd),
+              maximized = IsZoomed(hwnd),
+              focused = GetForegroundWindow() == hwnd
+            },
+            style = new {
+              border = (style & WS_BORDER) != 0,
+              caption = (style & WS_CAPTION) != 0,
+              child = (style & WS_CHILD) != 0,
+              popup = (style & WS_POPUP) != 0,
+              sysmenu = (style & WS_SYSMENU) != 0,
+              minimizeBox = (style & WS_MINIMIZEBOX) != 0,
+              maximizeBox = (style & WS_MAXIMIZEBOX) != 0
+            },
+            exStyle = new {
+              topmost = (exStyle & WS_EX_TOPMOST) != 0,
+              transparent = (exStyle & WS_EX_TRANSPARENT) != 0,
+              toolWindow = (exStyle & WS_EX_TOOLWINDOW) != 0,
+              layered = (exStyle & WS_EX_LAYERED) != 0
+            }
+          };
+
+          var serializer = new JavaScriptSerializer();
+          Console.WriteLine(serializer.Serialize(data));
+        }
+      }
+    }
+  `;
+
+  const result = await quickcommand.runCsharp(script);
+  return JSON.parse(result);
+}
+
+/**
+ * 设置窗口可见性
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {boolean} visible 是否可见
+ */
+async function setVisible(method, value, visible) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+    using System.Diagnostics;
+    using System.Management;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      const int SW_HIDE = 0;
+      const int SW_SHOW = 5;
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          ShowWindow(hwnd, ${visible ? "SW_SHOW" : "SW_HIDE"});
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 根据不同方式查找窗口
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @returns {string} C#代码片段
+ */
+function findWindowByMethod(method, value) {
+  switch (method) {
+    case "handle":
+      return `IntPtr hwnd = new IntPtr(${value});`;
+    case "active":
+      return `IntPtr hwnd = GetForegroundWindow();`;
+    default: // title
+      return `IntPtr hwnd = FindWindow(null, "${value}");`;
+  }
+}
+
+module.exports = {
+  setTopMost,
+  setOpacity,
+  setWindowRect,
+  setWindowState,
+  setVisible,
+  closeWindow,
+  setFocus,
+  setBorder,
+  setClickThrough,
+  getWindowInfo,
+};
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 5c671197..4d6329b0 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -14,8 +14,9 @@ import { utoolsCommands } from "./utoolsCommand";
 import { screenCommands } from "./screenCommands";
 import { audioCommands } from "./audioCommands";
 import { imageCommands } from "./imageCommands";
+import { windowsCommands } from "./windowsCommands";
 
-export const commandCategories = [
+let commands = [
   fileCommands,
   networkCommands,
   systemCommands,
@@ -31,5 +32,12 @@ export const commandCategories = [
   mathCommands,
   userdataCommands,
   screenCommands,
-  otherCommands,
 ];
+
+if (window.utools.isWindows()) {
+  commands.push(windowsCommands);
+}
+
+commands.push(otherCommands);
+
+export const commandCategories = commands;
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
new file mode 100644
index 00000000..0f0eed5c
--- /dev/null
+++ b/src/js/composer/commands/windowsCommands.js
@@ -0,0 +1,207 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+export const windowsCommands = {
+  label: "Windows工具",
+  icon: "window",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.windows.window.setTopMost",
+      label: "窗口控制",
+      desc: "Windows窗口操作",
+      icon: "window",
+      config: [
+        {
+          key: "method",
+          label: "查找方式",
+          component: "q-select",
+          icon: "search",
+          width: 3,
+          options: [
+            { label: "标题", value: "title" },
+            { label: "句柄", value: "handle" },
+            { label: "活动窗口", value: "active" },
+          ],
+          defaultValue: "title",
+        },
+        {
+          key: "value",
+          label: "窗口标题/句柄",
+          component: "VariableInput",
+          icon: "title",
+          width: 9,
+          placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.windows.window.setTopMost",
+          label: "窗口置顶",
+          icon: "vertical_align_top",
+          config: [
+            {
+              key: "isTopMost",
+              component: "ButtonGroup",
+              icon: "push_pin",
+              width: 12,
+              options: [
+                { label: "置顶", value: true },
+                { label: "取消置顶", value: false },
+              ],
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.setOpacity",
+          label: "窗口透明度",
+          icon: "opacity",
+          config: [
+            {
+              key: "opacity",
+              label: "透明度",
+              component: "NumberInput",
+              icon: "opacity",
+              width: 12,
+              min: 0,
+              max: 100,
+              defaultValue: 80,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.setWindowRect",
+          label: "窗口位置大小",
+          icon: "aspect_ratio",
+          config: [
+            {
+              key: "x",
+              label: "X坐标",
+              component: "NumberInput",
+              icon: "arrow_right",
+              width: 6,
+              defaultValue: 0,
+            },
+            {
+              key: "y",
+              label: "Y坐标",
+              component: "NumberInput",
+              icon: "arrow_drop_down",
+              width: 6,
+              defaultValue: 0,
+            },
+            {
+              key: "width",
+              label: "宽度",
+              component: "NumberInput",
+              icon: "swap_horiz",
+              width: 6,
+              min: 0,
+              defaultValue: 800,
+            },
+            {
+              key: "height",
+              label: "高度",
+              component: "NumberInput",
+              icon: "height",
+              width: 6,
+              min: 0,
+              defaultValue: 600,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.setWindowState",
+          label: "窗口状态",
+          icon: "open_in_full",
+          config: [
+            {
+              key: "state",
+              component: "ButtonGroup",
+              icon: "aspect_ratio",
+              width: 12,
+              options: [
+                { label: "最大化", value: "maximize" },
+                { label: "最小化", value: "minimize" },
+                { label: "还原", value: "normal" },
+              ],
+              defaultValue: "maximize",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.setVisible",
+          label: "窗口可见性",
+          icon: "visibility",
+          config: [
+            {
+              key: "visible",
+              component: "ButtonGroup",
+              icon: "visibility",
+              width: 12,
+              options: [
+                { label: "显示", value: true },
+                { label: "隐藏", value: false },
+              ],
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.closeWindow",
+          label: "关闭窗口",
+          icon: "close",
+        },
+        {
+          value: "quickcomposer.windows.window.setFocus",
+          label: "聚焦窗口",
+          icon: "front_hand",
+        },
+        {
+          value: "quickcomposer.windows.window.setBorder",
+          label: "窗口边框",
+          icon: "border_style",
+          config: [
+            {
+              key: "hasBorder",
+              component: "ButtonGroup",
+              icon: "border_style",
+              width: 12,
+              options: [
+                { label: "显示边框", value: true },
+                { label: "隐藏边框", value: false },
+              ],
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.setClickThrough",
+          label: "点击穿透",
+          icon: "touch_app",
+          config: [
+            {
+              key: "isTransparent",
+              component: "ButtonGroup",
+              icon: "touch_app",
+              width: 12,
+              options: [
+                { label: "开启穿透", value: true },
+                { label: "关闭穿透", value: false },
+              ],
+              defaultValue: false,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.window.getWindowInfo",
+          label: "窗口信息",
+          icon: "info",
+          outputVariable: "windowInfo",
+          saveOutput: true,
+        },
+      ],
+      isAsync: true,
+    },
+  ],
+};

From bf5a2306d06df5328262dc28f9d11aaa154f9cda Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 21:07:49 +0800
Subject: [PATCH 028/332] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=88=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/windows/index.js   |   2 +
 plugin/lib/quickcomposer/windows/message.js | 316 ++++++++++++++++++++
 src/js/composer/commands/windowsCommands.js | 220 ++++++++++++++
 3 files changed, 538 insertions(+)
 create mode 100644 plugin/lib/quickcomposer/windows/message.js

diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index eec62be1..e5a7774e 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -1,5 +1,7 @@
 const window = require("./window");
+const message = require("./message");
 
 module.exports = {
   window,
+  message,
 };
diff --git a/plugin/lib/quickcomposer/windows/message.js b/plugin/lib/quickcomposer/windows/message.js
new file mode 100644
index 00000000..d4eaa7ff
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/message.js
@@ -0,0 +1,316 @@
+/**
+ * 发送窗口消息
+ * @param {string} method 查找方式：title/handle/active
+ * @param {string} value 查找值（handle时为数字）
+ * @param {string} type 消息类型：click/key/text/custom
+ * @param {Object} params 消息参数
+ */
+async function sendMessage(method, value, type, params) {
+  let messageScript = "";
+
+  switch (type) {
+    case "click":
+      messageScript = `
+        const uint WM_LBUTTONDOWN = 0x0201;
+        const uint WM_LBUTTONUP = 0x0202;
+        const uint WM_RBUTTONDOWN = 0x0204;
+        const uint WM_RBUTTONUP = 0x0205;
+        const uint WM_MBUTTONDOWN = 0x0207;
+        const uint WM_MBUTTONUP = 0x0208;
+
+        IntPtr wParam = IntPtr.Zero;
+        IntPtr lParam = (IntPtr)((${params.y} << 16) | ${params.x});
+
+        switch("${params.button}") {
+          case "left":
+            PostMessage(hwnd, WM_LBUTTONDOWN, wParam, lParam);
+            PostMessage(hwnd, WM_LBUTTONUP, wParam, lParam);
+            break;
+          case "right":
+            PostMessage(hwnd, WM_RBUTTONDOWN, wParam, lParam);
+            PostMessage(hwnd, WM_RBUTTONUP, wParam, lParam);
+            break;
+          case "middle":
+            PostMessage(hwnd, WM_MBUTTONDOWN, wParam, lParam);
+            PostMessage(hwnd, WM_MBUTTONUP, wParam, lParam);
+            break;
+        }`;
+      break;
+
+    case "key":
+      messageScript = `
+        const uint WM_KEYDOWN = 0x0100;
+        const uint WM_KEYUP = 0x0101;
+        const uint WM_CHAR = 0x0102;
+
+        // 处理组合键
+        int modifiers = 0;
+        if(${params.ctrl}) modifiers |= 0x0008;
+        if(${params.alt}) modifiers |= 0x0001;
+        if(${params.shift}) modifiers |= 0x0004;
+
+        IntPtr wParam = (IntPtr)${params.keyCode};
+        IntPtr lParam = (IntPtr)((0x00000001 | (modifiers << 16)));
+
+        PostMessage(hwnd, WM_KEYDOWN, wParam, lParam);
+        if(!${params.hold}) {
+          PostMessage(hwnd, WM_KEYUP, wParam, lParam);
+        }`;
+      break;
+
+    case "text":
+      messageScript = `
+        const uint WM_CHAR = 0x0102;
+        string text = @"${params.text}";
+
+        foreach(char c in text) {
+          PostMessage(hwnd, WM_CHAR, (IntPtr)c, IntPtr.Zero);
+        }`;
+      break;
+
+    case "custom":
+      messageScript = `
+        uint msg = ${params.message};
+        IntPtr wParam = (IntPtr)${params.wParam};
+        IntPtr lParam = (IntPtr)${params.lParam};
+
+        PostMessage(hwnd, msg, wParam, lParam);`;
+      break;
+  }
+
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          ${messageScript}
+        }
+      }
+    }
+  `;
+
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 发送鼠标点击消息
+ */
+async function sendMouseClick(method, value, params) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          const uint WM_LBUTTONDOWN = 0x0201;
+          const uint WM_LBUTTONUP = 0x0202;
+          const uint WM_RBUTTONDOWN = 0x0204;
+          const uint WM_RBUTTONUP = 0x0205;
+          const uint WM_MBUTTONDOWN = 0x0207;
+          const uint WM_MBUTTONUP = 0x0208;
+
+          IntPtr wParam = IntPtr.Zero;
+          IntPtr lParam = (IntPtr)((${params.y} << 16) | ${params.x});
+
+          switch("${params.button}") {
+            case "left":
+              PostMessage(hwnd, WM_LBUTTONDOWN, wParam, lParam);
+              PostMessage(hwnd, WM_LBUTTONUP, wParam, lParam);
+              break;
+            case "right":
+              PostMessage(hwnd, WM_RBUTTONDOWN, wParam, lParam);
+              PostMessage(hwnd, WM_RBUTTONUP, wParam, lParam);
+              break;
+            case "middle":
+              PostMessage(hwnd, WM_MBUTTONDOWN, wParam, lParam);
+              PostMessage(hwnd, WM_MBUTTONUP, wParam, lParam);
+              break;
+          }
+        }
+      }
+    }
+  `;
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 发送键盘按键消息
+ */
+async function sendKeyPress(method, value, params) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          const uint WM_KEYDOWN = 0x0100;
+          const uint WM_KEYUP = 0x0101;
+          const uint WM_CHAR = 0x0102;
+
+          int modifiers = 0;
+          if(${params.ctrl}) modifiers |= 0x0008;
+          if(${params.alt}) modifiers |= 0x0001;
+          if(${params.shift}) modifiers |= 0x0004;
+
+          IntPtr wParam = (IntPtr)${params.keyCode};
+          IntPtr lParam = (IntPtr)((0x00000001 | (modifiers << 16)));
+
+          PostMessage(hwnd, WM_KEYDOWN, wParam, lParam);
+          if(!${params.hold}) {
+            PostMessage(hwnd, WM_KEYUP, wParam, lParam);
+          }
+        }
+      }
+    }
+  `;
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 发送文本输入消息
+ */
+async function sendText(method, value, params) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          const uint WM_CHAR = 0x0102;
+          string text = @"${params.text}";
+
+          foreach(char c in text) {
+            PostMessage(hwnd, WM_CHAR, (IntPtr)c, IntPtr.Zero);
+          }
+        }
+      }
+    }
+  `;
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 发送窗口命令消息
+ */
+async function sendCommand(method, value, params) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          uint msg = ${params.message};
+          IntPtr wParam = (IntPtr)${params.wParam};
+          IntPtr lParam = (IntPtr)${params.lParam};
+
+          PostMessage(hwnd, msg, wParam, lParam);
+        }
+      }
+    }
+  `;
+  await quickcommand.runCsharp(script);
+}
+
+/**
+ * 发送自定义消息
+ */
+async function sendCustom(method, value, params) {
+  const script = `
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Text;
+
+    public class Program {
+      [DllImport("user32.dll")]
+      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+      [DllImport("user32.dll")]
+      static extern IntPtr GetForegroundWindow();
+
+      public static void Main() {
+        ${findWindowByMethod(method, value)}
+        if (hwnd != IntPtr.Zero) {
+          uint msg = ${params.message};
+          IntPtr wParam = (IntPtr)${params.wParam};
+          IntPtr lParam = (IntPtr)${params.lParam};
+
+          PostMessage(hwnd, msg, wParam, lParam);
+        }
+      }
+    }
+  `;
+  await quickcommand.runCsharp(script);
+}
+
+module.exports = {
+  sendMessage,
+  sendMouseClick,
+  sendKeyPress,
+  sendText,
+  sendCommand,
+  sendCustom,
+};
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 0f0eed5c..046615a1 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -203,5 +203,225 @@ export const windowsCommands = {
       ],
       isAsync: true,
     },
+    {
+      value: "quickcomposer.windows.message.sendMouseClick",
+      label: "发送消息",
+      icon: "send",
+      isAsync: true,
+      config: [
+        {
+          key: "method",
+          label: "查找方式",
+          component: "q-select",
+          icon: "search",
+          width: 3,
+          options: [
+            { label: "标题", value: "title" },
+            { label: "句柄", value: "handle" },
+            { label: "活动窗口", value: "active" },
+          ],
+          defaultValue: "title",
+        },
+        {
+          key: "value",
+          label: "窗口标题/句柄",
+          component: "VariableInput",
+          icon: "title",
+          width: 9,
+          placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.windows.message.sendMouseClick",
+          label: "鼠标点击",
+          icon: "mouse",
+          config: [
+            {
+              key: "type",
+              defaultValue: "click",
+              hidden: true,
+            },
+            {
+              key: "button",
+              label: "按键",
+              component: "q-select",
+              icon: "mouse",
+              width: 4,
+              options: [
+                { label: "左键", value: "left" },
+                { label: "右键", value: "right" },
+                { label: "中键", value: "middle" },
+              ],
+              defaultValue: "left",
+            },
+            {
+              key: "x",
+              label: "X坐标",
+              component: "NumberInput",
+              icon: "arrow_right",
+              width: 4,
+              defaultValue: 0,
+            },
+            {
+              key: "y",
+              label: "Y坐标",
+              component: "NumberInput",
+              icon: "arrow_drop_down",
+              width: 4,
+              defaultValue: 0,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.message.sendKeyPress",
+          label: "键盘按键",
+          icon: "keyboard",
+          config: [
+            {
+              key: "type",
+              defaultValue: "key",
+              hidden: true,
+            },
+            {
+              key: "keyCode",
+              label: "按键码",
+              component: "NumberInput",
+              icon: "keyboard",
+              width: 6,
+              defaultValue: 0,
+            },
+            {
+              key: "ctrl",
+              label: "Ctrl",
+              component: "Switch",
+              width: 3,
+              defaultValue: false,
+            },
+            {
+              key: "alt",
+              label: "Alt",
+              component: "Switch",
+              width: 3,
+              defaultValue: false,
+            },
+            {
+              key: "shift",
+              label: "Shift",
+              component: "Switch",
+              width: 3,
+              defaultValue: false,
+            },
+            {
+              key: "hold",
+              label: "按住",
+              component: "Switch",
+              width: 3,
+              defaultValue: false,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.message.sendText",
+          label: "文本输入",
+          icon: "text_fields",
+          config: [
+            {
+              key: "type",
+              defaultValue: "text",
+              hidden: true,
+            },
+            {
+              key: "text",
+              label: "文本内容",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.message.sendCommand",
+          label: "窗口命令",
+          icon: "window",
+          config: [
+            {
+              key: "type",
+              defaultValue: "custom",
+              hidden: true,
+            },
+            {
+              key: "message",
+              label: "命令",
+              component: "q-select",
+              icon: "code",
+              width: 12,
+              options: [
+                { label: "关闭窗口", value: "0x0010" }, // WM_CLOSE
+                { label: "销毁窗口", value: "0x0002" }, // WM_DESTROY
+                { label: "激活窗口", value: "0x0006" }, // WM_ACTIVATE
+                { label: "显示窗口", value: "0x0018" }, // WM_SHOWWINDOW
+                { label: "重绘窗口", value: "0x000F" }, // WM_PAINT
+                { label: "窗口尺寸", value: "0x0005" }, // WM_SIZE
+                { label: "窗口位置", value: "0x0003" }, // WM_MOVE
+              ],
+              defaultValue: "0x0010",
+            },
+            {
+              key: "wParam",
+              label: "参数1",
+              component: "NumberInput",
+              icon: "input",
+              width: 6,
+              defaultValue: 0,
+            },
+            {
+              key: "lParam",
+              label: "参数2",
+              component: "NumberInput",
+              icon: "input",
+              width: 6,
+              defaultValue: 0,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.message.sendCustom",
+          label: "自定义消息",
+          icon: "settings",
+          config: [
+            {
+              key: "type",
+              defaultValue: "custom",
+              hidden: true,
+            },
+            {
+              key: "message",
+              label: "消息ID",
+              component: "NumberInput",
+              icon: "tag",
+              width: 12,
+              defaultValue: 0,
+            },
+            {
+              key: "wParam",
+              label: "wParam",
+              component: "NumberInput",
+              icon: "input",
+              width: 6,
+              defaultValue: 0,
+            },
+            {
+              key: "lParam",
+              label: "lParam",
+              component: "NumberInput",
+              icon: "input",
+              width: 6,
+              defaultValue: 0,
+            },
+          ],
+        },
+      ],
+    },
   ],
 };

From e7da2d3a26ab3fdd493bf2e06b72e97b45031643 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 10 Jan 2025 22:35:19 +0800
Subject: [PATCH 029/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E8=A1=A5=E5=85=A8uTo?=
 =?UTF-8?q?ols=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=80=89=E4=B8=AD=E6=96=87=E4=BB=B6=E3=80=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E3=80=81=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                   |   1 +
 .../lib/quickcomposer/status/getSelected.js   | 115 ++++++++++++++++++
 plugin/lib/quickcomposer/status/index.js      |   7 ++
 src/js/composer/commands/index.js             |   2 +
 src/js/composer/commands/statusCommands.js    |  51 ++++++++
 src/js/composer/commands/systemCommands.js    |  94 ++++++++++++++
 src/js/composer/commands/utoolsCommand.js     |  14 +++
 7 files changed, 284 insertions(+)
 create mode 100644 plugin/lib/quickcomposer/status/getSelected.js
 create mode 100644 plugin/lib/quickcomposer/status/index.js
 create mode 100644 src/js/composer/commands/statusCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index edd9f0b1..c3ab1b24 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -9,6 +9,7 @@ const quickcomposer = {
   audio: require("./quickcomposer/audio"),
   image: require("./quickcomposer/image"),
   windows: require("./quickcomposer/windows"),
+  status: require("./quickcomposer/status"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/status/getSelected.js b/plugin/lib/quickcomposer/status/getSelected.js
new file mode 100644
index 00000000..33446330
--- /dev/null
+++ b/plugin/lib/quickcomposer/status/getSelected.js
@@ -0,0 +1,115 @@
+const { clipboard } = require("electron");
+
+/**
+ * 获取当前选中的文本
+ * @returns {Promise<string>} 选中的文本内容
+ */
+function text() {
+  window.utools.hideMainWindow();
+  // 保存当前剪贴板内容
+  const originalText = clipboard.readText();
+
+  // 模拟 Ctrl+C/Command+C 复制操作
+  if (process.platform === "darwin") {
+    utools.simulateKeyboardTap("c", "command");
+  } else {
+    utools.simulateKeyboardTap("c", "control");
+  }
+
+  // 等待一小段时间确保复制完成
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      // 获取选中的文本
+      const selectedText = clipboard.readText();
+
+      // 恢复原始剪贴板内容
+      clipboard.writeText(originalText);
+
+      resolve(selectedText);
+    }, 100);
+  });
+}
+
+/**
+ * 获取当前选中的图片
+ * @returns {Promise<string>} 选中的图片的base64数据
+ */
+function image() {
+  window.utools.hideMainWindow();
+  // 保存当前剪贴板内容
+  const originalImage = clipboard.readImage();
+
+  // 模拟 Ctrl+C/Command+C 复制操作
+  if (process.platform === "darwin") {
+    utools.simulateKeyboardTap("c", "command");
+  } else {
+    utools.simulateKeyboardTap("c", "control");
+  }
+
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      try {
+        // 获取剪贴板中的图片
+        const image = clipboard.readImage();
+
+        if (image.isEmpty()) {
+          // 恢复原始剪贴板内容
+          if (!originalImage.isEmpty()) {
+            clipboard.writeImage(originalImage);
+          }
+          resolve(null);
+          return;
+        }
+
+        // 将图片转换为 base64
+        const base64 = image.toDataURL();
+
+        // 恢复原始剪贴板内容
+        if (!originalImage.isEmpty()) {
+          clipboard.writeImage(originalImage);
+        }
+
+        resolve(base64);
+      } catch (error) {
+        reject(error);
+      }
+    }, 100);
+  });
+}
+
+/**
+ * 获取当前选中的文件
+ * @returns {Promise<string[]>} 选中的文件路径数组
+ */
+function files() {
+  window.utools.hideMainWindow();
+  // 保存当前剪贴板内容
+  const originalFiles = utools.getCopyedFiles();
+
+  // 模拟 Ctrl+C/Command+C 复制操作
+  if (process.platform === "darwin") {
+    utools.simulateKeyboardTap("c", "command");
+  } else {
+    utools.simulateKeyboardTap("c", "control");
+  }
+
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      // 获取选中的文件
+      const selectedFiles = utools.getCopyedFiles();
+
+      // 恢复原始剪贴板内容
+      if (originalFiles && originalFiles.length > 0) {
+        utools.copyFile(originalFiles);
+      }
+
+      resolve(selectedFiles || []);
+    }, 100);
+  });
+}
+
+module.exports = {
+  text,
+  image,
+  files,
+};
diff --git a/plugin/lib/quickcomposer/status/index.js b/plugin/lib/quickcomposer/status/index.js
new file mode 100644
index 00000000..d4509ea9
--- /dev/null
+++ b/plugin/lib/quickcomposer/status/index.js
@@ -0,0 +1,7 @@
+const getSelected = require("./getSelected");
+
+module.exports = {
+  getSelectedText: getSelected.text,
+  getSelectedImage: getSelected.image,
+  getSelectedFiles: getSelected.files,
+};
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 4d6329b0..571c9b6b 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -15,11 +15,13 @@ import { screenCommands } from "./screenCommands";
 import { audioCommands } from "./audioCommands";
 import { imageCommands } from "./imageCommands";
 import { windowsCommands } from "./windowsCommands";
+import { statusCommands } from "./statusCommands";
 
 let commands = [
   fileCommands,
   networkCommands,
   systemCommands,
+  statusCommands,
   audioCommands,
   imageCommands,
   notifyCommands,
diff --git a/src/js/composer/commands/statusCommands.js b/src/js/composer/commands/statusCommands.js
new file mode 100644
index 00000000..3d295993
--- /dev/null
+++ b/src/js/composer/commands/statusCommands.js
@@ -0,0 +1,51 @@
+export const statusCommands = {
+  label: "获取状态",
+  icon: "task",
+  commands: [
+    {
+      value: "utools.readCurrentFolderPath",
+      label: "获取当前文件管理器路径",
+      desc: "获取当前文件管理器窗口路径",
+      icon: "folder",
+      isAsync: true,
+      outputVariable: "currentFolderPath",
+      saveOutput: true,
+    },
+    {
+      value: "utools.readCurrentBrowserUrl",
+      label: "获取当前浏览器地址",
+      desc: "获取当前浏览器窗口URL",
+      icon: "language",
+      isAsync: true,
+      outputVariable: "currentBrowserUrl",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.status.getSelectedText",
+      label: "获取选中文本",
+      desc: "获取选中的文本",
+      icon: "text_fields",
+      isAsync: true,
+      outputVariable: "selectedText",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.status.getSelectedImage",
+      label: "获取选中的图片",
+      desc: "获取选中的图片",
+      icon: "image",
+      isAsync: true,
+      outputVariable: "selectedImage",
+      saveOutput: true,
+    },
+    {
+      value: "quickcomposer.status.getSelectedFiles",
+      label: "获取选中的文件",
+      desc: "获取选中的文件",
+      icon: "file_present",
+      isAsync: true,
+      outputVariable: "selectedFiles",
+      saveOutput: true,
+    },
+  ],
+};
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 5f5b609d..20a778e4 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -113,6 +113,100 @@ export const systemCommands = {
       icon: "terminal",
       isAsync: true,
     },
+    {
+      value: "utools.getPath",
+      label: "获取系统路径",
+      desc: "获取系统路径",
+      outputVariable: "systemPath",
+      saveOutput: true,
+      defaultValue: "home",
+      config: [
+        {
+          label: "路径类型",
+          component: "ButtonGroup",
+          options: [
+            {
+              label: "用户主目录",
+              value: "home",
+            },
+            {
+              label: "应用数据目录",
+              value: "appData",
+            },
+            {
+              label: "用户数据目录",
+              value: "userData",
+            },
+            {
+              label: "缓存目录",
+              value: "cache",
+            },
+            {
+              label: "临时目录",
+              value: "temp",
+            },
+            {
+              label: "桌面",
+              value: "desktop",
+            },
+            {
+              label: "文档",
+              value: "documents",
+            },
+            {
+              label: "下载",
+              value: "downloads",
+            },
+            {
+              label: "音乐",
+              value: "music",
+            },
+            {
+              label: "图片",
+              value: "pictures",
+            },
+            {
+              label: "视频",
+              value: "videos",
+            },
+            {
+              label: "uTools日志目录",
+              value: "logs",
+            },
+            {
+              label: "uTools程序目录",
+              value: "exe",
+            },
+            {
+              label: "uTools模块目录",
+              value: "module",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "utools.isMacOS",
+      label: "判断系统类型",
+      desc: "判断系统类型",
+      subCommands: [
+        {
+          value: "utools.isMacOS",
+          label: "是否Mac",
+          icon: "computer",
+        },
+        {
+          value: "utools.isWindows",
+          label: "是否Windows",
+          icon: "computer",
+        },
+        {
+          value: "utools.isLinux",
+          label: "是否Linux",
+          icon: "computer",
+        },
+      ],
+    },
     {
       value: "quickcomposer.system.os.arch",
       label: "系统信息",
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 4e0c6c07..1dfd12a2 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -183,5 +183,19 @@ export const utoolsCommands = {
       outputVariable: "windowType",
       saveOutput: true,
     },
+    {
+      value: "utools.getNativeId",
+      label: "获取本地ID",
+      desc: "获取本地ID",
+      outputVariable: "nativeId",
+      saveOutput: true,
+    },
+    {
+      value: "utools.getAppVersion",
+      label: "获取uTools版本",
+      desc: "获取uTools版本",
+      outputVariable: "appVersion",
+      saveOutput: true,
+    },
   ],
 };

From 44b740de5c783d4755de556bbddda1b89858f3b0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 01:14:13 +0800
Subject: [PATCH 030/332] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=95=B0=E7=BB=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/data/array.js        |  238 ++++
 plugin/lib/quickcomposer/data/index.js        |   10 +-
 plugin/lib/quickcomposer/data/string.js       |  189 ++-
 plugin/lib/quickcomposer/data/time.js         |  350 +++++
 src/components/composer/CommandComposer.vue   |   13 +-
 .../composer/common/ArrayEditor.vue           |   13 +-
 .../composer/common/CheckButton.vue           |  145 ++
 .../composer/common/OperationCard.vue         |   20 +-
 .../composer/common/OptionEditor.vue          |    3 +-
 src/components/composer/common/ParamInput.vue |    2 +
 .../composer/ui/SelectListEditor.vue          |    3 +-
 src/js/composer/commands/dataCommands.js      | 1188 ++++++++++++++++-
 src/js/composer/commands/networkCommands.js   |    2 +-
 src/js/composer/commands/systemCommands.js    |    2 +-
 src/js/composer/commands/uiCommands.js        |    2 +
 src/js/composer/commands/userdataCommands.js  |    2 +-
 src/js/composer/commands/utoolsCommand.js     |   22 +-
 src/js/composer/composerConfig.js             |    6 +-
 18 files changed, 2109 insertions(+), 101 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/data/array.js
 create mode 100644 plugin/lib/quickcomposer/data/time.js
 create mode 100644 src/components/composer/common/CheckButton.vue

diff --git a/plugin/lib/quickcomposer/data/array.js b/plugin/lib/quickcomposer/data/array.js
new file mode 100644
index 00000000..42a3c668
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/array.js
@@ -0,0 +1,238 @@
+const array = {
+  // 安全的条件解析器
+  _parseCondition: function (item, condition) {
+    // 支持的操作符
+    const operators = {
+      "===": (a, b) => a === b,
+      "!==": (a, b) => a !== b,
+      ">=": (a, b) => a >= b,
+      "<=": (a, b) => a <= b,
+      ">": (a, b) => a > b,
+      "<": (a, b) => a < b,
+      "&&": (a, b) => a && b,
+      "||": (a, b) => a || b,
+      includes: (a, b) => String(a).includes(b),
+      startsWith: (a, b) => String(a).startsWith(b),
+      endsWith: (a, b) => String(a).endsWith(b),
+    };
+
+    try {
+      // 简单属性访问
+      if (/^[a-zA-Z0-9_]+$/.test(condition)) {
+        return item[condition];
+      }
+
+      // 解析复杂条件
+      for (const [op, func] of Object.entries(operators)) {
+        if (condition.includes(op)) {
+          const [left, right] = condition.split(op).map((s) => s.trim());
+          const leftValue = left.includes(".")
+            ? left.split(".").reduce((obj, key) => obj[key], item)
+            : /^[a-zA-Z0-9_]+$/.test(left)
+            ? item[left]
+            : this._parseValue(left);
+          const rightValue = right.includes(".")
+            ? right.split(".").reduce((obj, key) => obj[key], item)
+            : /^[a-zA-Z0-9_]+$/.test(right)
+            ? item[right]
+            : this._parseValue(right);
+          return func(leftValue, rightValue);
+        }
+      }
+      return false;
+    } catch (error) {
+      return false;
+    }
+  },
+
+  // 解析值
+  _parseValue: function (value) {
+    if (value === "true") return true;
+    if (value === "false") return false;
+    if (value === "null") return null;
+    if (value === "undefined") return undefined;
+    if (value.startsWith("'") && value.endsWith("'")) return value.slice(1, -1);
+    if (value.startsWith('"') && value.endsWith('"')) return value.slice(1, -1);
+    if (!isNaN(value)) return Number(value);
+    return value;
+  },
+
+  // 数组过滤
+  filter: function (array, condition) {
+    if (!Array.isArray(array)) return [];
+    return array.filter((item) => this._parseCondition(item, condition));
+  },
+
+  // 查找元素
+  find: function (array, condition) {
+    if (!Array.isArray(array)) return null;
+    return array.find((item) => this._parseCondition(item, condition));
+  },
+
+  // 数组映射
+  map: function (array, transform) {
+    if (!Array.isArray(array)) return [];
+    return array.map((item) => {
+      if (/^[a-zA-Z0-9_.]+$/.test(transform)) {
+        return transform.split(".").reduce((obj, key) => obj?.[key], item);
+      }
+      return item;
+    });
+  },
+
+  // 数组排序
+  sort: function (array, key, order = "asc") {
+    if (!Array.isArray(array)) return [];
+    return [...array].sort((a, b) => {
+      const valueA = key ? a[key] : a;
+      const valueB = key ? b[key] : b;
+
+      if (typeof valueA === "string" && typeof valueB === "string") {
+        return order === "asc"
+          ? valueA.localeCompare(valueB)
+          : valueB.localeCompare(valueA);
+      }
+
+      return order === "asc" ? valueA - valueB : valueB - valueA;
+    });
+  },
+
+  // 数组分组
+  group: function (array, key) {
+    if (!Array.isArray(array) || !key) return {};
+    return array.reduce((groups, item) => {
+      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
+      if (value !== undefined) {
+        if (!groups[value]) {
+          groups[value] = [];
+        }
+        groups[value].push(item);
+      }
+      return groups;
+    }, {});
+  },
+
+  // 数组去重
+  unique: function (array, key) {
+    if (!Array.isArray(array)) return [];
+    if (!key) {
+      return [...new Set(array)];
+    }
+    const seen = new Set();
+    return array.filter((item) => {
+      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
+      if (value === undefined || seen.has(value)) {
+        return false;
+      }
+      seen.add(value);
+      return true;
+    });
+  },
+
+  // 数组聚合
+  aggregate: function (array, operation, key) {
+    if (!Array.isArray(array)) return null;
+    const values = key
+      ? array.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
+      : array;
+    const validNumbers = values.filter((v) => !isNaN(v));
+
+    switch (operation) {
+      case "sum":
+        return validNumbers.reduce((sum, val) => sum + val, 0);
+      case "avg":
+        return validNumbers.length
+          ? validNumbers.reduce((sum, val) => sum + val, 0) /
+              validNumbers.length
+          : 0;
+      case "max":
+        return validNumbers.length ? Math.max(...validNumbers) : null;
+      case "min":
+        return validNumbers.length ? Math.min(...validNumbers) : null;
+      case "count":
+        return array.length;
+      default:
+        return null;
+    }
+  },
+
+  // 数组切片
+  slice: function (array, start, end) {
+    if (!Array.isArray(array)) return [];
+    return array.slice(start, end);
+  },
+
+  // 数组扁平化
+  flatten: function (array, depth = 1) {
+    if (!Array.isArray(array)) return [];
+    return array.flat(depth);
+  },
+
+  // 数组差集
+  diff: function (array1, array2, key) {
+    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
+    if (!key) {
+      return array1.filter((item) => !array2.includes(item));
+    }
+    const set2 = new Set(
+      array2.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
+    );
+    return array1.filter(
+      (item) => !set2.has(key.split(".").reduce((obj, k) => obj?.[k], item))
+    );
+  },
+
+  // 数组交集
+  intersect: function (array1, array2, key) {
+    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
+    if (!key) {
+      return array1.filter((item) => array2.includes(item));
+    }
+    const set2 = new Set(
+      array2.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
+    );
+    return array1.filter((item) =>
+      set2.has(key.split(".").reduce((obj, k) => obj?.[k], item))
+    );
+  },
+
+  // 数组并集
+  union: function (array1, array2, key) {
+    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
+    if (!key) {
+      return [...new Set([...array1, ...array2])];
+    }
+    const seen = new Set();
+    return [...array1, ...array2].filter((item) => {
+      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
+      if (value === undefined || seen.has(value)) {
+        return false;
+      }
+      seen.add(value);
+      return true;
+    });
+  },
+
+  // 数组分块
+  chunk: function (array, size = 1) {
+    if (!Array.isArray(array) || size < 1) return [];
+    const chunks = [];
+    for (let i = 0; i < array.length; i += size) {
+      chunks.push(array.slice(i, i + size));
+    }
+    return chunks;
+  },
+
+  // 数组随机排序
+  shuffle: function (array) {
+    if (!Array.isArray(array)) return [];
+    const result = [...array];
+    for (let i = result.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [result[i], result[j]] = [result[j], result[i]];
+    }
+    return result;
+  },
+};
+
+module.exports = array;
diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index 6241c922..469db082 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -1,11 +1,15 @@
 const string = require("./string");
 const buffer = require("./buffer");
 const zlib = require("./zlib");
-const htmlParser = require("./htmlParser");
+const { htmlParser } = require("./htmlParser");
+const array = require("./array");
+const time = require("./time");
 
 module.exports = {
-  ...string,
-  ...htmlParser,
+  htmlParser,
+  string,
   buffer,
   zlib,
+  array,
+  time,
 };
diff --git a/plugin/lib/quickcomposer/data/string.js b/plugin/lib/quickcomposer/data/string.js
index 3992091f..f9050b9e 100644
--- a/plugin/lib/quickcomposer/data/string.js
+++ b/plugin/lib/quickcomposer/data/string.js
@@ -1,24 +1,195 @@
 const string = {
   // 字符串反转
-  reverseString: function (text) {
+  reverse: function (text) {
     return text.split("").reverse().join("");
   },
+
   // 字符串替换
-  replaceString: function (text, oldStr, newStr) {
+  replace: function (text, oldStr, newStr) {
     return text.replaceAll(oldStr, newStr);
   },
+
   // 字符串截取
   substring: function (text, start, end) {
     return text.substring(start, end);
   },
-  // 正则处理
-  regexTransform: function (text, regex, replace) {
-    try {
-      if (replace === undefined) return text.match(regex);
-      return text.replace(regex, replace);
-    } catch (e) {
-      throw "正则表达式格式错误";
+
+  // 去除空白
+  trim: function (text, mode = "both") {
+    switch (mode) {
+      case "start":
+        return text.trimStart();
+      case "end":
+        return text.trimEnd();
+      default:
+        return text.trim();
+    }
+  },
+
+  // 大小写转换
+  case: function (text, mode = "upper") {
+    switch (mode) {
+      case "upper":
+        return text.toUpperCase();
+      case "lower":
+        return text.toLowerCase();
+      case "capitalize":
+        return text
+          .toLowerCase()
+          .split(" ")
+          .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+          .join(" ");
+      case "camel":
+        return text
+          .toLowerCase()
+          .split(/[^a-zA-Z0-9]+/)
+          .map((word, index) =>
+            index === 0 ? word : word.charAt(0).toUpperCase() + word.slice(1)
+          )
+          .join("");
+      case "snake":
+        return text
+          .toLowerCase()
+          .replace(/[^a-zA-Z0-9]+/g, "_")
+          .replace(/([A-Z])/g, "_$1")
+          .replace(/^_/, "");
+      case "kebab":
+        return text
+          .toLowerCase()
+          .replace(/[^a-zA-Z0-9]+/g, "-")
+          .replace(/([A-Z])/g, "-$1")
+          .replace(/^-/, "");
+      case "constant":
+        return text
+          .toUpperCase()
+          .replace(/[^A-Z0-9]+/g, "_")
+          .replace(/^_/, "");
+      default:
+        return text;
+    }
+  },
+
+  // 字符串填充
+  pad: function (text, length, padString = " ", mode = "end") {
+    const totalPadding = Math.max(0, length - text.length);
+    switch (mode) {
+      case "start":
+        return text.padStart(length, padString);
+      case "end":
+        return text.padEnd(length, padString);
+      case "both":
+        const leftPadding = Math.floor(totalPadding / 2);
+        const rightPadding = totalPadding - leftPadding;
+        return text
+          .padStart(text.length + leftPadding, padString)
+          .padEnd(length, padString);
+      default:
+        return text;
+    }
+  },
+
+  // 字符串分割
+  split: function (text, separator = ",") {
+    return text.split(separator);
+  },
+
+  // 数组合并
+  join: function (array, separator = ",") {
+    return Array.isArray(array) ? array.join(separator) : String(array);
+  },
+
+  // 字符串重复
+  repeat: function (text, count = 1) {
+    return text.repeat(Math.max(0, count));
+  },
+
+  // 提取字符
+  extract: function (text, mode = "number") {
+    const patterns = {
+      number: /\d+/g,
+      letter: /[a-zA-Z]+/g,
+      chinese: /[\u4e00-\u9fa5]+/g,
+      punctuation: /[^\w\s\u4e00-\u9fa5]+/g,
+      whitespace: /\s+/g,
+    };
+    const matches = text.match(patterns[mode] || patterns.number);
+    return matches ? matches : [];
+  },
+
+  // 字符统计
+  count: function (text, mode = "char") {
+    switch (mode) {
+      case "char":
+        return text.length;
+      case "word":
+        return text.trim().split(/\s+/).length;
+      case "line":
+        return text.split(/\r\n|\r|\n/).length;
+      case "number":
+        return (text.match(/\d/g) || []).length;
+      case "letter":
+        return (text.match(/[a-zA-Z]/g) || []).length;
+      case "chinese":
+        return (text.match(/[\u4e00-\u9fa5]/g) || []).length;
+      case "whitespace":
+        return (text.match(/\s/g) || []).length;
+      default:
+        return 0;
+    }
+  },
+
+  // 文本换行
+  wrap: function (text, width = 80) {
+    const words = text.split(/(\s+)/);
+    let line = "";
+    let result = "";
+
+    for (const word of words) {
+      if (line.length + word.length > width) {
+        result += line.trimEnd() + "\n";
+        line = "";
+      }
+      line += word;
     }
+
+    return result + line.trimEnd();
+  },
+
+  // 文本对齐
+  align: function (text, mode = "left", width = 80) {
+    const lines = text.split("\n");
+    return lines
+      .map((line) => {
+        const spaces = width - line.length;
+        if (spaces <= 0) return line;
+
+        switch (mode) {
+          case "right":
+            return " ".repeat(spaces) + line;
+          case "center":
+            const leftSpaces = Math.floor(spaces / 2);
+            return (
+              " ".repeat(leftSpaces) + line + " ".repeat(spaces - leftSpaces)
+            );
+          case "justify":
+            if (line.trim() === "") return line;
+            const words = line.trim().split(/\s+/);
+            if (words.length === 1) return line;
+            const totalSpaces = width - words.join("").length;
+            const spaceBetween = Math.floor(totalSpaces / (words.length - 1));
+            const extraSpaces = totalSpaces % (words.length - 1);
+            return words
+              .map((word, i) =>
+                i < words.length - 1
+                  ? word + " ".repeat(spaceBetween + (i < extraSpaces ? 1 : 0))
+                  : word
+              )
+              .join("");
+          default:
+            return line;
+        }
+      })
+      .join("\n");
   },
 };
 
diff --git a/plugin/lib/quickcomposer/data/time.js b/plugin/lib/quickcomposer/data/time.js
new file mode 100644
index 00000000..7db96aa7
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/time.js
@@ -0,0 +1,350 @@
+const time = {
+  // 解析时间字符串或时间戳为 Date 对象
+  _parseTime: function (time) {
+    if (!time || time === "now") {
+      return new Date();
+    }
+    if (typeof time === "number") {
+      return new Date(time.toString().length === 10 ? time * 1000 : time);
+    }
+    return new Date(time);
+  },
+
+  // 格式化数字为两位数
+  _pad: function (number) {
+    return number.toString().padStart(2, "0");
+  },
+
+  // 格式化时间
+  format: function (time, format) {
+    const date = this._parseTime(time);
+    if (!date.getTime()) return "";
+
+    const year = date.getFullYear();
+    const month = this._pad(date.getMonth() + 1);
+    const day = this._pad(date.getDate());
+    const hours = this._pad(date.getHours());
+    const minutes = this._pad(date.getMinutes());
+    const seconds = this._pad(date.getSeconds());
+
+    switch (format) {
+      case "YYYY-MM-DD":
+        return `${year}-${month}-${day}`;
+      case "YYYY-MM-DD HH:mm:ss":
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      case "YYYY年MM月DD日":
+        return `${year}年${month}月${day}日`;
+      case "MM/DD/YYYY":
+        return `${month}/${day}/${year}`;
+      case "DD/MM/YYYY":
+        return `${day}/${month}/${year}`;
+      case "HH:mm:ss":
+        return `${hours}:${minutes}:${seconds}`;
+      case "YYYY-MM-DD HH:mm":
+        return `${year}-${month}-${day} ${hours}:${minutes}`;
+      case "timestamp":
+        return Math.floor(date.getTime() / 1000);
+      case "timestamp_ms":
+        return date.getTime();
+      case "relative":
+        return this._getRelativeTime(date);
+      default:
+        return date.toLocaleString();
+    }
+  },
+
+  // 获取相对时间描述
+  _getRelativeTime: function (date) {
+    const now = new Date();
+    const diff = now - date;
+    const seconds = Math.floor(diff / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.floor(hours / 24);
+    const months = Math.floor(days / 30);
+    const years = Math.floor(days / 365);
+
+    if (seconds < 60) return "刚刚";
+    if (minutes < 60) return `${minutes}分钟前`;
+    if (hours < 24) return `${hours}小时前`;
+    if (days < 30) return `${days}天前`;
+    if (months < 12) return `${months}个月前`;
+    return `${years}年前`;
+  },
+
+  // 解析时间
+  parse: function (time, format) {
+    if (!time) return null;
+
+    // 处理时间戳
+    if (format === "timestamp") {
+      return new Date(Number(time) * 1000);
+    }
+    if (format === "timestamp_ms") {
+      return new Date(Number(time));
+    }
+
+    // 处理标准格式
+    const now = new Date();
+    const year = now.getFullYear();
+    let result;
+
+    switch (format) {
+      case "YYYY-MM-DD":
+      case "YYYY-MM-DD HH:mm:ss":
+      case "YYYY-MM-DD HH:mm":
+        result = new Date(time);
+        break;
+      case "YYYY年MM月DD日":
+        time = time.replace(/[年月日]/g, (match) => {
+          return { 年: "-", 月: "-", 日: "" }[match];
+        });
+        result = new Date(time);
+        break;
+      case "MM/DD/YYYY":
+        const [month, day, yyyy] = time.split("/");
+        result = new Date(yyyy, month - 1, day);
+        break;
+      case "DD/MM/YYYY":
+        const [dd, mm, yy] = time.split("/");
+        result = new Date(yy, mm - 1, dd);
+        break;
+      default:
+        result = new Date(time);
+    }
+
+    return result.getTime() ? result : null;
+  },
+
+  // 时间加减
+  add: function (time, value, unit) {
+    const date = this._parseTime(time);
+    if (!date.getTime()) return null;
+
+    const unitMap = {
+      years: "FullYear",
+      months: "Month",
+      weeks: "Date",
+      days: "Date",
+      hours: "Hours",
+      minutes: "Minutes",
+      seconds: "Seconds",
+    };
+
+    const methodName = `set${unitMap[unit]}`;
+    const getValue = `get${unitMap[unit]}`;
+
+    if (unit === "weeks") {
+      value *= 7;
+    }
+
+    date[methodName](date[getValue]() + value);
+    return date;
+  },
+
+  // 时间差值
+  diff: function (time1, time2, unit = "days", absolute = true) {
+    const date1 = this._parseTime(time1);
+    const date2 = this._parseTime(time2);
+
+    if (!date1.getTime() || !date2.getTime()) return null;
+
+    const milliseconds = date2 - date1;
+    let result;
+
+    switch (unit) {
+      case "years":
+        result = date2.getFullYear() - date1.getFullYear();
+        break;
+      case "months":
+        result =
+          (date2.getFullYear() - date1.getFullYear()) * 12 +
+          (date2.getMonth() - date1.getMonth());
+        break;
+      case "weeks":
+        result = milliseconds / (7 * 24 * 60 * 60 * 1000);
+        break;
+      case "days":
+        result = milliseconds / (24 * 60 * 60 * 1000);
+        break;
+      case "hours":
+        result = milliseconds / (60 * 60 * 1000);
+        break;
+      case "minutes":
+        result = milliseconds / (60 * 1000);
+        break;
+      case "seconds":
+        result = milliseconds / 1000;
+        break;
+      case "milliseconds":
+        result = milliseconds;
+        break;
+      default:
+        result = milliseconds / (24 * 60 * 60 * 1000);
+    }
+
+    return absolute ? Math.abs(result) : result;
+  },
+
+  // 时间边界
+  startOf: function (time, unit, type = "start") {
+    const date = this._parseTime(time);
+    if (!date.getTime()) return null;
+
+    const isEnd = type === "end";
+
+    switch (unit) {
+      case "year":
+        date.setMonth(isEnd ? 11 : 0, 1);
+        date.setHours(
+          isEnd ? 23 : 0,
+          isEnd ? 59 : 0,
+          isEnd ? 59 : 0,
+          isEnd ? 999 : 0
+        );
+        break;
+      case "month":
+        date.setDate(1);
+        if (isEnd) {
+          date.setMonth(date.getMonth() + 1, 0);
+          date.setHours(23, 59, 59, 999);
+        } else {
+          date.setHours(0, 0, 0, 0);
+        }
+        break;
+      case "week":
+        const day = date.getDay();
+        const diff = date.getDate() - day + (day === 0 ? -6 : 1);
+        date.setDate(diff);
+        if (isEnd) {
+          date.setDate(date.getDate() + 6);
+          date.setHours(23, 59, 59, 999);
+        } else {
+          date.setHours(0, 0, 0, 0);
+        }
+        break;
+      case "day":
+        date.setHours(
+          isEnd ? 23 : 0,
+          isEnd ? 59 : 0,
+          isEnd ? 59 : 0,
+          isEnd ? 999 : 0
+        );
+        break;
+      case "hour":
+        date.setMinutes(isEnd ? 59 : 0, isEnd ? 59 : 0, isEnd ? 999 : 0);
+        break;
+      case "minute":
+        date.setSeconds(isEnd ? 59 : 0, isEnd ? 999 : 0);
+        break;
+      case "second":
+        date.setMilliseconds(isEnd ? 999 : 0);
+        break;
+    }
+
+    return date;
+  },
+
+  // 时间验证
+  isValid: function (time, format) {
+    if (!time) return false;
+    const date = this.parse(time, format);
+    return date && date.getTime() > 0;
+  },
+
+  // 日历信息
+  calendar: function (time) {
+    const date = this._parseTime(time);
+    if (!date.getTime()) return null;
+
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    const week = date.getDay();
+    const weekText = ["日", "一", "二", "三", "四", "五", "六"][week];
+
+    // 星座计算
+    const constellation = this._getConstellation(month, day);
+
+    return {
+      year,
+      month,
+      day,
+      week,
+      weekText: `星期${weekText}`,
+      constellation,
+      isWeekend: week === 0 || week === 6,
+      isLeapYear: (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0,
+      daysInMonth: new Date(year, month, 0).getDate(),
+      timestamp: Math.floor(date.getTime() / 1000),
+      timestamp_ms: date.getTime(),
+    };
+  },
+
+  // 获取星座
+  _getConstellation: function (month, day) {
+    const constellations = [
+      "魔羯",
+      "水瓶",
+      "双鱼",
+      "白羊",
+      "金牛",
+      "双子",
+      "巨蟹",
+      "狮子",
+      "处女",
+      "天秤",
+      "天蝎",
+      "射手",
+      "魔羯",
+    ];
+    const dates = [20, 19, 21, 20, 21, 22, 23, 23, 23, 24, 23, 22];
+    return day < dates[month - 1]
+      ? constellations[month - 1]
+      : constellations[month];
+  },
+
+  // 工作日计算
+  workday: function (startTime, days, weekends = false, holidays = []) {
+    const date = this._parseTime(startTime);
+    if (!date.getTime()) return null;
+
+    let currentDate = new Date(date);
+    let remainingDays = Math.abs(days);
+    const direction = days >= 0 ? 1 : -1;
+    const holidaySet = new Set(
+      holidays.map((h) => this.format(h, "YYYY-MM-DD"))
+    );
+
+    while (remainingDays > 0) {
+      currentDate.setDate(currentDate.getDate() + direction);
+      const isWeekend =
+        currentDate.getDay() === 0 || currentDate.getDay() === 6;
+      const isHoliday = holidaySet.has(this.format(currentDate, "YYYY-MM-DD"));
+
+      if ((!isWeekend || weekends) && !isHoliday) {
+        remainingDays--;
+      }
+    }
+
+    return currentDate;
+  },
+
+  // 时间范围判断
+  between: function (time, startTime, endTime, inclusive = true) {
+    const date = this._parseTime(time);
+    const start = this._parseTime(startTime);
+    const end = this._parseTime(endTime);
+
+    if (!date.getTime() || !start.getTime() || !end.getTime()) {
+      return false;
+    }
+
+    if (inclusive) {
+      return date >= start && date <= end;
+    }
+    return date > start && date < end;
+  },
+};
+
+module.exports = time;
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 54e85d50..65bba2b0 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -96,7 +96,18 @@ export default defineComponent({
     },
     saveFlow() {
       const flow = window.lodashM.cloneDeep(this.commandFlow);
-      const uselessProps = ["config", "argvs", "label", "component", "subCommands", "options", "defaultValue"];
+      const uselessProps = [
+        "config",
+        "argvs",
+        "label",
+        "component",
+        "subCommands",
+        "options",
+        "defaultValue",
+        "icon",
+        "width",
+        "placeholder",
+      ];
       // 移除不必要属性
       flow.forEach((cmd) => {
         for (const props of uselessProps) {
diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index 7cecbd89..1af12070 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -6,15 +6,16 @@
     :model-value="isCollapse"
   >
     <div class="array-editor">
-      <div v-for="(row, index) in rows" :key="index" class="row items-center">
-        <template v-if="columns">
+      <div
+        v-for="(row, index) in rows"
+        :key="index"
+        class="row items-center q-gutter-sm"
+      >
+        <template v-if="!!columns">
           <div
             v-for="column in processedColumns"
             :key="column.key"
-            :class="[
-              column.width ? `col-${column.width}` : 'col',
-              Object.keys(columns).length > 1 ? 'q-pr-sm' : '',
-            ]"
+            :class="[column.width ? `col-${column.width}` : 'col']"
           >
             <VariableInput
               :model-value="row[column.key]"
diff --git a/src/components/composer/common/CheckButton.vue b/src/components/composer/common/CheckButton.vue
new file mode 100644
index 00000000..da6cadae
--- /dev/null
+++ b/src/components/composer/common/CheckButton.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="check-btn-group">
+    <q-btn
+      :color="modelValue ? 'primary' : 'grey-7'"
+      :flat="!modelValue"
+      :outline="modelValue"
+      dense
+      :class="['check-btn', { 'check-btn--selected': modelValue }]"
+      @click="toggleValue"
+    >
+      <template #default>
+        <div class="row items-center full-width">
+          <div class="check-btn-content">
+            <div class="check-btn-label">{{ label }}</div>
+          </div>
+          <q-icon
+            :name="modelValue ? 'check_circle' : 'radio_button_unchecked'"
+            size="14px"
+            class="q-ml-xs check-btn-icon"
+          />
+        </div>
+        <q-tooltip v-if="tooltip">{{ tooltip }}</q-tooltip>
+      </template>
+    </q-btn>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "CheckButton",
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    tooltip: {
+      type: String,
+      default: "",
+    },
+    isCollapse: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:model-value"],
+  methods: {
+    toggleValue() {
+      this.$emit("update:model-value", !this.modelValue);
+    },
+  },
+});
+</script>
+
+<style scoped>
+.check-btn-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  width: 100%;
+}
+
+.check-btn {
+  min-width: 100%;
+  max-width: 100% !important;
+  height: auto !important;
+  min-height: 36px;
+  font-size: 12px;
+  padding: 4px 12px;
+  border-radius: 4px !important;
+  transition: all 0.3s;
+  background-color: rgba(0, 0, 0, 0.03);
+}
+
+.check-btn :deep(.q-btn__content) {
+  min-width: 0;
+  height: auto;
+  white-space: normal;
+}
+
+.check-btn-content {
+  flex: 1;
+  min-width: 0;
+  margin-right: 4px;
+}
+
+.check-btn-label {
+  text-align: center;
+  line-height: 1.2;
+  word-break: break-word;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.check-btn-icon {
+  flex: none;
+  opacity: 0.8;
+  transition: all 0.3s;
+  margin-top: 2px;
+}
+
+.check-btn--selected .check-btn-icon {
+  opacity: 1;
+  transform: scale(1.1);
+}
+
+.check-btn:hover {
+  opacity: 0.9;
+  transform: translateY(-1px);
+  border-color: var(--q-primary);
+}
+
+.body--dark .check-btn {
+  background-color: rgba(255, 255, 255, 0.03);
+}
+
+.check-btn--selected {
+  background-color: transparent !important;
+  border-color: var(--q-primary) !important;
+}
+
+.check-btn.q-btn--flat {
+  color: var(--q-primary);
+  opacity: 0.8;
+}
+
+.body--dark .check-btn.q-btn--flat {
+  color: rgba(255, 255, 255, 0.9);
+}
+
+.check-btn.q-btn--outline {
+  opacity: 1;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/composer/common/OperationCard.vue b/src/components/composer/common/OperationCard.vue
index 8103ad54..9e62e9ee 100644
--- a/src/components/composer/common/OperationCard.vue
+++ b/src/components/composer/common/OperationCard.vue
@@ -4,6 +4,7 @@
       <div class="cards-wrapper">
         <div
           v-for="option in options"
+          ref="operationCard"
           :key="option.value"
           :class="['operation-card', { active: modelValue === option.value }]"
           :data-value="option.value"
@@ -71,14 +72,19 @@ export default {
     },
   },
   watch: {
-    modelValue(newVal) {
-      document
-        .querySelector(`.operation-card[data-value="${newVal}"]`)
-        ?.scrollIntoView({
-          behavior: "smooth",
-          block: "nearest",
-          inline: "nearest",
+    modelValue: {
+      immediate: true,
+      handler(newVal) {
+        this.$nextTick(() => {
+          this.$refs.operationCard
+            ?.find((card) => card.dataset.value === newVal)
+            ?.scrollIntoView({
+              behavior: "smooth",
+              block: "nearest",
+              inline: "nearest",
+            });
         });
+      },
     },
   },
 };
diff --git a/src/components/composer/common/OptionEditor.vue b/src/components/composer/common/OptionEditor.vue
index 77357a46..141f1a6a 100644
--- a/src/components/composer/common/OptionEditor.vue
+++ b/src/components/composer/common/OptionEditor.vue
@@ -41,7 +41,7 @@ import DictEditor from "./DictEditor.vue";
 import ButtonGroup from "./ButtonGroup.vue";
 import ControlInput from "./ControlInput.vue";
 import CheckGroup from "./CheckGroup.vue";
-
+import CheckButton from "./CheckButton.vue";
 export default defineComponent({
   name: "OptionEditor",
   components: {
@@ -53,6 +53,7 @@ export default defineComponent({
     ButtonGroup,
     ControlInput,
     CheckGroup,
+    CheckButton,
   },
   emits: ["update:modelValue"],
   props: {
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/common/ParamInput.vue
index b733f7d7..2c51fcaa 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/common/ParamInput.vue
@@ -34,6 +34,7 @@ import ButtonGroup from "./ButtonGroup.vue";
 import ControlInput from "./ControlInput.vue";
 import CheckGroup from "./CheckGroup.vue";
 import OptionEditor from "./OptionEditor.vue";
+import CheckButton from "./CheckButton.vue";
 
 /**
  * 参数输入组件
@@ -57,6 +58,7 @@ export default defineComponent({
     ControlInput,
     CheckGroup,
     OptionEditor,
+    CheckButton,
   },
   props: {
     configs: {
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 35478f3d..eb336fc7 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -223,13 +223,12 @@ export default defineComponent({
         },
         title: {
           label: "标题",
-          width: 4,
           noIcon: true,
         },
         description: {
           label: "描述",
-          width: 4,
           noIcon: true,
+          width: 4,
         },
       },
     };
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 48516c3a..c8296b1b 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -6,80 +6,378 @@ export const dataCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "quickcomposer.data.reverseString",
-      label: "字符串反转",
-      config: [
+      value: "quickcomposer.data.string.reverse",
+      label: "字符串处理",
+      desc: "字符串处理和转换",
+      icon: "text_fields",
+      subCommands: [
         {
-          key: "text",
-          label: "要反转的文本",
-          component: "VariableInput",
+          value: "quickcomposer.data.string.reverse",
+          label: "字符串反转",
           icon: "swap_horiz",
+          config: [
+            {
+              key: "text",
+              label: "要反转的文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+          ],
         },
-      ],
-      outputVariable: "reversedText",
-      saveOutput: true,
-    },
-    {
-      value: "quickcomposer.data.replaceString",
-      label: "字符串替换",
-      config: [
         {
-          key: "text",
-          label: "原始文本",
-          component: "VariableInput",
-          icon: "text_fields",
-          width: 4,
+          value: "quickcomposer.data.string.replace",
+          label: "字符串替换",
+          icon: "find_replace",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+            {
+              key: "oldStr",
+              label: "要替换的文本",
+              component: "VariableInput",
+              icon: "find_replace",
+              width: 6,
+            },
+            {
+              key: "newStr",
+              label: "替换为",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 6,
+            },
+          ],
         },
         {
-          key: "oldStr",
-          label: "要替换的文本",
-          component: "VariableInput",
-          icon: "find_replace",
-          width: 4,
+          value: "quickcomposer.data.string.substring",
+          label: "字符串截取",
+          icon: "content_cut",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+            {
+              key: "start",
+              label: "起始位置",
+              component: "NumberInput",
+              min: 0,
+              step: 1,
+              icon: "first_page",
+              width: 6,
+            },
+            {
+              key: "end",
+              label: "结束位置",
+              component: "NumberInput",
+              icon: "last_page",
+              min: 0,
+              step: 1,
+              width: 6,
+            },
+          ],
         },
         {
-          key: "newStr",
-          label: "替换为",
-          component: "VariableInput",
-          icon: "text_fields",
-          width: 4,
+          value: "quickcomposer.data.string.trim",
+          label: "去除空白",
+          icon: "format_align_justify",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "mode",
+              label: "模式",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "两端", value: "both" },
+                { label: "左侧", value: "start" },
+                { label: "右侧", value: "end" },
+              ],
+              defaultValue: "both",
+              width: 4,
+            },
+          ],
         },
-      ],
-      outputVariable: "replacedText",
-      saveOutput: true,
-    },
-    {
-      value: "quickcomposer.data.substring",
-      label: "字符串截取",
-      config: [
         {
-          key: "text",
-          label: "原始文本",
-          component: "VariableInput",
+          value: "quickcomposer.data.string.case",
+          label: "大小写转换",
           icon: "text_fields",
-          width: 6,
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "mode",
+              label: "转换为",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "大写", value: "upper" },
+                { label: "小写", value: "lower" },
+                { label: "首字母大写", value: "capitalize" },
+                { label: "驼峰", value: "camel" },
+                { label: "蛇形", value: "snake" },
+                { label: "短横线", value: "kebab" },
+                { label: "常量", value: "constant" },
+              ],
+              defaultValue: "upper",
+              width: 4,
+            },
+          ],
         },
         {
-          key: "start",
-          label: "起始位置",
-          component: "NumberInput",
-          min: 0,
-          step: 1,
-          icon: "first_page",
-          width: 3,
+          value: "quickcomposer.data.string.pad",
+          label: "字符串填充",
+          icon: "format_size",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+            {
+              key: "length",
+              label: "目标长度",
+              component: "NumberInput",
+              min: 0,
+              step: 1,
+              icon: "straighten",
+              width: 4,
+            },
+            {
+              key: "padString",
+              label: "填充字符",
+              component: "VariableInput",
+              icon: "space_bar",
+              width: 4,
+              defaultValue: newVarInputVal("str", " "),
+            },
+            {
+              key: "mode",
+              label: "填充位置",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "左侧", value: "start" },
+                { label: "右侧", value: "end" },
+                { label: "两端", value: "both" },
+              ],
+              defaultValue: "end",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.split",
+          label: "字符串分割",
+          icon: "splitscreen",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "separator",
+              label: "分隔符",
+              component: "VariableInput",
+              icon: "space_bar",
+              width: 4,
+              defaultValue: newVarInputVal("str", ","),
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.join",
+          label: "数组合并",
+          icon: "merge",
+          config: [
+            {
+              key: "array",
+              label: "字符串数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 8,
+            },
+            {
+              key: "separator",
+              label: "连接符",
+              component: "VariableInput",
+              icon: "space_bar",
+              width: 4,
+              defaultValue: newVarInputVal("str", ","),
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.repeat",
+          label: "字符串重复",
+          icon: "copy_all",
+          config: [
+            {
+              key: "text",
+              label: "要重复的文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "count",
+              label: "重复次数",
+              component: "NumberInput",
+              min: 0,
+              step: 1,
+              icon: "repeat",
+              width: 4,
+              defaultValue: 1,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.extract",
+          label: "提取字符",
+          icon: "content_cut",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "mode",
+              label: "提取类型",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "数字", value: "number" },
+                { label: "字母", value: "letter" },
+                { label: "中文", value: "chinese" },
+                { label: "标点符号", value: "punctuation" },
+                { label: "空白字符", value: "whitespace" },
+              ],
+              defaultValue: "number",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.count",
+          label: "字符统计",
+          icon: "numbers",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "mode",
+              label: "统计类型",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "字符数", value: "char" },
+                { label: "单词数", value: "word" },
+                { label: "行数", value: "line" },
+                { label: "数字数", value: "number" },
+                { label: "字母数", value: "letter" },
+                { label: "中文字数", value: "chinese" },
+                { label: "空白字符数", value: "whitespace" },
+              ],
+              defaultValue: "char",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.string.wrap",
+          label: "文本换行",
+          icon: "wrap_text",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+            },
+            {
+              key: "width",
+              label: "每行字符数",
+              component: "NumberInput",
+              min: 1,
+              step: 1,
+              icon: "straighten",
+              width: 4,
+              defaultValue: 80,
+            },
+          ],
         },
         {
-          key: "end",
-          label: "结束位置",
-          component: "NumberInput",
-          icon: "last_page",
-          min: 0,
-          step: 1,
-          width: 3,
+          value: "quickcomposer.data.string.align",
+          label: "文本对齐",
+          icon: "format_align_center",
+          config: [
+            {
+              key: "text",
+              label: "原始文本",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 12,
+            },
+            {
+              key: "mode",
+              label: "对齐方式",
+              component: "q-select",
+              icon: "settings",
+              options: [
+                { label: "左对齐", value: "left" },
+                { label: "居中", value: "center" },
+                { label: "右对齐", value: "right" },
+                { label: "两端对齐", value: "justify" },
+              ],
+              defaultValue: "left",
+              width: 6,
+            },
+            {
+              key: "width",
+              label: "总宽度",
+              component: "NumberInput",
+              min: 1,
+              step: 1,
+              icon: "straighten",
+              width: 6,
+              defaultValue: 80,
+            },
+          ],
         },
       ],
-      outputVariable: "substringText",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.data.regexTransform",
@@ -486,5 +784,781 @@ export const dataCommands = {
         },
       ],
     },
+    {
+      value: "JSON.stringify",
+      label: "JSON处理",
+      desc: "JSON处理",
+      icon: "data_object",
+      subCommands: [
+        {
+          value: "JSON.stringify",
+          label: "JSON序列化",
+          icon: "data_object",
+          config: [
+            {
+              label: "要序列化的对象",
+              component: "VariableInput",
+              icon: "input",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+            {
+              label: "替换函数/指定属性",
+              component: "VariableInput",
+              icon: "swap_horiz",
+              defaultValue: newVarInputVal("var", "null"),
+              disableToggleType: true,
+              width: 6,
+            },
+            {
+              label: "缩进",
+              component: "NumberInput",
+              icon: "format_indent_increase",
+              defaultValue: 2,
+              step: 1,
+              min: 0,
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "JSON.parse",
+          label: "JSON反序列化",
+          icon: "text_fields",
+          config: [
+            {
+              label: "要反序列化的JSON字符串",
+              component: "VariableInput",
+              icon: "input",
+              width: 12,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.data.array.filter",
+      label: "数组处理",
+      desc: "对象数组的常用操作",
+      icon: "view_list",
+      subCommands: [
+        {
+          value: "quickcomposer.data.array.filter",
+          label: "数组过滤",
+          icon: "filter_alt",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+            },
+            {
+              key: "condition",
+              label: "过滤条件",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "age > 18",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.map",
+          label: "数组映射",
+          icon: "transform",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+            },
+            {
+              key: "transform",
+              label: "转换函数",
+              component: "VariableInput",
+              icon: "code",
+              placeholder: "name",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.sort",
+          label: "数组排序",
+          icon: "sort",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+            },
+            {
+              key: "key",
+              label: "排序字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 6,
+              placeholder: "age",
+            },
+            {
+              key: "order",
+              label: "排序方式",
+              component: "q-select",
+              icon: "sort",
+              options: [
+                { label: "升序", value: "asc" },
+                { label: "降序", value: "desc" },
+              ],
+              defaultValue: "asc",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.group",
+          label: "数组分组",
+          icon: "group_work",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 8,
+              placeholder:
+                '[{"id":1,"name":"张三","dept":"技术"},{"id":2,"name":"李四","dept":"技术"}]',
+            },
+            {
+              key: "key",
+              label: "分组字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 4,
+              placeholder: "dept",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.unique",
+          label: "数组去重",
+          icon: "filter_1",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 8,
+              placeholder: '[{"id":1,"dept":"技术"},{"id":2,"dept":"技术"}]',
+            },
+            {
+              key: "key",
+              label: "去重字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 4,
+              placeholder: "dept",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.find",
+          label: "查找元素",
+          icon: "search",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
+            },
+            {
+              key: "condition",
+              label: "查找条件",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "id === 1",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.aggregate",
+          label: "数组聚合",
+          icon: "functions",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder: '[{"id":1,"amount":100},{"id":2,"amount":200}]',
+            },
+            {
+              key: "operation",
+              label: "聚合操作",
+              component: "q-select",
+              icon: "functions",
+              options: [
+                { label: "求和", value: "sum" },
+                { label: "平均值", value: "avg" },
+                { label: "最大值", value: "max" },
+                { label: "最小值", value: "min" },
+                { label: "计数", value: "count" },
+              ],
+              defaultValue: "sum",
+              width: 6,
+            },
+            {
+              key: "key",
+              label: "聚合字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 6,
+              placeholder: "amount",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.slice",
+          label: "数组切片",
+          icon: "content_cut",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder: "[1,2,3,4,5]",
+            },
+            {
+              key: "start",
+              label: "起始位置",
+              component: "NumberInput",
+              icon: "first_page",
+              min: 0,
+              step: 1,
+              width: 6,
+              placeholder: "1",
+            },
+            {
+              key: "end",
+              label: "结束位置",
+              component: "NumberInput",
+              icon: "last_page",
+              min: 0,
+              step: 1,
+              width: 6,
+              placeholder: "3",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.flatten",
+          label: "数组扁平化",
+          icon: "unfold_less",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 8,
+              placeholder: "[[1,2],[3,4],[[5,6]]]",
+            },
+            {
+              key: "depth",
+              label: "扁平化深度",
+              component: "NumberInput",
+              icon: "format_indent_decrease",
+              min: 1,
+              step: 1,
+              defaultValue: 1,
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.diff",
+          label: "数组差集",
+          icon: "difference",
+          config: [
+            {
+              key: "array1",
+              label: "数组1",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[1,2,3,4]",
+            },
+            {
+              key: "array2",
+              label: "数组2",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[3,4,5,6]",
+            },
+            {
+              key: "key",
+              label: "比较字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 12,
+              placeholder: "对象数组时使用，如: id",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.intersect",
+          label: "数组交集",
+          icon: "join_full",
+          config: [
+            {
+              key: "array1",
+              label: "数组1",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[1,2,3,4]",
+            },
+            {
+              key: "array2",
+              label: "数组2",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[3,4,5,6]",
+            },
+            {
+              key: "key",
+              label: "比较字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 12,
+              placeholder: "对象数组时使用，如: id",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.union",
+          label: "数组并集",
+          icon: "join_inner",
+          config: [
+            {
+              key: "array1",
+              label: "数组1",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[1,2,3,4]",
+            },
+            {
+              key: "array2",
+              label: "数组2",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 6,
+              placeholder: "[3,4,5,6]",
+            },
+            {
+              key: "key",
+              label: "比较字段",
+              component: "VariableInput",
+              icon: "key",
+              width: 12,
+              placeholder: "对象数组时使用，如: id",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.chunk",
+          label: "数组分块",
+          icon: "grid_view",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 8,
+              placeholder: "[1,2,3,4,5,6]",
+            },
+            {
+              key: "size",
+              label: "块大小",
+              component: "NumberInput",
+              icon: "straighten",
+              min: 1,
+              step: 1,
+              defaultValue: 2,
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.array.shuffle",
+          label: "数组随机排序",
+          icon: "shuffle",
+          config: [
+            {
+              key: "array",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              width: 12,
+              placeholder: "[1,2,3,4,5]",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.data.time.format",
+      label: "时间处理",
+      desc: "时间日期的常用操作",
+      icon: "schedule",
+      subCommands: [
+        {
+          value: "quickcomposer.data.time.format",
+          label: "时间格式化",
+          icon: "event",
+          config: [
+            {
+              key: "time",
+              label: "时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 8,
+              placeholder: "2024-01-01 或 now 或 timestamp",
+            },
+            {
+              key: "format",
+              label: "格式",
+              component: "q-select",
+              icon: "format_shapes",
+              width: 4,
+              options: [
+                { label: "YYYY-MM-DD", value: "YYYY-MM-DD" },
+                { label: "YYYY-MM-DD HH:mm:ss", value: "YYYY-MM-DD HH:mm:ss" },
+                { label: "YYYY年MM月DD日", value: "YYYY年MM月DD日" },
+                { label: "MM/DD/YYYY", value: "MM/DD/YYYY" },
+                { label: "DD/MM/YYYY", value: "DD/MM/YYYY" },
+                { label: "HH:mm:ss", value: "HH:mm:ss" },
+                { label: "YYYY-MM-DD HH:mm", value: "YYYY-MM-DD HH:mm" },
+                { label: "时间戳(秒)", value: "timestamp" },
+                { label: "时间戳(毫秒)", value: "timestamp_ms" },
+                { label: "相对时间", value: "relative" },
+              ],
+              defaultValue: "YYYY-MM-DD HH:mm:ss",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.parse",
+          label: "时间解析",
+          icon: "input",
+          config: [
+            {
+              key: "time",
+              label: "时间字符串",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 8,
+              placeholder: "2024-01-01 12:00:00",
+            },
+            {
+              key: "format",
+              label: "原格式",
+              component: "q-select",
+              icon: "format_shapes",
+              width: 4,
+              options: [
+                { label: "YYYY-MM-DD", value: "YYYY-MM-DD" },
+                { label: "YYYY-MM-DD HH:mm:ss", value: "YYYY-MM-DD HH:mm:ss" },
+                { label: "YYYY年MM月DD日", value: "YYYY年MM月DD日" },
+                { label: "MM/DD/YYYY", value: "MM/DD/YYYY" },
+                { label: "DD/MM/YYYY", value: "DD/MM/YYYY" },
+                { label: "时间戳(秒)", value: "timestamp" },
+                { label: "时间戳(毫秒)", value: "timestamp_ms" },
+              ],
+              defaultValue: "YYYY-MM-DD HH:mm:ss",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.add",
+          label: "时间加减",
+          icon: "add",
+          config: [
+            {
+              key: "time",
+              label: "基准时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 12,
+              placeholder: "2024-01-01 或 now",
+            },
+            {
+              key: "value",
+              label: "数值",
+              component: "NumberInput",
+              icon: "exposure",
+              width: 6,
+              defaultValue: 1,
+            },
+            {
+              key: "unit",
+              label: "单位",
+              component: "q-select",
+              icon: "straighten",
+              width: 6,
+              options: [
+                { label: "年", value: "years" },
+                { label: "月", value: "months" },
+                { label: "周", value: "weeks" },
+                { label: "天", value: "days" },
+                { label: "小时", value: "hours" },
+                { label: "分钟", value: "minutes" },
+                { label: "秒", value: "seconds" },
+              ],
+              defaultValue: "days",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.diff",
+          label: "时间差值",
+          icon: "difference",
+          config: [
+            {
+              key: "time1",
+              label: "时间1",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 6,
+              placeholder: "2024-01-01",
+            },
+            {
+              key: "time2",
+              label: "时间2",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 6,
+              placeholder: "2024-02-01",
+            },
+            {
+              key: "unit",
+              label: "返回单位",
+              component: "q-select",
+              icon: "straighten",
+              width: 6,
+              options: [
+                { label: "年", value: "years" },
+                { label: "月", value: "months" },
+                { label: "周", value: "weeks" },
+                { label: "天", value: "days" },
+                { label: "小时", value: "hours" },
+                { label: "分钟", value: "minutes" },
+                { label: "秒", value: "seconds" },
+                { label: "毫秒", value: "milliseconds" },
+              ],
+              defaultValue: "days",
+            },
+            {
+              key: "absolute",
+              label: "绝对值",
+              component: "CheckButton",
+              width: 6,
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.startOf",
+          label: "时间边界",
+          icon: "first_page",
+          config: [
+            {
+              key: "time",
+              label: "时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 6,
+              placeholder: "2024-01-01 或 now",
+            },
+            {
+              key: "unit",
+              label: "单位",
+              component: "q-select",
+              icon: "straighten",
+              width: 3,
+              options: [
+                { label: "年", value: "year" },
+                { label: "月", value: "month" },
+                { label: "周", value: "week" },
+                { label: "天", value: "day" },
+                { label: "小时", value: "hour" },
+                { label: "分钟", value: "minute" },
+                { label: "秒", value: "second" },
+              ],
+              defaultValue: "day",
+            },
+            {
+              key: "type",
+              label: "类型",
+              component: "q-select",
+              icon: "settings",
+              width: 3,
+              options: [
+                { label: "开始", value: "start" },
+                { label: "结束", value: "end" },
+              ],
+              defaultValue: "start",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.isValid",
+          label: "时间验证",
+          icon: "check_circle",
+          config: [
+            {
+              key: "time",
+              label: "时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 8,
+              placeholder: "2024-01-01",
+            },
+            {
+              key: "format",
+              label: "格式",
+              component: "q-select",
+              icon: "format_shapes",
+              width: 4,
+              options: [
+                { label: "YYYY-MM-DD", value: "YYYY-MM-DD" },
+                { label: "YYYY-MM-DD HH:mm:ss", value: "YYYY-MM-DD HH:mm:ss" },
+                { label: "YYYY年MM月DD日", value: "YYYY年MM月DD日" },
+                { label: "MM/DD/YYYY", value: "MM/DD/YYYY" },
+                { label: "DD/MM/YYYY", value: "DD/MM/YYYY" },
+              ],
+              defaultValue: "YYYY-MM-DD",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.calendar",
+          label: "日历信息",
+          icon: "calendar_month",
+          config: [
+            {
+              key: "time",
+              label: "时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 12,
+              placeholder: "2024-01-01 或 now",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.workday",
+          label: "工作日计算",
+          icon: "work",
+          config: [
+            {
+              key: "startTime",
+              label: "开始时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 4,
+              placeholder: "2024-01-01",
+            },
+            {
+              key: "days",
+              label: "工作日天数",
+              component: "NumberInput",
+              icon: "exposure",
+              width: 4,
+              defaultValue: 1,
+            },
+            {
+              key: "weekends",
+              label: "包含周末",
+              component: "CheckButton",
+              width: 4,
+              defaultValue: false,
+            },
+            {
+              key: "holidays",
+              label: "节假日",
+              component: "ArrayEditor",
+              icon: "event_busy",
+              width: 12,
+              placeholder: "['2024-01-01']",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.time.between",
+          label: "时间范围判断",
+          icon: "date_range",
+          config: [
+            {
+              key: "time",
+              label: "判断时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 12,
+              placeholder: "2024-01-01 或 now",
+            },
+            {
+              key: "startTime",
+              label: "开始时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 4,
+              placeholder: "2024-01-01",
+            },
+            {
+              key: "endTime",
+              label: "结束时间",
+              component: "VariableInput",
+              icon: "schedule",
+              width: 4,
+              placeholder: "2024-02-01",
+            },
+            {
+              key: "inclusive",
+              label: "包含边界",
+              component: "CheckButton",
+              width: 4,
+              defaultValue: true,
+            },
+          ],
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index db605a0d..b2de424a 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -259,7 +259,7 @@ export const networkCommands = {
             },
             {
               label: "返回所有地址",
-              component: "q-checkbox",
+              component: "CheckButton",
               defaultValue: false,
               width: 2.5,
             },
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 20a778e4..04dc3f9f 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -270,7 +270,7 @@ export const systemCommands = {
             },
             {
               label: "包含内部接口",
-              component: "q-checkbox",
+              component: "CheckButton",
               defaultValue: false,
               width: 12,
               condition: "values[0] === 'networkInterfaces'",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 92b8b33d..9920f4a0 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -115,6 +115,7 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "{id,text}",
       saveOutput: true,
+      width: 12,
       config: [
         {
           label: "按钮",
@@ -133,6 +134,7 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "[inputValue1]",
       saveOutput: true,
+      width: 12,
       config: [
         {
           label: "输入框",
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
index 7d6e06ed..95db7f1d 100644
--- a/src/js/composer/commands/userdataCommands.js
+++ b/src/js/composer/commands/userdataCommands.js
@@ -40,7 +40,7 @@ export const userdataCommands = {
         },
         {
           label: "不同步",
-          component: "q-checkbox",
+          component: "CheckButton",
           defaultValue: true,
           width: 2,
         },
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 1dfd12a2..961aa564 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -113,32 +113,32 @@ export const utoolsCommands = {
                 forward: {
                   label: "向前查找",
                   icon: "arrow_right",
-                  width: 2,
-                  component: "q-checkbox",
+                  width: 2.4,
+                  component: "CheckButton",
                 },
                 findNext: {
                   label: "查找下一个",
                   icon: "arrow_down",
-                  width: 2,
-                  component: "q-checkbox",
+                  width: 2.4,
+                  component: "CheckButton",
                 },
                 matchCase: {
                   label: "区分大小写",
                   icon: "arrow_up",
-                  width: 2,
-                  component: "q-checkbox",
+                  width: 2.4,
+                  component: "CheckButton",
                 },
                 wordStart: {
                   label: "单词开头",
                   icon: "arrow_right",
-                  width: 2,
-                  component: "q-checkbox",
+                  width: 2.4,
+                  component: "CheckButton",
                 },
                 medialCapitalAsWordStart: {
-                  label: "中缀大写作为单词开头",
+                  label: "中缀大写开头",
                   icon: "arrow_right",
-                  width: 4,
-                  component: "q-checkbox",
+                  width: 2.4,
+                  component: "CheckButton",
                 },
               },
               defaultValue: {
diff --git a/src/js/composer/composerConfig.js b/src/js/composer/composerConfig.js
index 3aae5b53..1c45dc35 100644
--- a/src/js/composer/composerConfig.js
+++ b/src/js/composer/composerConfig.js
@@ -16,7 +16,11 @@ export const availableCommands = categories.reduce((commands, category) => {
 }, []);
 
 export const findCommandByValue = (value) => {
-  return availableCommands.find((cmd) => cmd.value === value);
+  return availableCommands.find(
+    (cmd) =>
+      cmd.value === value ||
+      cmd.subCommands?.find((subCmd) => subCmd.value === value)
+  );
 };
 
 export const commandCategories = categories;

From 9eee3d1b14fcabd4b0a1d264522649f5fd9c5a7e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 09:06:48 +0800
Subject: [PATCH 031/332] =?UTF-8?q?=E6=96=B0=E5=A2=9EParamInporter?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86=E9=80=9A=E7=94=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       |  2 +-
 .../composer/common/OptionEditor.vue          | 33 ++------
 .../composer/control/ControlCommand.vue       |  2 +-
 .../composer/param/ParamImporter.vue          | 77 +++++++++++++++++++
 .../composer/{common => param}/ParamInput.vue | 42 ++++------
 5 files changed, 97 insertions(+), 59 deletions(-)
 create mode 100644 src/components/composer/param/ParamImporter.vue
 rename src/components/composer/{common => param}/ParamInput.vue (69%)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 20281f03..e9df810b 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -13,7 +13,7 @@
 <script>
 import { defineComponent } from "vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
-import ParamInput from "components/composer/common/ParamInput.vue";
+import ParamInput from "components/composer/param/ParamInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 
diff --git a/src/components/composer/common/OptionEditor.vue b/src/components/composer/common/OptionEditor.vue
index 141f1a6a..642408fe 100644
--- a/src/components/composer/common/OptionEditor.vue
+++ b/src/components/composer/common/OptionEditor.vue
@@ -12,20 +12,11 @@
         class="grid-item"
         :style="getColumnStyle(config.width)"
       >
-        <component
-          :is="config.component"
+        <ParamImporter
+          :config="config"
           :model-value="localObject[key]"
           @update:model-value="updateOption(key, $event)"
-          v-bind="config"
-          filled
-          dense
-          :emit-value="config.component === 'q-select'"
-          :map-options="config.component === 'q-select'"
-        >
-          <template v-slot:prepend v-if="shouldShowQIcon(config)">
-            <q-icon :name="config.icon" />
-          </template>
-        </component>
+        />
       </div>
     </div>
   </component>
@@ -33,27 +24,13 @@
 
 <script>
 import { defineComponent } from "vue";
+import ParamImporter from "../param/ParamImporter.vue";
 import BorderLabel from "./BorderLabel.vue";
-import VariableInput from "./VariableInput.vue";
-import NumberInput from "./NumberInput.vue";
-import ArrayEditor from "./ArrayEditor.vue";
-import DictEditor from "./DictEditor.vue";
-import ButtonGroup from "./ButtonGroup.vue";
-import ControlInput from "./ControlInput.vue";
-import CheckGroup from "./CheckGroup.vue";
-import CheckButton from "./CheckButton.vue";
 export default defineComponent({
   name: "OptionEditor",
   components: {
     BorderLabel,
-    VariableInput,
-    NumberInput,
-    ArrayEditor,
-    DictEditor,
-    ButtonGroup,
-    ControlInput,
-    CheckGroup,
-    CheckButton,
+    ParamImporter,
   },
   emits: ["update:modelValue"],
   props: {
diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
index ab97d8b6..e5f68208 100644
--- a/src/components/composer/control/ControlCommand.vue
+++ b/src/components/composer/control/ControlCommand.vue
@@ -45,7 +45,7 @@
 
 <script>
 import { defineComponent } from "vue";
-import ParamInput from "components/composer/common/ParamInput.vue";
+import ParamInput from "components/composer/param/ParamInput.vue";
 
 export default defineComponent({
   name: "ControlCommand",
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
new file mode 100644
index 00000000..b9460a97
--- /dev/null
+++ b/src/components/composer/param/ParamImporter.vue
@@ -0,0 +1,77 @@
+<template>
+  <component
+    :is="config.component"
+    v-model="localValue"
+    v-bind="componentProps"
+    @update:model-value="$emit('update:modelValue', $event)"
+  >
+    <template v-if="isQuasarInput" #prepend>
+      <q-icon v-if="config.icon" :name="config.icon" />
+    </template>
+  </component>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+// 导入OptionEditor之外的通用组件，因为他还要被OptionEditor使用，防止循环引用
+import VariableInput from "components/composer/common/VariableInput.vue";
+import NumberInput from "components/composer/common/NumberInput.vue";
+import ArrayEditor from "components/composer/common/ArrayEditor.vue";
+import DictEditor from "components/composer/common/DictEditor.vue";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+import ControlInput from "components/composer/common/ControlInput.vue";
+import CheckGroup from "components/composer/common/CheckGroup.vue";
+import CheckButton from "components/composer/common/CheckButton.vue";
+import CodeEditor from "components/composer/common/CodeEditor.vue";
+
+export default defineComponent({
+  name: "ParamInput",
+  components: {
+    VariableInput,
+    NumberInput,
+    ArrayEditor,
+    DictEditor,
+    ButtonGroup,
+    ControlInput,
+    CheckGroup,
+    CheckButton,
+    CodeEditor,
+  },
+  props: {
+    config: {
+      type: Array,
+      required: true,
+    },
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  computed: {
+    localValue: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit("update:modelValue", value);
+      },
+    },
+    isQuasarInput() {
+      return ["q-select", "q-input"].includes(this.config?.component);
+    },
+    isQuasarSelect() {
+      return ["q-select"].includes(this.config?.component);
+    },
+    componentProps() {
+      return {
+        ...this.config,
+        filled: true,
+        dense: true,
+        emitValue: this.isQuasarSelect,
+        mapOptions: this.isQuasarSelect,
+      };
+    },
+  },
+});
+</script>
diff --git a/src/components/composer/common/ParamInput.vue b/src/components/composer/param/ParamInput.vue
similarity index 69%
rename from src/components/composer/common/ParamInput.vue
rename to src/components/composer/param/ParamInput.vue
index 2c51fcaa..daa2a048 100644
--- a/src/components/composer/common/ParamInput.vue
+++ b/src/components/composer/param/ParamInput.vue
@@ -6,35 +6,26 @@
       class="grid-item"
       :style="getColumnStyle(config.width)"
     >
-      <component
-        :is="config.component"
+      <OptionEditor
+        v-if="config.component === 'OptionEditor'"
+        v-bind="config"
         :model-value="values[index]"
         @update:model-value="$emit('update', index, $event)"
-        v-bind="config"
-        filled
-        dense
-        :emit-value="config.component === 'q-select'"
-        :map-options="config.component === 'q-select'"
-      >
-        <template v-slot:prepend v-if="shouldShowQIcon(config)">
-          <q-icon :name="config.icon" />
-        </template>
-      </component>
+      />
+      <ParamImporter
+        v-else
+        :config="config"
+        :model-value="values[index]"
+        @update:model-value="$emit('update', index, $event)"
+      />
     </div>
   </div>
 </template>
 
 <script>
 import { defineComponent } from "vue";
-import VariableInput from "./VariableInput.vue";
-import NumberInput from "./NumberInput.vue";
-import ArrayEditor from "./ArrayEditor.vue";
-import DictEditor from "./DictEditor.vue";
-import ButtonGroup from "./ButtonGroup.vue";
-import ControlInput from "./ControlInput.vue";
-import CheckGroup from "./CheckGroup.vue";
-import OptionEditor from "./OptionEditor.vue";
-import CheckButton from "./CheckButton.vue";
+import ParamImporter from "components/composer/param/ParamImporter.vue";
+import OptionEditor from "components/composer/common/OptionEditor.vue";
 
 /**
  * 参数输入组件
@@ -50,15 +41,8 @@ import CheckButton from "./CheckButton.vue";
 export default defineComponent({
   name: "ParamInput",
   components: {
-    VariableInput,
-    NumberInput,
-    ArrayEditor,
-    DictEditor,
-    ButtonGroup,
-    ControlInput,
-    CheckGroup,
+    ParamImporter,
     OptionEditor,
-    CheckButton,
   },
   props: {
     configs: {

From a954cf076476c004d388498111f4e6fcb99cd76a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 11:44:02 +0800
Subject: [PATCH 032/332] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CodeEdiotr=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4MonocaEditor=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CodeEditor.vue | 228 ++++++++++++++++++
 src/components/editor/MonacoEditor.vue        |  23 ++
 src/css/app.css                               |  61 ++++-
 3 files changed, 310 insertions(+), 2 deletions(-)
 create mode 100644 src/components/composer/common/CodeEditor.vue

diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
new file mode 100644
index 00000000..90f82e40
--- /dev/null
+++ b/src/components/composer/common/CodeEditor.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="code-editor" :style="{ height: height }">
+    <div ref="editorContainer" class="editor-container"></div>
+  </div>
+</template>
+
+<script>
+import * as monaco from "monaco-editor";
+import { toRaw } from "vue";
+
+export default {
+  name: "CodeEditor",
+  props: {
+    // v-model 绑定值
+    modelValue: {
+      type: String,
+      default: "",
+    },
+    // 编程语言
+    language: {
+      type: String,
+      default: "plaintext",
+    },
+    // 编辑器高度
+    height: {
+      type: String,
+      default: "200px",
+    },
+    // 编辑器主题
+    theme: {
+      type: String,
+      default: "vs",
+    },
+    // 编辑器选项
+    options: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  emits: ["update:modelValue", "change"],
+  data() {
+    return {
+      editor: null,
+      value: null,
+      resizeTimeout: null,
+      defaultOptions: {
+        value: "",
+        // 自动布局
+        automaticLayout: true,
+        // 折叠策略
+        foldingStrategy: "indentation",
+        // 自动关闭括号
+        autoClosingBrackets: true,
+        // 制表符大小
+        tabSize: 2,
+        // 最小化
+        minimap: {
+          enabled: false,
+        },
+        // 自动格式化
+        formatOnType: true,
+        // 自动格式化
+        formatOnPaste: true,
+        // 自动缩进
+        autoIndent: "full",
+        // 滚动超出最后一行
+        scrollBeyondLastLine: false,
+        // 字体大小
+        fontSize: 14,
+        // 行号
+        lineNumbers: "on",
+        // 行号最小字符数
+        lineNumbersMinChars: 3,
+        // 行号
+        renderLineNumbers: "on",
+        // 行装饰宽度
+        lineDecorationsWidth: 0,
+        // 圆角
+        roundedSelection: false,
+        // 行高亮
+        renderLineHighlight: "all",
+        // 仅在聚焦时高亮行
+        renderLineHighlightOnlyWhenFocus: true,
+        // 隐藏光标
+        hideCursorInOverviewRuler: true,
+        // 隐藏概览边框
+        overviewRulerBorder: false,
+        // 隐藏概览线
+        overviewRulerLanes: 0,
+        // 滚动条
+        scrollBars: {
+          vertical: "visible",
+          horizontal: "visible",
+        },
+        // 只读
+        readOnly: false,
+        // 光标样式
+        cursorStyle: "line",
+      },
+    };
+  },
+  watch: {
+    // 监听 v-model 值变化
+    modelValue: {
+      immediate: true,
+      handler(newValue) {
+        if (this.value !== newValue) {
+          this.value = newValue;
+          if (this.editor && this.editor.getValue() !== newValue) {
+            this.editor.setValue(newValue || "");
+          }
+        }
+      },
+    },
+    // 监听语言变化
+    language: {
+      immediate: true,
+      handler(newValue) {
+        if (this.editor) {
+          monaco.editor.setModelLanguage(this.editor.getModel(), newValue);
+        }
+      },
+    },
+    "$q.dark.isActive": {
+      immediate: true,
+      handler(newValue) {
+        monaco.editor.setTheme(newValue ? "vs-dark" : "vs");
+      },
+    },
+  },
+  mounted() {
+    this.initEditor();
+    // 手动监听窗口大小变化，解决Monaco自动调整大小时导致ResizeObserver loop limit exceeded错误
+    window.addEventListener("resize", this.resizeEditor);
+  },
+  beforeUnmount() {
+    this.destroyEditor();
+  },
+  methods: {
+    // 初始化编辑器
+    initEditor() {
+      const options = {
+        ...this.defaultOptions,
+        ...this.options,
+        value: this.value || "",
+        language: this.language,
+        theme: this.theme,
+      };
+
+      this.editor = monaco.editor.create(this.$refs.editorContainer, options);
+      this.listenEditorValue();
+
+      // 初始化完成后立即触发一次布局更新
+      this.$nextTick(() => {
+        this.resizeEditor();
+      });
+    },
+    // 监听编辑器值变化
+    listenEditorValue() {
+      this.rawEditor().focus();
+      this.rawEditor().onDidChangeModelContent(() => {
+        this.value = this.getEditorValue();
+        this.$emit("update:modelValue", this.value);
+        this.$emit("change", this.value);
+      });
+    },
+    // 处理窗口大小变化
+    resizeEditor() {
+      if (this.resizeTimeout) {
+        clearTimeout(this.resizeTimeout);
+      }
+      this.resizeTimeout = setTimeout(() => {
+        this.rawEditor().layout();
+      }, 50);
+    },
+    // 销毁编辑器
+    destroyEditor() {
+      if (this.editor) {
+        window.removeEventListener("resize", this.resizeEditor);
+        this.rawEditor().dispose();
+        this.editor = null;
+      }
+    },
+    // 获取原始编辑器实例
+    rawEditor() {
+      return toRaw(this.editor);
+    },
+    // 获取编辑器实例
+    getEditor() {
+      return this.editor;
+    },
+    // 设置编辑器内容
+    setValue(value) {
+      if (this.editor) {
+        this.editor.setValue(value || "");
+      }
+    },
+    // 获取编辑器内容
+    getValue() {
+      return this.editor ? this.editor.getValue() : "";
+    },
+    // 获取编辑器内容
+    getEditorValue() {
+      return this.rawEditor().getValue();
+    },
+    // 聚焦编辑器
+    focus() {
+      if (this.editor) {
+        this.editor.focus();
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.code-editor {
+  width: 100%;
+  border: 1px solid rgba(0, 0, 0, 0.12);
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.editor-container {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/editor/MonacoEditor.vue b/src/components/editor/MonacoEditor.vue
index eb46449d..4dec0b69 100644
--- a/src/components/editor/MonacoEditor.vue
+++ b/src/components/editor/MonacoEditor.vue
@@ -59,16 +59,39 @@ export default {
     initEditor() {
       let monacoEditorPreferences = {
         value: "",
+        // 自动布局
         automaticLayout: true,
+        // 折叠策略
         foldingStrategy: "indentation",
+        // 自动关闭括号
         autoClosingBrackets: true,
+        // 制表符大小
         tabSize: 2,
         minimap: {
           enabled: false,
         },
+        // 自动格式化
         formatOnType: true,
         formatOnPaste: true,
+        // 自动缩进
         autoIndent: "full",
+        // 行号
+        lineNumbersMinChars: 3,
+        renderLineNumbers: "on",
+        // 行装饰宽度
+        lineDecorationsWidth: 0,
+        // 圆角
+        roundedSelection: false,
+        // 行高亮
+        renderLineHighlight: "all",
+        // 仅在聚焦时高亮行
+        renderLineHighlightOnlyWhenFocus: true,
+        // 隐藏光标
+        hideCursorInOverviewRuler: true,
+        // 隐藏概览边框
+        overviewRulerBorder: false,
+        // 隐藏概览线
+        overviewRulerLanes: 0,
         // JavaScript 特定的格式化选项
         "javascript.format.insertSpaceAfterSemicolonInForStatements": true,
         "javascript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
diff --git a/src/css/app.css b/src/css/app.css
index 7a09a2ba..215a42dc 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -13,10 +13,63 @@ body {
   color: #333;
 }
 
-.q-tooltip {
-  font-size: 11px;
+/* Monaco Editor 调整行号栏样式 */
+.monaco-editor .margin {
+  width: 40px !important;
+}
+
+.monaco-editor .line-numbers {
+  text-align: center !important;
+  width: 40px !important;
+  padding-right: 5px !important;
+  left: 0 !important;
+}
+
+/* Monaco Editor 当前行高亮样式 */
+.monaco-editor .current-line {
+  border: none !important;
+  background-color: rgba(0, 0, 0, 0.03);
+}
+
+.monaco-editor .line-numbers {
+  color: rgba(0, 0, 0, 0.5) !important;
+}
+
+.body--dark .monaco-editor .line-numbers {
+  color: rgba(255, 255, 255, 0.5) !important;
+}
+
+.monaco-editor .current-line~.line-numbers {
+  color: var(--q-primary) !important;
+}
+
+.body--dark .monaco-editor .current-line {
+  background-color: rgba(255, 255, 255, 0.05);
 }
 
+.monaco-editor .margin-view-overlays .current-line {
+  background-color: transparent !important;
+}
+
+/* Monaco Editor 滚动条样式 */
+.monaco-editor .scrollbar {
+  width: 5px !important;
+  height: 5px !important;
+}
+
+.monaco-editor .scrollbar.vertical .slider {
+  width: 5px !important;
+  border-radius: 2px !important;
+  background: rgba(0, 0, 0, 0.2) !important;
+}
+
+.monaco-editor .scrollbar.horizontal .slider {
+  height: 5px !important;
+  border-radius: 2px !important;
+  background: rgba(0, 0, 0, 0.2) !important;
+}
+
+/* 标签样式 */
 .q-chip {
   background: #e3e3e39a;
 }
@@ -54,6 +107,10 @@ body {
 }
 
 /* 优化 Tooltip 样式 */
+.q-tooltip {
+  font-size: 11px;
+}
+
 .q-tooltip {
   background: rgba(255, 255, 255, 0.18) !important;
   border-radius: 6px;

From 5691a8e48ec57907a7f1eae4c75e0c226b483c03 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 14:22:20 +0800
Subject: [PATCH 033/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0quickcommandUI?=
 =?UTF-8?q?=E5=9C=A8=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=92=8C=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  1 +
 src/components/CommandRunResult.vue           |  3 +++
 .../quickcommandUI/QuickCommand.vue           | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index e02457be..61ffc659 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,6 +24,7 @@ export default defineComponent({
     return {
       setCssVar: setCssVar,
       programs: programmings,
+      isRunningCommand: false,
       profile: defaultProfile.common,
       nativeProfile: defaultProfile.native,
       utools: UTOOLS,
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 3742df44..699244ac 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -126,6 +126,7 @@ export default {
   methods: {
     // 运行命令
     async runCurrentCommand(currentCommand) {
+      this.$root.isRunningCommand = true;
       await this.getTempPayload(currentCommand);
       if (currentCommand.cmd.includes("{{subinput"))
         return this.setSubInput(currentCommand);
@@ -284,6 +285,7 @@ export default {
       };
     },
     handleResult(stdout, stderr, options) {
+      this.$root.isRunningCommand = false;
       if (stderr) {
         return options.earlyExit
           ? alert(stderr)
@@ -293,6 +295,7 @@ export default {
     },
     // 显示运行结果
     async showRunResult(content, isSuccess) {
+      this.$root.isRunningCommand = false;
       content = await this.handleContent(content);
       this.runResultStatus = isSuccess;
       this.runResult = this.runResult.concat(content);
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 1f87b037..e505778c 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -4,6 +4,7 @@
     :maximized="maximized"
     :transition-show="maximized ? 'fade' : 'scale'"
     :transition-hide="maximized ? 'fade' : 'scale'"
+    @hide="hideDialog"
   >
     <component
       ref="ui"
@@ -262,12 +263,32 @@ export default {
   methods: {
     clickOK() {},
     wbEvent() {},
+    hideDialog() {},
     showUI(uiComponent, options, maximized, reslove) {
       this.showDialog = true;
       this.options = options;
       this.maximized = maximized;
       this.currentUI = uiComponent;
       this.clickOK = reslove;
+      this.hideDialog = () => {
+        switch (uiComponent) {
+          case InputBox:
+            reslove([]);
+            break;
+          case ButtonBox:
+          case SelectList:
+            reslove({});
+            break;
+          case ConfirmBox:
+            reslove(false);
+            break;
+          case TextArea:
+            reslove("");
+            break;
+          default:
+            reslove(false);
+        }
+      };
     },
   },
 };

From 099ee21d8d528b5b8ba7f8f0bb64f89f8b02fd4b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 17:08:14 +0800
Subject: [PATCH 034/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djson=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E8=BF=90=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug=EF=BC=8C=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=94=AF=E6=8C=81=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue |  2 +-
 src/components/popup/ResultMenu.vue | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 699244ac..1d16c83e 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -34,7 +34,7 @@
           <ResultMenu
             class="no-shadow q-pa-sm"
             :stretch="true"
-            :content="runResult.join('')"
+            :runResult="runResult"
             :closebtn="!fromUtools"
             :textbtn="!enableHtml"
             :imagebtn="!enableHtml && isDataUrl"
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index fe734de2..ecc10d65 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -19,6 +19,9 @@
     <q-btn icon="send" size="sm" @click="sendResult" v-show="textbtn" dense
       ><q-tooltip v-if="!dense">发送到活动窗口</q-tooltip></q-btn
     >
+    <q-btn icon="save" v-if="!dense" size="sm" @click="saveResult" dense
+      ><q-tooltip>保存到文件</q-tooltip></q-btn
+    >
     <q-btn icon="close" v-close-popup v-show="closebtn" dense size="sm" />
   </q-btn-group>
 </template>
@@ -31,7 +34,12 @@ export default {
     textbtn: Boolean,
     imagebtn: Boolean,
     closebtn: Boolean,
-    content: String,
+    runResult: Array,
+  },
+  computed: {
+    content() {
+      return this.getContent();
+    },
   },
   methods: {
     copyResult() {
@@ -48,6 +56,25 @@ export default {
       if (!imgs) return quickcommand.showMessageBox("dataUrl 格式不正确！");
       this.$emit("showImg", imgs);
     },
+    saveResult() {
+      window.saveFile(this.content, {
+        defaultPath: "quickcommand-result.txt",
+        filters: [{ name: "txt", extensions: ["txt"] }],
+      });
+    },
+    getContent() {
+      let content = this.runResult.map((item) => {
+        if (typeof item === "object") {
+          try {
+            return JSON.stringify(item, null, 2);
+          } catch (e) {
+            return item.toString();
+          }
+        }
+        return item;
+      });
+      return content.join("\n");
+    },
   },
 };
 </script>

From d6f53504254d00bdf27fdb569645d6a9f7588147 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 18:22:00 +0800
Subject: [PATCH 035/332] =?UTF-8?q?=E6=96=B0=E5=A2=9EMacOS=E4=B8=93?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=8E=B7=E5=8F=96=E5=89=8D=E5=8F=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E3=80=81=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E3=80=81=E5=90=AF=E5=8A=A8=E3=80=81=E9=80=80=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E3=80=81=E6=98=BE=E7=A4=BA=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E5=A4=A7=E5=8C=96=E3=80=81=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E8=8E=B7=E5=8F=96=E7=AA=97=E5=8F=A3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E8=8E=B7=E5=8F=96=E5=BA=94=E7=94=A8=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                   |   1 +
 plugin/lib/quickcomposer/macos/app.js         | 468 ++++++++++++++++++
 plugin/lib/quickcomposer/macos/finder.js      | 110 ++++
 plugin/lib/quickcomposer/macos/index.js       |   9 +
 plugin/lib/quickcomposer/macos/system.js      | 113 +++++
 .../composer/param/ParamImporter.vue          |   2 +-
 src/js/composer/commands/index.js             |   5 +
 src/js/composer/commands/macosCommands.js     | 445 +++++++++++++++++
 src/js/composer/commands/screenCommands.js    |   2 +-
 src/js/composer/commands/systemCommands.js    |   2 +-
 src/js/composer/commands/windowsCommands.js   |   4 +-
 11 files changed, 1155 insertions(+), 6 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/macos/app.js
 create mode 100644 plugin/lib/quickcomposer/macos/finder.js
 create mode 100644 plugin/lib/quickcomposer/macos/index.js
 create mode 100644 plugin/lib/quickcomposer/macos/system.js
 create mode 100644 src/js/composer/commands/macosCommands.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index c3ab1b24..b79aaa14 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -9,6 +9,7 @@ const quickcomposer = {
   audio: require("./quickcomposer/audio"),
   image: require("./quickcomposer/image"),
   windows: require("./quickcomposer/windows"),
+  macos: require("./quickcomposer/macos"),
   status: require("./quickcomposer/status"),
 };
 
diff --git a/plugin/lib/quickcomposer/macos/app.js b/plugin/lib/quickcomposer/macos/app.js
new file mode 100644
index 00000000..aa1de794
--- /dev/null
+++ b/plugin/lib/quickcomposer/macos/app.js
@@ -0,0 +1,468 @@
+module.exports = {
+  // 获取前台应用
+  getFrontmost: async function () {
+    const result = await quickcommand.runAppleScript(`
+      tell application "System Events"
+        set frontApp to first application process whose frontmost is true
+        set appName to name of frontApp
+        set appDisplayName to displayed name of frontApp
+        try
+          set appPath to POSIX path of (application file of frontApp)
+        on error
+          try
+            set appPath to POSIX path of (file of frontApp)
+          on error
+            set appPath to ""
+          end try
+        end try
+        try
+          set appVersion to short version of frontApp
+        on error
+          set appVersion to ""
+        end try
+        try
+          set appPid to unix id of frontApp
+        on error
+          set appPid to 0
+        end try
+        try
+          set appMemory to background only of frontApp
+        on error
+          set appMemory to false
+        end try
+        try
+          set appVisible to visible of frontApp
+        on error
+          set appVisible to false
+        end try
+        try
+          set theWindow to window 1 of frontApp
+          set windowName to name of theWindow
+          set windowPos to position of theWindow
+          set windowSize to size of theWindow
+          set isMinimized to value of attribute "AXMinimized" of theWindow
+          set isFullscreen to value of attribute "AXFullScreen" of theWindow
+          try
+            set windowTitle to title of theWindow
+          on error
+            set windowTitle to windowName
+          end try
+          try
+            set windowIndex to index of theWindow
+          on error
+            set windowIndex to 1
+          end try
+          set json to "{"
+          set json to json & "\\"name\\":\\"" & appName & "\\","
+          set json to json & "\\"displayedName\\":\\"" & appDisplayName & "\\","
+          set json to json & "\\"path\\":\\"" & appPath & "\\","
+          set json to json & "\\"version\\":\\"" & appVersion & "\\","
+          set json to json & "\\"pid\\":" & appPid & ","
+          set json to json & "\\"backgroundOnly\\":" & appMemory & ","
+          set json to json & "\\"visible\\":" & appVisible & ","
+          set json to json & "\\"frontmost\\":true,"
+          set json to json & "\\"window\\":{"
+          set json to json & "\\"name\\":\\"" & windowName & "\\","
+          set json to json & "\\"title\\":\\"" & windowTitle & "\\","
+          set json to json & "\\"index\\":" & windowIndex & ","
+          set json to json & "\\"position\\":[" & (item 1 of windowPos as text) & "," & (item 2 of windowPos as text) & "],"
+          set json to json & "\\"size\\":[" & (item 1 of windowSize as text) & "," & (item 2 of windowSize as text) & "],"
+          set json to json & "\\"minimized\\":" & isMinimized & ","
+          set json to json & "\\"fullscreen\\":" & isFullscreen
+          set json to json & "}"
+          set json to json & "}"
+        on error
+          set json to "{"
+          set json to json & "\\"name\\":\\"" & appName & "\\","
+          set json to json & "\\"displayedName\\":\\"" & appDisplayName & "\\","
+          set json to json & "\\"path\\":\\"" & appPath & "\\","
+          set json to json & "\\"version\\":\\"" & appVersion & "\\","
+          set json to json & "\\"pid\\":" & appPid & ","
+          set json to json & "\\"backgroundOnly\\":" & appMemory & ","
+          set json to json & "\\"visible\\":" & appVisible & ","
+          set json to json & "\\"frontmost\\":true,"
+          set json to json & "\\"window\\":null"
+          set json to json & "}"
+        end try
+        return json
+      end tell
+    `);
+    return JSON.parse(result);
+  },
+
+  // 获取运行中的应用
+  getRunningApps: async function () {
+    const result = await quickcommand.runAppleScript(`
+      tell application "System Events"
+        set appList to "["
+        set runningApps to application processes
+        repeat with i from 1 to count of runningApps
+          set theApp to item i of runningApps
+          set appName to name of theApp
+          set appDisplayName to displayed name of theApp
+          try
+            set appPath to POSIX path of (application file of theApp)
+          on error
+            try
+              set appPath to POSIX path of (file of theApp)
+            on error
+              set appPath to ""
+            end try
+          end try
+          try
+            set appVersion to short version of theApp
+          on error
+            set appVersion to ""
+          end try
+          try
+            set appPid to unix id of theApp
+          on error
+            set appPid to 0
+          end try
+          try
+            set appMemory to background only of theApp
+          on error
+            set appMemory to false
+          end try
+          try
+            set appVisible to visible of theApp
+          on error
+            set appVisible to false
+          end try
+          try
+            set theWindow to window 1 of theApp
+            set windowName to name of theWindow
+            set windowPos to position of theWindow
+            set windowSize to size of theWindow
+            set isMinimized to value of attribute "AXMinimized" of theWindow
+            set isFullscreen to value of attribute "AXFullScreen" of theWindow
+            try
+              set windowTitle to title of theWindow
+            on error
+              set windowTitle to windowName
+            end try
+            try
+              set windowIndex to index of theWindow
+            on error
+              set windowIndex to 1
+            end try
+            set json to "{"
+            set json to json & "\\"name\\":\\"" & appName & "\\","
+            set json to json & "\\"displayedName\\":\\"" & appDisplayName & "\\","
+            set json to json & "\\"path\\":\\"" & appPath & "\\","
+            set json to json & "\\"version\\":\\"" & appVersion & "\\","
+            set json to json & "\\"pid\\":" & appPid & ","
+            set json to json & "\\"backgroundOnly\\":" & appMemory & ","
+            set json to json & "\\"visible\\":" & appVisible & ","
+            set json to json & "\\"frontmost\\":" & (frontmost of theApp) & ","
+            set json to json & "\\"window\\":{"
+            set json to json & "\\"name\\":\\"" & windowName & "\\","
+            set json to json & "\\"title\\":\\"" & windowTitle & "\\","
+            set json to json & "\\"index\\":" & windowIndex & ","
+            set json to json & "\\"position\\":[" & (item 1 of windowPos as text) & "," & (item 2 of windowPos as text) & "],"
+            set json to json & "\\"size\\":[" & (item 1 of windowSize as text) & "," & (item 2 of windowSize as text) & "],"
+            set json to json & "\\"minimized\\":" & isMinimized & ","
+            set json to json & "\\"fullscreen\\":" & isFullscreen
+            set json to json & "}"
+            set json to json & "}"
+          on error
+            set json to "{"
+            set json to json & "\\"name\\":\\"" & appName & "\\","
+            set json to json & "\\"displayedName\\":\\"" & appDisplayName & "\\","
+            set json to json & "\\"path\\":\\"" & appPath & "\\","
+            set json to json & "\\"version\\":\\"" & appVersion & "\\","
+            set json to json & "\\"pid\\":" & appPid & ","
+            set json to json & "\\"backgroundOnly\\":" & appMemory & ","
+            set json to json & "\\"visible\\":" & appVisible & ","
+            set json to json & "\\"frontmost\\":" & (frontmost of theApp) & ","
+            set json to json & "\\"window\\":null"
+            set json to json & "}"
+          end try
+          if i < count of runningApps then
+            set appList to appList & json & ","
+          else
+            set appList to appList & json
+          end if
+        end repeat
+        return appList & "]"
+      end tell
+    `);
+    return JSON.parse(result);
+  },
+
+  // 启动应用
+  launch: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "${appName}"
+        activate
+      end tell
+    `);
+  },
+
+  // 退出应用
+  quit: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "${appName}"
+        quit
+      end tell
+    `);
+  },
+
+  // 隐藏应用
+  hide: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        set visible of process "${appName}" to false
+      end tell
+    `);
+  },
+
+  // 显示应用
+  show: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        set visible of process "${appName}" to true
+      end tell
+      tell application "${appName}"
+        activate
+      end tell
+    `);
+  },
+
+  // 最小化窗口
+  minimize: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "${appName}"
+          try
+            set value of attribute "AXMinimized" of window 1 to true
+          end try
+        end tell
+      end tell
+    `);
+  },
+
+  // 最大化窗口
+  maximize: async function (appName) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "${appName}"
+          try
+            set value of attribute "AXMinimized" of window 1 to false
+            set value of attribute "AXFullScreen" of window 1 to true
+          end try
+        end tell
+      end tell
+    `);
+  },
+
+  // 获取窗口信息
+  getWindows: async function (appName) {
+    const result = await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "${appName}"
+          set appName to name
+          set appDisplayName to displayed name
+          set appPid to unix id
+          set appMemory to background only
+          set appVisible to visible
+          set appFrontmost to frontmost
+
+          try
+            set appPath to POSIX path of (application file)
+          on error
+            try
+              set appPath to POSIX path of file
+            on error
+              set appPath to ""
+            end try
+          end try
+
+          try
+            set appVersion to short version
+          on error
+            set appVersion to ""
+          end try
+
+          set windowList to "["
+          set theWindows to windows
+          repeat with i from 1 to count of theWindows
+            set theWindow to item i of theWindows
+            try
+              set windowName to name of theWindow
+              set windowPos to position of theWindow
+              set windowSize to size of theWindow
+              set isMinimized to value of attribute "AXMinimized" of theWindow
+              set isFullscreen to value of attribute "AXFullScreen" of theWindow
+              try
+                set windowTitle to title of theWindow
+              on error
+                set windowTitle to windowName
+              end try
+              try
+                set windowIndex to index of theWindow
+              on error
+                set windowIndex to i
+              end try
+
+              set json to "{"
+              set json to json & "\\"name\\":\\"" & appName & "\\","
+              set json to json & "\\"displayedName\\":\\"" & appDisplayName & "\\","
+              set json to json & "\\"path\\":\\"" & appPath & "\\","
+              set json to json & "\\"version\\":\\"" & appVersion & "\\","
+              set json to json & "\\"pid\\":" & appPid & ","
+              set json to json & "\\"backgroundOnly\\":" & appMemory & ","
+              set json to json & "\\"visible\\":" & appVisible & ","
+              set json to json & "\\"frontmost\\":" & appFrontmost & ","
+              set json to json & "\\"window\\":{"
+              set json to json & "\\"name\\":\\"" & windowName & "\\","
+              set json to json & "\\"title\\":\\"" & windowTitle & "\\","
+              set json to json & "\\"index\\":" & windowIndex & ","
+              set json to json & "\\"position\\":[" & (item 1 of windowPos as text) & "," & (item 2 of windowPos as text) & "],"
+              set json to json & "\\"size\\":[" & (item 1 of windowSize as text) & "," & (item 2 of windowSize as text) & "],"
+              set json to json & "\\"minimized\\":" & isMinimized & ","
+              set json to json & "\\"fullscreen\\":" & isFullscreen
+              set json to json & "}"
+              set json to json & "}"
+
+              if i < count of theWindows then
+                set windowList to windowList & json & ","
+              else
+                set windowList to windowList & json
+              end if
+            end try
+          end repeat
+          return windowList & "]"
+        end tell
+      end tell
+    `);
+    return JSON.parse(result);
+  },
+
+  // 获取应用脚本字典
+  getScriptDictionary: async function (appName) {
+    try {
+      const { execSync } = require("child_process");
+
+      // 获取应用路径
+      const appPathResult = await quickcommand.runAppleScript(`
+        tell application "System Events"
+          tell process "${appName}"
+            try
+              set appPath to POSIX path of (application file)
+            on error
+              try
+                set appPath to POSIX path of file
+              on error
+                set appPath to ""
+              end try
+            end try
+            return appPath
+          end tell
+        end tell
+      `);
+
+      const appPath = appPathResult.trim();
+      if (!appPath) {
+        return {
+          commands: [],
+          properties: [],
+          error: "找不到应用程序",
+        };
+      }
+
+      // 使用 sdef 命令获取脚本字典
+      let xmlContent;
+      try {
+        xmlContent = execSync(`/usr/bin/sdef "${appPath}"`).toString();
+      } catch (e) {
+        return {
+          commands: [],
+          properties: [],
+          error: "该应用程序没有脚本字典",
+        };
+      }
+
+      // 使用正则表达式提取命令和属性的详细信息
+      const commands = [];
+      const properties = [];
+
+      // 匹配命令及其描述
+      const commandRegex =
+        /<command.*?name="([^"]+)".*?(?:description="([^"]*)")?.*?>([\s\S]*?)<\/command>/g;
+      let match;
+      while ((match = commandRegex.exec(xmlContent)) !== null) {
+        const name = match[1];
+        const description = match[2] || "";
+        const content = match[3];
+
+        // 解析参数
+        const parameters = [];
+        const paramRegex =
+          /<parameter.*?name="([^"]+)".*?(?:description="([^"]*)")?.*?type="([^"]+)".*?(?:optional="([^"]+)")?/g;
+        let paramMatch;
+        while ((paramMatch = paramRegex.exec(content)) !== null) {
+          parameters.push({
+            name: paramMatch[1],
+            description: paramMatch[2] || "",
+            type: paramMatch[3],
+            optional: paramMatch[4] === "yes",
+          });
+        }
+
+        // 解析返回值
+        const resultRegex =
+          /<result.*?type="([^"]+)".*?(?:description="([^"]*)")?/;
+        const resultMatch = content.match(resultRegex);
+        const result = resultMatch
+          ? {
+              type: resultMatch[1],
+              description: resultMatch[2] || "",
+            }
+          : null;
+
+        commands.push({
+          name,
+          description,
+          parameters,
+          result,
+          usage: `tell application "${appName}" to ${name}${
+            parameters.length
+              ? " " + parameters.map((p) => p.name).join(" ")
+              : ""
+          }`,
+        });
+      }
+
+      // 匹配属性及其描述
+      const propertyRegex =
+        /<property.*?name="([^"]+)".*?(?:description="([^"]*)")?.*?(?:access="([^"]*)")?.*?type="([^"]+)".*?>/g;
+      while ((match = propertyRegex.exec(xmlContent)) !== null) {
+        properties.push({
+          name: match[1],
+          description: match[2] || "",
+          access: match[3] || "read/write",
+          type: match[4],
+          usage: `tell application "${appName}" to get ${match[1]}`,
+        });
+      }
+
+      return {
+        commands,
+        properties,
+        summary: {
+          totalCommands: commands.length,
+          totalProperties: properties.length,
+          hasScriptingSupport: true,
+        },
+      };
+    } catch (e) {
+      console.error("Error getting script dictionary:", e);
+      return {
+        commands: [],
+        properties: [],
+        error: e.message,
+      };
+    }
+  },
+};
diff --git a/plugin/lib/quickcomposer/macos/finder.js b/plugin/lib/quickcomposer/macos/finder.js
new file mode 100644
index 00000000..e958b15b
--- /dev/null
+++ b/plugin/lib/quickcomposer/macos/finder.js
@@ -0,0 +1,110 @@
+module.exports = {
+  // 获取选中项
+  getSelection: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set selectedItems to selection
+        set itemList to {}
+        repeat with theItem in selectedItems
+          set end of itemList to {
+            name: name of theItem,
+            path: POSIX path of (theItem as alias),
+            kind: kind of theItem,
+            size: size of theItem,
+            created: creation date of theItem,
+            modified: modification date of theItem
+          }
+        end repeat
+        return itemList
+      end tell
+    `);
+  },
+
+  // 获取当前文件夹
+  getCurrentFolder: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set currentFolder to (target of front window) as alias
+        return {
+          name: name of currentFolder,
+          path: POSIX path of currentFolder,
+          kind: kind of currentFolder,
+          created: creation date of currentFolder,
+          modified: modification date of currentFolder
+        }
+      end tell
+    `);
+  },
+
+  // 新建文件夹
+  newFolder: async function (name) {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set currentFolder to (target of front window) as alias
+        make new folder at currentFolder with properties {name:"${name}"}
+      end tell
+    `);
+  },
+
+  // 移到废纸篓
+  moveToTrash: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        delete selection
+      end tell
+    `);
+  },
+
+  // 清空废纸篓
+  emptyTrash: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        empty trash
+      end tell
+    `);
+  },
+
+  // 显示包内容
+  showPackageContents: async function (path) {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        open package folder "${path}"
+      end tell
+    `);
+  },
+
+  // 设置显示隐藏文件
+  setShowHiddenFiles: async function (show) {
+    return await quickcommand.runAppleScript(`
+      do shell script "defaults write com.apple.finder AppleShowAllFiles -bool ${show}"
+      do shell script "killall Finder"
+    `);
+  },
+
+  // 设置显示路径栏
+  setShowPathbar: async function (show) {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set ShowPathbar to ${show}
+      end tell
+    `);
+  },
+
+  // 设置显示状态栏
+  setShowStatusBar: async function (show) {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set StatusBar to ${show}
+      end tell
+    `);
+  },
+
+  // 设置显示预览面板
+  setShowPreviewPane: async function (show) {
+    return await quickcommand.runAppleScript(`
+      tell application "Finder"
+        set PreviewPaneIsVisible to ${show}
+      end tell
+    `);
+  },
+};
diff --git a/plugin/lib/quickcomposer/macos/index.js b/plugin/lib/quickcomposer/macos/index.js
new file mode 100644
index 00000000..82a46397
--- /dev/null
+++ b/plugin/lib/quickcomposer/macos/index.js
@@ -0,0 +1,9 @@
+const app = require("./app");
+const system = require("./system");
+const finder = require("./finder");
+
+module.exports = {
+  app,
+  system,
+  finder,
+};
diff --git a/plugin/lib/quickcomposer/macos/system.js b/plugin/lib/quickcomposer/macos/system.js
new file mode 100644
index 00000000..4141db29
--- /dev/null
+++ b/plugin/lib/quickcomposer/macos/system.js
@@ -0,0 +1,113 @@
+module.exports = {
+  // 控制中心
+  controlCenter: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "Control Center"
+          click menu bar item 1 of menu bar 1
+        end tell
+      end tell
+    `);
+  },
+
+  // 通知中心
+  notificationCenter: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "NotificationCenter"
+          click menu bar item 1 of menu bar 1
+        end tell
+      end tell
+    `);
+  },
+
+  // 设置系统音量
+  setVolume: async function (volume) {
+    return await quickcommand.runAppleScript(`
+      set volume output volume ${volume}
+    `);
+  },
+
+  // 设置屏幕亮度
+  setBrightness: async function (brightness) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell process "SystemUIServer"
+          set value of slider 1 of group 1 of window "Display" to ${brightness}
+        end tell
+      end tell
+    `);
+  },
+
+  // 锁定屏幕
+  lockScreen: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        keystroke "q" using {command down, control down}
+      end tell
+    `);
+  },
+
+  // 进入睡眠
+  sleep: async function () {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        sleep
+      end tell
+    `);
+  },
+
+  // 设置Dock位置
+  setDockPosition: async function (position) {
+    return await quickcommand.runAppleScript(`
+      do shell script "defaults write com.apple.dock orientation -string ${position}"
+      do shell script "killall Dock"
+    `);
+  },
+
+  // 设置Dock大小
+  setDockSize: async function (size) {
+    return await quickcommand.runAppleScript(`
+      do shell script "defaults write com.apple.dock tilesize -int ${size}"
+      do shell script "killall Dock"
+    `);
+  },
+
+  // 设置Dock自动隐藏
+  toggleDockAutohide: async function (enabled) {
+    return await quickcommand.runAppleScript(`
+      do shell script "defaults write com.apple.dock autohide -bool ${enabled}"
+      do shell script "killall Dock"
+    `);
+  },
+
+  // 设置菜单栏自动隐藏
+  toggleMenuBarAutohide: async function (enabled) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell dock preferences
+          set autohide menu bar to ${enabled}
+        end tell
+      end tell
+    `);
+  },
+
+  // 设置时钟格式
+  setClockFormat: async function (format) {
+    return await quickcommand.runAppleScript(`
+      do shell script "defaults write com.apple.menuextra.clock DateFormat -string '${format}'"
+      do shell script "killall SystemUIServer"
+    `);
+  },
+
+  // 切换深色模式
+  toggleDarkMode: async function (enabled) {
+    return await quickcommand.runAppleScript(`
+      tell application "System Events"
+        tell appearance preferences
+          set dark mode to ${enabled}
+        end tell
+      end tell
+    `);
+  },
+};
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index b9460a97..e988a7ae 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -39,7 +39,7 @@ export default defineComponent({
   },
   props: {
     config: {
-      type: Array,
+      type: Object,
       required: true,
     },
     modelValue: {
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 571c9b6b..3bf3d0a4 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -16,6 +16,7 @@ import { audioCommands } from "./audioCommands";
 import { imageCommands } from "./imageCommands";
 import { windowsCommands } from "./windowsCommands";
 import { statusCommands } from "./statusCommands";
+import { macosCommands } from "./macosCommands";
 
 let commands = [
   fileCommands,
@@ -40,6 +41,10 @@ if (window.utools.isWindows()) {
   commands.push(windowsCommands);
 }
 
+if (window.utools.isMacOS()) {
+  commands.push(macosCommands);
+}
+
 commands.push(otherCommands);
 
 export const commandCategories = commands;
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
new file mode 100644
index 00000000..98e779a9
--- /dev/null
+++ b/src/js/composer/commands/macosCommands.js
@@ -0,0 +1,445 @@
+export const macosCommands = {
+  label: "MacOS专区",
+  icon: "laptop_mac",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.macos.app.getFrontmost",
+      label: "应用管理",
+      desc: "应用程序管理功能",
+      icon: "apps",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.macos.app.getFrontmost",
+          label: "获取前台应用",
+          desc: "获取当前前台运行的应用信息",
+          icon: "front_hand",
+        },
+        {
+          value: "quickcomposer.macos.app.getRunningApps",
+          label: "获取活动应用",
+          desc: "获取所有正在运行的应用列表",
+          icon: "list",
+        },
+        {
+          value: "quickcomposer.macos.app.launch",
+          label: "启动应用",
+          desc: "启动指定的应用程序",
+          icon: "launch",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.quit",
+          label: "退出应用",
+          desc: "退出指定的应用程序",
+          icon: "close",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.hide",
+          label: "隐藏应用",
+          desc: "隐藏指定的应用程序",
+          icon: "visibility_off",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.show",
+          label: "显示应用",
+          desc: "显示指定的应用程序",
+          icon: "visibility",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.minimize",
+          label: "最小化窗口",
+          desc: "最小化指定应用的窗口",
+          icon: "minimize",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.maximize",
+          label: "最大化窗口",
+          desc: "最大化指定应用的窗口",
+          icon: "maximize",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.getWindows",
+          label: "获取窗口信息",
+          desc: "获取指定应用的所有窗口信息",
+          icon: "window",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.app.getScriptDictionary",
+          label: "获取应用脚本字典",
+          desc: "获取应用程序的AppleScript字典内容",
+          icon: "code",
+          config: [
+            {
+              key: "appName",
+              label: "应用名称",
+              component: "VariableInput",
+              icon: "apps",
+              width: 12,
+              placeholder: "输入应用名称",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.macos.system",
+      label: "系统管理",
+      desc: "系统级别的控制功能",
+      icon: "settings",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.macos.system.controlCenter",
+          label: "控制中心",
+          desc: "打开或关闭控制中心",
+          icon: "toggle_on",
+        },
+        {
+          value: "quickcomposer.macos.system.notificationCenter",
+          label: "通知中心",
+          desc: "打开或关闭通知中心",
+          icon: "notifications",
+        },
+        {
+          value: "quickcomposer.macos.system.setVolume",
+          label: "系统音量",
+          desc: "调整系统音量",
+          icon: "volume_up",
+          config: [
+            {
+              key: "volume",
+              label: "音量",
+              component: "NumberInput",
+              icon: "volume_up",
+              min: 0,
+              max: 100,
+              defaultValue: 50,
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.setBrightness",
+          label: "屏幕亮度",
+          desc: "调整屏幕亮度",
+          icon: "brightness_medium",
+          config: [
+            {
+              key: "brightness",
+              label: "亮度",
+              component: "NumberInput",
+              icon: "brightness_medium",
+              min: 0,
+              max: 100,
+              defaultValue: 50,
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.lockScreen",
+          label: "锁定屏幕",
+          desc: "锁定系统屏幕",
+          icon: "lock",
+        },
+        {
+          value: "quickcomposer.macos.system.sleep",
+          label: "进入睡眠",
+          desc: "使系统进入睡眠状态",
+          icon: "bedtime",
+        },
+        {
+          value: "quickcomposer.macos.system.setDockPosition",
+          label: "Dock位置",
+          desc: "设置Dock栏位置",
+          icon: "swap_horiz",
+          config: [
+            {
+              key: "position",
+              label: "位置",
+              component: "ButtonGroup",
+              width: 12,
+              options: [
+                { label: "底部", value: "bottom" },
+                { label: "左侧", value: "left" },
+                { label: "右侧", value: "right" },
+              ],
+              defaultValue: "bottom",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.setDockSize",
+          label: "Dock大小",
+          desc: "设置Dock栏大小",
+          icon: "aspect_ratio",
+          config: [
+            {
+              key: "size",
+              label: "大小",
+              component: "NumberInput",
+              min: 16,
+              max: 128,
+              defaultValue: 48,
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.toggleDockAutohide",
+          label: "Dock自动隐藏",
+          desc: "设置Dock栏自动隐藏",
+          icon: "visibility_off",
+          config: [
+            {
+              key: "enabled",
+              label: "启用",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: false,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.toggleMenuBarAutohide",
+          label: "菜单栏自动隐藏",
+          desc: "设置菜单栏自动隐藏",
+          icon: "visibility_off",
+          config: [
+            {
+              key: "enabled",
+              label: "启用",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: false,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.setClockFormat",
+          label: "时钟格式",
+          desc: "设置菜单栏时钟显示格式",
+          icon: "schedule",
+          config: [
+            {
+              key: "format",
+              label: "格式",
+              component: "TextInput",
+              width: 12,
+              placeholder: "EEE MMM d  H:mm:ss",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.system.toggleDarkMode",
+          label: "深色模式",
+          desc: "切换系统深色模式",
+          icon: "dark_mode",
+          config: [
+            {
+              key: "enabled",
+              label: "启用",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: false,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.macos.finder",
+      label: "访达管理",
+      desc: "访达操作和文件管理功能",
+      icon: "folder",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.macos.finder.getSelection",
+          label: "获取选中项",
+          desc: "获取访达中当前选中的项目",
+          icon: "select_all",
+        },
+        {
+          value: "quickcomposer.macos.finder.getCurrentFolder",
+          label: "获取当前文件夹",
+          desc: "获取访达当前打开的文件夹路径",
+          icon: "folder_open",
+        },
+        {
+          value: "quickcomposer.macos.finder.newFolder",
+          label: "新建文件夹",
+          desc: "在当前位置创建新文件夹",
+          icon: "create_new_folder",
+          config: [
+            {
+              key: "name",
+              label: "文件夹名称",
+              component: "TextInput",
+              width: 12,
+              placeholder: "新建文件夹",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.finder.moveToTrash",
+          label: "移到废纸篓",
+          desc: "将选中项目移动到废纸篓",
+          icon: "delete",
+        },
+        {
+          value: "quickcomposer.macos.finder.emptyTrash",
+          label: "清空废纸篓",
+          desc: "清空废纸篓",
+          icon: "delete_forever",
+        },
+        {
+          value: "quickcomposer.macos.finder.showPackageContents",
+          label: "显示包内容",
+          desc: "显示应用程序包内容",
+          icon: "folder_zip",
+          config: [
+            {
+              key: "path",
+              label: "应用路径",
+              component: "FilePicker",
+              width: 12,
+              placeholder: "选择应用程序",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.finder.setShowHiddenFiles",
+          label: "显示隐藏文件",
+          desc: "设置是否显示隐藏文件",
+          icon: "visibility",
+          config: [
+            {
+              key: "show",
+              label: "显示",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: false,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.finder.setShowPathbar",
+          label: "显示路径栏",
+          desc: "设置是否显示路径栏",
+          icon: "wrap_text",
+          config: [
+            {
+              key: "show",
+              label: "显示",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.finder.setShowStatusBar",
+          label: "显示状态栏",
+          desc: "设置是否显示状态栏",
+          icon: "info",
+          config: [
+            {
+              key: "show",
+              label: "显示",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.finder.setShowPreviewPane",
+          label: "显示预览面板",
+          desc: "设置是否显示预览面板",
+          icon: "preview",
+          config: [
+            {
+              key: "show",
+              label: "显示",
+              component: "CheckButton",
+              width: 12,
+              defaultValue: true,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
index cc1fbdca..fb90e32c 100644
--- a/src/js/composer/commands/screenCommands.js
+++ b/src/js/composer/commands/screenCommands.js
@@ -67,7 +67,7 @@ const RECT_DICT_EDITOR = {
 
 export const screenCommands = {
   label: "显示器",
-  icon: "screenshot_monitor",
+  icon: "display_settings",
   commands: [
     {
       value: "utools.getPrimaryDisplay",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 04dc3f9f..a281f6a6 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -2,7 +2,7 @@ import { newVarInputVal } from "js/composer/varInputValManager";
 
 export const systemCommands = {
   label: "系统操作",
-  icon: "computer",
+  icon: "settings_suggest",
   defaultOpened: false,
   commands: [
     {
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 046615a1..1449b32d 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,7 +1,5 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
-
 export const windowsCommands = {
-  label: "Windows工具",
+  label: "Windows专区",
   icon: "window",
   defaultOpened: false,
   commands: [

From f7165c9f2d0a392916969b9a5d67659d70985198 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 19:11:57 +0800
Subject: [PATCH 036/332] =?UTF-8?q?MacOS=E4=B8=93=E5=8C=BA=EF=BC=8C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=9F=B3=E9=87=8F=E3=80=81=E9=94=81=E5=AE=9A=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E3=80=81=E8=BF=9B=E5=85=A5=E7=9D=A1=E7=9C=A0=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEDock=E3=80=81=E9=9A=90=E8=97=8F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/macos/system.js      | 41 --------
 .../composer/param/ParamImporter.vue          |  2 +-
 src/js/composer/commands/macosCommands.js     | 93 +++++++------------
 3 files changed, 32 insertions(+), 104 deletions(-)

diff --git a/plugin/lib/quickcomposer/macos/system.js b/plugin/lib/quickcomposer/macos/system.js
index 4141db29..9c5c15d1 100644
--- a/plugin/lib/quickcomposer/macos/system.js
+++ b/plugin/lib/quickcomposer/macos/system.js
@@ -1,26 +1,4 @@
 module.exports = {
-  // 控制中心
-  controlCenter: async function () {
-    return await quickcommand.runAppleScript(`
-      tell application "System Events"
-        tell process "Control Center"
-          click menu bar item 1 of menu bar 1
-        end tell
-      end tell
-    `);
-  },
-
-  // 通知中心
-  notificationCenter: async function () {
-    return await quickcommand.runAppleScript(`
-      tell application "System Events"
-        tell process "NotificationCenter"
-          click menu bar item 1 of menu bar 1
-        end tell
-      end tell
-    `);
-  },
-
   // 设置系统音量
   setVolume: async function (volume) {
     return await quickcommand.runAppleScript(`
@@ -28,17 +6,6 @@ module.exports = {
     `);
   },
 
-  // 设置屏幕亮度
-  setBrightness: async function (brightness) {
-    return await quickcommand.runAppleScript(`
-      tell application "System Events"
-        tell process "SystemUIServer"
-          set value of slider 1 of group 1 of window "Display" to ${brightness}
-        end tell
-      end tell
-    `);
-  },
-
   // 锁定屏幕
   lockScreen: async function () {
     return await quickcommand.runAppleScript(`
@@ -92,14 +59,6 @@ module.exports = {
     `);
   },
 
-  // 设置时钟格式
-  setClockFormat: async function (format) {
-    return await quickcommand.runAppleScript(`
-      do shell script "defaults write com.apple.menuextra.clock DateFormat -string '${format}'"
-      do shell script "killall SystemUIServer"
-    `);
-  },
-
   // 切换深色模式
   toggleDarkMode: async function (enabled) {
     return await quickcommand.runAppleScript(`
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index e988a7ae..23503aa0 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -43,7 +43,7 @@ export default defineComponent({
       required: true,
     },
     modelValue: {
-      type: Object,
+      type: [Object, String, Number, Array, Boolean],
       required: true,
     },
   },
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 98e779a9..9f569371 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -153,24 +153,12 @@ export const macosCommands = {
       ],
     },
     {
-      value: "quickcomposer.macos.system",
+      value: "quickcomposer.macos.system.setVolume",
       label: "系统管理",
       desc: "系统级别的控制功能",
       icon: "settings",
       isAsync: true,
       subCommands: [
-        {
-          value: "quickcomposer.macos.system.controlCenter",
-          label: "控制中心",
-          desc: "打开或关闭控制中心",
-          icon: "toggle_on",
-        },
-        {
-          value: "quickcomposer.macos.system.notificationCenter",
-          label: "通知中心",
-          desc: "打开或关闭通知中心",
-          icon: "notifications",
-        },
         {
           value: "quickcomposer.macos.system.setVolume",
           label: "系统音量",
@@ -184,24 +172,7 @@ export const macosCommands = {
               icon: "volume_up",
               min: 0,
               max: 100,
-              defaultValue: 50,
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.system.setBrightness",
-          label: "屏幕亮度",
-          desc: "调整屏幕亮度",
-          icon: "brightness_medium",
-          config: [
-            {
-              key: "brightness",
-              label: "亮度",
-              component: "NumberInput",
-              icon: "brightness_medium",
-              min: 0,
-              max: 100,
+              step: 10,
               defaultValue: 50,
               width: 12,
             },
@@ -221,34 +192,44 @@ export const macosCommands = {
         },
         {
           value: "quickcomposer.macos.system.setDockPosition",
-          label: "Dock位置",
-          desc: "设置Dock栏位置",
-          icon: "swap_horiz",
+          label: "设置Dock位置",
+          desc: "设置Dock栏的显示位置",
+          icon: "dock",
           config: [
             {
               key: "position",
               label: "位置",
               component: "ButtonGroup",
+              defaultValue: "bottom",
               width: 12,
               options: [
-                { label: "底部", value: "bottom" },
-                { label: "左侧", value: "left" },
-                { label: "右侧", value: "right" },
+                {
+                  label: "底部",
+                  value: "bottom",
+                },
+                {
+                  label: "左侧",
+                  value: "left",
+                },
+                {
+                  label: "右侧",
+                  value: "right",
+                },
               ],
-              defaultValue: "bottom",
             },
           ],
         },
         {
           value: "quickcomposer.macos.system.setDockSize",
-          label: "Dock大小",
-          desc: "设置Dock栏大小",
-          icon: "aspect_ratio",
+          label: "设置Dock大小",
+          desc: "设置Dock栏的图标大小",
+          icon: "dock",
           config: [
             {
               key: "size",
               label: "大小",
               component: "NumberInput",
+              icon: "dock",
               min: 16,
               max: 128,
               defaultValue: 48,
@@ -259,45 +240,32 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.toggleDockAutohide",
           label: "Dock自动隐藏",
-          desc: "设置Dock栏自动隐藏",
-          icon: "visibility_off",
+          desc: "设置Dock栏是否自动隐藏",
+          icon: "dock",
           config: [
             {
               key: "enabled",
               label: "启用",
               component: "CheckButton",
-              width: 12,
               defaultValue: false,
+              icon: "dock",
+              width: 12,
             },
           ],
         },
         {
           value: "quickcomposer.macos.system.toggleMenuBarAutohide",
           label: "菜单栏自动隐藏",
-          desc: "设置菜单栏自动隐藏",
-          icon: "visibility_off",
+          desc: "设置菜单栏是否自动隐藏",
+          icon: "menu",
           config: [
             {
               key: "enabled",
               label: "启用",
               component: "CheckButton",
-              width: 12,
               defaultValue: false,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.system.setClockFormat",
-          label: "时钟格式",
-          desc: "设置菜单栏时钟显示格式",
-          icon: "schedule",
-          config: [
-            {
-              key: "format",
-              label: "格式",
-              component: "TextInput",
+              icon: "menu",
               width: 12,
-              placeholder: "EEE MMM d  H:mm:ss",
             },
           ],
         },
@@ -311,8 +279,9 @@ export const macosCommands = {
               key: "enabled",
               label: "启用",
               component: "CheckButton",
+              defaultValue: true,
+              icon: "dark_mode",
               width: 12,
-              defaultValue: false,
             },
           ],
         },

From b7af2bd1ff05da168eb1b42e08582a45213da9e1 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 11 Jan 2025 20:24:46 +0800
Subject: [PATCH 037/332] =?UTF-8?q?MacOS=E4=B8=93=E5=8C=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BF=E8=BE=BE=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=8E=B7=E5=8F=96=E9=80=89=E4=B8=AD=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=93=E5=BC=80=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=AA=97=E5=8F=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=BF=80=E6=B4=BB=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/macos/finder.js      | 126 ++++++++----------
 .../composer/param/ParamImporter.vue          |   2 +-
 src/js/composer/commands/macosCommands.js     |  99 +++-----------
 3 files changed, 70 insertions(+), 157 deletions(-)

diff --git a/plugin/lib/quickcomposer/macos/finder.js b/plugin/lib/quickcomposer/macos/finder.js
index e958b15b..d7c6b57b 100644
--- a/plugin/lib/quickcomposer/macos/finder.js
+++ b/plugin/lib/quickcomposer/macos/finder.js
@@ -1,76 +1,47 @@
 module.exports = {
   // 获取选中项
   getSelection: async function () {
-    return await quickcommand.runAppleScript(`
+    const result = await quickcommand.runAppleScript(`
       tell application "Finder"
         set selectedItems to selection
-        set itemList to {}
-        repeat with theItem in selectedItems
-          set end of itemList to {
-            name: name of theItem,
-            path: POSIX path of (theItem as alias),
-            kind: kind of theItem,
-            size: size of theItem,
-            created: creation date of theItem,
-            modified: modification date of theItem
-          }
+        set json to "["
+        repeat with i from 1 to count of selectedItems
+          set theItem to item i of selectedItems
+          set json to json & "{"
+          set json to json & "\\"name\\":\\"" & name of theItem & "\\","
+          set json to json & "\\"path\\":\\"" & POSIX path of (theItem as alias) & "\\","
+          set json to json & "\\"kind\\":\\"" & kind of theItem & "\\","
+          set json to json & "\\"size\\":" & size of theItem & ","
+          set json to json & "\\"created\\":\\"" & creation date of theItem & "\\","
+          set json to json & "\\"modified\\":\\"" & modification date of theItem & "\\""
+          set json to json & "}"
+          if i < count of selectedItems then
+            set json to json & ","
+          end if
         end repeat
-        return itemList
+        set json to json & "]"
+        return json
       end tell
     `);
+    return JSON.parse(result);
   },
 
   // 获取当前文件夹
   getCurrentFolder: async function () {
-    return await quickcommand.runAppleScript(`
-      tell application "Finder"
-        set currentFolder to (target of front window) as alias
-        return {
-          name: name of currentFolder,
-          path: POSIX path of currentFolder,
-          kind: kind of currentFolder,
-          created: creation date of currentFolder,
-          modified: modification date of currentFolder
-        }
-      end tell
-    `);
-  },
-
-  // 新建文件夹
-  newFolder: async function (name) {
-    return await quickcommand.runAppleScript(`
+    const result = await quickcommand.runAppleScript(`
       tell application "Finder"
         set currentFolder to (target of front window) as alias
-        make new folder at currentFolder with properties {name:"${name}"}
-      end tell
-    `);
-  },
-
-  // 移到废纸篓
-  moveToTrash: async function () {
-    return await quickcommand.runAppleScript(`
-      tell application "Finder"
-        delete selection
-      end tell
-    `);
-  },
-
-  // 清空废纸篓
-  emptyTrash: async function () {
-    return await quickcommand.runAppleScript(`
-      tell application "Finder"
-        empty trash
-      end tell
-    `);
-  },
-
-  // 显示包内容
-  showPackageContents: async function (path) {
-    return await quickcommand.runAppleScript(`
-      tell application "Finder"
-        open package folder "${path}"
+        set json to "{"
+        set json to json & "\\"name\\":\\"" & name of currentFolder & "\\","
+        set json to json & "\\"path\\":\\"" & POSIX path of currentFolder & "\\","
+        set json to json & "\\"kind\\":\\"" & kind of currentFolder & "\\","
+        set json to json & "\\"created\\":\\"" & creation date of currentFolder & "\\","
+        set json to json & "\\"modified\\":\\"" & modification date of currentFolder & "\\""
+        set json to json & "}"
+        return json
       end tell
     `);
+    return JSON.parse(result);
   },
 
   // 设置显示隐藏文件
@@ -81,29 +52,38 @@ module.exports = {
     `);
   },
 
-  // 设置显示路径栏
-  setShowPathbar: async function (show) {
-    return await quickcommand.runAppleScript(`
-      tell application "Finder"
-        set ShowPathbar to ${show}
-      end tell
-    `);
-  },
-
-  // 设置显示状态栏
-  setShowStatusBar: async function (show) {
-    return await quickcommand.runAppleScript(`
+  // 获取窗口列表
+  getWindows: async function () {
+    const result = await quickcommand.runAppleScript(`
       tell application "Finder"
-        set StatusBar to ${show}
+        set windowList to every window
+        set json to "["
+        repeat with i from 1 to count of windowList
+          set theWindow to item i of windowList
+          set json to json & "{"
+          set json to json & "\\"name\\":\\"" & name of theWindow & "\\","
+          set json to json & "\\"index\\":" & index of theWindow & ","
+          set json to json & "\\"bounds\\":\\"" & bounds of theWindow & "\\","
+          set json to json & "\\"target\\":\\"" & POSIX path of (target of theWindow as alias) & "\\""
+          set json to json & "}"
+          if i < count of windowList then
+            set json to json & ","
+          end if
+        end repeat
+        set json to json & "]"
+        return json
       end tell
     `);
+    return JSON.parse(result);
   },
 
-  // 设置显示预览面板
-  setShowPreviewPane: async function (show) {
+  // 激活指定窗口
+  activateWindow: async function (index) {
     return await quickcommand.runAppleScript(`
       tell application "Finder"
-        set PreviewPaneIsVisible to ${show}
+        activate
+        set theWindow to window ${index}
+        set index of theWindow to 1
       end tell
     `);
   },
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 23503aa0..53d04d21 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -43,7 +43,7 @@ export default defineComponent({
       required: true,
     },
     modelValue: {
-      type: [Object, String, Number, Array, Boolean],
+      type: null,
       required: true,
     },
   },
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 9f569371..b0c45aec 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -288,7 +288,7 @@ export const macosCommands = {
       ],
     },
     {
-      value: "quickcomposer.macos.finder",
+      value: "quickcomposer.macos.finder.getSelection",
       label: "访达管理",
       desc: "访达操作和文件管理功能",
       icon: "folder",
@@ -297,61 +297,16 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.finder.getSelection",
           label: "获取选中项",
-          desc: "获取访达中当前选中的项目",
           icon: "select_all",
         },
         {
           value: "quickcomposer.macos.finder.getCurrentFolder",
-          label: "获取当前文件夹",
-          desc: "获取访达当前打开的文件夹路径",
+          label: "获取打开的路径",
           icon: "folder_open",
         },
-        {
-          value: "quickcomposer.macos.finder.newFolder",
-          label: "新建文件夹",
-          desc: "在当前位置创建新文件夹",
-          icon: "create_new_folder",
-          config: [
-            {
-              key: "name",
-              label: "文件夹名称",
-              component: "TextInput",
-              width: 12,
-              placeholder: "新建文件夹",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.finder.moveToTrash",
-          label: "移到废纸篓",
-          desc: "将选中项目移动到废纸篓",
-          icon: "delete",
-        },
-        {
-          value: "quickcomposer.macos.finder.emptyTrash",
-          label: "清空废纸篓",
-          desc: "清空废纸篓",
-          icon: "delete_forever",
-        },
-        {
-          value: "quickcomposer.macos.finder.showPackageContents",
-          label: "显示包内容",
-          desc: "显示应用程序包内容",
-          icon: "folder_zip",
-          config: [
-            {
-              key: "path",
-              label: "应用路径",
-              component: "FilePicker",
-              width: 12,
-              placeholder: "选择应用程序",
-            },
-          ],
-        },
         {
           value: "quickcomposer.macos.finder.setShowHiddenFiles",
           label: "显示隐藏文件",
-          desc: "设置是否显示隐藏文件",
           icon: "visibility",
           config: [
             {
@@ -364,47 +319,25 @@ export const macosCommands = {
           ],
         },
         {
-          value: "quickcomposer.macos.finder.setShowPathbar",
-          label: "显示路径栏",
-          desc: "设置是否显示路径栏",
-          icon: "wrap_text",
-          config: [
-            {
-              key: "show",
-              label: "显示",
-              component: "CheckButton",
-              width: 12,
-              defaultValue: true,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.finder.setShowStatusBar",
-          label: "显示状态栏",
-          desc: "设置是否显示状态栏",
-          icon: "info",
-          config: [
-            {
-              key: "show",
-              label: "显示",
-              component: "CheckButton",
-              width: 12,
-              defaultValue: true,
-            },
-          ],
+          value: "quickcomposer.macos.finder.getWindows",
+          label: "获取窗口列表",
+          desc: "获取所有访达窗口信息",
+          icon: "window",
         },
         {
-          value: "quickcomposer.macos.finder.setShowPreviewPane",
-          label: "显示预览面板",
-          desc: "设置是否显示预览面板",
-          icon: "preview",
+          value: "quickcomposer.macos.finder.activateWindow",
+          label: "激活窗口",
+          desc: "激活指定的访达窗口",
+          icon: "open_in_new",
           config: [
             {
-              key: "show",
-              label: "显示",
-              component: "CheckButton",
+              key: "index",
+              label: "窗口索引",
+              component: "NumberInput",
+              icon: "window",
+              min: 1,
+              defaultValue: 1,
               width: 12,
-              defaultValue: true,
             },
           ],
         },

From c3a07ed0b54891899c6fba585e9ee136acf74f76 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 00:57:29 +0800
Subject: [PATCH 038/332] =?UTF-8?q?MacOS=E4=B8=93=E5=8C=BA=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B5=8F=E8=A7=88=E5=99=A8=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E8=87=AA=E5=8A=A8=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=EF=BC=8C=E8=BE=93=E5=85=A5=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E5=85=A5css=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                    |   7 +-
 plugin/lib/quickcomposer/macos/browser.js     | 347 ++++++++++
 plugin/lib/quickcomposer/macos/index.js       |   2 +
 src/components/composer/MultiParams.vue       |   3 +-
 .../composer/common/ButtonGroup.vue           |   1 -
 src/components/composer/common/CodeEditor.vue |  10 +-
 src/components/composer/common/DictEditor.vue | 242 +++----
 src/js/composer/commands/macosCommands.js     | 591 ++++++++++++++++++
 src/js/composer/formatString.js               |  18 +-
 9 files changed, 1036 insertions(+), 185 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/macos/browser.js

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 37c29393..9c4d4868 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -297,10 +297,15 @@ window.runPythonCommand = (py) => {
 };
 
 // 在终端中执行
-if (process.platform !== "linux")
+if (process.platform !== "linux") {
   quickcommand.runInTerminal = function (cmdline, dir) {
     let command = getCommandToLaunchTerminal(cmdline, dir);
     child_process.exec(command);
   };
+}
+
+quickcommand.showSystemMessageBox = function (title, content) {
+  window.utools.showNotification(title + "\n" + content);
+};
 
 module.exports = quickcommand;
diff --git a/plugin/lib/quickcomposer/macos/browser.js b/plugin/lib/quickcomposer/macos/browser.js
new file mode 100644
index 00000000..665e43c4
--- /dev/null
+++ b/plugin/lib/quickcomposer/macos/browser.js
@@ -0,0 +1,347 @@
+module.exports = {
+  // 获取当前地址
+  getUrl: async function (browser = "Microsoft Edge") {
+    const result = await quickcommand.runAppleScript(`
+      tell application "${browser}"
+        set currentTab to active tab of front window
+        return URL of currentTab
+      end tell
+    `);
+    return result;
+  },
+
+  // 设置当前地址
+  setUrl: async function (browser = "Microsoft Edge", url) {
+    return await quickcommand.runAppleScript(`
+      tell application "${browser}"
+        set URL of active tab of front window to "${url}"
+      end tell
+    `);
+  },
+
+  // 获取标签列表
+  getTabs: async function (browser = "Microsoft Edge") {
+    const result = await quickcommand.runAppleScript(`
+      tell application "${browser}"
+        set tabList to every tab of front window
+        set json to "["
+        repeat with i from 1 to count of tabList
+          set currentTab to item i of tabList
+          set json to json & "{"
+          set json to json & "\\"title\\":\\"" & title of currentTab & "\\","
+          set json to json & "\\"url\\":\\"" & URL of currentTab & "\\","
+          set json to json & "\\"index\\":" & i & ","
+          set json to json & "\\"loading\\":" & loading of currentTab
+          set json to json & "}"
+          if i < count of tabList then
+            set json to json & ","
+          end if
+        end repeat
+        set json to json & "]"
+        return json
+      end tell
+    `);
+    return JSON.parse(result);
+  },
+
+  // 切换标签
+  activateTab: async function (browser = "Microsoft Edge", index) {
+    return await quickcommand.runAppleScript(`
+        tell application "${browser}"
+          activate
+          tell front window
+            set active tab index to ${index}
+          end tell
+        end tell
+      `);
+  },
+
+  // 执行脚本
+  executeScript: async function (
+    browser = "Microsoft Edge",
+    script,
+    newScope = true
+  ) {
+    try {
+      // 默认在两边加上括号让脚本每次在新的作用域执行，防止变量污染
+      if (newScope) script = "{" + script + "}";
+      // 使用JSON.stringify处理转义
+      const escapedScript = JSON.stringify(script);
+      console.log(escapedScript);
+
+      return await quickcommand.runAppleScript(`
+        tell application "${browser}"
+          tell front window
+            tell active tab
+              execute javascript ${escapedScript}
+            end tell
+          end tell
+        end tell
+      `);
+    } catch (error) {
+      quickcommand.showSystemMessageBox("执行失败", error.toString());
+    }
+  },
+
+  // 点击元素
+  clickElement: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.click();
+        'success';
+      } else {
+        'element not found';
+      }
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 输入文本
+  inputText: async function (browser = "Microsoft Edge", selector, text) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.value = '${text}';
+        element.dispatchEvent(new Event('input'));
+        element.dispatchEvent(new Event('change'));
+        'success';
+      } else {
+        'element not found';
+      }
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 获取文本
+  getText: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      element ? element.textContent : '';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 获取HTML
+  getHtml: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      element ? element.innerHTML : '';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 隐藏元素
+  hideElement: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.style.display = 'none';
+        'success';
+      } else {
+        'element not found';
+      }
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 显示元素
+  showElement: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.style.display = '';
+        'success';
+      } else {
+        'element not found';
+      }
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 注入CSS
+  injectCSS: async function (browser = "Microsoft Edge", css) {
+    const script = `
+      const style = document.createElement('style');
+      style.textContent = \`${css}\`;
+      document.head.appendChild(style);
+      'success';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 设置Cookie
+  setCookie: async function (
+    browser = "Microsoft Edge",
+    cookies,
+    options = {}
+  ) {
+    // 在外部构建所有cookie的设置语句
+    console.log(cookies, options);
+    const cookieStatements = cookies
+      .map((cookie) => {
+        let cookieString = `${cookie.name}=${cookie.value}`;
+        if (options.expires) cookieString += `;expires=${options.expires}`;
+        if (options.path) cookieString += `;path=${options.path}`;
+        if (options.domain) cookieString += `;domain=${options.domain}`;
+        if (options.secure) cookieString += ";secure";
+        if (options.sameSite) cookieString += `;samesite=${options.sameSite}`;
+        return `document.cookie = ${JSON.stringify(cookieString)};`;
+      })
+      .join("\n");
+
+    const script = `
+      ${cookieStatements}
+      'success';
+    `;
+
+    return await this.executeScript(browser, script);
+  },
+
+  // 获取Cookie
+  getCookie: async function (browser = "Microsoft Edge", name) {
+    const script = `
+      const value = document.cookie
+        .split('; ')
+        .find(row => row.startsWith('${name}='))
+        ?.split('=')[1];
+      value || '';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 删除Cookie
+  deleteCookie: async function (
+    browser = "Microsoft Edge",
+    name,
+    path = "/",
+    domain = ""
+  ) {
+    const script = `
+      document.cookie = '${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
+        (${domain ? `'; domain=${domain}'` : "''"}) +
+        (${path ? `'; path=${path}'` : "''"});
+      'success';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 滚动到指定位置
+  scrollTo: async function (browser = "Microsoft Edge", x, y) {
+    const script = `
+      window.scrollTo(${x}, ${y});
+      'success';
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 滚动到元素位置
+  scrollToElement: async function (browser = "Microsoft Edge", selector) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+        'success';
+      } else {
+        'element not found';
+      }
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 获取滚动位置
+  getScrollPosition: async function (browser = "Microsoft Edge") {
+    const script = `
+      JSON.stringify({
+        x: window.pageXOffset || document.documentElement.scrollLeft,
+        y: window.pageYOffset || document.documentElement.scrollTop
+      });
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 获取页面尺寸
+  getPageSize: async function (browser = "Microsoft Edge") {
+    const script = `
+      JSON.stringify({
+        width: Math.max(
+          document.documentElement.scrollWidth,
+          document.documentElement.clientWidth
+        ),
+        height: Math.max(
+          document.documentElement.scrollHeight,
+          document.documentElement.clientHeight
+        )
+      });
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 等待元素出现
+  waitForElement: async function (
+    browser = "Microsoft Edge",
+    selector,
+    timeout = 5000
+  ) {
+    const script = `
+      new Promise((resolve, reject) => {
+        const element = document.querySelector('${selector}');
+        if (element) {
+          resolve('found');
+          return;
+        }
+
+        const observer = new MutationObserver((mutations, obs) => {
+          const element = document.querySelector('${selector}');
+          if (element) {
+            obs.disconnect();
+            resolve('found');
+          }
+        });
+
+        observer.observe(document.body, {
+          childList: true,
+          subtree: true
+        });
+
+        setTimeout(() => {
+          observer.disconnect();
+          reject('timeout');
+        }, ${timeout});
+      });
+    `;
+    return await this.executeScript(browser, script);
+  },
+
+  // 监听元素变化
+  observeElement: async function (
+    browser = "Microsoft Edge",
+    selector,
+    callback
+  ) {
+    const script = `
+      const element = document.querySelector('${selector}');
+      if (!element) return 'element not found';
+
+      const observer = new MutationObserver((mutations) => {
+        const data = mutations.map(mutation => ({
+          type: mutation.type,
+          target: mutation.target.outerHTML,
+          addedNodes: Array.from(mutation.addedNodes).map(node => node.outerHTML),
+          removedNodes: Array.from(mutation.removedNodes).map(node => node.outerHTML)
+        }));
+        window.webkit.messageHandlers.callback.postMessage(JSON.stringify(data));
+      });
+
+      observer.observe(element, {
+        attributes: true,
+        childList: true,
+        subtree: true,
+        characterData: true
+      });
+
+      'success';
+    `;
+    return await this.executeScript(browser, script);
+  },
+};
diff --git a/plugin/lib/quickcomposer/macos/index.js b/plugin/lib/quickcomposer/macos/index.js
index 82a46397..e8f982ed 100644
--- a/plugin/lib/quickcomposer/macos/index.js
+++ b/plugin/lib/quickcomposer/macos/index.js
@@ -1,9 +1,11 @@
 const app = require("./app");
 const system = require("./system");
 const finder = require("./finder");
+const browser = require("./browser");
 
 module.exports = {
   app,
   system,
   finder,
+  browser,
 };
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index e9df810b..6e10d051 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -152,7 +152,7 @@ export default defineComponent({
         if (config.component === "VariableInput") {
           variableFormatPaths.push(prefix);
         } else if (config.component === "ArrayEditor") {
-          variableFormatPaths.push(`${prefix}[*]`);
+          variableFormatPaths.push(`${prefix}[*].**`, `${prefix}[*]`);
         } else if (config.component === "DictEditor") {
           variableFormatPaths.push(`${prefix}.**`);
         }
@@ -167,7 +167,6 @@ export default defineComponent({
           addVariableFormatPath(`arg${index}`, item);
         }
       });
-
       try {
         argvs = parseFunction(code, { variableFormatPaths }).argvs;
       } catch (e) {
diff --git a/src/components/composer/common/ButtonGroup.vue b/src/components/composer/common/ButtonGroup.vue
index 4afca6cd..b5f5e714 100644
--- a/src/components/composer/common/ButtonGroup.vue
+++ b/src/components/composer/common/ButtonGroup.vue
@@ -58,7 +58,6 @@ export default defineComponent({
   width: 100%;
   flex-wrap: wrap;
   gap: 6px;
-  padding: 10px;
   border-radius: 6px;
 }
 
diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
index 90f82e40..ef9dd5c1 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/composer/common/CodeEditor.vue
@@ -112,15 +112,6 @@ export default {
         }
       },
     },
-    // 监听语言变化
-    language: {
-      immediate: true,
-      handler(newValue) {
-        if (this.editor) {
-          monaco.editor.setModelLanguage(this.editor.getModel(), newValue);
-        }
-      },
-    },
     "$q.dark.isActive": {
       immediate: true,
       handler(newValue) {
@@ -132,6 +123,7 @@ export default {
     this.initEditor();
     // 手动监听窗口大小变化，解决Monaco自动调整大小时导致ResizeObserver loop limit exceeded错误
     window.addEventListener("resize", this.resizeEditor);
+    monaco.editor.setTheme(this.$q.dark.isActive ? "vs-dark" : "vs");
   },
   beforeUnmount() {
     this.destroyEditor();
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index 38b05af2..6f378c7c 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -27,43 +27,44 @@
             </q-input>
           </template>
           <template v-else>
-            <q-select
+            <q-input
               v-if="options?.optionKeys"
               :model-value="item.key"
-              :options="normalizedOptionKeys"
               label="名称"
               dense
               filled
-              use-input
-              input-debounce="0"
-              :hide-selected="!!inputValue"
-              @filter="filterFn"
-              @update:model-value="
-                (val) => handleSelect(val, getEditableIndex(index))
-              "
-              @input-value="(val) => handleInput(val, getEditableIndex(index))"
-              @blur="handleBlur"
+              @update:model-value="(val) => handleInput(val, index)"
             >
               <template v-slot:prepend>
                 <q-icon name="code" />
               </template>
-              <template v-slot:option="scope">
-                <q-item v-bind="scope.itemProps">
-                  <q-item-section>
-                    {{ getKeyLabel(scope.opt) }}
-                  </q-item-section>
-                </q-item>
+              <template v-slot:append>
+                <q-btn dense flat icon="arrow_drop_down">
+                  <q-menu>
+                    <q-list dense>
+                      <q-item
+                        v-for="opt in normalizedOptionKeys"
+                        :key="opt.value"
+                        clickable
+                        v-close-popup
+                        @click="handleSelect(opt, index)"
+                      >
+                        <q-item-section>
+                          {{ getKeyLabel(opt) }}
+                        </q-item-section>
+                      </q-item>
+                    </q-list>
+                  </q-menu>
+                </q-btn>
               </template>
-            </q-select>
+            </q-input>
             <q-input
               v-else
               :model-value="item.key"
               label="名称"
               dense
               filled
-              @update:model-value="
-                (val) => updateItemKey(val, getEditableIndex(index))
-              "
+              @update:model-value="(val) => handleInput(val, index)"
             >
               <template v-slot:prepend>
                 <q-icon name="code" />
@@ -77,9 +78,7 @@
             label="值"
             icon="code"
             class="col-grow"
-            @update:model-value="
-              (val) => updateItemValue(val, index, item.type === 'fixed')
-            "
+            @update:model-value="(val) => updateItemValue(val, index)"
           />
         </div>
         <div
@@ -87,7 +86,7 @@
           class="col-auto"
         >
           <div class="btn-container">
-            <template v-if="editableItems.length === 1">
+            <template v-if="localItems.length === 1">
               <q-btn
                 flat
                 dense
@@ -97,16 +96,14 @@
                 @click="addItem"
               />
             </template>
-            <template
-              v-else-if="getEditableIndex(index) === editableItems.length - 1"
-            >
+            <template v-else-if="index === allItems.length - 1">
               <q-btn
                 flat
                 dense
                 size="sm"
                 icon="remove"
                 class="top-btn"
-                @click="removeItem(getEditableIndex(index))"
+                @click="removeItem(index)"
               />
               <q-btn
                 flat
@@ -124,7 +121,7 @@
                 size="sm"
                 icon="remove"
                 class="center-btn"
-                @click="removeItem(getEditableIndex(index))"
+                @click="removeItem(index)"
               />
             </template>
           </div>
@@ -140,30 +137,6 @@ import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import BorderLabel from "components/composer/common/BorderLabel.vue";
 
-/**
- * 字典编辑器组件
- * @description 支持键值对编辑，键支持变量选择和字符串输入，值为VariableInput特有对象
- *
- * @property {Object} modelValue - 绑定的字典对象
- * @property {Object} options - 配置选项
- * @property {String[]|Object[]} [options.optionKeys] - 可选键名
- * @property {String[]|Object[]} [options.fixedKeys] - 固定键名
- * @property {Boolean} [options.disableAdd] - 禁止添加新的键值对
- *
- * @example
- * // 基础字典对象
- * {
- *   key: newVarInputVal("str"),
- * }
- *
- * // 下拉选择模式
- * options.optionKeys = ['User-Agent', 'Content-Type', 'Accept']
- * {
- *   "User-Agent": newVarInputVal("str", "Mozilla/5.0"),
- *   "Content-Type": newVarInputVal("str", "text/html"),
- *   "Accept": newVarInputVal("str", "text/html")
- * }
- */
 export default defineComponent({
   name: "DictEditor",
   components: {
@@ -173,7 +146,6 @@ export default defineComponent({
   props: {
     modelValue: {
       type: Object,
-      required: true,
       default: () => ({}),
     },
     options: {
@@ -198,35 +170,23 @@ export default defineComponent({
     },
   },
   emits: ["update:modelValue"],
+  created() {
+    if (!this.modelValue || Object.keys(this.modelValue).length === 0) {
+      this.$emit("update:modelValue", { "": newVarInputVal("str") });
+    }
+  },
   data() {
     return {
       inputValue: "",
     };
   },
   computed: {
-    editableItems: {
-      get() {
-        return this.localItems;
-      },
-      set(newItems) {
-        this.localItems = newItems;
-        this.updateModelValue();
-      },
-    },
-    normalizedOptionKeys() {
-      return this.filterOptions;
-    },
-    // 规范化的固定键列表
-    normalizedFixedKeys() {
-      return this.normalizeKeys(this.options?.fixedKeys || []);
-    },
-    // 从 modelValue 中提取的所有条目
     modelEntries() {
       return Object.entries(this.modelValue || {});
     },
-    // 固定键项
     fixedItems() {
-      return this.normalizedFixedKeys.map((key) => ({
+      const fixedKeys = this.normalizeKeys(this.options?.fixedKeys || []);
+      return fixedKeys.map((key) => ({
         type: "fixed",
         key: key.value,
         value:
@@ -234,137 +194,85 @@ export default defineComponent({
           newVarInputVal("str"),
       }));
     },
-    // 可编辑项
     localItems() {
-      // 过滤出不在固定键中的条目
-      const editableEntries = this.modelEntries.filter(
-        ([key]) => !this.normalizedFixedKeys.some((k) => k.value === key)
-      );
-
-      return editableEntries.length || this.options?.disableAdd
-        ? editableEntries.map(([key, value]) => ({
-            type: "editable",
-            key,
-            value,
-          }))
-        : [{ type: "editable", key: "", value: newVarInputVal("str") }];
+      return this.modelEntries
+        .filter(
+          ([key]) =>
+            !this.normalizeKeys(this.options?.fixedKeys || []).some(
+              (k) => k.value === key
+            )
+        )
+        .map(([key, value]) => ({
+          type: "editable",
+          key,
+          value,
+        }));
     },
-    // 所有项目的组合
     allItems() {
       return [...this.fixedItems, ...this.localItems];
     },
-    // 过滤选项
-    filterOptions() {
+    normalizedOptionKeys() {
       return this.normalizeKeys(this.options?.optionKeys || []);
     },
   },
   methods: {
     normalizeKeys(keys) {
-      return keys.map((key) => {
-        if (typeof key === "string") {
-          return { value: key, label: key };
-        }
-        return key;
-      });
+      return keys.map((key) =>
+        typeof key === "string" ? { value: key, label: key } : key
+      );
     },
-
     getKeyLabel(key) {
       if (typeof key === "object") return key.label;
-      const allKeys = [...this.normalizedFixedKeys, ...this.filterOptions];
+      const allKeys = [
+        ...this.normalizeKeys(this.options?.fixedKeys || []),
+        ...this.normalizedOptionKeys,
+      ];
       return allKeys.find((k) => k.value === key)?.label || key;
     },
-
-    getEditableIndex(index) {
-      return index - this.fixedItems.length;
-    },
-
-    updateModelValue() {
-      const dict = {};
-      // 先添加固定键
-      this.fixedItems.forEach((item) => {
-        if (item.key) {
-          dict[item.key] = item.value;
-        }
-      });
-      // 再添加可编辑键
-      this.localItems.forEach((item) => {
-        if (item.key) {
-          dict[item.key] = item.value;
-        }
-      });
-      this.$emit("update:modelValue", dict);
-    },
-
-    updateItemValue(val, index, isFixed = false) {
-      const dict = { ...this.modelValue };
+    updateItemValue(val, index) {
       const item = this.allItems[index];
-      if (item.key) {
-        dict[item.key] = val;
-        this.$emit("update:modelValue", dict);
-      }
+      const dict = { ...this.modelValue };
+      dict[item.key] = val;
+      this.$emit("update:modelValue", dict);
     },
-
     addItem() {
       if (this.options?.disableAdd) return;
       const dict = { ...this.modelValue };
       dict[""] = newVarInputVal("str");
       this.$emit("update:modelValue", dict);
     },
-
     removeItem(index) {
-      if (this.options?.disableAdd) return;
-      const dict = { ...this.modelValue };
       const item = this.localItems[index];
-      if (item.key) {
-        delete dict[item.key];
-        this.$emit("update:modelValue", dict);
-      }
-    },
-
-    updateItemKey(val, index) {
       const dict = { ...this.modelValue };
-      const oldItem = this.localItems[index];
-      if (oldItem.key) {
-        delete dict[oldItem.key];
+      delete dict[item.key];
+
+      // 如果删除后没有条目，添加一个空行
+      if (Object.keys(dict).length === 0) {
+        dict[""] = newVarInputVal("str");
       }
-      dict[val] = oldItem.value;
+
       this.$emit("update:modelValue", dict);
     },
-
     handleInput(val, index) {
       this.inputValue = val;
-      if (val) {
-        this.updateItemKey(val, index);
-      }
+      const item = this.allItems[index];
+      const dict = { ...this.modelValue };
+      delete dict[item.key];
+      dict[val] = item.value;
+      this.$emit("update:modelValue", dict);
     },
-
     handleSelect(val, index) {
       this.inputValue = "";
-      this.updateItemKey(val.value || val, index);
+      const value = val?.value || val;
+      const item = this.allItems[index];
+      const dict = { ...this.modelValue };
+      delete dict[item.key];
+      dict[value] = item.value;
+      this.$emit("update:modelValue", dict);
     },
-
     handleBlur() {
       this.inputValue = "";
     },
-
-    filterFn(val, update) {
-      if (!this.options?.optionKeys) return;
-
-      update(() => {
-        if (val === "") {
-          this.filterOptions = this.normalizeKeys(this.options.optionKeys);
-        } else {
-          const needle = val.toLowerCase();
-          this.filterOptions = this.normalizeKeys(
-            this.options.optionKeys
-          ).filter(
-            (v) =>
-              v.label.toLowerCase().indexOf(needle) > -1 ||
-              v.value.toLowerCase().indexOf(needle) > -1
-          );
-        }
-      });
-    },
   },
 });
 </script>
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index b0c45aec..b82180fa 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const macosCommands = {
   label: "MacOS专区",
   icon: "laptop_mac",
@@ -343,5 +345,594 @@ export const macosCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.macos.browser.getUrl",
+      label: "浏览器管理",
+      desc: "浏览器管理功能",
+      icon: "web",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.macos.browser.getUrl",
+          label: "获取当前地址",
+          desc: "获取当前标签页的URL地址",
+          icon: "link",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.setUrl",
+          label: "设置当前地址",
+          desc: "设置当前标签页的URL地址",
+          icon: "link",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "url",
+              label: "网址",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "输入网址",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.getTabs",
+          label: "获取标签列表",
+          desc: "获取所有打开的标签页信息",
+          icon: "tab",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.activateTab",
+          label: "切换标签",
+          desc: "切换到指定的标签页",
+          icon: "tab_unselected",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "index",
+              label: "标签索引",
+              component: "NumberInput",
+              icon: "tab",
+              min: 1,
+              defaultValue: 1,
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.executeScript",
+          label: "执行脚本",
+          desc: "在当前标签页执行JavaScript脚本",
+          icon: "code",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "script",
+              label: "脚本内容",
+              component: "CodeEditor",
+              icon: "code",
+              width: 12,
+              placeholder: "输入JavaScript代码",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.clickElement",
+          label: "点击元素",
+          desc: "点击指定的页面元素",
+          icon: "mouse",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.inputText",
+          label: "输入文本",
+          desc: "在指定输入框中输入文本",
+          icon: "edit",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+            {
+              key: "text",
+              label: "文本内容",
+              component: "VariableInput",
+              icon: "edit",
+              width: 12,
+              placeholder: "输入要填写的文本",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.getText",
+          label: "获取文本",
+          desc: "获取指定元素的文本内容",
+          icon: "text_fields",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.hideElement",
+          label: "隐藏元素",
+          desc: "隐藏指定的页面元素",
+          icon: "visibility_off",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.showElement",
+          label: "显示元素",
+          desc: "显示指定的页面元素",
+          icon: "visibility",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.injectCSS",
+          label: "注入CSS",
+          desc: "向页面注入CSS样式",
+          icon: "style",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "css",
+              label: "CSS内容",
+              component: "CodeEditor",
+              icon: "style",
+              width: 12,
+              placeholder: "输入CSS代码",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.setCookie",
+          label: "设置Cookie",
+          desc: "设置浏览器Cookie",
+          icon: "cookie",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              label: "Cookie",
+              component: "ArrayEditor",
+              icon: "cookie",
+              width: 12,
+              columns: {
+                name: {
+                  label: "名称",
+                  defaultValue: newVarInputVal("str"),
+                },
+                value: {
+                  label: "值",
+                  defaultValue: newVarInputVal("str"),
+                },
+              },
+            },
+            {
+              label: "选项",
+              component: "DictEditor",
+              icon: "settings",
+              width: 12,
+              options: {
+                optionKeys: ["expires", "path", "domain", "secure", "sameSite"],
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.getCookie",
+          label: "获取Cookie",
+          desc: "获取指定的Cookie值",
+          icon: "cookie",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "name",
+              label: "名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "输入Cookie名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.scrollTo",
+          label: "滚动到位置",
+          desc: "滚动到指定坐标位置",
+          icon: "open_in_full",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "x",
+              label: "X坐标",
+              component: "NumberInput",
+              icon: "arrow_right",
+              width: 12,
+              defaultValue: 0,
+            },
+            {
+              key: "y",
+              label: "Y坐标",
+              component: "NumberInput",
+              icon: "arrow_drop_down",
+              width: 12,
+              defaultValue: 0,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.scrollToElement",
+          label: "滚动到元素",
+          desc: "滚动到指定元素位置",
+          icon: "open_in_full",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.waitForElement",
+          label: "等待元素",
+          desc: "等待指定元素出现",
+          icon: "hourglass_empty",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+            {
+              key: "timeout",
+              label: "超时时间",
+              component: "NumberInput",
+              icon: "timer",
+              width: 12,
+              defaultValue: 5000,
+              min: 1000,
+              step: 1000,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.macos.browser.observeElement",
+          label: "监听元素",
+          desc: "监听指定元素的变化",
+          icon: "visibility",
+          config: [
+            {
+              key: "browser",
+              component: "ButtonGroup",
+              defaultValue: "Microsoft Edge",
+              options: [
+                {
+                  label: "Edge 浏览器",
+                  value: "Microsoft Edge",
+                },
+                {
+                  label: "Chrome 浏览器",
+                  value: "Google Chrome",
+                },
+              ],
+              width: 12,
+            },
+            {
+              key: "selector",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+            {
+              key: "callback",
+              label: "回调函数",
+              component: "CodeEditor",
+              icon: "code",
+              width: 12,
+              placeholder: "输入回调函数代码",
+            },
+          ],
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 60d1a8eb..9364d745 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -5,6 +5,14 @@ import {
   newVarInputVal,
 } from "./varInputValManager";
 
+const processString = (value) => {
+  try {
+    return JSON.stringify(value);
+  } catch (error) {
+    return `"${value}"`;
+  }
+};
+
 /**
  * 处理单个值，返回格式化后的字符串
  */
@@ -12,13 +20,13 @@ const processValue = (value, parentPath = "") => {
   if (!value) return value;
 
   if (typeof value === "object") {
-    if (isVarInputVal(value)) {
-      return stringifyVarInputVal(value);
-    }
     return processObject(value, parentPath);
   }
+  if (typeof value === "string") {
+    return processString(value);
+  }
 
-  return typeof value === "string" ? `"${value}"` : value;
+  return value;
 };
 
 /**
@@ -131,7 +139,7 @@ const stringifyObject = (jsonObj) => {
 export const stringifyArgv = (argv) => {
   // 普通字符串加上引号
   if (typeof argv === "string") {
-    return `"${argv}"`;
+    return processString(argv);
   }
   // null类型是Object，需要单独处理，返回原值
   if (argv === null) {

From 06938cade13c19bf653ba3ab2b332f3fe1e1851f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 10:39:24 +0800
Subject: [PATCH 039/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=AE=BE=E7=BD=AECookie=E3=80=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=92=8C=E7=AD=89=E5=BE=85=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/macos/browser.js     | 150 ++++++++----------
 src/components/composer/common/DictEditor.vue |   8 +-
 src/js/composer/commands/macosCommands.js     |  86 +++++-----
 3 files changed, 117 insertions(+), 127 deletions(-)

diff --git a/plugin/lib/quickcomposer/macos/browser.js b/plugin/lib/quickcomposer/macos/browser.js
index 665e43c4..70c0ea15 100644
--- a/plugin/lib/quickcomposer/macos/browser.js
+++ b/plugin/lib/quickcomposer/macos/browser.js
@@ -60,16 +60,22 @@ module.exports = {
   executeScript: async function (
     browser = "Microsoft Edge",
     script,
-    newScope = true
+    args = {}
   ) {
     try {
-      // 默认在两边加上括号让脚本每次在新的作用域执行，防止变量污染
-      if (newScope) script = "{" + script + "}";
+      // 构建参数列表
+      const argNames = Object.keys(args);
+      const argValues = Object.values(args).map((v) => JSON.stringify(v));
+
+      script = `
+        (function(${argNames.join(", ")}) {
+          ${script}
+        })(${argValues.join(", ")})
+      `;
       // 使用JSON.stringify处理转义
       const escapedScript = JSON.stringify(script);
-      console.log(escapedScript);
 
-      return await quickcommand.runAppleScript(`
+      let result = await quickcommand.runAppleScript(`
         tell application "${browser}"
           tell front window
             tell active tab
@@ -78,8 +84,23 @@ module.exports = {
           end tell
         end tell
       `);
+
+      result = result?.trim() || "";
+      if (result === "missing value") {
+        // 脚本没有返回值
+        return;
+      } else if (result === "##execute_script_success##") {
+        // 模拟操作执行成功
+        return true;
+      } else if (result === "##execute_script_failed##") {
+        // 模拟操作执行失败
+        return false;
+      }
+
+      return result;
     } catch (error) {
       quickcommand.showSystemMessageBox("执行失败", error.toString());
+      throw error;
     }
   },
 
@@ -89,9 +110,9 @@ module.exports = {
       const element = document.querySelector('${selector}');
       if (element) {
         element.click();
-        'success';
+        return '##execute_script_success##';
       } else {
-        'element not found';
+        return '##execute_script_failed##';
       }
     `;
     return await this.executeScript(browser, script);
@@ -105,9 +126,9 @@ module.exports = {
         element.value = '${text}';
         element.dispatchEvent(new Event('input'));
         element.dispatchEvent(new Event('change'));
-        'success';
+        return '##execute_script_success##';
       } else {
-        'element not found';
+        return '##execute_script_failed##';
       }
     `;
     return await this.executeScript(browser, script);
@@ -117,7 +138,7 @@ module.exports = {
   getText: async function (browser = "Microsoft Edge", selector) {
     const script = `
       const element = document.querySelector('${selector}');
-      element ? element.textContent : '';
+      return element ? element.textContent : '';
     `;
     return await this.executeScript(browser, script);
   },
@@ -126,7 +147,7 @@ module.exports = {
   getHtml: async function (browser = "Microsoft Edge", selector) {
     const script = `
       const element = document.querySelector('${selector}');
-      element ? element.innerHTML : '';
+      return element ? element.innerHTML : '';
     `;
     return await this.executeScript(browser, script);
   },
@@ -137,9 +158,9 @@ module.exports = {
       const element = document.querySelector('${selector}');
       if (element) {
         element.style.display = 'none';
-        'success';
+        return '##execute_script_success##';
       } else {
-        'element not found';
+        return '##execute_script_failed##';
       }
     `;
     return await this.executeScript(browser, script);
@@ -151,9 +172,9 @@ module.exports = {
       const element = document.querySelector('${selector}');
       if (element) {
         element.style.display = '';
-        'success';
+        return '##execute_script_success##';
       } else {
-        'element not found';
+        return '##execute_script_failed##';
       }
     `;
     return await this.executeScript(browser, script);
@@ -165,7 +186,7 @@ module.exports = {
       const style = document.createElement('style');
       style.textContent = \`${css}\`;
       document.head.appendChild(style);
-      'success';
+      return '##execute_script_success##';
     `;
     return await this.executeScript(browser, script);
   },
@@ -176,23 +197,25 @@ module.exports = {
     cookies,
     options = {}
   ) {
-    // 在外部构建所有cookie的设置语句
-    console.log(cookies, options);
     const cookieStatements = cookies
       .map((cookie) => {
         let cookieString = `${cookie.name}=${cookie.value}`;
-        if (options.expires) cookieString += `;expires=${options.expires}`;
+        if (options.expires) {
+          const expiresDate = new Date(
+            Date.now() + options.expires * 60 * 60 * 1000
+          );
+          cookieString += `;expires=${expiresDate.toUTCString()}`;
+        }
         if (options.path) cookieString += `;path=${options.path}`;
         if (options.domain) cookieString += `;domain=${options.domain}`;
         if (options.secure) cookieString += ";secure";
-        if (options.sameSite) cookieString += `;samesite=${options.sameSite}`;
         return `document.cookie = ${JSON.stringify(cookieString)};`;
       })
       .join("\n");
 
     const script = `
       ${cookieStatements}
-      'success';
+      return '##execute_script_success##';
     `;
 
     return await this.executeScript(browser, script);
@@ -205,7 +228,7 @@ module.exports = {
         .split('; ')
         .find(row => row.startsWith('${name}='))
         ?.split('=')[1];
-      value || '';
+      return value || '';
     `;
     return await this.executeScript(browser, script);
   },
@@ -221,7 +244,7 @@ module.exports = {
       document.cookie = '${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
         (${domain ? `'; domain=${domain}'` : "''"}) +
         (${path ? `'; path=${path}'` : "''"});
-      'success';
+      return '##execute_script_success##';
     `;
     return await this.executeScript(browser, script);
   },
@@ -230,7 +253,7 @@ module.exports = {
   scrollTo: async function (browser = "Microsoft Edge", x, y) {
     const script = `
       window.scrollTo(${x}, ${y});
-      'success';
+      return '##execute_script_success##';
     `;
     return await this.executeScript(browser, script);
   },
@@ -241,9 +264,9 @@ module.exports = {
       const element = document.querySelector('${selector}');
       if (element) {
         element.scrollIntoView({ behavior: 'smooth', block: 'center' });
-        'success';
+        return '##execute_script_success##';
       } else {
-        'element not found';
+        return '##execute_script_failed##';
       }
     `;
     return await this.executeScript(browser, script);
@@ -252,7 +275,7 @@ module.exports = {
   // 获取滚动位置
   getScrollPosition: async function (browser = "Microsoft Edge") {
     const script = `
-      JSON.stringify({
+      return JSON.stringify({
         x: window.pageXOffset || document.documentElement.scrollLeft,
         y: window.pageYOffset || document.documentElement.scrollTop
       });
@@ -263,7 +286,7 @@ module.exports = {
   // 获取页面尺寸
   getPageSize: async function (browser = "Microsoft Edge") {
     const script = `
-      JSON.stringify({
+      return JSON.stringify({
         width: Math.max(
           document.documentElement.scrollWidth,
           document.documentElement.clientWidth
@@ -283,65 +306,24 @@ module.exports = {
     selector,
     timeout = 5000
   ) {
-    const script = `
-      new Promise((resolve, reject) => {
-        const element = document.querySelector('${selector}');
-        if (element) {
-          resolve('found');
-          return;
-        }
-
-        const observer = new MutationObserver((mutations, obs) => {
-          const element = document.querySelector('${selector}');
-          if (element) {
-            obs.disconnect();
-            resolve('found');
-          }
-        });
-
-        observer.observe(document.body, {
-          childList: true,
-          subtree: true
-        });
-
-        setTimeout(() => {
-          observer.disconnect();
-          reject('timeout');
-        }, ${timeout});
-      });
-    `;
-    return await this.executeScript(browser, script);
-  },
+    const startTime = Date.now();
 
-  // 监听元素变化
-  observeElement: async function (
-    browser = "Microsoft Edge",
-    selector,
-    callback
-  ) {
-    const script = `
+    // 检查元素是否存在的函数
+    const checkScript = `
       const element = document.querySelector('${selector}');
-      if (!element) return 'element not found';
-
-      const observer = new MutationObserver((mutations) => {
-        const data = mutations.map(mutation => ({
-          type: mutation.type,
-          target: mutation.target.outerHTML,
-          addedNodes: Array.from(mutation.addedNodes).map(node => node.outerHTML),
-          removedNodes: Array.from(mutation.removedNodes).map(node => node.outerHTML)
-        }));
-        window.webkit.messageHandlers.callback.postMessage(JSON.stringify(data));
-      });
+      return element ? '##execute_script_success##' : '##execute_script_failed##';
+    `;
 
-      observer.observe(element, {
-        attributes: true,
-        childList: true,
-        subtree: true,
-        characterData: true
-      });
+    // 轮询检查元素
+    while (Date.now() - startTime < timeout) {
+      const result = await this.executeScript(browser, checkScript);
+      if (result === true) {
+        return true;
+      }
+      // 等待100ms再次检查
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
 
-      'success';
-    `;
-    return await this.executeScript(browser, script);
+    return false;
   },
 };
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index 6f378c7c..bbbb98b1 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -39,7 +39,7 @@
                 <q-icon name="code" />
               </template>
               <template v-slot:append>
-                <q-btn dense flat icon="arrow_drop_down">
+                <q-btn dense flat icon="menu">
                   <q-menu>
                     <q-list dense>
                       <q-item
@@ -256,6 +256,9 @@ export default defineComponent({
     handleInput(val, index) {
       this.inputValue = val;
       const item = this.allItems[index];
+      if (val in this.modelValue && val !== item.key) {
+        return;
+      }
       const dict = { ...this.modelValue };
       delete dict[item.key];
       dict[val] = item.value;
@@ -265,6 +268,9 @@ export default defineComponent({
       this.inputValue = "";
       const value = val?.value || val;
       const item = this.allItems[index];
+      if (value in this.modelValue && value !== item.key) {
+        return;
+      }
       const dict = { ...this.modelValue };
       delete dict[item.key];
       dict[value] = item.value;
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index b82180fa..d7da47c3 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -495,6 +495,13 @@ export const macosCommands = {
               width: 12,
               placeholder: "输入JavaScript代码",
             },
+            {
+              key: "args",
+              topLabel: "要传递的参数",
+              component: "DictEditor",
+              icon: "data_array",
+              width: 12,
+            },
           ],
         },
         {
@@ -737,11 +744,46 @@ export const macosCommands = {
             },
             {
               label: "选项",
-              component: "DictEditor",
+              component: "OptionEditor",
               icon: "settings",
               width: 12,
               options: {
-                optionKeys: ["expires", "path", "domain", "secure", "sameSite"],
+                expires: {
+                  label: "过期时间",
+                  component: "q-select",
+                  icon: "timer",
+                  width: 6,
+                  options: [
+                    { label: "关闭浏览器失效", value: false },
+                    { label: "1小时", value: 1 },
+                    { label: "1天", value: 24 },
+                    { label: "1年", value: 24 * 365 },
+                  ],
+                },
+                path: {
+                  label: "路径",
+                  component: "VariableInput",
+                  icon: "folder",
+                  width: 6,
+                },
+                domain: {
+                  label: "域名",
+                  component: "VariableInput",
+                  icon: "domain",
+                  width: 6,
+                },
+                secure: {
+                  label: "安全",
+                  component: "CheckButton",
+                  icon: "lock",
+                  width: 6,
+                },
+              },
+              defaultValue: {
+                expires: false,
+                path: newVarInputVal("str", "/"),
+                domain: newVarInputVal("str", ""),
+                secure: false,
               },
             },
           ],
@@ -892,46 +934,6 @@ export const macosCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.macos.browser.observeElement",
-          label: "监听元素",
-          desc: "监听指定元素的变化",
-          icon: "visibility",
-          config: [
-            {
-              key: "browser",
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              key: "selector",
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-            {
-              key: "callback",
-              label: "回调函数",
-              component: "CodeEditor",
-              icon: "code",
-              width: 12,
-              placeholder: "输入回调函数代码",
-            },
-          ],
-        },
       ],
     },
   ],

From e13f778f2a0bbe92553b1cf44db4ca949238b3fd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 11:35:10 +0800
Subject: [PATCH 040/332] =?UTF-8?q?=E8=B0=83=E6=95=B4VariableInput?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=9B=B4=E5=8A=A0=E7=B4=A7=E5=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/VariableInput.vue         | 48 ++++++++++++++-----
 .../composer/ui/SelectListEditor.vue          |  4 +-
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 6b641042..de8cf483 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -29,10 +29,10 @@
         v-if="!hasSelectedVariable"
       >
         <q-tooltip>{{
-          isString
+          (isString
             ? "当前类型是：字符串"
-            : "当前类型是：变量、数字、表达式等" +
-              (disableToggleType ? "" : "，点击切换")
+            : "当前类型是：变量、数字、表达式等") +
+          (disableToggleType ? "" : "，点击切换")
         }}</q-tooltip>
       </q-btn>
       <!-- 选项下拉按钮 -->
@@ -104,10 +104,7 @@
       <q-btn-dropdown
         flat
         dense
-        :class="{
-          'text-primary': hasSelectedVariable,
-          'text-grey-6': !hasSelectedVariable,
-        }"
+        stretch
         class="variable-dropdown prepend-btn"
         size="sm"
         @click="variables = getAvailableVariables()"
@@ -398,18 +395,43 @@ export default defineComponent({
 
 .variable-input :deep(.q-field__control) {
   padding-left: 8px;
-  padding-right: 8px;
+  padding-right: 0px;
+}
+
+.variable-input :deep(.q-field__append) {
+  padding-left: 0;
 }
 
 .prepend-btn {
-  min-width: 24px;
-  padding: 4px;
-  opacity: 0.6;
-  transition: all 0.3s ease;
+  max-width: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-left: 5px;
+  transition: all 0.6s ease;
 }
 
-.prepend-btn:hover {
+.string-toggle.prepend-btn {
+  transform: translateX(14px);
+  max-width: 0;
+  margin-left: 0;
+  opacity: 0;
+}
+
+.variable-input:hover .string-toggle.prepend-btn {
+  max-width: 14px;
   opacity: 1;
+  transform: translateX(0);
+  margin-left: 5px;
+  transition: all 0.6s ease;
+}
+
+.variable-dropdown.prepend-btn {
+  background-color: rgba(0, 0, 0, 0.02);
+}
+
+.body--dark .variable-dropdown.prepend-btn {
+  background-color: rgba(255, 255, 255, 0.02);
 }
 
 .clear-btn:hover {
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index eb336fc7..85e707a7 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -218,7 +218,7 @@ export default defineComponent({
       arrayEditorColumns: {
         id: {
           label: "id",
-          width: 3,
+          width: 2,
           noIcon: true,
         },
         title: {
@@ -228,7 +228,7 @@ export default defineComponent({
         description: {
           label: "描述",
           noIcon: true,
-          width: 4,
+          width: 5,
         },
       },
     };

From 2fcad53ef9775b58763fef5be3b1dde8a43407f3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 12:44:52 +0800
Subject: [PATCH 041/332] =?UTF-8?q?=E9=92=88=E5=AF=B9=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=BE=83=E6=85=A2=E7=9A=84=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BD=BD=E5=85=A5=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/CommandComposer.vue | 36 ++++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 65bba2b0..1fa6e531 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -17,6 +17,9 @@
         />
       </div>
     </div>
+    <q-inner-loading :showing="hasCommandNeedLoading && $root.isRunningCommand">
+      <q-spinner-cube size="50px" color="primary" />
+    </q-inner-loading>
   </div>
 </template>
 
@@ -70,6 +73,7 @@ export default defineComponent({
   data() {
     return {
       availableCommands,
+      hasCommandNeedLoading: false,
     };
   },
   emits: ["use-composer", "update:modelValue"],
@@ -87,11 +91,23 @@ export default defineComponent({
       return generateCode(this.commandFlow);
     },
     handleComposer(type, flow) {
-      if (type === "save") return this.saveFlow();
-      if (type === "load") return this.loadFlow();
-      const code = flow ? generateCode(flow) : generateCode(this.commandFlow);
-      this.$emit("use-composer", { type, code });
-      if (type !== "run") return this.$emit("update:modelValue", false);
+      switch (type) {
+        case "save":
+          return this.saveFlow();
+        case "load":
+          return this.loadFlow();
+        case "run":
+          return this.runFlow(flow);
+        default:
+          this.$emit("use-composer", { type, code });
+          return this.$emit("update:modelValue", false);
+      }
+    },
+    // 传入临时flow说明是运行单独的命令，否则是运行整个命令流
+    runFlow(flow) {
+      this.hasCommandNeedLoading = this.findCommandNeedLoading(flow);
+      const code = generateCode(flow || this.commandFlow);
+      this.$emit("use-composer", { type: "run", code });
       if (!code.includes("console.log")) quickcommand.showMessageBox("已运行");
     },
     saveFlow() {
@@ -129,6 +145,16 @@ export default defineComponent({
         };
       });
     },
+    findCommandNeedLoading(flow) {
+      // 暂时只在运行单独命令时显示载入界面，因为运行整个命令流时，如果不打印输出，是无法判断什么时候运行结束的，
+      // 运行单独命令时，添加了打印流程，且showLoading参数可控
+      if (!flow) return;
+      return flow.some(
+        (cmd) =>
+          cmd.showLoading ||
+          cmd.subCommands?.find((c) => c.value === cmd.value)?.showLoading
+      );
+    },
   },
 });
 </script>

From 9df34cfe08a71c83e099ca21cbf870f0c5012147 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 15:35:45 +0800
Subject: [PATCH 042/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E7=BC=96=E6=8E=92=E7=9A=84=E7=8B=AC=E7=AB=8B=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/plugin.json                            |  9 ++++
 src/components/CommandEditor.vue              | 23 ++++++---
 src/components/ComposerEditor.vue             | 42 ++++++++++++++++
 src/components/composer/CommandComposer.vue   | 15 ++++--
 src/components/composer/ComposerFlow.vue      |  5 ++
 .../composer/flow/ComposerButtons.vue         | 28 +++++++++--
 src/components/editor/CommandLanguageBar.vue  | 49 +------------------
 src/pages/RunComposerPage.vue                 | 21 ++++++++
 src/router/routes.js                          |  5 ++
 9 files changed, 134 insertions(+), 63 deletions(-)
 create mode 100644 src/components/ComposerEditor.vue
 create mode 100644 src/pages/RunComposerPage.vue

diff --git a/plugin/plugin.json b/plugin/plugin.json
index 870341e9..ffb93ba6 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -32,6 +32,15 @@
       ],
       "icon": "features/code.png"
     },
+    {
+      "code": "composer",
+      "explain": "运行可视化编排",
+      "cmds": [
+        "可视化编排",
+        "RunComposer"
+      ],
+      "icon": "features/code.png"
+    },
     {
       "code": "newcommand",
       "explain": "快速新建快捷命令",
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 54027540..64e68b25 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -38,7 +38,7 @@
       @program-changed="programChanged"
       @run="runCurrentCommand"
       @save="saveCurrentCommand"
-      @use-composer="handleComposer"
+      @show-composer="showComposer = true"
     />
 
     <!-- 编辑器 -->
@@ -71,6 +71,11 @@
       @toggle-fullscreen="toggleFullscreen"
     />
 
+    <!-- 可视化编排 -->
+    <q-dialog v-model="showComposer" maximized>
+      <CommandComposer ref="composer" @use-composer="handleComposer" />
+    </q-dialog>
+
     <!-- 运行结果 -->
     <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
   </div>
@@ -82,6 +87,7 @@ import CommandSideBar from "components/editor/CommandSideBar";
 import CommandLanguageBar from "components/editor/CommandLanguageBar";
 import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
+import CommandComposer from "components/composer/CommandComposer.vue";
 
 // 预加载 MonacoEditor
 const MonacoEditorPromise = import("components/editor/MonacoEditor");
@@ -108,6 +114,7 @@ export default {
     CommandSideBar,
     CommandRunResult,
     CommandLanguageBar,
+    CommandComposer,
     EditorTools,
   },
   data() {
@@ -115,7 +122,10 @@ export default {
       programLanguages: Object.keys(this.$root.programs),
       sideBarWidth: 200,
       languageBarHeight: 40,
-      canCommandSave: this.action.type === "code" ? false : true,
+      showComposer: false,
+      isRunCodePage: this.action.type === "run",
+      canCommandSave: this.action.type !== "run",
+      showSidebar: this.action.type !== "run",
       quickcommandInfo: {
         program: "quickcommand",
         cmd: "",
@@ -131,8 +141,6 @@ export default {
         },
       },
       resultMaxLength: 10000,
-      showSidebar: this.action.type !== "run",
-      isRunCodePage: this.action.type === "run",
       listener: null,
       isFullscreen: false,
     };
@@ -162,10 +170,9 @@ export default {
   methods: {
     // 命令初始化
     commandInit() {
-      let quickCommandInfo =
-        this.action.type === "run"
-          ? this.$root.utools.getDB("cfg_codeHistory")
-          : this.action.data;
+      let quickCommandInfo = this.isRunCodePage
+        ? this.$root.utools.getDB("cfg_codeHistory")
+        : this.action.data;
       quickCommandInfo?.program &&
         Object.assign(
           this.quickcommandInfo,
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
new file mode 100644
index 00000000..19b7cdbf
--- /dev/null
+++ b/src/components/ComposerEditor.vue
@@ -0,0 +1,42 @@
+<template>
+  <CommandComposer
+    ref="composer"
+    @use-composer="handleComposer"
+    :show-close-button="false"
+    class="fixed-full"
+  />
+  <!-- 运行结果 -->
+  <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
+</template>
+
+<script>
+import CommandComposer from "components/composer/CommandComposer.vue";
+import CommandRunResult from "components/CommandRunResult";
+
+export default {
+  components: { CommandComposer, CommandRunResult },
+  props: {
+    action: {
+      type: Object,
+      required: true,
+    },
+  },
+  methods: {
+    handleComposer({ type, code }) {
+      switch (type) {
+        case "run":
+          return this.runCurrentCommand(code);
+      }
+    },
+    runCurrentCommand(cmd) {
+      if (!cmd) return;
+      let command = {
+        cmd: cmd,
+        output: "text",
+        program: "quickcommand",
+      };
+      this.$refs.result.runCurrentCommand(command);
+    },
+  },
+};
+</script>
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 1fa6e531..0de8d9f1 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -12,6 +12,7 @@
         <ComposerFlow
           v-model="commandFlow"
           :generate-code="generateFlowCode"
+          :show-close-button="showCloseButton"
           @add-command="addCommand"
           @action="http://github.com/handleComposer"
         />
@@ -76,7 +77,13 @@ export default defineComponent({
       hasCommandNeedLoading: false,
     };
   },
-  emits: ["use-composer", "update:modelValue"],
+  props: {
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  emits: ["use-composer"],
   methods: {
     addCommand(action) {
       let newAction = window.lodashM.cloneDeep(action);
@@ -99,8 +106,10 @@ export default defineComponent({
         case "run":
           return this.runFlow(flow);
         default:
-          this.$emit("use-composer", { type, code });
-          return this.$emit("update:modelValue", false);
+          return this.$emit("use-composer", {
+            type,
+            code: this.generateFlowCode(),
+          });
       }
     },
     // 传入临时flow说明是运行单独的命令，否则是运行整个命令流
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 961143c3..fa34140e 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -9,6 +9,7 @@
       <ComposerButtons
         :generate-code="generateCode"
         :is-all-collapsed="isAllCollapsed"
+        :show-close-button="showCloseButton"
         @action="http://github.com/handleAction"
         class="flex-grow"
       />
@@ -97,6 +98,10 @@ export default defineComponent({
       type: Function,
       required: true,
     },
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
   },
   setup() {
     const getCurrentVariables = inject("getCurrentVariables");
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 5e413a7b..c08d28a0 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -22,17 +22,31 @@
         v-if="isDev"
       >
       </q-btn>
-      <q-btn icon="close" dense flat v-close-popup>
+      <q-btn icon="close" dense flat v-close-popup v-if="showCloseButton">
         <q-tooltip>退出可视化编排</q-tooltip>
       </q-btn>
-      <q-separator vertical />
-      <q-btn dense icon="read_more" flat @click="$emit('action', 'insert')">
+      <q-separator vertical v-if="showCloseButton" />
+      <q-btn
+        dense
+        icon="read_more"
+        flat
+        v-close-popup
+        @click="$emit('action', 'insert')"
+        v-if="showCloseButton"
+      >
         <q-tooltip>插入到编辑器光标处</q-tooltip>
       </q-btn>
-      <q-btn dense flat icon="done_all" @click="$emit('action', 'apply')">
+      <q-btn
+        dense
+        flat
+        v-close-popup
+        icon="done_all"
+        @click="$emit('action', 'apply')"
+        v-if="showCloseButton"
+      >
         <q-tooltip>清空编辑器内容并插入</q-tooltip>
       </q-btn>
-      <q-separator vertical />
+      <q-separator vertical v-if="showCloseButton" />
       <q-btn dense flat icon="save" @click="$emit('action', 'save')">
         <q-tooltip>保存</q-tooltip>
       </q-btn>
@@ -80,6 +94,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   emits: ["action"],
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index d206ce2f..c207c1d9 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -39,8 +39,6 @@
         <template v-if="modelValue.program === 'quickcommand'">
           <q-btn
             v-for="(item, index) in [
-              // 'keyboard',
-              // 'rocket_launch',
               'help_center',
               'view_timeline',
             ]"
@@ -53,7 +51,6 @@
             @click="handleQuickCommandAction(index)"
           >
             <q-tooltip>
-              <!-- {{ ["录制按键", "快捷动作", "查看文档", "可视化编排"][index] }} -->
               {{ ["查看文档", "可视化编排"][index] }}
             </q-tooltip>
           </q-btn>
@@ -161,36 +158,13 @@
         ></q-btn>
       </q-btn-group>
     </div>
-
-    <!-- 移动对话框到这里 -->
-    <!-- <q-dialog v-model="showActions">
-      <QuickAction @addAction="addAction" />
-    </q-dialog> -->
-    <!-- <q-dialog v-model="showRecorder" position="bottom">
-      <KeyRecorder @sendKeys="addAction" />
-    </q-dialog> -->
-    <q-dialog v-model="showComposer" maximized>
-      <CommandComposer
-        ref="composer"
-        @use-composer="handleComposer"
-        @update:model-value="showComposer = false"
-      />
-    </q-dialog>
   </div>
 </template>
 
 <script>
-// import QuickAction from "components/popup/QuickAction";
-// import KeyRecorder from "components/popup/KeyRecorder";
-import CommandComposer from "components/composer/CommandComposer.vue";
 
 export default {
   name: "CommandLanguageBar",
-  components: {
-    // QuickAction,
-    // KeyRecorder,
-    CommandComposer,
-  },
   props: {
     modelValue: {
       type: Object,
@@ -209,22 +183,12 @@ export default {
       default: false,
     },
   },
-  data() {
-    return {
-      // showActions: false,
-      // showRecorder: false,
-      showComposer: false,
-    };
-  },
   emits: [
     "update:modelValue",
     "program-changed",
     "run",
     "save",
-    // "show-recorder",
-    // "show-actions",
-    "show-help",
-    "use-composer",
+    "show-composer",
   ],
   computed: {
     programLanguages() {
@@ -280,23 +244,14 @@ export default {
     },
     handleQuickCommandAction(index) {
       const actions = [
-        // () => (this.showRecorder = true),
-        // () => (this.showActions = true),
         () => this.showHelp(),
-        () => (this.showComposer = true),
+        () => this.$emit("show-composer"),
       ];
       actions[index]();
     },
-    // addAction(text) {
-    //   this.$emit("add-action", text);
-    // },
     showHelp() {
       window.showUb.docs();
     },
-    handleComposer({ type, code }) {
-      this.$emit("use-composer", { type, code });
-      if (type !== "run") this.showComposer = false;
-    },
   },
 };
 </script>
diff --git a/src/pages/RunComposerPage.vue b/src/pages/RunComposerPage.vue
new file mode 100644
index 00000000..f351fd8a
--- /dev/null
+++ b/src/pages/RunComposerPage.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <ComposerEditor :http://github.com/action="action"></ComposerEditor>
+  </div>
+</template>
+
+<script>
+import ComposerEditor from "components/ComposerEditor";
+
+export default {
+  components: { ComposerEditor },
+  data() {
+    return {
+      action: {
+        type: "composer",
+        data: {},
+      },
+    };
+  },
+};
+</script>
diff --git a/src/router/routes.js b/src/router/routes.js
index c671c016..4c689832 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,6 +9,11 @@ const routes = [
     name: "code",
     component: () => import("pages/RunCodePage.vue"),
   },
+  {
+    path: "/composer",
+    name: "composer",
+    component: () => import("pages/RunComposerPage.vue"),
+  },
   {
     path: "/newcommand",
     name: "newcommand",

From 246ce8bc335211c6d7567d88bb3fd46621ac0828 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 18:53:40 +0800
Subject: [PATCH 043/332] =?UTF-8?q?win=E4=B8=93=E5=8C=BA=E5=92=8Cmac?=
 =?UTF-8?q?=E4=B8=93=E5=8C=BA=E6=94=B9=E5=90=8Dwin=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E5=92=8Cmac=E8=87=AA=E5=8A=A8=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                  | 1 +
 src/js/composer/commands/macosCommands.js   | 6 +++---
 src/js/composer/commands/windowsCommands.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 9c4d4868..6ffafddd 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -306,6 +306,7 @@ if (process.platform !== "linux") {
 
 quickcommand.showSystemMessageBox = function (title, content) {
   window.utools.showNotification(title + "\n" + content);
+  console.log(title + "\n" + content);
 };
 
 module.exports = quickcommand;
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index d7da47c3..8d54cc26 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,13 +1,13 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
 
 export const macosCommands = {
-  label: "MacOS专区",
+  label: "Mac自动化",
   icon: "laptop_mac",
   defaultOpened: false,
   commands: [
     {
       value: "quickcomposer.macos.app.getFrontmost",
-      label: "应用管理",
+      label: "应用及窗口控制",
       desc: "应用程序管理功能",
       icon: "apps",
       isAsync: true,
@@ -347,7 +347,7 @@ export const macosCommands = {
     },
     {
       value: "quickcomposer.macos.browser.getUrl",
-      label: "浏览器管理",
+      label: "浏览器控制",
       desc: "浏览器管理功能",
       icon: "web",
       isAsync: true,
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 1449b32d..d908b703 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,5 +1,5 @@
 export const windowsCommands = {
-  label: "Windows专区",
+  label: "Win自动化",
   icon: "window",
   defaultOpened: false,
   commands: [

From 5f3806a797e6777fd1c9e5218a2eb3ca73f05fef Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 20:45:33 +0800
Subject: [PATCH 044/332] =?UTF-8?q?quickcommand=E6=96=B0=E5=A2=9E=E5=85=AD?=
 =?UTF-8?q?=E4=B8=AA=E7=B3=BB=E7=BB=9F=E7=BA=A7=E5=BC=B9=E7=AA=97=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3showSystemMessageBox=E3=80=81showSystemInputBox?=
 =?UTF-8?q?=E3=80=81showSystemConfirmBox=E3=80=81showSystemSelectList?=
 =?UTF-8?q?=E3=80=81showSystemButtonBox=E3=80=81showSystemTextArea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...mandTempFile.js => getQuickcommandFile.js} |  11 +-
 plugin/lib/quickcommand.js                    |  19 +-
 plugin/lib/systemDialog.js                    | 425 ++++++++++++++++++
 plugin/preload.js                             |   2 +-
 .../monaco/types/quickcommand.api.d.ts        | 112 +++++
 5 files changed, 560 insertions(+), 9 deletions(-)
 rename plugin/lib/{getQuickcommandTempFile.js => getQuickcommandFile.js} (52%)
 create mode 100644 plugin/lib/systemDialog.js

diff --git a/plugin/lib/getQuickcommandTempFile.js b/plugin/lib/getQuickcommandFile.js
similarity index 52%
rename from plugin/lib/getQuickcommandTempFile.js
rename to plugin/lib/getQuickcommandFile.js
index d30b27fb..e6c7e80a 100644
--- a/plugin/lib/getQuickcommandTempFile.js
+++ b/plugin/lib/getQuickcommandFile.js
@@ -9,4 +9,13 @@ const getQuickcommandTempFile = (ext, name, dir = "quickcommandTempDir") => {
   return path.join(tempDir, `${name}.${ext}`);
 };
 
-module.exports = getQuickcommandTempFile;
+const getQuickcommandFolderFile = (name, ext) => {
+  const quickcommandPath = path.join(
+    window.utools.getPath("userData"),
+    "quickcommand"
+  );
+  if (!fs.existsSync(quickcommandPath)) fs.mkdirSync(quickcommandPath);
+  return path.join(quickcommandPath, `${name}.${ext}`);
+};
+
+module.exports = { getQuickcommandTempFile, getQuickcommandFolderFile };
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 6ffafddd..d6c4a9bc 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -6,7 +6,10 @@ const iconv = require("iconv-lite");
 const path = require("path");
 const axios = require("axios");
 
-const getQuickcommandTempFile = require("./getQuickcommandTempFile");
+const systemDialog = require("./systemDialog");
+
+const { getQuickcommandTempFile } = require("./getQuickcommandFile");
+
 const getCommandToLaunchTerminal = require("./getCommandToLaunchTerminal");
 
 const ctlKey = window.utools.isMacOs() ? "command" : "control";
@@ -262,6 +265,7 @@ if (process.platform === "win32") {
       });
     });
   };
+  quickcommand.showSystemTextArea = systemDialog.showSystemTextArea;
 }
 
 if (process.platform === "darwin") {
@@ -296,17 +300,18 @@ window.runPythonCommand = (py) => {
   }
 };
 
-// 在终端中执行
 if (process.platform !== "linux") {
+  // 在终端中执行
   quickcommand.runInTerminal = function (cmdline, dir) {
     let command = getCommandToLaunchTerminal(cmdline, dir);
     child_process.exec(command);
   };
+  // 系统级弹窗
+  quickcommand.showSystemMessageBox = systemDialog.showSystemMessageBox;
+  quickcommand.showSystemInputBox = systemDialog.showSystemInputBox;
+  quickcommand.showSystemConfirmBox = systemDialog.showSystemConfirmBox;
+  quickcommand.showSystemSelectList = systemDialog.showSystemSelectList;
+  quickcommand.showSystemButtonBox = systemDialog.showSystemButtonBox;
 }
 
-quickcommand.showSystemMessageBox = function (title, content) {
-  window.utools.showNotification(title + "\n" + content);
-  console.log(title + "\n" + content);
-};
-
 module.exports = quickcommand;
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
new file mode 100644
index 00000000..b0e1ef0a
--- /dev/null
+++ b/plugin/lib/systemDialog.js
@@ -0,0 +1,425 @@
+const fs = require("fs");
+const path = require("path");
+const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
+
+const getQuickcommandIconPath = () => {
+  try {
+    const iconPath = getQuickcommandFolderFile("logo", "png");
+    if (!fs.existsSync(iconPath)) {
+      fs.copyFileSync(path.join(__dirname, "..", "logo.png"), iconPath);
+    }
+    return iconPath;
+  } catch (error) {
+    console.error(error);
+    return null;
+  }
+};
+
+const showSystemMessageBox = async function (content, title = "") {
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isMacOs()) {
+    let iconParam = "note";
+    if (iconPath) {
+      const posixPath = iconPath.replace(/\\/g, "/");
+      iconParam = `alias POSIX file "${posixPath}"`;
+    }
+    const script = `display dialog "${content}" with title "${title}" buttons {"确定"} default button "确定" with icon ${iconParam}`;
+    await this.runAppleScript(script);
+  } else if (window.utools.isWindows()) {
+    const csharpScript = `
+          using System.Windows.Forms;
+          using System.Drawing;
+          using System.IO;
+          class Program {
+            static void Main() {
+              Form form = new Form();
+              ${
+                iconPath
+                  ? `using (var bmp = new Bitmap("${iconPath}"))
+                {
+                  form.Icon = Icon.FromHandle(bmp.GetHicon());
+                }`
+                  : ""
+              }
+              MessageBox.Show(form, "${content}", "${title}",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+              form.Dispose();
+            }
+          }`;
+    await this.runCsharp(csharpScript);
+  }
+};
+
+// 系统级输入框
+const showSystemInputBox = async function (placeholders, title = "") {
+  if (!Array.isArray(placeholders)) {
+    placeholders = [placeholders];
+  }
+
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isMacOs()) {
+    let iconParam = "note";
+    if (iconPath) {
+      const posixPath = iconPath.replace(/\\/g, "/");
+      iconParam = `alias POSIX file "${posixPath}"`;
+    }
+
+    const results = [];
+    for (let i = 0; i < placeholders.length; i++) {
+      const isLast = i === placeholders.length - 1;
+      const buttons = isLast ? '{"取消", "确定"}' : '{"取消", "继续"}';
+      const defaultButton = isLast ? '"确定"' : '"继续"';
+      const script = `display dialog "${placeholders[i]}" with title "${title}" default answer "" buttons ${buttons} default button ${defaultButton} with icon ${iconParam}`;
+      const result = await this.runAppleScript(script);
+      const buttonClicked = isLast ? "确定" : "继续";
+      if (!result.includes(`button returned:${buttonClicked}`)) {
+        return null;
+      }
+      const text = result.match(/text returned:(.+)/)[1];
+      results.push(text);
+    }
+    return results;
+  } else if (window.utools.isWindows()) {
+    const csharpScript = `
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          static void Main() {
+            Form form = new Form();
+            form.Text = "${title}";
+            form.ClientSize = new Size(300, ${50 + placeholders.length * 70});
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
+            ${
+              iconPath
+                ? `using (var bmp = new Bitmap("${iconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
+            }
+
+            ${placeholders
+              .map(
+                (placeholder, index) => `
+            Label label${index} = new Label();
+            label${index}.Text = "${placeholder}";
+            label${index}.SetBounds(10, ${10 + index * 70}, 280, 20);
+            form.Controls.Add(label${index});
+
+            TextBox textBox${index} = new TextBox();
+            textBox${index}.SetBounds(10, ${35 + index * 70}, 280, 20);
+            form.Controls.Add(textBox${index});`
+              )
+              .join("\n")}
+
+            Button okButton = new Button();
+            okButton.Text = "确定";
+            okButton.DialogResult = DialogResult.OK;
+            okButton.SetBounds(120, ${20 + placeholders.length * 70}, 75, 23);
+            form.Controls.Add(okButton);
+
+            Button cancelButton = new Button();
+            cancelButton.Text = "取消";
+            cancelButton.DialogResult = DialogResult.Cancel;
+            cancelButton.SetBounds(210, ${
+              20 + placeholders.length * 70
+            }, 75, 23);
+            form.Controls.Add(cancelButton);
+
+            form.AcceptButton = okButton;
+            form.CancelButton = cancelButton;
+
+            if (form.ShowDialog() == DialogResult.OK) {
+              ${placeholders
+                .map((_, index) => `Console.WriteLine(textBox${index}.Text);`)
+                .join("\n              ")}
+            }
+            form.Dispose();
+          }
+        }`;
+    const result = await this.runCsharp(csharpScript);
+    const lines = result.trim().split("\n");
+    return lines.length > 0 && lines[0] !== "" ? lines : null;
+  }
+};
+
+// 系统级确认框
+const showSystemConfirmBox = async function (content, title = "") {
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isMacOs()) {
+    let iconParam = "note";
+    if (iconPath) {
+      const posixPath = iconPath.replace(/\\/g, "/");
+      iconParam = `alias POSIX file "${posixPath}"`;
+    }
+    const script = `display dialog "${content}" with title "${title}" buttons {"取消", "确定"} default button "确定" with icon ${iconParam}`;
+    const result = await this.runAppleScript(script);
+    return result.includes("button returned:确定");
+  } else if (window.utools.isWindows()) {
+    const csharpScript = `
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          static void Main() {
+            Form form = new Form();
+            ${
+              iconPath
+                ? `using (var bmp = new Bitmap("${iconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
+            }
+            DialogResult result = MessageBox.Show(form, "${content}", "${title}",
+              MessageBoxButtons.OKCancel,
+              MessageBoxIcon.Question);
+            Console.WriteLine(result == DialogResult.OK);
+            form.Dispose();
+          }
+        }`;
+    const result = await this.runCsharp(csharpScript);
+    return result.trim() === "True";
+  }
+};
+
+// 系统级选择框
+const showSystemSelectList = async function (items, title = "") {
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isMacOs()) {
+    const itemList = items.map((item) => `"${item}"`).join(", ");
+    const script = `choose from list {${itemList}} with title "${title}" with prompt "请选择：" default items {"${items[0]}"}`;
+    const result = await this.runAppleScript(script);
+    if (result.includes("false")) return null;
+    const text = result.trim();
+    const id = items.findIndex((item) => item === text);
+    return { id, text };
+  } else if (window.utools.isWindows()) {
+    const csharpScript = `
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          static void Main() {
+            Form form = new Form();
+            ListBox listBox = new ListBox();
+            Button okButton = new Button();
+            Button cancelButton = new Button();
+
+            form.Text = "${title}";
+            form.ClientSize = new Size(300, 250);
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
+            ${
+              iconPath
+                ? `using (var bmp = new Bitmap("${iconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
+            }
+
+            listBox.SetBounds(10, 10, 280, 180);
+            ${items
+              .map((item, index) => `listBox.Items.Add("${item}");`)
+              .join("\n          ")}
+            listBox.SelectedIndex = 0;
+            form.Controls.Add(listBox);
+
+            okButton.Text = "确定";
+            okButton.DialogResult = DialogResult.OK;
+            okButton.SetBounds(120, 200, 75, 23);
+            form.Controls.Add(okButton);
+
+            cancelButton.Text = "取消";
+            cancelButton.DialogResult = DialogResult.Cancel;
+            cancelButton.SetBounds(210, 200, 75, 23);
+            form.Controls.Add(cancelButton);
+
+            if (form.ShowDialog() == DialogResult.OK && listBox.SelectedItem != null) {
+              Console.WriteLine($"{listBox.SelectedIndex}|{listBox.SelectedItem}");
+            }
+            form.Dispose();
+          }
+        }`;
+    const result = await this.runCsharp(csharpScript);
+    if (result.trim()) {
+      const [id, text] = result.trim().split("|");
+      return { id: parseInt(id), text };
+    }
+    return null;
+  }
+};
+
+// 系统级按钮组弹窗
+const showSystemButtonBox = async function (buttons, content, title = "") {
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isMacOs()) {
+    let iconParam = "note";
+    if (iconPath) {
+      const posixPath = iconPath.replace(/\\/g, "/");
+      iconParam = `alias POSIX file "${posixPath}"`;
+    }
+    const buttonList = buttons.map((btn) => `"${btn}"`).join(", ");
+    const script = `display dialog "${content}" with title "${title}" buttons {${buttonList}} default button "${buttons[0]}" with icon ${iconParam}`;
+    const result = await this.runAppleScript(script);
+    const match = result.match(/button returned:(.+)/);
+    if (match) {
+      const text = match[1];
+      const id = buttons.findIndex((btn) => btn === text);
+      return { id, text };
+    }
+    return null;
+  } else if (window.utools.isWindows()) {
+    const csharpScript = `
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          static void Main() {
+            Form form = new Form();
+            Label label = new Label();
+            FlowLayoutPanel buttonPanel = new FlowLayoutPanel();
+
+            form.Text = "${title}";
+            form.ClientSize = new Size(400, 150);
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
+            ${
+              iconPath
+                ? `using (var bmp = new Bitmap("${iconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
+            }
+
+            label.Text = "${content}";
+            label.SetBounds(10, 10, 380, 40);
+            label.AutoSize = true;
+            form.Controls.Add(label);
+
+            buttonPanel.SetBounds(10, 60, 380, 40);
+            buttonPanel.FlowDirection = FlowDirection.RightToLeft;
+            buttonPanel.WrapContents = false;
+            form.Controls.Add(buttonPanel);
+
+            ${buttons
+              .map(
+                (btn, index) => `
+              Button button${index} = new Button();
+              button${index}.Text = "${btn}";
+              button${index}.DialogResult = DialogResult.OK;
+              button${index}.Tag = "${index}";
+              button${index}.SetBounds(0, 0, 80, 30);
+              buttonPanel.Controls.Add(button${index});`
+              )
+              .join("\n")}
+
+            DialogResult result = form.ShowDialog();
+            if (result == DialogResult.OK) {
+              foreach (Button btn in buttonPanel.Controls) {
+                if (btn.DialogResult == result) {
+                  Console.WriteLine($"{btn.Tag}|{btn.Text}");
+                  break;
+                }
+              }
+            }
+            form.Dispose();
+          }
+        }`;
+    const result = await this.runCsharp(csharpScript);
+    if (result.trim()) {
+      const [id, text] = result.trim().split("|");
+      return { id: parseInt(id), text };
+    }
+    return null;
+  }
+};
+
+// 系统级文本区域弹窗
+const showSystemTextArea = async function (
+  placeholder = "",
+  defaultText = "",
+  title = ""
+) {
+  const iconPath = getQuickcommandIconPath();
+  if (window.utools.isWindows()) {
+    const csharpScript = `
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          static void Main() {
+            Form form = new Form();
+            TextBox textBox = new TextBox();
+            Button okButton = new Button();
+            Button cancelButton = new Button();
+            Label label = new Label();
+
+            form.Text = "${title}";
+            form.ClientSize = new Size(400, 300);
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
+            ${
+              iconPath
+                ? `using (var bmp = new Bitmap("${iconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
+            }
+
+            label.Text = "${placeholder}";
+            label.SetBounds(10, 10, 380, 20);
+            form.Controls.Add(label);
+
+            textBox.Multiline = true;
+            textBox.ScrollBars = ScrollBars.Vertical;
+            textBox.SetBounds(10, 40, 380, 180);
+            textBox.Text = "${defaultText}";
+            form.Controls.Add(textBox);
+
+            okButton.Text = "确定";
+            okButton.DialogResult = DialogResult.OK;
+            okButton.SetBounds(220, 230, 75, 23);
+            form.Controls.Add(okButton);
+
+            cancelButton.Text = "取消";
+            cancelButton.DialogResult = DialogResult.Cancel;
+            cancelButton.SetBounds(310, 230, 75, 23);
+            form.Controls.Add(cancelButton);
+
+            form.AcceptButton = okButton;
+            form.CancelButton = cancelButton;
+
+            if (form.ShowDialog() == DialogResult.OK) {
+              Console.WriteLine(textBox.Text);
+            }
+            form.Dispose();
+          }
+        }`;
+    const result = await this.runCsharp(csharpScript);
+    return result.trim() || null;
+  }
+};
+
+module.exports = {
+  showSystemMessageBox,
+  showSystemInputBox,
+  showSystemConfirmBox,
+  showSystemSelectList,
+  showSystemButtonBox,
+  showSystemTextArea,
+};
diff --git a/plugin/preload.js b/plugin/preload.js
index e98a6742..62309b30 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -41,8 +41,8 @@ window.convertFilePathToUtoolsPayload = convertFilePathToUtoolsPayload;
 window.getuToolsLite = require("./lib/utoolsLite");
 window.quickcommand = require("./lib/quickcommand");
 window.quickcomposer = require("./lib/quickcomposer");
-window.getQuickcommandTempFile = require("./lib/getQuickcommandTempFile");
 window.showUb = require("./lib/showDocs");
+window.getQuickcommandTempFile = require("./lib/getQuickcommandFile").getQuickcommandTempFile;
 
 window.getSharedQcById = async (id) => {
   const url = "https://qc.qaz.ink/home/quick/script/getScript";
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index bf02d33a..a188d7d1 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -485,6 +485,118 @@ interface quickcommandApi {
      */
     all(): Array<{ id: string; value: string; isNative: boolean }>;
   };
+
+  /**
+   * 显示一个系统级消息框（不支持Linux）
+   *
+   * ```js
+   * quickcommand.showSystemMessageBox("这是一条消息", "标题")
+   * ```
+   *
+   * @param content 消息内容
+   * @param title 标题，默认为空
+   */
+  showSystemMessageBox(content: string, title?: string): Promise<void>;
+
+  /**
+   * 显示一个系统级输入框组，返回所有输入框的值（不支持Linux）
+   *
+   * ```js
+   * // 单个输入框
+   * quickcommand.showSystemInputBox("请输入：", "标题").then(results => {
+   *   console.log(results[0]) // 第一个输入框的值
+   * })
+   *
+   * // 多个输入框
+   * quickcommand.showSystemInputBox(["姓名：", "年龄：", "地址："], "个人信息").then(results => {
+   *   console.log(results) // ["张三", "25", "北京"]
+   * })
+   * ```
+   *
+   * @param placeholders 输入框的提示文本，可以是单个字符串或字符串数组
+   * @param title 标题，默认为空
+   */
+  showSystemInputBox(
+    placeholders: string | string[],
+    title?: string
+  ): Promise<string[] | null>;
+
+  /**
+   * 显示一个系统级确认框，返回是否点击了确认（不支持Linux）
+   *
+   * ```js
+   * quickcommand.showSystemConfirmBox("确定要删除吗？", "确认删除").then(confirmed => {
+   *   if (confirmed) {
+   *     console.log("用户点击了确定")
+   *   }
+   * })
+   * ```
+   *
+   * @param content 确认内容
+   * @param title 标题，默认为空
+   */
+  showSystemConfirmBox(content: string, title?: string): Promise<boolean>;
+
+  /**
+   * 显示一个系统级选择列表，返回选择的项的索引和文本（不支持Linux）
+   *
+   * ```js
+   * quickcommand.showSystemSelectList(["选项1", "选项2", "选项3"], "请选择").then(result => {
+   *   if (result) {
+   *     console.log(`选择了第${result.id + 1}个选项：${result.text}`)
+   *   }
+   * })
+   * ```
+   *
+   * @param items 选项列表
+   * @param title 标题，默认为空
+   */
+  showSystemSelectList(
+    items: string[],
+    title?: string
+  ): Promise<{ id: number; text: string } | null>;
+
+  /**
+   * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本（不支持Linux）
+   *
+   * ```js
+   * quickcommand.showSystemButtonBox(["保存", "不保存", "取消"], "是否保存更改？", "保存确认").then(result => {
+   *   if (result) {
+   *     console.log(`点击了第${result.id + 1}个按钮：${result.text}`)
+   *   }
+   * })
+   * ```
+   *
+   * @param buttons 按钮文本数组
+   * @param content 对话框内容
+   * @param title 标题，默认为空
+   */
+  showSystemButtonBox(
+    buttons: string[],
+    content: string,
+    title?: string
+  ): Promise<{ id: number; text: string } | null>;
+
+  /**
+   * 显示一个系统级多行文本输入框（仅Windows支持）
+   *
+   * ```js
+   * quickcommand.showSystemTextArea("请输入多行文本：", "默认内容", "文本编辑").then(text => {
+   *   if (text) {
+   *     console.log("输入的文本：", text)
+   *   }
+   * })
+   * ```
+   *
+   * @param placeholder 提示文本，默认为空
+   * @param defaultText 默认文本，默认为空
+   * @param title 标题，默认为空
+   */
+  showSystemTextArea(
+    placeholder?: string,
+    defaultText?: string,
+    title?: string
+  ): Promise<string | null>;
 }
 
 declare var quickcommand: quickcommandApi;

From a54d528fb8f352ede0fde4274aa248cee23a7d97 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 21:13:42 +0800
Subject: [PATCH 045/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwindows=E4=B8=8Bshows?=
 =?UTF-8?q?ystemtextarea=E5=9B=9E=E8=BD=A6=E6=97=A0=E6=B3=95=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/systemDialog.js | 59 ++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index b0e1ef0a..f538647a 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -26,7 +26,9 @@ const showSystemMessageBox = async function (content, title = "") {
     const script = `display dialog "${content}" with title "${title}" buttons {"确定"} default button "确定" with icon ${iconParam}`;
     await this.runAppleScript(script);
   } else if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+          using System;
           using System.Windows.Forms;
           using System.Drawing;
           using System.IO;
@@ -34,8 +36,8 @@ const showSystemMessageBox = async function (content, title = "") {
             static void Main() {
               Form form = new Form();
               ${
-                iconPath
-                  ? `using (var bmp = new Bitmap("${iconPath}"))
+                escapedIconPath
+                  ? `using (var bmp = new Bitmap("${escapedIconPath}"))
                 {
                   form.Icon = Icon.FromHandle(bmp.GetHicon());
                 }`
@@ -81,7 +83,9 @@ const showSystemInputBox = async function (placeholders, title = "") {
     }
     return results;
   } else if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+        using System;
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
@@ -95,8 +99,8 @@ const showSystemInputBox = async function (placeholders, title = "") {
             form.MaximizeBox = false;
             form.MinimizeBox = false;
             ${
-              iconPath
-                ? `using (var bmp = new Bitmap("${iconPath}"))
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
               {
                 form.Icon = Icon.FromHandle(bmp.GetHicon());
               }`
@@ -161,7 +165,9 @@ const showSystemConfirmBox = async function (content, title = "") {
     const result = await this.runAppleScript(script);
     return result.includes("button returned:确定");
   } else if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+        using System;
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
@@ -169,8 +175,8 @@ const showSystemConfirmBox = async function (content, title = "") {
           static void Main() {
             Form form = new Form();
             ${
-              iconPath
-                ? `using (var bmp = new Bitmap("${iconPath}"))
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
               {
                 form.Icon = Icon.FromHandle(bmp.GetHicon());
               }`
@@ -200,7 +206,9 @@ const showSystemSelectList = async function (items, title = "") {
     const id = items.findIndex((item) => item === text);
     return { id, text };
   } else if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+        using System;
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
@@ -218,8 +226,8 @@ const showSystemSelectList = async function (items, title = "") {
             form.MaximizeBox = false;
             form.MinimizeBox = false;
             ${
-              iconPath
-                ? `using (var bmp = new Bitmap("${iconPath}"))
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
               {
                 form.Icon = Icon.FromHandle(bmp.GetHicon());
               }`
@@ -228,7 +236,7 @@ const showSystemSelectList = async function (items, title = "") {
 
             listBox.SetBounds(10, 10, 280, 180);
             ${items
-              .map((item, index) => `listBox.Items.Add("${item}");`)
+              .map((item) => `listBox.Items.Add("${item}");`)
               .join("\n          ")}
             listBox.SelectedIndex = 0;
             form.Controls.Add(listBox);
@@ -244,14 +252,14 @@ const showSystemSelectList = async function (items, title = "") {
             form.Controls.Add(cancelButton);
 
             if (form.ShowDialog() == DialogResult.OK && listBox.SelectedItem != null) {
-              Console.WriteLine($"{listBox.SelectedIndex}|{listBox.SelectedItem}");
+              Console.WriteLine(listBox.SelectedIndex.ToString() + "|||||" + listBox.SelectedItem.ToString());
             }
             form.Dispose();
           }
         }`;
     const result = await this.runCsharp(csharpScript);
     if (result.trim()) {
-      const [id, text] = result.trim().split("|");
+      const [id, text] = result.trim().split("|||||");
       return { id: parseInt(id), text };
     }
     return null;
@@ -278,7 +286,9 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
     }
     return null;
   } else if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+        using System;
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
@@ -295,8 +305,8 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
             form.MaximizeBox = false;
             form.MinimizeBox = false;
             ${
-              iconPath
-                ? `using (var bmp = new Bitmap("${iconPath}"))
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
               {
                 form.Icon = Icon.FromHandle(bmp.GetHicon());
               }`
@@ -329,7 +339,7 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
             if (result == DialogResult.OK) {
               foreach (Button btn in buttonPanel.Controls) {
                 if (btn.DialogResult == result) {
-                  Console.WriteLine($"{btn.Tag}|{btn.Text}");
+                  Console.WriteLine(btn.Tag.ToString() + "|||||" + btn.Text);
                   break;
                 }
               }
@@ -339,7 +349,7 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
         }`;
     const result = await this.runCsharp(csharpScript);
     if (result.trim()) {
-      const [id, text] = result.trim().split("|");
+      const [id, text] = result.trim().split("|||||");
       return { id: parseInt(id), text };
     }
     return null;
@@ -354,7 +364,9 @@ const showSystemTextArea = async function (
 ) {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isWindows()) {
+    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
+        using System;
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
@@ -373,8 +385,8 @@ const showSystemTextArea = async function (
             form.MaximizeBox = false;
             form.MinimizeBox = false;
             ${
-              iconPath
-                ? `using (var bmp = new Bitmap("${iconPath}"))
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
               {
                 form.Icon = Icon.FromHandle(bmp.GetHicon());
               }`
@@ -389,6 +401,7 @@ const showSystemTextArea = async function (
             textBox.ScrollBars = ScrollBars.Vertical;
             textBox.SetBounds(10, 40, 380, 180);
             textBox.Text = "${defaultText}";
+            textBox.AcceptsReturn = true;
             form.Controls.Add(textBox);
 
             okButton.Text = "确定";
@@ -401,9 +414,19 @@ const showSystemTextArea = async function (
             cancelButton.SetBounds(310, 230, 75, 23);
             form.Controls.Add(cancelButton);
 
-            form.AcceptButton = okButton;
+            // 移除默认的 Enter 键行为
+            form.AcceptButton = null;
             form.CancelButton = cancelButton;
 
+            // 添加快捷键处理
+            form.KeyPreview = true;
+            form.KeyDown += (sender, e) => {
+              if (e.KeyCode == Keys.Enter && e.Control) {
+                okButton.PerformClick();
+                e.Handled = true;
+              }
+            };
+
             if (form.ShowDialog() == DialogResult.OK) {
               Console.WriteLine(textBox.Text);
             }

From 8038ed28f425a9de545ba286c7f98e442c17c52f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 21:53:21 +0800
Subject: [PATCH 046/332] =?UTF-8?q?=E7=BE=8E=E5=8C=96windows=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84system=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js |   6 +-
 plugin/lib/systemDialog.js | 237 +++++++++++++++++++++++++++++--------
 2 files changed, 193 insertions(+), 50 deletions(-)

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index d6c4a9bc..d7a4aebf 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -184,7 +184,7 @@ if (process.platform === "win32") {
   // 运行vbs脚本
   quickcommand.runVbs = function (script) {
     return new Promise((reslove, reject) => {
-      var tempfile = getQuickcommandTempFile("vbs", "TempVBSScript");
+      var tempfile = getQuickcommandTempFile("vbs");
       fs.writeFile(tempfile, iconv.encode(script, "gbk"), () => {
         child_process.exec(
           `cscript.exe /nologo "${tempfile}"`,
@@ -243,8 +243,8 @@ if (process.platform === "win32") {
         return reject("未安装.NET Framework");
       }
       // 写入临时文件
-      let tempCsharpFile = getQuickcommandTempFile("cs", "TempCsharpScript");
-      let tempBuildFile = getQuickcommandTempFile("exe", "TempCsharpBuildExe");
+      let tempCsharpFile = getQuickcommandTempFile("cs");
+      let tempBuildFile = getQuickcommandTempFile("exe");
 
       fs.writeFile(tempCsharpFile, iconv.encode(script, "gbk"), (err) => {
         if (err) return reject(err.toString());
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index f538647a..929e31d7 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -2,6 +2,53 @@ const fs = require("fs");
 const path = require("path");
 const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
 
+// 定义通用样式
+const commonStyles = `
+  static void ApplyModernStyle(Form form) {
+    form.Font = new Font("Microsoft YaHei UI", 9F);
+    form.BackColor = Color.White;
+    form.Padding = new Padding(15);
+  }
+
+  static void ApplyButtonStyle(Button button) {
+    button.FlatStyle = FlatStyle.Flat;
+    button.BackColor = Color.FromArgb(0, 120, 212);
+    button.ForeColor = Color.White;
+    button.Font = new Font("Microsoft YaHei UI", 9F);
+    button.Cursor = Cursors.Hand;
+    button.FlatAppearance.BorderSize = 0;
+    button.Height = 30;
+    button.Width = 85;
+  }
+
+  static void ApplySecondaryButtonStyle(Button button) {
+    button.FlatStyle = FlatStyle.Flat;
+    button.BackColor = Color.FromArgb(240, 240, 240);
+    button.ForeColor = Color.Black;
+    button.Font = new Font("Microsoft YaHei UI", 9F);
+    button.Cursor = Cursors.Hand;
+    button.FlatAppearance.BorderSize = 1;
+    button.FlatAppearance.BorderColor = Color.FromArgb(200, 200, 200);
+    button.Height = 30;
+    button.Width = 85;
+  }
+
+  static void ApplyTextBoxStyle(TextBox textBox) {
+    textBox.BorderStyle = BorderStyle.FixedSingle;
+    textBox.Font = new Font("Microsoft YaHei UI", 9F);
+  }
+
+  static void ApplyLabelStyle(Label label) {
+    label.Font = new Font("Microsoft YaHei UI", 9F);
+    label.ForeColor = Color.FromArgb(51, 51, 51);
+  }
+
+  static void ApplyListBoxStyle(ListBox listBox) {
+    listBox.Font = new Font("Microsoft YaHei UI", 9F);
+    listBox.BorderStyle = BorderStyle.FixedSingle;
+    listBox.BackColor = Color.White;
+  }`;
+
 const getQuickcommandIconPath = () => {
   try {
     const iconPath = getQuickcommandFolderFile("logo", "png");
@@ -28,27 +75,51 @@ const showSystemMessageBox = async function (content, title = "") {
   } else if (window.utools.isWindows()) {
     const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
-          using System;
-          using System.Windows.Forms;
-          using System.Drawing;
-          using System.IO;
-          class Program {
-            static void Main() {
-              Form form = new Form();
-              ${
-                escapedIconPath
-                  ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-                {
-                  form.Icon = Icon.FromHandle(bmp.GetHicon());
-                }`
-                  : ""
-              }
-              MessageBox.Show(form, "${content}", "${title}",
-                MessageBoxButtons.OK,
-                MessageBoxIcon.Information);
-              form.Dispose();
+        using System;
+        using System.Windows.Forms;
+        using System.Drawing;
+        using System.IO;
+        class Program {
+          ${commonStyles}
+
+          static void Main() {
+            Form form = new Form();
+            Label label = new Label();
+            Button okButton = new Button();
+
+            ApplyModernStyle(form);
+            form.Text = "${title}";
+            form.ClientSize = new Size(400, 130);
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
+            ${
+              escapedIconPath
+                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
+              {
+                form.Icon = Icon.FromHandle(bmp.GetHicon());
+              }`
+                : ""
             }
-          }`;
+
+            ApplyLabelStyle(label);
+            label.Text = "${content}";
+            label.SetBounds(15, 15, 370, 60);
+            label.AutoSize = true;
+            form.Controls.Add(label);
+
+            ApplyButtonStyle(okButton);
+            okButton.Text = "确定";
+            okButton.DialogResult = DialogResult.OK;
+            okButton.SetBounds(300, 80, 85, 30);
+            form.Controls.Add(okButton);
+
+            form.AcceptButton = okButton;
+            form.ShowDialog();
+            form.Dispose();
+          }
+        }`;
     await this.runCsharp(csharpScript);
   }
 };
@@ -89,11 +160,15 @@ const showSystemInputBox = async function (placeholders, title = "") {
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
+
         class Program {
+          ${commonStyles}
+
           static void Main() {
             Form form = new Form();
+            ApplyModernStyle(form);
             form.Text = "${title}";
-            form.ClientSize = new Size(300, ${50 + placeholders.length * 70});
+            form.ClientSize = new Size(350, ${45 + placeholders.length * 70});
             form.FormBorderStyle = FormBorderStyle.FixedDialog;
             form.StartPosition = FormStartPosition.CenterScreen;
             form.MaximizeBox = false;
@@ -111,28 +186,32 @@ const showSystemInputBox = async function (placeholders, title = "") {
               .map(
                 (placeholder, index) => `
             Label label${index} = new Label();
+            ApplyLabelStyle(label${index});
             label${index}.Text = "${placeholder}";
-            label${index}.SetBounds(10, ${10 + index * 70}, 280, 20);
+            label${index}.SetBounds(15, ${15 + index * 70}, 320, 20);
             form.Controls.Add(label${index});
 
             TextBox textBox${index} = new TextBox();
-            textBox${index}.SetBounds(10, ${35 + index * 70}, 280, 20);
+            ApplyTextBoxStyle(textBox${index});
+            textBox${index}.SetBounds(15, ${40 + index * 70}, 320, 25);
             form.Controls.Add(textBox${index});`
               )
               .join("\n")}
 
             Button okButton = new Button();
+            ApplyButtonStyle(okButton);
             okButton.Text = "确定";
             okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(120, ${20 + placeholders.length * 70}, 75, 23);
+            okButton.SetBounds(160, ${20 + placeholders.length * 70}, 85, 30);
             form.Controls.Add(okButton);
 
             Button cancelButton = new Button();
+            ApplySecondaryButtonStyle(cancelButton);
             cancelButton.Text = "取消";
             cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(210, ${
+            cancelButton.SetBounds(250, ${
               20 + placeholders.length * 70
-            }, 75, 23);
+            }, 85, 30);
             form.Controls.Add(cancelButton);
 
             form.AcceptButton = okButton;
@@ -141,14 +220,13 @@ const showSystemInputBox = async function (placeholders, title = "") {
             if (form.ShowDialog() == DialogResult.OK) {
               ${placeholders
                 .map((_, index) => `Console.WriteLine(textBox${index}.Text);`)
-                .join("\n              ")}
+                .join("\n          ")}
             }
             form.Dispose();
           }
         }`;
     const result = await this.runCsharp(csharpScript);
-    const lines = result.trim().split("\n");
-    return lines.length > 0 && lines[0] !== "" ? lines : null;
+    return result.trim() || null;
   }
 };
 
@@ -172,8 +250,21 @@ const showSystemConfirmBox = async function (content, title = "") {
         using System.Drawing;
         using System.IO;
         class Program {
+          ${commonStyles}
+
           static void Main() {
             Form form = new Form();
+            Label label = new Label();
+            Button okButton = new Button();
+            Button cancelButton = new Button();
+
+            ApplyModernStyle(form);
+            form.Text = "${title}";
+            form.ClientSize = new Size(400, 130);
+            form.FormBorderStyle = FormBorderStyle.FixedDialog;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            form.MaximizeBox = false;
+            form.MinimizeBox = false;
             ${
               escapedIconPath
                 ? `using (var bmp = new Bitmap("${escapedIconPath}"))
@@ -182,9 +273,29 @@ const showSystemConfirmBox = async function (content, title = "") {
               }`
                 : ""
             }
-            DialogResult result = MessageBox.Show(form, "${content}", "${title}",
-              MessageBoxButtons.OKCancel,
-              MessageBoxIcon.Question);
+
+            ApplyLabelStyle(label);
+            label.Text = "${content}";
+            label.SetBounds(15, 15, 370, 60);
+            label.AutoSize = true;
+            form.Controls.Add(label);
+
+            ApplyButtonStyle(okButton);
+            okButton.Text = "确定";
+            okButton.DialogResult = DialogResult.OK;
+            okButton.SetBounds(210, 80, 85, 30);
+            form.Controls.Add(okButton);
+
+            ApplySecondaryButtonStyle(cancelButton);
+            cancelButton.Text = "取消";
+            cancelButton.DialogResult = DialogResult.Cancel;
+            cancelButton.SetBounds(300, 80, 85, 30);
+            form.Controls.Add(cancelButton);
+
+            form.AcceptButton = okButton;
+            form.CancelButton = cancelButton;
+
+            DialogResult result = form.ShowDialog();
             Console.WriteLine(result == DialogResult.OK);
             form.Dispose();
           }
@@ -212,15 +323,20 @@ const showSystemSelectList = async function (items, title = "") {
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
+
         class Program {
+          ${commonStyles}
+
           static void Main() {
             Form form = new Form();
             ListBox listBox = new ListBox();
             Button okButton = new Button();
             Button cancelButton = new Button();
+            Label titleLabel = new Label();
 
+            ApplyModernStyle(form);
             form.Text = "${title}";
-            form.ClientSize = new Size(300, 250);
+            form.ClientSize = new Size(350, 280);
             form.FormBorderStyle = FormBorderStyle.FixedDialog;
             form.StartPosition = FormStartPosition.CenterScreen;
             form.MaximizeBox = false;
@@ -234,23 +350,35 @@ const showSystemSelectList = async function (items, title = "") {
                 : ""
             }
 
-            listBox.SetBounds(10, 10, 280, 180);
+            titleLabel.Text = "请选择：";
+            titleLabel.AutoSize = true;
+            titleLabel.SetBounds(15, 15, 320, 20);
+            ApplyLabelStyle(titleLabel);
+            form.Controls.Add(titleLabel);
+
+            ApplyListBoxStyle(listBox);
+            listBox.SetBounds(15, 45, 320, 180);
             ${items
               .map((item) => `listBox.Items.Add("${item}");`)
               .join("\n          ")}
             listBox.SelectedIndex = 0;
             form.Controls.Add(listBox);
 
+            ApplyButtonStyle(okButton);
             okButton.Text = "确定";
             okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(120, 200, 75, 23);
+            okButton.SetBounds(160, 235, 85, 30);
             form.Controls.Add(okButton);
 
+            ApplySecondaryButtonStyle(cancelButton);
             cancelButton.Text = "取消";
             cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(210, 200, 75, 23);
+            cancelButton.SetBounds(250, 235, 85, 30);
             form.Controls.Add(cancelButton);
 
+            form.AcceptButton = okButton;
+            form.CancelButton = cancelButton;
+
             if (form.ShowDialog() == DialogResult.OK && listBox.SelectedItem != null) {
               Console.WriteLine(listBox.SelectedIndex.ToString() + "|||||" + listBox.SelectedItem.ToString());
             }
@@ -292,14 +420,18 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
+
         class Program {
+          ${commonStyles}
+
           static void Main() {
             Form form = new Form();
             Label label = new Label();
             FlowLayoutPanel buttonPanel = new FlowLayoutPanel();
 
+            ApplyModernStyle(form);
             form.Text = "${title}";
-            form.ClientSize = new Size(400, 150);
+            form.ClientSize = new Size(400, 160);
             form.FormBorderStyle = FormBorderStyle.FixedDialog;
             form.StartPosition = FormStartPosition.CenterScreen;
             form.MaximizeBox = false;
@@ -313,14 +445,16 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
                 : ""
             }
 
+            ApplyLabelStyle(label);
             label.Text = "${content}";
-            label.SetBounds(10, 10, 380, 40);
+            label.SetBounds(15, 15, 370, 60);
             label.AutoSize = true;
             form.Controls.Add(label);
 
-            buttonPanel.SetBounds(10, 60, 380, 40);
+            buttonPanel.SetBounds(15, 90, 370, 40);
             buttonPanel.FlowDirection = FlowDirection.RightToLeft;
             buttonPanel.WrapContents = false;
+            buttonPanel.BackColor = Color.White;
             form.Controls.Add(buttonPanel);
 
             ${buttons
@@ -330,7 +464,10 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
               button${index}.Text = "${btn}";
               button${index}.DialogResult = DialogResult.OK;
               button${index}.Tag = "${index}";
-              button${index}.SetBounds(0, 0, 80, 30);
+              ${
+                index === 0 ? "ApplyButtonStyle" : "ApplySecondaryButtonStyle"
+              }(button${index});
+              button${index}.Margin = new Padding(5, 0, 0, 0);
               buttonPanel.Controls.Add(button${index});`
               )
               .join("\n")}
@@ -370,7 +507,10 @@ const showSystemTextArea = async function (
         using System.Windows.Forms;
         using System.Drawing;
         using System.IO;
+
         class Program {
+          ${commonStyles}
+
           static void Main() {
             Form form = new Form();
             TextBox textBox = new TextBox();
@@ -378,8 +518,9 @@ const showSystemTextArea = async function (
             Button cancelButton = new Button();
             Label label = new Label();
 
+            ApplyModernStyle(form);
             form.Text = "${title}";
-            form.ClientSize = new Size(400, 300);
+            form.ClientSize = new Size(450, 320);
             form.FormBorderStyle = FormBorderStyle.FixedDialog;
             form.StartPosition = FormStartPosition.CenterScreen;
             form.MaximizeBox = false;
@@ -393,32 +534,34 @@ const showSystemTextArea = async function (
                 : ""
             }
 
+            ApplyLabelStyle(label);
             label.Text = "${placeholder}";
-            label.SetBounds(10, 10, 380, 20);
+            label.SetBounds(15, 15, 420, 20);
             form.Controls.Add(label);
 
+            ApplyTextBoxStyle(textBox);
             textBox.Multiline = true;
             textBox.ScrollBars = ScrollBars.Vertical;
-            textBox.SetBounds(10, 40, 380, 180);
+            textBox.SetBounds(15, 45, 420, 220);
             textBox.Text = "${defaultText}";
             textBox.AcceptsReturn = true;
             form.Controls.Add(textBox);
 
+            ApplyButtonStyle(okButton);
             okButton.Text = "确定";
             okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(220, 230, 75, 23);
+            okButton.SetBounds(260, 275, 85, 30);
             form.Controls.Add(okButton);
 
+            ApplySecondaryButtonStyle(cancelButton);
             cancelButton.Text = "取消";
             cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(310, 230, 75, 23);
+            cancelButton.SetBounds(350, 275, 85, 30);
             form.Controls.Add(cancelButton);
 
-            // 移除默认的 Enter 键行为
             form.AcceptButton = null;
             form.CancelButton = cancelButton;
 
-            // 添加快捷键处理
             form.KeyPreview = true;
             form.KeyDown += (sender, e) => {
               if (e.KeyCode == Keys.Enter && e.Control) {

From 90e8ec7ff114ac779e2a76654861d25b2cfedce6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 22:19:44 +0800
Subject: [PATCH 047/332] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BA=A7=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=B7=BB=E5=8A=A0Linux=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/systemDialog.js | 104 +++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index 929e31d7..dbd4afeb 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -1,7 +1,34 @@
 const fs = require("fs");
 const path = require("path");
+const { exec } = require("child_process");
 const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
 
+// 添加一个辅助函数来执行命令
+const execCommand = (cmd) => {
+  return new Promise((resolve, reject) => {
+    exec(cmd, (error, stdout, stderr) => {
+      if (error) {
+        reject(stderr);
+      } else {
+        resolve(stdout);
+      }
+    });
+  });
+};
+
+// 添加一个辅助函数来检查命令是否存在
+const checkZenity = async () => {
+  try {
+    await execCommand("which zenity");
+    return true;
+  } catch (error) {
+    window.utools.showNotification(
+      "请先安装 zenity：\nsudo apt install zenity 或\nsudo yum install zenity 或\nsudo pacman -S zenity"
+    );
+    return false;
+  }
+};
+
 // 定义通用样式
 const commonStyles = `
   static void ApplyModernStyle(Form form) {
@@ -121,6 +148,14 @@ const showSystemMessageBox = async function (content, title = "") {
           }
         }`;
     await this.runCsharp(csharpScript);
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return;
+    try {
+      const script = `zenity --info --title="${title}" --text="${content}" --width=400`;
+      await execCommand(script);
+    } catch (error) {
+      console.error("执行 zenity 命令失败:", error);
+    }
   }
 };
 
@@ -227,6 +262,21 @@ const showSystemInputBox = async function (placeholders, title = "") {
         }`;
     const result = await this.runCsharp(csharpScript);
     return result.trim() || null;
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return null;
+    const results = [];
+    for (let i = 0; i < placeholders.length; i++) {
+      try {
+        const script = `zenity --entry --title="${title}" --text="${placeholders[i]}" --width=400`;
+        const result = await execCommand(script);
+        if (!result) return null;
+        results.push(result.trim());
+      } catch (error) {
+        console.error("执行 zenity 命令失败:", error);
+        return null;
+      }
+    }
+    return results;
   }
 };
 
@@ -302,6 +352,15 @@ const showSystemConfirmBox = async function (content, title = "") {
         }`;
     const result = await this.runCsharp(csharpScript);
     return result.trim() === "True";
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return false;
+    try {
+      const script = `zenity --question --title="${title}" --text="${content}" --width=400`;
+      await execCommand(script);
+      return true;
+    } catch (error) {
+      return false;
+    }
   }
 };
 
@@ -391,6 +450,22 @@ const showSystemSelectList = async function (items, title = "") {
       return { id: parseInt(id), text };
     }
     return null;
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return null;
+    try {
+      const itemsList = items
+        .map((item, index) => `"${index}" "${item}"`)
+        .join(" ");
+      const script = `zenity --list --title="${title}" --text="请选择：" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
+      const result = await execCommand(script);
+      if (!result) return null;
+      const text = result.trim();
+      const id = items.findIndex((item) => item === text);
+      return { id, text };
+    } catch (error) {
+      console.error("执行 zenity 命令失败:", error);
+      return null;
+    }
   }
 };
 
@@ -490,6 +565,25 @@ const showSystemButtonBox = async function (buttons, content, title = "") {
       return { id: parseInt(id), text };
     }
     return null;
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return null;
+    try {
+      const script1 = `zenity --info --title="${title}" --text="${content}" --width=400`;
+      await execCommand(script1);
+
+      const itemsList = buttons
+        .map((btn, index) => `"${index}" "${btn}"`)
+        .join(" ");
+      const script2 = `zenity --list --title="${title}" --text="请选择：" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
+      const result = await execCommand(script2);
+      if (!result) return null;
+      const text = result.trim();
+      const id = buttons.findIndex((btn) => btn === text);
+      return { id, text };
+    } catch (error) {
+      console.error("执行 zenity 命令失败:", error);
+      return null;
+    }
   }
 };
 
@@ -578,6 +672,16 @@ const showSystemTextArea = async function (
         }`;
     const result = await this.runCsharp(csharpScript);
     return result.trim() || null;
+  } else if (window.utools.isLinux()) {
+    if (!(await checkZenity())) return null;
+    try {
+      const script = `zenity --text-info --title="${title}" --text="${placeholder}" --editable --width=450 --height=350 --filename=<(echo "${defaultText}")`;
+      const result = await execCommand(script);
+      return result ? result.trim() : null;
+    } catch (error) {
+      console.error("执行 zenity 命令失败:", error);
+      return null;
+    }
   }
 };
 

From 4053f7a9c254d1b034a778766a3409fd95565e3f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 12 Jan 2025 23:05:56 +0800
Subject: [PATCH 048/332] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=BA=A7?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/systemDialog.js             |  35 +++--
 src/js/composer/commands/uiCommands.js | 202 +++++++++++++++++++------
 2 files changed, 172 insertions(+), 65 deletions(-)

diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index dbd4afeb..c33f0818 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -470,24 +470,29 @@ const showSystemSelectList = async function (items, title = "") {
 };
 
 // 系统级按钮组弹窗
-const showSystemButtonBox = async function (buttons, content, title = "") {
+const showSystemButtonBox = async function (buttons, content = "", title = "") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
-    let iconParam = "note";
-    if (iconPath) {
-      const posixPath = iconPath.replace(/\\/g, "/");
-      iconParam = `alias POSIX file "${posixPath}"`;
-    }
-    const buttonList = buttons.map((btn) => `"${btn}"`).join(", ");
-    const script = `display dialog "${content}" with title "${title}" buttons {${buttonList}} default button "${buttons[0]}" with icon ${iconParam}`;
-    const result = await this.runAppleScript(script);
-    const match = result.match(/button returned:(.+)/);
-    if (match) {
-      const text = match[1];
-      const id = buttons.findIndex((btn) => btn === text);
-      return { id, text };
+    try {
+      let iconParam = "note";
+      if (iconPath) {
+        const posixPath = iconPath.replace(/\\/g, "/");
+        iconParam = `alias POSIX file "${posixPath}"`;
+      }
+      const buttonList = buttons.map((btn) => `"${btn}"`).join(", ");
+      const script = `display dialog "${content}" with title "${title}" buttons {${buttonList}} default button "${buttons[0]}" with icon ${iconParam}`;
+      const result = await this.runAppleScript(script);
+      const match = result.match(/button returned:(.+)/);
+      if (match) {
+        const text = match[1];
+        const id = buttons.findIndex((btn) => btn === text);
+        return { id, text };
+      }
+      return null;
+    } catch (error) {
+      window.utools.showNotification(error);
+      throw error;
     }
-    return null;
   } else if (window.utools.isWindows()) {
     const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
     const csharpScript = `
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 9920f4a0..068609c5 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -79,7 +79,6 @@ const DIALOG_CONFIG = {
         extensions: {
           label: "扩展名",
           noIcon: true,
-          width: 7,
           disableToggleType: true,
           options: {
             items: ["*", "jpg", "png", "gif", "txt", "json", "exe"],
@@ -126,6 +125,24 @@ export const uiCommands = {
           ],
           defaultRowValue: newVarInputVal("str"),
         },
+        {
+          label: "标题",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str", "请选择"),
+          width: 12,
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcommand.showButtonBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+        },
+        {
+          value: "quickcommand.showSystemButtonBox",
+          icon: "report",
+          label: "系统弹窗",
+        },
       ],
     },
     {
@@ -134,42 +151,79 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "[inputValue1]",
       saveOutput: true,
-      width: 12,
-      config: [
+      subCommands: [
         {
-          label: "输入框",
-          component: "ArrayEditor",
-          width: 12,
-          columns: {
-            label: {
-              label: "标签",
-            },
-            value: {
-              label: "默认值",
-            },
-          },
-          defaultValue: [
+          value: "quickcommand.showInputBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+          config: [
             {
-              label: newVarInputVal("str", "请输入"),
-              value: newVarInputVal("str"),
+              label: "输入框",
+              component: "ArrayEditor",
+              width: 12,
+              columns: {
+                label: {
+                  label: "标签",
+                },
+                value: {
+                  label: "默认值",
+                },
+              },
+              defaultValue: [
+                {
+                  label: newVarInputVal("str", "请输入"),
+                  value: newVarInputVal("str"),
+                },
+              ],
             },
           ],
         },
         {
-          label: "标题",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str"),
-          width: 12,
+          value: "quickcommand.showSystemInputBox",
+          icon: "report",
+          label: "系统弹窗",
+          config: [
+            {
+              label: "提示信息",
+              component: "ArrayEditor",
+              width: 12,
+            },
+            {
+              label: "标题",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str", "请输入"),
+              width: 12,
+            },
+          ],
         },
       ],
     },
     {
       value: "quickcommand.showSelectList",
-      label: "选择列表",
+      label: "uTools选择列表",
       desc: "显示一个支持搜索的选项列表，可以动态更新选项",
       component: "SelectListEditor",
       isAsync: true,
     },
+    {
+      value: "quickcommand.showSystemSelectList",
+      label: "系统选择列表",
+      desc: "选择列表（系统）",
+      isAsync: true,
+      config: [
+        {
+          label: "选项",
+          component: "ArrayEditor",
+          width: 12,
+        },
+        {
+          label: "标题",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str", "请选择"),
+          width: 12,
+        },
+      ],
+    },
     {
       value: "quickcommand.showTextArea",
       label: "文本框",
@@ -191,6 +245,18 @@ export const uiCommands = {
           width: 6,
         },
       ],
+      subCommands: [
+        {
+          value: "quickcommand.showTextArea",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+        },
+        {
+          value: "quickcommand.showSystemTextArea",
+          icon: "report",
+          label: "系统弹窗(Mac不支持)",
+        },
+      ],
     },
     {
       value: "quickcommand.showMessageBox",
@@ -205,26 +271,48 @@ export const uiCommands = {
           defaultValue: newVarInputVal("str", "这是一条提示消息"),
           width: 12,
         },
+      ],
+      subCommands: [
         {
-          label: "图标类型",
-          component: "q-select",
-          defaultValue: "success",
-          icon: "lightbulb",
-          width: 6,
-          options: [
-            { label: "成功", value: "success" },
-            { label: "错误", value: "error" },
-            { label: "警告", value: "warning" },
-            { label: "信息", value: "info" },
+          value: "quickcommand.showMessageBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+          config: [
+            {
+              label: "图标类型",
+              component: "q-select",
+              defaultValue: "success",
+              icon: "lightbulb",
+              width: 6,
+              options: [
+                { label: "成功", value: "success" },
+                { label: "错误", value: "error" },
+                { label: "警告", value: "warning" },
+                { label: "信息", value: "info" },
+              ],
+            },
+            {
+              label: "显示时间(ms)",
+              component: "NumberInput",
+              min: 0,
+              step: 100,
+              width: 6,
+              placeholder: "0为手动关闭，留空按文本长度调整",
+            },
           ],
         },
         {
-          label: "显示时间(ms)",
-          component: "NumberInput",
-          min: 0,
-          step: 100,
-          width: 6,
-          placeholder: "0为手动关闭，留空按文本长度调整",
+          value: "quickcommand.showSystemMessageBox",
+          icon: "report",
+          label: "系统弹窗",
+          config: [
+            {
+              label: "标题",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str", "提示"),
+              width: 12,
+            },
+          ],
         },
       ],
     },
@@ -246,22 +334,36 @@ export const uiCommands = {
           label: "标题",
           component: "VariableInput",
           defaultValue: newVarInputVal("str", "提示"),
-          width: 7,
+          width: 12,
         },
+      ],
+      subCommands: [
         {
-          label: "支持HTML",
-          component: "q-toggle",
-          defaultValue: false,
-          width: 2,
+          value: "quickcommand.showConfirmBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+          config: [
+            {
+              label: "支持HTML",
+              component: "CheckButton",
+              defaultValue: false,
+              width: 6,
+            },
+            {
+              label: "宽度",
+              component: "NumberInput",
+              min: 0,
+              step: 100,
+              defaultValue: 450,
+              width: 6,
+              placeholder: "对话框宽度",
+            },
+          ],
         },
         {
-          label: "宽度",
-          component: "NumberInput",
-          min: 0,
-          step: 100,
-          defaultValue: 450,
-          width: 3,
-          placeholder: "对话框宽度",
+          value: "quickcommand.showSystemConfirmBox",
+          icon: "report",
+          label: "系统弹窗",
         },
       ],
     },

From 0a8c24374a9cc467647921b711775aff0ae25dae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 13 Jan 2025 01:15:42 +0800
Subject: [PATCH 049/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Equickcommand.runCode?=
 =?UTF-8?q?=EF=BC=8Cquickcommand.runInTerminal=E6=94=AF=E6=8C=81warp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/createTerminalCommand.js           | 150 ++++++++++++++++++
 plugin/lib/getCommandToLaunchTerminal.js      |  44 -----
 plugin/lib/quickcommand.js                    |   8 +-
 plugin/preload.js                             | 138 +++++++++-------
 src/components/CommandRunResult.vue           |   2 +-
 .../quickcommandUI/QuickCommand.vue           |  19 +++
 src/js/composer/commands/index.js             |   3 +-
 src/js/composer/commands/scriptCommands.js    |  53 +++++++
 .../monaco/types/quickcommand.api.d.ts        |  52 +++++-
 9 files changed, 365 insertions(+), 104 deletions(-)
 create mode 100644 plugin/lib/createTerminalCommand.js
 delete mode 100644 plugin/lib/getCommandToLaunchTerminal.js
 create mode 100644 src/js/composer/commands/scriptCommands.js

diff --git a/plugin/lib/createTerminalCommand.js b/plugin/lib/createTerminalCommand.js
new file mode 100644
index 00000000..fd480b6c
--- /dev/null
+++ b/plugin/lib/createTerminalCommand.js
@@ -0,0 +1,150 @@
+const fs = require("fs");
+const path = require("path");
+
+// 终端配置
+const DEFAULT_TERMINALS = {
+  windows: ["wt", "cmd"],
+  macos: ["warp", "iterm", "terminal"],
+};
+
+// Windows 终端命令生成器
+const getWindowsTerminalCommand = (cmdline, options = {}) => {
+  const { dir, terminal = "wt" } = options;
+  const appPath = path.join(
+    window.utools.getPath("home"),
+    "/AppData/Local/Microsoft/WindowsApps/"
+  );
+
+  const terminalCommands = {
+    wt: () => {
+      if (
+        fs.existsSync(appPath) &&
+        fs.readdirSync(appPath).includes("wt.exe")
+      ) {
+        const escapedCmd = cmdline.replace(/"/g, `\\"`);
+        const cd = dir ? `-d "${dir.replace(/\\/g, "/")}"` : "";
+        return `${appPath}wt.exe ${cd} cmd /k "${escapedCmd}"`;
+      }
+      return null;
+    },
+    cmd: () => {
+      const escapedCmd = cmdline.replace(/"/g, `^"`);
+      const cd = dir ? `cd /d "${dir.replace(/\\/g, "/")}" &&` : "";
+      return `${cd} start "" cmd /k "${escapedCmd}"`;
+    },
+  };
+
+  // 按优先级尝试不同终端
+  const terminalPriority =
+    terminal === "default"
+      ? DEFAULT_TERMINALS.windows
+      : [terminal, ...DEFAULT_TERMINALS.windows];
+
+  for (const term of terminalPriority) {
+    const command = terminalCommands[term]?.();
+    if (command) return command;
+  }
+
+  // 如果都失败了，返回默认的 cmd 命令
+  return terminalCommands.cmd();
+};
+
+// macOS 终端命令生成器
+const getMacTerminalCommand = (cmdline, options = {}) => {
+  const { dir, terminal = "warp" } = options;
+
+  const terminalCommands = {
+    warp: () => {
+      if (fs.existsSync("/Applications/Warp.app")) {
+        const workingDir = dir || process.cwd();
+        // 创建临时的 launch configuration
+        const configName = `temp_${Date.now()}`;
+        const configPath = path.join(
+          window.utools.getPath("home"),
+          ".warp/launch_configurations",
+          `${configName}.yml`
+        );
+
+        // 确保目录存在
+        const configDir = path.dirname(configPath);
+        if (!fs.existsSync(configDir)) {
+          fs.mkdirSync(configDir, { recursive: true });
+        }
+
+        // 创建配置文件，对于 Warp，命令不需要转义，因为是通过 YAML 配置传递
+        const config = `---
+name: ${configName}
+windows:
+  - tabs:
+      - layout:
+          cwd: "${workingDir}"
+          commands:
+            - exec: ${cmdline}`;
+
+        fs.writeFileSync(configPath, config);
+
+        // 使用配置文件启动 Warp
+        return `open "warp://launch/${configName}" && sleep 0.5 && rm "${configPath}"`;
+      }
+      return null;
+    },
+    iterm: () => {
+      const escapedCmd = cmdline.replace(/"/g, `\\"`);
+      const cd = dir ? `cd ${dir.replace(/ /g, "\\\\ ")} &&` : "";
+      if (fs.existsSync("/Applications/iTerm.app")) {
+        return `osascript -e 'tell application "iTerm"
+          if application "iTerm" is running then
+            create window with default profile
+          end if
+          tell current session of first window to write text "clear && ${cd} ${escapedCmd}"
+          activate
+        end tell'`;
+      }
+      return null;
+    },
+    terminal: () => {
+      const escapedCmd = cmdline.replace(/"/g, `\\"`);
+      const cd = dir ? `cd ${dir.replace(/ /g, "\\\\ ")} &&` : "";
+      return `osascript -e 'tell application "Terminal"
+        if application "Terminal" is running then
+          do script "clear && ${cd} ${escapedCmd}"
+        else
+          do script "clear && ${cd} ${escapedCmd}" in window 1
+        end if
+        activate
+      end tell'`;
+    },
+  };
+
+  // 按优先级尝试不同终端
+  const terminalPriority =
+    terminal === "default"
+      ? DEFAULT_TERMINALS.macos
+      : [terminal, ...DEFAULT_TERMINALS.macos];
+
+  for (const term of terminalPriority) {
+    const command = terminalCommands[term]?.();
+    if (command) return command;
+  }
+
+  // 如果都失败了，返回默认终端命令
+  return terminalCommands.terminal();
+};
+
+// 主函数
+const createTerminalCommand = (cmdline, options = {}) => {
+  const { windows = "default", macos = "default" } = options;
+
+  if (window.utools.isWindows()) {
+    return getWindowsTerminalCommand(cmdline, {
+      ...options,
+      terminal: windows,
+    });
+  } else if (window.utools.isMacOs()) {
+    return getMacTerminalCommand(cmdline, { ...options, terminal: macos });
+  }
+
+  throw new Error("Unsupported operating system");
+};
+
+module.exports = createTerminalCommand;
diff --git a/plugin/lib/getCommandToLaunchTerminal.js b/plugin/lib/getCommandToLaunchTerminal.js
deleted file mode 100644
index 2aca1862..00000000
--- a/plugin/lib/getCommandToLaunchTerminal.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const getCommandToLaunchTerminal = (cmdline, dir) => {
-  let cd, command;
-  if (window.utools.isWindows()) {
-    let appPath = path.join(
-      window.utools.getPath("home"),
-      "/AppData/Local/Microsoft/WindowsApps/"
-    );
-    // 直接 existsSync wt.exe 无效
-    if (fs.existsSync(appPath) && fs.readdirSync(appPath).includes("wt.exe")) {
-      cmdline = cmdline.replace(/"/g, `\\"`);
-      cd = dir ? `-d "${dir.replace(/\\/g, "/")}"` : "";
-      command = `${appPath}wt.exe ${cd} cmd /k "${cmdline}"`;
-    } else {
-      cmdline = cmdline.replace(/"/g, `^"`);
-      cd = dir ? `cd /d "${dir.replace(/\\/g, "/")}" &&` : "";
-      command = `${cd} start "" cmd /k "${cmdline}"`;
-    }
-  } else if (window.utools.isMacOs()) {
-    cmdline = cmdline.replace(/"/g, `\\"`);
-    cd = dir ? `cd ${dir.replace(/ /g, "\\\\ ")} &&` : "";
-    command = fs.existsSync("/Applications/iTerm.app")
-      ? `osascript -e 'tell application "iTerm"
-                if application "iTerm" is running then
-                  create window with default profile
-                end if
-                tell current session of first window to write text "clear && ${cd} ${cmdline}"
-                activate
-              end tell'`
-      : `osascript -e 'tell application "Terminal"
-                if application "Terminal" is running then
-                  do script "clear && ${cd} ${cmdline}"
-                else
-                  do script "clear && ${cd} ${cmdline}" in window 1
-                end if
-                activate
-              end tell'`;
-  }
-  return command;
-};
-
-module.exports = getCommandToLaunchTerminal;
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index d7a4aebf..a73034a0 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -10,7 +10,7 @@ const systemDialog = require("./systemDialog");
 
 const { getQuickcommandTempFile } = require("./getQuickcommandFile");
 
-const getCommandToLaunchTerminal = require("./getCommandToLaunchTerminal");
+const createTerminalCommand = require("./createTerminalCommand");
 
 const ctlKey = window.utools.isMacOs() ? "command" : "control";
 
@@ -302,8 +302,10 @@ window.runPythonCommand = (py) => {
 
 if (process.platform !== "linux") {
   // 在终端中执行
-  quickcommand.runInTerminal = function (cmdline, dir) {
-    let command = getCommandToLaunchTerminal(cmdline, dir);
+  quickcommand.runInTerminal = function (cmdline, options) {
+    // 兼容老版本接口, 老版本第二个参数是dir
+    if (typeof options === "string") options = { dir: options };
+    let command = createTerminalCommand(cmdline, options);
     child_process.exec(command);
   };
   // 系统级弹窗
diff --git a/plugin/preload.js b/plugin/preload.js
index 62309b30..775ddc10 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -18,7 +18,7 @@ const md5 = (input) => {
 
 window.lodashM = require("./lib/lodashMini");
 
-const getCommandToLaunchTerminal = require("./lib/getCommandToLaunchTerminal");
+const createTerminalCommand = require("./lib/createTerminalCommand");
 const shortCodes = require("./lib/shortCodes");
 const { pluginInfo, getUtoolsPlugins } = require("./lib/getUtoolsPlugins");
 const {
@@ -42,7 +42,8 @@ window.getuToolsLite = require("./lib/utoolsLite");
 window.quickcommand = require("./lib/quickcommand");
 window.quickcomposer = require("./lib/quickcomposer");
 window.showUb = require("./lib/showDocs");
-window.getQuickcommandTempFile = require("./lib/getQuickcommandFile").getQuickcommandTempFile;
+window.getQuickcommandTempFile =
+  require("./lib/getQuickcommandFile").getQuickcommandTempFile;
 
 window.getSharedQcById = async (id) => {
   const url = "https://qc.qaz.ink/home/quick/script/getScript";
@@ -211,66 +212,95 @@ window.runCodeInSandbox = (code, callback, addVars = {}) => {
   }
 };
 
-window.runCodeFile = (cmd, option, terminal, callback, realTime = true) => {
-  let { bin, argv, ext, charset, scptarg, envPath, alias } = option;
-  let script = getQuickcommandTempFile(ext, "quickcommandTempScript");
-  // 批处理和 powershell 默认编码为 GBK, 解决批处理的换行问题
-  if (charset.scriptCode)
-    cmd = iconv.encode(cmd.replace(/\n/g, "\r\n"), charset.scriptCode);
-  fs.writeFileSync(script, cmd);
-  // var argvs = [script]
-  // if (argv) {
-  //     argvs = argv.split(' ')
-  //     argvs.push(script);
-  // }
-  let child, cmdline;
-  if (bin.slice(-7) == "csc.exe") {
-    cmdline = `${bin} ${argv} /out:"${
-      script.slice(0, -2) + "exe"
-    }" "${script}" && "${script.slice(0, -2) + "exe"}" ${scptarg}`;
-  } else if (bin == "gcc") {
-    var suffix = utools.isWindows() ? ".exe" : "";
-    cmdline = `${bin} ${argv} "${script.slice(0, -2)}" "${script}" && "${
-      script.slice(0, -2) + suffix
-    }" ${scptarg}`;
-  } else if (utools.isWindows() && bin == "bash") {
-    cmdline = `${bin} ${argv} "${script
-      .replace(/\\/g, "/")
-      .replace(/C:/i, "/mnt/c")}" ${scptarg}`;
-  } else {
-    cmdline = `${bin} ${argv} "${script}" ${scptarg}`;
+// 构建命令行字符串的工具函数
+const buildCommandLine = (bin, argv, script, scptarg) => {
+  if (bin.slice(-7) === "csc.exe") {
+    const outFile = script.slice(0, -2) + "exe";
+    return `${bin} ${argv} /out:"${outFile}" "${script}" && "${outFile}" ${scptarg}`;
   }
-  let processEnv = window.lodashM.cloneDeep(process.env);
-  if (envPath) processEnv.PATH = envPath;
-  if (alias) cmdline = alias + "\n" + cmdline;
-  // 在终端中输出
-  if (terminal) cmdline = getCommandToLaunchTerminal(cmdline);
-  child = child_process.spawn(cmdline, {
-    encoding: "buffer",
-    shell: true,
-    env: processEnv,
-  });
-  let chunks = [],
-    err_chunks = [];
-  console.log("Running: " + cmdline);
+
+  if (bin === "gcc") {
+    const suffix = utools.isWindows() ? ".exe" : "";
+    const outFile = script.slice(0, -2) + suffix;
+    return `${bin} ${argv} "${script.slice(
+      0,
+      -2
+    )}" "${script}" && "${outFile}" ${scptarg}`;
+  }
+
+  if (utools.isWindows() && bin === "bash") {
+    const wslPath = script.replace(/\\/g, "/").replace(/C:/i, "/mnt/c");
+    return `${bin} ${argv} "${wslPath}" ${scptarg}`;
+  }
+
+  return `${bin} ${argv} "${script}" ${scptarg}`;
+};
+
+// 处理进程输出的工具函数
+const handleProcessOutput = (child, charset, callback, realTime) => {
+  const chunks = [];
+  const errChunks = [];
+
   child.stdout.on("data", (chunk) => {
-    if (charset.outputCode) chunk = iconv.decode(chunk, charset.outputCode);
-    realTime ? callback(chunk.toString(), null) : chunks.push(chunk);
+    const decodedChunk = charset.outputCode
+      ? iconv.decode(chunk, charset.outputCode)
+      : chunk;
+    realTime
+      ? callback(decodedChunk.toString(), null)
+      : chunks.push(decodedChunk);
   });
-  child.stderr.on("data", (err_chunk) => {
-    if (charset.outputCode)
-      err_chunk = iconv.decode(err_chunk, charset.outputCode);
+
+  child.stderr.on("data", (errChunk) => {
+    const decodedChunk = charset.outputCode
+      ? iconv.decode(errChunk, charset.outputCode)
+      : errChunk;
     realTime
-      ? callback(null, err_chunk.toString())
-      : err_chunks.push(err_chunk);
+      ? callback(null, decodedChunk.toString())
+      : errChunks.push(decodedChunk);
   });
+
   if (!realTime) {
-    child.on("close", (code) => {
-      let stdout = chunks.join("");
-      let stderr = err_chunks.join("");
-      callback(stdout, stderr);
+    child.on("close", () => {
+      callback(chunks.join(""), errChunks.join(""));
     });
   }
+};
+
+window.runCodeFile = (
+  cmd,
+  option,
+  terminalOptions,
+  callback,
+  realTime = true
+) => {
+  const { bin, argv, ext, charset, scptarg, envPath, alias } = option;
+  const script = getQuickcommandTempFile(ext, "quickcommandTempScript");
+
+  // 处理编码和换行
+  const processedCmd = charset.scriptCode
+    ? iconv.encode(cmd.replace(/\n/g, "\r\n"), charset.scriptCode)
+    : cmd;
+  fs.writeFileSync(script, processedCmd);
+  // 构建命令行
+  let cmdline = buildCommandLine(bin, argv, script, scptarg);
+
+  // 处理环境变量
+  const processEnv = window.lodashM.cloneDeep(process.env);
+  if (envPath) processEnv.PATH = envPath;
+  if (alias) cmdline = `${alias}\n${cmdline}`;
+  if (!!terminalOptions) {
+    cmdline = createTerminalCommand(cmdline, terminalOptions);
+  }
+
+  // 创建子进程
+  const child = child_process.spawn(cmdline, {
+    encoding: "buffer",
+    shell: true,
+    env: processEnv,
+  });
+
+  console.log("Running: " + cmdline);
+  handleProcessOutput(child, charset, callback, realTime);
   return child;
 };
 
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 1d16c83e..581d5d9c 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -159,7 +159,7 @@ export default {
           this.childProcess = window.runCodeFile(
             currentCommand.cmd,
             this.getCommandOpt(currentCommand),
-            currentCommand.output === "terminal",
+            currentCommand.output === "terminal" ? {} : false,
             (stdout, stderr) => this.handleResult(stdout, stderr, resultOpts)
           );
           this.listenStopSign();
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index e505778c..c575c5cc 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -36,6 +36,7 @@ import ButtonBox from "components/quickcommandUI/ButtonBox";
 import ConfirmBox from "components/quickcommandUI/ConfirmBox";
 import TextArea from "components/quickcommandUI/TextArea";
 import SelectList from "components/quickcommandUI/SelectList";
+import programs from "js/options/programs";
 
 export default {
   components: {
@@ -256,8 +257,26 @@ export default {
         });
       },
     };
+    // 将quickcommandUI添加到quickcommand
     Object.assign(window.quickcommand, quickcommandUI);
+
+    // 获取用户数据
     window.quickcommand.userData = this.$root.utools.userData;
+
+    // 添加runCode方法，不在preload中加是因为programs写在了src中-_-
+    quickcommand.runCode = (code, program, runInTerminal = false) => {
+      return new Promise((reslove, reject) => {
+        window.runCodeFile(
+          code,
+          { ...programs[program], charset: {}, scptarg: "" },
+          runInTerminal,
+          (result, err) => (err ? reject(err) : reslove(result))
+        );
+        false;
+      });
+    };
+
+    // 冻结quickcommand
     Object.freeze(quickcommand);
   },
   methods: {
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 3bf3d0a4..05fe3206 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -17,7 +17,7 @@ import { imageCommands } from "./imageCommands";
 import { windowsCommands } from "./windowsCommands";
 import { statusCommands } from "./statusCommands";
 import { macosCommands } from "./macosCommands";
-
+import { scriptCommands } from "./scriptCommands";
 let commands = [
   fileCommands,
   networkCommands,
@@ -30,6 +30,7 @@ let commands = [
   dataCommands,
   codingCommands,
   controlCommands,
+  scriptCommands,
   uiCommands,
   simulateCommands,
   mathCommands,
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
new file mode 100644
index 00000000..1b5ebe94
--- /dev/null
+++ b/src/js/composer/commands/scriptCommands.js
@@ -0,0 +1,53 @@
+export const scriptCommands = {
+  label: "编程相关",
+  icon: "integration_instructions",
+  commands: [
+    {
+      value: "",
+      label: "赋值",
+      icon: "script",
+      outputVariable: "value",
+      saveOutput: true,
+      config: [
+        {
+          label: "值或表达式",
+          component: "VariableInput",
+          width: 12,
+        },
+      ],
+    },
+    {
+      value: "(function(code){new Function(code)()})",
+      label: "注入JS脚本",
+      icon: "script",
+      config: [
+        {
+          label: "JS脚本",
+          component: "CodeEditor",
+          width: 12,
+        },
+      ],
+    },
+    {
+      value: "quickcommand.runAppleScript",
+      label: "执行 AppleScript",
+      icon: "script",
+      outputVariable: "result",
+      saveOutput: true,
+      config: [
+        {
+          label: "脚本",
+          component: "CodeEditor",
+          width: 12,
+        },
+      ],
+    },
+    {
+      value: "quickcommand.runCsharp",
+      label: "执行C#脚本",
+      icon: "script",
+      outputVariable: "result",
+      saveOutput: true,
+    },
+  ],
+};
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index a188d7d1..97453fe7 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -378,11 +378,23 @@ interface quickcommandApi {
    * 在终端运行，不支持 Linux
    *
    * @param command 要在终端运行的命令
+   * @param options 终端运行参数
+   * @param options.dir 运行目录
+   * @param options.windows 终端类型，默认wt
+   * @param options.macos 终端类型，默认warp
+   *
    * ```js
    * quickcommand.runInTerminal(`whoami`)
    * ```
    */
-  runInTerminal(command: string);
+  runInTerminal(
+    command: string,
+    options?: {
+      dir?: string;
+      windows?: "wt" | "cmd";
+      macos?: "warp" | "iterm" | "terminal";
+    }
+  );
 
   /**
    * 对应 utools.onPluginEnter 的 `code` `type` 和 `payload`
@@ -597,6 +609,44 @@ interface quickcommandApi {
     defaultText?: string,
     title?: string
   ): Promise<string | null>;
+
+  /**
+   * 运行代码
+   * @param code 代码
+   * @param program 编程语言
+   * @param runInTerminal 终端运行参数，不传则不在终端运行
+   * @param runInTerminal.dir 运行目录
+   * @param runInTerminal.windows windows使用的终端，默认wt
+   * @param runInTerminal.macos macos使用的终端，默认warp
+   *
+   * 支持的编程语言：
+   * shell, applescript, cmd, python, powershell, javascript, ruby, php, lua, perl, csharp, c
+   *
+   * ```js
+   * quickcommand.runCode("print('Hello, World!');", "python");
+   * ```
+   */
+  runCode(
+    code: string,
+    program:
+      | "shell"
+      | "applescript"
+      | "cmd"
+      | "python"
+      | "powershell"
+      | "javascript"
+      | "ruby"
+      | "php"
+      | "lua"
+      | "perl"
+      | "csharp"
+      | "c",
+    runInTerminal?: {
+      dir?: string;
+      windows?: "wt" | "cmd";
+      macos?: "warp" | "iterm" | "terminal";
+    }
+  ): Promise<string>;
 }
 
 declare var quickcommand: quickcommandApi;

From 877d13958ade99ab838cc878d2d91c82c434374f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 13 Jan 2025 18:04:29 +0800
Subject: [PATCH 050/332] =?UTF-8?q?=E4=BC=98=E5=8C=96windows=E4=B8=8B?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=BC=B9=E7=AA=97=E5=9C=A8=E9=AB=98=E5=88=86?=
 =?UTF-8?q?=E5=B1=8F=E4=B8=8B=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E5=A4=84bug=EF=BC=8C=E5=8E=BB=E6=8E=89showsy?=
 =?UTF-8?q?stemselectlist=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4runS?=
 =?UTF-8?q?harp=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/dialog.cs                   | 745 ++++++++++++++++++
 plugin/lib/getQuickcommandFile.js             |   8 +-
 plugin/lib/quickcommand.js                    |  92 +--
 plugin/lib/systemDialog.js                    | 646 +++------------
 src/js/composer/commands/uiCommands.js        |  63 +-
 .../monaco/types/quickcommand.api.d.ts        |  28 +-
 6 files changed, 951 insertions(+), 631 deletions(-)
 create mode 100644 plugin/lib/csharp/dialog.cs

diff --git a/plugin/lib/csharp/dialog.cs b/plugin/lib/csharp/dialog.cs
new file mode 100644
index 00000000..96f41406
--- /dev/null
+++ b/plugin/lib/csharp/dialog.cs
@@ -0,0 +1,745 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.IO;
+using System.Drawing.Drawing2D;
+
+public class DialogGenerator
+{
+    [DllImport("user32.dll")]
+    private static extern bool SetProcessDPIAware();
+
+    private const int DEFAULT_WIDTH = 900;
+    private const int DEFAULT_HEIGHT = 350;
+    private const int PADDING = 30;
+    private const int BUTTON_HEIGHT = 50;
+    private const int BUTTON_WIDTH = 140;
+    private const int INPUT_HEIGHT = 40;
+    private const int SPACING = 20;
+    private const int EM_SETRECT = 0xB3;
+
+    private static void InitializeDPIAwareness()
+    {
+        if (Environment.OSVersion.Version.Major >= 6)
+        {
+            SetProcessDPIAware();
+        }
+    }
+
+    public static DialogResult Show(string[] args)
+    {
+        string type = GetArgumentValue(args, "-type");
+        string title = GetArgumentValue(args, "-title");
+        string content = GetArgumentValue(args, "-content");
+        string iconPath = GetArgumentValue(args, "-iconpath");
+
+        if (string.IsNullOrEmpty(type) || string.IsNullOrEmpty(title))
+        {
+            MessageBox.Show("必须指定 -type 和 -title 参数");
+            return DialogResult.None;
+        }
+
+        Form dialog = CreateBaseDialog(title);
+
+        // 设置图标
+        if (!string.IsNullOrEmpty(iconPath) && File.Exists(iconPath))
+        {
+            try
+            {
+                using (Bitmap bmp = new Bitmap(iconPath))
+                {
+                    dialog.Icon = Icon.FromHandle(bmp.GetHicon());
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("加载图标失败: " + ex.Message);
+            }
+        }
+
+        switch (type.ToLower())
+        {
+            case "message":
+                CreateMessageDialog(dialog, content);
+                break;
+            case "input":
+                CreateInputDialog(dialog, content);
+                break;
+            case "confirm":
+                CreateConfirmDialog(dialog, content);
+                break;
+            case "buttons":
+                CreateButtonsDialog(dialog, content);
+                break;
+            case "textarea":
+                CreateTextAreaDialog(dialog, content);
+                break;
+            default:
+                MessageBox.Show("不支持的对话框类型");
+                return DialogResult.None;
+        }
+
+        return dialog.ShowDialog();
+    }
+
+    private static Form CreateBaseDialog(string title)
+    {
+        Form dialog = new Form();
+        dialog.Text = title;
+        dialog.Width = DEFAULT_WIDTH;
+        dialog.Height = DEFAULT_HEIGHT;
+        dialog.StartPosition = FormStartPosition.CenterScreen;
+
+        // 使用 Microsoft YaHei UI 字体
+        dialog.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
+
+        // 设置DPI感知
+        dialog.AutoScaleMode = AutoScaleMode.Dpi;
+
+        // 设置文本渲染质量
+        dialog.Paint += delegate(object sender, PaintEventArgs e) {
+            e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+        };
+
+        return dialog;
+    }
+
+    private static void CreateMessageDialog(Form dialog, string content)
+    {
+        const int MAX_CONTENT_HEIGHT = 500;
+        const int MIN_CONTENT_HEIGHT = 200;
+        int iconSize = 96;
+
+        // 先计算所需的内容高度
+        int requiredHeight = Math.Max(
+            TextRenderer.MeasureText(content,
+                new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+                new Size(dialog.ClientSize.Width - PADDING * 3 - iconSize, int.MaxValue),
+                TextFormatFlags.WordBreak | TextFormatFlags.TextBoxControl
+            ).Height + 20,
+            MIN_CONTENT_HEIGHT
+        );
+
+        int contentHeight = Math.Min(requiredHeight, MAX_CONTENT_HEIGHT);
+        dialog.Height = contentHeight + PADDING * 3 + BUTTON_HEIGHT;
+
+        // 创建内容面板
+        Panel contentPanel = new Panel
+        {
+            AutoScroll = false,
+            Width = dialog.ClientSize.Width - PADDING * 2,
+            Height = dialog.ClientSize.Height - PADDING * 3 - BUTTON_HEIGHT,
+            Location = new Point(PADDING, PADDING),
+            BackColor = SystemColors.Control
+        };
+
+        dialog.Controls.Add(contentPanel);
+
+        // 添加图标
+        PictureBox iconBox = new PictureBox
+        {
+            Width = iconSize,
+            Height = iconSize,
+            Location = new Point(0, 0),
+            SizeMode = PictureBoxSizeMode.Zoom,
+            BackColor = Color.Transparent
+        };
+
+        try
+        {
+            Icon sysIcon = SystemIcons.Information;
+            Bitmap bmp = new Bitmap(iconSize, iconSize);
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                g.DrawIcon(sysIcon, new Rectangle(0, 0, iconSize, iconSize));
+            }
+            iconBox.Image = bmp;
+        }
+        catch
+        {
+            iconBox.Visible = false;
+        }
+        contentPanel.Controls.Add(iconBox);
+
+        // 使用普通TextBox替代RichTextBox
+        TextBox messageBox = new TextBox
+        {
+            Text = content,
+            ReadOnly = true,
+            Multiline = true,
+            BorderStyle = BorderStyle.None,
+            BackColor = SystemColors.Control,
+            Location = new Point(iconSize + PADDING, 0),
+            Width = contentPanel.ClientSize.Width - iconSize - PADDING,
+            Height = contentPanel.Height,
+            Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+            WordWrap = true,
+            TabStop = false,
+            Cursor = Cursors.IBeam,
+            ScrollBars = requiredHeight > MAX_CONTENT_HEIGHT ? ScrollBars.Vertical : ScrollBars.None
+        };
+
+        // 隐藏光标但允许选择
+        messageBox.GotFocus += delegate(object sender, EventArgs e) {
+            if (messageBox.SelectionLength == 0)
+            {
+                NativeMethods.HideCaret(messageBox.Handle);
+            }
+        };
+
+        contentPanel.Controls.Add(messageBox);
+
+        // 添加确定按钮
+        Button okButton = CreateStyledButton("确定", DialogResult.OK);
+        okButton.Location = new Point(
+            dialog.ClientSize.Width - BUTTON_WIDTH - PADDING,
+            dialog.ClientSize.Height - PADDING - BUTTON_HEIGHT
+        );
+        dialog.Controls.Add(okButton);
+
+        // 确保按钮始终在最上层
+        okButton.BringToFront();
+    }
+
+    private static void CreateInputDialog(Form dialog, string content)
+    {
+        const int MAX_CONTENT_HEIGHT = 500;
+        const int MIN_CONTENT_HEIGHT = 200;
+
+        string[] prompts = content.Split(new[] { "|||||" }, StringSplitOptions.None);
+        var textBoxes = new System.Collections.Generic.List<TextBox>();
+
+        // 创建一个临时窗体和面板来准确计算高度
+        using (Form tempForm = new Form())
+        {
+            tempForm.Width = dialog.Width;
+            Panel tempPanel = new Panel
+            {
+                Width = dialog.ClientSize.Width - PADDING * 2,
+                AutoSize = true
+            };
+            tempForm.Controls.Add(tempPanel);
+
+            // 添加临时控件来计算实际高度
+            int currentY = (int)(PADDING * 1.5);  // 起始位置
+            foreach (string prompt in prompts)
+            {
+                Label label = new Label
+                {
+                    Text = prompt,
+                    AutoSize = true,
+                    Location = new Point(PADDING, currentY),
+                    Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular)
+                };
+                tempPanel.Controls.Add(label);
+
+                TextBox textBox = new TextBox
+                {
+                    Width = tempPanel.Width - PADDING * 2,
+                    Height = INPUT_HEIGHT,
+                    Location = new Point(PADDING, currentY + label.Height + 5),
+                    BorderStyle = BorderStyle.FixedSingle
+                };
+                tempPanel.Controls.Add(textBox);
+
+                currentY += label.Height + INPUT_HEIGHT + SPACING;
+            }
+
+            // 获取实际需要的高度
+            int totalContentHeight = currentY + PADDING;  // 添加底部边距
+            int requiredHeight = Math.Max(totalContentHeight, MIN_CONTENT_HEIGHT);
+            int contentHeight = Math.Min(requiredHeight, MAX_CONTENT_HEIGHT);
+
+            // 设置对话框高度，保持原有的总体布局
+            dialog.Height = contentHeight + PADDING * 3 + BUTTON_HEIGHT;
+
+            // 创建实际的内容面板
+            Panel contentPanel = new Panel
+            {
+                AutoScroll = false,
+                Width = dialog.ClientSize.Width - PADDING * 2,
+                Height = dialog.ClientSize.Height - PADDING * 3 - BUTTON_HEIGHT,
+                Location = new Point(PADDING, PADDING),
+                BackColor = SystemColors.Control
+            };
+
+            // 只有当实际内容超过最大高度时才启用滚动
+            if (requiredHeight > MAX_CONTENT_HEIGHT)
+            {
+                contentPanel.AutoScroll = true;
+                contentPanel.AutoScrollMinSize = new Size(0, requiredHeight);
+            }
+
+            dialog.Controls.Add(contentPanel);
+
+            // 添加实际的输入控件
+            currentY = (int)(PADDING * 0.5);
+            bool needScroll = requiredHeight > MAX_CONTENT_HEIGHT;
+            int scrollWidth = needScroll ? SystemInformation.VerticalScrollBarWidth + 10 : 0;
+
+            foreach (string prompt in prompts)
+            {
+                Label label = new Label
+                {
+                    Text = prompt,
+                    AutoSize = true,
+                    Location = new Point(0, currentY),
+                    Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular)
+                };
+                contentPanel.Controls.Add(label);
+
+                TextBox textBox = new TextBox
+                {
+                    Width = contentPanel.ClientSize.Width - scrollWidth,
+                    Height = INPUT_HEIGHT,
+                    Location = new Point(0, currentY + label.Height + 5),
+                    BorderStyle = BorderStyle.FixedSingle,
+                    Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular)
+                };
+                contentPanel.Controls.Add(textBox);
+                textBoxes.Add(textBox);
+
+                currentY += label.Height + INPUT_HEIGHT + SPACING;
+            }
+        }
+
+        // 添加确定按钮
+        Button okButton = CreateStyledButton("确定", DialogResult.OK);
+        okButton.Location = new Point(
+            dialog.ClientSize.Width - BUTTON_WIDTH - PADDING,
+            dialog.ClientSize.Height - PADDING - BUTTON_HEIGHT
+        );
+
+        // 处理确定按钮点击事件
+        okButton.Click += (sender, e) => {
+            bool hasInput = false;
+            foreach (var textBox in textBoxes)
+            {
+                if (!string.IsNullOrEmpty(textBox.Text))
+                {
+                    hasInput = true;
+                    break;
+                }
+            }
+
+            if (hasInput)
+            {
+                Console.Write("[");
+                for (int i = 0; i < textBoxes.Count; i++)
+                {
+                    string value = textBoxes[i].Text ?? "";
+                    Console.Write("\"" + value.Replace("\"", "\\\"") + "\"");
+                    if (i < textBoxes.Count - 1)
+                    {
+                        Console.Write(",");
+                    }
+                }
+                Console.Write("]");
+            }
+            else
+            {
+                Console.Write("[]");
+            }
+        };
+
+        dialog.Controls.Add(okButton);
+        okButton.BringToFront();
+    }
+
+    private static void CreateConfirmDialog(Form dialog, string content)
+    {
+        const int MAX_CONTENT_HEIGHT = 500;
+        const int MIN_CONTENT_HEIGHT = 200;
+        int iconSize = 96;
+
+        // 先计算所需的内容高度
+        int requiredHeight = Math.Max(
+            TextRenderer.MeasureText(content,
+                new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+                new Size(dialog.ClientSize.Width - PADDING * 3 - iconSize, int.MaxValue),
+                TextFormatFlags.WordBreak | TextFormatFlags.TextBoxControl
+            ).Height + 20,
+            MIN_CONTENT_HEIGHT
+        );
+
+        int contentHeight = Math.Min(requiredHeight, MAX_CONTENT_HEIGHT);
+        dialog.Height = contentHeight + PADDING * 3 + BUTTON_HEIGHT;
+
+        // 创建内容面板
+        Panel contentPanel = new Panel
+        {
+            AutoScroll = false,
+            Width = dialog.ClientSize.Width - PADDING * 2,
+            Height = dialog.ClientSize.Height - PADDING * 3 - BUTTON_HEIGHT,
+            Location = new Point(PADDING, PADDING),
+            BackColor = SystemColors.Control
+        };
+
+        dialog.Controls.Add(contentPanel);
+
+        // 添加图标
+        PictureBox iconBox = new PictureBox
+        {
+            Width = iconSize,
+            Height = iconSize,
+            Location = new Point(0, 0),
+            SizeMode = PictureBoxSizeMode.Zoom,
+            BackColor = Color.Transparent
+        };
+
+        try
+        {
+            Icon sysIcon = SystemIcons.Warning;  // 改为警告图标
+            Bitmap bmp = new Bitmap(iconSize, iconSize);
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                g.DrawIcon(sysIcon, new Rectangle(0, 0, iconSize, iconSize));
+            }
+            iconBox.Image = bmp;
+        }
+        catch
+        {
+            iconBox.Visible = false;
+        }
+        contentPanel.Controls.Add(iconBox);
+
+        // 使用TextBox显示内容
+        TextBox messageBox = new TextBox
+        {
+            Text = content,
+            ReadOnly = true,
+            Multiline = true,
+            BorderStyle = BorderStyle.None,
+            BackColor = SystemColors.Control,
+            Location = new Point(iconSize + PADDING, 0),
+            Width = contentPanel.ClientSize.Width - iconSize - PADDING,
+            Height = contentPanel.Height,
+            Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+            WordWrap = true,
+            TabStop = false,
+            Cursor = Cursors.IBeam,
+            ScrollBars = requiredHeight > MAX_CONTENT_HEIGHT ? ScrollBars.Vertical : ScrollBars.None
+        };
+
+        // 隐藏光标但允许选择
+        messageBox.GotFocus += delegate(object sender, EventArgs e) {
+            if (messageBox.SelectionLength == 0)
+            {
+                NativeMethods.HideCaret(messageBox.Handle);
+            }
+        };
+
+        contentPanel.Controls.Add(messageBox);
+
+        // 添加确定和取消按钮
+        Button okButton = CreateStyledButton("确定", DialogResult.OK);
+        Button cancelButton = CreateStyledButton("取消", DialogResult.Cancel);
+
+        // 修改取消按钮样式为灰色
+        cancelButton.BackColor = Color.FromArgb(153, 153, 153);
+        cancelButton.MouseEnter += delegate(object sender, EventArgs e) {
+            cancelButton.BackColor = Color.FromArgb(133, 133, 133);
+        };
+        cancelButton.MouseLeave += delegate(object sender, EventArgs e) {
+            cancelButton.BackColor = Color.FromArgb(153, 153, 153);
+        };
+
+        // 调整按钮位置，靠右对齐，确认在最右边
+        okButton.Location = new Point(
+            dialog.ClientSize.Width - BUTTON_WIDTH - PADDING,
+            dialog.ClientSize.Height - PADDING - BUTTON_HEIGHT
+        );
+        cancelButton.Location = new Point(
+            dialog.ClientSize.Width - BUTTON_WIDTH * 2 - PADDING * 2,
+            dialog.ClientSize.Height - PADDING - BUTTON_HEIGHT
+        );
+
+        // 处理按钮点击事件
+        okButton.Click += (sender, e) => {
+            Console.Write("true");
+        };
+
+        cancelButton.Click += (sender, e) => {
+            Console.Write("false");
+        };
+
+        // 处理窗口关闭事件
+        dialog.FormClosing += delegate(object sender, FormClosingEventArgs e) {
+            if (dialog.DialogResult == DialogResult.None)
+            {
+                Console.Write("{}");
+            }
+        };
+
+        dialog.Controls.Add(okButton);
+        dialog.Controls.Add(cancelButton);
+
+        // 确保按钮始终在最上层
+        okButton.BringToFront();
+        cancelButton.BringToFront();
+    }
+
+    private static void CreateButtonsDialog(Form dialog, string content)
+    {
+        const int MAX_CONTENT_HEIGHT = 500;
+        const int MIN_CONTENT_HEIGHT = 200;
+
+        string[] buttonTexts = content.Split(new[] { "|||||" }, StringSplitOptions.None);
+
+        // 计算所需的内容高度
+        int totalHeight = buttonTexts.Length * (BUTTON_HEIGHT + SPACING) - SPACING;  // 减去最后一个按钮后的间距
+        int requiredHeight = Math.Max(totalHeight + PADDING * 2, MIN_CONTENT_HEIGHT);  // 添加上下内边距
+        int contentHeight = Math.Min(requiredHeight, MAX_CONTENT_HEIGHT);
+
+        // 设置对话框高度，根据按钮数量添加底部空间
+        int bottomPadding = buttonTexts.Length > 1 ? Math.Min(buttonTexts.Length * 10, 50) : 0;  // 根据按钮数量增加底部空间，但不超过PADDING
+        dialog.ClientSize = new Size(dialog.ClientSize.Width, contentHeight + bottomPadding);
+
+        // 创建内容面板
+        Panel contentPanel = new Panel
+        {
+            AutoScroll = false,
+            Width = dialog.ClientSize.Width - PADDING * 2,
+            Height = dialog.ClientSize.Height - PADDING * 2,
+            Location = new Point(PADDING, PADDING),
+            BackColor = SystemColors.Control
+        };
+
+        // 只有当实际内容超过最大高度时才启用滚动
+        if (requiredHeight > MAX_CONTENT_HEIGHT)
+        {
+            contentPanel.AutoScroll = true;
+            contentPanel.AutoScrollMinSize = new Size(0, totalHeight);
+        }
+
+        dialog.Controls.Add(contentPanel);
+
+        // 添加按钮
+        int currentY = PADDING;  // 从内边距开始
+        bool needScroll = requiredHeight > MAX_CONTENT_HEIGHT;
+        int scrollWidth = needScroll ? SystemInformation.VerticalScrollBarWidth + 10 : 0;
+
+        for (int i = 0; i < buttonTexts.Length; i++)
+        {
+            Button button = new Button
+            {
+                Text = buttonTexts[i],
+                Width = contentPanel.ClientSize.Width - scrollWidth,
+                Height = BUTTON_HEIGHT,
+                Location = new Point(0, currentY),
+                Tag = i,
+                FlatStyle = FlatStyle.Flat,
+                BackColor = Color.FromArgb(0, 122, 204),  // 使用蓝色背景
+                ForeColor = Color.White,  // 白色文字
+                Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+                Cursor = Cursors.Hand,
+                TextAlign = ContentAlignment.MiddleCenter  // 文字居中
+            };
+
+            // 设置边框
+            button.FlatAppearance.BorderSize = 0;
+
+            // 添加圆角效果
+            GraphicsPath path = new GraphicsPath();
+            int radius = 8; // 圆角半径
+            Rectangle rect = new Rectangle(0, 0, button.Width, button.Height);
+            path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90);
+            path.AddArc(rect.X + rect.Width - radius * 2, rect.Y, radius * 2, radius * 2, 270, 90);
+            path.AddArc(rect.X + rect.Width - radius * 2, rect.Y + rect.Height - radius * 2, radius * 2, radius * 2, 0, 90);
+            path.AddArc(rect.X, rect.Y + rect.Height - radius * 2, radius * 2, radius * 2, 90, 90);
+            path.CloseFigure();
+            button.Region = new Region(path);
+
+            // 修改鼠标悬停效果的颜色
+            button.MouseEnter += delegate(object sender, EventArgs e) {
+                button.BackColor = Color.FromArgb(0, 102, 184);  // 深一点的蓝色
+            };
+            button.MouseLeave += delegate(object sender, EventArgs e) {
+                button.BackColor = Color.FromArgb(0, 122, 204);  // 恢复原来的蓝色
+            };
+
+            // 修改文本绘制部分
+            button.Paint += delegate(object sender, PaintEventArgs e) {
+                e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+                using (GraphicsPath buttonPath = new GraphicsPath())
+                {
+                    Rectangle newRect = new Rectangle(0, 0, button.Width, button.Height);
+                    buttonPath.AddArc(newRect.X, newRect.Y, radius * 2, radius * 2, 180, 90);
+                    buttonPath.AddArc(newRect.X + newRect.Width - radius * 2, newRect.Y, radius * 2, radius * 2, 270, 90);
+                    buttonPath.AddArc(newRect.X + newRect.Width - radius * 2, newRect.Y + newRect.Height - radius * 2, radius * 2, radius * 2, 0, 90);
+                    buttonPath.AddArc(newRect.X, newRect.Y + newRect.Height - radius * 2, radius * 2, radius * 2, 90, 90);
+                    buttonPath.CloseFigure();
+
+                    e.Graphics.FillPath(new SolidBrush(button.BackColor), buttonPath);
+
+                    // 绘制文本（居中对齐）
+                    StringFormat sf = new StringFormat();
+                    sf.Alignment = StringAlignment.Center;  // 水平居中
+                    sf.LineAlignment = StringAlignment.Center;  // 垂直居中
+                    e.Graphics.DrawString(button.Text, button.Font, new SolidBrush(button.ForeColor), newRect, sf);
+                }
+            };
+
+            // 添加按钮点击事件
+            button.Click += delegate(object sender, EventArgs e) {
+                Button clickedButton = (Button)sender;
+                int id = (int)clickedButton.Tag;
+                string text = clickedButton.Text;
+                Console.Write("{\"id\":" + id + ",\"text\":\"" + text.Replace("\"", "\\\"") + "\"}");
+                dialog.DialogResult = DialogResult.OK;
+            };
+
+            contentPanel.Controls.Add(button);
+            currentY += BUTTON_HEIGHT + SPACING;
+        }
+
+        // 处理窗口关闭事件
+        dialog.FormClosing += delegate(object sender, FormClosingEventArgs e) {
+            if (dialog.DialogResult == DialogResult.None)
+            {
+                Console.Write("{}");
+            }
+        };
+    }
+
+    private static void CreateTextAreaDialog(Form dialog, string content)
+    {
+        dialog.Height = 600;  // 改为600
+
+        TextBox textArea = new TextBox
+        {
+            Multiline = true,
+            ScrollBars = ScrollBars.Vertical,
+            Width = dialog.ClientSize.Width - PADDING * 2,
+            Height = dialog.ClientSize.Height - PADDING * 3 - BUTTON_HEIGHT,
+            Location = new Point(PADDING, PADDING),
+            ForeColor = SystemColors.WindowText,
+            Text = content,  // 使用传入的content作为默认文本
+            Font = new Font("Microsoft YaHei UI", 10F, FontStyle.Regular),
+            BorderStyle = BorderStyle.FixedSingle
+        };
+
+        dialog.Controls.Add(textArea);
+
+        // 添加确定按钮
+        Button okButton = CreateStyledButton("确定", DialogResult.OK);
+        okButton.Location = new Point(
+            dialog.ClientSize.Width - BUTTON_WIDTH - PADDING,
+            dialog.ClientSize.Height - PADDING - BUTTON_HEIGHT
+        );
+
+        // 处理确定按钮点击事件
+        okButton.Click += delegate(object sender, EventArgs e) {
+            Console.Write(textArea.Text ?? "");  // 直接输出文本，不加引号
+        };
+
+        dialog.Controls.Add(okButton);
+        okButton.BringToFront();
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        int index = Array.IndexOf(args, key);
+        if (index >= 0 && index < args.Length - 1)
+        {
+            return args[index + 1];
+        }
+        return string.Empty;
+    }
+
+    private static void StyleButton(Button button)
+    {
+        button.FlatStyle = FlatStyle.Flat;
+        button.FlatAppearance.BorderSize = 0;
+        button.BackColor = Color.FromArgb(0, 122, 204);
+        button.ForeColor = Color.White;
+        button.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular);
+        button.Cursor = Cursors.Hand;
+        button.Width = BUTTON_WIDTH;
+        button.Height = BUTTON_HEIGHT;
+
+        // 圆角绘制
+        GraphicsPath path = new GraphicsPath();
+        int radius = 8; // 圆角半径
+        Rectangle rect = new Rectangle(0, 0, button.Width, button.Height);
+        path.AddArc(rect.X, rect.Y, radius * 2, radius * 2, 180, 90);
+        path.AddArc(rect.X + rect.Width - radius * 2, rect.Y, radius * 2, radius * 2, 270, 90);
+        path.AddArc(rect.X + rect.Width - radius * 2, rect.Y + rect.Height - radius * 2, radius * 2, radius * 2, 0, 90);
+        path.AddArc(rect.X, rect.Y + rect.Height - radius * 2, radius * 2, radius * 2, 90, 90);
+        path.CloseFigure();
+        button.Region = new Region(path);
+
+        // 添加鼠标悬停效果
+        button.MouseEnter += delegate(object sender, EventArgs e) {
+            button.BackColor = Color.FromArgb(0, 102, 184);
+        };
+        button.MouseLeave += delegate(object sender, EventArgs e) {
+            button.BackColor = Color.FromArgb(0, 122, 204);
+        };
+
+        // 自定义绘制
+        button.Paint += delegate(object sender, PaintEventArgs e) {
+            e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+            using (GraphicsPath buttonPath = new GraphicsPath())
+            {
+                Rectangle newRect = new Rectangle(0, 0, button.Width, button.Height);
+                buttonPath.AddArc(newRect.X, newRect.Y, radius * 2, radius * 2, 180, 90);
+                buttonPath.AddArc(newRect.X + newRect.Width - radius * 2, newRect.Y, radius * 2, radius * 2, 270, 90);
+                buttonPath.AddArc(newRect.X + newRect.Width - radius * 2, newRect.Y + newRect.Height - radius * 2, radius * 2, radius * 2, 0, 90);
+                buttonPath.AddArc(newRect.X, newRect.Y + newRect.Height - radius * 2, radius * 2, radius * 2, 90, 90);
+                buttonPath.CloseFigure();
+
+                e.Graphics.FillPath(new SolidBrush(button.BackColor), buttonPath);
+
+                // 绘制文本
+                StringFormat sf = new StringFormat();
+                sf.Alignment = StringAlignment.Center;
+                sf.LineAlignment = StringAlignment.Center;
+                e.Graphics.DrawString(button.Text, button.Font, new SolidBrush(button.ForeColor), newRect, sf);
+            }
+        };
+    }
+
+    private static Button CreateStyledButton(string text, DialogResult dialogResult)
+    {
+        Button button = new Button();
+        button.Text = text;
+        button.DialogResult = dialogResult;
+        StyleButton(button);
+        return button;
+    }
+
+    public static void Main(string[] args)
+    {
+        InitializeDPIAwareness();
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+        Show(args);
+    }
+
+    private class NativeMethods
+    {
+        [DllImport("user32.dll")]
+        public static extern bool HideCaret(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, ref RECT lParam);
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+        }
+    }
+}
diff --git a/plugin/lib/getQuickcommandFile.js b/plugin/lib/getQuickcommandFile.js
index e6c7e80a..e966678f 100644
--- a/plugin/lib/getQuickcommandFile.js
+++ b/plugin/lib/getQuickcommandFile.js
@@ -10,12 +10,14 @@ const getQuickcommandTempFile = (ext, name, dir = "quickcommandTempDir") => {
 };
 
 const getQuickcommandFolderFile = (name, ext) => {
-  const quickcommandPath = path.join(
+  const folderPath = path.join(
     window.utools.getPath("userData"),
     "quickcommand"
   );
-  if (!fs.existsSync(quickcommandPath)) fs.mkdirSync(quickcommandPath);
-  return path.join(quickcommandPath, `${name}.${ext}`);
+  if (!fs.existsSync(folderPath)) {
+    fs.mkdirSync(folderPath, { recursive: true });
+  }
+  return path.join(folderPath, `${name}.${ext}`);
 };
 
 module.exports = { getQuickcommandTempFile, getQuickcommandFolderFile };
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index a73034a0..4a555a67 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -178,51 +178,10 @@ const quickcommand = {
     }
     return null;
   },
-};
-
-if (process.platform === "win32") {
-  // 运行vbs脚本
-  quickcommand.runVbs = function (script) {
-    return new Promise((reslove, reject) => {
-      var tempfile = getQuickcommandTempFile("vbs");
-      fs.writeFile(tempfile, iconv.encode(script, "gbk"), () => {
-        child_process.exec(
-          `cscript.exe /nologo "${tempfile}"`,
-          {
-            encoding: "buffer",
-            windowsHide: true,
-          },
-          (err, stdout, stderr) => {
-            if (err) reject(iconv.decode(stderr, "gbk"));
-            else reslove(iconv.decode(stdout, "gbk"));
-            fs.unlink(tempfile, () => {});
-          }
-        );
-      });
-    });
-  };
-  // 运行powershell脚本
-  quickcommand.runPowerShell = function (script) {
-    return new Promise((reslove, reject) => {
-      let base64str = Buffer.from(script, "utf16le").toString("base64");
-      child_process.exec(
-        `powershell.exe -e "${base64str}"`,
-        {
-          encoding: "buffer",
-          windowsHide: true,
-        },
-        (err, stdout, stderr) => {
-          if (err) reject(iconv.decode(stderr, "gbk"));
-          else reslove(iconv.decode(stdout, "gbk"));
-        }
-      );
-    });
-  };
 
   // 运行C#脚本
-  quickcommand.runCsharp = function (script) {
+  runCsharp: function (script, args = []) {
     return new Promise((reslove, reject) => {
-      // 找到csc.exe
       let cscPath = path.join(
         process.env.WINDIR,
         "Microsoft.NET",
@@ -242,15 +201,16 @@ if (process.platform === "win32") {
       if (!fs.existsSync(cscPath)) {
         return reject("未安装.NET Framework");
       }
-      // 写入临时文件
       let tempCsharpFile = getQuickcommandTempFile("cs");
       let tempBuildFile = getQuickcommandTempFile("exe");
 
       fs.writeFile(tempCsharpFile, iconv.encode(script, "gbk"), (err) => {
         if (err) return reject(err.toString());
-        // 运行csc.exe
+        // 添加命令行参数
+        const argsStr =
+          args.length > 0 ? " " + args.map((arg) => `"${arg}"`).join(" ") : "";
         child_process.exec(
-          `${cscPath} /nologo /out:${tempBuildFile} ${tempCsharpFile} && ${tempBuildFile}`,
+          `${cscPath} /nologo /out:${tempBuildFile} ${tempCsharpFile} && ${tempBuildFile}${argsStr}`,
           {
             encoding: "buffer",
             windowsHide: true,
@@ -264,7 +224,48 @@ if (process.platform === "win32") {
         );
       });
     });
+  },
+};
+
+if (process.platform === "win32") {
+  // 运行vbs脚本
+  quickcommand.runVbs = function (script) {
+    return new Promise((reslove, reject) => {
+      var tempfile = getQuickcommandTempFile("vbs");
+      fs.writeFile(tempfile, iconv.encode(script, "gbk"), () => {
+        child_process.exec(
+          `cscript.exe /nologo "${tempfile}"`,
+          {
+            encoding: "buffer",
+            windowsHide: true,
+          },
+          (err, stdout, stderr) => {
+            if (err) reject(iconv.decode(stderr, "gbk"));
+            else reslove(iconv.decode(stdout, "gbk"));
+            fs.unlink(tempfile, () => {});
+          }
+        );
+      });
+    });
+  };
+  // 运行powershell脚本
+  quickcommand.runPowerShell = function (script) {
+    return new Promise((reslove, reject) => {
+      let base64str = Buffer.from(script, "utf16le").toString("base64");
+      child_process.exec(
+        `powershell.exe -e "${base64str}"`,
+        {
+          encoding: "buffer",
+          windowsHide: true,
+        },
+        (err, stdout, stderr) => {
+          if (err) reject(iconv.decode(stderr, "gbk"));
+          else reslove(iconv.decode(stdout, "gbk"));
+        }
+      );
+    });
   };
+
   quickcommand.showSystemTextArea = systemDialog.showSystemTextArea;
 }
 
@@ -312,7 +313,6 @@ if (process.platform !== "linux") {
   quickcommand.showSystemMessageBox = systemDialog.showSystemMessageBox;
   quickcommand.showSystemInputBox = systemDialog.showSystemInputBox;
   quickcommand.showSystemConfirmBox = systemDialog.showSystemConfirmBox;
-  quickcommand.showSystemSelectList = systemDialog.showSystemSelectList;
   quickcommand.showSystemButtonBox = systemDialog.showSystemButtonBox;
 }
 
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index c33f0818..9bd5dde2 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -3,7 +3,13 @@ const path = require("path");
 const { exec } = require("child_process");
 const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
 
-// 添加一个辅助函数来执行命令
+// 读取 dialog.cs 模板
+const dialogTemplate = fs.readFileSync(
+  path.join(__dirname, "csharp", "dialog.cs"),
+  "utf8"
+);
+
+// 辅助函数
 const execCommand = (cmd) => {
   return new Promise((resolve, reject) => {
     exec(cmd, (error, stdout, stderr) => {
@@ -16,7 +22,6 @@ const execCommand = (cmd) => {
   });
 };
 
-// 添加一个辅助函数来检查命令是否存在
 const checkZenity = async () => {
   try {
     await execCommand("which zenity");
@@ -29,137 +34,75 @@ const checkZenity = async () => {
   }
 };
 
-// 定义通用样式
-const commonStyles = `
-  static void ApplyModernStyle(Form form) {
-    form.Font = new Font("Microsoft YaHei UI", 9F);
-    form.BackColor = Color.White;
-    form.Padding = new Padding(15);
-  }
-
-  static void ApplyButtonStyle(Button button) {
-    button.FlatStyle = FlatStyle.Flat;
-    button.BackColor = Color.FromArgb(0, 120, 212);
-    button.ForeColor = Color.White;
-    button.Font = new Font("Microsoft YaHei UI", 9F);
-    button.Cursor = Cursors.Hand;
-    button.FlatAppearance.BorderSize = 0;
-    button.Height = 30;
-    button.Width = 85;
-  }
-
-  static void ApplySecondaryButtonStyle(Button button) {
-    button.FlatStyle = FlatStyle.Flat;
-    button.BackColor = Color.FromArgb(240, 240, 240);
-    button.ForeColor = Color.Black;
-    button.Font = new Font("Microsoft YaHei UI", 9F);
-    button.Cursor = Cursors.Hand;
-    button.FlatAppearance.BorderSize = 1;
-    button.FlatAppearance.BorderColor = Color.FromArgb(200, 200, 200);
-    button.Height = 30;
-    button.Width = 85;
-  }
-
-  static void ApplyTextBoxStyle(TextBox textBox) {
-    textBox.BorderStyle = BorderStyle.FixedSingle;
-    textBox.Font = new Font("Microsoft YaHei UI", 9F);
-  }
-
-  static void ApplyLabelStyle(Label label) {
-    label.Font = new Font("Microsoft YaHei UI", 9F);
-    label.ForeColor = Color.FromArgb(51, 51, 51);
-  }
-
-  static void ApplyListBoxStyle(ListBox listBox) {
-    listBox.Font = new Font("Microsoft YaHei UI", 9F);
-    listBox.BorderStyle = BorderStyle.FixedSingle;
-    listBox.BackColor = Color.White;
-  }`;
-
 const getQuickcommandIconPath = () => {
   try {
     const iconPath = getQuickcommandFolderFile("logo", "png");
     if (!fs.existsSync(iconPath)) {
-      fs.copyFileSync(path.join(__dirname, "..", "logo.png"), iconPath);
+      const sourcePath = path.join(__dirname, "..", "logo.png");
+      if (!fs.existsSync(sourcePath)) {
+        console.error("Source icon not found:", sourcePath);
+        return "";
+      }
+      fs.copyFileSync(sourcePath, iconPath);
     }
     return iconPath;
   } catch (error) {
-    console.error(error);
-    return null;
+    console.error("Error getting icon path:", error);
+    return "";
   }
 };
 
+// 修改对话框函数，使用新的 dialog.cs
 const showSystemMessageBox = async function (content, title = "") {
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isMacOs()) {
-    let iconParam = "note";
-    if (iconPath) {
-      const posixPath = iconPath.replace(/\\/g, "/");
-      iconParam = `alias POSIX file "${posixPath}"`;
-    }
-    const script = `display dialog "${content}" with title "${title}" buttons {"确定"} default button "确定" with icon ${iconParam}`;
-    await this.runAppleScript(script);
-  } else if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            Label label = new Label();
-            Button okButton = new Button();
-
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(400, 130);
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
-
-            ApplyLabelStyle(label);
-            label.Text = "${content}";
-            label.SetBounds(15, 15, 370, 60);
-            label.AutoSize = true;
-            form.Controls.Add(label);
+  try {
+    const iconPath = getQuickcommandIconPath();
+    if (window.utools.isWindows()) {
+      const args = [
+        "-type",
+        "message",
+        "-title",
+        title,
+        "-content",
+        content.replace(/\r\n|\n/g, ""),
+      ];
 
-            ApplyButtonStyle(okButton);
-            okButton.Text = "确定";
-            okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(300, 80, 85, 30);
-            form.Controls.Add(okButton);
+      if (iconPath) {
+        args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
+      }
 
-            form.AcceptButton = okButton;
-            form.ShowDialog();
-            form.Dispose();
-          }
-        }`;
-    await this.runCsharp(csharpScript);
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return;
-    try {
-      const script = `zenity --info --title="${title}" --text="${content}" --width=400`;
-      await execCommand(script);
-    } catch (error) {
-      console.error("执行 zenity 命令失败:", error);
+      const csharpCode = dialogTemplate;
+      const result = await this.runCsharp(csharpCode, args);
+      if (result && result.startsWith("Error:")) {
+        throw new Error(result.substring(7));
+      }
+      return;
+    }
+    if (window.utools.isMacOs()) {
+      let iconParam = "note";
+      if (iconPath) {
+        const posixPath = iconPath.replace(/\\/g, "/");
+        iconParam = `alias POSIX file "${posixPath}"`;
+      }
+      const script = `display dialog "${content}" with title "${title}" buttons {"取消", "确定"} default button "确定" with icon ${iconParam}`;
+      const result = await this.runAppleScript(script);
+      return result.includes("button returned:确定");
+    } else if (window.utools.isLinux()) {
+      if (!(await checkZenity())) return false;
+      try {
+        const script = `zenity --info --title="${title}" --text="${content}" --width=400`;
+        await execCommand(script);
+        return true;
+      } catch (error) {
+        return false;
+      }
     }
+  } catch (error) {
+    console.error("Dialog error:", error);
+    window.utools.showNotification(`对话框错误: ${error.message}`);
+    return false;
   }
 };
 
-// 系统级输入框
 const showSystemInputBox = async function (placeholders, title = "") {
   if (!Array.isArray(placeholders)) {
     placeholders = [placeholders];
@@ -189,79 +132,23 @@ const showSystemInputBox = async function (placeholders, title = "") {
     }
     return results;
   } else if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(350, ${45 + placeholders.length * 70});
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
-
-            ${placeholders
-              .map(
-                (placeholder, index) => `
-            Label label${index} = new Label();
-            ApplyLabelStyle(label${index});
-            label${index}.Text = "${placeholder}";
-            label${index}.SetBounds(15, ${15 + index * 70}, 320, 20);
-            form.Controls.Add(label${index});
-
-            TextBox textBox${index} = new TextBox();
-            ApplyTextBoxStyle(textBox${index});
-            textBox${index}.SetBounds(15, ${40 + index * 70}, 320, 25);
-            form.Controls.Add(textBox${index});`
-              )
-              .join("\n")}
-
-            Button okButton = new Button();
-            ApplyButtonStyle(okButton);
-            okButton.Text = "确定";
-            okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(160, ${20 + placeholders.length * 70}, 85, 30);
-            form.Controls.Add(okButton);
+    const args = [
+      "-type",
+      "input",
+      "-title",
+      title,
+      "-content",
+      placeholders.join("|||||"),
+    ];
 
-            Button cancelButton = new Button();
-            ApplySecondaryButtonStyle(cancelButton);
-            cancelButton.Text = "取消";
-            cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(250, ${
-              20 + placeholders.length * 70
-            }, 85, 30);
-            form.Controls.Add(cancelButton);
-
-            form.AcceptButton = okButton;
-            form.CancelButton = cancelButton;
+    if (iconPath) {
+      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
+    }
 
-            if (form.ShowDialog() == DialogResult.OK) {
-              ${placeholders
-                .map((_, index) => `Console.WriteLine(textBox${index}.Text);`)
-                .join("\n          ")}
-            }
-            form.Dispose();
-          }
-        }`;
-    const result = await this.runCsharp(csharpScript);
-    return result.trim() || null;
+    const csharpCode = dialogTemplate;
+    const result = await this.runCsharp(csharpCode, args);
+    console.log(result, JSON.parse(result));
+    return result ? JSON.parse(result) : null;
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
     const results = [];
@@ -280,7 +167,6 @@ const showSystemInputBox = async function (placeholders, title = "") {
   }
 };
 
-// 系统级确认框
 const showSystemConfirmBox = async function (content, title = "") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
@@ -293,65 +179,22 @@ const showSystemConfirmBox = async function (content, title = "") {
     const result = await this.runAppleScript(script);
     return result.includes("button returned:确定");
   } else if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            Label label = new Label();
-            Button okButton = new Button();
-            Button cancelButton = new Button();
-
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(400, 130);
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
-
-            ApplyLabelStyle(label);
-            label.Text = "${content}";
-            label.SetBounds(15, 15, 370, 60);
-            label.AutoSize = true;
-            form.Controls.Add(label);
-
-            ApplyButtonStyle(okButton);
-            okButton.Text = "确定";
-            okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(210, 80, 85, 30);
-            form.Controls.Add(okButton);
+    const args = [
+      "-type",
+      "confirm",
+      "-title",
+      title,
+      "-content",
+      content.replace(/\r\n|\n/g, "\\n"),
+    ];
 
-            ApplySecondaryButtonStyle(cancelButton);
-            cancelButton.Text = "取消";
-            cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(300, 80, 85, 30);
-            form.Controls.Add(cancelButton);
-
-            form.AcceptButton = okButton;
-            form.CancelButton = cancelButton;
+    if (iconPath) {
+      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
+    }
 
-            DialogResult result = form.ShowDialog();
-            Console.WriteLine(result == DialogResult.OK);
-            form.Dispose();
-          }
-        }`;
-    const result = await this.runCsharp(csharpScript);
-    return result.trim() === "True";
+    const csharpCode = dialogTemplate;
+    const result = await this.runCsharp(csharpCode, args);
+    return result === "true";
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return false;
     try {
@@ -364,216 +207,40 @@ const showSystemConfirmBox = async function (content, title = "") {
   }
 };
 
-// 系统级选择框
-const showSystemSelectList = async function (items, title = "") {
+const showSystemButtonBox = async function (buttons, title = "") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
-    const itemList = items.map((item) => `"${item}"`).join(", ");
-    const script = `choose from list {${itemList}} with title "${title}" with prompt "请选择：" default items {"${items[0]}"}`;
+    const itemList = buttons.map((item) => `"${item}"`).join(", ");
+    const script = `choose from list {${itemList}} with title "${title}" with prompt "请选择：" default items {"${buttons[0]}"}`;
     const result = await this.runAppleScript(script);
     if (result.includes("false")) return null;
     const text = result.trim();
-    const id = items.findIndex((item) => item === text);
+    const id = buttons.findIndex((item) => item === text);
     return { id, text };
   } else if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            ListBox listBox = new ListBox();
-            Button okButton = new Button();
-            Button cancelButton = new Button();
-            Label titleLabel = new Label();
-
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(350, 280);
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
-
-            titleLabel.Text = "请选择：";
-            titleLabel.AutoSize = true;
-            titleLabel.SetBounds(15, 15, 320, 20);
-            ApplyLabelStyle(titleLabel);
-            form.Controls.Add(titleLabel);
-
-            ApplyListBoxStyle(listBox);
-            listBox.SetBounds(15, 45, 320, 180);
-            ${items
-              .map((item) => `listBox.Items.Add("${item}");`)
-              .join("\n          ")}
-            listBox.SelectedIndex = 0;
-            form.Controls.Add(listBox);
+    const args = [
+      "-type",
+      "buttons",
+      "-title",
+      title,
+      "-content",
+      buttons.join("|||||"),
+    ];
 
-            ApplyButtonStyle(okButton);
-            okButton.Text = "确定";
-            okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(160, 235, 85, 30);
-            form.Controls.Add(okButton);
-
-            ApplySecondaryButtonStyle(cancelButton);
-            cancelButton.Text = "取消";
-            cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(250, 235, 85, 30);
-            form.Controls.Add(cancelButton);
-
-            form.AcceptButton = okButton;
-            form.CancelButton = cancelButton;
-
-            if (form.ShowDialog() == DialogResult.OK && listBox.SelectedItem != null) {
-              Console.WriteLine(listBox.SelectedIndex.ToString() + "|||||" + listBox.SelectedItem.ToString());
-            }
-            form.Dispose();
-          }
-        }`;
-    const result = await this.runCsharp(csharpScript);
-    if (result.trim()) {
-      const [id, text] = result.trim().split("|||||");
-      return { id: parseInt(id), text };
-    }
-    return null;
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return null;
-    try {
-      const itemsList = items
-        .map((item, index) => `"${index}" "${item}"`)
-        .join(" ");
-      const script = `zenity --list --title="${title}" --text="请选择：" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
-      const result = await execCommand(script);
-      if (!result) return null;
-      const text = result.trim();
-      const id = items.findIndex((item) => item === text);
-      return { id, text };
-    } catch (error) {
-      console.error("执行 zenity 命令失败:", error);
-      return null;
-    }
-  }
-};
-
-// 系统级按钮组弹窗
-const showSystemButtonBox = async function (buttons, content = "", title = "") {
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isMacOs()) {
-    try {
-      let iconParam = "note";
-      if (iconPath) {
-        const posixPath = iconPath.replace(/\\/g, "/");
-        iconParam = `alias POSIX file "${posixPath}"`;
-      }
-      const buttonList = buttons.map((btn) => `"${btn}"`).join(", ");
-      const script = `display dialog "${content}" with title "${title}" buttons {${buttonList}} default button "${buttons[0]}" with icon ${iconParam}`;
-      const result = await this.runAppleScript(script);
-      const match = result.match(/button returned:(.+)/);
-      if (match) {
-        const text = match[1];
-        const id = buttons.findIndex((btn) => btn === text);
-        return { id, text };
-      }
-      return null;
-    } catch (error) {
-      window.utools.showNotification(error);
-      throw error;
+    if (iconPath) {
+      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
     }
-  } else if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            Label label = new Label();
-            FlowLayoutPanel buttonPanel = new FlowLayoutPanel();
 
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(400, 160);
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
-
-            ApplyLabelStyle(label);
-            label.Text = "${content}";
-            label.SetBounds(15, 15, 370, 60);
-            label.AutoSize = true;
-            form.Controls.Add(label);
-
-            buttonPanel.SetBounds(15, 90, 370, 40);
-            buttonPanel.FlowDirection = FlowDirection.RightToLeft;
-            buttonPanel.WrapContents = false;
-            buttonPanel.BackColor = Color.White;
-            form.Controls.Add(buttonPanel);
-
-            ${buttons
-              .map(
-                (btn, index) => `
-              Button button${index} = new Button();
-              button${index}.Text = "${btn}";
-              button${index}.DialogResult = DialogResult.OK;
-              button${index}.Tag = "${index}";
-              ${
-                index === 0 ? "ApplyButtonStyle" : "ApplySecondaryButtonStyle"
-              }(button${index});
-              button${index}.Margin = new Padding(5, 0, 0, 0);
-              buttonPanel.Controls.Add(button${index});`
-              )
-              .join("\n")}
-
-            DialogResult result = form.ShowDialog();
-            if (result == DialogResult.OK) {
-              foreach (Button btn in buttonPanel.Controls) {
-                if (btn.DialogResult == result) {
-                  Console.WriteLine(btn.Tag.ToString() + "|||||" + btn.Text);
-                  break;
-                }
-              }
-            }
-            form.Dispose();
-          }
-        }`;
-    const result = await this.runCsharp(csharpScript);
-    if (result.trim()) {
-      const [id, text] = result.trim().split("|||||");
-      return { id: parseInt(id), text };
+    const csharpCode = dialogTemplate;
+    const result = await this.runCsharp(csharpCode, args);
+    if (result) {
+      return JSON.parse(result);
     }
     return null;
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
     try {
-      const script1 = `zenity --info --title="${title}" --text="${content}" --width=400`;
+      const script1 = `zenity --info --title="${title}" --width=400`;
       await execCommand(script1);
 
       const itemsList = buttons
@@ -592,95 +259,29 @@ const showSystemButtonBox = async function (buttons, content = "", title = "") {
   }
 };
 
-// 系统级文本区域弹窗
-const showSystemTextArea = async function (
-  placeholder = "",
-  defaultText = "",
-  title = ""
-) {
+const showSystemTextArea = async function (defaultText = "", title = "") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isWindows()) {
-    const escapedIconPath = iconPath ? iconPath.replace(/\\/g, "\\\\") : null;
-    const csharpScript = `
-        using System;
-        using System.Windows.Forms;
-        using System.Drawing;
-        using System.IO;
-
-        class Program {
-          ${commonStyles}
-
-          static void Main() {
-            Form form = new Form();
-            TextBox textBox = new TextBox();
-            Button okButton = new Button();
-            Button cancelButton = new Button();
-            Label label = new Label();
-
-            ApplyModernStyle(form);
-            form.Text = "${title}";
-            form.ClientSize = new Size(450, 320);
-            form.FormBorderStyle = FormBorderStyle.FixedDialog;
-            form.StartPosition = FormStartPosition.CenterScreen;
-            form.MaximizeBox = false;
-            form.MinimizeBox = false;
-            ${
-              escapedIconPath
-                ? `using (var bmp = new Bitmap("${escapedIconPath}"))
-              {
-                form.Icon = Icon.FromHandle(bmp.GetHicon());
-              }`
-                : ""
-            }
+    const args = [
+      "-type",
+      "textarea",
+      "-title",
+      title,
+      "-content",
+      defaultText,
+    ];
 
-            ApplyLabelStyle(label);
-            label.Text = "${placeholder}";
-            label.SetBounds(15, 15, 420, 20);
-            form.Controls.Add(label);
-
-            ApplyTextBoxStyle(textBox);
-            textBox.Multiline = true;
-            textBox.ScrollBars = ScrollBars.Vertical;
-            textBox.SetBounds(15, 45, 420, 220);
-            textBox.Text = "${defaultText}";
-            textBox.AcceptsReturn = true;
-            form.Controls.Add(textBox);
-
-            ApplyButtonStyle(okButton);
-            okButton.Text = "确定";
-            okButton.DialogResult = DialogResult.OK;
-            okButton.SetBounds(260, 275, 85, 30);
-            form.Controls.Add(okButton);
-
-            ApplySecondaryButtonStyle(cancelButton);
-            cancelButton.Text = "取消";
-            cancelButton.DialogResult = DialogResult.Cancel;
-            cancelButton.SetBounds(350, 275, 85, 30);
-            form.Controls.Add(cancelButton);
-
-            form.AcceptButton = null;
-            form.CancelButton = cancelButton;
-
-            form.KeyPreview = true;
-            form.KeyDown += (sender, e) => {
-              if (e.KeyCode == Keys.Enter && e.Control) {
-                okButton.PerformClick();
-                e.Handled = true;
-              }
-            };
+    if (iconPath) {
+      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
+    }
 
-            if (form.ShowDialog() == DialogResult.OK) {
-              Console.WriteLine(textBox.Text);
-            }
-            form.Dispose();
-          }
-        }`;
-    const result = await this.runCsharp(csharpScript);
-    return result.trim() || null;
+    const csharpCode = dialogTemplate;
+    const result = await this.runCsharp(csharpCode, args);
+    return result || null;
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
     try {
-      const script = `zenity --text-info --title="${title}" --text="${placeholder}" --editable --width=450 --height=350 --filename=<(echo "${defaultText}")`;
+      const script = `zenity --text-info --title="${title}" --editable --width=450 --height=350 --filename=<(echo "${defaultText}")`;
       const result = await execCommand(script);
       return result ? result.trim() : null;
     } catch (error) {
@@ -694,7 +295,6 @@ module.exports = {
   showSystemMessageBox,
   showSystemInputBox,
   showSystemConfirmBox,
-  showSystemSelectList,
   showSystemButtonBox,
   showSystemTextArea,
 };
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 068609c5..da6887b8 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -200,30 +200,11 @@ export const uiCommands = {
     },
     {
       value: "quickcommand.showSelectList",
-      label: "uTools选择列表",
+      label: "选择列表",
       desc: "显示一个支持搜索的选项列表，可以动态更新选项",
       component: "SelectListEditor",
       isAsync: true,
     },
-    {
-      value: "quickcommand.showSystemSelectList",
-      label: "系统选择列表",
-      desc: "选择列表（系统）",
-      isAsync: true,
-      config: [
-        {
-          label: "选项",
-          component: "ArrayEditor",
-          width: 12,
-        },
-        {
-          label: "标题",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "请选择"),
-          width: 12,
-        },
-      ],
-    },
     {
       value: "quickcommand.showTextArea",
       label: "文本框",
@@ -231,30 +212,44 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "textareaValue",
       saveOutput: true,
-      config: [
-        {
-          label: "文本框占位符",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "请输入"),
-          width: 6,
-        },
-        {
-          label: "文本框默认值",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str"),
-          width: 6,
-        },
-      ],
       subCommands: [
         {
           value: "quickcommand.showTextArea",
           icon: "call_to_action",
           label: "插件内弹窗",
+          config: [
+            {
+              label: "文本框占位符",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str", "请输入"),
+              width: 6,
+            },
+            {
+              label: "文本框默认值",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str"),
+              width: 6,
+            },
+          ],
         },
         {
           value: "quickcommand.showSystemTextArea",
           icon: "report",
           label: "系统弹窗(Mac不支持)",
+          config: [
+            {
+              label: "文本框默认值",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str"),
+              width: 6,
+            },
+            {
+              label: "标题",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str", "请输入"),
+              width: 6,
+            },
+          ],
         },
       ],
     },
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 97453fe7..27bfff07 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -549,30 +549,12 @@ interface quickcommandApi {
    */
   showSystemConfirmBox(content: string, title?: string): Promise<boolean>;
 
-  /**
-   * 显示一个系统级选择列表，返回选择的项的索引和文本（不支持Linux）
-   *
-   * ```js
-   * quickcommand.showSystemSelectList(["选项1", "选项2", "选项3"], "请选择").then(result => {
-   *   if (result) {
-   *     console.log(`选择了第${result.id + 1}个选项：${result.text}`)
-   *   }
-   * })
-   * ```
-   *
-   * @param items 选项列表
-   * @param title 标题，默认为空
-   */
-  showSystemSelectList(
-    items: string[],
-    title?: string
-  ): Promise<{ id: number; text: string } | null>;
 
   /**
    * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本（不支持Linux）
    *
    * ```js
-   * quickcommand.showSystemButtonBox(["保存", "不保存", "取消"], "是否保存更改？", "保存确认").then(result => {
+   * quickcommand.showSystemButtonBox(["保存", "不保存", "取消"], "保存确认").then(result => {
    *   if (result) {
    *     console.log(`点击了第${result.id + 1}个按钮：${result.text}`)
    *   }
@@ -580,12 +562,10 @@ interface quickcommandApi {
    * ```
    *
    * @param buttons 按钮文本数组
-   * @param content 对话框内容
    * @param title 标题，默认为空
    */
   showSystemButtonBox(
     buttons: string[],
-    content: string,
     title?: string
   ): Promise<{ id: number; text: string } | null>;
 
@@ -593,19 +573,17 @@ interface quickcommandApi {
    * 显示一个系统级多行文本输入框（仅Windows支持）
    *
    * ```js
-   * quickcommand.showSystemTextArea("请输入多行文本：", "默认内容", "文本编辑").then(text => {
+   * quickcommand.showSystemTextArea("默认内容", "文本编辑").then(text => {
    *   if (text) {
    *     console.log("输入的文本：", text)
    *   }
    * })
    * ```
    *
-   * @param placeholder 提示文本，默认为空
-   * @param defaultText 默认文本，默认为空
+     * @param defaultText 默认文本，默认为空
    * @param title 标题，默认为空
    */
   showSystemTextArea(
-    placeholder?: string,
     defaultText?: string,
     title?: string
   ): Promise<string | null>;

From cf7c30ea39758115e5d47f2330832f73153f15ac Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 13 Jan 2025 19:12:34 +0800
Subject: [PATCH 051/332] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/systemDialog.js | 77 ++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index 9bd5dde2..6c36ffcb 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -75,7 +75,7 @@ const showSystemMessageBox = async function (content, title = "") {
       if (result && result.startsWith("Error:")) {
         throw new Error(result.substring(7));
       }
-      return;
+      return true;
     }
     if (window.utools.isMacOs()) {
       let iconParam = "note";
@@ -83,9 +83,9 @@ const showSystemMessageBox = async function (content, title = "") {
         const posixPath = iconPath.replace(/\\/g, "/");
         iconParam = `alias POSIX file "${posixPath}"`;
       }
-      const script = `display dialog "${content}" with title "${title}" buttons {"取消", "确定"} default button "确定" with icon ${iconParam}`;
-      const result = await this.runAppleScript(script);
-      return result.includes("button returned:确定");
+      const script = `display dialog "${content}" with title "${title}" buttons {"确定"} default button "确定" with icon ${iconParam}`;
+      await this.runAppleScript(script);
+      return true;
     } else if (window.utools.isLinux()) {
       if (!(await checkZenity())) return false;
       try {
@@ -115,22 +115,26 @@ const showSystemInputBox = async function (placeholders, title = "") {
       const posixPath = iconPath.replace(/\\/g, "/");
       iconParam = `alias POSIX file "${posixPath}"`;
     }
-
-    const results = [];
-    for (let i = 0; i < placeholders.length; i++) {
-      const isLast = i === placeholders.length - 1;
-      const buttons = isLast ? '{"取消", "确定"}' : '{"取消", "继续"}';
-      const defaultButton = isLast ? '"确定"' : '"继续"';
-      const script = `display dialog "${placeholders[i]}" with title "${title}" default answer "" buttons ${buttons} default button ${defaultButton} with icon ${iconParam}`;
-      const result = await this.runAppleScript(script);
-      const buttonClicked = isLast ? "确定" : "继续";
-      if (!result.includes(`button returned:${buttonClicked}`)) {
-        return null;
+    try {
+      const results = [];
+      for (let i = 0; i < placeholders.length; i++) {
+        const isLast = i === placeholders.length - 1;
+        const buttons = isLast ? '{"取消", "确定"}' : '{"取消", "继续"}';
+        const defaultButton = isLast ? '"确定"' : '"继续"';
+        const script = `display dialog "${placeholders[i]}" with title "${title}" default answer "" buttons ${buttons} default button ${defaultButton} with icon ${iconParam}`;
+        const result = await this.runAppleScript(script);
+        const buttonClicked = isLast ? "确定" : "继续";
+        if (!result.includes(`button returned:${buttonClicked}`)) {
+          return null;
+        }
+        const text = result.match(/text returned:(.+)/)[1];
+        results.push(text);
       }
-      const text = result.match(/text returned:(.+)/)[1];
-      results.push(text);
+      return results;
+    } catch (err) {
+      console.error(err);
+      return [];
     }
-    return results;
   } else if (window.utools.isWindows()) {
     const args = [
       "-type",
@@ -147,8 +151,7 @@ const showSystemInputBox = async function (placeholders, title = "") {
 
     const csharpCode = dialogTemplate;
     const result = await this.runCsharp(csharpCode, args);
-    console.log(result, JSON.parse(result));
-    return result ? JSON.parse(result) : null;
+    return result ? JSON.parse(result) : [];
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
     const results = [];
@@ -156,11 +159,11 @@ const showSystemInputBox = async function (placeholders, title = "") {
       try {
         const script = `zenity --entry --title="${title}" --text="${placeholders[i]}" --width=400`;
         const result = await execCommand(script);
-        if (!result) return null;
+        if (!result) return [];
         results.push(result.trim());
       } catch (error) {
         console.error("执行 zenity 命令失败:", error);
-        return null;
+        return [];
       }
     }
     return results;
@@ -176,8 +179,13 @@ const showSystemConfirmBox = async function (content, title = "") {
       iconParam = `alias POSIX file "${posixPath}"`;
     }
     const script = `display dialog "${content}" with title "${title}" buttons {"取消", "确定"} default button "确定" with icon ${iconParam}`;
-    const result = await this.runAppleScript(script);
-    return result.includes("button returned:确定");
+    try {
+      const result = await this.runAppleScript(script);
+      return result.includes("button returned:确定");
+    } catch (err) {
+      console.error(err);
+      return false;
+    }
   } else if (window.utools.isWindows()) {
     const args = [
       "-type",
@@ -211,12 +219,17 @@ const showSystemButtonBox = async function (buttons, title = "") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
     const itemList = buttons.map((item) => `"${item}"`).join(", ");
-    const script = `choose from list {${itemList}} with title "${title}" with prompt "请选择：" default items {"${buttons[0]}"}`;
-    const result = await this.runAppleScript(script);
-    if (result.includes("false")) return null;
-    const text = result.trim();
-    const id = buttons.findIndex((item) => item === text);
-    return { id, text };
+    const script = `choose from list {${itemList}} with title "${title}" default items {"${buttons[0]}"}`;
+    try {
+      const result = await this.runAppleScript(script);
+      if (result.includes("false")) return {};
+      const text = result.trim();
+      const id = buttons.findIndex((item) => item === text);
+      return { id, text };
+    } catch (err) {
+      console.error(err);
+      return {};
+    }
   } else if (window.utools.isWindows()) {
     const args = [
       "-type",
@@ -236,7 +249,7 @@ const showSystemButtonBox = async function (buttons, title = "") {
     if (result) {
       return JSON.parse(result);
     }
-    return null;
+    return {};
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
     try {
@@ -248,7 +261,7 @@ const showSystemButtonBox = async function (buttons, title = "") {
         .join(" ");
       const script2 = `zenity --list --title="${title}" --text="请选择：" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
       const result = await execCommand(script2);
-      if (!result) return null;
+      if (!result) return {};
       const text = result.trim();
       const id = buttons.findIndex((btn) => btn === text);
       return { id, text };

From d477d634e353e6ac0fdcd0950d03a699a9d8fe72 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 13 Jan 2025 20:44:13 +0800
Subject: [PATCH 052/332] =?UTF-8?q?window=E4=B8=8B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=87=AA=E9=80=82=E5=BA=94=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=92=8C=E5=88=86=E8=BE=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/dialog.cs | 76 ++++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 14 deletions(-)

diff --git a/plugin/lib/csharp/dialog.cs b/plugin/lib/csharp/dialog.cs
index 96f41406..a1f50aa4 100644
--- a/plugin/lib/csharp/dialog.cs
+++ b/plugin/lib/csharp/dialog.cs
@@ -11,14 +11,55 @@ public class DialogGenerator
     [DllImport("user32.dll")]
     private static extern bool SetProcessDPIAware();
 
-    private const int DEFAULT_WIDTH = 900;
-    private const int DEFAULT_HEIGHT = 350;
-    private const int PADDING = 30;
-    private const int BUTTON_HEIGHT = 50;
-    private const int BUTTON_WIDTH = 140;
-    private const int INPUT_HEIGHT = 40;
-    private const int SPACING = 20;
-    private const int EM_SETRECT = 0xB3;
+    [DllImport("gdi32.dll")]
+    private static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+    private const int LOGPIXELSX = 88;
+    private const int LOGPIXELSY = 90;
+
+    // 基础尺寸常量 (96 DPI下的尺寸，当前尺寸/1.75)
+    private const int BASE_WIDTH = 515;        // 900/1.75 ≈ 515
+    private const int BASE_HEIGHT = 200;       // 350/1.75 ≈ 200
+    private const int BASE_PADDING = 17;       // 30/1.75 ≈ 17
+    private const int BASE_BUTTON_HEIGHT = 29; // 50/1.75 ≈ 29
+    private const int BASE_BUTTON_WIDTH = 80;  // 140/1.75 ≈ 80
+    private const int BASE_INPUT_HEIGHT = 23;  // 40/1.75 ≈ 23
+    private const int BASE_SPACING = 11;       // 20/1.75 ≈ 11
+
+    // 实际使用的缩放尺寸
+    private static int DEFAULT_WIDTH;
+    private static int DEFAULT_HEIGHT;
+    private static int PADDING;
+    private static int BUTTON_HEIGHT;
+    private static int BUTTON_WIDTH;
+    private static int INPUT_HEIGHT;
+    private static int SPACING;
+
+    // 添加获取DPI缩放比例的方法
+    private static float GetScaleFactor()
+    {
+        using (Graphics g = Graphics.FromHwnd(IntPtr.Zero))
+        {
+            IntPtr desktop = g.GetHdc();
+            int dpiX = GetDeviceCaps(desktop, LOGPIXELSX);
+            g.ReleaseHdc(desktop);
+            return dpiX / 96f;
+        }
+    }
+
+    // 初始化缩放尺寸的方法
+    private static void InitializeScaledSizes()
+    {
+        float scaleFactor = GetScaleFactor();
+
+        DEFAULT_WIDTH = (int)(BASE_WIDTH * scaleFactor);
+        DEFAULT_HEIGHT = (int)(BASE_HEIGHT * scaleFactor);
+        PADDING = (int)(BASE_PADDING * scaleFactor);
+        BUTTON_HEIGHT = (int)(BASE_BUTTON_HEIGHT * scaleFactor);
+        BUTTON_WIDTH = (int)(BASE_BUTTON_WIDTH * scaleFactor);
+        INPUT_HEIGHT = (int)(BASE_INPUT_HEIGHT * scaleFactor);
+        SPACING = (int)(BASE_SPACING * scaleFactor);
+    }
 
     private static void InitializeDPIAwareness()
     {
@@ -30,6 +71,8 @@ private static void InitializeDPIAwareness()
 
     public static DialogResult Show(string[] args)
     {
+        InitializeScaledSizes(); // 初始化缩放尺寸
+
         string type = GetArgumentValue(args, "-type");
         string title = GetArgumentValue(args, "-title");
         string content = GetArgumentValue(args, "-content");
@@ -91,14 +134,16 @@ private static Form CreateBaseDialog(string title)
         dialog.Width = DEFAULT_WIDTH;
         dialog.Height = DEFAULT_HEIGHT;
         dialog.StartPosition = FormStartPosition.CenterScreen;
+        dialog.AutoScaleMode = AutoScaleMode.None; // 禁用自动缩放
 
-        // 使用 Microsoft YaHei UI 字体
-        dialog.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
+        // 禁止调整窗口大小
+        dialog.FormBorderStyle = FormBorderStyle.FixedDialog;
+        dialog.MaximizeBox = false;
+        dialog.MinimizeBox = false;
 
-        // 设置DPI感知
-        dialog.AutoScaleMode = AutoScaleMode.Dpi;
+        float scaleFactor = GetScaleFactor();
+        dialog.Font = new Font("Microsoft YaHei UI", 9F * scaleFactor, FontStyle.Regular, GraphicsUnit.Pixel);
 
-        // 设置文本渲染质量
         dialog.Paint += delegate(object sender, PaintEventArgs e) {
             e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
         };
@@ -719,7 +764,10 @@ private static Button CreateStyledButton(string text, DialogResult dialogResult)
 
     public static void Main(string[] args)
     {
-        InitializeDPIAwareness();
+        if (Environment.OSVersion.Version.Major >= 6)
+        {
+            SetProcessDPIAware();
+        }
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Show(args);

From 0ff5c4b49f21d4e96b986938516fb497dc4e1f1e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 01:20:20 +0800
Subject: [PATCH 053/332] =?UTF-8?q?win=E8=87=AA=E5=8A=A8=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81=E5=90=91=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=8C=87=E5=AE=9A=E6=8E=A7=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=94=AE=E7=9B=98=E3=80=81=E9=BC=A0=E6=A0=87=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/automation.cs               | 797 ++++++++++++++++++
 plugin/lib/csharp/dialog.cs                   |  92 ++
 plugin/lib/quickcommand.js                    |   9 +-
 .../lib/quickcomposer/windows/automation.js   | 129 +++
 plugin/lib/quickcomposer/windows/index.js     |   2 +
 plugin/lib/quickcomposer/windows/window.js    |   6 +-
 src/js/composer/commands/windowsCommands.js   | 344 ++++----
 7 files changed, 1222 insertions(+), 157 deletions(-)
 create mode 100644 plugin/lib/csharp/automation.cs
 create mode 100644 plugin/lib/quickcomposer/windows/automation.js

diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
new file mode 100644
index 00000000..e93281c9
--- /dev/null
+++ b/plugin/lib/csharp/automation.cs
@@ -0,0 +1,797 @@
+using System;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Drawing;
+using System.Collections.Generic;
+using System.Linq;
+
+public class AutomationTool
+{
+    #region Win32 API
+    [DllImport("user32.dll")]
+    private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
+
+    [DllImport("user32.dll")]
+    private static extern bool PostMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+
+    [DllImport("user32.dll")]
+    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+
+    [DllImport("user32.dll")]
+    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, StringBuilder lParam);
+
+    [DllImport("user32.dll")]
+    private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetFocus();
+
+    [DllImport("user32.dll")]
+    private static extern int EnumChildWindows(IntPtr hWnd, EnumWindowProc lpEnumFunc, IntPtr lParam);
+
+    [DllImport("user32.dll")]
+    private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetForegroundWindow();
+
+    [DllImport("user32.dll")]
+    private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+    [DllImport("user32.dll")]
+    private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+    [DllImport("user32.dll")]
+    private static extern int GetWindowTextLength(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool IsWindowVisible(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+    [DllImport("user32.dll")]
+    private static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
+
+    [DllImport("user32.dll")]
+    private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+    private const uint WM_KEYDOWN = 0x0100;
+    private const uint WM_KEYUP = 0x0101;
+    private const uint WM_CHAR = 0x0102;
+    private const uint WM_SETTEXT = 0x000C;
+    private const uint WM_LBUTTONDOWN = 0x0201;
+    private const uint WM_LBUTTONUP = 0x0202;
+    private const uint WM_RBUTTONDOWN = 0x0204;
+    private const uint WM_RBUTTONUP = 0x0205;
+    private const uint WM_LBUTTONDBLCLK = 0x0203;
+
+    private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
+    private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct RECT
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct POINT
+    {
+        public int X;
+        public int Y;
+    }
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetParent(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetAncestor(IntPtr hwnd, int flags);
+
+    private const int GA_ROOT = 2;
+
+    // 添加工具栏相关的常量和结构体
+    private const uint TB_BUTTONCOUNT = 0x0418;
+    private const uint TB_GETBUTTON = 0x0417;
+    private const uint TB_GETBUTTONTEXT = 0x042D;
+    private const uint TB_GETITEMRECT = 0x041D;
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct TBBUTTON
+    {
+        public int iBitmap;
+        public int idCommand;
+        public byte fsState;
+        public byte fsStyle;
+        public byte bReserved1;
+        public byte bReserved2;
+        public IntPtr dwData;
+        public IntPtr iString;
+    }
+
+    // 添加 SendMessage 重载
+    [DllImport("user32.dll")]
+    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref TBBUTTON lParam);
+
+    [DllImport("user32.dll")]
+    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref RECT lParam);
+    #endregion
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        string action = GetArgumentValue(args, "-action");
+        string value = GetArgumentValue(args, "-value");
+        string window = GetArgumentValue(args, "-window");
+        string control = GetArgumentValue(args, "-control");
+        string filter = GetArgumentValue(args, "-filter");
+        string pos = GetArgumentValue(args, "-pos");
+        bool background = HasArgument(args, "-background");
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "keyboard":
+                    HandleKeyboardOperation(args);
+                    break;
+                case "mouse":
+                    HandleMouseOperation(args);
+                    break;
+                case "inspect":
+                    HandleInspectOperation(args);
+                    break;
+                default:
+                    Console.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static List<IntPtr> FindTargetWindows(string window)
+    {
+        List<IntPtr> targetWindows = new List<IntPtr>();
+        if (string.IsNullOrEmpty(window))
+        {
+            targetWindows.Add(GetForegroundWindow());
+        }
+        else
+        {
+            // 查找所有匹配的窗口
+            EnumWindows((hwnd, param) =>
+            {
+                StringBuilder title = new StringBuilder(256);
+                GetWindowText(hwnd, title, title.Capacity);
+                string windowTitle = title.ToString();
+
+                if (!string.IsNullOrEmpty(windowTitle) &&
+                    windowTitle.IndexOf(window, StringComparison.OrdinalIgnoreCase) >= 0)
+                {
+                    targetWindows.Add(hwnd);
+                }
+                return true;
+            }, IntPtr.Zero);
+
+            if (targetWindows.Count == 0)
+            {
+                Console.WriteLine("Error: 未找到匹配的窗口");
+                return targetWindows;
+            }
+
+            // 如果找到多个窗口，输出所有窗口信息
+            if (targetWindows.Count > 1)
+            {
+                Console.WriteLine("找到 {0} 个匹配窗口:", targetWindows.Count);
+                foreach (IntPtr hwnd in targetWindows)
+                {
+                    StringBuilder title = new StringBuilder(256);
+                    GetWindowText(hwnd, title, title.Capacity);
+                    Console.WriteLine("0x{0:X} - {1}", hwnd.ToInt64(), title);
+                }
+            }
+        }
+
+        return targetWindows;
+    }
+
+    private static void HandleKeyboardOperation(string[] args)
+    {
+        string window = GetArgumentValue(args, "-window");
+        string control = GetArgumentValue(args, "-control");
+        string action = GetArgumentValue(args, "-action");
+        string value = GetArgumentValue(args, "-value");
+        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+
+        if (string.IsNullOrEmpty(action))
+        {
+            Console.WriteLine("Error: keyboard操作需要指定 -action 参数");
+            return;
+        }
+
+        var targetWindows = FindTargetWindows(window);
+        if (targetWindows.Count == 0)
+        {
+            return;
+        }
+
+        foreach (IntPtr hWnd in targetWindows)
+        {
+            IntPtr targetHandle = hWnd;
+
+            // 如果指定了控件，递归查找控件句柄
+            if (!string.IsNullOrEmpty(control))
+            {
+                IntPtr hControl = FindControl(hWnd, control);
+                if (hControl != IntPtr.Zero)
+                {
+                    targetHandle = hControl;
+                }
+                else
+                {
+                    Console.WriteLine(string.Format("Warning: 在窗口 0x{0:X} 中未找到指定控件", hWnd.ToInt64()));
+                    continue;
+                }
+            }
+
+            // 只在非后台操作时激活窗口
+            if (!background)
+            {
+                SetForegroundWindow(hWnd);
+                Thread.Sleep(50); // 等待窗口激活
+            }
+
+            switch (action.ToLower())
+            {
+                case "keys":
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        Console.WriteLine("Error: 发送按键需要指定 -value 参数");
+                        return;
+                    }
+                    SendKeys(targetHandle, value);
+                    break;
+
+                case "text":
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        Console.WriteLine("Error: 发送文本需要指定 -value 参数");
+                        return;
+                    }
+                    SendText(targetHandle, value);
+                    break;
+
+                default:
+                    Console.WriteLine("Error: 不支持的keyboard操作类型");
+                    break;
+            }
+        }
+    }
+
+    private static void HandleMouseOperation(string[] args)
+    {
+        string window = GetArgumentValue(args, "-window");
+        string control = GetArgumentValue(args, "-control");
+        string controlText = GetArgumentValue(args, "-text");
+        string action = GetArgumentValue(args, "-action");
+        string position = GetArgumentValue(args, "-pos");
+        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+
+        if (string.IsNullOrEmpty(action))
+        {
+            Console.WriteLine("Error: mouse操作需要指定 -action 参数");
+            return;
+        }
+
+        var targetWindows = FindTargetWindows(window);
+        if (targetWindows.Count == 0)
+        {
+            return;
+        }
+
+        foreach (IntPtr hWnd in targetWindows)
+        {
+            IntPtr targetHandle = hWnd;
+
+            // 如果指定了控件类名和文本，查找匹配的控件
+            if (!string.IsNullOrEmpty(control) || !string.IsNullOrEmpty(controlText))
+            {
+                targetHandle = FindControlByTextAndClass(hWnd, controlText, control);
+                if (targetHandle == IntPtr.Zero)
+                {
+                    Console.WriteLine(string.Format("Warning: 在窗口 0x{0:X} 中未找到指定控件", hWnd.ToInt64()));
+                    continue;
+                }
+            }
+
+            // 只在非后台操作时激活窗口
+            if (!background)
+            {
+                SetForegroundWindow(hWnd);
+                Thread.Sleep(50);
+            }
+
+            // 获取点击坐标
+            int x = 0, y = 0;
+            if (!string.IsNullOrEmpty(position))
+            {
+                // 使用指定坐标
+                string[] pos = position.Split(',');
+                if (pos.Length == 2)
+                {
+                    x = int.Parse(pos[0]);
+                    y = int.Parse(pos[1]);
+                }
+            }
+            else
+            {
+                // 如果没有指定坐标，点击控件中心
+                RECT rect;
+                if (GetWindowRect(targetHandle, out rect))
+                {
+                    x = (rect.Right - rect.Left) / 2;
+                    y = (rect.Bottom - rect.Top) / 2;
+                }
+            }
+
+            int lParam = (y << 16) | (x & 0xFFFF);
+
+            switch (action.ToLower())
+            {
+                case "click":
+                    SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                    break;
+
+                case "rightclick":
+                    SendMessage(targetHandle, WM_RBUTTONDOWN, 0, lParam);
+                    SendMessage(targetHandle, WM_RBUTTONUP, 0, lParam);
+                    break;
+
+                case "doubleclick":
+                    SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                    SendMessage(targetHandle, WM_LBUTTONDBLCLK, 0, lParam);
+                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                    break;
+
+                default:
+                    Console.WriteLine("Error: 不支持的mouse操作类型");
+                    break;
+            }
+        }
+    }
+
+    private static void SendKeys(IntPtr hWnd, string keys)
+    {
+        // 解析按键组合
+        string[] keyArray = keys.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+        foreach (string keyCombo in keyArray)
+        {
+            string[] modifiers = keyCombo.Trim().Split('+');
+            List<byte> modifierKeys = new List<byte>();
+            byte mainKey = 0;
+
+            // 处理每个按键
+            for (int i = 0; i < modifiers.Length; i++)
+            {
+                byte vKey = GetVirtualKeyCode(modifiers[i].Trim());
+                if (i < modifiers.Length - 1)
+                {
+                    modifierKeys.Add(vKey);
+                }
+                else
+                {
+                    mainKey = vKey;
+                }
+            }
+
+            // 按下修饰键
+            foreach (byte modifier in modifierKeys)
+            {
+                PostMessage(hWnd, WM_KEYDOWN, modifier, 0);
+            }
+
+            // 按下主键
+            if (mainKey > 0)
+            {
+                PostMessage(hWnd, WM_KEYDOWN, mainKey, 0);
+                Thread.Sleep(10);
+                PostMessage(hWnd, WM_KEYUP, mainKey, 0);
+            }
+
+            // 释放修饰键
+            for (int i = modifierKeys.Count - 1; i >= 0; i--)
+            {
+                PostMessage(hWnd, WM_KEYUP, modifierKeys[i], 0);
+            }
+
+            // 如果有多个按键组合，等待一下
+            if (keyArray.Length > 1)
+            {
+                Thread.Sleep(50);
+            }
+        }
+    }
+
+    private static void SendText(IntPtr hWnd, string text)
+    {
+        StringBuilder sb = new StringBuilder(text);
+        SendMessage(hWnd, WM_SETTEXT, 0, sb);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static bool HasArgument(string[] args, string key)
+    {
+        return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static byte GetVirtualKeyCode(string key)
+    {
+        switch (key.ToLower())
+        {
+            case "ctrl": return 0x11;
+            case "alt": return 0x12;
+            case "shift": return 0x10;
+            case "win": return 0x5B;
+            case "enter": return 0x0D;
+            case "tab": return 0x09;
+            case "esc": return 0x1B;
+            case "space": return 0x20;
+            case "backspace": return 0x08;
+            case "delete": return 0x2E;
+            default:
+                if (key.Length == 1)
+                {
+                    return (byte)key.ToUpper()[0];
+                }
+                throw new ArgumentException(string.Format("不支持的按键: {0}", key));
+        }
+    }
+
+    private static IntPtr FindControlRecursive(IntPtr parentHandle, string targetClassName)
+    {
+        if (string.IsNullOrEmpty(targetClassName))
+            return IntPtr.Zero;
+
+        IntPtr foundHandle = IntPtr.Zero;
+        List<IntPtr> childHandles = new List<IntPtr>();
+
+        // 枚举所有子窗口
+        EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
+        {
+            // 获取类名
+            StringBuilder classNameBuffer = new StringBuilder(256);
+            GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
+
+            // 检查是否匹配
+            if (classNameBuffer.ToString().Equals(targetClassName, StringComparison.OrdinalIgnoreCase))
+            {
+                foundHandle = handle;
+                return false; // 找到后停止枚举
+            }
+
+            childHandles.Add(handle);
+            return true;
+        });
+
+        EnumChildWindows(parentHandle, childProc, IntPtr.Zero);
+
+        // 如果在当前层级没找到，递归查找子窗口
+        if (foundHandle == IntPtr.Zero)
+        {
+            foreach (IntPtr childHandle in childHandles)
+            {
+                foundHandle = FindControlRecursive(childHandle, targetClassName);
+                if (foundHandle != IntPtr.Zero)
+                    break;
+            }
+        }
+
+        return foundHandle;
+    }
+
+    // 修改 HandleKeyboardOperation 和 HandleMouseOperation 中查找控件的部分
+    private static IntPtr FindControl(IntPtr parentHandle, string controlClass)
+    {
+        // 先尝试直接查找
+        IntPtr hControl = FindWindowEx(parentHandle, IntPtr.Zero, controlClass, null);
+        if (hControl != IntPtr.Zero)
+            return hControl;
+
+        // 如果直接查找失败，进行递归查找
+        return FindControlRecursive(parentHandle, controlClass);
+    }
+
+    private static IntPtr FindControlByTextAndClass(IntPtr parentHandle, string controlText, string className)
+    {
+        if (string.IsNullOrEmpty(controlText) && string.IsNullOrEmpty(className))
+            return IntPtr.Zero;
+
+        List<IntPtr> matchedControls = new List<IntPtr>();
+        Queue<IntPtr> searchQueue = new Queue<IntPtr>();
+        searchQueue.Enqueue(parentHandle);
+
+        while (searchQueue.Count > 0)
+        {
+            IntPtr currentHandle = searchQueue.Dequeue();
+            List<IntPtr> children = new List<IntPtr>();
+
+            // 枚举当前层级的子窗口
+            EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
+            {
+                bool match = true;
+
+                // 检查类名（如果指定）
+                if (!string.IsNullOrEmpty(className))
+                {
+                    StringBuilder classNameBuffer = new StringBuilder(256);
+                    GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
+                    if (!className.Equals(classNameBuffer.ToString(), StringComparison.OrdinalIgnoreCase))
+                    {
+                        match = false;
+                    }
+                }
+
+                // 检查控件文本（如果指定）
+                if (match && !string.IsNullOrEmpty(controlText))
+                {
+                    StringBuilder textBuffer = new StringBuilder(256);
+                    GetWindowText(handle, textBuffer, textBuffer.Capacity);
+                    string windowText = textBuffer.ToString();
+                    if (!windowText.Contains(controlText))
+                    {
+                        match = false;
+                    }
+                }
+
+                // 检查控件是否可见
+                if (match && !IsWindowVisible(handle))
+                {
+                    match = false;
+                }
+
+                if (match)
+                {
+                    matchedControls.Add(handle);
+                }
+
+                // 将子窗口加入搜索队列
+                children.Add(handle);
+                return true;
+            });
+
+            EnumChildWindows(currentHandle, childProc, IntPtr.Zero);
+
+            // 将所有子窗口加入搜索队列
+            foreach (IntPtr child in children)
+            {
+                searchQueue.Enqueue(child);
+            }
+        }
+
+        if (matchedControls.Count == 0)
+        {
+            return IntPtr.Zero;
+        }
+        else if (matchedControls.Count > 1)
+        {
+            Console.WriteLine("Warning: 找到多个匹配控件:");
+            foreach (IntPtr handle in matchedControls)
+            {
+                StringBuilder text = new StringBuilder(256);
+                GetWindowText(handle, text, text.Capacity);
+                StringBuilder classBuffer = new StringBuilder(256);
+                GetClassName(handle, classBuffer, classBuffer.Capacity);
+                Console.WriteLine(string.Format("0x{0:X} - Class: {1}, Text: {2}",
+                    handle.ToInt64(), classBuffer, text));
+            }
+        }
+
+        return matchedControls[0];
+    }
+
+    private static void HandleInspectOperation(string[] args)
+    {
+        string window = GetArgumentValue(args, "-window");
+        string filter = GetArgumentValue(args, "-filter");
+        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+
+        var targetWindows = FindTargetWindows(window);
+        if (targetWindows.Count == 0)
+        {
+            return;
+        }
+
+        // 输出所有匹配窗口的信息
+        StringBuilder json = new StringBuilder();
+        json.Append("[");
+        bool firstWindow = true;
+
+        foreach (IntPtr hWnd in targetWindows)
+        {
+            // 只在非后台操作时激活窗口
+            if (!background)
+            {
+                SetForegroundWindow(hWnd);
+                Thread.Sleep(50);
+            }
+
+            if (!firstWindow)
+            {
+                json.Append(",");
+            }
+            firstWindow = false;
+
+            json.Append(GetControlsTree(hWnd, filter));
+        }
+
+        json.Append("]");
+        Console.WriteLine(json.ToString());
+    }
+
+    private static string GetControlsTree(IntPtr parentHandle, string filter, int depth = 0)
+    {
+        if (parentHandle == IntPtr.Zero)
+            return "{}";
+
+        StringBuilder json = new StringBuilder();
+        json.Append("{");
+
+        // 获取窗口信息
+        StringBuilder title = new StringBuilder(256);
+        StringBuilder className = new StringBuilder(256);
+        GetWindowText(parentHandle, title, title.Capacity);
+        GetClassName(parentHandle, className, className.Capacity);
+
+        // 获取窗口位置和大小
+        RECT windowRect;
+        GetWindowRect(parentHandle, out windowRect);
+
+        bool isVisible = IsWindowVisible(parentHandle);
+
+        // 检查当前节点是否匹配过滤条件
+        bool matchFilter = true;
+        if (!string.IsNullOrEmpty(filter))
+        {
+            matchFilter =
+                title.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0 ||
+                className.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        // 添加节点信息
+        json.AppendFormat(
+            "\"handle\":\"0x{0:X}\",\"class\":\"{1}\",\"text\":\"{2}\",\"visible\":{3},\"location\":{{\"x\":{4},\"y\":{5},\"width\":{6},\"height\":{7}}},\"matched\":{8},\"children\":[",
+            parentHandle.ToInt64(),
+            className.ToString().Replace("\"", "\\\""),
+            title.ToString().Replace("\"", "\\\""),
+            isVisible.ToString().ToLower(),
+            windowRect.Left,
+            windowRect.Top,
+            windowRect.Right - windowRect.Left,
+            windowRect.Bottom - windowRect.Top,
+            matchFilter.ToString().ToLower()
+        );
+
+        // 递归获取子控件树
+        List<string> childJsons = new List<string>();
+
+        EnumChildWindows(parentHandle, (hwnd, param) =>
+        {
+            string childJson = GetControlsTree(hwnd, filter, depth + 1);
+            if (!string.IsNullOrEmpty(childJson) && childJson != "{}")
+            {
+                childJsons.Add(childJson);
+            }
+            return true;
+        }, IntPtr.Zero);
+
+        // 添加子节点JSON
+        if (childJsons.Count > 0)
+        {
+            json.Append(string.Join(",", childJsons));
+        }
+
+        json.Append("]}");
+
+        return json.ToString();
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 界面自动化工具使用说明
+==========================
+
+基本语法:
+automation.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. keyboard - 键盘操作
+2. mouse   - 鼠标操作
+3. inspect - 获取控件树
+
+通用参数:
+--------
+-window    窗口标题或句柄（支持模糊匹配）
+-control   控件类名
+-background 后台操作，不激活窗口，默认激活
+
+键盘操作参数:
+-----------
+-action    操作类型：keys（按键）或text（文本）
+-value     要发送的按键或文本内容
+
+鼠标操作参数:
+-----------
+-action    操作类型：click（单击）、doubleclick（双击）、rightclick（右键）
+-text      控件文本
+-pos       点击坐标（x,y）
+
+控件树参数:
+---------
+-filter    过滤条件（控件类名或文本）
+
+使用示例:
+--------
+1. 发送按键到指定窗口：
+   automation.exe -type keyboard -action keys -window ""记事本"" -value ""ctrl+a""
+
+2. 发送文本到指定控件：
+   automation.exe -type keyboard -action text -window ""记事本"" -control ""Edit"" -value ""Hello World""
+
+3. 点击指定控件：
+   automation.exe -type mouse -action click -window ""记事本"" -control ""Button"" -text ""确定""
+
+4. 后台发送文本：
+   automation.exe -type keyboard -action text -window ""记事本"" -value ""Hello"" -background
+
+5. 获取窗口控件树：
+   automation.exe -type inspect -window ""记事本"" -filter ""button""
+
+注意事项:
+--------
+1. 窗口标题支持模糊匹配
+2. 控件类名需要完全匹配
+3. 后台操作可能会影响某些程序的响应
+4. 建议先用inspect获取正确的控件信息再进行操作
+";
+        Console.WriteLine(help);
+    }
+}
diff --git a/plugin/lib/csharp/dialog.cs b/plugin/lib/csharp/dialog.cs
index a1f50aa4..bb455eb1 100644
--- a/plugin/lib/csharp/dialog.cs
+++ b/plugin/lib/csharp/dialog.cs
@@ -790,4 +790,96 @@ public struct RECT
             public int Bottom;
         }
     }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 对话框生成工具使用说明
+==========================
+
+基本语法:
+dialog.exe -type <对话框类型> [参数...]
+
+对话框类型:
+----------
+1. message  - 消息对话框，显示一条消息
+2. input    - 输入对话框，支持多个输入框
+3. confirm  - 确认对话框，带确定和取消按钮
+4. buttons  - 按钮对话框，支持多个自定义按钮
+5. textarea - 文本区域对话框，用于编辑大段文本
+
+通用参数:
+--------
+-type      对话框类型（必需）
+          可选值：message, input, confirm, buttons, textarea
+
+-title     对话框标题（必需）
+          示例：-title ""提示""
+
+-content   对话框内容
+          - message/confirm/textarea：显示的文本内容
+          - input：输入框提示文本，多个输入框用|||||分隔
+          - buttons：按钮文本，多个按钮用|||||分隔
+
+-iconpath  对话框图标路径（可选）
+          示例：-iconpath ""D:\icons\app.ico""
+
+使用示例:
+--------
+1. 显示消息对话框：
+   dialog.exe -type message -title ""提示"" -content ""操作已完成""
+
+2. 显示输入对话框（单个输入）：
+   dialog.exe -type input -title ""输入"" -content ""请输入用户名：""
+
+3. 显示输入对话框（多个输入）：
+   dialog.exe -type input -title ""用户信息"" -content ""用户名：|||||密码：|||||邮箱：""
+
+4. 显示确认对话框：
+   dialog.exe -type confirm -title ""确认"" -content ""确定要删除这个文件吗？""
+
+5. 显示按钮对话框：
+   dialog.exe -type buttons -title ""选择操作"" -content ""保存|||||不保存|||||取消""
+
+6. 显示文本区域对话框：
+   dialog.exe -type textarea -title ""编辑文本"" -content ""在这里输入内容...""
+
+返回值:
+------
+1. message对话框：
+   无返回值
+
+2. input对话框：
+   返回JSON数组，包含所有输入框的值
+   示例：[""user"",""123456"",""user@email.com""]
+   用户取消：[]
+
+3. confirm对话框：
+   确定：true
+   取消：false
+   关闭窗口：{}
+
+4. buttons对话框：
+   返回JSON对象，包含按钮id和文本
+   示例：{""id"":0,""text"":""保存""}
+   关闭窗口：{}
+
+5. textarea对话框：
+   返回编辑后的文本内容
+   取消：空字符串
+
+注意事项:
+--------
+1. 包含空格的参数值需要用引号括起来
+2. 多个输入框或按钮的文本用|||||（5个竖线）分隔
+3. 所有对话框都支持自定义图标（使用-iconpath参数）
+4. 对话框会自动适应DPI缩放
+5. 所有对话框都支持文本选择和复制
+
+更多信息:
+--------
+遇到问题请查看错误信息，错误信息会提供详细的原因说明。
+";
+        Console.WriteLine(help);
+    }
 }
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 4a555a67..91dcce28 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -208,7 +208,14 @@ const quickcommand = {
         if (err) return reject(err.toString());
         // 添加命令行参数
         const argsStr =
-          args.length > 0 ? " " + args.map((arg) => `"${arg}"`).join(" ") : "";
+          args.length > 0
+            ? " " +
+              args
+                .map((arg) =>
+                  arg.startsWith("-") ? arg : `"${arg}"`
+                )
+                .join(" ")
+            : "";
         child_process.exec(
           `${cscPath} /nologo /out:${tempBuildFile} ${tempCsharpFile} && ${tempBuildFile}${argsStr}`,
           {
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
new file mode 100644
index 00000000..5f92fdf1
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -0,0 +1,129 @@
+const fs = require("fs");
+const path = require("path");
+const quickcommand = require("../../quickcommand");
+
+// 读取 automation.cs 模板
+const automationTemplate = fs.readFileSync(
+  path.join(__dirname, "..", "..", "csharp", "automation.cs"),
+  "utf8"
+);
+
+/**
+ * 键盘操作
+ * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} keys 键盘按键
+ * @param {object} options 选项
+ * @param {string} options.control 控件类名
+ * @param {boolean} options.background 是否后台操作
+ * @returns {boolean} 是否成功
+ */
+const sendKeys = async function (windowType, window, keys, options = {}) {
+  const { control, background = false } = options;
+  const args = ["-type", "keyboard", "-action", "keys", "-value", keys];
+
+  if (windowType !== "active" && window) args.push("-window", window);
+  if (control) args.push("-control", control);
+  args.push("-background", background.toString());
+
+  const result = await quickcommand.runCsharp(automationTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 发送文本
+ * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} text 文本
+ * @param {object} options 选项
+ * @param {string} options.control 控件类名
+ * @param {boolean} options.background 是否后台操作
+ * @returns {boolean} 是否成功
+ */
+const sendText = async function (windowType, window, text, options = {}) {
+  const { control, background = false } = options;
+  const args = ["-type", "keyboard", "-action", "text", "-value", text];
+
+  if (windowType !== "active" && window) args.push("-window", window);
+  if (control) args.push("-control", control);
+  args.push("-background", background.toString());
+
+  const result = await quickcommand.runCsharp(automationTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 鼠标点击
+ * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} action 动作：click/doubleClick/rightClick
+ * @param {object} options 选项
+ * @param {string} options.control 控件类名
+ * @param {string} options.text 控件文本
+ * @param {string} options.pos 点击位置：x,y
+ * @param {boolean} options.background 是否后台操作
+ * @returns {boolean} 是否成功
+ */
+const click = async function (
+  windowType,
+  window,
+  action = "click",
+  options = {}
+) {
+  const { control, text, pos, background = false } = options;
+  const args = ["-type", "mouse", "-action", action];
+
+  if (windowType !== "active" && window) args.push("-window", window);
+  if (control) args.push("-control", control);
+  if (text) args.push("-text", text);
+  if (pos) args.push("-pos", pos);
+  args.push("-background", background.toString());
+
+  const result = await quickcommand.runCsharp(automationTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 获取窗口控件树
+ * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {object} options 选项
+ * @param {string} options.filter 过滤条件
+ * @param {boolean} options.background 是否后台操作
+ * @returns {object} 控件树
+ */
+const inspectWindow = async function (windowType, window, options = {}) {
+  const { filter, background = false } = options;
+  const args = ["-type", "inspect"];
+
+  if (windowType !== "active" && window) args.push("-window", window);
+  if (filter) args.push("-filter", filter);
+  args.push("-background", background.toString());
+
+  const result = await quickcommand.runCsharp(automationTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析控件树失败:", error);
+    return null;
+  }
+};
+
+module.exports = {
+  sendKeys,
+  sendText,
+  click,
+  inspectWindow,
+};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index e5a7774e..2435ddfb 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -1,7 +1,9 @@
 const window = require("./window");
 const message = require("./message");
+const automation = require("./automation");
 
 module.exports = {
   window,
   message,
+  automation,
 };
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
index af160970..8f25ba03 100644
--- a/plugin/lib/quickcomposer/windows/window.js
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -489,7 +489,11 @@ async function getWindowInfo(method, value) {
   `;
 
   const result = await quickcommand.runCsharp(script);
-  return JSON.parse(result);
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    return {};
+  }
 }
 
 /**
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index d908b703..98d0b692 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,3 +1,50 @@
+const controlClass = [
+  // 基础控件
+  { value: "Button", label: "按钮 (Button)" },
+  { value: "Edit", label: "编辑框 (Edit)" },
+  { value: "Static", label: "静态文本 (Static)" },
+  { value: "ComboBox", label: "下拉框 (ComboBox)" },
+  { value: "ListBox", label: "列表框 (ListBox)" },
+  { value: "CheckBox", label: "复选框 (CheckBox)" },
+  { value: "RadioButton", label: "单选框 (RadioButton)" },
+
+  // 常见对话框控件
+  { value: "SysListView32", label: "列表视图 (SysListView32)" },
+  { value: "SysTreeView32", label: "树形视图 (SysTreeView32)" },
+  { value: "SysTabControl32", label: "选项卡 (SysTabControl32)" },
+  { value: "msctls_progress32", label: "进度条 (msctls_progress32)" },
+  { value: "msctls_trackbar32", label: "滑块 (msctls_trackbar32)" },
+  { value: "msctls_updown32", label: "数字调节器 (msctls_updown32)" },
+
+  // 文件对话框相关
+  { value: "DirectUIHWND", label: "文件浏览器 (DirectUIHWND)" },
+  { value: "ToolbarWindow32", label: "工具栏 (ToolbarWindow32)" },
+  { value: "ComboBoxEx32", label: "扩展下拉框 (ComboBoxEx32)" },
+
+  // 常见应用程序控件
+  { value: "RICHEDIT50W", label: "富文本编辑框 (RICHEDIT50W)" },
+  { value: "Scintilla", label: "代码编辑器 (Scintilla)" },
+  { value: "WebView2", label: "Edge浏览器 (WebView2)" },
+  {
+    value: "Chrome_RenderWidgetHostHWND",
+    label: "Chrome渲染 (Chrome_RenderWidgetHostHWND)",
+  },
+
+  // 系统控件
+  { value: "Shell_TrayWnd", label: "任务栏 (Shell_TrayWnd)" },
+  { value: "TrayNotifyWnd", label: "通知区域 (TrayNotifyWnd)" },
+  { value: "ReBarWindow32", label: "工具条容器 (ReBarWindow32)" },
+  { value: "TaskListThumbnailWnd", label: "任务预览 (TaskListThumbnailWnd)" },
+
+  // 通用容器
+  { value: "Window", label: "窗口 (Window)" },
+  { value: "Dialog", label: "对话框 (Dialog)" },
+  { value: "#32770", label: "标准对话框 (#32770)" },
+  { value: "MDIClient", label: "MDI客户区 (MDIClient)" },
+  { value: "ScrollBar", label: "滚动条 (ScrollBar)" },
+  { value: "GroupBox", label: "分组框 (GroupBox)" },
+];
+
 export const windowsCommands = {
   label: "Win自动化",
   icon: "window",
@@ -202,9 +249,10 @@ export const windowsCommands = {
       isAsync: true,
     },
     {
-      value: "quickcomposer.windows.message.sendMouseClick",
-      label: "发送消息",
-      icon: "send",
+      value: "quickcomposer.windows.automation.inspectWindow",
+      label: "界面自动化",
+      desc: "Windows界面自动化操作",
+      icon: "smart_button",
       isAsync: true,
       config: [
         {
@@ -231,191 +279,177 @@ export const windowsCommands = {
       ],
       subCommands: [
         {
-          value: "quickcomposer.windows.message.sendMouseClick",
-          label: "鼠标点击",
-          icon: "mouse",
+          value: "quickcomposer.windows.automation.inspectWindow",
+          label: "获取控件树",
+          icon: "account_tree",
+          outputVariable: "controlsTree",
+          saveOutput: true,
           config: [
             {
-              key: "type",
-              defaultValue: "click",
-              hidden: true,
-            },
-            {
-              key: "button",
-              label: "按键",
-              component: "q-select",
-              icon: "mouse",
-              width: 4,
-              options: [
-                { label: "左键", value: "left" },
-                { label: "右键", value: "right" },
-                { label: "中键", value: "middle" },
-              ],
-              defaultValue: "left",
-            },
-            {
-              key: "x",
-              label: "X坐标",
-              component: "NumberInput",
-              icon: "arrow_right",
-              width: 4,
-              defaultValue: 0,
-            },
-            {
-              key: "y",
-              label: "Y坐标",
-              component: "NumberInput",
-              icon: "arrow_drop_down",
-              width: 4,
-              defaultValue: 0,
+              key: "options",
+              component: "OptionEditor",
+              width: 12,
+              options: {
+                filter: {
+                  label: "控件过滤",
+                  component: "VariableInput",
+                  icon: "filter_alt",
+                  options: {
+                    items: controlClass,
+                  },
+                  width: 8,
+                  placeholder: "可选，输入要过滤的控件类名或文本",
+                },
+                background: {
+                  label: "后台操作",
+                  component: "CheckButton",
+                  icon: "back_hand",
+                  width: 4,
+                },
+              },
+              defaultValue: {
+                background: true,
+              },
             },
           ],
         },
         {
-          value: "quickcomposer.windows.message.sendKeyPress",
-          label: "键盘按键",
-          icon: "keyboard",
+          value: "quickcomposer.windows.automation.click",
+          label: "点击控件",
+          icon: "mouse",
           config: [
             {
-              key: "type",
-              defaultValue: "key",
-              hidden: true,
-            },
-            {
-              key: "keyCode",
-              label: "按键码",
-              component: "NumberInput",
-              icon: "keyboard",
-              width: 6,
-              defaultValue: 0,
-            },
-            {
-              key: "ctrl",
-              label: "Ctrl",
-              component: "Switch",
-              width: 3,
-              defaultValue: false,
-            },
-            {
-              key: "alt",
-              label: "Alt",
-              component: "Switch",
-              width: 3,
-              defaultValue: false,
-            },
-            {
-              key: "shift",
-              label: "Shift",
-              component: "Switch",
-              width: 3,
-              defaultValue: false,
+              key: "action",
+              component: "ButtonGroup",
+              width: 12,
+              options: [
+                { label: "单击", value: "click" },
+                { label: "双击", value: "doubleclick" },
+                { label: "右键", value: "rightclick" },
+              ],
+              defaultValue: "click",
             },
             {
-              key: "hold",
-              label: "按住",
-              component: "Switch",
-              width: 3,
-              defaultValue: false,
+              key: "options",
+              component: "OptionEditor",
+              width: 12,
+              options: {
+                control: {
+                  label: "控件类名",
+                  component: "VariableInput",
+                  icon: "class",
+                  options: {
+                    items: controlClass,
+                  },
+                  width: 6,
+                  placeholder: "可选，和文本至少输入一个",
+                },
+                text: {
+                  label: "控件文本",
+                  component: "VariableInput",
+                  icon: "text_fields",
+                  width: 6,
+                  placeholder: "可选，和控件类名至少输入一个",
+                },
+                pos: {
+                  label: "坐标",
+                  component: "VariableInput",
+                  icon: "place",
+                  width: 6,
+                  placeholder: "可选，格式：x,y",
+                },
+                background: {
+                  label: "后台操作",
+                  component: "CheckButton",
+                  icon: "back_hand",
+                  width: 6,
+                },
+              },
+              defaultValue: {
+                background: true,
+              },
             },
           ],
         },
         {
-          value: "quickcomposer.windows.message.sendText",
-          label: "文本输入",
-          icon: "text_fields",
+          value: "quickcomposer.windows.automation.sendText",
+          label: "发送文本",
+          icon: "keyboard",
           config: [
-            {
-              key: "type",
-              defaultValue: "text",
-              hidden: true,
-            },
             {
               key: "text",
               label: "文本内容",
               component: "VariableInput",
               icon: "text_fields",
               width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.windows.message.sendCommand",
-          label: "窗口命令",
-          icon: "window",
-          config: [
-            {
-              key: "type",
-              defaultValue: "custom",
-              hidden: true,
+              placeholder: "要发送的文本内容",
             },
             {
-              key: "message",
-              label: "命令",
-              component: "q-select",
-              icon: "code",
+              key: "options",
+              component: "OptionEditor",
               width: 12,
-              options: [
-                { label: "关闭窗口", value: "0x0010" }, // WM_CLOSE
-                { label: "销毁窗口", value: "0x0002" }, // WM_DESTROY
-                { label: "激活窗口", value: "0x0006" }, // WM_ACTIVATE
-                { label: "显示窗口", value: "0x0018" }, // WM_SHOWWINDOW
-                { label: "重绘窗口", value: "0x000F" }, // WM_PAINT
-                { label: "窗口尺寸", value: "0x0005" }, // WM_SIZE
-                { label: "窗口位置", value: "0x0003" }, // WM_MOVE
-              ],
-              defaultValue: "0x0010",
-            },
-            {
-              key: "wParam",
-              label: "参数1",
-              component: "NumberInput",
-              icon: "input",
-              width: 6,
-              defaultValue: 0,
-            },
-            {
-              key: "lParam",
-              label: "参数2",
-              component: "NumberInput",
-              icon: "input",
-              width: 6,
-              defaultValue: 0,
+              options: {
+                control: {
+                  label: "目标控件",
+                  component: "VariableInput",
+                  options: {
+                    items: controlClass,
+                  },
+                  icon: "class",
+                  width: 8,
+                  placeholder: "可选，目标控件的类名",
+                },
+                background: {
+                  label: "后台操作",
+                  component: "CheckButton",
+                  icon: "back_hand",
+                  width: 4,
+                },
+              },
+              defaultValue: {
+                background: true,
+              },
             },
           ],
         },
         {
-          value: "quickcomposer.windows.message.sendCustom",
-          label: "自定义消息",
-          icon: "settings",
+          value: "quickcomposer.windows.automation.sendKeys",
+          label: "发送按键",
+          icon: "keyboard_alt",
           config: [
             {
-              key: "type",
-              defaultValue: "custom",
-              hidden: true,
-            },
-            {
-              key: "message",
-              label: "消息ID",
-              component: "NumberInput",
-              icon: "tag",
+              key: "keys",
+              label: "按键序列",
+              component: "VariableInput",
+              icon: "keyboard",
               width: 12,
-              defaultValue: 0,
-            },
-            {
-              key: "wParam",
-              label: "wParam",
-              component: "NumberInput",
-              icon: "input",
-              width: 6,
-              defaultValue: 0,
+              placeholder: "按键组合，多个逗号隔开，如：ctrl+a,a,b",
             },
             {
-              key: "lParam",
-              label: "lParam",
-              component: "NumberInput",
-              icon: "input",
-              width: 6,
-              defaultValue: 0,
+              key: "options",
+              component: "OptionEditor",
+              width: 12,
+              options: {
+                control: {
+                  label: "目标控件",
+                  component: "VariableInput",
+                  options: {
+                    items: controlClass,
+                  },
+                  icon: "class",
+                  width: 8,
+                  placeholder: "可选，目标控件的类名",
+                },
+                background: {
+                  label: "后台操作",
+                  component: "CheckButton",
+                  icon: "back_hand",
+                  width: 4,
+                },
+              },
+              defaultValue: {
+                background: true,
+              },
             },
           ],
         },

From 55be953eef4c95f9f3cd665e5457523d27d34a20 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 01:20:51 +0800
Subject: [PATCH 054/332] =?UTF-8?q?win=E8=87=AA=E5=8A=A8=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=96=B0=E5=A2=9E=E7=9B=91=E6=8E=A7=E5=89=AA=E8=B4=B4?=
 =?UTF-8?q?=E6=9D=BF=E5=92=8C=E6=96=87=E4=BB=B6=E5=A4=B9=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=AD=89=E5=BE=85=E5=89=AA=E8=B4=B4=E6=9D=BF=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E5=92=8C=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E8=BF=94=E5=9B=9E=E5=8F=98=E5=8C=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/monitor.cs                | 279 ++++++++++++++++++++
 plugin/lib/js/monitor.js                    |  49 ++++
 plugin/lib/quickcomposer/windows/index.js   |   2 +
 plugin/lib/quickcomposer/windows/monitor.js |  48 ++++
 src/js/composer/commands/windowsCommands.js |  65 +++++
 5 files changed, 443 insertions(+)
 create mode 100644 plugin/lib/csharp/monitor.cs
 create mode 100644 plugin/lib/js/monitor.js
 create mode 100644 plugin/lib/quickcomposer/windows/monitor.js

diff --git a/plugin/lib/csharp/monitor.cs b/plugin/lib/csharp/monitor.cs
new file mode 100644
index 00000000..5db5adc7
--- /dev/null
+++ b/plugin/lib/csharp/monitor.cs
@@ -0,0 +1,279 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Linq;
+using System.Drawing;
+
+class Monitor {
+    // Win32 API
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool ChangeClipboardChain(IntPtr hWndRemove, IntPtr hWndNewNext);
+
+    private static FileSystemWatcher fsWatcher;
+    private static IntPtr nextClipboardViewer;
+    private static ClipboardForm clipboardForm;
+    private static bool running = true;
+    private static bool listenOnce = false;
+    private static bool isFirstClipboardEvent = true;
+
+    private class ClipboardForm : Form {
+        public ClipboardForm() {
+            this.ShowInTaskbar = false;
+            this.Visible = false;
+            this.WindowState = FormWindowState.Minimized;
+            this.FormBorderStyle = FormBorderStyle.None;
+            this.Size = new System.Drawing.Size(1, 1);
+            this.Load += (sender, e) => {
+                nextClipboardViewer = SetClipboardViewer(this.Handle);
+            };
+            this.FormClosing += (sender, e) => {
+                ChangeClipboardChain(this.Handle, nextClipboardViewer);
+            };
+        }
+
+        protected override CreateParams CreateParams {
+            get {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x80; // WS_EX_TOOLWINDOW
+                return cp;
+            }
+        }
+
+        protected override void WndProc(ref Message m) {
+            if (m.Msg == 0x308) { // WM_DRAWCLIPBOARD
+                if (isFirstClipboardEvent) {
+                    isFirstClipboardEvent = false;
+                } else {
+                    HandleClipboardChanged();
+                    if (listenOnce) {
+                        running = false;
+                        this.BeginInvoke(new Action(this.Close));
+                    }
+                }
+                SendMessage(nextClipboardViewer, m.Msg, m.WParam, m.LParam);
+            }
+            else if (m.Msg == 0x30D) { // WM_CHANGECBCHAIN
+                if (m.WParam == nextClipboardViewer)
+                    nextClipboardViewer = m.LParam;
+                else if (nextClipboardViewer != IntPtr.Zero)
+                    SendMessage(nextClipboardViewer, m.Msg, m.WParam, m.LParam);
+            }
+            base.WndProc(ref m);
+        }
+    }
+
+    public static void ShowHelp() {
+        Console.WriteLine(@"Windows 监控工具使用说明
+用法: monitor.exe -type <监控类型> [参数...]
+
+监控类型:
+  clipboard - 剪贴板监控
+    参数:
+      -once             只监听一次变化就停止（可选）
+    示例:
+      monitor.exe -type clipboard -once
+
+  filesystem - 文件系统监控
+    参数:
+      -path <路径>         要监控的文件夹路径
+      -filter <过滤器>     文件过滤器，如 *.txt（可选，默认监控所有文件）
+      -recursive <bool>    是否监控子文件夹（可选，默认为 true）
+      -once               只监听一次变化就停止（可选）
+    示例:
+      monitor.exe -type filesystem -path C:\MyFolder -filter *.txt -recursive true -once
+
+返回值:
+  监控到的变化会实时输出 JSON 格式的事件信息：
+  剪贴板事件:
+    {""type"": ""clipboard"", ""format"": ""文本/图片/文件"", ""content"": ""变化内容""}
+  文件系统事件:
+    {""type"": ""filesystem"", ""event"": ""created/changed/deleted/renamed"", ""path"": ""文件路径"", ""oldPath"": ""重命名前的路径""}
+
+注意事项:
+  1. 按 Ctrl+C 停止监控
+  2. 剪贴板监控支持文本、图片和文件格式
+  3. 文件系统监控支持文件和文件夹的创建、修改、删除和重命名事件
+  4. 使用 -once 参数可以在监听到第一次变化后自动停止");
+    }
+
+    private static string GetArgumentValue(string[] args, string key) {
+        for (int i = 0; i < args.Length - 1; i++) {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase)) {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static string EscapeJsonString(string str) {
+        if (str == null) return "null";
+        StringBuilder sb = new StringBuilder();
+        foreach (char c in str) {
+            switch (c) {
+                case '\"': sb.Append("\\\""); break;
+                case '\\': sb.Append("\\\\"); break;
+                case '\b': sb.Append("\\b"); break;
+                case '\f': sb.Append("\\f"); break;
+                case '\n': sb.Append("\\n"); break;
+                case '\r': sb.Append("\\r"); break;
+                case '\t': sb.Append("\\t"); break;
+                default:
+                    if (c < ' ') {
+                        sb.Append(string.Format("\\u{0:X4}", (int)c));
+                    }
+                    else {
+                        sb.Append(c);
+                    }
+                    break;
+            }
+        }
+        return string.Format("\"{0}\"", sb.ToString());
+    }
+
+    private static void OutputEvent(string type, string format, string content) {
+        string json = string.Format("{{\"type\": {0}, \"format\": {1}, \"content\": {2}}}",
+            EscapeJsonString(type),
+            EscapeJsonString(format),
+            EscapeJsonString(content));
+        Console.WriteLine(json);
+    }
+
+    private static void OutputFileSystemEvent(string type, string eventType, string path, string oldPath = null) {
+        StringBuilder json = new StringBuilder();
+        json.Append("{\"type\": ").Append(EscapeJsonString(type));
+        json.Append(", \"event\": ").Append(EscapeJsonString(eventType));
+        json.Append(", \"path\": ").Append(EscapeJsonString(path));
+        if (oldPath != null) {
+            json.Append(", \"oldPath\": ").Append(EscapeJsonString(oldPath));
+        }
+        json.Append("}");
+        Console.WriteLine(json.ToString());
+    }
+
+    private static void StartClipboardMonitor() {
+        Thread thread = new Thread(() => {
+            clipboardForm = new ClipboardForm();
+            Application.Run(clipboardForm);
+        });
+
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+    }
+
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+    private static void HandleClipboardChanged() {
+        if (Clipboard.ContainsText()) {
+            OutputEvent("clipboard", "text", Clipboard.GetText());
+        }
+        else if (Clipboard.ContainsImage()) {
+            OutputEvent("clipboard", "image", "image_data");
+        }
+        else if (Clipboard.ContainsFileDropList()) {
+            OutputEvent("clipboard", "files", string.Join(", ", Clipboard.GetFileDropList().Cast<string>()));
+        }
+    }
+
+    private static void StartFileSystemMonitor(string path, string fileFilter, bool includeSubdirectories) {
+        fsWatcher = new FileSystemWatcher(path);
+        fsWatcher.Filter = fileFilter ?? "*.*";
+        fsWatcher.IncludeSubdirectories = includeSubdirectories;
+
+        FileSystemEventHandler handler = (s, e) => {
+            OutputFileSystemEvent("filesystem", e.ChangeType.ToString().ToLower(), e.FullPath);
+            if (listenOnce) {
+                running = false;
+                fsWatcher.Dispose();
+            }
+        };
+
+        RenamedEventHandler renameHandler = (s, e) => {
+            OutputFileSystemEvent("filesystem", "renamed", e.FullPath, e.OldFullPath);
+            if (listenOnce) {
+                running = false;
+                fsWatcher.Dispose();
+            }
+        };
+
+        fsWatcher.Created += handler;
+        fsWatcher.Changed += handler;
+        fsWatcher.Deleted += handler;
+        fsWatcher.Renamed += renameHandler;
+
+        fsWatcher.EnableRaisingEvents = true;
+    }
+
+    private static bool HasArgument(string[] args, string key) {
+        return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
+    }
+
+    public static void Main(string[] args) {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help") {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type)) {
+            Console.Error.WriteLine("Error: 必须指定监控类型 (-type)");
+            return;
+        }
+
+        listenOnce = HasArgument(args, "-once");
+
+        Console.CancelKeyPress += (s, e) => {
+            running = false;
+            if (fsWatcher != null) {
+                fsWatcher.Dispose();
+            }
+            if (clipboardForm != null) {
+                clipboardForm.Invoke(new Action(() => clipboardForm.Close()));
+            }
+            Environment.Exit(0);
+        };
+
+        try {
+            switch (type.ToLower()) {
+                case "clipboard":
+                    StartClipboardMonitor();
+                    break;
+
+                case "filesystem":
+                    string path = GetArgumentValue(args, "-path");
+                    if (string.IsNullOrEmpty(path)) {
+                        Console.Error.WriteLine("Error: 必须指定监控路径 (-path)");
+                        return;
+                    }
+
+                    string filter = GetArgumentValue(args, "-filter");
+                    bool recursive = true;
+                    string recursiveArg = GetArgumentValue(args, "-recursive");
+                    if (!string.IsNullOrEmpty(recursiveArg)) {
+                        recursive = bool.Parse(recursiveArg);
+                    }
+
+                    StartFileSystemMonitor(path, filter, recursive);
+                    break;
+
+                default:
+                    Console.Error.WriteLine(string.Format("Error: 不支持的监控类型: {0}", type));
+                    return;
+            }
+
+            while (running) {
+                Thread.Sleep(100);
+            }
+        }
+        catch (Exception ex) {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+}
diff --git a/plugin/lib/js/monitor.js b/plugin/lib/js/monitor.js
new file mode 100644
index 00000000..c897c021
--- /dev/null
+++ b/plugin/lib/js/monitor.js
@@ -0,0 +1,49 @@
+const fs = require("fs");
+const path = require("path");
+const quickcommand = require("../../quickcommand");
+
+// 读取 monitor.cs 模板
+const monitorTemplate = fs.readFileSync(
+  path.join(__dirname, "..", "csharp", "monitor.cs"),
+  "utf8"
+);
+
+// 监控剪贴板变化
+const watchClipboard = async function () {
+  const args = ["-type", "clipboard"];
+  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+// 监控文件系统变化
+const watchFileSystem = async function (options = {}) {
+  const { path: watchPath, filter = "*.*", recursive = true } = options;
+
+  if (!watchPath) {
+    throw new Error("必须指定监控路径");
+  }
+
+  const args = ["-type", "filesystem", "-path", watchPath];
+
+  if (filter !== "*.*") {
+    args.push("-filter", filter);
+  }
+
+  if (!recursive) {
+    args.push("-recursive", "false");
+  }
+
+  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+module.exports = {
+  watchClipboard,
+  watchFileSystem,
+};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index 2435ddfb..7393a2de 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -1,9 +1,11 @@
 const window = require("./window");
 const message = require("./message");
 const automation = require("./automation");
+const monitor = require("./monitor");
 
 module.exports = {
   window,
   message,
   automation,
+  monitor,
 };
diff --git a/plugin/lib/quickcomposer/windows/monitor.js b/plugin/lib/quickcomposer/windows/monitor.js
new file mode 100644
index 00000000..caa72a74
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/monitor.js
@@ -0,0 +1,48 @@
+const fs = require("fs");
+const path = require("path");
+
+// 读取 monitor.cs 模板
+const monitorTemplate = fs.readFileSync(
+  path.join(__dirname, "..", "..", "csharp", "monitor.cs"),
+  "utf8"
+);
+
+// 监控剪贴板变化
+const watchClipboard = async function () {
+  const args = ["-type", "clipboard", "-once"];
+  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return JSON.parse(result);
+};
+
+// 监控文件系统变化
+const watchFileSystem = async function (watchPath, options = {}) {
+  const { filter = "*.*", recursive = true } = options;
+
+  if (!watchPath) {
+    throw new Error("必须指定监控路径");
+  }
+
+  const args = ["-type", "filesystem", "-path", watchPath, "-once"];
+
+  if (filter !== "*.*") {
+    args.push("-filter", filter);
+  }
+
+  if (!recursive) {
+    args.push("-recursive", "false");
+  }
+
+  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return JSON.parse(result);
+};
+
+module.exports = {
+  watchClipboard,
+  watchFileSystem,
+};
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 98d0b692..48924f38 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -455,5 +455,70 @@ export const windowsCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.windows.monitor.watchClipboard",
+      label: "剪贴板/文件监控",
+      desc: "监控系统变化",
+      icon: "monitor_heart",
+      isAsync: true,
+      outputVariable: "monitorEvent",
+      saveOutput: true,
+      showLoading: true,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.monitor.watchClipboard",
+          label: "等待剪贴板变化",
+          icon: "content_paste",
+        },
+        {
+          value: "quickcomposer.windows.monitor.watchFileSystem",
+          label: "等待文件夹变化",
+          icon: "folder",
+          config: [
+            {
+              label: "监控路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择文件夹",
+                    properties: ["openDirectory"],
+                  },
+                },
+              },
+              placeholder: "要监控的文件夹路径",
+              required: true,
+            },
+            {
+              key: "options",
+              component: "OptionEditor",
+              width: 12,
+              options: {
+                filter: {
+                  label: "文件过滤",
+                  component: "VariableInput",
+                  icon: "filter_alt",
+                  width: 6,
+                  placeholder: "如: *.txt, *.docx",
+                },
+                recursive: {
+                  label: "包含子文件夹",
+                  component: "CheckButton",
+                  icon: "subdirectory_arrow_right",
+                  width: 6,
+                  defaultValue: true,
+                },
+              },
+              defaultValue: {
+                recursive: false,
+              },
+            },
+          ],
+        },
+      ],
+    },
   ],
 };

From 601df1f1e39e769cbdf944aefa22ece43cf1fc9e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 10:44:43 +0800
Subject: [PATCH 055/332] =?UTF-8?q?=E8=B0=83=E6=95=B4C#=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=87=8F=E5=B0=91=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/dialog.cs                   |  18 +-
 plugin/lib/csharp/index.js                    |  93 +++
 .../csharp/{automation.cs => sendmessage.cs}  | 206 +++++--
 plugin/lib/csharp/window.cs                   | 454 +++++++++++++++
 plugin/lib/js/monitor.js                      |  49 --
 plugin/lib/quickcomposer/windows/index.js     |   6 +-
 plugin/lib/quickcomposer/windows/message.js   | 316 ----------
 plugin/lib/quickcomposer/windows/monitor.js   |  13 +-
 .../windows/{automation.js => sendmessage.js} |  47 +-
 plugin/lib/quickcomposer/windows/window.js    | 540 +++---------------
 plugin/lib/systemDialog.js                    |  22 +-
 src/js/composer/commands/uiCommands.js        | 218 +++----
 src/js/composer/commands/windowsCommands.js   |  28 +-
 13 files changed, 953 insertions(+), 1057 deletions(-)
 create mode 100644 plugin/lib/csharp/index.js
 rename plugin/lib/csharp/{automation.cs => sendmessage.cs} (79%)
 create mode 100644 plugin/lib/csharp/window.cs
 delete mode 100644 plugin/lib/js/monitor.js
 delete mode 100644 plugin/lib/quickcomposer/windows/message.js
 rename plugin/lib/quickcomposer/windows/{automation.js => sendmessage.js} (68%)

diff --git a/plugin/lib/csharp/dialog.cs b/plugin/lib/csharp/dialog.cs
index bb455eb1..f647fde7 100644
--- a/plugin/lib/csharp/dialog.cs
+++ b/plugin/lib/csharp/dialog.cs
@@ -17,14 +17,14 @@ public class DialogGenerator
     private const int LOGPIXELSX = 88;
     private const int LOGPIXELSY = 90;
 
-    // 基础尺寸常量 (96 DPI下的尺寸，当前尺寸/1.75)
-    private const int BASE_WIDTH = 515;        // 900/1.75 ≈ 515
-    private const int BASE_HEIGHT = 200;       // 350/1.75 ≈ 200
-    private const int BASE_PADDING = 17;       // 30/1.75 ≈ 17
-    private const int BASE_BUTTON_HEIGHT = 29; // 50/1.75 ≈ 29
-    private const int BASE_BUTTON_WIDTH = 80;  // 140/1.75 ≈ 80
-    private const int BASE_INPUT_HEIGHT = 23;  // 40/1.75 ≈ 23
-    private const int BASE_SPACING = 11;       // 20/1.75 ≈ 11
+    // 基础尺寸常量 (96 DPI下的尺寸，当前尺寸/2)
+    private const int BASE_WIDTH = 450;        // 900/2 = 450
+    private const int BASE_HEIGHT = 175;       // 350/2 = 175
+    private const int BASE_PADDING = 15;       // 30/2 = 15
+    private const int BASE_BUTTON_HEIGHT = 25; // 50/2 = 25
+    private const int BASE_BUTTON_WIDTH = 70;  // 140/2 = 70
+    private const int BASE_INPUT_HEIGHT = 20;  // 40/2 = 20
+    private const int BASE_SPACING = 10;       // 20/2 = 10
 
     // 实际使用的缩放尺寸
     private static int DEFAULT_WIDTH;
@@ -80,7 +80,7 @@ public static DialogResult Show(string[] args)
 
         if (string.IsNullOrEmpty(type) || string.IsNullOrEmpty(title))
         {
-            MessageBox.Show("必须指定 -type 和 -title 参数");
+            ShowHelp();
             return DialogResult.None;
         }
 
diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
new file mode 100644
index 00000000..71fb5dc6
--- /dev/null
+++ b/plugin/lib/csharp/index.js
@@ -0,0 +1,93 @@
+const fs = require("fs");
+const path = require("path");
+const iconv = require("iconv-lite");
+const child_process = require("child_process");
+const { getQuickcommandFolderFile } = require("../getQuickcommandFile");
+const getCsharpFeatureCs = (feature) => {
+  return path.join(__dirname, feature + ".cs");
+};
+
+const getCsharpFeatureExe = async (feature, alwaysBuildNewExe = false) => {
+  const exePath = getQuickcommandFolderFile(feature, "exe");
+  if (!fs.existsSync(exePath) || alwaysBuildNewExe) {
+    await buildCsharpFeature(feature);
+  }
+  return exePath;
+};
+
+const buildCsharpFeature = async (feature) => {
+  return new Promise((resolve, reject) => {
+    const exePath = getQuickcommandFolderFile(feature, "exe");
+    const srcCsPath = getCsharpFeatureCs(feature);
+    const destCsPath = getQuickcommandFolderFile(feature, "cs");
+    const cscPath = getCscPath();
+    fs.copyFile(srcCsPath, destCsPath, (err) => {
+      if (err) return reject(err.toString());
+      child_process.exec(
+        `${cscPath} /nologo /out:${exePath} ${destCsPath}`,
+        { encoding: null },
+        (err, stdout) => {
+          if (err) return reject(iconv.decode(stdout, "gbk"));
+          else resolve(iconv.decode(stdout, "gbk"));
+          fs.unlink(destCsPath, () => {});
+        }
+      );
+    });
+  });
+};
+
+const getCscPath = () => {
+  const cscPath = path.join(
+    process.env.WINDIR,
+    "Microsoft.NET",
+    "Framework",
+    "v4.0.30319",
+    "csc.exe"
+  );
+  if (!fs.existsSync(cscPath)) {
+    cscPath = path.join(
+      process.env.WINDIR,
+      "Microsoft.NET",
+      "Framework",
+      "v3.5",
+      "csc.exe"
+    );
+  }
+  if (!fs.existsSync(cscPath)) {
+    throw new Error("未安装.NET Framework");
+  }
+  return cscPath;
+};
+
+/**
+ * 运行C#插件
+ * @param {string} feature - 插件名称
+ * @param {string[]} args - 参数
+ * @param {object} options - 选项
+ * @param {boolean} options.alwaysBuildNewExe - 是否总是构建新的可执行文件
+ * @returns {Promise<string>} - 返回结果
+ */
+const runCsharpFeature = async (feature, args = [], options = {}) => {
+  return new Promise(async (reslove, reject) => {
+    const { alwaysBuildNewExe = false } = options;
+    try {
+      const featureExePath = await getCsharpFeatureExe(feature, alwaysBuildNewExe);
+      child_process.execFile(
+        featureExePath,
+        args,
+        {
+          encoding: null,
+        },
+        (err, stdout) => {
+          console.log(iconv.decode(stdout, "gbk"));
+          if (err) reject(iconv.decode(stdout, "gbk"));
+          else reslove(iconv.decode(stdout, "gbk"));
+        }
+      );
+    } catch (error) {
+      return reject(error.toString());
+    }
+  });
+};
+
+module.exports = { runCsharpFeature };
diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/sendmessage.cs
similarity index 79%
rename from plugin/lib/csharp/automation.cs
rename to plugin/lib/csharp/sendmessage.cs
index e93281c9..38ce5d1e 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/sendmessage.cs
@@ -63,6 +63,7 @@ public class AutomationTool
 
     private const uint WM_KEYDOWN = 0x0100;
     private const uint WM_KEYUP = 0x0101;
+    private const uint WM_KEYPRESS = 0x0102;
     private const uint WM_CHAR = 0x0102;
     private const uint WM_SETTEXT = 0x000C;
     private const uint WM_LBUTTONDOWN = 0x0201;
@@ -123,6 +124,9 @@ private struct TBBUTTON
 
     [DllImport("user32.dll")]
     private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref RECT lParam);
+
+    [DllImport("user32.dll")]
+    private static extern uint MapVirtualKey(uint uCode, uint uMapType);
     #endregion
 
     public static void Main(string[] args)
@@ -172,46 +176,60 @@ public static void Main(string[] args)
         }
     }
 
-    private static List<IntPtr> FindTargetWindows(string window)
+    private static List<IntPtr> FindTargetWindows(string[] args)
     {
         List<IntPtr> targetWindows = new List<IntPtr>();
-        if (string.IsNullOrEmpty(window))
+        string method = GetArgumentValue(args, "-method") ?? "title";
+        string value = GetArgumentValue(args, "-window") ?? "";
+
+        if (method == "active")
         {
             targetWindows.Add(GetForegroundWindow());
+            return targetWindows;
         }
-        else
+
+        if (method == "handle")
         {
-            // 查找所有匹配的窗口
-            EnumWindows((hwnd, param) =>
-            {
-                StringBuilder title = new StringBuilder(256);
-                GetWindowText(hwnd, title, title.Capacity);
-                string windowTitle = title.ToString();
+            targetWindows.Add(new IntPtr(long.Parse(value)));
+            return targetWindows;
+        }
 
-                if (!string.IsNullOrEmpty(windowTitle) &&
-                    windowTitle.IndexOf(window, StringComparison.OrdinalIgnoreCase) >= 0)
-                {
-                    targetWindows.Add(hwnd);
-                }
-                return true;
-            }, IntPtr.Zero);
+        // title方式
+        if (string.IsNullOrEmpty(value))
+        {
+            return targetWindows;
+        }
+
+        // 查找所有匹配的窗口
+        EnumWindows((hwnd, param) =>
+        {
+            StringBuilder title = new StringBuilder(256);
+            GetWindowText(hwnd, title, title.Capacity);
+            string windowTitle = title.ToString();
 
-            if (targetWindows.Count == 0)
+            if (!string.IsNullOrEmpty(windowTitle) &&
+                windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
             {
-                Console.WriteLine("Error: 未找到匹配的窗口");
-                return targetWindows;
+                targetWindows.Add(hwnd);
             }
+            return true;
+        }, IntPtr.Zero);
+
+        if (targetWindows.Count == 0)
+        {
+            Console.WriteLine("Error: 未找到匹配的窗口");
+            return targetWindows;
+        }
 
-            // 如果找到多个窗口，输出所有窗口信息
-            if (targetWindows.Count > 1)
+        // 如果找到多个窗口，输出所有窗口信息
+        if (targetWindows.Count > 1)
+        {
+            Console.WriteLine("找到 {0} 个匹配窗口:", targetWindows.Count);
+            foreach (IntPtr hwnd in targetWindows)
             {
-                Console.WriteLine("找到 {0} 个匹配窗口:", targetWindows.Count);
-                foreach (IntPtr hwnd in targetWindows)
-                {
-                    StringBuilder title = new StringBuilder(256);
-                    GetWindowText(hwnd, title, title.Capacity);
-                    Console.WriteLine("0x{0:X} - {1}", hwnd.ToInt64(), title);
-                }
+                StringBuilder title = new StringBuilder(256);
+                GetWindowText(hwnd, title, title.Capacity);
+                Console.WriteLine("0x{0:X} - {1}", hwnd.ToInt64(), title);
             }
         }
 
@@ -220,7 +238,6 @@ private static List<IntPtr> FindTargetWindows(string window)
 
     private static void HandleKeyboardOperation(string[] args)
     {
-        string window = GetArgumentValue(args, "-window");
         string control = GetArgumentValue(args, "-control");
         string action = GetArgumentValue(args, "-action");
         string value = GetArgumentValue(args, "-value");
@@ -232,7 +249,7 @@ private static void HandleKeyboardOperation(string[] args)
             return;
         }
 
-        var targetWindows = FindTargetWindows(window);
+        var targetWindows = FindTargetWindows(args);
         if (targetWindows.Count == 0)
         {
             return;
@@ -293,7 +310,6 @@ private static void HandleKeyboardOperation(string[] args)
 
     private static void HandleMouseOperation(string[] args)
     {
-        string window = GetArgumentValue(args, "-window");
         string control = GetArgumentValue(args, "-control");
         string controlText = GetArgumentValue(args, "-text");
         string action = GetArgumentValue(args, "-action");
@@ -306,7 +322,7 @@ private static void HandleMouseOperation(string[] args)
             return;
         }
 
-        var targetWindows = FindTargetWindows(window);
+        var targetWindows = FindTargetWindows(args);
         if (targetWindows.Count == 0)
         {
             return;
@@ -416,18 +432,17 @@ private static void SendKeys(IntPtr hWnd, string keys)
                 PostMessage(hWnd, WM_KEYDOWN, modifier, 0);
             }
 
-            // 按下主键
+            // 发送主键字符
             if (mainKey > 0)
             {
-                PostMessage(hWnd, WM_KEYDOWN, mainKey, 0);
-                Thread.Sleep(10);
-                PostMessage(hWnd, WM_KEYUP, mainKey, 0);
+                PostMessage(hWnd, WM_CHAR, mainKey, 0);
             }
 
             // 释放修饰键
             for (int i = modifierKeys.Count - 1; i >= 0; i--)
             {
-                PostMessage(hWnd, WM_KEYUP, modifierKeys[i], 0);
+                byte modifier = modifierKeys[i];
+                PostMessage(hWnd, WM_KEYUP, modifier, 0);
             }
 
             // 如果有多个按键组合，等待一下
@@ -438,6 +453,58 @@ private static void SendKeys(IntPtr hWnd, string keys)
         }
     }
 
+    private static bool IsSpecialKey(byte vKey)
+    {
+        switch (vKey)
+        {
+            // 修饰键
+            case 0xA0: // VK_LSHIFT
+            case 0xA2: // VK_LCONTROL
+            case 0xA4: // VK_LMENU
+            case 0x5B: // VK_LWIN
+            // 控制键
+            case 0x08: // VK_BACK
+            case 0x09: // VK_TAB
+            case 0x0D: // VK_RETURN
+            case 0x1B: // VK_ESCAPE
+            case 0x20: // VK_SPACE
+            case 0x2E: // VK_DELETE
+            // 方向键
+            case 0x25: // VK_LEFT
+            case 0x26: // VK_UP
+            case 0x27: // VK_RIGHT
+            case 0x28: // VK_DOWN
+            // 导航键
+            case 0x24: // VK_HOME
+            case 0x23: // VK_END
+            case 0x21: // VK_PRIOR (PageUp)
+            case 0x22: // VK_NEXT (PageDown)
+            case 0x2D: // VK_INSERT
+            // 功能键
+            case 0x70: // VK_F1
+            case 0x71: // VK_F2
+            case 0x72: // VK_F3
+            case 0x73: // VK_F4
+            case 0x74: // VK_F5
+            case 0x75: // VK_F6
+            case 0x76: // VK_F7
+            case 0x77: // VK_F8
+            case 0x78: // VK_F9
+            case 0x79: // VK_F10
+            case 0x7A: // VK_F11
+            case 0x7B: // VK_F12
+            // 其他常用键
+            case 0x14: // VK_CAPITAL
+            case 0x90: // VK_NUMLOCK
+            case 0x91: // VK_SCROLL
+            case 0x2C: // VK_SNAPSHOT
+            case 0x13: // VK_PAUSE
+                return true;
+            default:
+                return false;
+        }
+    }
+
     private static void SendText(IntPtr hWnd, string text)
     {
         StringBuilder sb = new StringBuilder(text);
@@ -465,16 +532,47 @@ private static byte GetVirtualKeyCode(string key)
     {
         switch (key.ToLower())
         {
-            case "ctrl": return 0x11;
-            case "alt": return 0x12;
-            case "shift": return 0x10;
-            case "win": return 0x5B;
+            case "ctrl":
+            case "^": return 0xA2;  // VK_LCONTROL
+            case "alt": return 0xA4;  // VK_LMENU
+            case "shift": return 0xA0;  // VK_LSHIFT
+            case "win": return 0x5B;    // VK_LWIN
             case "enter": return 0x0D;
             case "tab": return 0x09;
             case "esc": return 0x1B;
             case "space": return 0x20;
             case "backspace": return 0x08;
             case "delete": return 0x2E;
+            // 方向键
+            case "left": return 0x25;    // VK_LEFT
+            case "up": return 0x26;      // VK_UP
+            case "right": return 0x27;   // VK_RIGHT
+            case "down": return 0x28;    // VK_DOWN
+            // 导航键
+            case "home": return 0x24;    // VK_HOME
+            case "end": return 0x23;     // VK_END
+            case "pageup": return 0x21;  // VK_PRIOR
+            case "pagedown": return 0x22; // VK_NEXT
+            case "insert": return 0x2D;  // VK_INSERT
+            // 功能键
+            case "f1": return 0x70;      // VK_F1
+            case "f2": return 0x71;
+            case "f3": return 0x72;
+            case "f4": return 0x73;
+            case "f5": return 0x74;
+            case "f6": return 0x75;
+            case "f7": return 0x76;
+            case "f8": return 0x77;
+            case "f9": return 0x78;
+            case "f10": return 0x79;
+            case "f11": return 0x7A;
+            case "f12": return 0x7B;
+            // 其他常用键
+            case "capslock": return 0x14; // VK_CAPITAL
+            case "numlock": return 0x90;  // VK_NUMLOCK
+            case "scrolllock": return 0x91; // VK_SCROLL
+            case "printscreen": return 0x2C; // VK_SNAPSHOT
+            case "pause": return 0x13;    // VK_PAUSE
             default:
                 if (key.Length == 1)
                 {
@@ -628,11 +726,10 @@ private static IntPtr FindControlByTextAndClass(IntPtr parentHandle, string cont
 
     private static void HandleInspectOperation(string[] args)
     {
-        string window = GetArgumentValue(args, "-window");
         string filter = GetArgumentValue(args, "-filter");
         bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
 
-        var targetWindows = FindTargetWindows(window);
+        var targetWindows = FindTargetWindows(args);
         if (targetWindows.Count == 0)
         {
             return;
@@ -739,7 +836,7 @@ Windows 界面自动化工具使用说明
 ==========================
 
 基本语法:
-automation.exe -type <操作类型> [参数...]
+sendmessage.exe -type <操作类型> [参数...]
 
 操作类型:
 --------
@@ -749,6 +846,9 @@ 3. inspect - 获取控件树
 
 通用参数:
 --------
++-method    窗口查找方式（可选，默认title）
++          可选值：title（标题）, handle（句柄）, active（活动窗口）
++
 -window    窗口标题或句柄（支持模糊匹配）
 -control   控件类名
 -background 后台操作，不激活窗口，默认激活
@@ -771,19 +871,25 @@ 3. inspect - 获取控件树
 使用示例:
 --------
 1. 发送按键到指定窗口：
-   automation.exe -type keyboard -action keys -window ""记事本"" -value ""ctrl+a""
+   sendmessage.exe -type keyboard -action keys -window ""记事本"" -value ""ctrl+a""
 
 2. 发送文本到指定控件：
-   automation.exe -type keyboard -action text -window ""记事本"" -control ""Edit"" -value ""Hello World""
+   sendmessage.exe -type keyboard -action text -window ""记事本"" -control ""Edit"" -value ""Hello World""
 
 3. 点击指定控件：
-   automation.exe -type mouse -action click -window ""记事本"" -control ""Button"" -text ""确定""
+   sendmessage.exe -type mouse -action click -window ""记事本"" -control ""Button"" -text ""确定""
 
 4. 后台发送文本：
-   automation.exe -type keyboard -action text -window ""记事本"" -value ""Hello"" -background
+   sendmessage.exe -type keyboard -action text -window ""记事本"" -value ""Hello"" -background
 
 5. 获取窗口控件树：
-   automation.exe -type inspect -window ""记事本"" -filter ""button""
+   sendmessage.exe -type inspect -window ""记事本"" -filter ""button""
+
+6. 使用句柄查找窗口：
+   sendmessage.exe -type keyboard -method handle -window ""0x12345"" -value ""Hello""
+
+7. 操作当前活动窗口：
+   sendmessage.exe -type keyboard -method active -value ""ctrl+s""
 
 注意事项:
 --------
@@ -791,6 +897,8 @@ 1. 窗口标题支持模糊匹配
 2. 控件类名需要完全匹配
 3. 后台操作可能会影响某些程序的响应
 4. 建议先用inspect获取正确的控件信息再进行操作
+5. handle方式查找窗口时需要提供正确的窗口句柄
+6. active方式不需要提供window参数，直接操作当前活动窗口
 ";
         Console.WriteLine(help);
     }
diff --git a/plugin/lib/csharp/window.cs b/plugin/lib/csharp/window.cs
new file mode 100644
index 00000000..0c3a9b0e
--- /dev/null
+++ b/plugin/lib/csharp/window.cs
@@ -0,0 +1,454 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Diagnostics;
+using System.Web.Script.Serialization;
+
+public class WindowManager
+{
+    #region Win32 API
+    [DllImport("user32.dll")]
+    private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+    [DllImport("user32.dll")]
+    private static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
+
+    [DllImport("user32.dll")]
+    private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+    [DllImport("user32.dll")]
+    private static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+    [DllImport("user32.dll")]
+    private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
+
+    [DllImport("user32.dll")]
+    private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll")]
+    private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetForegroundWindow();
+
+    [DllImport("user32.dll")]
+    private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+    [DllImport("user32.dll")]
+    private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+    [DllImport("user32.dll")]
+    private static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
+
+    [DllImport("user32.dll")]
+    private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+    [DllImport("user32.dll")]
+    private static extern bool IsWindowVisible(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool IsIconic(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern bool IsZoomed(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+    [DllImport("user32.dll")]
+    private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct RECT
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+    }
+
+    private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+    private static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
+    private const uint SWP_NOMOVE = 0x0002;
+    private const uint SWP_NOSIZE = 0x0001;
+    private const uint WM_CLOSE = 0x0010;
+    private const int GWL_STYLE = -16;
+    private const int GWL_EXSTYLE = -20;
+    private const int WS_BORDER = 0x00800000;
+    private const int WS_CAPTION = 0x00C00000;
+    private const int WS_CHILD = 0x40000000;
+    private const int WS_POPUP = unchecked((int)0x80000000);
+    private const int WS_SYSMENU = 0x00080000;
+    private const int WS_MINIMIZEBOX = 0x00020000;
+    private const int WS_MAXIMIZEBOX = 0x00010000;
+    private const int WS_EX_TOPMOST = 0x00000008;
+    private const int WS_EX_TRANSPARENT = 0x00000020;
+    private const int WS_EX_TOOLWINDOW = 0x00000080;
+    private const int WS_EX_LAYERED = 0x00080000;
+    private const uint LWA_ALPHA = 0x2;
+    private const int SW_HIDE = 0;
+    private const int SW_SHOW = 5;
+    private const int SW_NORMAL = 1;
+    private const int SW_MAXIMIZE = 3;
+    private const int SW_MINIMIZE = 6;
+    private const int SW_RESTORE = 9;
+
+    private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+    #endregion
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            IntPtr hwnd = GetWindowHandle(args);
+            if (hwnd == IntPtr.Zero)
+            {
+                Console.Error.WriteLine("Error: 未找到目标窗口");
+                return;
+            }
+
+            switch (type.ToLower())
+            {
+                case "topmost":
+                    bool isTopMost = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+                    SetWindowPos(hwnd, isTopMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+                    break;
+
+                case "opacity":
+                    int opacity = int.Parse(GetArgumentValue(args, "-value") ?? "100");
+                    SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
+                    SetLayeredWindowAttributes(hwnd, 0, (byte)(opacity * 2.55), LWA_ALPHA);
+                    break;
+
+                case "rect":
+                    string[] rectValues = (GetArgumentValue(args, "-value") ?? "").Split(',');
+                    if (rectValues.Length == 4)
+                    {
+                        int x = int.Parse(rectValues[0]);
+                        int y = int.Parse(rectValues[1]);
+                        int width = int.Parse(rectValues[2]);
+                        int height = int.Parse(rectValues[3]);
+                        MoveWindow(hwnd, x, y, width, height, true);
+                    }
+                    break;
+
+                case "state":
+                    string state = GetArgumentValue(args, "-value") ?? "normal";
+                    int cmdShow = state == "maximize" ? SW_MAXIMIZE :
+                                state == "minimize" ? SW_MINIMIZE : SW_NORMAL;
+                    ShowWindow(hwnd, cmdShow);
+                    break;
+
+                case "visible":
+                    bool visible = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+                    ShowWindow(hwnd, visible ? SW_SHOW : SW_HIDE);
+                    break;
+
+                case "close":
+                    PostMessage(hwnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                    break;
+
+                case "focus":
+                    if (IsIconic(hwnd))
+                    {
+                        ShowWindow(hwnd, SW_RESTORE);
+                    }
+                    SetForegroundWindow(hwnd);
+                    break;
+
+                case "border":
+                    bool hasBorder = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+                    int style = GetWindowLong(hwnd, GWL_STYLE);
+                    style = hasBorder ? style | WS_CAPTION : style & ~WS_CAPTION;
+                    SetWindowLong(hwnd, GWL_STYLE, style);
+                    break;
+
+                case "clickthrough":
+                    bool isTransparent = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+                    int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+                    exStyle |= WS_EX_LAYERED;
+                    exStyle = isTransparent ? exStyle | WS_EX_TRANSPARENT : exStyle & ~WS_EX_TRANSPARENT;
+                    SetWindowLong(hwnd, GWL_EXSTYLE, exStyle);
+                    break;
+
+                case "info":
+                    GetWindowInfo(hwnd);
+                    break;
+
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static IntPtr GetWindowHandle(string[] args)
+    {
+        string method = GetArgumentValue(args, "-method") ?? "title";
+        string value = GetArgumentValue(args, "-window") ?? "";
+
+        switch (method.ToLower())
+        {
+            case "handle":
+                return new IntPtr(long.Parse(value));
+            case "active":
+                return GetForegroundWindow();
+            default: // title
+                if (string.IsNullOrEmpty(value))
+                {
+                    return IntPtr.Zero;
+                }
+
+                IntPtr foundWindow = IntPtr.Zero;
+                EnumWindows((hwnd, param) =>
+                {
+                    StringBuilder title = new StringBuilder(256);
+                    GetWindowText(hwnd, title, title.Capacity);
+                    string windowTitle = title.ToString();
+
+                    if (!string.IsNullOrEmpty(windowTitle) &&
+                        windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+                    {
+                        foundWindow = hwnd;
+                        return false; // 找到后停止枚举
+                    }
+                    return true;
+                }, IntPtr.Zero);
+
+                return foundWindow;
+        }
+    }
+
+    private static void GetWindowInfo(IntPtr hwnd)
+    {
+        var windowRect = new RECT();
+        GetWindowRect(hwnd, out windowRect);
+
+        var clientRect = new RECT();
+        GetClientRect(hwnd, out clientRect);
+
+        var titleText = new StringBuilder(256);
+        GetWindowText(hwnd, titleText, 256);
+
+        var className = new StringBuilder(256);
+        GetClassName(hwnd, className, 256);
+
+        uint processId = 0;
+        GetWindowThreadProcessId(hwnd, out processId);
+
+        string processName = "";
+        string processPath = "";
+        try
+        {
+            Process process = Process.GetProcessById((int)processId);
+            processName = process.ProcessName;
+
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = "wmic",
+                Arguments = string.Format("process where ProcessId={0} get ExecutablePath /value", processId),
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                CreateNoWindow = true
+            };
+            using (var proc = Process.Start(startInfo))
+            {
+                string output = proc.StandardOutput.ReadToEnd();
+                if (!string.IsNullOrEmpty(output))
+                {
+                    string[] lines = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string line in lines)
+                    {
+                        if (line.StartsWith("ExecutablePath="))
+                        {
+                            processPath = line.Substring("ExecutablePath=".Length);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        catch { }
+
+        int style = GetWindowLong(hwnd, GWL_STYLE);
+        int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+
+        var data = new
+        {
+            handle = hwnd.ToInt64(),
+            processId = processId,
+            process = new
+            {
+                name = processName,
+                path = processPath
+            },
+            title = titleText.ToString(),
+            className = className.ToString(),
+            window = new
+            {
+                x = windowRect.Left,
+                y = windowRect.Top,
+                width = windowRect.Right - windowRect.Left,
+                height = windowRect.Bottom - windowRect.Top
+            },
+            client = new
+            {
+                width = clientRect.Right - clientRect.Left,
+                height = clientRect.Bottom - clientRect.Top
+            },
+            state = new
+            {
+                visible = IsWindowVisible(hwnd),
+                minimized = IsIconic(hwnd),
+                maximized = IsZoomed(hwnd),
+                focused = GetForegroundWindow() == hwnd
+            },
+            style = new
+            {
+                border = (style & WS_BORDER) != 0,
+                caption = (style & WS_CAPTION) != 0,
+                child = (style & WS_CHILD) != 0,
+                popup = (style & WS_POPUP) != 0,
+                sysmenu = (style & WS_SYSMENU) != 0,
+                minimizeBox = (style & WS_MINIMIZEBOX) != 0,
+                maximizeBox = (style & WS_MAXIMIZEBOX) != 0
+            },
+            exStyle = new
+            {
+                topmost = (exStyle & WS_EX_TOPMOST) != 0,
+                transparent = (exStyle & WS_EX_TRANSPARENT) != 0,
+                toolWindow = (exStyle & WS_EX_TOOLWINDOW) != 0,
+                layered = (exStyle & WS_EX_LAYERED) != 0
+            }
+        };
+
+        var serializer = new JavaScriptSerializer();
+        Console.WriteLine(serializer.Serialize(data));
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        int index = Array.IndexOf(args, key);
+        if (index >= 0 && index < args.Length - 1)
+        {
+            return args[index + 1];
+        }
+        return null;
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 窗口管理工具使用说明
+==========================
+
+基本语法:
+window.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. topmost    - 设置窗口置顶
+2. opacity    - 设置窗口透明度
+3. rect       - 设置窗口位置和大小
+4. state      - 设置窗口状态
+5. visible    - 设置窗口可见性
+6. close      - 关闭窗口
+7. focus      - 设置窗口焦点
+8. border     - 设置窗口边框
+9. clickthrough - 设置点击穿透
+10. info      - 获取窗口信息
+
+通用参数:
+--------
+-method    窗口查找方式（可选，默认title）
+          可选值：title, handle, active
+
+-window    窗口标题或句柄
+          示例：-window ""记事本""
+
+-value     操作值，根据不同操作类型有不同含义
+
+操作参数说明:
+-----------
+1. topmost:
+   -value    true/false，是否置顶
+
+2. opacity:
+   -value    0-100，透明度
+
+3. rect:
+   -value    x,y,width,height，窗口位置和大小
+
+4. state:
+   -value    normal/maximize/minimize，窗口状态
+
+5. visible:
+   -value    true/false，是否可见
+
+6. border:
+   -value    true/false，是否显示边框
+
+7. clickthrough:
+   -value    true/false，是否点击穿透
+
+使用示例:
+--------
+1. 设置窗口置顶：
+   window.exe -type topmost -window ""记事本"" -value true
+
+2. 设置窗口透明度：
+   window.exe -type opacity -window ""记事本"" -value 80
+
+3. 设置窗口位置和大小：
+   window.exe -type rect -window ""记事本"" -value ""100,100,800,600""
+
+4. 最大化窗口：
+   window.exe -type state -window ""记事本"" -value maximize
+
+5. 隐藏窗口：
+   window.exe -type visible -window ""记事本"" -value false
+
+6. 关闭窗口：
+   window.exe -type close -window ""记事本""
+
+7. 获取窗口信息：
+   window.exe -type info -window ""记事本""
+
+返回值:
+------
+1. info操作返回JSON格式的窗口信息
+2. 其他操作无返回值，执行失败时输出错误信息
+
+注意事项:
+--------
+1. 窗口标题支持模糊匹配
+2. handle方式查找窗口时需要提供正确的窗口句柄
+3. active方式不需要提供window参数，直接操作当前活动窗口
+4. 某些操作可能需要管理员权限
+";
+        Console.WriteLine(help);
+    }
+}
diff --git a/plugin/lib/js/monitor.js b/plugin/lib/js/monitor.js
deleted file mode 100644
index c897c021..00000000
--- a/plugin/lib/js/monitor.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const quickcommand = require("../../quickcommand");
-
-// 读取 monitor.cs 模板
-const monitorTemplate = fs.readFileSync(
-  path.join(__dirname, "..", "csharp", "monitor.cs"),
-  "utf8"
-);
-
-// 监控剪贴板变化
-const watchClipboard = async function () {
-  const args = ["-type", "clipboard"];
-  const result = await quickcommand.runCsharp(monitorTemplate, args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
-  return true;
-};
-
-// 监控文件系统变化
-const watchFileSystem = async function (options = {}) {
-  const { path: watchPath, filter = "*.*", recursive = true } = options;
-
-  if (!watchPath) {
-    throw new Error("必须指定监控路径");
-  }
-
-  const args = ["-type", "filesystem", "-path", watchPath];
-
-  if (filter !== "*.*") {
-    args.push("-filter", filter);
-  }
-
-  if (!recursive) {
-    args.push("-recursive", "false");
-  }
-
-  const result = await quickcommand.runCsharp(monitorTemplate, args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
-  return true;
-};
-
-module.exports = {
-  watchClipboard,
-  watchFileSystem,
-};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index 7393a2de..37f8aef2 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -1,11 +1,9 @@
 const window = require("./window");
-const message = require("./message");
-const automation = require("./automation");
+const sendmessage = require("./sendmessage");
 const monitor = require("./monitor");
 
 module.exports = {
   window,
-  message,
-  automation,
+  sendmessage,
   monitor,
 };
diff --git a/plugin/lib/quickcomposer/windows/message.js b/plugin/lib/quickcomposer/windows/message.js
deleted file mode 100644
index d4eaa7ff..00000000
--- a/plugin/lib/quickcomposer/windows/message.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * 发送窗口消息
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @param {string} type 消息类型：click/key/text/custom
- * @param {Object} params 消息参数
- */
-async function sendMessage(method, value, type, params) {
-  let messageScript = "";
-
-  switch (type) {
-    case "click":
-      messageScript = `
-        const uint WM_LBUTTONDOWN = 0x0201;
-        const uint WM_LBUTTONUP = 0x0202;
-        const uint WM_RBUTTONDOWN = 0x0204;
-        const uint WM_RBUTTONUP = 0x0205;
-        const uint WM_MBUTTONDOWN = 0x0207;
-        const uint WM_MBUTTONUP = 0x0208;
-
-        IntPtr wParam = IntPtr.Zero;
-        IntPtr lParam = (IntPtr)((${params.y} << 16) | ${params.x});
-
-        switch("${params.button}") {
-          case "left":
-            PostMessage(hwnd, WM_LBUTTONDOWN, wParam, lParam);
-            PostMessage(hwnd, WM_LBUTTONUP, wParam, lParam);
-            break;
-          case "right":
-            PostMessage(hwnd, WM_RBUTTONDOWN, wParam, lParam);
-            PostMessage(hwnd, WM_RBUTTONUP, wParam, lParam);
-            break;
-          case "middle":
-            PostMessage(hwnd, WM_MBUTTONDOWN, wParam, lParam);
-            PostMessage(hwnd, WM_MBUTTONUP, wParam, lParam);
-            break;
-        }`;
-      break;
-
-    case "key":
-      messageScript = `
-        const uint WM_KEYDOWN = 0x0100;
-        const uint WM_KEYUP = 0x0101;
-        const uint WM_CHAR = 0x0102;
-
-        // 处理组合键
-        int modifiers = 0;
-        if(${params.ctrl}) modifiers |= 0x0008;
-        if(${params.alt}) modifiers |= 0x0001;
-        if(${params.shift}) modifiers |= 0x0004;
-
-        IntPtr wParam = (IntPtr)${params.keyCode};
-        IntPtr lParam = (IntPtr)((0x00000001 | (modifiers << 16)));
-
-        PostMessage(hwnd, WM_KEYDOWN, wParam, lParam);
-        if(!${params.hold}) {
-          PostMessage(hwnd, WM_KEYUP, wParam, lParam);
-        }`;
-      break;
-
-    case "text":
-      messageScript = `
-        const uint WM_CHAR = 0x0102;
-        string text = @"${params.text}";
-
-        foreach(char c in text) {
-          PostMessage(hwnd, WM_CHAR, (IntPtr)c, IntPtr.Zero);
-        }`;
-      break;
-
-    case "custom":
-      messageScript = `
-        uint msg = ${params.message};
-        IntPtr wParam = (IntPtr)${params.wParam};
-        IntPtr lParam = (IntPtr)${params.lParam};
-
-        PostMessage(hwnd, msg, wParam, lParam);`;
-      break;
-  }
-
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          ${messageScript}
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 发送鼠标点击消息
- */
-async function sendMouseClick(method, value, params) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          const uint WM_LBUTTONDOWN = 0x0201;
-          const uint WM_LBUTTONUP = 0x0202;
-          const uint WM_RBUTTONDOWN = 0x0204;
-          const uint WM_RBUTTONUP = 0x0205;
-          const uint WM_MBUTTONDOWN = 0x0207;
-          const uint WM_MBUTTONUP = 0x0208;
-
-          IntPtr wParam = IntPtr.Zero;
-          IntPtr lParam = (IntPtr)((${params.y} << 16) | ${params.x});
-
-          switch("${params.button}") {
-            case "left":
-              PostMessage(hwnd, WM_LBUTTONDOWN, wParam, lParam);
-              PostMessage(hwnd, WM_LBUTTONUP, wParam, lParam);
-              break;
-            case "right":
-              PostMessage(hwnd, WM_RBUTTONDOWN, wParam, lParam);
-              PostMessage(hwnd, WM_RBUTTONUP, wParam, lParam);
-              break;
-            case "middle":
-              PostMessage(hwnd, WM_MBUTTONDOWN, wParam, lParam);
-              PostMessage(hwnd, WM_MBUTTONUP, wParam, lParam);
-              break;
-          }
-        }
-      }
-    }
-  `;
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 发送键盘按键消息
- */
-async function sendKeyPress(method, value, params) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          const uint WM_KEYDOWN = 0x0100;
-          const uint WM_KEYUP = 0x0101;
-          const uint WM_CHAR = 0x0102;
-
-          int modifiers = 0;
-          if(${params.ctrl}) modifiers |= 0x0008;
-          if(${params.alt}) modifiers |= 0x0001;
-          if(${params.shift}) modifiers |= 0x0004;
-
-          IntPtr wParam = (IntPtr)${params.keyCode};
-          IntPtr lParam = (IntPtr)((0x00000001 | (modifiers << 16)));
-
-          PostMessage(hwnd, WM_KEYDOWN, wParam, lParam);
-          if(!${params.hold}) {
-            PostMessage(hwnd, WM_KEYUP, wParam, lParam);
-          }
-        }
-      }
-    }
-  `;
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 发送文本输入消息
- */
-async function sendText(method, value, params) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          const uint WM_CHAR = 0x0102;
-          string text = @"${params.text}";
-
-          foreach(char c in text) {
-            PostMessage(hwnd, WM_CHAR, (IntPtr)c, IntPtr.Zero);
-          }
-        }
-      }
-    }
-  `;
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 发送窗口命令消息
- */
-async function sendCommand(method, value, params) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          uint msg = ${params.message};
-          IntPtr wParam = (IntPtr)${params.wParam};
-          IntPtr lParam = (IntPtr)${params.lParam};
-
-          PostMessage(hwnd, msg, wParam, lParam);
-        }
-      }
-    }
-  `;
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 发送自定义消息
- */
-async function sendCustom(method, value, params) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          uint msg = ${params.message};
-          IntPtr wParam = (IntPtr)${params.wParam};
-          IntPtr lParam = (IntPtr)${params.lParam};
-
-          PostMessage(hwnd, msg, wParam, lParam);
-        }
-      }
-    }
-  `;
-  await quickcommand.runCsharp(script);
-}
-
-module.exports = {
-  sendMessage,
-  sendMouseClick,
-  sendKeyPress,
-  sendText,
-  sendCommand,
-  sendCustom,
-};
diff --git a/plugin/lib/quickcomposer/windows/monitor.js b/plugin/lib/quickcomposer/windows/monitor.js
index caa72a74..97189042 100644
--- a/plugin/lib/quickcomposer/windows/monitor.js
+++ b/plugin/lib/quickcomposer/windows/monitor.js
@@ -1,16 +1,9 @@
-const fs = require("fs");
-const path = require("path");
-
-// 读取 monitor.cs 模板
-const monitorTemplate = fs.readFileSync(
-  path.join(__dirname, "..", "..", "csharp", "monitor.cs"),
-  "utf8"
-);
+const { runCsharpFeature } = require("../../csharp");
 
 // 监控剪贴板变化
 const watchClipboard = async function () {
   const args = ["-type", "clipboard", "-once"];
-  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  const result = await runCsharpFeature("monitor", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
@@ -35,7 +28,7 @@ const watchFileSystem = async function (watchPath, options = {}) {
     args.push("-recursive", "false");
   }
 
-  const result = await quickcommand.runCsharp(monitorTemplate, args);
+  const result = await runCsharpFeature("monitor", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/sendmessage.js
similarity index 68%
rename from plugin/lib/quickcomposer/windows/automation.js
rename to plugin/lib/quickcomposer/windows/sendmessage.js
index 5f92fdf1..f9d27938 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/sendmessage.js
@@ -1,16 +1,8 @@
-const fs = require("fs");
-const path = require("path");
-const quickcommand = require("../../quickcommand");
-
-// 读取 automation.cs 模板
-const automationTemplate = fs.readFileSync(
-  path.join(__dirname, "..", "..", "csharp", "automation.cs"),
-  "utf8"
-);
+const { runCsharpFeature } = require("../../csharp");
 
 /**
  * 键盘操作
- * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} method 窗口类型：title/handle/active
  * @param {string} window 窗口标题/句柄
  * @param {string} keys 键盘按键
  * @param {object} options 选项
@@ -18,15 +10,15 @@ const automationTemplate = fs.readFileSync(
  * @param {boolean} options.background 是否后台操作
  * @returns {boolean} 是否成功
  */
-const sendKeys = async function (windowType, window, keys, options = {}) {
+const sendKeys = async function (method, window, keys, options = {}) {
   const { control, background = false } = options;
   const args = ["-type", "keyboard", "-action", "keys", "-value", keys];
-
-  if (windowType !== "active" && window) args.push("-window", window);
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
   if (control) args.push("-control", control);
   args.push("-background", background.toString());
 
-  const result = await quickcommand.runCsharp(automationTemplate, args);
+  const result = await runCsharpFeature("sendmessage", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
@@ -35,7 +27,7 @@ const sendKeys = async function (windowType, window, keys, options = {}) {
 
 /**
  * 发送文本
- * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} method 窗口类型：title/handle/active
  * @param {string} window 窗口标题/句柄
  * @param {string} text 文本
  * @param {object} options 选项
@@ -43,15 +35,16 @@ const sendKeys = async function (windowType, window, keys, options = {}) {
  * @param {boolean} options.background 是否后台操作
  * @returns {boolean} 是否成功
  */
-const sendText = async function (windowType, window, text, options = {}) {
+const sendText = async function (method, window, text, options = {}) {
   const { control, background = false } = options;
   const args = ["-type", "keyboard", "-action", "text", "-value", text];
 
-  if (windowType !== "active" && window) args.push("-window", window);
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
   if (control) args.push("-control", control);
   args.push("-background", background.toString());
 
-  const result = await quickcommand.runCsharp(automationTemplate, args);
+  const result = await runCsharpFeature("sendmessage", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
@@ -60,7 +53,7 @@ const sendText = async function (windowType, window, text, options = {}) {
 
 /**
  * 鼠标点击
- * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} method 窗口类型：title/handle/active
  * @param {string} window 窗口标题/句柄
  * @param {string} action 动作：click/doubleClick/rightClick
  * @param {object} options 选项
@@ -71,7 +64,7 @@ const sendText = async function (windowType, window, text, options = {}) {
  * @returns {boolean} 是否成功
  */
 const click = async function (
-  windowType,
+  method,
   window,
   action = "click",
   options = {}
@@ -79,13 +72,14 @@ const click = async function (
   const { control, text, pos, background = false } = options;
   const args = ["-type", "mouse", "-action", action];
 
-  if (windowType !== "active" && window) args.push("-window", window);
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
   if (control) args.push("-control", control);
   if (text) args.push("-text", text);
   if (pos) args.push("-pos", pos);
   args.push("-background", background.toString());
 
-  const result = await quickcommand.runCsharp(automationTemplate, args);
+  const result = await runCsharpFeature("sendmessage", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
@@ -94,22 +88,23 @@ const click = async function (
 
 /**
  * 获取窗口控件树
- * @param {string} windowType 窗口类型：title/handle/active
+ * @param {string} method 窗口类型：title/handle/active
  * @param {string} window 窗口标题/句柄
  * @param {object} options 选项
  * @param {string} options.filter 过滤条件
  * @param {boolean} options.background 是否后台操作
  * @returns {object} 控件树
  */
-const inspectWindow = async function (windowType, window, options = {}) {
+const inspectWindow = async function (method, window, options = {}) {
   const { filter, background = false } = options;
   const args = ["-type", "inspect"];
 
-  if (windowType !== "active" && window) args.push("-window", window);
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
   if (filter) args.push("-filter", filter);
   args.push("-background", background.toString());
 
-  const result = await quickcommand.runCsharp(automationTemplate, args);
+  const result = await runCsharpFeature("sendmessage", args);
   if (result && result.startsWith("Error:")) {
     throw new Error(result.substring(7));
   }
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
index 8f25ba03..9c62a458 100644
--- a/plugin/lib/quickcomposer/windows/window.js
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -1,3 +1,5 @@
+const { runCsharpFeature } = require("../../csharp");
+
 /**
  * 窗口置顶
  * @param {string} method 查找方式：title/handle/active
@@ -5,40 +7,17 @@
  * @param {boolean} isTopMost 是否置顶
  */
 async function setTopMost(method, value, isTopMost) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
-      static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
-      const uint SWP_NOMOVE = 0x0002;
-      const uint SWP_NOSIZE = 0x0001;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          SetWindowPos(hwnd, ${
-            isTopMost ? "HWND_TOPMOST" : "HWND_NOTOPMOST"
-          }, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "topmost",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    isTopMost.toString(),
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -48,38 +27,17 @@ async function setTopMost(method, value, isTopMost) {
  * @param {number} opacity 透明度 0-100
  */
 async function setOpacity(method, value, opacity) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
-
-      [DllImport("user32.dll")]
-      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const int GWL_EXSTYLE = -20;
-      const int WS_EX_LAYERED = 0x80000;
-      const uint LWA_ALPHA = 0x2;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          SetWindowLong(hwnd, GWL_EXSTYLE, WS_EX_LAYERED);
-          SetLayeredWindowAttributes(hwnd, 0, (byte)(${opacity} * 2.55), LWA_ALPHA);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "opacity",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    opacity.toString(),
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -92,30 +50,17 @@ async function setOpacity(method, value, opacity) {
  * @param {number} height 高度
  */
 async function setWindowRect(method, value, x, y, width, height) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          MoveWindow(hwnd, ${x}, ${y}, ${width}, ${height}, true);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "rect",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    `${x},${y},${width},${height}`,
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -125,40 +70,17 @@ async function setWindowRect(method, value, x, y, width, height) {
  * @param {string} state 状态：normal/maximize/minimize
  */
 async function setWindowState(method, value, state) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const int SW_NORMAL = 1;
-      const int SW_MAXIMIZE = 3;
-      const int SW_MINIMIZE = 6;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          ShowWindow(hwnd, ${
-            state === "maximize"
-              ? "SW_MAXIMIZE"
-              : state === "minimize"
-              ? "SW_MINIMIZE"
-              : "SW_NORMAL"
-          });
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "state",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    state,
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -167,32 +89,8 @@ async function setWindowState(method, value, state) {
  * @param {string} value 查找值（handle时为数字）
  */
 async function closeWindow(method, value) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const uint WM_CLOSE = 0x0010;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          PostMessage(hwnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = ["-type", "close", "-method", method, "-window", value];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -201,30 +99,8 @@ async function closeWindow(method, value) {
  * @param {string} value 查找值（handle时为数字）
  */
 async function setFocus(method, value) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool SetForegroundWindow(IntPtr hWnd);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          SetForegroundWindow(hwnd);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = ["-type", "focus", "-method", method, "-window", value];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -234,44 +110,17 @@ async function setFocus(method, value) {
  * @param {boolean} hasBorder 是否显示边框
  */
 async function setBorder(method, value, hasBorder) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-      [DllImport("user32.dll")]
-      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const int GWL_STYLE = -16;
-      const int WS_BORDER = 0x00800000;
-      const int WS_DLGFRAME = 0x00400000;
-      const int WS_CAPTION = WS_BORDER | WS_DLGFRAME;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          int style = GetWindowLong(hwnd, GWL_STYLE);
-          if (${hasBorder}) {
-            style |= WS_CAPTION;
-          } else {
-            style &= ~WS_CAPTION;
-          }
-          SetWindowLong(hwnd, GWL_STYLE, style);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "border",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    hasBorder.toString(),
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -281,44 +130,17 @@ async function setBorder(method, value, hasBorder) {
  * @param {boolean} isTransparent 是否点击穿透
  */
 async function setClickThrough(method, value, isTransparent) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-      [DllImport("user32.dll")]
-      static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const int GWL_EXSTYLE = -20;
-      const int WS_EX_TRANSPARENT = 0x00000020;
-      const int WS_EX_LAYERED = 0x80000;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-          exStyle |= WS_EX_LAYERED;
-          if (${isTransparent}) {
-            exStyle |= WS_EX_TRANSPARENT;
-          } else {
-            exStyle &= ~WS_EX_TRANSPARENT;
-          }
-          SetWindowLong(hwnd, GWL_EXSTYLE, exStyle);
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
+  const args = [
+    "-type",
+    "clickthrough",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    isTransparent.toString(),
+  ];
+  await runCsharpFeature("window", args);
 }
 
 /**
@@ -328,167 +150,8 @@ async function setClickThrough(method, value, isTransparent) {
  * @returns {Object} 窗口信息
  */
 async function getWindowInfo(method, value) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Web.Script.Serialization;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-      [DllImport("user32.dll")]
-      static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      [DllImport("user32.dll")]
-      static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
-
-      [DllImport("user32.dll")]
-      static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
-
-      [DllImport("user32.dll")]
-      static extern bool IsWindowVisible(IntPtr hWnd);
-
-      [DllImport("user32.dll")]
-      static extern bool IsIconic(IntPtr hWnd);
-
-      [DllImport("user32.dll")]
-      static extern bool IsZoomed(IntPtr hWnd);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr GetForegroundWindow();
-
-      [DllImport("user32.dll")]
-      static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-      [DllImport("user32.dll")]
-      static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
-
-      [StructLayout(LayoutKind.Sequential)]
-      public struct RECT {
-        public int Left;
-        public int Top;
-        public int Right;
-        public int Bottom;
-      }
-
-      const int GWL_STYLE = -16;
-      const int GWL_EXSTYLE = -20;
-      const int WS_BORDER = 0x00800000;
-      const int WS_CAPTION = 0x00C00000;
-      const int WS_CHILD = 0x40000000;
-      const int WS_POPUP = unchecked((int)0x80000000);
-      const int WS_SYSMENU = 0x00080000;
-      const int WS_MINIMIZEBOX = 0x00020000;
-      const int WS_MAXIMIZEBOX = 0x00010000;
-      const int WS_EX_TOPMOST = 0x00000008;
-      const int WS_EX_TRANSPARENT = 0x00000020;
-      const int WS_EX_TOOLWINDOW = 0x00000080;
-      const int WS_EX_LAYERED = 0x00080000;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          var windowRect = new RECT();
-          GetWindowRect(hwnd, out windowRect);
-
-          var clientRect = new RECT();
-          GetClientRect(hwnd, out clientRect);
-
-          var titleText = new StringBuilder(256);
-          GetWindowText(hwnd, titleText, 256);
-
-          var className = new StringBuilder(256);
-          GetClassName(hwnd, className, 256);
-
-          uint processId = 0;
-          GetWindowThreadProcessId(hwnd, out processId);
-
-          string processName = "";
-          string processPath = "";
-          try {
-            Process process = Process.GetProcessById((int)processId);
-            processName = process.ProcessName;
-
-            var startInfo = new ProcessStartInfo {
-              FileName = "wmic",
-              Arguments = string.Format("process where ProcessId={0} get ExecutablePath /value", processId),
-              UseShellExecute = false,
-              RedirectStandardOutput = true,
-              CreateNoWindow = true
-            };
-            using (var proc = Process.Start(startInfo)) {
-              string output = proc.StandardOutput.ReadToEnd();
-              if (!string.IsNullOrEmpty(output)) {
-                string[] lines = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string line in lines) {
-                  if (line.StartsWith("ExecutablePath=")) {
-                    processPath = line.Substring("ExecutablePath=".Length);
-                    break;
-                  }
-                }
-              }
-            }
-          } catch {}
-
-          int style = GetWindowLong(hwnd, GWL_STYLE);
-          int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-
-          var data = new {
-            handle = hwnd.ToInt64(),
-            processId = processId,
-            process = new {
-              name = processName,
-              path = processPath
-            },
-            title = titleText.ToString(),
-            className = className.ToString(),
-            window = new {
-              x = windowRect.Left,
-              y = windowRect.Top,
-              width = windowRect.Right - windowRect.Left,
-              height = windowRect.Bottom - windowRect.Top
-            },
-            client = new {
-              width = clientRect.Right - clientRect.Left,
-              height = clientRect.Bottom - clientRect.Top
-            },
-            state = new {
-              visible = IsWindowVisible(hwnd),
-              minimized = IsIconic(hwnd),
-              maximized = IsZoomed(hwnd),
-              focused = GetForegroundWindow() == hwnd
-            },
-            style = new {
-              border = (style & WS_BORDER) != 0,
-              caption = (style & WS_CAPTION) != 0,
-              child = (style & WS_CHILD) != 0,
-              popup = (style & WS_POPUP) != 0,
-              sysmenu = (style & WS_SYSMENU) != 0,
-              minimizeBox = (style & WS_MINIMIZEBOX) != 0,
-              maximizeBox = (style & WS_MAXIMIZEBOX) != 0
-            },
-            exStyle = new {
-              topmost = (exStyle & WS_EX_TOPMOST) != 0,
-              transparent = (exStyle & WS_EX_TRANSPARENT) != 0,
-              toolWindow = (exStyle & WS_EX_TOOLWINDOW) != 0,
-              layered = (exStyle & WS_EX_LAYERED) != 0
-            }
-          };
-
-          var serializer = new JavaScriptSerializer();
-          Console.WriteLine(serializer.Serialize(data));
-        }
-      }
-    }
-  `;
-
-  const result = await quickcommand.runCsharp(script);
+  const args = ["-type", "info", "-method", method, "-window", value];
+  const result = await runCsharpFeature("window", args);
   try {
     return JSON.parse(result);
   } catch (error) {
@@ -503,50 +166,17 @@ async function getWindowInfo(method, value) {
  * @param {boolean} visible 是否可见
  */
 async function setVisible(method, value, visible) {
-  const script = `
-    using System;
-    using System.Runtime.InteropServices;
-    using System.Text;
-    using System.Diagnostics;
-    using System.Management;
-
-    public class Program {
-      [DllImport("user32.dll")]
-      static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
-      [DllImport("user32.dll")]
-      static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-      const int SW_HIDE = 0;
-      const int SW_SHOW = 5;
-
-      public static void Main() {
-        ${findWindowByMethod(method, value)}
-        if (hwnd != IntPtr.Zero) {
-          ShowWindow(hwnd, ${visible ? "SW_SHOW" : "SW_HIDE"});
-        }
-      }
-    }
-  `;
-
-  await quickcommand.runCsharp(script);
-}
-
-/**
- * 根据不同方式查找窗口
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @returns {string} C#代码片段
- */
-function findWindowByMethod(method, value) {
-  switch (method) {
-    case "handle":
-      return `IntPtr hwnd = new IntPtr(${value});`;
-    case "active":
-      return `IntPtr hwnd = GetForegroundWindow();`;
-    default: // title
-      return `IntPtr hwnd = FindWindow(null, "${value}");`;
-  }
+  const args = [
+    "-type",
+    "visible",
+    "-method",
+    method,
+    "-window",
+    value,
+    "-value",
+    visible.toString(),
+  ];
+  await runCsharpFeature("window", args);
 }
 
 module.exports = {
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index 6c36ffcb..d4a60f7f 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -2,12 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const { exec } = require("child_process");
 const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
-
-// 读取 dialog.cs 模板
-const dialogTemplate = fs.readFileSync(
-  path.join(__dirname, "csharp", "dialog.cs"),
-  "utf8"
-);
+const { runCsharpFeature } = require("./csharp");
 
 // 辅助函数
 const execCommand = (cmd) => {
@@ -70,8 +65,7 @@ const showSystemMessageBox = async function (content, title = "") {
         args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
       }
 
-      const csharpCode = dialogTemplate;
-      const result = await this.runCsharp(csharpCode, args);
+      const result = await runCsharpFeature("dialog", args);
       if (result && result.startsWith("Error:")) {
         throw new Error(result.substring(7));
       }
@@ -149,8 +143,7 @@ const showSystemInputBox = async function (placeholders, title = "") {
       args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
     }
 
-    const csharpCode = dialogTemplate;
-    const result = await this.runCsharp(csharpCode, args);
+    const result = await runCsharpFeature("dialog", args);
     return result ? JSON.parse(result) : [];
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
@@ -200,8 +193,7 @@ const showSystemConfirmBox = async function (content, title = "") {
       args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
     }
 
-    const csharpCode = dialogTemplate;
-    const result = await this.runCsharp(csharpCode, args);
+    const result = await runCsharpFeature("dialog", args);
     return result === "true";
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return false;
@@ -244,8 +236,7 @@ const showSystemButtonBox = async function (buttons, title = "") {
       args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
     }
 
-    const csharpCode = dialogTemplate;
-    const result = await this.runCsharp(csharpCode, args);
+    const result = await runCsharpFeature("dialog", args);
     if (result) {
       return JSON.parse(result);
     }
@@ -288,8 +279,7 @@ const showSystemTextArea = async function (defaultText = "", title = "") {
       args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
     }
 
-    const csharpCode = dialogTemplate;
-    const result = await this.runCsharp(csharpCode, args);
+    const result = await runCsharpFeature("dialog", args);
     return result || null;
   } else if (window.utools.isLinux()) {
     if (!(await checkZenity())) return null;
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index da6887b8..ec4d9aa5 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -108,6 +108,115 @@ export const uiCommands = {
   icon: "web",
   defaultOpened: false,
   commands: [
+    {
+      value: "quickcommand.showMessageBox",
+      label: "消息提示",
+      desc: "显示一个自动消失的提示框",
+      isAsync: true,
+      config: [
+        {
+          label: "提示内容",
+          component: "VariableInput",
+          icon: "info",
+          defaultValue: newVarInputVal("str", "这是一条提示消息"),
+          width: 12,
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcommand.showMessageBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+          config: [
+            {
+              label: "图标类型",
+              component: "q-select",
+              defaultValue: "success",
+              icon: "lightbulb",
+              width: 6,
+              options: [
+                { label: "成功", value: "success" },
+                { label: "错误", value: "error" },
+                { label: "警告", value: "warning" },
+                { label: "信息", value: "info" },
+              ],
+            },
+            {
+              label: "显示时间(ms)",
+              component: "NumberInput",
+              min: 0,
+              step: 100,
+              width: 6,
+              placeholder: "0为手动关闭，留空按文本长度调整",
+            },
+          ],
+        },
+        {
+          value: "quickcommand.showSystemMessageBox",
+          icon: "report",
+          label: "系统弹窗",
+          config: [
+            {
+              label: "标题",
+              component: "VariableInput",
+              defaultValue: newVarInputVal("str", "提示"),
+              width: 12,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcommand.showConfirmBox",
+      label: "确认框",
+      desc: "显示一个确认框，返回是否点击了确认",
+      isAsync: true,
+      outputVariable: "confirmed",
+      saveOutput: true,
+      config: [
+        {
+          label: "提示内容",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str", "确认要执行此操作吗？"),
+          width: 12,
+        },
+        {
+          label: "标题",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str", "提示"),
+          width: 12,
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcommand.showConfirmBox",
+          icon: "call_to_action",
+          label: "插件内弹窗",
+          config: [
+            {
+              label: "支持HTML",
+              component: "CheckButton",
+              defaultValue: false,
+              width: 6,
+            },
+            {
+              label: "宽度",
+              component: "NumberInput",
+              min: 0,
+              step: 100,
+              defaultValue: 450,
+              width: 6,
+              placeholder: "对话框宽度",
+            },
+          ],
+        },
+        {
+          value: "quickcommand.showSystemConfirmBox",
+          icon: "report",
+          label: "系统弹窗",
+        },
+      ],
+    },
     {
       value: "quickcommand.showButtonBox",
       label: "按钮组",
@@ -253,115 +362,6 @@ export const uiCommands = {
         },
       ],
     },
-    {
-      value: "quickcommand.showMessageBox",
-      label: "消息提示",
-      desc: "显示一个自动消失的提示框",
-      isAsync: true,
-      config: [
-        {
-          label: "提示内容",
-          component: "VariableInput",
-          icon: "info",
-          defaultValue: newVarInputVal("str", "这是一条提示消息"),
-          width: 12,
-        },
-      ],
-      subCommands: [
-        {
-          value: "quickcommand.showMessageBox",
-          icon: "call_to_action",
-          label: "插件内弹窗",
-          config: [
-            {
-              label: "图标类型",
-              component: "q-select",
-              defaultValue: "success",
-              icon: "lightbulb",
-              width: 6,
-              options: [
-                { label: "成功", value: "success" },
-                { label: "错误", value: "error" },
-                { label: "警告", value: "warning" },
-                { label: "信息", value: "info" },
-              ],
-            },
-            {
-              label: "显示时间(ms)",
-              component: "NumberInput",
-              min: 0,
-              step: 100,
-              width: 6,
-              placeholder: "0为手动关闭，留空按文本长度调整",
-            },
-          ],
-        },
-        {
-          value: "quickcommand.showSystemMessageBox",
-          icon: "report",
-          label: "系统弹窗",
-          config: [
-            {
-              label: "标题",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str", "提示"),
-              width: 12,
-            },
-          ],
-        },
-      ],
-    },
-    {
-      value: "quickcommand.showConfirmBox",
-      label: "确认框",
-      desc: "显示一个确认框，返回是否点击了确认",
-      isAsync: true,
-      outputVariable: "confirmed",
-      saveOutput: true,
-      config: [
-        {
-          label: "提示内容",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "确认要执行此操作吗？"),
-          width: 12,
-        },
-        {
-          label: "标题",
-          component: "VariableInput",
-          defaultValue: newVarInputVal("str", "提示"),
-          width: 12,
-        },
-      ],
-      subCommands: [
-        {
-          value: "quickcommand.showConfirmBox",
-          icon: "call_to_action",
-          label: "插件内弹窗",
-          config: [
-            {
-              label: "支持HTML",
-              component: "CheckButton",
-              defaultValue: false,
-              width: 6,
-            },
-            {
-              label: "宽度",
-              component: "NumberInput",
-              min: 0,
-              step: 100,
-              defaultValue: 450,
-              width: 6,
-              placeholder: "对话框宽度",
-            },
-          ],
-        },
-        {
-          value: "quickcommand.showSystemConfirmBox",
-          icon: "report",
-          label: "系统弹窗",
-        },
-      ],
-    },
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 48924f38..1d288ce8 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -51,7 +51,7 @@ export const windowsCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "quickcomposer.windows.window.setTopMost",
+      value: "quickcomposer.windows.window.getWindowInfo",
       label: "窗口控制",
       desc: "Windows窗口操作",
       icon: "window",
@@ -79,6 +79,13 @@ export const windowsCommands = {
         },
       ],
       subCommands: [
+        {
+          value: "quickcomposer.windows.window.getWindowInfo",
+          label: "窗口信息",
+          icon: "info",
+          outputVariable: "windowInfo",
+          saveOutput: true,
+        },
         {
           value: "quickcomposer.windows.window.setTopMost",
           label: "窗口置顶",
@@ -238,19 +245,12 @@ export const windowsCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.windows.window.getWindowInfo",
-          label: "窗口信息",
-          icon: "info",
-          outputVariable: "windowInfo",
-          saveOutput: true,
-        },
       ],
       isAsync: true,
     },
     {
-      value: "quickcomposer.windows.automation.inspectWindow",
-      label: "界面自动化",
+      value: "quickcomposer.windows.sendmessage.inspectWindow",
+      label: "界面自动化(sendmessage)",
       desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,
@@ -279,7 +279,7 @@ export const windowsCommands = {
       ],
       subCommands: [
         {
-          value: "quickcomposer.windows.automation.inspectWindow",
+          value: "quickcomposer.windows.sendmessage.inspectWindow",
           label: "获取控件树",
           icon: "account_tree",
           outputVariable: "controlsTree",
@@ -314,7 +314,7 @@ export const windowsCommands = {
           ],
         },
         {
-          value: "quickcomposer.windows.automation.click",
+          value: "quickcomposer.windows.sendmessage.click",
           label: "点击控件",
           icon: "mouse",
           config: [
@@ -372,7 +372,7 @@ export const windowsCommands = {
           ],
         },
         {
-          value: "quickcomposer.windows.automation.sendText",
+          value: "quickcomposer.windows.sendmessage.sendText",
           label: "发送文本",
           icon: "keyboard",
           config: [
@@ -413,7 +413,7 @@ export const windowsCommands = {
           ],
         },
         {
-          value: "quickcomposer.windows.automation.sendKeys",
+          value: "quickcomposer.windows.sendmessage.sendKeys",
           label: "发送按键",
           icon: "keyboard_alt",
           config: [

From ab5f90ea5168fbc43582a36e53973181b25061ac Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 16:21:35 +0800
Subject: [PATCH 056/332] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=B0=86=E6=A0=91=E7=8A=B6=E7=9A=84?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=A0=BC=E5=BC=8F=E4=B8=BAJSON=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=AC=E8=A1=A8=E6=A0=BC=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E7=AC=A6=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E8=BD=AC=E4=B8=BA=E8=A1=A8=E6=A0=BC=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue |   1 +
 src/components/ResultArea.vue       |  19 ++-
 src/components/popup/ResultMenu.vue | 200 ++++++++++++++++++++++++----
 3 files changed, 195 insertions(+), 25 deletions(-)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 581d5d9c..0b2f476e 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -39,6 +39,7 @@
             :textbtn="!enableHtml"
             :imagebtn="!enableHtml && isDataUrl"
             @showImg="showBase64Img"
+            @updateResult="runResult = $event"
             :style="{
               height: headerHeight + 'px',
             }"
diff --git a/src/components/ResultArea.vue b/src/components/ResultArea.vue
index 8a3d8882..24414495 100644
--- a/src/components/ResultArea.vue
+++ b/src/components/ResultArea.vue
@@ -22,7 +22,12 @@
           v-else-if="typeof item === 'undefined'"
           v-text="'undefined'"
         />
-        <pre class="result" v-text="item" v-else />
+        <pre
+          class="result"
+          :class="{ wrapLine: !isTable }"
+          v-text="item"
+          v-else
+        />
       </div>
     </div>
   </div>
@@ -78,6 +83,10 @@ export default {
           )
         : "";
     },
+    // 判断是否是转为表格的结果，表格结果不需要换行，第二行一般包含分隔符---
+    isTable() {
+      return this.runResult?.[0]?.split("\n")?.[1]?.includes("---");
+    },
   },
   mounted() {
     this.frameInit();
@@ -135,16 +144,22 @@ export default {
 .text {
   font-family: Consolas, Monaco, "Courier New";
 }
+
 .result {
-  white-space: pre-wrap;
   word-wrap: break-word;
   max-width: 100%;
   margin: 0;
 }
+
+.result.wrapLine {
+  white-space: pre-wrap;
+}
+
 .undefined {
   color: #999;
   font-style: italic;
 }
+
 iframe {
   width: 100%;
   display: block;
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index ecc10d65..d5e20b5f 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -1,13 +1,32 @@
 <template>
-  <q-btn-group :stretch="stretch" class="text-primary">
+  <q-btn-group :stretch="stretch" class="text-primary result-menu">
     <q-btn
       icon="image"
-      label="转为图片"
+      label="转图片"
       @click="dataUrlToImg"
       v-show="imagebtn"
       dense
       size="sm"
     ></q-btn>
+    <q-btn
+      icon="data_object"
+      @click="updateStringifyResult"
+      v-show="textbtn && hasObject"
+      :label="!dense ? '格式化' : ''"
+      dense
+      size="sm"
+    >
+      <q-tooltip v-if="!dense">格式化JSON</q-tooltip>
+    </q-btn>
+    <q-btn
+      icon="pivot_table_chart"
+      @click="updateTableResult"
+      v-show="textbtn && hasTable"
+      :label="!dense ? '转表格' : ''"
+      dense
+      size="sm"
+    >
+    </q-btn>
     <q-btn
       icon="content_paste"
       @click="copyResult"
@@ -36,45 +55,180 @@ export default {
     closebtn: Boolean,
     runResult: Array,
   },
+  emits: ["updateResult"],
   computed: {
-    content() {
-      return this.getContent();
+    /**
+     * 处理运行结果数据，同时完成以下任务：
+     * 1. 查找符合表格显示条件的数组数据（数组元素都是对象）
+     * 2. 格式化所有数据项（对象转JSON，处理null等特殊情况）
+     *
+     * @returns {Object} 处理后的数据对象
+     * - items: 格式化后的所有数据项数组，每项包含:
+     *   - raw: 原始数据
+     *   - formatted: 格式化后的字符串
+     * - tableData: 找到的第一个可转换为表格的数组，如果没有则为null
+     */
+    processedData() {
+      // 空数据处理
+      if (!this.runResult) return { items: [], tableData: null };
+
+      let tableData = null;
+      const items = this.runResult.map((item, index) => {
+        // 1. 表格数据检测
+        // 如果还没找到表格数据，且当前项是非空数组，则检查是否可以作为表格数据
+        if (!tableData && Array.isArray(item) && item.length > 0) {
+          // 检查数组的每个元素是否都是非null的普通对象（非数组）
+          const isValidTable = item.every(
+            (elem) =>
+              typeof elem === "object" && elem !== null && !Array.isArray(elem)
+          );
+          // 如果是有效的表格数据，保存起来
+          if (isValidTable) {
+            tableData = item;
+          }
+        }
+
+        // 2. 数据格式化
+        // 2.1 处理非对象类型：直接返回原值
+        if (typeof item !== "object") {
+          return { raw: item, formatted: item };
+        }
+        // 2.2 处理 null：转换为字符串 "null"
+        if (item === null) {
+          return { raw: null, formatted: "null" };
+        }
+        // 2.3 处理对象类型
+        try {
+          // 尝试将对象转换为格式化的JSON字符串
+          return {
+            raw: item,
+            formatted: JSON.stringify(item, null, 2),
+          };
+        } catch (error) {
+          // 如果JSON转换失败，则使用toString()方法
+          return {
+            raw: item,
+            formatted: item.toString(),
+          };
+        }
+      });
+
+      // 返回处理后的数据
+      return { items, tableData };
+    },
+    formattedItems() {
+      return this.processedData.items;
+    },
+    validTableData() {
+      return this.processedData.tableData;
+    },
+    hasObject() {
+      return this.formattedItems.some(
+        (item) => typeof item.raw === "object" && item.raw !== null
+      );
+    },
+    hasTable() {
+      return this.validTableData !== null;
     },
   },
   methods: {
     copyResult() {
-      window.utools.copyText(this.content);
+      window.utools.copyText(this.getFormattedContent());
       quickcommand.showMessageBox("已复制到剪贴板");
     },
     sendResult() {
-      window.utools.hideMainWindowTypeString(this.content);
+      window.utools.hideMainWindowTypeString(this.getFormattedContent());
     },
     dataUrlToImg() {
-      let imgs = this.content
-        .match(/data:image\/.*?;base64,.*/g)
+      const imagePattern = /data:image\/.*?;base64,.*/g;
+      const imageUrls = this.getFormattedContent()
+        .match(imagePattern)
         ?.map((dataUrl) => `<img src="http://github.com/$%7BdataUrl%7D"><br>`);
-      if (!imgs) return quickcommand.showMessageBox("dataUrl 格式不正确！");
-      this.$emit("showImg", imgs);
+
+      if (!imageUrls) {
+        return quickcommand.showMessageBox("dataUrl 格式不正确！");
+      }
+      this.$emit("showImg", imageUrls);
     },
     saveResult() {
-      window.saveFile(this.content, {
+      const saveOptions = {
         defaultPath: "quickcommand-result.txt",
         filters: [{ name: "txt", extensions: ["txt"] }],
-      });
+      };
+      window.saveFile(this.getFormattedContent(), saveOptions);
     },
-    getContent() {
-      let content = this.runResult.map((item) => {
-        if (typeof item === "object") {
-          try {
-            return JSON.stringify(item, null, 2);
-          } catch (e) {
-            return item.toString();
-          }
-        }
-        return item;
+    getFormattedContent() {
+      return this.formattedItems.map((item) => item.formatted).join("\n");
+    },
+    updateStringifyResult() {
+      this.updateResult([this.getFormattedContent()]);
+    },
+    updateTableResult() {
+      const tableData = this.validTableData;
+      if (!tableData) return;
+
+      const headers = [
+        ...new Set(tableData.flatMap((obj) => Object.keys(obj))),
+      ];
+      if (!headers.length) return;
+
+      // 计算每列的最大宽度
+      const columnWidths = headers.map((header) => {
+        const maxDataWidth = Math.max(
+          header.length,
+          ...tableData.map((obj) => {
+            const value = obj[header];
+            return value === undefined || value === null
+              ? 0
+              : String(value).replace(/\n/g, "\\n").length;
+          })
+        );
+        return maxDataWidth;
       });
-      return content.join("\n");
+
+      // 生成对齐的行
+      const createAlignedRow = (cells) =>
+        "| " +
+        cells
+          .map((cell, index) => {
+            const padding = " ".repeat(
+              Math.max(0, columnWidths[index] - String(cell).length)
+            );
+            return String(cell) + padding;
+          })
+          .join(" | ") +
+        " |";
+
+      const rows = [
+        // 表头行
+        createAlignedRow(headers),
+        // 分隔行
+        "| " +
+          headers.map((_, i) => "-".repeat(columnWidths[i])).join(" | ") +
+          " |",
+        // 数据行
+        ...tableData.map((obj) =>
+          createAlignedRow(
+            headers.map((header) => {
+              const value = obj[header];
+              return value === undefined || value === null
+                ? ""
+                : String(value).replace(/\n/g, "\\n");
+            })
+          )
+        ),
+      ];
+
+      this.updateResult([rows.join("\n")]);
+    },
+    updateResult(result) {
+      this.$emit("updateResult", result);
     },
   },
 };
 </script>
+<style scoped>
+.result-menu {
+  gap: 4px;
+}
+</style>

From 64e231d5cb0320e7fd9f3863fbd31f21c19620a1 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 16:24:12 +0800
Subject: [PATCH 057/332] =?UTF-8?q?win=E8=87=AA=E5=8A=A8=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=B7=BB=E5=8A=A0=E8=BF=9B=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E8=A1=A8=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E3=80=81=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E7=B3=BB=E7=BB=9F=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/process.cs                 | 281 +++++++++
 plugin/lib/csharp/registry.cs                | 357 ++++++++++++
 plugin/lib/csharp/service.cs                 | 233 ++++++++
 plugin/lib/csharp/software.cs                | 352 +++++++++++
 plugin/lib/csharp/utils.cs                   | 407 +++++++++++++
 plugin/lib/quickcomposer/windows/index.js    |  10 +
 plugin/lib/quickcomposer/windows/process.js  |  57 ++
 plugin/lib/quickcomposer/windows/registry.js |  96 +++
 plugin/lib/quickcomposer/windows/service.js  |  39 ++
 plugin/lib/quickcomposer/windows/software.js |  38 ++
 plugin/lib/quickcomposer/windows/utils.js    | 146 +++++
 src/js/composer/commands/windowsCommands.js  | 577 +++++++++++++++++++
 12 files changed, 2593 insertions(+)
 create mode 100644 plugin/lib/csharp/process.cs
 create mode 100644 plugin/lib/csharp/registry.cs
 create mode 100644 plugin/lib/csharp/service.cs
 create mode 100644 plugin/lib/csharp/software.cs
 create mode 100644 plugin/lib/csharp/utils.cs
 create mode 100644 plugin/lib/quickcomposer/windows/process.js
 create mode 100644 plugin/lib/quickcomposer/windows/registry.js
 create mode 100644 plugin/lib/quickcomposer/windows/service.js
 create mode 100644 plugin/lib/quickcomposer/windows/software.js
 create mode 100644 plugin/lib/quickcomposer/windows/utils.js

diff --git a/plugin/lib/csharp/process.cs b/plugin/lib/csharp/process.cs
new file mode 100644
index 00000000..32bad458
--- /dev/null
+++ b/plugin/lib/csharp/process.cs
@@ -0,0 +1,281 @@
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.IO;
+
+public class ProcessManager
+{
+    [DllImport("kernel32.dll")]
+    private static extern IntPtr OpenProcess(uint dwDesiredAccess, bool bInheritHandle, uint dwProcessId);
+
+    [DllImport("kernel32.dll")]
+    private static extern bool CloseHandle(IntPtr hObject);
+
+    [DllImport("kernel32.dll")]
+    private static extern bool TerminateProcess(IntPtr hProcess, uint uExitCode);
+
+    private const uint PROCESS_TERMINATE = 0x0001;
+    private const uint PROCESS_QUERY_INFORMATION = 0x0400;
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "list":
+                    ListProcesses();
+                    break;
+                case "kill":
+                    string target = GetArgumentValue(args, "-target");
+                    if (string.IsNullOrEmpty(target))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定目标进程 (-target)");
+                        return;
+                    }
+                    KillProcess(target);
+                    break;
+                case "start":
+                    string path = GetArgumentValue(args, "-path");
+                    string arguments = GetArgumentValue(args, "-args");
+                    if (arguments == null)
+                    {
+                        arguments = "";
+                    }
+                    StartProcess(path, arguments);
+                    break;
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void ListProcesses()
+    {
+        Console.Write("[");
+        Process[] processes = Process.GetProcesses();
+        bool first = true;
+        foreach (Process proc in processes)
+        {
+            try
+            {
+                string processPath = "";
+                DateTime startTime = DateTime.MinValue;
+                TimeSpan cpuTime = TimeSpan.Zero;
+                long memorySize = 0;
+                int threadCount = 0;
+                ProcessPriorityClass priority = ProcessPriorityClass.Normal;
+                string description = "";
+                string company = "";
+                string version = "";
+
+                try
+                {
+                    if (proc.MainModule != null)
+                    {
+                        processPath = proc.MainModule.FileName;
+                    }
+                    else
+                    {
+                        processPath = "";
+                    }
+                    startTime = proc.StartTime;
+                    cpuTime = proc.TotalProcessorTime;
+                    memorySize = proc.WorkingSet64;
+                    threadCount = proc.Threads.Count;
+                    priority = proc.PriorityClass;
+
+                    // 获取文件版本信息
+                    if (!string.IsNullOrEmpty(processPath) && File.Exists(processPath))
+                    {
+                        var versionInfo = FileVersionInfo.GetVersionInfo(processPath);
+                        description = versionInfo.FileDescription;
+                        if (description == null) description = "";
+                        company = versionInfo.CompanyName;
+                        if (company == null) company = "";
+                        version = versionInfo.FileVersion;
+                        if (version == null) version = "";
+                    }
+                }
+                catch { }
+
+                if (!first)
+                {
+                    Console.Write(",");
+                }
+                first = false;
+
+                Console.Write(string.Format(
+                    "{{" +
+                    "\"id\": {0}," +
+                    "\"name\": \"{1}\"," +
+                    "\"title\": \"{2}\"," +
+                    "\"path\": \"{3}\"," +
+                    "\"startTime\": \"{4}\"," +
+                    "\"cpuTime\": \"{5}\"," +
+                    "\"memory\": {6}," +
+                    "\"threads\": {7}," +
+                    "\"priority\": \"{8}\"," +
+                    "\"description\": \"{9}\"," +
+                    "\"company\": \"{10}\"," +
+                    "\"version\": \"{11}\"" +
+                    "}}",
+                    proc.Id,
+                    proc.ProcessName,
+                    proc.MainWindowTitle.Replace("\"", "\\\""),
+                    processPath.Replace("\\", "\\\\").Replace("\"", "\\\""),
+                    startTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                    cpuTime.ToString(),
+                    memorySize,
+                    threadCount,
+                    priority.ToString(),
+                    description.Replace("\"", "\\\""),
+                    company.Replace("\"", "\\\""),
+                    version.Replace("\"", "\\\"")
+                    ));
+            }
+            catch { }
+        }
+        Console.Write("]");
+    }
+
+    private static void KillProcess(string target)
+    {
+        int pid;
+        if (int.TryParse(target, out pid))
+        {
+            KillProcessById(pid);
+        }
+        else
+        {
+            KillProcessByName(target);
+        }
+    }
+
+    private static void KillProcessById(int pid)
+    {
+        Process proc = Process.GetProcessById(pid);
+        try
+        {
+            proc.Kill();
+            Console.WriteLine(string.Format("成功终止进程: {0} (PID: {1})", proc.ProcessName, pid));
+        }
+        catch (Exception ex)
+        {
+            throw new Exception(string.Format("无法终止进程: {0}", ex.Message));
+        }
+    }
+
+    private static void KillProcessByName(string name)
+    {
+        Process[] processes = Process.GetProcessesByName(name);
+        if (processes.Length == 0)
+        {
+            throw new Exception("找不到指定的进程");
+        }
+
+        foreach (Process proc in processes)
+        {
+            try
+            {
+                proc.Kill();
+                Console.WriteLine(string.Format("成功终止进程: {0} (PID: {1})", name, proc.Id));
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine(string.Format("无法终止进程: {0} (PID: {1}) - {2}",
+                    name, proc.Id, ex.Message));
+            }
+        }
+    }
+
+    private static void StartProcess(string path, string args)
+    {
+        ProcessStartInfo startInfo = new ProcessStartInfo
+        {
+            FileName = path,
+            Arguments = args,
+            UseShellExecute = true
+        };
+
+        Process proc = Process.Start(startInfo);
+        Console.WriteLine(string.Format("已启动进程: {0} (PID: {1})", path, proc.Id));
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+进程管理工具使用说明
+================
+
+基本语法:
+process.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. list - 列出所有进程
+   示例: process.exe -type list
+
+2. kill - 终止进程
+   参数:
+     -target <PID或进程名>  要终止的进程ID或名称
+   示例:
+     process.exe -type kill -target notepad
+     process.exe -type kill -target 1234
+
+3. start - 启动进程
+   参数:
+     -path <程序路径>  要启动的程序路径
+     -args <参数>      启动参数（可选）
+   示例:
+     process.exe -type start -path ""c:\windows\notepad.exe""
+     process.exe -type start -path ""c:\program.exe"" -args ""-param value""
+
+返回值:
+------
+list操作返回JSON格式的进程信息：
+{""id"": 进程ID, ""name"": ""进程名"", ""title"": ""窗口标题"", ""path"": ""进程路径"",
+""startTime"": ""启动时间"", ""cpuTime"": ""CPU时间"", ""memory"": 内存使用量,
+""threads"": 线程数, ""priority"": ""优先级"", ""description"": ""描述"",
+""company"": ""公司"", ""version"": ""版本""}
+
+注意事项:
+--------
+1. 终止进程可能需要管理员权限
+2. 进程名称不需要包含.exe后缀
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+}
diff --git a/plugin/lib/csharp/registry.cs b/plugin/lib/csharp/registry.cs
new file mode 100644
index 00000000..53c23274
--- /dev/null
+++ b/plugin/lib/csharp/registry.cs
@@ -0,0 +1,357 @@
+using System;
+using System.Text;
+using Microsoft.Win32;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+
+public class RegistryManager
+{
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            string path = GetArgumentValue(args, "-path");
+            string name = GetArgumentValue(args, "-name");
+            string value = GetArgumentValue(args, "-value");
+            string valueType = GetArgumentValue(args, "-valuetype");
+            if (valueType == null)
+            {
+                valueType = "string";
+            }
+            else
+            {
+                valueType = valueType.ToLower();
+            }
+
+            switch (type.ToLower())
+            {
+                case "get":
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定注册表路径 (-path)");
+                        return;
+                    }
+                    GetValue(path, name);
+                    break;
+
+                case "set":
+                    if (string.IsNullOrEmpty(path) || string.IsNullOrEmpty(name))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定注册表路径 (-path) 和键名 (-name)");
+                        return;
+                    }
+                    SetValue(path, name, value, valueType);
+                    break;
+
+                case "delete":
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定注册表路径 (-path)");
+                        return;
+                    }
+                    DeleteValue(path, name);
+                    break;
+
+                case "list":
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定注册表路径 (-path)");
+                        return;
+                    }
+                    ListKeys(path);
+                    break;
+
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void GetValue(string path, string name)
+    {
+        using (RegistryKey key = OpenRegistryKey(path))
+        {
+            if (key != null)
+            {
+                object value = key.GetValue(name);
+                if (value != null)
+                {
+                    var info = new Dictionary<string, string>();
+                    info["path"] = path.Replace("\\", "\\\\");
+                    info["name"] = name;
+                    info["value"] = value.ToString();
+                    info["type"] = key.GetValueKind(name).ToString();
+
+                    var serializer = new JavaScriptSerializer();
+                    Console.Write(serializer.Serialize(info));
+                    return;
+                }
+            }
+        }
+        Console.Error.WriteLine("Error: 找不到指定的注册表值");
+    }
+
+    private static void SetValue(string path, string name, string value, string valueType)
+    {
+        using (RegistryKey key = OpenRegistryKey(path, true))
+        {
+            if (key == null)
+            {
+                throw new Exception("找不到指定的注册表项");
+            }
+
+            object typedValue = ConvertValue(value, valueType);
+            RegistryValueKind kind = GetValueKind(valueType);
+            key.SetValue(name, typedValue, kind);
+            Console.WriteLine("成功设置注册表值");
+        }
+    }
+
+    private static void DeleteValue(string path, string name)
+    {
+        using (RegistryKey key = OpenRegistryKey(path, true))
+        {
+            if (key == null)
+            {
+                throw new Exception("找不到指定的注册表项");
+            }
+
+            if (string.IsNullOrEmpty(name))
+            {
+                // 删除整个键
+                Registry.LocalMachine.DeleteSubKeyTree(GetRelativePath(path), false);
+                Console.WriteLine("成功删除注册表项");
+            }
+            else
+            {
+                // 删除指定值
+                key.DeleteValue(name, false);
+                Console.WriteLine("成功删除注册表值");
+            }
+        }
+    }
+
+    private static void ListKeys(string path)
+    {
+        var result = new List<Dictionary<string, string>>();
+        using (RegistryKey key = OpenRegistryKey(path))
+        {
+            if (key != null)
+            {
+                foreach (string subKeyName in key.GetSubKeyNames())
+                {
+                    var info = new Dictionary<string, string>();
+                    info["path"] = (path + "\\" + subKeyName).Replace("\\", "\\\\");
+                    info["name"] = subKeyName;
+                    result.Add(info);
+                }
+            }
+        }
+
+        var serializer = new JavaScriptSerializer();
+        Console.Write(serializer.Serialize(result));
+    }
+
+    private static RegistryKey OpenRegistryKey(string path, bool writable = false)
+    {
+        string[] parts = path.Split('\\');
+        if (parts.Length < 2)
+        {
+            throw new Exception("无效的注册表路径");
+        }
+
+        RegistryKey root = GetRootKey(parts[0]);
+        string subPath = string.Join("\\", parts, 1, parts.Length - 1);
+        return root.OpenSubKey(subPath, writable);
+    }
+
+    private static RegistryKey GetRootKey(string name)
+    {
+        switch (name.ToUpper())
+        {
+            case "HKLM":
+            case "HKEY_LOCAL_MACHINE":
+                return Registry.LocalMachine;
+            case "HKCU":
+            case "HKEY_CURRENT_USER":
+                return Registry.CurrentUser;
+            case "HKCR":
+            case "HKEY_CLASSES_ROOT":
+                return Registry.ClassesRoot;
+            case "HKU":
+            case "HKEY_USERS":
+                return Registry.Users;
+            case "HKCC":
+            case "HKEY_CURRENT_CONFIG":
+                return Registry.CurrentConfig;
+            default:
+                throw new Exception("无效的注册表根键");
+        }
+    }
+
+    private static string GetRelativePath(string path)
+    {
+        string[] parts = path.Split('\\');
+        if (parts.Length < 2)
+        {
+            throw new Exception("无效的注册表路径");
+        }
+        return string.Join("\\", parts, 1, parts.Length - 1);
+    }
+
+    private static void OutputValue(string name, object value, RegistryValueKind kind)
+    {
+        string valueStr = FormatValue(value, kind);
+        Console.WriteLine(string.Format("{{\"type\": \"value\", \"name\": \"{0}\", \"value\": {1}, \"valueType\": \"{2}\"}}",
+            name.Replace("\"", "\\\""),
+            valueStr,
+            kind.ToString()));
+    }
+
+    private static string FormatValue(object value, RegistryValueKind kind)
+    {
+        switch (kind)
+        {
+            case RegistryValueKind.String:
+            case RegistryValueKind.ExpandString:
+                return string.Format("\"{0}\"", value.ToString().Replace("\"", "\\\""));
+            case RegistryValueKind.MultiString:
+                return string.Format("[{0}]", string.Join(",", Array.ConvertAll(
+                    (string[])value,
+                    s => string.Format("\"{0}\"", s.Replace("\"", "\\\"")))));
+            case RegistryValueKind.Binary:
+                return string.Format("[{0}]", string.Join(",", (byte[])value));
+            default:
+                return value.ToString();
+        }
+    }
+
+    private static object ConvertValue(string value, string valueType)
+    {
+        switch (valueType)
+        {
+            case "string":
+                return value;
+            case "dword":
+                return int.Parse(value);
+            case "qword":
+                return long.Parse(value);
+            case "binary":
+                return Array.ConvertAll(value.Split(','), byte.Parse);
+            case "multistring":
+                return value.Split(',');
+            case "expandstring":
+                return value;
+            default:
+                throw new Exception("不支持的值类型");
+        }
+    }
+
+    private static RegistryValueKind GetValueKind(string valueType)
+    {
+        switch (valueType)
+        {
+            case "string":
+                return RegistryValueKind.String;
+            case "dword":
+                return RegistryValueKind.DWord;
+            case "qword":
+                return RegistryValueKind.QWord;
+            case "binary":
+                return RegistryValueKind.Binary;
+            case "multistring":
+                return RegistryValueKind.MultiString;
+            case "expandstring":
+                return RegistryValueKind.ExpandString;
+            default:
+                throw new Exception("不支持的值类型");
+        }
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 注册表管理工具使用说明
+======================
+
+基本语法:
+registry.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. get - 获取注册表值
+   参数:
+     -path <注册表路径>  完整的注册表路径
+     -name <值名称>      要获取的值名称（可选，不指定则列出所有值）
+   示例:
+     registry.exe -type get -path ""HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion"" -name ""ProgramFilesDir""
+
+2. set - 设置注册表值
+   参数:
+     -path <注册表路径>  完整的注册表路径
+     -name <值名称>      要设置的值名称
+     -value <值>         要设置的值
+     -valuetype <类型>   值类型（可选，默认为string）
+                        支持的类型：string, dword, qword, binary, multistring, expandstring
+   示例:
+     registry.exe -type set -path ""HKCU\Software\MyApp"" -name ""Setting"" -value ""123"" -valuetype dword
+
+3. delete - 删除注册表项或值
+   参数:
+     -path <注册表路径>  完整的注册表路径
+     -name <值名称>      要删除的值名称（可选，不指定则删除整个键）
+   示例:
+     registry.exe -type delete -path ""HKCU\Software\MyApp"" -name ""Setting""
+
+4. list - 列出注册表项下的所有子项和值
+   参数:
+     -path <注册表路径>  完整的注册表路径
+   示例:
+     registry.exe -type list -path ""HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion""
+
+返回值:
+------
+JSON格式的注册表信息：
+键：{""type"": ""key"", ""name"": ""键名""}
+值：{""type"": ""value"", ""name"": ""值名"", ""value"": 值, ""valueType"": ""值类型""}
+
+注意事项:
+--------
+1. 需要管理员权限才能修改系统关键注册表项
+2. 注册表路径必须以根键开头（HKLM、HKCU、HKCR、HKU、HKCC）
+3. 修改注册表可能会影响系统稳定性，请谨慎操作
+4. 建议在修改前备份重要的注册表项
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+}
diff --git a/plugin/lib/csharp/service.cs b/plugin/lib/csharp/service.cs
new file mode 100644
index 00000000..07cffe87
--- /dev/null
+++ b/plugin/lib/csharp/service.cs
@@ -0,0 +1,233 @@
+using System;
+using System.ServiceProcess;
+using System.Runtime.InteropServices;
+using System.Text;
+
+public class ServiceManager
+{
+    [DllImport("advapi32.dll", SetLastError = true)]
+    private static extern IntPtr OpenSCManager(string lpMachineName, string lpDatabaseName, uint dwDesiredAccess);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    private static extern IntPtr OpenService(IntPtr hSCManager, string lpServiceName, uint dwDesiredAccess);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    private static extern bool StartService(IntPtr hService, uint dwNumServiceArgs, string[] lpServiceArgVectors);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    private static extern bool ControlService(IntPtr hService, uint dwControl, ref SERVICE_STATUS lpServiceStatus);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    private static extern bool CloseServiceHandle(IntPtr hSCObject);
+
+    private const uint SC_MANAGER_ALL_ACCESS = 0xF003F;
+    private const uint SERVICE_ALL_ACCESS = 0xF01FF;
+    private const uint SERVICE_CONTROL_STOP = 0x00000001;
+    private const uint SERVICE_CONTROL_PAUSE = 0x00000002;
+    private const uint SERVICE_CONTROL_CONTINUE = 0x00000003;
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct SERVICE_STATUS
+    {
+        public uint dwServiceType;
+        public uint dwCurrentState;
+        public uint dwControlsAccepted;
+        public uint dwWin32ExitCode;
+        public uint dwServiceSpecificExitCode;
+        public uint dwCheckPoint;
+        public uint dwWaitHint;
+    }
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "list":
+                    ListServices();
+                    break;
+                case "start":
+                case "stop":
+                case "pause":
+                case "continue":
+                    string name = GetArgumentValue(args, "-name");
+                    if (string.IsNullOrEmpty(name))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定服务名称 (-name)");
+                        return;
+                    }
+                    ControlServiceByName(name, type);
+                    break;
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void ListServices()
+    {
+        Console.Write("[");
+        bool first = true;
+        ServiceController[] services = ServiceController.GetServices();
+        foreach (ServiceController service in services)
+        {
+            if (!first)
+            {
+                Console.Write(",");
+            }
+            first = false;
+            Console.Write(string.Format("{{\"name\": \"{0}\", \"displayName\": \"{1}\", \"status\": \"{2}\"}}",
+                service.ServiceName,
+                service.DisplayName.Replace("\"", "\\\""),
+                service.Status));
+        }
+        Console.Write("]");
+    }
+
+    private static void ControlServiceByName(string serviceName, string operation)
+    {
+        IntPtr scm = OpenSCManager(null, null, SC_MANAGER_ALL_ACCESS);
+        if (scm == IntPtr.Zero)
+        {
+            throw new Exception("无法打开服务控制管理器");
+        }
+
+        try
+        {
+            IntPtr service = OpenService(scm, serviceName, SERVICE_ALL_ACCESS);
+            if (service == IntPtr.Zero)
+            {
+                throw new Exception("无法打开服务");
+            }
+
+            try
+            {
+                SERVICE_STATUS status = new SERVICE_STATUS();
+                bool success = false;
+
+                switch (operation.ToLower())
+                {
+                    case "start":
+                        success = StartService(service, 0, null);
+                        break;
+                    case "stop":
+                        success = ControlService(service, SERVICE_CONTROL_STOP, ref status);
+                        break;
+                    case "pause":
+                        success = ControlService(service, SERVICE_CONTROL_PAUSE, ref status);
+                        break;
+                    case "continue":
+                        success = ControlService(service, SERVICE_CONTROL_CONTINUE, ref status);
+                        break;
+                }
+
+                if (success)
+                {
+                    Console.WriteLine(string.Format("成功{0}服务: {1}", GetOperationName(operation), serviceName));
+                }
+                else
+                {
+                    throw new Exception(string.Format("无法{0}服务", GetOperationName(operation)));
+                }
+            }
+            finally
+            {
+                CloseServiceHandle(service);
+            }
+        }
+        finally
+        {
+            CloseServiceHandle(scm);
+        }
+    }
+
+    private static string GetOperationName(string operation)
+    {
+        switch (operation.ToLower())
+        {
+            case "start": return "启动";
+            case "stop": return "停止";
+            case "pause": return "暂停";
+            case "continue": return "继续";
+            default: return operation;
+        }
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 服务管理工具使用说明
+======================
+
+基本语法:
+service.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. list - 列出所有服务
+   示例: service.exe -type list
+
+2. start - 启动服务
+   参数:
+     -name <服务名>  服务名称
+   示例: service.exe -type start -name Spooler
+
+3. stop - 停止服务
+   参数:
+     -name <服务名>  服务名称
+   示例: service.exe -type stop -name Spooler
+
+4. pause - 暂停服务
+   参数:
+     -name <服务名>  服务名称
+   示例: service.exe -type pause -name Spooler
+
+5. continue - 继续服务
+   参数:
+     -name <服务名>  服务名称
+   示例: service.exe -type continue -name Spooler
+
+返回值:
+------
+list操作返回JSON格式的服务信息：
+{""name"": ""服务名"", ""displayName"": ""显示名称"", ""status"": ""状态""}
+
+注意事项:
+--------
+1. 需要管理员权限
+2. 并非所有服务都支持暂停/继续操作
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+}
diff --git a/plugin/lib/csharp/software.cs b/plugin/lib/csharp/software.cs
new file mode 100644
index 00000000..0b964db9
--- /dev/null
+++ b/plugin/lib/csharp/software.cs
@@ -0,0 +1,352 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using Microsoft.Win32;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Web.Script.Serialization;
+using System.Linq;
+
+public class SoftwareManager
+{
+    [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+    private static extern uint MsiEnumProducts(uint iProductIndex, StringBuilder lpProductBuf);
+
+    [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+    private static extern uint MsiGetProductInfo(string szProduct, string szProperty, StringBuilder lpValueBuf, ref uint pcchValueBuf);
+
+    [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+    private static extern uint MsiConfigureProduct(string szProduct, int iInstallLevel, int eInstallState);
+
+    private const int INSTALLSTATE_DEFAULT = -1;
+    private const int INSTALLSTATE_ABSENT = 2;
+    private const int INSTALLLEVEL_DEFAULT = 0;
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "list":
+                    ListSoftware();
+                    break;
+                case "uninstall":
+                    string target = GetArgumentValue(args, "-target");
+                    if (string.IsNullOrEmpty(target))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定目标软件 (-target)");
+                        return;
+                    }
+                    UninstallSoftware(target);
+                    break;
+                case "repair":
+                    string product = GetArgumentValue(args, "-target");
+                    if (string.IsNullOrEmpty(product))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定目标软件 (-target)");
+                        return;
+                    }
+                    RepairSoftware(product);
+                    break;
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void ListSoftware()
+    {
+        Console.Write("[");
+        bool first = true;
+
+        // 列出MSI安装的软件
+        uint index = 0;
+        StringBuilder productCode = new StringBuilder(39);
+        while (MsiEnumProducts(index++, productCode) == 0)
+        {
+            uint charCount = 128;
+            StringBuilder displayName = new StringBuilder((int)charCount);
+            StringBuilder publisher = new StringBuilder((int)charCount);
+            StringBuilder version = new StringBuilder((int)charCount);
+
+            MsiGetProductInfo(productCode.ToString(), "ProductName", displayName, ref charCount);
+            charCount = 128;
+            MsiGetProductInfo(productCode.ToString(), "Publisher", publisher, ref charCount);
+            charCount = 128;
+            MsiGetProductInfo(productCode.ToString(), "VersionString", version, ref charCount);
+
+            if (!first)
+            {
+                Console.Write(",");
+            }
+            first = false;
+            Console.Write(string.Format("{{\"name\": \"{0}\", \"publisher\": \"{1}\", \"version\": \"{2}\", \"source\": \"{3}\", \"id\": \"{4}\"}}",
+                displayName.ToString().Replace("\"", "\\\""),
+                publisher.ToString().Replace("\"", "\\\""),
+                version.ToString().Replace("\"", "\\\""),
+                "MSI",
+                productCode.ToString().Replace("\\", "\\\\").Replace("\"", "\\\"")));
+        }
+
+        // 列出注册表中的软件
+        string[] registryPaths = {
+            @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
+            @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
+        };
+
+        foreach (string registryPath in registryPaths)
+        {
+            using (RegistryKey key = Registry.LocalMachine.OpenSubKey(registryPath))
+            {
+                if (key != null)
+                {
+                    foreach (string subKeyName in key.GetSubKeyNames())
+                    {
+                        using (RegistryKey subKey = key.OpenSubKey(subKeyName))
+                        {
+                            if (subKey != null)
+                            {
+                                string displayName = subKey.GetValue("DisplayName") as string;
+                                if (!string.IsNullOrEmpty(displayName))
+                                {
+                                    string publisher = subKey.GetValue("Publisher") as string;
+                                    if (publisher == null) publisher = "";
+                                    string version = subKey.GetValue("DisplayVersion") as string;
+                                    if (version == null) version = "";
+                                    string uninstallString = subKey.GetValue("UninstallString") as string;
+                                    if (uninstallString == null) uninstallString = "";
+
+                                    if (!first)
+                                    {
+                                        Console.Write(",");
+                                    }
+                                    first = false;
+                                    Console.Write(string.Format("{{\"name\": \"{0}\", \"publisher\": \"{1}\", \"version\": \"{2}\", \"source\": \"{3}\", \"id\": \"{4}\"}}",
+                                        displayName.Replace("\"", "\\\""),
+                                        publisher.Replace("\"", "\\\""),
+                                        version.Replace("\"", "\\\""),
+                                        "Registry",
+                                        uninstallString.Replace("\\", "\\\\").Replace("\"", "\\\"")));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Console.Write("]");
+    }
+
+    private static void OutputSoftwareInfo(string name, string publisher, string version, string source, string id)
+    {
+        Console.WriteLine(string.Format("{{\"name\": \"{0}\", \"publisher\": \"{1}\", \"version\": \"{2}\", \"source\": \"{3}\", \"id\": \"{4}\"}}",
+            name.Replace("\"", "\\\""),
+            publisher.Replace("\"", "\\\""),
+            version.Replace("\"", "\\\""),
+            source,
+            id.Replace("\"", "\\\"")));
+    }
+
+    private static void UninstallSoftware(string target)
+    {
+        // 尝试通过MSI卸载
+        if (target.Length == 38 && target.StartsWith("{") && target.EndsWith("}"))
+        {
+            uint result = MsiConfigureProduct(target, INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT);
+            if (result == 0)
+            {
+                Console.WriteLine("成功启动卸载程序");
+                return;
+            }
+        }
+
+        // 尝试通过注册表卸载字符串卸载
+        string[] registryPaths = {
+            @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
+            @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
+        };
+
+        foreach (string registryPath in registryPaths)
+        {
+            using (RegistryKey key = Registry.LocalMachine.OpenSubKey(registryPath))
+            {
+                if (key != null)
+                {
+                    foreach (string subKeyName in key.GetSubKeyNames())
+                    {
+                        using (RegistryKey subKey = key.OpenSubKey(subKeyName))
+                        {
+                            if (subKey != null)
+                            {
+                                string displayName = subKey.GetValue("DisplayName") as string;
+                                if (displayName != null && displayName.Contains(target))
+                                {
+                                    string uninstallString = subKey.GetValue("UninstallString") as string;
+                                    if (!string.IsNullOrEmpty(uninstallString))
+                                    {
+                                        // 启动卸载程序
+                                        ProcessStartInfo startInfo = new ProcessStartInfo
+                                        {
+                                            FileName = "cmd.exe",
+                                            Arguments = "/c " + uninstallString,
+                                            UseShellExecute = true
+                                        };
+                                        Process.Start(startInfo);
+                                        Console.WriteLine("成功启动卸载程序");
+                                        return;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        throw new Exception("找不到指定的软件或无法卸载");
+    }
+
+    private static void RepairSoftware(string productCode)
+    {
+        if (productCode.Length != 38 || !productCode.StartsWith("{") || !productCode.EndsWith("}"))
+        {
+            throw new Exception("无效的产品代码");
+        }
+
+        uint result = MsiConfigureProduct(productCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT);
+        if (result == 0)
+        {
+            Console.WriteLine("成功启动修复程序");
+        }
+        else
+        {
+            throw new Exception("无法修复软件");
+        }
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 软件管理工具使用说明
+======================
+
+基本语法:
+software.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. list - 列出已安装的软件
+   示例: software.exe -type list
+
+2. uninstall - 卸载软件
+   参数:
+     -target <软件名称或ID>  要卸载的软件名称或产品代码
+   示例:
+     software.exe -type uninstall -target ""Microsoft Office""
+     software.exe -type uninstall -target ""{12345678-1234-1234-1234-123456789012}""
+
+3. repair - 修复MSI安装的软件
+   参数:
+     -target <产品代码>  要修复的软件的产品代码
+   示例: software.exe -type repair -target ""{12345678-1234-1234-1234-123456789012}""
+
+返回值:
+------
+list操作返回JSON格式的软件信息：
+{""name"": ""软件名称"", ""publisher"": ""发布者"", ""version"": ""版本"", ""source"": ""来源"", ""id"": ""标识符""}
+
+注意事项:
+--------
+1. 需要管理员权限
+2. 卸载和修复操作可能需要用户确认
+3. 并非所有软件都支持修复功能
+4. 卸载操作会启动软件自带的卸载程序
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static string GetSoftwareInfo()
+    {
+        var result = new List<Dictionary<string, string>>();
+        string uninstallKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall";
+        string uninstallKey32 = @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall";
+
+        // 获取64位和32位软件信息
+        GetSoftwareFromRegistry(Registry.LocalMachine, uninstallKey, result);
+        GetSoftwareFromRegistry(Registry.LocalMachine, uninstallKey32, result);
+
+        var serializer = new JavaScriptSerializer();
+        return serializer.Serialize(result.Select(info => new {
+            id = info["id"],
+            name = info["name"],
+            version = info["version"],
+            publisher = info["publisher"],
+            installLocation = info.ContainsKey("installLocation") && info["installLocation"] != null ?
+                info["installLocation"].Replace("\\", "\\\\") : null,
+            uninstallString = info.ContainsKey("uninstallString") && info["uninstallString"] != null ?
+                info["uninstallString"].Replace("\\", "\\\\") : null
+        }));
+    }
+
+    private static void GetSoftwareFromRegistry(RegistryKey root, string keyPath, List<Dictionary<string, string>> result)
+    {
+        using (RegistryKey key = root.OpenSubKey(keyPath))
+        {
+            if (key != null)
+            {
+                foreach (string subKeyName in key.GetSubKeyNames())
+                {
+                    using (RegistryKey subKey = key.OpenSubKey(subKeyName))
+                    {
+                        if (subKey != null)
+                        {
+                            string displayName = subKey.GetValue("DisplayName") as string;
+                            if (!string.IsNullOrEmpty(displayName))
+                            {
+                                var info = new Dictionary<string, string>();
+                                info["id"] = subKeyName;
+                                info["name"] = displayName;
+                                info["version"] = subKey.GetValue("DisplayVersion") as string ?? "";
+                                info["publisher"] = subKey.GetValue("Publisher") as string ?? "";
+                                info["installLocation"] = subKey.GetValue("InstallLocation") as string;
+                                info["uninstallString"] = subKey.GetValue("UninstallString") as string;
+                                result.Add(info);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/plugin/lib/csharp/utils.cs b/plugin/lib/csharp/utils.cs
new file mode 100644
index 00000000..9a87308b
--- /dev/null
+++ b/plugin/lib/csharp/utils.cs
@@ -0,0 +1,407 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Net.NetworkInformation;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.Win32;
+
+public class SystemUtils
+{
+    #region Win32 API
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
+    private static extern int SystemParametersInfo(int uAction, int uParam, string lpvParam, int fuWinIni);
+
+    [DllImport("user32.dll")]
+    private static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetForegroundWindow();
+
+    [DllImport("PowrProf.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+    private static extern bool SetSuspendState(bool hibernate, bool forceCritical, bool disableWakeEvent);
+
+    [DllImport("kernel32.dll")]
+    private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+
+    private const int SPI_SETDESKWALLPAPER = 20;
+    private const int SPIF_UPDATEINIFILE = 0x01;
+    private const int SPIF_SENDCHANGE = 0x02;
+    private const int WM_SYSCOMMAND = 0x0112;
+    private const int SC_MONITORPOWER = 0xF170;
+
+    [Flags]
+    private enum EXECUTION_STATE : uint
+    {
+        ES_AWAYMODE_REQUIRED = 0x00000040,
+        ES_CONTINUOUS = 0x80000000,
+        ES_DISPLAY_REQUIRED = 0x00000002,
+        ES_SYSTEM_REQUIRED = 0x00000001
+    }
+    #endregion
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "wallpaper":
+                    string wallpaperPath = GetArgumentValue(args, "-path");
+                    if (string.IsNullOrEmpty(wallpaperPath))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定壁纸路径 (-path)");
+                        return;
+                    }
+                    SetWallpaper(wallpaperPath);
+                    break;
+
+                case "monitor":
+                    string action = GetArgumentValue(args, "-action");
+                    if (string.IsNullOrEmpty(action))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定动作 (-action)");
+                        return;
+                    }
+                    ControlMonitor(action);
+                    break;
+
+                case "power":
+                    string mode = GetArgumentValue(args, "-mode");
+                    if (string.IsNullOrEmpty(mode))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定电源模式 (-mode)");
+                        return;
+                    }
+                    PowerControl(mode);
+                    break;
+
+                case "network":
+                    string interfaceName = GetArgumentValue(args, "-interface");
+                    string ip = GetArgumentValue(args, "-ip");
+                    string mask = GetArgumentValue(args, "-mask");
+                    string gateway = GetArgumentValue(args, "-gateway");
+                    string dns = GetArgumentValue(args, "-dns");
+                    ConfigureNetwork(interfaceName, ip, mask, gateway, dns);
+                    break;
+
+                case "startup":
+                    string appPath = GetArgumentValue(args, "-path");
+                    string appName = GetArgumentValue(args, "-name");
+                    bool remove = HasArgument(args, "-remove");
+                    ManageStartup(appPath, appName, remove);
+                    break;
+
+                case "shortcut":
+                    string targetPath = GetArgumentValue(args, "-target");
+                    string shortcutPath = GetArgumentValue(args, "-path");
+                    string shortcutArgs = GetArgumentValue(args, "-args");
+                    CreateShortcut(targetPath, shortcutPath, shortcutArgs);
+                    break;
+
+                case "brightness":
+                    string brightness = GetArgumentValue(args, "-level");
+                    if (string.IsNullOrEmpty(brightness))
+                    {
+                        Console.Error.WriteLine("Error: 必须指定亮度级别 (-level)");
+                        return;
+                    }
+                    SetBrightness(int.Parse(brightness));
+                    break;
+
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void SetWallpaper(string path)
+    {
+        if (!File.Exists(path))
+        {
+            throw new Exception("壁纸文件不存在");
+        }
+
+        SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, path, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
+        Console.WriteLine("成功设置壁纸");
+    }
+
+    private static void ControlMonitor(string action)
+    {
+        IntPtr hWnd = GetForegroundWindow();
+        switch (action.ToLower())
+        {
+            case "off":
+                SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, 2);
+                break;
+            case "on":
+                SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, -1);
+                break;
+            default:
+                throw new Exception("不支持的显示器操作");
+        }
+        Console.WriteLine("成功控制显示器");
+    }
+
+    private static void PowerControl(string mode)
+    {
+        switch (mode.ToLower())
+        {
+            case "sleep":
+                SetSuspendState(false, false, false);
+                break;
+            case "hibernate":
+                SetSuspendState(true, false, false);
+                break;
+            case "awake":
+                SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_DISPLAY_REQUIRED | EXECUTION_STATE.ES_SYSTEM_REQUIRED);
+                break;
+            case "normal":
+                SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS);
+                break;
+            default:
+                throw new Exception("不支持的电源模式");
+        }
+        Console.WriteLine("成功设置电源模式");
+    }
+
+    private static void ConfigureNetwork(string interfaceName, string ip, string mask, string gateway, string dns)
+    {
+        // 使用netsh命令配置网络
+        StringBuilder command = new StringBuilder();
+        command.AppendFormat("interface ip set address \"{0}\" static {1} {2}", interfaceName, ip, mask);
+        if (!string.IsNullOrEmpty(gateway))
+        {
+            command.AppendFormat(" {0}", gateway);
+        }
+
+        ProcessStartInfo startInfo = new ProcessStartInfo
+        {
+            FileName = "netsh",
+            Arguments = command.ToString(),
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            CreateNoWindow = true
+        };
+
+        using (Process process = Process.Start(startInfo))
+        {
+            process.WaitForExit();
+            if (process.ExitCode != 0)
+            {
+                throw new Exception("设置IP地址失败");
+            }
+        }
+
+        if (!string.IsNullOrEmpty(dns))
+        {
+            command.Clear();
+            command.AppendFormat("interface ip set dns \"{0}\" static {1}", interfaceName, dns);
+            startInfo.Arguments = command.ToString();
+
+            using (Process process = Process.Start(startInfo))
+            {
+                process.WaitForExit();
+                if (process.ExitCode != 0)
+                {
+                    throw new Exception("设置DNS失败");
+                }
+            }
+        }
+
+        Console.WriteLine("成功配置网络");
+    }
+
+    private static void ManageStartup(string appPath, string appName, bool remove)
+    {
+        string keyPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
+        using (RegistryKey key = Registry.CurrentUser.OpenSubKey(keyPath, true))
+        {
+            if (key == null)
+            {
+                throw new Exception("无法访问启动项注册表");
+            }
+
+            if (remove)
+            {
+                key.DeleteValue(appName, false);
+                Console.WriteLine("成功移除开机启动项");
+            }
+            else
+            {
+                key.SetValue(appName, appPath);
+                Console.WriteLine("成功添加开机启动项");
+            }
+        }
+    }
+
+    private static void CreateShortcut(string targetPath, string shortcutPath, string args)
+    {
+        // 使用PowerShell创建快捷方式
+        StringBuilder command = new StringBuilder();
+        command.AppendFormat(@"
+            $WshShell = New-Object -comObject WScript.Shell
+            $Shortcut = $WshShell.CreateShortcut('{0}')
+            $Shortcut.TargetPath = '{1}'",
+            shortcutPath.Replace("'", "''"),
+            targetPath.Replace("'", "''"));
+
+        if (!string.IsNullOrEmpty(args))
+        {
+            command.AppendFormat(@"
+                $Shortcut.Arguments = '{0}'",
+                args.Replace("'", "''"));
+        }
+
+        command.Append(@"
+            $Shortcut.Save()");
+
+        ProcessStartInfo startInfo = new ProcessStartInfo
+        {
+            FileName = "powershell",
+            Arguments = command.ToString(),
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            CreateNoWindow = true
+        };
+
+        using (Process process = Process.Start(startInfo))
+        {
+            process.WaitForExit();
+            if (process.ExitCode != 0)
+            {
+                throw new Exception("创建快捷方式失败");
+            }
+        }
+
+        Console.WriteLine("成功创建快捷方式");
+    }
+
+    private static void SetBrightness(int level)
+    {
+        if (level < 0 || level > 100)
+        {
+            throw new Exception("亮度级别必须在0-100之间");
+        }
+
+        // 使用PowerShell命令设置亮度
+        ProcessStartInfo startInfo = new ProcessStartInfo
+        {
+            FileName = "powershell",
+            Arguments = string.Format("(Get-WmiObject -Namespace root/WMI -Class WmiMonitorBrightnessMethods).WmiSetBrightness(1,{0})", level),
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            CreateNoWindow = true
+        };
+
+        using (Process process = Process.Start(startInfo))
+        {
+            process.WaitForExit();
+            if (process.ExitCode != 0)
+            {
+                throw new Exception("设置亮度失败");
+            }
+        }
+
+        Console.WriteLine("成功设置亮度");
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"
+Windows 系统工具使用说明
+===================
+
+基本语法:
+utils.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. wallpaper - 设置壁纸
+   参数:
+     -path <文件路径>  壁纸图片路径
+   示例: utils.exe -type wallpaper -path ""C:\wallpaper.jpg""
+
+2. monitor - 控制显示器
+   参数:
+     -action <动作>  on/off
+   示例: utils.exe -type monitor -action off
+
+3. power - 电源控制
+   参数:
+     -mode <模式>  sleep/hibernate/awake/normal
+   示例: utils.exe -type power -mode sleep
+
+4. network - 配置网络
+   参数:
+     -interface <网卡名称>  网络接口名称
+     -ip <IP地址>          要设置的IP地址
+     -mask <子网掩码>      子网掩码
+     -gateway <网关>       默认网关（可选）
+     -dns <DNS>           DNS服务器（可选）
+   示例: utils.exe -type network -interface ""以太网"" -ip 192.168.1.100 -mask 255.255.255.0
+
+5. startup - 管理开机启动项
+   参数:
+     -path <应用程序路径>  应用程序路径
+     -name <启动项名称>  启动项名称
+     -remove         移除开机启动项（可选）
+   示例: utils.exe -type startup -path ""C:\Program Files\MyApp\MyApp.exe"" -name MyApp
+
+6. shortcut - 创建快捷方式
+   参数:
+     -target <目标路径>  目标路径
+     -path <快捷方式路径>  快捷方式路径
+     -args <参数>  参数（可选）
+   示例: utils.exe -type shortcut -target ""C:\Program Files\MyApp\MyApp.exe"" -path ""C:\Users\MyUser\Desktop\MyApp.lnk""
+
+7. brightness - 控制亮度
+    参数:
+      -level <亮度>  亮度级别（0-100）
+    示例: utils.exe -type brightness -level 75
+
+注意事项:
+--------
+1. 某些操作可能需要管理员权限
+2. 网络配置更改可能会暂时断开网络连接
+3. 电源控制可能会影响正在运行的程序
+4. 建议在更改系统设置前先备份当前配置
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static bool HasArgument(string[] args, string key)
+    {
+        return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
+    }
+}
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index 37f8aef2..99ab8849 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -1,9 +1,19 @@
 const window = require("./window");
 const sendmessage = require("./sendmessage");
 const monitor = require("./monitor");
+const process = require("./process");
+const registry = require("./registry");
+const service = require("./service");
+const software = require("./software");
+const utils = require("./utils");
 
 module.exports = {
   window,
   sendmessage,
   monitor,
+  process,
+  registry,
+  service,
+  software,
+  utils,
 };
diff --git a/plugin/lib/quickcomposer/windows/process.js b/plugin/lib/quickcomposer/windows/process.js
new file mode 100644
index 00000000..71cdf5e9
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/process.js
@@ -0,0 +1,57 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 列出进程
+ * @returns {Array} 进程列表
+ */
+const listProcesses = async function () {
+  const args = ["-type", "list"];
+  const result = await runCsharpFeature("process", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析进程列表失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 终止进程
+ * @param {string} target 进程ID或名称
+ * @returns {boolean} 是否成功
+ */
+const killProcess = async function (target) {
+  const args = ["-type", "kill", "-target", target];
+  const result = await runCsharpFeature("process", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 启动进程
+ * @param {string} path 程序路径
+ * @param {string} arguments 启动参数
+ * @returns {boolean} 是否成功
+ */
+const startProcess = async function (path, arguments = "") {
+  const args = ["-type", "start", "-path", path];
+  if (arguments) {
+    args.push("-args", arguments);
+  }
+  const result = await runCsharpFeature("process", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+module.exports = {
+  listProcesses,
+  killProcess,
+  startProcess,
+};
diff --git a/plugin/lib/quickcomposer/windows/registry.js b/plugin/lib/quickcomposer/windows/registry.js
new file mode 100644
index 00000000..1bfc471a
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/registry.js
@@ -0,0 +1,96 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 获取注册表值
+ * @param {string} path 注册表路径
+ * @param {string} name 值名称
+ * @returns {object} 注册表值
+ */
+const getValue = async function (path, name = "") {
+  const args = ["-type", "get", "-path", path];
+  if (name) {
+    args.push("-name", name);
+  }
+  const result = await runCsharpFeature("registry", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析注册表值失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 设置注册表值
+ * @param {string} path 注册表路径
+ * @param {string} name 值名称
+ * @param {string} value 值
+ * @param {string} valueType 值类型
+ * @returns {boolean} 是否成功
+ */
+const setValue = async function (path, name, value, valueType = "string") {
+  const args = [
+    "-type",
+    "set",
+    "-path",
+    path,
+    "-name",
+    name,
+    "-value",
+    value,
+    "-valuetype",
+    valueType,
+  ];
+  const result = await runCsharpFeature("registry", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 删除注册表值
+ * @param {string} path 注册表路径
+ * @param {string} name 值名称
+ * @returns {boolean} 是否成功
+ */
+const deleteValue = async function (path, name = "") {
+  const args = ["-type", "delete", "-path", path];
+  if (name) {
+    args.push("-name", name);
+  }
+  const result = await runCsharpFeature("registry", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 列出注册表项
+ * @param {string} path 注册表路径
+ * @returns {Array} 注册表项列表
+ */
+const listKeys = async function (path) {
+  const args = ["-type", "list", "-path", path];
+  const result = await runCsharpFeature("registry", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析注册表项列表失败:", error);
+    return null;
+  }
+};
+
+module.exports = {
+  getValue,
+  setValue,
+  deleteValue,
+  listKeys,
+};
diff --git a/plugin/lib/quickcomposer/windows/service.js b/plugin/lib/quickcomposer/windows/service.js
new file mode 100644
index 00000000..9d87e6f5
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/service.js
@@ -0,0 +1,39 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 列出服务
+ * @returns {Array} 服务列表
+ */
+const listServices = async function () {
+  const args = ["-type", "list"];
+  const result = await runCsharpFeature("service", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析服务列表失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 控制服务
+ * @param {string} name 服务名称
+ * @param {string} operation 操作类型：start/stop/pause/continue
+ * @returns {boolean} 是否成功
+ */
+const controlService = async function (name, operation) {
+  const args = ["-type", operation, "-name", name];
+  const result = await runCsharpFeature("service", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+module.exports = {
+  listServices,
+  controlService,
+};
diff --git a/plugin/lib/quickcomposer/windows/software.js b/plugin/lib/quickcomposer/windows/software.js
new file mode 100644
index 00000000..8f4cb4f4
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/software.js
@@ -0,0 +1,38 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 列出已安装软件
+ * @returns {Array} 软件列表
+ */
+const listSoftware = async function () {
+  const args = ["-type", "list"];
+  const result = await runCsharpFeature("software", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析软件列表失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 卸载软件
+ * @param {string} target 软件ID
+ * @returns {boolean} 是否成功
+ */
+const uninstallSoftware = async function (target) {
+  const args = ["-type", "uninstall", "-target", target];
+  const result = await runCsharpFeature("software", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+module.exports = {
+  listSoftware,
+  uninstallSoftware,
+};
diff --git a/plugin/lib/quickcomposer/windows/utils.js b/plugin/lib/quickcomposer/windows/utils.js
new file mode 100644
index 00000000..d6285fb7
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/utils.js
@@ -0,0 +1,146 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 设置壁纸
+ * @param {string} path 壁纸路径
+ * @returns {boolean} 是否成功
+ */
+const setWallpaper = async function (path) {
+  const args = ["-type", "wallpaper", "-path", path];
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 控制显示器
+ * @param {string} action 动作：on/off
+ * @returns {boolean} 是否成功
+ */
+const controlMonitor = async function (action) {
+  const args = ["-type", "monitor", "-action", action];
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 电源控制
+ * @param {string} mode 模式：sleep/hibernate/awake/normal
+ * @returns {boolean} 是否成功
+ */
+const powerControl = async function (mode) {
+  const args = ["-type", "power", "-mode", mode];
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 配置网络
+ * @param {string} interfaceName 网卡名称
+ * @param {string} ip IP地址
+ * @param {string} mask 子网掩码
+ * @param {string} gateway 网关
+ * @param {string} dns DNS服务器
+ * @returns {boolean} 是否成功
+ */
+const configureNetwork = async function (
+  interfaceName,
+  ip,
+  mask,
+  gateway = "",
+  dns = ""
+) {
+  const args = [
+    "-type",
+    "network",
+    "-interface",
+    interfaceName,
+    "-ip",
+    ip,
+    "-mask",
+    mask,
+  ];
+  if (gateway) args.push("-gateway", gateway);
+  if (dns) args.push("-dns", dns);
+
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 管理开机启动项
+ * @param {string} path 程序路径
+ * @param {string} name 启动项名称
+ * @param {boolean} remove 是否移除
+ * @returns {boolean} 是否成功
+ */
+const manageStartup = async function (path, name, remove = false) {
+  const args = ["-type", "startup", "-path", path, "-name", name];
+  if (remove) args.push("-remove");
+
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 创建快捷方式
+ * @param {string} targetPath 目标路径
+ * @param {string} shortcutPath 快捷方式路径
+ * @param {string} args 启动参数
+ * @returns {boolean} 是否成功
+ */
+const createShortcut = async function (targetPath, shortcutPath, args = "") {
+  const cmdArgs = [
+    "-type",
+    "shortcut",
+    "-target",
+    targetPath,
+    "-path",
+    shortcutPath,
+  ];
+  if (args) cmdArgs.push("-args", args);
+
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 设置亮度
+ * @param {number} level 亮度级别(0-100)
+ * @returns {boolean} 是否成功
+ */
+const setBrightness = async function (level) {
+  const args = ["-type", "brightness", "-level", level.toString()];
+  const result = await runCsharpFeature("utils", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+module.exports = {
+  setWallpaper,
+  controlMonitor,
+  powerControl,
+  configureNetwork,
+  manageStartup,
+  createShortcut,
+  setBrightness,
+};
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 1d288ce8..be218f03 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -45,6 +45,65 @@ const controlClass = [
   { value: "GroupBox", label: "分组框 (GroupBox)" },
 ];
 
+const registryPaths = [
+  // 系统设置
+  {
+    value: "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion",
+    label: "Windows设置",
+  },
+  { value: "HKLM\\SYSTEM\\CurrentControlSet\\Control", label: "系统控制" },
+  {
+    value: "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+    label: "Windows NT设置",
+  },
+
+  // 启动项
+  {
+    value: "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
+    label: "系统启动项",
+  },
+  {
+    value: "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
+    label: "用户启动项",
+  },
+
+  // 软件设置
+  {
+    value: "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
+    label: "已安装软件(64位)",
+  },
+  {
+    value:
+      "HKLM\\SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
+    label: "已安装软件(32位)",
+  },
+
+  // 文件关联
+  { value: "HKLM\\SOFTWARE\\Classes", label: "系统文件关联" },
+  { value: "HKCU\\SOFTWARE\\Classes", label: "用户文件关联" },
+
+  // 服务
+  { value: "HKLM\\SYSTEM\\CurrentControlSet\\Services", label: "系统服务" },
+
+  // 环境变量
+  {
+    value:
+      "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment",
+    label: "系统环境变量",
+  },
+  { value: "HKCU\\Environment", label: "用户环境变量" },
+
+  // 网络设置
+  {
+    value: "HKLM\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
+    label: "TCP/IP设置",
+  },
+  {
+    value: "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkList",
+    label: "网络配置",
+  },
+];
+
 export const windowsCommands = {
   label: "Win自动化",
   icon: "window",
@@ -520,5 +579,523 @@ export const windowsCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.windows.process.listProcesses",
+      label: "进程管理",
+      desc: "Windows进程操作",
+      icon: "memory",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.process.listProcesses",
+          label: "进程列表",
+          icon: "list",
+          outputVariable: "processList",
+          saveOutput: true,
+        },
+        {
+          value: "quickcomposer.windows.process.killProcess",
+          label: "终止进程",
+          icon: "stop_circle",
+          config: [
+            {
+              key: "target",
+              label: "进程ID/名称",
+              component: "VariableInput",
+              icon: "tag",
+              width: 12,
+              placeholder: "输入进程ID或名称",
+              required: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.process.startProcess",
+          label: "启动进程",
+          icon: "play_circle",
+          config: [
+            {
+              key: "path",
+              label: "程序路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择程序",
+                    filters: [
+                      { name: "可执行文件", extensions: ["exe"] },
+                      { name: "所有文件", extensions: ["*"] },
+                    ],
+                  },
+                },
+              },
+              required: true,
+            },
+            {
+              key: "arguments",
+              label: "启动参数",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "可选的启动参数",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.windows.registry.listKeys",
+      label: "注册表管理",
+      desc: "Windows注册表操作",
+      icon: "settings",
+      isAsync: true,
+      config: [
+        {
+          key: "path",
+          label: "注册表路径",
+          component: "VariableInput",
+          icon: "folder",
+          width: 12,
+          placeholder: "如: HKLM\\SOFTWARE\\Microsoft\\Windows",
+          options: {
+            items: registryPaths,
+          },
+          required: true,
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.windows.registry.listKeys",
+          label: "列出项",
+          icon: "list",
+          outputVariable: "registryKeys",
+          saveOutput: true,
+        },
+        {
+          value: "quickcomposer.windows.registry.getValue",
+          label: "获取值",
+          icon: "search",
+          config: [
+            {
+              key: "path",
+              label: "注册表路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              placeholder: "如: HKLM\\SOFTWARE\\Microsoft\\Windows",
+              options: {
+                items: registryPaths,
+              },
+              required: true,
+            },
+            {
+              key: "name",
+              label: "值名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "要获取的值名称",
+            },
+          ],
+          outputVariable: "registryValue",
+          saveOutput: true,
+        },
+        {
+          value: "quickcomposer.windows.registry.setValue",
+          label: "设置值",
+          icon: "edit",
+          config: [
+            {
+              key: "path",
+              label: "注册表路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              placeholder: "如: HKLM\\SOFTWARE\\Microsoft\\Windows",
+              options: {
+                items: registryPaths,
+              },
+              required: true,
+            },
+            {
+              key: "name",
+              label: "值名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "要设置的值名称",
+              required: true,
+            },
+            {
+              key: "value",
+              label: "值内容",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+              required: true,
+            },
+            {
+              key: "valueType",
+              label: "值类型",
+              component: "q-select",
+              icon: "category",
+              width: 4,
+              options: [
+                { label: "字符串", value: "string" },
+                { label: "可扩展字符串", value: "expandstring" },
+                { label: "二进制", value: "binary" },
+                { label: "DWORD", value: "dword" },
+                { label: "QWORD", value: "qword" },
+                { label: "多字符串", value: "multistring" },
+              ],
+              defaultValue: "string",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.registry.deleteValue",
+          label: "删除值",
+          icon: "delete",
+          config: [
+            {
+              key: "path",
+              label: "注册表路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              placeholder: "如: HKLM\\SOFTWARE\\Microsoft\\Windows",
+              options: {
+                items: registryPaths,
+              },
+              required: true,
+            },
+            {
+              key: "name",
+              label: "值名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "要删除的值名称(留空删除整个项)",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.windows.service.listServices",
+      label: "服务管理",
+      desc: "Windows服务操作",
+      icon: "miscellaneous_services",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.service.listServices",
+          label: "服务列表",
+          icon: "list",
+          outputVariable: "serviceList",
+          saveOutput: true,
+        },
+        {
+          value: "quickcomposer.windows.service.controlService",
+          label: "控制服务",
+          icon: "settings",
+          config: [
+            {
+              key: "name",
+              label: "服务名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "输入服务名称",
+              required: true,
+            },
+            {
+              key: "operation",
+              label: "操作",
+              component: "ButtonGroup",
+              icon: "play_circle",
+              width: 12,
+              options: [
+                { label: "启动", value: "start" },
+                { label: "停止", value: "stop" },
+                { label: "暂停", value: "pause" },
+                { label: "继续", value: "continue" },
+              ],
+              defaultValue: "start",
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.windows.software.listSoftware",
+      label: "软件管理",
+      desc: "Windows软件操作",
+      icon: "apps",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.software.listSoftware",
+          label: "软件列表",
+          icon: "list",
+          outputVariable: "softwareList",
+          saveOutput: true,
+        },
+        {
+          value: "quickcomposer.windows.software.uninstallSoftware",
+          label: "卸载软件",
+          icon: "delete",
+          config: [
+            {
+              key: "target",
+              label: "软件ID",
+              component: "VariableInput",
+              icon: "tag",
+              width: 12,
+              placeholder: "输入软件ID(从软件列表获取)",
+              required: true,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.windows.utils.setWallpaper",
+      label: "系统工具",
+      desc: "Windows系统工具",
+      icon: "build",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.utils.setWallpaper",
+          label: "设置壁纸",
+          icon: "wallpaper",
+          config: [
+            {
+              key: "path",
+              label: "壁纸路径",
+              component: "VariableInput",
+              icon: "image",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择壁纸",
+                    filters: [
+                      {
+                        name: "图片文件",
+                        extensions: ["jpg", "jpeg", "png", "bmp"],
+                      },
+                    ],
+                  },
+                },
+              },
+              required: true,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.controlMonitor",
+          label: "控制显示器",
+          icon: "desktop_windows",
+          config: [
+            {
+              key: "action",
+              component: "ButtonGroup",
+              icon: "power_settings_new",
+              width: 12,
+              options: [
+                { label: "开启", value: "on" },
+                { label: "关闭", value: "off" },
+              ],
+              defaultValue: "off",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.powerControl",
+          label: "电源控制",
+          icon: "power",
+          config: [
+            {
+              key: "mode",
+              component: "ButtonGroup",
+              icon: "power_settings_new",
+              width: 12,
+              options: [
+                { label: "睡眠", value: "sleep" },
+                { label: "休眠", value: "hibernate" },
+                { label: "保持唤醒", value: "awake" },
+                { label: "正常", value: "normal" },
+              ],
+              defaultValue: "sleep",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.configureNetwork",
+          label: "配置网络",
+          icon: "network_check",
+          config: [
+            {
+              key: "interfaceName",
+              label: "网卡名称",
+              component: "VariableInput",
+              icon: "settings_ethernet",
+              width: 12,
+              placeholder: "输入网卡名称",
+              required: true,
+            },
+            {
+              key: "ip",
+              label: "IP地址",
+              component: "VariableInput",
+              icon: "router",
+              width: 6,
+              placeholder: "如: 192.168.1.100",
+              required: true,
+            },
+            {
+              key: "mask",
+              label: "子网掩码",
+              component: "VariableInput",
+              icon: "filter_alt",
+              width: 6,
+              placeholder: "如: 255.255.255.0",
+              required: true,
+            },
+            {
+              key: "gateway",
+              label: "默认网关",
+              component: "VariableInput",
+              icon: "dns",
+              width: 6,
+              placeholder: "可选",
+            },
+            {
+              key: "dns",
+              label: "DNS服务器",
+              component: "VariableInput",
+              icon: "dns",
+              width: 6,
+              placeholder: "可选",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.manageStartup",
+          label: "开机启动项",
+          icon: "power",
+          config: [
+            {
+              key: "path",
+              label: "程序路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择程序",
+                    filters: [
+                      { name: "可执行文件", extensions: ["exe"] },
+                      { name: "所有文件", extensions: ["*"] },
+                    ],
+                  },
+                },
+              },
+              required: true,
+            },
+            {
+              key: "name",
+              label: "启动项名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 8,
+              required: true,
+            },
+            {
+              key: "remove",
+              label: "移除",
+              component: "CheckButton",
+              icon: "delete",
+              width: 4,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.createShortcut",
+          label: "创建快捷方式",
+          icon: "link",
+          config: [
+            {
+              key: "targetPath",
+              label: "目标路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择目标",
+                    filters: [{ name: "所有文件", extensions: ["*"] }],
+                  },
+                },
+              },
+              required: true,
+            },
+            {
+              key: "shortcutPath",
+              label: "快捷方式路径",
+              component: "VariableInput",
+              icon: "save",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "save",
+                  options: {
+                    title: "保存快捷方式",
+                    filters: [{ name: "快捷方式", extensions: ["lnk"] }],
+                  },
+                },
+              },
+              required: true,
+            },
+            {
+              key: "args",
+              label: "启动参数",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "可选的启动参数",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.utils.setBrightness",
+          label: "设置亮度",
+          icon: "brightness_medium",
+          config: [
+            {
+              key: "level",
+              label: "亮度级别",
+              component: "NumberInput",
+              icon: "brightness_medium",
+              width: 12,
+              min: 0,
+              max: 100,
+              defaultValue: 50,
+              required: true,
+            },
+          ],
+        },
+      ],
+    },
   ],
 };

From 7597d18f767962b60e582606410321b0b43487d8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 18:09:54 +0800
Subject: [PATCH 058/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0automation.cs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/automation.cs | 1141 +++++++++++++++++++++++++++++++
 plugin/lib/csharp/index.js      |  107 ++-
 2 files changed, 1243 insertions(+), 5 deletions(-)
 create mode 100644 plugin/lib/csharp/automation.cs

diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
new file mode 100644
index 00000000..19000074
--- /dev/null
+++ b/plugin/lib/csharp/automation.cs
@@ -0,0 +1,1141 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Windows.Automation;
+using System.Windows.Automation.Text;
+using System.Windows;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+using System.Linq;
+using System.Threading;
+using System.Windows.Forms;
+
+public class AutomationManager
+{
+    // 用于缓存找到的元素
+    private static Dictionary<string, AutomationElement> elementCache = new Dictionary<string, AutomationElement>();
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetForegroundWindow();
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct Point
+    {
+        public int X;
+        public int Y;
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is Point)) return false;
+            Point other = (Point)obj;
+            return X == other.X && Y == other.Y;
+        }
+
+        public static bool operator ==(Point a, Point b)
+        {
+            return a.Equals(b);
+        }
+
+        public static bool operator !=(Point a, Point b)
+        {
+            return !a.Equals(b);
+        }
+
+        public override int GetHashCode()
+        {
+            return X.GetHashCode() ^ Y.GetHashCode();
+        }
+
+        public System.Windows.Point ToWindowsPoint()
+        {
+            return new System.Windows.Point(X, Y);
+        }
+    }
+
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool GetCursorPos(out Point lpPoint);
+
+    [DllImport("user32.dll")]
+    private static extern short GetAsyncKeyState(int vKey);
+
+    public static void Main(string[] args)
+    {
+        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+        {
+            ShowHelp();
+            return;
+        }
+
+        string type = GetArgumentValue(args, "-type");
+        if (string.IsNullOrEmpty(type))
+        {
+            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+            return;
+        }
+
+        try
+        {
+            switch (type.ToLower())
+            {
+                case "list":
+                    // 列出所有元素
+                    string filter = GetArgumentValue(args, "-filter"); // 可选的过滤条件
+                    ListElements(args, filter);
+                    break;
+
+                case "find":
+                    // 查找元素
+                    string by = GetArgumentValue(args, "-by") ?? "name";
+                    string value = GetArgumentValue(args, "-value");
+                    string scope = GetArgumentValue(args, "-scope") ?? "children";
+                    FindElement(args, by, value, scope);
+                    break;
+
+                case "getinfo":
+                    // 获取元素信息
+                    GetElementInfo(args);
+                    break;
+
+                case "click":
+                    // 点击元素
+                    ClickElement(args);
+                    break;
+
+                case "setvalue":
+                    // 设置值
+                    string newValue = GetArgumentValue(args, "-value");
+                    SetElementValue(args, newValue);
+                    break;
+
+                case "getvalue":
+                    // 获取值
+                    GetElementValue(args);
+                    break;
+
+                case "select":
+                    // 选择项目
+                    string item = GetArgumentValue(args, "-item");
+                    SelectItem(args, item);
+                    break;
+
+                case "expand":
+                    // 展开/折叠
+                    string expandStr = GetArgumentValue(args, "-expand");
+                    bool expand = expandStr != null && expandStr.ToLower() == "true";
+                    ExpandElement(args, expand);
+                    break;
+
+                case "scroll":
+                    // 滚动
+                    string direction = GetArgumentValue(args, "-direction") ?? "vertical";
+                    double amount = double.Parse(GetArgumentValue(args, "-amount") ?? "0");
+                    ScrollElement(args, direction, amount);
+                    break;
+
+                case "wait":
+                    // 等待元素
+                    by = GetArgumentValue(args, "-by") ?? "name";
+                    value = GetArgumentValue(args, "-value");
+                    int timeout = int.Parse(GetArgumentValue(args, "-timeout") ?? "30");
+                    WaitForElement(args, by, value, timeout);
+                    break;
+
+                case "focus":
+                    // 设置焦点
+                    SetFocus(args);
+                    break;
+
+                case "sendkeys":
+                    // 发送按键
+                    string keys = GetArgumentValue(args, "-keys");
+                    SendKeys(args, keys);
+                    break;
+
+                case "getchild":
+                    // 获取子元素
+                    string childType = GetArgumentValue(args, "-type") ?? "all";
+                    GetChildElements(args, childType);
+                    break;
+
+                case "getparent":
+                    // 获取父元素
+                    GetParentElement(args);
+                    break;
+
+                case "highlight":
+                    // 高亮显示元素
+                    int duration = int.Parse(GetArgumentValue(args, "-duration") ?? "2");
+                    HighlightElement(args, duration);
+                    break;
+
+                case "inspect":
+                    // 生成元素识别器
+                    int inspectTimeout = int.Parse(GetArgumentValue(args, "-timeout") ?? "30");
+                    InspectElement(args, inspectTimeout);
+                    break;
+
+                default:
+                    Console.Error.WriteLine("Error: 不支持的操作类型");
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+        }
+    }
+
+    private static void ShowHelp()
+    {
+        string help = @"UI自动化工具 - 使用说明
+
+用法:
+  automation.exe -type <操作类型> [参数]
+
+通用参数:
+  -window <窗口标识>  指定操作的窗口(可选)
+  -method <查找方式>  指定窗口查找方式(可选,默认active)
+    支持以下方式:
+    - title     窗口标题(支持模糊匹配)
+    - class     窗口类名
+    - handle    窗口句柄
+    - process   进程名
+    - active    当前活动窗口(默认)
+    不指定时默认在整个桌面范围内查找
+
+元素识别参数:
+  -value <标识值>    要查找的元素的值
+  -by <识别方式>     识别方式(可选,默认name)
+  支持以下方式:
+  - name         按名称查找
+  - class        按类名查找
+  - type         按控件类型查找
+  - automationid 按AutomationId查找
+
+操作类型及示例:
+1. inspect - 生成元素识别器
+  参数:
+    -timeout <超时>    等待超时时间(秒,默认30)
+  示例:
+    automation.exe -type inspect -timeout 60
+  说明:
+    运行后点击要识别的元素，将返回元素的详细信息和示例命令
+
+2. list - 列出所有元素
+   参数:
+    -filter <过滤文本>  按名称/类名/AutomationId过滤(可选)
+   示例:
+     automation.exe -window ""记事本"" -method title -type list
+     automation.exe -window ""记事本"" -method title -type list -filter ""按钮""
+
+3. find - 查找元素
+   参数:
+     -by <查找方式>     name/class/type/automationid
+     -value <查找值>    要查找的值
+     -scope <查找范围>  children/descendants/subtree等(可选,默认children)
+   示例:
+     automation.exe -window ""计算器"" -method title -type find -by name -value ""等于""
+     automation.exe -window ""记事本"" -method class -type find -by type -value ""button""
+
+4. getinfo - 获取元素信息
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+   示例:
+     automation.exe -type getinfo -value ""确定"" -by name
+     automation.exe -type getinfo -value ""button"" -by type
+
+5. click - 点击元素
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -pattern <模式>   invoke/toggle/expand等(可选,默认invoke)
+   示例:
+     automation.exe -type click -value ""确定"" -by name
+     automation.exe -type click -value ""button"" -by type -pattern toggle
+
+6. setvalue - 设置值
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -newvalue <新值>   要设置的值
+   示例:
+     automation.exe -type setvalue -value ""文本框"" -by name -newvalue ""新内容""
+
+7. getvalue - 获取值
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+   示例:
+     automation.exe -type getvalue -value ""文本框"" -by name
+
+8. select - 选择项目
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -item <项目>      要选择的项目
+   示例:
+     automation.exe -type select -value ""下拉框"" -by name -item ""选项1""
+
+9. expand - 展开/折叠
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -expand <true/false> 是否展开
+   示例:
+     automation.exe -type expand -value ""树节点"" -by name -expand true
+
+10. scroll - 滚动
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -direction <方向>  vertical/horizontal(可选,默认vertical)
+     -amount <数值>     滚动量(0-100)
+   示例:
+     automation.exe -type scroll -value ""列表"" -by name -direction vertical -amount 50
+
+11. wait - 等待元素
+   参数:
+     -value <标识值>    要查找的值
+     -by <识别方式>     识别方式(可选,默认name)
+     -timeout <超时>    超时时间(秒,默认30)
+   示例:
+     automation.exe -type wait -value ""登录"" -by name -timeout 60
+
+12. focus - 设置焦点
+    参数:
+      -value <标识值>    要查找的值
+      -by <识别方式>     识别方式(可选,默认name)
+    示例:
+      automation.exe -type focus -value ""输入框"" -by name
+
+13. sendkeys - 发送按键
+    参数:
+      -value <标识值>    要查找的值
+      -by <识别方式>     识别方式(可选,默认name)
+      -keys <按键序列>   要发送的按键
+    示例:
+      automation.exe -type sendkeys -value ""输入框"" -by name -keys ""Hello World""
+
+14. getchild - 获取子元素
+    参数:
+      -value <标识值>    要查找的值
+      -by <识别方式>     识别方式(可选,默认name)
+      -type <控件类型>   筛选类型(可选,默认all)
+    示例:
+      automation.exe -type getchild -value ""窗口"" -by name -type button
+
+15. getparent - 获取父元素
+    参数:
+      -value <标识值>    要查找的值
+      -by <识别方式>     识别方式(可选,默认name)
+    示例:
+      automation.exe -type getparent -value ""按钮"" -by name
+
+16. highlight - 高亮显示元素
+    参数:
+      -value <标识值>    要查找的值
+      -by <识别方式>     识别方式(可选,默认name)
+      -duration <时长>   显示时长(秒,默认2)
+    示例:
+      automation.exe -type highlight -value ""按钮"" -by name -duration 5
+
+支持的控件类型:
+- button      (按钮)
+- edit        (编辑框)
+- combobox    (下拉框)
+- checkbox    (复选框)
+- radiobutton (单选按钮)
+- listitem    (列表项)
+- treeitem    (树项)
+- menu        (菜单)
+- menuitem    (菜单项)
+- tab         (选项卡)
+- window      (窗口)
+
+注意事项:
+1. 元素ID在find或list操作后返回，需要保存以供后续操作使用
+2. list操作会返回元素的完整路径，便于定位
+3. 所有操作都支持-timeout参数指定超时时间
+4. sendkeys支持特殊按键，如{ENTER}, {TAB}, {F1}, ^c(Ctrl+C)等
+5. 高亮显示功能会创建一个半透明黄色窗口覆盖在目标元素上
+6. 部分操作可能因目标元素不支持相应模式而失败
+";
+        Console.WriteLine(help);
+    }
+
+    private static string GetArgumentValue(string[] args, string key)
+    {
+        for (int i = 0; i < args.Length - 1; i++)
+        {
+            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+            {
+                return args[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static AutomationElement GetElementByIdentifier(string[] args, string identifier, string by = null)
+    {
+        // 如果提供了id，优先使用缓存
+        if (by == null && elementCache.ContainsKey(identifier))
+        {
+            return elementCache[identifier];
+        }
+
+        // 否则根据识别方式查找元素
+        AutomationElement root = GetRootElement(args);
+        by = by ?? "name";  // 默认使用name
+
+        Condition condition;
+        switch (by.ToLower())
+        {
+            case "name":
+                condition = new PropertyCondition(AutomationElement.NameProperty, identifier);
+                break;
+            case "class":
+                condition = new PropertyCondition(AutomationElement.ClassNameProperty, identifier);
+                break;
+            case "type":
+                // 根据控件类型名称获取对应的ControlType
+                ControlType controlType = null;
+                switch (identifier.ToLower())
+                {
+                    case "button":
+                        controlType = ControlType.Button;
+                        break;
+                    case "edit":
+                        controlType = ControlType.Edit;
+                        break;
+                    case "combobox":
+                        controlType = ControlType.ComboBox;
+                        break;
+                    case "checkbox":
+                        controlType = ControlType.CheckBox;
+                        break;
+                    case "radiobutton":
+                        controlType = ControlType.RadioButton;
+                        break;
+                    case "listitem":
+                        controlType = ControlType.ListItem;
+                        break;
+                    case "treeitem":
+                        controlType = ControlType.TreeItem;
+                        break;
+                    case "menu":
+                        controlType = ControlType.Menu;
+                        break;
+                    case "menuitem":
+                        controlType = ControlType.MenuItem;
+                        break;
+                    case "tab":
+                        controlType = ControlType.Tab;
+                        break;
+                    case "window":
+                        controlType = ControlType.Window;
+                        break;
+                    default:
+                        throw new Exception("不支持的控件类型: " + identifier);
+                }
+                condition = new PropertyCondition(AutomationElement.ControlTypeProperty, controlType);
+                break;
+            case "automationid":
+                condition = new PropertyCondition(AutomationElement.AutomationIdProperty, identifier);
+                break;
+            default:
+                throw new Exception("不支持的识别方式: " + by);
+        }
+
+        var element = root.FindFirst(TreeScope.Subtree, condition);
+        if (element == null)
+        {
+            throw new Exception(string.Format("找不到{0}为'{1}'的元素", by, identifier));
+        }
+
+        return element;
+    }
+
+    private static void GetElementInfo(string[] args)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var info = new Dictionary<string, object>();
+        info.Add("name", element.Current.Name);
+        info.Add("class", element.Current.ClassName);
+        info.Add("type", element.Current.ControlType.ProgrammaticName);
+        info.Add("automationId", element.Current.AutomationId);
+        info.Add("processId", element.Current.ProcessId);
+        info.Add("boundingRectangle", new
+        {
+            x = element.Current.BoundingRectangle.X,
+            y = element.Current.BoundingRectangle.Y,
+            width = element.Current.BoundingRectangle.Width,
+            height = element.Current.BoundingRectangle.Height
+        });
+        info.Add("patterns", GetSupportedPatterns(element));
+
+        var serializer = new JavaScriptSerializer();
+        Console.Write(serializer.Serialize(info));
+    }
+
+    private static void ClickElement(string[] args)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        string pattern = GetArgumentValue(args, "-pattern") ?? "invoke";
+        var element = GetElementByIdentifier(args, identifier, by);
+        switch (pattern.ToLower())
+        {
+            case "invoke":
+                var invokePattern = element.GetCurrentPattern(InvokePattern.Pattern) as InvokePattern;
+                if (invokePattern != null)
+                {
+                    invokePattern.Invoke();
+                    Console.WriteLine("成功执行点击操作");
+                    return;
+                }
+                break;
+
+            case "toggle":
+                var togglePattern = element.GetCurrentPattern(TogglePattern.Pattern) as TogglePattern;
+                if (togglePattern != null)
+                {
+                    togglePattern.Toggle();
+                    Console.WriteLine("成功执行切换操作");
+                    return;
+                }
+                break;
+        }
+        throw new Exception("元素不支持指定的操作模式");
+    }
+
+    private static string[] GetSupportedPatterns(AutomationElement element)
+    {
+        var patterns = new List<string>();
+        var supportedPatterns = element.GetSupportedPatterns();
+        foreach (var pattern in supportedPatterns)
+        {
+            patterns.Add(pattern.ProgrammaticName);
+        }
+        return patterns.ToArray();
+    }
+
+    private static void SetElementValue(string[] args, string newValue)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+
+        // 尝试ValuePattern
+        var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+        if (valuePattern != null)
+        {
+            valuePattern.SetValue(newValue);
+            Console.WriteLine("成功设置值");
+            return;
+        }
+
+        // 尝试TextPattern
+        var textPattern = element.GetCurrentPattern(TextPattern.Pattern) as TextPattern;
+        if (textPattern != null)
+        {
+            // 获取支持的文本选择单位
+            SupportedTextSelection supportedTextSelection = textPattern.SupportedTextSelection;
+            if (supportedTextSelection != SupportedTextSelection.None)
+            {
+                var documentRange = textPattern.DocumentRange;
+                // 选择所有文本
+                documentRange.Select();
+                // 替换文本
+                System.Windows.Forms.SendKeys.SendWait("^a"); // Ctrl+A 全选
+                System.Windows.Forms.SendKeys.SendWait(newValue);
+            }
+            else
+            {
+                throw new Exception("元素不支持文本选择");
+            }
+            Console.WriteLine("成功设置文本");
+            return;
+        }
+
+        throw new Exception("元素不支持设置值操作");
+    }
+
+    private static void GetElementValue(string[] args)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        string value = null;
+
+        // 尝试ValuePattern
+        var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+        if (valuePattern != null)
+        {
+            value = valuePattern.Current.Value;
+        }
+        // 尝试TextPattern
+        else
+        {
+            var textPattern = element.GetCurrentPattern(TextPattern.Pattern) as TextPattern;
+            if (textPattern != null)
+            {
+                value = textPattern.DocumentRange.GetText(int.MaxValue);
+            }
+        }
+
+        if (value != null)
+        {
+            var result = new Dictionary<string, string>();
+            result.Add("value", value);
+            var serializer = new JavaScriptSerializer();
+            Console.Write(serializer.Serialize(result));
+            return;
+        }
+
+        throw new Exception("元素不支持获取值操作");
+    }
+
+    private static void SelectItem(string[] args, string item)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+
+        // 尝试SelectionItemPattern
+        var selectionItemPattern = element.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+        if (selectionItemPattern != null)
+        {
+            selectionItemPattern.Select();
+            Console.WriteLine("成功选择项目");
+            return;
+        }
+
+        // 尝试ExpandCollapsePattern
+        var expandCollapsePattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
+        if (expandCollapsePattern != null)
+        {
+            // 如果是折叠状态，先展开
+            if (expandCollapsePattern.Current.ExpandCollapseState == ExpandCollapseState.Collapsed)
+            {
+                expandCollapsePattern.Expand();
+            }
+
+            // 查找并选择子项
+            Condition nameCondition = new PropertyCondition(AutomationElement.NameProperty, item);
+            AutomationElement child = element.FindFirst(TreeScope.Descendants, nameCondition);
+            if (child != null)
+            {
+                var childSelectionPattern = child.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+                if (childSelectionPattern != null)
+                {
+                    childSelectionPattern.Select();
+                    Console.WriteLine("成功选择子项");
+                    return;
+                }
+            }
+        }
+
+        throw new Exception("元素不支持选择操作或未找到指定项目");
+    }
+
+    private static void ExpandElement(string[] args, bool expand)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var expandCollapsePattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
+
+        if (expandCollapsePattern != null)
+        {
+            if (expand)
+            {
+                expandCollapsePattern.Expand();
+                Console.WriteLine("成功展开元素");
+            }
+            else
+            {
+                expandCollapsePattern.Collapse();
+                Console.WriteLine("成功折叠元素");
+            }
+            return;
+        }
+
+        throw new Exception("元素不支持展开/折叠操作");
+    }
+
+    private static void ScrollElement(string[] args, string direction, double amount)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var scrollPattern = element.GetCurrentPattern(ScrollPattern.Pattern) as ScrollPattern;
+
+        if (scrollPattern != null)
+        {
+            if (direction.ToLower() == "horizontal")
+            {
+                scrollPattern.SetScrollPercent(amount, ScrollPattern.NoScroll);
+            }
+            else
+            {
+                scrollPattern.SetScrollPercent(ScrollPattern.NoScroll, amount);
+            }
+            Console.WriteLine("成功执行滚动操作");
+            return;
+        }
+
+        throw new Exception("元素不支持滚动操作");
+    }
+
+    private static void WaitForElement(string[] args, string by, string value, int timeout)
+    {
+        DateTime endTime = DateTime.Now.AddSeconds(timeout);
+        while (DateTime.Now < endTime)
+        {
+            try
+            {
+                FindElement(args, by, value, "subtree");
+                Console.WriteLine("成功找到元素");
+                return;
+            }
+            catch
+            {
+                Thread.Sleep(500);
+            }
+        }
+        throw new Exception("等待超时");
+    }
+
+    private static void FindElementByXPath(string xpath)
+    {
+        // XPath查找的实现
+        throw new Exception("XPath查找暂未实现");
+    }
+
+    private static void SetFocus(string[] args)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        try
+        {
+            element.SetFocus();
+            Console.WriteLine("成功设置焦点");
+        }
+        catch (Exception)
+        {
+            throw new Exception("无法设置焦点");
+        }
+    }
+
+    private static void SendKeys(string[] args, string keys)
+    {
+        if (string.IsNullOrEmpty(keys))
+        {
+            throw new Exception("必须指定要发送的按键");
+        }
+
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+
+        // 确保元素可以接收输入
+        if (!element.Current.IsKeyboardFocusable)
+        {
+            throw new Exception("元素不支持键盘输入");
+        }
+
+        element.SetFocus();
+        System.Windows.Forms.SendKeys.SendWait(keys);
+        Console.WriteLine("成功发送按键");
+    }
+
+    private static void GetChildElements(string[] args, string childType)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var result = new List<Dictionary<string, string>>();
+
+        TreeScope scope = TreeScope.Children;
+        Condition condition = Condition.TrueCondition;
+
+        // 根据类型筛选子元素
+        if (childType != "all")
+        {
+            // 根据控件类型名称获取对应的ControlType
+            ControlType controlType = null;
+            switch (childType.ToLower())
+            {
+                case "button":
+                    controlType = ControlType.Button;
+                    break;
+                case "edit":
+                    controlType = ControlType.Edit;
+                    break;
+                case "combobox":
+                    controlType = ControlType.ComboBox;
+                    break;
+                case "checkbox":
+                    controlType = ControlType.CheckBox;
+                    break;
+                case "radiobutton":
+                    controlType = ControlType.RadioButton;
+                    break;
+                case "listitem":
+                    controlType = ControlType.ListItem;
+                    break;
+                case "treeitem":
+                    controlType = ControlType.TreeItem;
+                    break;
+                case "menu":
+                    controlType = ControlType.Menu;
+                    break;
+                case "menuitem":
+                    controlType = ControlType.MenuItem;
+                    break;
+                case "tab":
+                    controlType = ControlType.Tab;
+                    break;
+                case "window":
+                    controlType = ControlType.Window;
+                    break;
+                default:
+                    throw new Exception("不支持的控件类型: " + childType);
+            }
+
+            if (controlType != null)
+            {
+                condition = new PropertyCondition(
+                    AutomationElement.ControlTypeProperty,
+                    controlType
+                );
+            }
+        }
+
+        var children = element.FindAll(scope, condition);
+        foreach (AutomationElement child in children)
+        {
+            var childInfo = new Dictionary<string, string>();
+            childInfo.Add("id", CacheElement(child));
+            childInfo.Add("name", child.Current.Name);
+            childInfo.Add("class", child.Current.ClassName);
+            childInfo.Add("type", child.Current.ControlType.ProgrammaticName);
+            childInfo.Add("automationId", child.Current.AutomationId);
+            result.Add(childInfo);
+        }
+
+        var serializer = new JavaScriptSerializer();
+        Console.Write(serializer.Serialize(result));
+    }
+
+    private static void GetParentElement(string[] args)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var parent = TreeWalker.ControlViewWalker.GetParent(element);
+
+        if (parent != null)
+        {
+            var parentInfo = new Dictionary<string, string>();
+            parentInfo.Add("id", CacheElement(parent));
+            parentInfo.Add("name", parent.Current.Name);
+            parentInfo.Add("class", parent.Current.ClassName);
+            parentInfo.Add("type", parent.Current.ControlType.ProgrammaticName);
+            parentInfo.Add("automationId", parent.Current.AutomationId);
+
+            var serializer = new JavaScriptSerializer();
+            Console.Write(serializer.Serialize(parentInfo));
+        }
+        else
+        {
+            throw new Exception("元素没有父元素");
+        }
+    }
+
+    private static void HighlightElement(string[] args, int duration)
+    {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        var element = GetElementByIdentifier(args, identifier, by);
+        var rect = element.Current.BoundingRectangle;
+
+        // 创建一个半透明的高亮窗口
+        var highlightForm = new System.Windows.Forms.Form
+        {
+            StartPosition = System.Windows.Forms.FormStartPosition.Manual,
+            Location = new System.Drawing.Point((int)rect.Left, (int)rect.Top),
+            Size = new System.Drawing.Size((int)rect.Width, (int)rect.Height),
+            BackColor = System.Drawing.Color.Yellow,
+            Opacity = 0.3,
+            ShowInTaskbar = false,
+            FormBorderStyle = System.Windows.Forms.FormBorderStyle.None,
+            TopMost = true
+        };
+
+        highlightForm.Show();
+        Console.WriteLine("正在高亮显示元素");
+
+        // 等待指定时间后关闭高亮
+        Thread.Sleep(duration * 1000);
+        highlightForm.Close();
+        highlightForm.Dispose();
+    }
+
+    private static void ListElements(string[] args, string filter)
+    {
+        var root = GetRootElement(args);
+        var result = new List<Dictionary<string, string>>();
+
+        // 获取所有元素
+        var elements = root.FindAll(
+            TreeScope.Subtree,
+            Condition.TrueCondition
+        );
+
+        foreach (AutomationElement element in elements)
+        {
+            // 如果指定了过滤条件，检查元素名称是否包含过滤文本
+            if (!string.IsNullOrEmpty(filter) &&
+                !element.Current.Name.Contains(filter) &&
+                !element.Current.ClassName.Contains(filter) &&
+                !element.Current.AutomationId.Contains(filter))
+            {
+                continue;
+            }
+
+            var elementInfo = new Dictionary<string, string>();
+            elementInfo.Add("id", CacheElement(element));
+            elementInfo.Add("name", element.Current.Name);
+            elementInfo.Add("class", element.Current.ClassName);
+            elementInfo.Add("type", element.Current.ControlType.ProgrammaticName);
+            elementInfo.Add("automationId", element.Current.AutomationId);
+            elementInfo.Add("path", GetElementPath(element));
+            result.Add(elementInfo);
+        }
+
+        var serializer = new JavaScriptSerializer();
+        Console.Write(serializer.Serialize(result));
+    }
+
+    private static string GetElementPath(AutomationElement element)
+    {
+        var path = new List<string>();
+        var current = element;
+
+        while (current != null && current != AutomationElement.RootElement)
+        {
+            string name = current.Current.Name;
+            string type = current.Current.ControlType.ProgrammaticName;
+            string automationId = current.Current.AutomationId;
+            // 构建简单的路径段
+            string pathSegment = type;
+            if (!string.IsNullOrEmpty(automationId))
+            {
+                pathSegment += string.Format("[@AutomationId='{0}']", automationId);
+            }
+            else if (!string.IsNullOrEmpty(name))
+            {
+                pathSegment += string.Format("[@Name='{0}']", name.Replace("'", "&apos;"));
+            }
+
+            path.Insert(0, pathSegment);
+            current = TreeWalker.ControlViewWalker.GetParent(current);
+        }
+
+        return "//" + string.Join("/", path);
+    }
+
+    private static string CacheElement(AutomationElement element)
+    {
+        string elementId = Guid.NewGuid().ToString();
+        elementCache[elementId] = element;
+        return elementId;
+    }
+
+    private static AutomationElement GetRootElement(string[] args)
+    {
+        string window = GetArgumentValue(args, "-window");
+        string method = GetArgumentValue(args, "-method") ?? "active";
+
+        if (string.IsNullOrEmpty(window) && method == "active")
+        {
+            return AutomationElement.RootElement;
+        }
+
+        switch (method.ToLower())
+        {
+            case "handle":
+                // 通过窗口句柄查找
+                int handle = int.Parse(window);
+                return AutomationElement.FromHandle(new IntPtr(handle));
+
+            case "class":
+                // 通过窗口类名查找
+                return AutomationElement.RootElement.FindFirst(
+                    TreeScope.Children,
+                    new PropertyCondition(AutomationElement.ClassNameProperty, window)
+                );
+
+            case "process":
+                // 通过进程名查找
+                var processes = System.Diagnostics.Process.GetProcessesByName(window);
+                if (processes.Length > 0)
+                {
+                    return AutomationElement.FromHandle(processes[0].MainWindowHandle);
+                }
+                break;
+
+            case "active":
+                // 获取当前活动窗口
+                IntPtr activeHandle = GetForegroundWindow();
+                return AutomationElement.FromHandle(activeHandle);
+
+            case "title":
+            default:
+                // 通过窗口标题查找(支持模糊匹配)
+                var windows = AutomationElement.RootElement.FindAll(
+                    TreeScope.Children,
+                    Condition.TrueCondition
+                );
+                foreach (AutomationElement win in windows)
+                {
+                    if (win.Current.Name.Contains(window))
+                    {
+                        return win;
+                    }
+                }
+                break;
+        }
+
+        throw new Exception("找不到指定的窗口");
+    }
+
+    private static void FindElement(string[] args, string by, string value, string scope)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            throw new Exception("必须指定查找值 (-value)");
+        }
+
+        AutomationElement root = GetRootElement(args);
+        TreeScope treeScope = TreeScope.Children;
+        switch (scope.ToLower())
+        {
+            case "descendants":
+                treeScope = TreeScope.Descendants;
+                break;
+            case "subtree":
+                treeScope = TreeScope.Subtree;
+                break;
+        }
+
+        Condition condition;
+        switch (by.ToLower())
+        {
+            case "name":
+                condition = new PropertyCondition(AutomationElement.NameProperty, value);
+                break;
+            case "class":
+                condition = new PropertyCondition(AutomationElement.ClassNameProperty, value);
+                break;
+            case "automation":
+                condition = new PropertyCondition(AutomationElement.AutomationIdProperty, value);
+                break;
+            case "xpath":
+                FindElementByXPath(value);
+                return;
+            default:
+                throw new Exception("不支持的查找方式: " + by);
+        }
+
+        var elements = root.FindAll(treeScope, condition);
+        var result = new List<Dictionary<string, string>>();
+
+        foreach (AutomationElement element in elements)
+        {
+            var elementInfo = new Dictionary<string, string>();
+            elementInfo.Add("id", CacheElement(element));
+            elementInfo.Add("name", element.Current.Name);
+            elementInfo.Add("class", element.Current.ClassName);
+            elementInfo.Add("type", element.Current.ControlType.ProgrammaticName);
+            elementInfo.Add("automationId", element.Current.AutomationId);
+            result.Add(elementInfo);
+        }
+
+        var serializer = new JavaScriptSerializer();
+        Console.Write(serializer.Serialize(result));
+    }
+
+    private static void InspectElement(string[] args, int timeout)
+    {
+        Console.WriteLine("请在" + timeout + "秒内点击要识别的元素...");
+
+        // 记录当前鼠标位置
+        DateTime endTime = DateTime.Now.AddSeconds(timeout);
+        AutomationElement clickedElement = null;
+        bool wasPressed = false;
+
+        while (DateTime.Now < endTime)
+        {
+            // 检测鼠标左键点击
+            bool isPressed = (GetAsyncKeyState(0x01) & 0x8000) != 0;
+            if (isPressed && !wasPressed)  // 鼠标按下瞬间
+            {
+                // 获取当前鼠标位置
+                Point currentPosition;
+                GetCursorPos(out currentPosition);
+
+                try
+                {
+                    // 从鼠标位置获取元素
+                    clickedElement = AutomationElement.FromPoint(currentPosition.ToWindowsPoint());
+                    if (clickedElement != null && clickedElement != AutomationElement.RootElement)
+                    {
+                        // 构建元素信息
+                        var elementInfo = new Dictionary<string, object>();
+                        elementInfo.Add("id", CacheElement(clickedElement));
+                        elementInfo.Add("name", clickedElement.Current.Name);
+                        elementInfo.Add("class", clickedElement.Current.ClassName);
+                        elementInfo.Add("type", clickedElement.Current.ControlType.ProgrammaticName);
+                        elementInfo.Add("automationId", clickedElement.Current.AutomationId);
+                        elementInfo.Add("path", GetElementPath(clickedElement));
+                        elementInfo.Add("location", new {
+                            x = clickedElement.Current.BoundingRectangle.X,
+                            y = clickedElement.Current.BoundingRectangle.Y,
+                            width = clickedElement.Current.BoundingRectangle.Width,
+                            height = clickedElement.Current.BoundingRectangle.Height
+                        });
+                        elementInfo.Add("patterns", GetSupportedPatterns(clickedElement));
+
+                        // 生成示例命令
+                        var commands = new List<string>();
+                        if (!string.IsNullOrEmpty(clickedElement.Current.Name))
+                            commands.Add(string.Format("automation.exe -type find -by name -value \"{0}\"", clickedElement.Current.Name));
+                        if (!string.IsNullOrEmpty(clickedElement.Current.AutomationId))
+                            commands.Add(string.Format("automation.exe -type find -by automationid -value \"{0}\"", clickedElement.Current.AutomationId));
+                        elementInfo.Add("commands", commands);
+
+                        var serializer = new JavaScriptSerializer();
+                        Console.Write(serializer.Serialize(elementInfo));
+                        return;
+                    }
+                }
+                catch
+                {
+                    // 忽略获取元素时的错误
+                }
+            }
+
+            wasPressed = isPressed;
+            Thread.Sleep(100);
+        }
+
+        throw new Exception("操作超时");
+    }
+}
diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 71fb5dc6..5be5e3b5 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -3,6 +3,95 @@ const path = require("path");
 const iconv = require("iconv-lite");
 const child_process = require("child_process");
 const { getQuickcommandFolderFile } = require("../getQuickcommandFile");
+
+const getAssemblyPath = (assembly) => {
+  const { version } = getCscPath();
+  const is64bit = process.arch === "x64";
+
+  const paths = [
+    // v4.0 路径
+    path.join(
+      process.env.WINDIR,
+      "Microsoft.NET",
+      "assembly",
+      "GAC_MSIL",
+      assembly,
+      "v4.0_4.0.0.0__31bf3856ad364e35",
+      assembly + ".dll"
+    ),
+    path.join(
+      process.env.WINDIR,
+      "Microsoft.NET",
+      is64bit ? "Framework64" : "Framework",
+      "v4.0.30319",
+      assembly + ".dll"
+    ),
+    path.join(
+      process.env.WINDIR,
+      "Microsoft.NET",
+      is64bit ? "Framework64" : "Framework",
+      "v4.0.30319",
+      "WPF",
+      assembly + ".dll"
+    ),
+
+    // v3.0/v3.5 路径
+    path.join(
+      process.env["ProgramFiles(x86)"] || process.env.ProgramFiles,
+      "Reference Assemblies",
+      "Microsoft",
+      "Framework",
+      "v3.0",
+      assembly + ".dll"
+    ),
+    path.join(
+      process.env.ProgramFiles,
+      "Reference Assemblies",
+      "Microsoft",
+      "Framework",
+      "v3.0",
+      assembly + ".dll"
+    ),
+    path.join(
+      process.env.WINDIR,
+      "assembly",
+      "GAC_MSIL",
+      assembly,
+      "3.0.0.0__31bf3856ad364e35",
+      assembly + ".dll"
+    ),
+  ];
+
+  // 根据csc版本筛选合适的路径
+  const filteredPaths = paths.filter((p) => {
+    if (version === "v4.0") return true; // v4.0可以使用所有版本
+    return !p.includes("v4.0"); // v3.5只使用v3.0及以下版本
+  });
+
+  for (const p of filteredPaths) {
+    if (fs.existsSync(p)) return p;
+  }
+  return null;
+};
+
+const getFeatureReferences = (feature) => {
+  let references = "";
+  if (feature === "automation") {
+    const automationDll = getAssemblyPath("UIAutomationClient");
+    const formsDll = getAssemblyPath("System.Windows.Forms");
+    const typesDll = getAssemblyPath("UIAutomationTypes");
+    const baseDll = getAssemblyPath("WindowsBase");
+    if (!automationDll) throw new Error("找不到UIAutomationClient.dll");
+    if (!formsDll) throw new Error("找不到System.Windows.Forms.dll");
+    if (!typesDll) throw new Error("找不到UIAutomationTypes.dll");
+    if (!baseDll) throw new Error("找不到WindowsBase.dll");
+    references =
+      `/reference:"${automationDll}" /reference:"${formsDll}" ` +
+      `/reference:"${typesDll}" /reference:"${baseDll}" `;
+  }
+  return references;
+};
+
 const getCsharpFeatureCs = (feature) => {
   return path.join(__dirname, feature + ".cs");
 };
@@ -20,11 +109,13 @@ const buildCsharpFeature = async (feature) => {
     const exePath = getQuickcommandFolderFile(feature, "exe");
     const srcCsPath = getCsharpFeatureCs(feature);
     const destCsPath = getQuickcommandFolderFile(feature, "cs");
-    const cscPath = getCscPath();
+    const { path: cscPath } = getCscPath();
+    const references = getFeatureReferences(feature);
+
     fs.copyFile(srcCsPath, destCsPath, (err) => {
       if (err) return reject(err.toString());
       child_process.exec(
-        `${cscPath} /nologo /out:${exePath} ${destCsPath}`,
+        `${cscPath} /nologo ${references}/out:"${exePath}" "${destCsPath}"`,
         { encoding: null },
         (err, stdout) => {
           if (err) return reject(iconv.decode(stdout, "gbk"));
@@ -37,13 +128,15 @@ const buildCsharpFeature = async (feature) => {
 };
 
 const getCscPath = () => {
-  const cscPath = path.join(
+  let cscPath = path.join(
     process.env.WINDIR,
     "Microsoft.NET",
     "Framework",
     "v4.0.30319",
     "csc.exe"
   );
+  let version = "v4.0";
+
   if (!fs.existsSync(cscPath)) {
     cscPath = path.join(
       process.env.WINDIR,
@@ -52,11 +145,12 @@ const getCscPath = () => {
       "v3.5",
       "csc.exe"
     );
+    version = "v3.5";
   }
   if (!fs.existsSync(cscPath)) {
     throw new Error("未安装.NET Framework");
   }
-  return cscPath;
+  return { path: cscPath, version };
 };
 
 /**
@@ -71,7 +165,10 @@ const runCsharpFeature = async (feature, args = [], options = {}) => {
   return new Promise(async (reslove, reject) => {
     const { alwaysBuildNewExe = false } = options;
     try {
-      const featureExePath = await getCsharpFeatureExe(feature, alwaysBuildNewExe);
+      const featureExePath = await getCsharpFeatureExe(
+        feature,
+        alwaysBuildNewExe
+      );
       child_process.execFile(
         featureExePath,
         args,

From 021cce59471edc53278ded9dc59ebc87fdea21d5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 14 Jan 2025 22:06:23 +0800
Subject: [PATCH 059/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=A1=A8=E6=A0=BC=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue |  2 +-
 src/components/popup/ResultMenu.vue | 35 ++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 0b2f476e..f74b8aed 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -62,7 +62,7 @@
           <q-resize-observer @resize="autoHeight" debounce="0" />
         </div>
         <q-menu v-if="selectText" touch-position @before-hide="clearSelect">
-          <ResultMenu :dense="true" :content="selectText" :textbtn="true" />
+          <ResultMenu :dense="true" :selectText="selectText" :textbtn="true" />
         </q-menu>
       </q-card>
     </q-dialog>
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index d5e20b5f..2439dcfa 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -54,6 +54,7 @@ export default {
     imagebtn: Boolean,
     closebtn: Boolean,
     runResult: Array,
+    selectText: String,
   },
   emits: ["updateResult"],
   computed: {
@@ -133,11 +134,13 @@ export default {
   },
   methods: {
     copyResult() {
-      window.utools.copyText(this.getFormattedContent());
+      window.utools.copyText(this.selectText || this.getFormattedContent());
       quickcommand.showMessageBox("已复制到剪贴板");
     },
     sendResult() {
-      window.utools.hideMainWindowTypeString(this.getFormattedContent());
+      window.utools.hideMainWindowTypeString(
+        this.selectText || this.getFormattedContent()
+      );
     },
     dataUrlToImg() {
       const imagePattern = /data:image\/.*?;base64,.*/g;
@@ -172,15 +175,33 @@ export default {
       ];
       if (!headers.length) return;
 
+      // 计算字符串显示宽度的辅助函数
+      const getDisplayWidth = (str) => {
+        return String(str)
+          .split("")
+          .reduce((width, char) => {
+            // 判断是否为全角字符
+            // 包括：中文字符、全角标点符号、全角空格、日韩字符等
+            return (
+              width +
+              (/[\u2E80-\u2FFF\u3000-\u303F\u3040-\u309F\u30A0-\u30FF\u3100-\u312F\u3200-\u32FF\u3400-\u4DBF\u4E00-\u9FFF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]/.test(
+                char
+              )
+                ? 2
+                : 1)
+            );
+          }, 0);
+      };
+
       // 计算每列的最大宽度
       const columnWidths = headers.map((header) => {
         const maxDataWidth = Math.max(
-          header.length,
+          getDisplayWidth(header),
           ...tableData.map((obj) => {
             const value = obj[header];
             return value === undefined || value === null
               ? 0
-              : String(value).replace(/\n/g, "\\n").length;
+              : getDisplayWidth(String(value).replace(/\n/g, "\\n"));
           })
         );
         return maxDataWidth;
@@ -191,10 +212,12 @@ export default {
         "| " +
         cells
           .map((cell, index) => {
+            const cellStr = String(cell);
+            const displayWidth = getDisplayWidth(cellStr);
             const padding = " ".repeat(
-              Math.max(0, columnWidths[index] - String(cell).length)
+              Math.max(0, columnWidths[index] - displayWidth)
             );
-            return String(cell) + padding;
+            return cellStr + padding;
           })
           .join(" | ") +
         " |";

From a3dc6479f256104c9901854641fdc95cd3e1f45b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 15 Jan 2025 01:33:28 +0800
Subject: [PATCH 060/332] =?UTF-8?q?automation=E5=AE=9E=E7=8E=B0inspect?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 automation.cs                                 |   9 +
 plugin/lib/csharp/automation.cs               | 531 ++++++++++++------
 plugin/lib/csharp/index.js                    |  32 +-
 .../lib/quickcomposer/windows/automation.js   | 165 ++++++
 plugin/lib/quickcomposer/windows/index.js     |   2 +
 plugin/lib/systemDialog.js                    |  12 +-
 src/components/ResultArea.vue                 |   4 +-
 src/components/composer/MultiParams.vue       |   8 +-
 src/js/composer/commands/networkCommands.js   | 120 +++-
 src/js/composer/commands/systemCommands.js    |  59 +-
 src/js/composer/commands/windowsCommands.js   | 226 +++++++-
 11 files changed, 919 insertions(+), 249 deletions(-)
 create mode 100644 automation.cs
 create mode 100644 plugin/lib/quickcomposer/windows/automation.js

diff --git a/automation.cs b/automation.cs
new file mode 100644
index 00000000..9c2dc580
--- /dev/null
+++ b/automation.cs
@@ -0,0 +1,9 @@
+        // 如果指定了过滤条件，创建一个组合条件
+        if (!string.IsNullOrEmpty(filter))
+        {
+            searchCondition = new OrCondition(
+                new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase),
+                new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase),
+                new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase)
+            );
+        }
diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
index 19000074..f66fc9e3 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/automation.cs
@@ -9,9 +9,16 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using System.Drawing;
 
 public class AutomationManager
 {
+    // UIA Control Type IDs
+    private static class UIA_ControlTypeIds
+    {
+        public const int Window = 50032;
+    }
+
     // 用于缓存找到的元素
     private static Dictionary<string, AutomationElement> elementCache = new Dictionary<string, AutomationElement>();
 
@@ -59,6 +66,15 @@ public System.Windows.Point ToWindowsPoint()
     [DllImport("user32.dll")]
     private static extern short GetAsyncKeyState(int vKey);
 
+    [DllImport("user32.dll")]
+    private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+    [DllImport("user32.dll")]
+    private static extern bool BlockInput(bool fBlockIt);
+
+    [DllImport("user32.dll")]
+    private static extern bool SetForegroundWindow(IntPtr hWnd);
+
     public static void Main(string[] args)
     {
         if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
@@ -79,17 +95,10 @@ public static void Main(string[] args)
             switch (type.ToLower())
             {
                 case "list":
-                    // 列出所有元素
-                    string filter = GetArgumentValue(args, "-filter"); // 可选的过滤条件
-                    ListElements(args, filter);
-                    break;
-
                 case "find":
-                    // 查找元素
-                    string by = GetArgumentValue(args, "-by") ?? "name";
-                    string value = GetArgumentValue(args, "-value");
-                    string scope = GetArgumentValue(args, "-scope") ?? "children";
-                    FindElement(args, by, value, scope);
+                    // 列出所有元素或查找元素
+                    string filter = GetArgumentValue(args, "-value") ?? GetArgumentValue(args, "-filter"); // 兼容两种参数名
+                    ListElements(args, filter);
                     break;
 
                 case "getinfo":
@@ -135,8 +144,8 @@ public static void Main(string[] args)
 
                 case "wait":
                     // 等待元素
-                    by = GetArgumentValue(args, "-by") ?? "name";
-                    value = GetArgumentValue(args, "-value");
+                    string by = GetArgumentValue(args, "-by") ?? "name";
+                    string value = GetArgumentValue(args, "-value");
                     int timeout = int.Parse(GetArgumentValue(args, "-timeout") ?? "30");
                     WaitForElement(args, by, value, timeout);
                     break;
@@ -171,8 +180,7 @@ public static void Main(string[] args)
 
                 case "inspect":
                     // 生成元素识别器
-                    int inspectTimeout = int.Parse(GetArgumentValue(args, "-timeout") ?? "30");
-                    InspectElement(args, inspectTimeout);
+                    InspectElement(args);
                     break;
 
                 default:
@@ -203,6 +211,7 @@ private static void ShowHelp()
     - process   进程名
     - active    当前活动窗口(默认)
     不指定时默认在整个桌面范围内查找
+  -background       后台操作模式，不激活窗口(可选)
 
 元素识别参数:
   -value <标识值>    要查找的元素的值
@@ -215,10 +224,8 @@ private static void ShowHelp()
 
 操作类型及示例:
 1. inspect - 生成元素识别器
-  参数:
-    -timeout <超时>    等待超时时间(秒,默认30)
   示例:
-    automation.exe -type inspect -timeout 60
+    automation.exe -type inspect
   说明:
     运行后点击要识别的元素，将返回元素的详细信息和示例命令
 
@@ -465,7 +472,9 @@ private static void GetElementInfo(string[] args)
         var info = new Dictionary<string, object>();
         info.Add("name", element.Current.Name);
         info.Add("class", element.Current.ClassName);
-        info.Add("type", element.Current.ControlType.ProgrammaticName);
+        info.Add("controlType", element.Current.ControlType.ProgrammaticName);
+        info.Add("controlClass", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+        info.Add("localizedType", element.Current.LocalizedControlType);
         info.Add("automationId", element.Current.AutomationId);
         info.Add("processId", element.Current.ProcessId);
         info.Add("boundingRectangle", new
@@ -486,7 +495,18 @@ private static void ClickElement(string[] args)
         string identifier = GetArgumentValue(args, "-value");
         string by = GetArgumentValue(args, "-by");
         string pattern = GetArgumentValue(args, "-pattern") ?? "invoke";
+        bool background = HasArgument(args, "-background");
+
         var element = GetElementByIdentifier(args, identifier, by);
+
+        // 只在非后台操作时激活窗口
+        if (!background)
+        {
+            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
+            SetForegroundWindow(hwnd);
+            Thread.Sleep(50); // 等待窗口激活
+        }
+
         switch (pattern.ToLower())
         {
             case "invoke":
@@ -512,6 +532,11 @@ private static void ClickElement(string[] args)
         throw new Exception("元素不支持指定的操作模式");
     }
 
+    private static bool HasArgument(string[] args, string key)
+    {
+        return args.Contains(key, StringComparer.OrdinalIgnoreCase);
+    }
+
     private static string[] GetSupportedPatterns(AutomationElement element)
     {
         var patterns = new List<string>();
@@ -527,8 +552,18 @@ private static void SetElementValue(string[] args, string newValue)
     {
         string identifier = GetArgumentValue(args, "-value");
         string by = GetArgumentValue(args, "-by");
+        bool background = HasArgument(args, "-background");
+
         var element = GetElementByIdentifier(args, identifier, by);
 
+        // 只在非后台操作时激活窗口
+        if (!background)
+        {
+            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
+            SetForegroundWindow(hwnd);
+            Thread.Sleep(50); // 等待窗口激活
+        }
+
         // 尝试ValuePattern
         var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
         if (valuePattern != null)
@@ -698,7 +733,7 @@ private static void WaitForElement(string[] args, string by, string value, int t
         {
             try
             {
-                FindElement(args, by, value, "subtree");
+                ListElements(args, value);
                 Console.WriteLine("成功找到元素");
                 return;
             }
@@ -734,15 +769,25 @@ private static void SetFocus(string[] args)
 
     private static void SendKeys(string[] args, string keys)
     {
+        string identifier = GetArgumentValue(args, "-value");
+        string by = GetArgumentValue(args, "-by");
+        bool background = HasArgument(args, "-background");
+
+        var element = GetElementByIdentifier(args, identifier, by);
+
+        // 只在非后台操作时激活窗口
+        if (!background)
+        {
+            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
+            SetForegroundWindow(hwnd);
+            Thread.Sleep(50); // 等待窗口激活
+        }
+
         if (string.IsNullOrEmpty(keys))
         {
             throw new Exception("必须指定要发送的按键");
         }
 
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-
         // 确保元素可以接收输入
         if (!element.Current.IsKeyboardFocusable)
         {
@@ -824,7 +869,9 @@ private static void GetChildElements(string[] args, string childType)
             childInfo.Add("id", CacheElement(child));
             childInfo.Add("name", child.Current.Name);
             childInfo.Add("class", child.Current.ClassName);
-            childInfo.Add("type", child.Current.ControlType.ProgrammaticName);
+            childInfo.Add("controlType", child.Current.ControlType.ProgrammaticName);
+            childInfo.Add("type", child.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+            childInfo.Add("localizedType", child.Current.LocalizedControlType);
             childInfo.Add("automationId", child.Current.AutomationId);
             result.Add(childInfo);
         }
@@ -846,7 +893,9 @@ private static void GetParentElement(string[] args)
             parentInfo.Add("id", CacheElement(parent));
             parentInfo.Add("name", parent.Current.Name);
             parentInfo.Add("class", parent.Current.ClassName);
-            parentInfo.Add("type", parent.Current.ControlType.ProgrammaticName);
+            parentInfo.Add("controlType", parent.Current.ControlType.ProgrammaticName);
+            parentInfo.Add("type", parent.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+            parentInfo.Add("localizedType", parent.Current.LocalizedControlType);
             parentInfo.Add("automationId", parent.Current.AutomationId);
 
             var serializer = new JavaScriptSerializer();
@@ -891,32 +940,131 @@ private static void ListElements(string[] args, string filter)
     {
         var root = GetRootElement(args);
         var result = new List<Dictionary<string, string>>();
+        string window = GetArgumentValue(args, "-window");
+        string method = GetArgumentValue(args, "-method") ?? "active";
+        string by = GetArgumentValue(args, "-by") ?? "name";
+        string scope = GetArgumentValue(args, "-scope") ?? "children";
+
+        // 确定搜索范围
+        TreeScope searchScope = TreeScope.Children;
+        switch (scope.ToLower())
+        {
+            case "descendants":
+                searchScope = TreeScope.Descendants;
+                break;
+            case "subtree":
+                searchScope = TreeScope.Subtree;
+                break;
+        }
+
+        Condition searchCondition = Condition.TrueCondition;
 
-        // 获取所有元素
-        var elements = root.FindAll(
-            TreeScope.Subtree,
-            Condition.TrueCondition
-        );
+        // 如果指定了过滤条件，创建一个组合条件
+        if (!string.IsNullOrEmpty(filter))
+        {
+            // 尝试直接使用ControlType
+            if (filter.StartsWith("ControlType."))
+            {
+                string controlTypeName = filter.Substring("ControlType.".Length);
+                ControlType controlType = (ControlType)typeof(ControlType).GetField(controlTypeName).GetValue(null);
+                searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, controlType);
+            }
+            else
+            {
+                switch (by.ToLower())
+                {
+                    case "name":
+                        searchCondition = new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase);
+                        break;
+                    case "class":
+                        searchCondition = new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase);
+                        break;
+                    case "automation":
+                        searchCondition = new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase);
+                        break;
+                    case "xpath":
+                        // XPath暂不支持
+                        throw new Exception("XPath查找暂未实现");
+                    default:
+                        // 如果没有指定查找方式，则使用组合条件
+                        searchCondition = new OrCondition(
+                            new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase),
+                            new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase),
+                            new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase)
+                        );
+                        break;
+                }
+            }
+        }
 
-        foreach (AutomationElement element in elements)
+        // 如果是按标题搜索，先找到所有匹配的窗口
+        if (method.ToLower() == "title" && !string.IsNullOrEmpty(window))
         {
-            // 如果指定了过滤条件，检查元素名称是否包含过滤文本
-            if (!string.IsNullOrEmpty(filter) &&
-                !element.Current.Name.Contains(filter) &&
-                !element.Current.ClassName.Contains(filter) &&
-                !element.Current.AutomationId.Contains(filter))
+            searchScope = TreeScope.Children;
+            var windows = root.FindAll(searchScope, Condition.TrueCondition);
+            foreach (AutomationElement win in windows)
             {
-                continue;
+                if (win.Current.Name.Contains(window))
+                {
+                    // 对每个匹配的窗口进行处理
+                    var windowElements = win.FindAll(TreeScope.Subtree, searchCondition);
+                    foreach (AutomationElement element in windowElements)
+                    {
+                        var elementInfo = new Dictionary<string, string>();
+                        elementInfo.Add("id", CacheElement(element));
+                        elementInfo.Add("name", element.Current.Name);
+                        elementInfo.Add("class", element.Current.ClassName);
+                        elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
+                        elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+                        elementInfo.Add("localizedType", element.Current.LocalizedControlType);
+                        elementInfo.Add("automationId", element.Current.AutomationId);
+                        elementInfo.Add("path", GetElementPath(element));
+
+                        // 添加控件文本值
+                        try
+                        {
+                            var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+                            if (valuePattern != null)
+                            {
+                                elementInfo.Add("value", valuePattern.Current.Value);
+                            }
+                        }
+                        catch { }
+
+                        result.Add(elementInfo);
+                    }
+                }
             }
+        }
+        else
+        {
+            // 其他查找方式保持原有逻辑
+            var elements = root.FindAll(searchScope, searchCondition);
+            foreach (AutomationElement element in elements)
+            {
+                var elementInfo = new Dictionary<string, string>();
+                elementInfo.Add("id", CacheElement(element));
+                elementInfo.Add("name", element.Current.Name);
+                elementInfo.Add("class", element.Current.ClassName);
+                elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
+                elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+                elementInfo.Add("localizedType", element.Current.LocalizedControlType);
+                elementInfo.Add("automationId", element.Current.AutomationId);
+                elementInfo.Add("path", GetElementPath(element));
+
+                // 添加控件文本值
+                try
+                {
+                    var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+                    if (valuePattern != null)
+                    {
+                        elementInfo.Add("value", valuePattern.Current.Value);
+                    }
+                }
+                catch { }
 
-            var elementInfo = new Dictionary<string, string>();
-            elementInfo.Add("id", CacheElement(element));
-            elementInfo.Add("name", element.Current.Name);
-            elementInfo.Add("class", element.Current.ClassName);
-            elementInfo.Add("type", element.Current.ControlType.ProgrammaticName);
-            elementInfo.Add("automationId", element.Current.AutomationId);
-            elementInfo.Add("path", GetElementPath(element));
-            result.Add(elementInfo);
+                result.Add(elementInfo);
+            }
         }
 
         var serializer = new JavaScriptSerializer();
@@ -963,7 +1111,15 @@ private static AutomationElement GetRootElement(string[] args)
         string window = GetArgumentValue(args, "-window");
         string method = GetArgumentValue(args, "-method") ?? "active";
 
-        if (string.IsNullOrEmpty(window) && method == "active")
+        // 如果是active方法，直接返回当前活动窗口
+        if (method.ToLower() == "active")
+        {
+            IntPtr activeHandle = GetForegroundWindow();
+            return AutomationElement.FromHandle(activeHandle);
+        }
+
+        // 其他方法需要检查window参数
+        if (string.IsNullOrEmpty(window))
         {
             return AutomationElement.RootElement;
         }
@@ -977,10 +1133,15 @@ private static AutomationElement GetRootElement(string[] args)
 
             case "class":
                 // 通过窗口类名查找
-                return AutomationElement.RootElement.FindFirst(
+                var classElements = AutomationElement.RootElement.FindAll(
                     TreeScope.Children,
                     new PropertyCondition(AutomationElement.ClassNameProperty, window)
                 );
+                if (classElements.Count > 0)
+                {
+                    return classElements[0];
+                }
+                break;
 
             case "process":
                 // 通过进程名查找
@@ -991,151 +1152,199 @@ private static AutomationElement GetRootElement(string[] args)
                 }
                 break;
 
-            case "active":
-                // 获取当前活动窗口
-                IntPtr activeHandle = GetForegroundWindow();
-                return AutomationElement.FromHandle(activeHandle);
-
             case "title":
             default:
-                // 通过窗口标题查找(支持模糊匹配)
-                var windows = AutomationElement.RootElement.FindAll(
-                    TreeScope.Children,
-                    Condition.TrueCondition
-                );
-                foreach (AutomationElement win in windows)
-                {
-                    if (win.Current.Name.Contains(window))
-                    {
-                        return win;
-                    }
-                }
-                break;
+                // 返回根元素，让调用方自己处理查找逻辑
+                return AutomationElement.RootElement;
         }
 
         throw new Exception("找不到指定的窗口");
     }
 
-    private static void FindElement(string[] args, string by, string value, string scope)
+    private static void InspectElement(string[] args)
+    {
+        // 创建一个半透明的全屏窗口来捕获鼠标事件
+        Form overlayForm = new Form();
+        overlayForm.FormBorderStyle = FormBorderStyle.None;
+        overlayForm.WindowState = FormWindowState.Maximized;
+        overlayForm.TopMost = true;
+        overlayForm.BackColor = Color.Black;
+        overlayForm.Opacity = 0.1;  // 设置为淡淡的蒙版效果
+        overlayForm.Cursor = Cursors.Cross;
+        overlayForm.ShowInTaskbar = false;
+
+        bool completed = false;
+
+        overlayForm.MouseClick += (sender, e) => {
+            if (e.Button == MouseButtons.Left) {
+                try {
+                    Point clickPosition;
+                    GetCursorPos(out clickPosition);
+
+                    // 先关闭覆盖窗口
+                    overlayForm.Hide();
+
+                    // 等待一小段时间确保窗口完全消失
+                    Thread.Sleep(100);
+
+                    // 获取点击位置的元素
+                    var element = AutomationElement.FromPoint(clickPosition.ToWindowsPoint());
+
+                    if (element != null && element != AutomationElement.RootElement) {
+                        InspectElementInfo(element);
+                        completed = true;
+                    }
+                }
+                catch (Exception ex) {
+                    Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+                }
+                finally {
+                    overlayForm.Close();
+                }
+            }
+        };
+
+        overlayForm.KeyPress += (sender, e) => {
+            if (e.KeyChar == (char)27) { // ESC键
+                overlayForm.Close();
+                Environment.Exit(0); // 直接退出程序
+            }
+        };
+
+        // 在新线程中显示窗口
+        Thread thread = new Thread(() => {
+            overlayForm.Show();
+            while (!completed) {
+                Application.DoEvents();
+                Thread.Sleep(100);
+            }
+        });
+        thread.SetApartmentState(ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+    }
+
+    private static void InspectElementInfo(AutomationElement element)
     {
-        if (string.IsNullOrEmpty(value))
+        Dictionary<string, object> elementInfo = new Dictionary<string, object>();
+
+        // 基本信息
+        elementInfo.Add("id", element.Current.AutomationId);
+        elementInfo.Add("name", element.Current.Name);
+        elementInfo.Add("class", element.Current.ClassName);
+        elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
+        elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+        elementInfo.Add("localizedType", element.Current.LocalizedControlType);
+        elementInfo.Add("automationId", element.Current.AutomationId);
+        elementInfo.Add("path", GetElementPath(element));
+        elementInfo.Add("handle", element.Current.NativeWindowHandle);
+
+        // 添加控件文本值
+        try
         {
-            throw new Exception("必须指定查找值 (-value)");
+            var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+            if (valuePattern != null)
+            {
+                elementInfo.Add("value", valuePattern.Current.Value);
+            }
         }
+        catch { }
 
-        AutomationElement root = GetRootElement(args);
-        TreeScope treeScope = TreeScope.Children;
-        switch (scope.ToLower())
+        // 获取窗口信息
+        var walker = TreeWalker.ControlViewWalker;
+        var parent = element;
+        while (parent != null && parent != AutomationElement.RootElement && parent.Current.ControlType.Id != UIA_ControlTypeIds.Window)
         {
-            case "descendants":
-                treeScope = TreeScope.Descendants;
-                break;
-            case "subtree":
-                treeScope = TreeScope.Subtree;
-                break;
+            parent = walker.GetParent(parent);
         }
 
-        Condition condition;
-        switch (by.ToLower())
+        // 添加窗口详细信息
+        if (parent != null && parent != AutomationElement.RootElement)
         {
-            case "name":
-                condition = new PropertyCondition(AutomationElement.NameProperty, value);
-                break;
-            case "class":
-                condition = new PropertyCondition(AutomationElement.ClassNameProperty, value);
-                break;
-            case "automation":
-                condition = new PropertyCondition(AutomationElement.AutomationIdProperty, value);
-                break;
-            case "xpath":
-                FindElementByXPath(value);
-                return;
-            default:
-                throw new Exception("不支持的查找方式: " + by);
+            var processId = parent.Current.ProcessId;
+            var process = System.Diagnostics.Process.GetProcessById(processId);
+            elementInfo.Add("window", new
+            {
+                title = parent.Current.Name,
+                @class = parent.Current.ClassName,
+                handle = parent.Current.NativeWindowHandle,
+                processName = process.ProcessName,
+                processId = processId,
+                processPath = process.MainModule.FileName
+            });
         }
 
-        var elements = root.FindAll(treeScope, condition);
-        var result = new List<Dictionary<string, string>>();
+        // 添加父元素信息
+        var immediateParent = walker.GetParent(element);
+        if (immediateParent != null && immediateParent != AutomationElement.RootElement)
+        {
+            elementInfo.Add("parent", new
+            {
+                handle = immediateParent.Current.NativeWindowHandle,
+                path = GetElementPath(immediateParent),
+                @class = immediateParent.Current.ClassName,
+                name = immediateParent.Current.Name,
+                controlType = immediateParent.Current.ControlType.ProgrammaticName,
+                type = immediateParent.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""),
+                localizedType = immediateParent.Current.LocalizedControlType,
+                automationId = immediateParent.Current.AutomationId
+            });
+        }
+
+        // 位置信息
+        elementInfo.Add("location", new {
+            x = element.Current.BoundingRectangle.X,
+            y = element.Current.BoundingRectangle.Y,
+            width = element.Current.BoundingRectangle.Width,
+            height = element.Current.BoundingRectangle.Height
+        });
 
-        foreach (AutomationElement element in elements)
+        // 支持的模式
+        List<string> patterns = new List<string>();
+        foreach (AutomationPattern pattern in element.GetSupportedPatterns())
         {
-            var elementInfo = new Dictionary<string, string>();
-            elementInfo.Add("id", CacheElement(element));
-            elementInfo.Add("name", element.Current.Name);
-            elementInfo.Add("class", element.Current.ClassName);
-            elementInfo.Add("type", element.Current.ControlType.ProgrammaticName);
-            elementInfo.Add("automationId", element.Current.AutomationId);
-            result.Add(elementInfo);
+            patterns.Add(pattern.ProgrammaticName);
         }
+        elementInfo.Add("patterns", patterns);
 
+        // 输出 JSON
         var serializer = new JavaScriptSerializer();
-        Console.Write(serializer.Serialize(result));
+        Console.Write(serializer.Serialize(elementInfo));
     }
 
-    private static void InspectElement(string[] args, int timeout)
+    // 序列化为 JSON 字符串
+    private static string JsonSerialize(object obj)
     {
-        Console.WriteLine("请在" + timeout + "秒内点击要识别的元素...");
+        if (obj == null) return "null";
 
-        // 记录当前鼠标位置
-        DateTime endTime = DateTime.Now.AddSeconds(timeout);
-        AutomationElement clickedElement = null;
-        bool wasPressed = false;
+        if (obj is string)
+        {
+            return string.Format("\"{0}\"", ((string)obj).Replace("\"", "\\\""));
+        }
 
-        while (DateTime.Now < endTime)
+        if (obj is bool)
         {
-            // 检测鼠标左键点击
-            bool isPressed = (GetAsyncKeyState(0x01) & 0x8000) != 0;
-            if (isPressed && !wasPressed)  // 鼠标按下瞬间
-            {
-                // 获取当前鼠标位置
-                Point currentPosition;
-                GetCursorPos(out currentPosition);
+            return obj.ToString().ToLower();
+        }
 
-                try
-                {
-                    // 从鼠标位置获取元素
-                    clickedElement = AutomationElement.FromPoint(currentPosition.ToWindowsPoint());
-                    if (clickedElement != null && clickedElement != AutomationElement.RootElement)
-                    {
-                        // 构建元素信息
-                        var elementInfo = new Dictionary<string, object>();
-                        elementInfo.Add("id", CacheElement(clickedElement));
-                        elementInfo.Add("name", clickedElement.Current.Name);
-                        elementInfo.Add("class", clickedElement.Current.ClassName);
-                        elementInfo.Add("type", clickedElement.Current.ControlType.ProgrammaticName);
-                        elementInfo.Add("automationId", clickedElement.Current.AutomationId);
-                        elementInfo.Add("path", GetElementPath(clickedElement));
-                        elementInfo.Add("location", new {
-                            x = clickedElement.Current.BoundingRectangle.X,
-                            y = clickedElement.Current.BoundingRectangle.Y,
-                            width = clickedElement.Current.BoundingRectangle.Width,
-                            height = clickedElement.Current.BoundingRectangle.Height
-                        });
-                        elementInfo.Add("patterns", GetSupportedPatterns(clickedElement));
-
-                        // 生成示例命令
-                        var commands = new List<string>();
-                        if (!string.IsNullOrEmpty(clickedElement.Current.Name))
-                            commands.Add(string.Format("automation.exe -type find -by name -value \"{0}\"", clickedElement.Current.Name));
-                        if (!string.IsNullOrEmpty(clickedElement.Current.AutomationId))
-                            commands.Add(string.Format("automation.exe -type find -by automationid -value \"{0}\"", clickedElement.Current.AutomationId));
-                        elementInfo.Add("commands", commands);
-
-                        var serializer = new JavaScriptSerializer();
-                        Console.Write(serializer.Serialize(elementInfo));
-                        return;
-                    }
-                }
-                catch
-                {
-                    // 忽略获取元素时的错误
-                }
-            }
+        if (obj is int || obj is long || obj is float || obj is double)
+        {
+            return obj.ToString();
+        }
 
-            wasPressed = isPressed;
-            Thread.Sleep(100);
+        if (obj is Dictionary<string, object>)
+        {
+            var dict = obj as Dictionary<string, object>;
+            var pairs = dict.Select(kvp => string.Format("\"{0}\": {1}", kvp.Key, JsonSerialize(kvp.Value)));
+            return string.Format("{{{0}}}", string.Join(", ", pairs));
+        }
+
+        if (obj is System.Collections.IEnumerable)
+        {
+            var items = ((System.Collections.IEnumerable)obj).Cast<object>().Select(item => JsonSerialize(item));
+            return string.Format("[{0}]", string.Join(", ", items));
         }
 
-        throw new Exception("操作超时");
+        return "null";
     }
 }
diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 5be5e3b5..338c820f 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -4,6 +4,8 @@ const iconv = require("iconv-lite");
 const child_process = require("child_process");
 const { getQuickcommandFolderFile } = require("../getQuickcommandFile");
 
+let currentChild = null;
+
 const getAssemblyPath = (assembly) => {
   const { version } = getCscPath();
   const is64bit = process.arch === "x64";
@@ -37,15 +39,9 @@ const getAssemblyPath = (assembly) => {
 
     // v3.0/v3.5 路径
     path.join(
-      process.env["ProgramFiles(x86)"] || process.env.ProgramFiles,
-      "Reference Assemblies",
-      "Microsoft",
-      "Framework",
-      "v3.0",
-      assembly + ".dll"
-    ),
-    path.join(
-      process.env.ProgramFiles,
+      process.arch === "x64"
+        ? process.env.ProgramFiles
+        : process.env["ProgramFiles(x86)"],
       "Reference Assemblies",
       "Microsoft",
       "Framework",
@@ -81,13 +77,16 @@ const getFeatureReferences = (feature) => {
     const formsDll = getAssemblyPath("System.Windows.Forms");
     const typesDll = getAssemblyPath("UIAutomationTypes");
     const baseDll = getAssemblyPath("WindowsBase");
+    const drawingDll = getAssemblyPath("System.Drawing");
     if (!automationDll) throw new Error("找不到UIAutomationClient.dll");
     if (!formsDll) throw new Error("找不到System.Windows.Forms.dll");
     if (!typesDll) throw new Error("找不到UIAutomationTypes.dll");
     if (!baseDll) throw new Error("找不到WindowsBase.dll");
+    if (!drawingDll) throw new Error("找不到System.Drawing.dll");
     references =
       `/reference:"${automationDll}" /reference:"${formsDll}" ` +
-      `/reference:"${typesDll}" /reference:"${baseDll}" `;
+      `/reference:"${typesDll}" /reference:"${baseDll}" ` +
+      `/reference:"${drawingDll}" `;
   }
   return references;
 };
@@ -128,10 +127,11 @@ const buildCsharpFeature = async (feature) => {
 };
 
 const getCscPath = () => {
+  const is64bit = process.arch === "x64";
   let cscPath = path.join(
     process.env.WINDIR,
     "Microsoft.NET",
-    "Framework",
+    is64bit ? "Framework64" : "Framework",
     "v4.0.30319",
     "csc.exe"
   );
@@ -141,7 +141,7 @@ const getCscPath = () => {
     cscPath = path.join(
       process.env.WINDIR,
       "Microsoft.NET",
-      "Framework",
+      is64bit ? "Framework64" : "Framework",
       "v3.5",
       "csc.exe"
     );
@@ -163,13 +163,17 @@ const getCscPath = () => {
  */
 const runCsharpFeature = async (feature, args = [], options = {}) => {
   return new Promise(async (reslove, reject) => {
-    const { alwaysBuildNewExe = false } = options;
+    const { alwaysBuildNewExe = window.utools.isDev(), killPrevious = true } =
+      options;
     try {
       const featureExePath = await getCsharpFeatureExe(
         feature,
         alwaysBuildNewExe
       );
-      child_process.execFile(
+      if (killPrevious && currentChild) {
+        quickcommand.kill(currentChild.pid, "SIGKILL");
+      }
+      currentChild = child_process.execFile(
         featureExePath,
         args,
         {
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
new file mode 100644
index 00000000..94008c9c
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -0,0 +1,165 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 列出所有元素
+ * @param {string} method 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {object} options 选项
+ * @param {string} options.filter 过滤条件
+ * @param {boolean} options.background 是否后台操作
+ * @returns {object[]} 元素列表
+ */
+const listElements = async function (method, window, options = {}) {
+  const { filter, scope } = options;
+  const args = ["-type", "list"];
+
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
+  if (filter) args.push("-filter", filter);
+  if (scope) args.push("-scope", scope);
+  const result = await runCsharpFeature("automation", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析元素列表失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 点击元素
+ * @param {string} method 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} value 查找值
+ * @param {object} options 选项
+ * @param {string} options.pattern 点击模式：invoke/toggle
+ * @param {boolean} options.background 是否后台操作
+ * @returns {boolean} 是否成功
+ */
+const clickElement = async function (method, window, by, value, options = {}) {
+  const { pattern = "invoke", background = false } = options;
+  const args = ["-type", "click", "-by", by, "-value", value];
+
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
+  if (pattern) args.push("-pattern", pattern);
+  if (background) args.push("-background");
+
+  const result = await runCsharpFeature("automation", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 设置元素值
+ * @param {string} method 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} value 查找值
+ * @param {string} newValue 要设置的值
+ * @param {object} options 选项
+ * @param {boolean} options.background 是否后台操作
+ * @returns {boolean} 是否成功
+ */
+const setElementValue = async function (
+  method,
+  window,
+  by,
+  value,
+  newValue,
+  options = {}
+) {
+  const { background = false } = options;
+  const args = [
+    "-type",
+    "setvalue",
+    "-by",
+    by,
+    "-value",
+    value,
+    "-newvalue",
+    newValue,
+  ];
+
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
+  if (background) args.push("-background");
+
+  const result = await runCsharpFeature("automation", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  return true;
+};
+
+/**
+ * 获取元素值
+ * @param {string} method 窗口类型：title/handle/active
+ * @param {string} window 窗口标题/句柄
+ * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} value 查找值
+ * @param {object} options 选项
+ * @param {boolean} options.background 是否后台操作
+ * @returns {object} 元素值
+ */
+const getElementValue = async function (
+  method,
+  window,
+  by,
+  value,
+  options = {}
+) {
+  const { background = false } = options;
+  const args = ["-type", "getvalue", "-by", by, "-value", value];
+
+  args.push("-method", method);
+  if (method !== "active" && window) args.push("-window", window);
+  if (background) args.push("-background");
+
+  const result = await runCsharpFeature("automation", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析元素值失败:", error);
+    return null;
+  }
+};
+
+/**
+ * 检查元素
+ * @param {object} options 选项
+ * @param {number} options.timeout 超时时间(秒)
+ * @param {boolean} options.background 是否后台操作
+ * @returns {object} 元素信息
+ */
+const inspectElement = async function () {
+  const args = ["-type", "inspect"];
+
+  const result = await runCsharpFeature("automation", args);
+  if (result && result.startsWith("Error:")) {
+    throw new Error(result.substring(7));
+  }
+  try {
+    return JSON.parse(result);
+  } catch (error) {
+    console.error("解析元素信息失败:", error);
+    return null;
+  }
+};
+
+module.exports = {
+  listElements,
+  clickElement,
+  setElementValue,
+  getElementValue,
+  inspectElement,
+};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index 99ab8849..ebd0a721 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -6,6 +6,7 @@ const registry = require("./registry");
 const service = require("./service");
 const software = require("./software");
 const utils = require("./utils");
+const automation = require("./automation");
 
 module.exports = {
   window,
@@ -16,4 +17,5 @@ module.exports = {
   service,
   software,
   utils,
+  automation,
 };
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
index d4a60f7f..d9e74daf 100644
--- a/plugin/lib/systemDialog.js
+++ b/plugin/lib/systemDialog.js
@@ -48,7 +48,7 @@ const getQuickcommandIconPath = () => {
 };
 
 // 修改对话框函数，使用新的 dialog.cs
-const showSystemMessageBox = async function (content, title = "") {
+const showSystemMessageBox = async function (content, title = "提示") {
   try {
     const iconPath = getQuickcommandIconPath();
     if (window.utools.isWindows()) {
@@ -97,7 +97,7 @@ const showSystemMessageBox = async function (content, title = "") {
   }
 };
 
-const showSystemInputBox = async function (placeholders, title = "") {
+const showSystemInputBox = async function (placeholders, title = "请输入") {
   if (!Array.isArray(placeholders)) {
     placeholders = [placeholders];
   }
@@ -163,7 +163,7 @@ const showSystemInputBox = async function (placeholders, title = "") {
   }
 };
 
-const showSystemConfirmBox = async function (content, title = "") {
+const showSystemConfirmBox = async function (content, title = "请确认") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
     let iconParam = "note";
@@ -207,7 +207,7 @@ const showSystemConfirmBox = async function (content, title = "") {
   }
 };
 
-const showSystemButtonBox = async function (buttons, title = "") {
+const showSystemButtonBox = async function (buttons, title = "请选择") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isMacOs()) {
     const itemList = buttons.map((item) => `"${item}"`).join(", ");
@@ -250,7 +250,7 @@ const showSystemButtonBox = async function (buttons, title = "") {
       const itemsList = buttons
         .map((btn, index) => `"${index}" "${btn}"`)
         .join(" ");
-      const script2 = `zenity --list --title="${title}" --text="请选择：" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
+      const script2 = `zenity --list --title="${title}" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
       const result = await execCommand(script2);
       if (!result) return {};
       const text = result.trim();
@@ -263,7 +263,7 @@ const showSystemButtonBox = async function (buttons, title = "") {
   }
 };
 
-const showSystemTextArea = async function (defaultText = "", title = "") {
+const showSystemTextArea = async function (defaultText = "", title = "请输入") {
   const iconPath = getQuickcommandIconPath();
   if (window.utools.isWindows()) {
     const args = [
diff --git a/src/components/ResultArea.vue b/src/components/ResultArea.vue
index 24414495..7850e8ef 100644
--- a/src/components/ResultArea.vue
+++ b/src/components/ResultArea.vue
@@ -85,7 +85,9 @@ export default {
     },
     // 判断是否是转为表格的结果，表格结果不需要换行，第二行一般包含分隔符---
     isTable() {
-      return this.runResult?.[0]?.split("\n")?.[1]?.includes("---");
+      const result = this.runResult?.[0];
+      if (typeof result !== "string") return false;
+      return result.split("\n")?.[1]?.includes("---");
     },
   },
   mounted() {
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 6e10d051..e1aafb11 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -37,13 +37,7 @@ export default defineComponent({
     },
     // 通用参数配置
     commonConfig() {
-      return (
-        // 过滤掉特定函数排除的参数, excludeConfig格式为[要排除的参数索引]
-        this.modelValue.config?.filter(
-          (_, index) =>
-            !this.getSelectSubCommand()?.excludeConfig?.includes(index)
-        ) || []
-      );
+      return this.modelValue.config || [];
     },
     // 特定函数独有参数配置，config格式和通用的config一致
     subCommandConfig() {
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index b2de424a..c26995ed 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -53,14 +53,7 @@ export const networkCommands = {
       label: "URL操作",
       desc: "URL解析、格式化和参数处理",
       icon: "link",
-      config: [
-        {
-          label: "URL",
-          component: "VariableInput",
-          icon: "link",
-          width: "auto",
-        },
-      ],
+      config: [],
       subCommands: [
         {
           value: "quickcomposer.network.url.parse",
@@ -71,7 +64,6 @@ export const networkCommands = {
           value: "quickcomposer.network.url.format",
           label: "格式化URL",
           icon: "link",
-          excludeConfig: [0],
           config: [
             {
               label: "协议",
@@ -120,7 +112,6 @@ export const networkCommands = {
           value: "quickcomposer.network.url.parseQuery",
           label: "解析查询字符串",
           icon: "search",
-          excludeConfig: [0],
           config: [
             {
               label: "查询字符串",
@@ -133,7 +124,6 @@ export const networkCommands = {
           value: "quickcomposer.network.url.formatQuery",
           label: "格式化查询字符串",
           icon: "edit",
-          excludeConfig: [0],
           config: [
             {
               label: "参数",
@@ -146,7 +136,6 @@ export const networkCommands = {
           value: "quickcomposer.network.url.parsePath",
           label: "解析路径",
           icon: "folder_open",
-          excludeConfig: [0],
           config: [
             {
               label: "路径",
@@ -159,7 +148,6 @@ export const networkCommands = {
           value: "quickcomposer.network.url.parseHost",
           label: "解析主机名",
           icon: "dns",
-          excludeConfig: [0],
           config: [
             {
               label: "主机名",
@@ -173,6 +161,12 @@ export const networkCommands = {
           label: "获取参数",
           icon: "find_in_page",
           config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: "auto",
+            },
             {
               label: "参数名",
               component: "VariableInput",
@@ -186,6 +180,12 @@ export const networkCommands = {
           label: "添加参数",
           icon: "add_circle",
           config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: "auto",
+            },
             {
               label: "参数名",
               component: "VariableInput",
@@ -205,6 +205,12 @@ export const networkCommands = {
           label: "移除参数",
           icon: "remove_circle",
           config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: "auto",
+            },
             {
               label: "参数名",
               component: "VariableInput",
@@ -217,11 +223,27 @@ export const networkCommands = {
           value: "quickcomposer.network.url.isAbsolute",
           label: "检查绝对URL",
           icon: "check_circle",
+          config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.url.parseComponents",
           label: "解析组成部分",
           icon: "category",
+          config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: "auto",
+            },
+          ],
         },
       ],
     },
@@ -231,20 +253,19 @@ export const networkCommands = {
       desc: "DNS解析和查询",
       icon: "dns",
       isAsync: true,
-      config: [
-        {
-          label: "要查询的域名",
-          icon: "dns",
-          component: "VariableInput",
-          width: "auto",
-        },
-      ],
+      config: [],
       subCommands: [
         {
           label: "DNS查询",
           value: "quickcomposer.network.dns.lookupHost",
           icon: "search",
           config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
             {
               label: "IP版本",
               icon: "settings_ethernet",
@@ -269,42 +290,97 @@ export const networkCommands = {
           value: "quickcomposer.network.dns.resolveAll",
           label: "解析所有记录",
           icon: "all_inclusive",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveIpv4",
           label: "解析IPv4",
           icon: "filter_4",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveIpv6",
           label: "解析IPv6",
           icon: "filter_6",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveMxRecords",
           label: "解析MX记录",
           icon: "mail",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveTxtRecords",
           label: "解析TXT记录",
           icon: "text_fields",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveNsRecords",
           label: "解析NS记录",
           icon: "dns",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.resolveCnameRecords",
           label: "解析CNAME记录",
           icon: "link",
+          config: [
+            {
+              label: "要查询的域名",
+              icon: "dns",
+              component: "VariableInput",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.network.dns.reverseResolve",
           label: "反向解析",
           icon: "swap_horiz",
-          excludeConfig: [0],
           config: [
             {
               label: "IP地址",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index a281f6a6..9d2eb3c8 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -308,35 +308,58 @@ export const systemCommands = {
       label: "路径操作",
       desc: "路径解析和处理",
       icon: "folder",
-      config: [
-        {
-          label: "路径",
-          component: "VariableInput",
-          icon: "folder",
-          width: "auto",
-        },
-      ],
+      config: [],
       subCommands: [
         {
           value: "quickcomposer.system.path.normalize",
           label: "规范化路径",
           icon: "straighten",
+          config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.system.path.parse",
           label: "解析路径",
           icon: "account_tree",
+          config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.system.path.dirname",
           label: "获取目录名",
           icon: "folder",
+          config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.system.path.basename",
           label: "获取文件名",
           icon: "description",
           config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
             {
               label: "要移除的扩展名",
               component: "VariableInput",
@@ -349,17 +372,32 @@ export const systemCommands = {
           value: "quickcomposer.system.path.extname",
           label: "获取扩展名",
           icon: "extension",
+          config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.system.path.isAbsolute",
           label: "判断绝对路径",
           icon: "check_circle",
+          config: [
+            {
+              label: "路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: "auto",
+            },
+          ],
         },
         {
           value: "quickcomposer.system.path.join",
           label: "连接路径",
           icon: "add_link",
-          excludeConfig: [0],
           config: [
             {
               label: "路径片段",
@@ -379,7 +417,6 @@ export const systemCommands = {
           value: "quickcomposer.system.path.resolve",
           label: "解析绝对路径",
           icon: "assistant_direction",
-          excludeConfig: [0],
           config: [
             {
               label: "路径片段",
@@ -399,7 +436,6 @@ export const systemCommands = {
           value: "quickcomposer.system.path.relative",
           label: "计算相对路径",
           icon: "compare_arrows",
-          excludeConfig: [0],
           config: [
             {
               label: "起始路径",
@@ -419,7 +455,6 @@ export const systemCommands = {
           value: "quickcomposer.system.path.format",
           label: "格式化路径",
           icon: "format_shapes",
-          excludeConfig: [0],
           config: [
             {
               label: "根路径",
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index be218f03..dcac5474 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -104,6 +104,32 @@ const registryPaths = [
   },
 ];
 
+const searchWindowConfig = [
+  {
+    key: "method",
+    label: "查找方式",
+    component: "q-select",
+    icon: "search",
+    width: 3,
+    options: [
+      { label: "标题", value: "title" },
+      // { label: "类名", value: "class" },
+      { label: "句柄", value: "handle" },
+      // { label: "进程", value: "process" },
+      { label: "活动窗口", value: "active" },
+    ],
+    defaultValue: "title",
+  },
+  {
+    key: "value",
+    label: "窗口标题/句柄",
+    component: "VariableInput",
+    icon: "title",
+    width: 9,
+    placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
+  },
+];
+
 export const windowsCommands = {
   label: "Win自动化",
   icon: "window",
@@ -114,29 +140,7 @@ export const windowsCommands = {
       label: "窗口控制",
       desc: "Windows窗口操作",
       icon: "window",
-      config: [
-        {
-          key: "method",
-          label: "查找方式",
-          component: "q-select",
-          icon: "search",
-          width: 3,
-          options: [
-            { label: "标题", value: "title" },
-            { label: "句柄", value: "handle" },
-            { label: "活动窗口", value: "active" },
-          ],
-          defaultValue: "title",
-        },
-        {
-          key: "value",
-          label: "窗口标题/句柄",
-          component: "VariableInput",
-          icon: "title",
-          width: 9,
-          placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
-        },
-      ],
+      config: searchWindowConfig,
       subCommands: [
         {
           value: "quickcomposer.windows.window.getWindowInfo",
@@ -357,7 +361,7 @@ export const windowsCommands = {
                     items: controlClass,
                   },
                   width: 8,
-                  placeholder: "可选，输入要过滤的控件类名或文本",
+                  placeholder: "可选，输入要过滤的控件类型或文本",
                 },
                 background: {
                   label: "后台操作",
@@ -394,7 +398,7 @@ export const windowsCommands = {
               width: 12,
               options: {
                 control: {
-                  label: "控件类名",
+                  label: "控件类型",
                   component: "VariableInput",
                   icon: "class",
                   options: {
@@ -408,7 +412,7 @@ export const windowsCommands = {
                   component: "VariableInput",
                   icon: "text_fields",
                   width: 6,
-                  placeholder: "可选，和控件类名至少输入一个",
+                  placeholder: "可选，和控件类型至少输入一个",
                 },
                 pos: {
                   label: "坐标",
@@ -1097,5 +1101,175 @@ export const windowsCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.windows.automation.inspectElement",
+      label: "UI自动化",
+      desc: "Windows界面自动化操作",
+      icon: "smart_button",
+      isAsync: true,
+      config: [],
+      subCommands: [
+        {
+          value: "quickcomposer.windows.automation.inspectElement",
+          label: "检查元素",
+          icon: "search",
+        },
+        {
+          value: "quickcomposer.windows.automation.listElements",
+          label: "列出元素",
+          icon: "list",
+          config: [
+            ...searchWindowConfig,
+            {
+              component: "OptionEditor",
+              icon: "settings",
+              width: 12,
+              options: {
+                scope: {
+                  label: "范围",
+                  component: "q-select",
+                  icon: "account_tree",
+                  width: 3,
+                  options: [
+                    { label: "子元素", value: "children" },
+                    { label: "所有后代", value: "descendants" },
+                    { label: "整个子树", value: "subtree" },
+                  ],
+                },
+                filter: {
+                  label: "过滤条件",
+                  component: "VariableInput",
+                  icon: "filter_alt",
+                  width: 9,
+                  placeholder: "可选，按名称/类名/ControlType/AutomationId过滤",
+                },
+              },
+              defaultValue: {
+                scope: "children",
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.clickElement",
+          label: "点击元素",
+          icon: "mouse",
+          config: [
+            ...searchWindowConfig,
+            {
+              key: "by",
+              label: "查找方式",
+              component: "q-select",
+              icon: "search",
+              width: 4,
+              options: [
+                { label: "名称", value: "name" },
+                { label: "类名", value: "class" },
+                { label: "类型", value: "type" },
+                { label: "AutomationId", value: "automationid" },
+              ],
+              defaultValue: "name",
+            },
+            {
+              key: "value",
+              label: "查找值",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+              placeholder: "要点击的元素值",
+            },
+            {
+              key: "pattern",
+              label: "点击模式",
+              component: "ButtonGroup",
+              icon: "touch_app",
+              width: 12,
+              options: [
+                { label: "普通点击", value: "invoke" },
+                { label: "切换状态", value: "toggle" },
+              ],
+              defaultValue: "invoke",
+            },
+            {
+              key: "background",
+              label: "后台操作",
+              component: "CheckButton",
+              icon: "back_hand",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.setElementValue",
+          label: "设置值",
+          icon: "edit",
+          config: [
+            ...searchWindowConfig,
+            {
+              key: "by",
+              label: "查找方式",
+              component: "q-select",
+              icon: "search",
+              width: 4,
+              options: [
+                { label: "名称", value: "name" },
+                { label: "类名", value: "class" },
+                { label: "类型", value: "type" },
+                { label: "AutomationId", value: "automationid" },
+              ],
+              defaultValue: "name",
+            },
+            {
+              key: "value",
+              label: "查找值",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+              placeholder: "要设置值的元素",
+            },
+            {
+              key: "newValue",
+              label: "新值",
+              component: "VariableInput",
+              icon: "edit",
+              width: 12,
+              placeholder: "要设置的新值",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.getElementValue",
+          label: "获取值",
+          icon: "content_paste",
+          outputVariable: "elementValue",
+          saveOutput: true,
+          config: [
+            ...searchWindowConfig,
+            {
+              key: "by",
+              label: "查找方式",
+              component: "q-select",
+              icon: "search",
+              width: 4,
+              options: [
+                { label: "名称", value: "name" },
+                { label: "类名", value: "class" },
+                { label: "类型", value: "type" },
+                { label: "AutomationId", value: "automationid" },
+              ],
+              defaultValue: "name",
+            },
+            {
+              key: "value",
+              label: "查找值",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 8,
+              placeholder: "要获取值的元素",
+            },
+          ],
+        },
+      ],
+    },
   ],
 };

From fcc8f47127c27efb0a367ac6ca5f202fe66a20cf Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 15 Jan 2025 19:26:07 +0800
Subject: [PATCH 061/332] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E6=8E=A7=E4=BB=B6=E6=93=8D=E4=BD=9C=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/index.js                    |   7 +-
 plugin/lib/csharp/sendmessage.cs              | 479 +++++++++++-------
 plugin/lib/csharp/window.cs                   | 282 +++++------
 .../lib/quickcomposer/windows/automation.js   | 103 ++--
 .../lib/quickcomposer/windows/sendmessage.js  |  96 ++--
 plugin/lib/quickcomposer/windows/window.js    | 204 +++++---
 src/components/popup/ResultMenu.vue           |  29 +-
 src/js/composer/commands/windowsCommands.js   |  58 +--
 8 files changed, 716 insertions(+), 542 deletions(-)

diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 338c820f..147e3616 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -173,15 +173,16 @@ const runCsharpFeature = async (feature, args = [], options = {}) => {
       if (killPrevious && currentChild) {
         quickcommand.kill(currentChild.pid, "SIGKILL");
       }
+      console.log(featureExePath, args.join(" "));
       currentChild = child_process.execFile(
         featureExePath,
         args,
         {
           encoding: null,
         },
-        (err, stdout) => {
-          console.log(iconv.decode(stdout, "gbk"));
-          if (err) reject(iconv.decode(stdout, "gbk"));
+        (err, stdout, stderr) => {
+          if (err || Buffer.byteLength(stderr) > 0)
+            reject(iconv.decode(stderr || stdout, "gbk"));
           else reslove(iconv.decode(stdout, "gbk"));
         }
       );
diff --git a/plugin/lib/csharp/sendmessage.cs b/plugin/lib/csharp/sendmessage.cs
index 38ce5d1e..61fb173c 100644
--- a/plugin/lib/csharp/sendmessage.cs
+++ b/plugin/lib/csharp/sendmessage.cs
@@ -6,6 +6,7 @@
 using System.Drawing;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web.Script.Serialization;
 
 public class AutomationTool
 {
@@ -127,6 +128,9 @@ private struct TBBUTTON
 
     [DllImport("user32.dll")]
     private static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+    [DllImport("user32.dll")]
+    private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
     #endregion
 
     public static void Main(string[] args)
@@ -137,42 +141,61 @@ public static void Main(string[] args)
             return;
         }
 
-        string type = GetArgumentValue(args, "-type");
-        if (string.IsNullOrEmpty(type))
+        try
         {
-            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
-            return;
-        }
+            List<IntPtr> targetWindows = FindTargetWindows(args);
+            if (targetWindows.Count == 0)
+            {
+                throw new Exception("未找到目标窗口");
+            }
 
-        string action = GetArgumentValue(args, "-action");
-        string value = GetArgumentValue(args, "-value");
-        string window = GetArgumentValue(args, "-window");
-        string control = GetArgumentValue(args, "-control");
-        string filter = GetArgumentValue(args, "-filter");
-        string pos = GetArgumentValue(args, "-pos");
-        bool background = HasArgument(args, "-background");
+            string type = GetArgumentValue(args, "-type");
+            IntPtr targetHandle = targetWindows[0];  // 总是使用第一个窗口
+            Dictionary<string, object> operatedWindow = null;
 
-        try
-        {
             switch (type.ToLower())
             {
+                case "inspect":
+                    // inspect 操作只获取第一个匹配窗口的控件树
+                    string filter = GetArgumentValue(args, "-filter");
+                    bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+
+                    // 只在非后台操作时激活窗口
+                    if (!background)
+                    {
+                        SetForegroundWindow(targetHandle);
+                        Thread.Sleep(50);
+                    }
+
+                    string treeJson = GetControlsTree(targetHandle, filter);
+                    if (!string.IsNullOrEmpty(treeJson))
+                    {
+                        Console.WriteLine("[" + treeJson + "]");
+                    }
+                    return;  // 直接返回，不输出窗口信息
+
                 case "keyboard":
-                    HandleKeyboardOperation(args);
+                    operatedWindow = HandleKeyboardOperation(targetHandle, args);
                     break;
+
                 case "mouse":
-                    HandleMouseOperation(args);
-                    break;
-                case "inspect":
-                    HandleInspectOperation(args);
+                    operatedWindow = HandleMouseOperation(targetHandle, args);
                     break;
+
                 default:
-                    Console.WriteLine("Error: 不支持的操作类型");
-                    break;
+                    throw new Exception("不支持的操作类型");
+            }
+
+            // 输出操作的窗口信息
+            if (operatedWindow != null)
+            {
+                var serializer = new JavaScriptSerializer();
+                Console.WriteLine(serializer.Serialize(operatedWindow));
             }
         }
         catch (Exception ex)
         {
-            Console.WriteLine(string.Format("Error: {0}", ex.Message));
+            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
         }
     }
 
@@ -182,133 +205,145 @@ private static List<IntPtr> FindTargetWindows(string[] args)
         string method = GetArgumentValue(args, "-method") ?? "title";
         string value = GetArgumentValue(args, "-window") ?? "";
 
-        if (method == "active")
+        // 如果是active方法，直接返回当前活动窗口
+        if (method.ToLower() == "active")
         {
             targetWindows.Add(GetForegroundWindow());
             return targetWindows;
         }
 
-        if (method == "handle")
+        // 如果是handle方法，直接返回指定句柄
+        if (method.ToLower() == "handle")
         {
             targetWindows.Add(new IntPtr(long.Parse(value)));
             return targetWindows;
         }
 
-        // title方式
+        // 如果没有指定窗口值，返回空列表
         if (string.IsNullOrEmpty(value))
         {
             return targetWindows;
         }
 
-        // 查找所有匹配的窗口
-        EnumWindows((hwnd, param) =>
+        switch (method.ToLower())
         {
-            StringBuilder title = new StringBuilder(256);
-            GetWindowText(hwnd, title, title.Capacity);
-            string windowTitle = title.ToString();
+            case "process":
+                // 通过进程名查找
+                var processes = System.Diagnostics.Process.GetProcessesByName(value);
+                foreach (var process in processes)
+                {
+                    if (process.MainWindowHandle != IntPtr.Zero)
+                    {
+                        targetWindows.Add(process.MainWindowHandle);
+                    }
+                }
+                break;
 
-            if (!string.IsNullOrEmpty(windowTitle) &&
-                windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
-            {
-                targetWindows.Add(hwnd);
-            }
-            return true;
-        }, IntPtr.Zero);
+            case "class":
+                // 通过窗口类名查找
+                EnumWindows((hwnd, param) =>
+                {
+                    if (!IsWindowVisible(hwnd))
+                    {
+                        return true;
+                    }
 
-        if (targetWindows.Count == 0)
-        {
-            Console.WriteLine("Error: 未找到匹配的窗口");
-            return targetWindows;
+                    StringBuilder className = new StringBuilder(256);
+                    GetClassName(hwnd, className, className.Capacity);
+                    string windowClassName = className.ToString();
+
+                    if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+                    {
+                        targetWindows.Add(hwnd);
+                    }
+                    return true;
+                }, IntPtr.Zero);
+                break;
+
+            case "title":
+            default:
+                // 通过窗口标题查找（支持模糊匹配）
+                EnumWindows((hwnd, param) =>
+                {
+                    StringBuilder title = new StringBuilder(256);
+                    GetWindowText(hwnd, title, title.Capacity);
+                    string windowTitle = title.ToString();
+
+                    if (!string.IsNullOrEmpty(windowTitle) &&
+                        windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+                    {
+                        targetWindows.Add(hwnd);
+                    }
+                    return true;
+                }, IntPtr.Zero);
+                break;
         }
 
-        // 如果找到多个窗口，输出所有窗口信息
-        if (targetWindows.Count > 1)
+        if (targetWindows.Count == 0)
         {
-            Console.WriteLine("找到 {0} 个匹配窗口:", targetWindows.Count);
-            foreach (IntPtr hwnd in targetWindows)
-            {
-                StringBuilder title = new StringBuilder(256);
-                GetWindowText(hwnd, title, title.Capacity);
-                Console.WriteLine("0x{0:X} - {1}", hwnd.ToInt64(), title);
-            }
+            Console.WriteLine(string.Format("Error: 未找到匹配的窗口 (method={0}, value={1})", method, value));
         }
 
         return targetWindows;
     }
 
-    private static void HandleKeyboardOperation(string[] args)
+    private static Dictionary<string, object> HandleKeyboardOperation(IntPtr targetHandle, string[] args)
     {
         string control = GetArgumentValue(args, "-control");
         string action = GetArgumentValue(args, "-action");
         string value = GetArgumentValue(args, "-value");
         bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
 
-        if (string.IsNullOrEmpty(action))
+        // 如果指定了控件，递归查找控件句柄
+        IntPtr controlHandle = IntPtr.Zero;
+        if (!string.IsNullOrEmpty(control))
         {
-            Console.WriteLine("Error: keyboard操作需要指定 -action 参数");
-            return;
+            StringBuilder windowTitle = new StringBuilder(256);
+            GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
+
+            controlHandle = FindControl(targetHandle, control);
+            if (controlHandle == IntPtr.Zero)
+            {
+                throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\")",
+                    targetHandle.ToInt64(), windowTitle.ToString(), control));
+            }
+            targetHandle = controlHandle;
         }
 
-        var targetWindows = FindTargetWindows(args);
-        if (targetWindows.Count == 0)
+        // 只在非后台操作时激活窗口
+        if (!background)
         {
-            return;
+            SetForegroundWindow(targetHandle);
+            Thread.Sleep(50);
         }
 
-        foreach (IntPtr hWnd in targetWindows)
+        switch (action.ToLower())
         {
-            IntPtr targetHandle = hWnd;
-
-            // 如果指定了控件，递归查找控件句柄
-            if (!string.IsNullOrEmpty(control))
-            {
-                IntPtr hControl = FindControl(hWnd, control);
-                if (hControl != IntPtr.Zero)
+            case "keys":
+                if (string.IsNullOrEmpty(value))
                 {
-                    targetHandle = hControl;
+                    throw new Exception("发送按键需要指定 -value 参数");
                 }
-                else
+                SendKeys(targetHandle, value);
+                break;
+
+            case "text":
+                if (string.IsNullOrEmpty(value))
                 {
-                    Console.WriteLine(string.Format("Warning: 在窗口 0x{0:X} 中未找到指定控件", hWnd.ToInt64()));
-                    continue;
+                    throw new Exception("发送文本需要指定 -value 参数");
                 }
-            }
+                SendText(targetHandle, value);
+                break;
 
-            // 只在非后台操作时激活窗口
-            if (!background)
-            {
-                SetForegroundWindow(hWnd);
-                Thread.Sleep(50); // 等待窗口激活
-            }
-
-            switch (action.ToLower())
-            {
-                case "keys":
-                    if (string.IsNullOrEmpty(value))
-                    {
-                        Console.WriteLine("Error: 发送按键需要指定 -value 参数");
-                        return;
-                    }
-                    SendKeys(targetHandle, value);
-                    break;
-
-                case "text":
-                    if (string.IsNullOrEmpty(value))
-                    {
-                        Console.WriteLine("Error: 发送文本需要指定 -value 参数");
-                        return;
-                    }
-                    SendText(targetHandle, value);
-                    break;
-
-                default:
-                    Console.WriteLine("Error: 不支持的keyboard操作类型");
-                    break;
-            }
+            default:
+                throw new Exception("不支持的keyboard操作类型");
         }
+
+        // 返回操作结果
+        return GetBasicWindowInfo(targetHandle, controlHandle);
     }
 
-    private static void HandleMouseOperation(string[] args)
+    private static Dictionary<string, object> HandleMouseOperation(IntPtr targetHandle, string[] args)
     {
         string control = GetArgumentValue(args, "-control");
         string controlText = GetArgumentValue(args, "-text");
@@ -318,87 +353,83 @@ private static void HandleMouseOperation(string[] args)
 
         if (string.IsNullOrEmpty(action))
         {
-            Console.WriteLine("Error: mouse操作需要指定 -action 参数");
-            return;
-        }
-
-        var targetWindows = FindTargetWindows(args);
-        if (targetWindows.Count == 0)
-        {
-            return;
+            throw new Exception("mouse操作需要指定 -action 参数");
         }
 
-        foreach (IntPtr hWnd in targetWindows)
+        // 如果指定了控件类名和文本，查找匹配的控件
+        IntPtr controlHandle = IntPtr.Zero;
+        if (!string.IsNullOrEmpty(control) || !string.IsNullOrEmpty(controlText))
         {
-            IntPtr targetHandle = hWnd;
+            StringBuilder windowTitle = new StringBuilder(256);
+            GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
 
-            // 如果指定了控件类名和文本，查找匹配的控件
-            if (!string.IsNullOrEmpty(control) || !string.IsNullOrEmpty(controlText))
+            controlHandle = FindControlByTextAndClass(targetHandle, controlText, control);
+            if (controlHandle == IntPtr.Zero)
             {
-                targetHandle = FindControlByTextAndClass(hWnd, controlText, control);
-                if (targetHandle == IntPtr.Zero)
-                {
-                    Console.WriteLine(string.Format("Warning: 在窗口 0x{0:X} 中未找到指定控件", hWnd.ToInt64()));
-                    continue;
-                }
+                throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\", 控件文本=\"{3}\")",
+                    targetHandle.ToInt64(), windowTitle.ToString(), control ?? "", controlText ?? ""));
             }
+            targetHandle = controlHandle;
+        }
 
-            // 只在非后台操作时激活窗口
-            if (!background)
-            {
-                SetForegroundWindow(hWnd);
-                Thread.Sleep(50);
-            }
+        // 只在非后台操作时激活窗口
+        if (!background)
+        {
+            SetForegroundWindow(targetHandle);
+            Thread.Sleep(50);
+        }
 
-            // 获取点击坐标
-            int x = 0, y = 0;
-            if (!string.IsNullOrEmpty(position))
+        // 获取点击坐标
+        int x = 0, y = 0;
+        if (!string.IsNullOrEmpty(position))
+        {
+            // 使用指定坐标
+            string[] pos = position.Split(',');
+            if (pos.Length == 2)
             {
-                // 使用指定坐标
-                string[] pos = position.Split(',');
-                if (pos.Length == 2)
-                {
-                    x = int.Parse(pos[0]);
-                    y = int.Parse(pos[1]);
-                }
+                x = int.Parse(pos[0]);
+                y = int.Parse(pos[1]);
             }
-            else
+        }
+        else
+        {
+            // 如果没有指定坐标，点击控件中心
+            RECT rect;
+            if (GetWindowRect(targetHandle, out rect))
             {
-                // 如果没有指定坐标，点击控件中心
-                RECT rect;
-                if (GetWindowRect(targetHandle, out rect))
-                {
-                    x = (rect.Right - rect.Left) / 2;
-                    y = (rect.Bottom - rect.Top) / 2;
-                }
+                x = (rect.Right - rect.Left) / 2;
+                y = (rect.Bottom - rect.Top) / 2;
             }
+        }
 
-            int lParam = (y << 16) | (x & 0xFFFF);
-
-            switch (action.ToLower())
-            {
-                case "click":
-                    SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
-                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                    break;
-
-                case "rightclick":
-                    SendMessage(targetHandle, WM_RBUTTONDOWN, 0, lParam);
-                    SendMessage(targetHandle, WM_RBUTTONUP, 0, lParam);
-                    break;
+        int lParam = (y << 16) | (x & 0xFFFF);
 
-                case "doubleclick":
-                    SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
-                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                    SendMessage(targetHandle, WM_LBUTTONDBLCLK, 0, lParam);
-                    SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                    break;
+        switch (action.ToLower())
+        {
+            case "click":
+                SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                break;
+
+            case "rightclick":
+                SendMessage(targetHandle, WM_RBUTTONDOWN, 0, lParam);
+                SendMessage(targetHandle, WM_RBUTTONUP, 0, lParam);
+                break;
+
+            case "doubleclick":
+                SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                SendMessage(targetHandle, WM_LBUTTONDBLCLK, 0, lParam);
+                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+                break;
 
-                default:
-                    Console.WriteLine("Error: 不支持的mouse操作类型");
-                    break;
-            }
+            default:
+                Console.WriteLine("Error: 不支持的mouse操作类型");
+                break;
         }
+
+        // 返回操作结果
+        return GetBasicWindowInfo(targetHandle, controlHandle);
     }
 
     private static void SendKeys(IntPtr hWnd, string keys)
@@ -735,10 +766,8 @@ private static void HandleInspectOperation(string[] args)
             return;
         }
 
-        // 输出所有匹配窗口的信息
-        StringBuilder json = new StringBuilder();
-        json.Append("[");
-        bool firstWindow = true;
+        // 创建一个列表存储所有窗口的控件树数组
+        List<string> allWindowTrees = new List<string>();
 
         foreach (IntPtr hWnd in targetWindows)
         {
@@ -749,17 +778,18 @@ private static void HandleInspectOperation(string[] args)
                 Thread.Sleep(50);
             }
 
-            if (!firstWindow)
+            // 获取当前窗口的控件树并添加到列表
+            // 注意：每个控件树已经是一个数组
+            string treeJson = GetControlsTree(hWnd, filter);
+            if (!string.IsNullOrEmpty(treeJson) && treeJson != "{}")
             {
-                json.Append(",");
+                // 将每个控件树作为一个数组元素添加
+                allWindowTrees.Add("[" + treeJson + "]");
             }
-            firstWindow = false;
-
-            json.Append(GetControlsTree(hWnd, filter));
         }
 
-        json.Append("]");
-        Console.WriteLine(json.ToString());
+        // 将所有窗口的控件树数组合并成一个大数组
+        Console.WriteLine("[" + string.Join(",", allWindowTrees) + "]");
     }
 
     private static string GetControlsTree(IntPtr parentHandle, string filter, int depth = 0)
@@ -791,10 +821,10 @@ private static string GetControlsTree(IntPtr parentHandle, string filter, int de
                 className.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
         }
 
-        // 添加节点信息
+        // 添加节点信息 - 将句柄改为十进制格式
         json.AppendFormat(
-            "\"handle\":\"0x{0:X}\",\"class\":\"{1}\",\"text\":\"{2}\",\"visible\":{3},\"location\":{{\"x\":{4},\"y\":{5},\"width\":{6},\"height\":{7}}},\"matched\":{8},\"children\":[",
-            parentHandle.ToInt64(),
+            "\"handle\":\"{0}\",\"class\":\"{1}\",\"text\":\"{2}\",\"visible\":{3},\"location\":{{\"x\":{4},\"y\":{5},\"width\":{6},\"height\":{7}}},\"matched\":{8},\"children\":[",
+            parentHandle.ToInt64(),  // 直接使用十进制格式
             className.ToString().Replace("\"", "\\\""),
             title.ToString().Replace("\"", "\\\""),
             isVisible.ToString().ToLower(),
@@ -846,10 +876,15 @@ 3. inspect - 获取控件树
 
 通用参数:
 --------
-+-method    窗口查找方式（可选，默认title）
-+          可选值：title（标题）, handle（句柄）, active（活动窗口）
-+
--window    窗口标题或句柄（支持模糊匹配）
+-method    窗口查找方式（可选，默认title）
+          可选值：
+          - title     窗口标题（支持模糊匹配）
+          - handle    窗口句柄
+          - active    当前活动窗口
+          - process   进程名
+          - class     窗口类名（支持模糊匹配）
+
+-window    要查找的窗口值（根据method解释）
 -control   控件类名
 -background 后台操作，不激活窗口，默认激活
 
@@ -891,15 +926,77 @@ 6. 使用句柄查找窗口：
 7. 操作当前活动窗口：
    sendmessage.exe -type keyboard -method active -value ""ctrl+s""
 
+8. 通过进程名查找窗口：
+   sendmessage.exe -type keyboard -method process -window ""notepad"" -value ""Hello""
+
+9. 通过窗口类名查找：
+   sendmessage.exe -type keyboard -method class -window ""Chrome"" -value ""Hello""  # 会匹配 Chrome_WidgetWin_1
+   sendmessage.exe -type keyboard -method class -window ""Chrome_WidgetWin_1"" -value ""Hello""  # 精确匹配
+
+返回值:
+------
+1. 均为JSON格式
+2. inspect操作返回控件树信息
+3. 其他操作返回操作的控件信息及其所在窗口信息
+4. 失败均抛出异常
+
 注意事项:
 --------
-1. 窗口标题支持模糊匹配
-2. 控件类名需要完全匹配
-3. 后台操作可能会影响某些程序的响应
-4. 建议先用inspect获取正确的控件信息再进行操作
-5. handle方式查找窗口时需要提供正确的窗口句柄
-6. active方式不需要提供window参数，直接操作当前活动窗口
+1. 窗口标题、类名支持模糊匹配，active方式可不提供window参数
+2. 所有操作都只会处理第一个匹配的窗口
 ";
         Console.WriteLine(help);
     }
+
+    private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd, IntPtr controlHandle = default(IntPtr))
+    {
+        var info = new Dictionary<string, object>();
+
+        // 获取窗口信息
+        StringBuilder title = new StringBuilder(256);
+        StringBuilder className = new StringBuilder(256);
+        GetWindowText(hwnd, title, title.Capacity);
+        GetClassName(hwnd, className, className.Capacity);
+
+        int processId = 0;
+        GetWindowThreadProcessId(hwnd, out processId);
+        string processName = "";
+        try
+        {
+            var process = System.Diagnostics.Process.GetProcessById(processId);
+            processName = process.ProcessName;
+        }
+        catch { }
+
+        // 窗口信息放在 window 键下
+        info["window"] = new Dictionary<string, object>
+        {
+            { "handle", hwnd.ToInt64() },
+            { "title", title.ToString() },
+            { "class", className.ToString() },
+            { "process", processName }
+        };
+
+        // 如果有控件信息，添加到顶层
+        if (controlHandle != IntPtr.Zero)
+        {
+            StringBuilder controlTitle = new StringBuilder(256);
+            StringBuilder controlClassName = new StringBuilder(256);
+            GetWindowText(controlHandle, controlTitle, controlTitle.Capacity);
+            GetClassName(controlHandle, controlClassName, controlClassName.Capacity);
+
+            info["handle"] = controlHandle.ToInt64();
+            info["title"] = controlTitle.ToString();
+            info["class"] = controlClassName.ToString();
+        }
+        else
+        {
+            // 如果没有控件，设置为 null
+            info["handle"] = null;
+            info["title"] = null;
+            info["class"] = null;
+        }
+
+        return info;
+    }
 }
diff --git a/plugin/lib/csharp/window.cs b/plugin/lib/csharp/window.cs
index 0c3a9b0e..c9402571 100644
--- a/plugin/lib/csharp/window.cs
+++ b/plugin/lib/csharp/window.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Diagnostics;
 using System.Web.Script.Serialization;
+using System.Collections.Generic;
 
 public class WindowManager
 {
@@ -110,33 +111,47 @@ public static void Main(string[] args)
             return;
         }
 
-        string type = GetArgumentValue(args, "-type");
-        if (string.IsNullOrEmpty(type))
-        {
-            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
-            return;
-        }
-
         try
         {
-            IntPtr hwnd = GetWindowHandle(args);
-            if (hwnd == IntPtr.Zero)
+            List<IntPtr> targetWindows = GetTargetWindows(args);
+            if (targetWindows.Count == 0)
             {
-                Console.Error.WriteLine("Error: 未找到目标窗口");
+                throw new Exception("未找到目标窗口");
+            }
+
+            string type = GetArgumentValue(args, "-type");
+            if (type.ToLower() == "info")
+            {
+                var allWindowInfo = new List<Dictionary<string, object>>();
+                foreach (IntPtr windowHandle in targetWindows)
+                {
+                    var windowInfo = GetBasicWindowInfo(windowHandle);
+                    if (windowInfo != null)
+                    {
+                        allWindowInfo.Add(windowInfo);
+                    }
+                }
+                var serializer = new JavaScriptSerializer();
+                Console.WriteLine(serializer.Serialize(allWindowInfo));
                 return;
             }
 
+            IntPtr targetHandle = targetWindows[0];
+            Dictionary<string, object> operatedWindow = null;
+
             switch (type.ToLower())
             {
                 case "topmost":
                     bool isTopMost = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    SetWindowPos(hwnd, isTopMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+                    SetWindowPos(targetHandle, isTopMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "opacity":
                     int opacity = int.Parse(GetArgumentValue(args, "-value") ?? "100");
-                    SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
-                    SetLayeredWindowAttributes(hwnd, 0, (byte)(opacity * 2.55), LWA_ALPHA);
+                    SetWindowLong(targetHandle, GWL_EXSTYLE, GetWindowLong(targetHandle, GWL_EXSTYLE) | WS_EX_LAYERED);
+                    SetLayeredWindowAttributes(targetHandle, 0, (byte)(opacity * 2.55), LWA_ALPHA);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "rect":
@@ -147,56 +162,69 @@ public static void Main(string[] args)
                         int y = int.Parse(rectValues[1]);
                         int width = int.Parse(rectValues[2]);
                         int height = int.Parse(rectValues[3]);
-                        MoveWindow(hwnd, x, y, width, height, true);
+                        MoveWindow(targetHandle, x, y, width, height, true);
                     }
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "state":
                     string state = GetArgumentValue(args, "-value") ?? "normal";
                     int cmdShow = state == "maximize" ? SW_MAXIMIZE :
                                 state == "minimize" ? SW_MINIMIZE : SW_NORMAL;
-                    ShowWindow(hwnd, cmdShow);
+                    ShowWindow(targetHandle, cmdShow);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "visible":
                     bool visible = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    ShowWindow(hwnd, visible ? SW_SHOW : SW_HIDE);
+                    ShowWindow(targetHandle, visible ? SW_SHOW : SW_HIDE);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "close":
-                    PostMessage(hwnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                    PostMessage(targetHandle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "focus":
-                    if (IsIconic(hwnd))
+                    if (IsIconic(targetHandle))
                     {
-                        ShowWindow(hwnd, SW_RESTORE);
+                        ShowWindow(targetHandle, SW_RESTORE);
                     }
-                    SetForegroundWindow(hwnd);
+                    SetForegroundWindow(targetHandle);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "border":
                     bool hasBorder = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    int style = GetWindowLong(hwnd, GWL_STYLE);
+                    int style = GetWindowLong(targetHandle, GWL_STYLE);
                     style = hasBorder ? style | WS_CAPTION : style & ~WS_CAPTION;
-                    SetWindowLong(hwnd, GWL_STYLE, style);
+                    SetWindowLong(targetHandle, GWL_STYLE, style);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "clickthrough":
                     bool isTransparent = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+                    int exStyle = GetWindowLong(targetHandle, GWL_EXSTYLE);
                     exStyle |= WS_EX_LAYERED;
                     exStyle = isTransparent ? exStyle | WS_EX_TRANSPARENT : exStyle & ~WS_EX_TRANSPARENT;
-                    SetWindowLong(hwnd, GWL_EXSTYLE, exStyle);
+                    SetWindowLong(targetHandle, GWL_EXSTYLE, exStyle);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 case "info":
-                    GetWindowInfo(hwnd);
+                    operatedWindow = GetBasicWindowInfo(targetHandle);
                     break;
 
                 default:
                     Console.Error.WriteLine("Error: 不支持的操作类型");
-                    break;
+                    return;
+            }
+
+            if (operatedWindow != null)
+            {
+                var serializer = new JavaScriptSerializer();
+                Console.WriteLine(serializer.Serialize(operatedWindow));
             }
         }
         catch (Exception ex)
@@ -205,148 +233,106 @@ public static void Main(string[] args)
         }
     }
 
-    private static IntPtr GetWindowHandle(string[] args)
+    private static List<IntPtr> GetTargetWindows(string[] args)
     {
+        List<IntPtr> targetWindows = new List<IntPtr>();
         string method = GetArgumentValue(args, "-method") ?? "title";
         string value = GetArgumentValue(args, "-window") ?? "";
 
         switch (method.ToLower())
         {
             case "handle":
-                return new IntPtr(long.Parse(value));
+                targetWindows.Add(new IntPtr(long.Parse(value)));
+                break;
+
             case "active":
-                return GetForegroundWindow();
-            default: // title
-                if (string.IsNullOrEmpty(value))
+                targetWindows.Add(GetForegroundWindow());
+                break;
+
+            case "process":
+                var processes = Process.GetProcessesByName(value);
+                foreach (var process in processes)
                 {
-                    return IntPtr.Zero;
+                    if (process.MainWindowHandle != IntPtr.Zero)
+                    {
+                        targetWindows.Add(process.MainWindowHandle);
+                    }
                 }
+                break;
 
-                IntPtr foundWindow = IntPtr.Zero;
+            case "class":
                 EnumWindows((hwnd, param) =>
                 {
-                    StringBuilder title = new StringBuilder(256);
-                    GetWindowText(hwnd, title, title.Capacity);
-                    string windowTitle = title.ToString();
+                    if (!IsWindowVisible(hwnd))
+                    {
+                        return true;
+                    }
+
+                    StringBuilder className = new StringBuilder(256);
+                    GetClassName(hwnd, className, className.Capacity);
+                    string windowClassName = className.ToString();
 
-                    if (!string.IsNullOrEmpty(windowTitle) &&
-                        windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+                    if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
                     {
-                        foundWindow = hwnd;
-                        return false; // 找到后停止枚举
+                        targetWindows.Add(hwnd);
                     }
                     return true;
                 }, IntPtr.Zero);
+                break;
 
-                return foundWindow;
-        }
-    }
+            case "title":
+            default:
+                if (!string.IsNullOrEmpty(value))
+                {
+                    EnumWindows((hwnd, param) =>
+                    {
+                        StringBuilder title = new StringBuilder(256);
+                        GetWindowText(hwnd, title, title.Capacity);
+                        string windowTitle = title.ToString();
 
-    private static void GetWindowInfo(IntPtr hwnd)
-    {
-        var windowRect = new RECT();
-        GetWindowRect(hwnd, out windowRect);
+                        if (!string.IsNullOrEmpty(windowTitle) &&
+                            windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+                        {
+                            targetWindows.Add(hwnd);
+                        }
+                        return true;
+                    }, IntPtr.Zero);
+                }
+                break;
+        }
 
-        var clientRect = new RECT();
-        GetClientRect(hwnd, out clientRect);
+        if (targetWindows.Count == 0)
+        {
+            throw new Exception("未找到匹配的窗口");
+        }
 
-        var titleText = new StringBuilder(256);
-        GetWindowText(hwnd, titleText, 256);
+        return targetWindows;
+    }
 
-        var className = new StringBuilder(256);
-        GetClassName(hwnd, className, 256);
+    private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
+    {
+        StringBuilder title = new StringBuilder(256);
+        StringBuilder className = new StringBuilder(256);
+        GetWindowText(hwnd, title, title.Capacity);
+        GetClassName(hwnd, className, className.Capacity);
 
         uint processId = 0;
         GetWindowThreadProcessId(hwnd, out processId);
-
         string processName = "";
-        string processPath = "";
         try
         {
-            Process process = Process.GetProcessById((int)processId);
+            var process = Process.GetProcessById((int)processId);
             processName = process.ProcessName;
-
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = "wmic",
-                Arguments = string.Format("process where ProcessId={0} get ExecutablePath /value", processId),
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                CreateNoWindow = true
-            };
-            using (var proc = Process.Start(startInfo))
-            {
-                string output = proc.StandardOutput.ReadToEnd();
-                if (!string.IsNullOrEmpty(output))
-                {
-                    string[] lines = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (string line in lines)
-                    {
-                        if (line.StartsWith("ExecutablePath="))
-                        {
-                            processPath = line.Substring("ExecutablePath=".Length);
-                            break;
-                        }
-                    }
-                }
-            }
         }
         catch { }
 
-        int style = GetWindowLong(hwnd, GWL_STYLE);
-        int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-
-        var data = new
+        return new Dictionary<string, object>
         {
-            handle = hwnd.ToInt64(),
-            processId = processId,
-            process = new
-            {
-                name = processName,
-                path = processPath
-            },
-            title = titleText.ToString(),
-            className = className.ToString(),
-            window = new
-            {
-                x = windowRect.Left,
-                y = windowRect.Top,
-                width = windowRect.Right - windowRect.Left,
-                height = windowRect.Bottom - windowRect.Top
-            },
-            client = new
-            {
-                width = clientRect.Right - clientRect.Left,
-                height = clientRect.Bottom - clientRect.Top
-            },
-            state = new
-            {
-                visible = IsWindowVisible(hwnd),
-                minimized = IsIconic(hwnd),
-                maximized = IsZoomed(hwnd),
-                focused = GetForegroundWindow() == hwnd
-            },
-            style = new
-            {
-                border = (style & WS_BORDER) != 0,
-                caption = (style & WS_CAPTION) != 0,
-                child = (style & WS_CHILD) != 0,
-                popup = (style & WS_POPUP) != 0,
-                sysmenu = (style & WS_SYSMENU) != 0,
-                minimizeBox = (style & WS_MINIMIZEBOX) != 0,
-                maximizeBox = (style & WS_MAXIMIZEBOX) != 0
-            },
-            exStyle = new
-            {
-                topmost = (exStyle & WS_EX_TOPMOST) != 0,
-                transparent = (exStyle & WS_EX_TRANSPARENT) != 0,
-                toolWindow = (exStyle & WS_EX_TOOLWINDOW) != 0,
-                layered = (exStyle & WS_EX_LAYERED) != 0
-            }
+            { "handle", hwnd.ToInt64() },
+            { "title", title.ToString() },
+            { "class", className.ToString() },
+            { "process", processName }
         };
-
-        var serializer = new JavaScriptSerializer();
-        Console.WriteLine(serializer.Serialize(data));
     }
 
     private static string GetArgumentValue(string[] args, string key)
@@ -384,12 +370,14 @@ 10. info      - 获取窗口信息
 通用参数:
 --------
 -method    窗口查找方式（可选，默认title）
-          可选值：title, handle, active
+          可选值：
+          - title     窗口标题（支持模糊匹配）
+          - handle    窗口句柄
+          - active    当前活动窗口
+          - process   进程名
+          - class     窗口类名（支持模糊匹配）
 
--window    窗口标题或句柄
-          示例：-window ""记事本""
-
--value     操作值，根据不同操作类型有不同含义
+-window    要查找的窗口值（根据method解释）
 
 操作参数说明:
 -----------
@@ -437,17 +425,23 @@ 6. 关闭窗口：
 7. 获取窗口信息：
    window.exe -type info -window ""记事本""
 
+8. 通过进程名查找窗口：
+   window.exe -type info -method process -window ""notepad""
+
+9. 通过窗口类名查找：
+   window.exe -type info -method class -window ""Chrome""  # 会匹配 Chrome_WidgetWin_1
+
 返回值:
 ------
-1. info操作返回JSON格式的窗口信息
-2. 其他操作无返回值，执行失败时输出错误信息
+1. 均为JSON格式
+2. info操作返回所有匹配窗口信息
+3. 其他操作返回操作的窗口信息
+4. 失败均抛出异常
 
 注意事项:
 --------
-1. 窗口标题支持模糊匹配
-2. handle方式查找窗口时需要提供正确的窗口句柄
-3. active方式不需要提供window参数，直接操作当前活动窗口
-4. 某些操作可能需要管理员权限
+1. 窗口标题、类名支持模糊匹配，active方式可不提供window参数
+2. 只有info操作会返回所有匹配窗口的信息，其他操作只会操作第一个匹配的窗口
 ";
         Console.WriteLine(help);
     }
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index 94008c9c..521dc526 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -2,11 +2,10 @@ const { runCsharpFeature } = require("../../csharp");
 
 /**
  * 列出所有元素
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
  * @param {object} options 选项
  * @param {string} options.filter 过滤条件
- * @param {boolean} options.background 是否后台操作
  * @returns {object[]} 元素列表
  */
 const listElements = async function (method, window, options = {}) {
@@ -17,28 +16,29 @@ const listElements = async function (method, window, options = {}) {
   if (method !== "active" && window) args.push("-window", window);
   if (filter) args.push("-filter", filter);
   if (scope) args.push("-scope", scope);
-  const result = await runCsharpFeature("automation", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
   try {
-    return JSON.parse(result);
-  } catch (error) {
-    console.error("解析元素列表失败:", error);
-    return null;
+    const result = await runCsharpFeature("automation", args);
+    console.log(result);
+    if (result) return JSON.parse(result);
+  } catch (err) {
+    console.log(err);
   }
+  return [];
 };
 
 /**
  * 点击元素
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
- * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
+ * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
  * @param {string} value 查找值
  * @param {object} options 选项
- * @param {string} options.pattern 点击模式：invoke/toggle
+ * @param {string} options.pattern 点击模式："invoke"|"toggle"
  * @param {boolean} options.background 是否后台操作
- * @returns {boolean} 是否成功
+ * @returns {Object} 操作结果
+ * @property {boolean} success 是否成功
+ * @property {Object} element 操作的元素信息
+ * @property {Object} element.window 操作的元素所在的窗口信息
  */
 const clickElement = async function (method, window, by, value, options = {}) {
   const { pattern = "invoke", background = false } = options;
@@ -48,24 +48,31 @@ const clickElement = async function (method, window, by, value, options = {}) {
   if (method !== "active" && window) args.push("-window", window);
   if (pattern) args.push("-pattern", pattern);
   if (background) args.push("-background");
-
-  const result = await runCsharpFeature("automation", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  let error;
+  try {
+    const result = await runCsharpFeature("automation", args);
+    if (result) {
+      return { success: true, element: JSON.parse(result) };
+    }
+  } catch (err) {
+    error = err.toString();
   }
-  return true;
+  return { success: true, error };
 };
 
 /**
  * 设置元素值
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
- * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
+ * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
  * @param {string} value 查找值
  * @param {string} newValue 要设置的值
  * @param {object} options 选项
  * @param {boolean} options.background 是否后台操作
- * @returns {boolean} 是否成功
+ * @returns {Object} 操作结果
+ * @property {boolean} success 是否成功
+ * @property {Object} element 操作的元素信息
+ * @property {Object} element.window 操作的元素所在的窗口信息
  */
 const setElementValue = async function (
   method,
@@ -90,19 +97,21 @@ const setElementValue = async function (
   args.push("-method", method);
   if (method !== "active" && window) args.push("-window", window);
   if (background) args.push("-background");
-
-  const result = await runCsharpFeature("automation", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  let error;
+  try {
+    const result = await runCsharpFeature("automation", args);
+    if (result) return { success: true, element: JSON.parse(result) };
+  } catch (err) {
+    error = err.toString();
   }
-  return true;
+  return { success: false, error };
 };
 
 /**
  * 获取元素值
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
- * @param {string} by 查找方式：name/class/type/automationid
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
+ * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
  * @param {string} value 查找值
  * @param {object} options 选项
  * @param {boolean} options.background 是否后台操作
@@ -122,38 +131,32 @@ const getElementValue = async function (
   if (method !== "active" && window) args.push("-window", window);
   if (background) args.push("-background");
 
-  const result = await runCsharpFeature("automation", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
+  let error;
   try {
-    return JSON.parse(result);
-  } catch (error) {
-    console.error("解析元素值失败:", error);
-    return null;
+    const result = await runCsharpFeature("automation", args);
+    if (result) return JSON.parse(result);
+  } catch (err) {
+    error = err.toString();
   }
+  return { success: false, error };
 };
 
 /**
  * 检查元素
  * @param {object} options 选项
  * @param {number} options.timeout 超时时间(秒)
- * @param {boolean} options.background 是否后台操作
  * @returns {object} 元素信息
  */
 const inspectElement = async function () {
   const args = ["-type", "inspect"];
 
-  const result = await runCsharpFeature("automation", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
   try {
-    return JSON.parse(result);
-  } catch (error) {
-    console.error("解析元素信息失败:", error);
-    return null;
+    const result = await runCsharpFeature("automation", args);
+    if (result) return JSON.parse(result);
+  } catch (err) {
+    console.log(err);
   }
+  return [];
 };
 
 module.exports = {
diff --git a/plugin/lib/quickcomposer/windows/sendmessage.js b/plugin/lib/quickcomposer/windows/sendmessage.js
index f9d27938..0b9bb448 100644
--- a/plugin/lib/quickcomposer/windows/sendmessage.js
+++ b/plugin/lib/quickcomposer/windows/sendmessage.js
@@ -2,13 +2,16 @@ const { runCsharpFeature } = require("../../csharp");
 
 /**
  * 键盘操作
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
  * @param {string} keys 键盘按键
  * @param {object} options 选项
  * @param {string} options.control 控件类名
  * @param {boolean} options.background 是否后台操作
- * @returns {boolean} 是否成功
+ * @returns {Object} 操作结果
+ * @property {boolean} success 是否成功
+ * @property {Object} control 控件信息
+ * @property {string} control.window 控件所在窗口的信息
  */
 const sendKeys = async function (method, window, keys, options = {}) {
   const { control, background = false } = options;
@@ -17,23 +20,33 @@ const sendKeys = async function (method, window, keys, options = {}) {
   if (method !== "active" && window) args.push("-window", window);
   if (control) args.push("-control", control);
   args.push("-background", background.toString());
-
-  const result = await runCsharpFeature("sendmessage", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  let error;
+  try {
+    const result = await runCsharpFeature("sendmessage", args);
+    if (result) {
+      return {
+        success: true,
+        control: JSON.parse(result),
+      };
+    }
+  } catch (err) {
+    error = err.toString();
   }
-  return true;
+  return { success: false, error };
 };
 
 /**
  * 发送文本
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
  * @param {string} text 文本
  * @param {object} options 选项
  * @param {string} options.control 控件类名
  * @param {boolean} options.background 是否后台操作
- * @returns {boolean} 是否成功
+ * @returns {Object} 操作结果
+ * @property {boolean} success 是否成功
+ * @property {Object} control 控件信息
+ * @property {string} control.window 控件所在窗口的信息
  */
 const sendText = async function (method, window, text, options = {}) {
   const { control, background = false } = options;
@@ -43,32 +56,34 @@ const sendText = async function (method, window, text, options = {}) {
   if (method !== "active" && window) args.push("-window", window);
   if (control) args.push("-control", control);
   args.push("-background", background.toString());
-
-  const result = await runCsharpFeature("sendmessage", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  let error;
+  try {
+    const result = await runCsharpFeature("sendmessage", args);
+    if (result) {
+      return { success: true, control: JSON.parse(result) };
+    }
+  } catch (err) {
+    error = err.toString();
   }
-  return true;
+  return { success: false, error };
 };
 
 /**
  * 鼠标点击
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
- * @param {string} action 动作：click/doubleClick/rightClick
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
+ * @param {string} action 动作："click"|"doubleClick"|"rightClick"
  * @param {object} options 选项
  * @param {string} options.control 控件类名
  * @param {string} options.text 控件文本
  * @param {string} options.pos 点击位置：x,y
  * @param {boolean} options.background 是否后台操作
- * @returns {boolean} 是否成功
+ * @returns {Object} 操作结果
+ * @property {boolean} success 是否成功
+ * @property {Object} control 控件信息
+ * @property {string} control.window 控件所在窗口的信息
  */
-const click = async function (
-  method,
-  window,
-  action = "click",
-  options = {}
-) {
+const click = async function (method, window, action = "click", options = {}) {
   const { control, text, pos, background = false } = options;
   const args = ["-type", "mouse", "-action", action];
 
@@ -79,17 +94,22 @@ const click = async function (
   if (pos) args.push("-pos", pos);
   args.push("-background", background.toString());
 
-  const result = await runCsharpFeature("sendmessage", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  let error;
+  try {
+    const result = await runCsharpFeature("sendmessage", args);
+    if (result) {
+      return { success: true, control: JSON.parse(result) };
+    }
+  } catch (err) {
+    error = err.toString();
   }
-  return true;
+  return { success: false, error };
 };
 
 /**
  * 获取窗口控件树
- * @param {string} method 窗口类型：title/handle/active
- * @param {string} window 窗口标题/句柄
+ * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
+ * @param {string} window 窗口标题、句柄、进程名、类名
  * @param {object} options 选项
  * @param {string} options.filter 过滤条件
  * @param {boolean} options.background 是否后台操作
@@ -103,17 +123,13 @@ const inspectWindow = async function (method, window, options = {}) {
   if (method !== "active" && window) args.push("-window", window);
   if (filter) args.push("-filter", filter);
   args.push("-background", background.toString());
-
-  const result = await runCsharpFeature("sendmessage", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
-  }
   try {
-    return JSON.parse(result);
+    const result = await runCsharpFeature("sendmessage", args);
+    if (result) return JSON.parse(result);
   } catch (error) {
-    console.error("解析控件树失败:", error);
-    return null;
+    console.log(error);
   }
+  return [];
 };
 
 module.exports = {
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
index 9c62a458..22b0f992 100644
--- a/plugin/lib/quickcomposer/windows/window.js
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -1,10 +1,12 @@
 const { runCsharpFeature } = require("../../csharp");
 
 /**
- * 窗口置顶
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @param {boolean} isTopMost 是否置顶
+ * 窗口置顶，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被置顶的窗口信息
  */
 async function setTopMost(method, value, isTopMost) {
   const args = [
@@ -17,14 +19,29 @@ async function setTopMost(method, value, isTopMost) {
     "-value",
     isTopMost.toString(),
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return {
+        success: true,
+        window: JSON.parse(windowInfo),
+      };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口透明度
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 设置窗口透明度，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
  * @param {number} opacity 透明度 0-100
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置透明度的窗口信息
  */
 async function setOpacity(method, value, opacity) {
   const args = [
@@ -37,17 +54,29 @@ async function setOpacity(method, value, opacity) {
     "-value",
     opacity.toString(),
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口位置和大小
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 设置窗口位置和大小，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
  * @param {number} x X坐标
  * @param {number} y Y坐标
  * @param {number} width 宽度
  * @param {number} height 高度
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置位置和大小的窗口信息
  */
 async function setWindowRect(method, value, x, y, width, height) {
   const args = [
@@ -60,14 +89,26 @@ async function setWindowRect(method, value, x, y, width, height) {
     "-value",
     `${x},${y},${width},${height}`,
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口状态
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @param {string} state 状态：normal/maximize/minimize
+ * 设置窗口状态，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
+ * @param {string} state 状态："normal"|"maximize"|"minimize"
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置状态的窗口信息
  */
 async function setWindowState(method, value, state) {
   const args = [
@@ -80,34 +121,70 @@ async function setWindowState(method, value, state) {
     "-value",
     state,
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 关闭窗口
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 关闭窗口，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被关闭的窗口信息
  */
 async function closeWindow(method, value) {
   const args = ["-type", "close", "-method", method, "-window", value];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口焦点
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 设置窗口焦点，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置焦点的窗口信息
  */
 async function setFocus(method, value) {
   const args = ["-type", "focus", "-method", method, "-window", value];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口边框
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 设置窗口边框，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
  * @param {boolean} hasBorder 是否显示边框
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置边框的窗口信息
  */
 async function setBorder(method, value, hasBorder) {
   const args = [
@@ -120,14 +197,26 @@ async function setBorder(method, value, hasBorder) {
     "-value",
     hasBorder.toString(),
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 设置窗口点击穿透
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
+ * 设置窗口点击穿透，只操作第一个找到的窗口
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
  * @param {boolean} isTransparent 是否点击穿透
+ * @param {Object} result 结果
+ * @param {boolean} result.success 是否成功
+ * @param {Object} result.window 被设置点击穿透的窗口信息
  */
 async function setClickThrough(method, value, isTransparent) {
   const args = [
@@ -140,43 +229,33 @@ async function setClickThrough(method, value, isTransparent) {
     "-value",
     isTransparent.toString(),
   ];
-  await runCsharpFeature("window", args);
+  let error;
+  try {
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) {
+      return { success: true, window: JSON.parse(windowInfo) };
+    }
+  } catch (err) {
+    error = err.toString();
+  }
+  return { success: false, error };
 }
 
 /**
- * 获取窗口信息
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @returns {Object} 窗口信息
+ * 获取窗口信息，返回所有匹配的窗口信息
+ * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} value 窗口标题、句柄、进程名、类名
+ * @returns {Object} 所有匹配的窗口信息
  */
 async function getWindowInfo(method, value) {
   const args = ["-type", "info", "-method", method, "-window", value];
-  const result = await runCsharpFeature("window", args);
   try {
-    return JSON.parse(result);
-  } catch (error) {
-    return {};
+    const windowInfo = await runCsharpFeature("window", args);
+    if (windowInfo) return JSON.parse(windowInfo);
+  } catch (err) {
+    console.log(err);
   }
-}
-
-/**
- * 设置窗口可见性
- * @param {string} method 查找方式：title/handle/active
- * @param {string} value 查找值（handle时为数字）
- * @param {boolean} visible 是否可见
- */
-async function setVisible(method, value, visible) {
-  const args = [
-    "-type",
-    "visible",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    visible.toString(),
-  ];
-  await runCsharpFeature("window", args);
+  return [];
 }
 
 module.exports = {
@@ -184,7 +263,6 @@ module.exports = {
   setOpacity,
   setWindowRect,
   setWindowState,
-  setVisible,
   closeWindow,
   setFocus,
   setBorder,
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index 2439dcfa..a1442c6a 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -193,6 +193,31 @@ export default {
           }, 0);
       };
 
+      const formatValue = (value) => {
+        const liteView = (obj) => {
+          if (Array.isArray(obj)) {
+            return `[${obj.slice(0, 3).join(",")} ${
+              obj.length > 3 ? "..." : ""
+            }]`;
+          }
+          const keys = Object.keys(obj);
+          return `{${keys.slice(0, 3).join(",")} ${
+            keys.length > 3 ? "..." : ""
+          }}`;
+        };
+
+        if (value == null) return "";
+
+        switch (typeof value) {
+          case "string":
+            return value.replace(/\n/g, "\\n");
+          case "object":
+            return liteView(value);
+          default:
+            return String(value);
+        }
+      };
+
       // 计算每列的最大宽度
       const columnWidths = headers.map((header) => {
         const maxDataWidth = Math.max(
@@ -201,7 +226,7 @@ export default {
             const value = obj[header];
             return value === undefined || value === null
               ? 0
-              : getDisplayWidth(String(value).replace(/\n/g, "\\n"));
+              : getDisplayWidth(formatValue(value));
           })
         );
         return maxDataWidth;
@@ -236,7 +261,7 @@ export default {
               const value = obj[header];
               return value === undefined || value === null
                 ? ""
-                : String(value).replace(/\n/g, "\\n");
+                : formatValue(value);
             })
           )
         ),
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index dcac5474..f898aef7 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -107,26 +107,26 @@ const registryPaths = [
 const searchWindowConfig = [
   {
     key: "method",
-    label: "查找方式",
+    label: "窗口查找方式",
     component: "q-select",
     icon: "search",
     width: 3,
     options: [
       { label: "标题", value: "title" },
-      // { label: "类名", value: "class" },
+      { label: "类名", value: "class" },
       { label: "句柄", value: "handle" },
-      // { label: "进程", value: "process" },
+      { label: "进程名", value: "process" },
       { label: "活动窗口", value: "active" },
     ],
     defaultValue: "title",
   },
   {
     key: "value",
-    label: "窗口标题/句柄",
+    label: "窗口标题/类名/句柄/进程名/活动窗口",
     component: "VariableInput",
     icon: "title",
     width: 9,
-    placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
+    placeholder: "标题、类名支持模糊匹配，选择活动窗口无需输入",
   },
 ];
 
@@ -244,24 +244,6 @@ export const windowsCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.windows.window.setVisible",
-          label: "窗口可见性",
-          icon: "visibility",
-          config: [
-            {
-              key: "visible",
-              component: "ButtonGroup",
-              icon: "visibility",
-              width: 12,
-              options: [
-                { label: "显示", value: true },
-                { label: "隐藏", value: false },
-              ],
-              defaultValue: true,
-            },
-          ],
-        },
         {
           value: "quickcomposer.windows.window.closeWindow",
           label: "关闭窗口",
@@ -317,29 +299,7 @@ export const windowsCommands = {
       desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,
-      config: [
-        {
-          key: "method",
-          label: "查找方式",
-          component: "q-select",
-          icon: "search",
-          width: 3,
-          options: [
-            { label: "标题", value: "title" },
-            { label: "句柄", value: "handle" },
-            { label: "活动窗口", value: "active" },
-          ],
-          defaultValue: "title",
-        },
-        {
-          key: "value",
-          label: "窗口标题/句柄",
-          component: "VariableInput",
-          icon: "title",
-          width: 9,
-          placeholder: "标题支持模糊匹配，选择活动窗口无需输入",
-        },
-      ],
+      config: searchWindowConfig,
       subCommands: [
         {
           value: "quickcomposer.windows.sendmessage.inspectWindow",
@@ -1158,10 +1118,10 @@ export const windowsCommands = {
             ...searchWindowConfig,
             {
               key: "by",
-              label: "查找方式",
+              label: "元素查找方式",
               component: "q-select",
               icon: "search",
-              width: 4,
+              width: 3,
               options: [
                 { label: "名称", value: "name" },
                 { label: "类名", value: "class" },
@@ -1175,7 +1135,7 @@ export const windowsCommands = {
               label: "查找值",
               component: "VariableInput",
               icon: "text_fields",
-              width: 8,
+              width: 9,
               placeholder: "要点击的元素值",
             },
             {

From 0664e021d0aaef073c61728e08dfc55291ef753a Mon Sep 17 00:00:00 2001
From: wanmeihuaxu <540765296@qq.com>
Date: Thu, 16 Jan 2025 16:02:55 +0800
Subject: [PATCH 062/332] =?UTF-8?q?bug=20fix:showSelectList=20options?=
 =?UTF-8?q?=E7=9A=84closeOnSelect=E8=AE=BE=E7=BD=AE=E4=B8=BAfalse=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E9=A1=B9=E5=8F=AA=E8=83=BD=E7=82=B9=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E9=80=89=E9=A1=B9=E7=8B=AC=E7=AB=8B=E7=9A=84?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/QuickCommand.vue |  3 +++
 src/components/quickcommandUI/SelectList.vue   |  2 +-
 src/plugins/monaco/types/quickcommand.api.d.ts | 11 +++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index c575c5cc..b89b9313 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -186,6 +186,9 @@ export default {
        * initItems = [{title: "1", description: "1"},     {title: "2", description: "2"}, {title: "3", description: "3"}]
        * options = {placeholder: "输入进行筛选，支持拼音", optionType: "json", enableSearch: true, showCancelButton: false, closeOnSelect: true}
        *
+       * 如需对每个选项单独注册点击事件，可以在initItems的元素中添加id和clickFn，如：
+       * initItems = [{id:1, title: "1", description: "1", clickFn:function(e){console.log(e)}}, {id:2, title: "2", description: "2", clickFn:function(e){console.log(e)}}]
+       * 
        * @example
        * initItems = ["<div>1</div>", "<div>2</div>", "<div>3</div>"]
        * options = {placeholder: "输入进行筛选，支持拼音", optionType: "html", enableSearch: true, showCancelButton: false, closeOnSelect: true}
diff --git a/src/components/quickcommandUI/SelectList.vue b/src/components/quickcommandUI/SelectList.vue
index 4ada780a..23d5e97f 100644
--- a/src/components/quickcommandUI/SelectList.vue
+++ b/src/components/quickcommandUI/SelectList.vue
@@ -144,7 +144,7 @@ export default {
             id: this.currentIndex,
             text: this.matchedItems[this.currentIndex],
           };
-      this.$emit("clickOK", selected);
+      this.is.json && selected.clickFn ? selected.clickFn(this.matchedItems[this.currentIndex].id) : this.$emit("clickOK", selected);
       this.options.options.closeOnSelect && this.hide();
     },
 
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 27bfff07..5fb9062a 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -55,8 +55,15 @@ interface quickcommandApi {
    * // json
    * var opt = []
    * for (var i = 0; i < 15; i++) {
-   *     // 每一个选项为 json 格式
-   *     opt.push({title: `选项${i}`, description: `选项${i}的描述`, icon: `http://www.u.tools/favicon.ico`,abcd: `选项${i}的自定义属性`})
+   *     // 每一个选项为 json 格式, 使用clickFn注册选项单击事件时id属性是必需的
+   *     opt.push({
+   *        id: i, 
+   *        title: `选项${i}`, 
+   *        description: `选项${i}的描述`, 
+   *        icon: `http://www.u.tools/favicon.ico`,
+   *        abcd: `选项${i}的自定义属性`, 
+   *        clickFn:function(e){console.log(e)}
+   *     })
    * }
    * quickcommand.showSelectList(opt, {optionType: 'json'}).then(choise => {
    *     console.log(`选择的选项为${choise.title}`)

From 10b67c919acda0311b0f06bed79fd6dfe4aa79d5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 17 Jan 2025 18:51:11 +0800
Subject: [PATCH 063/332] =?UTF-8?q?window=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=9A1.=E6=96=B0=E5=A2=9E=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=AA=97=E5=8F=A3=EF=BC=88inspect=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=AB=98=E4=BA=AE=E6=8C=87=E5=AE=9A=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=EF=BC=8C=E5=B9=B6=E6=9F=A5=E7=9C=8B=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E3=80=81=E7=B1=BB=E5=9E=8B=E3=80=81?=
 =?UTF-8?q?=E5=8F=A5=E6=9F=84=E3=80=81xpath=E7=AD=89=E5=90=84=E9=A1=B9?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=8A=E6=89=80=E5=9C=A8=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=90=84=E9=A1=B9=E5=B1=9E=E6=80=A7=202.=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8=E5=8C=96=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87xpath=E3=80=81name=E3=80=81id?=
 =?UTF-8?q?=E7=AD=89=E6=9D=A1=E4=BB=B6=E5=9C=A8=E5=AF=B9=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E6=89=A7=E8=A1=8C=E7=82=B9=E5=87=BB=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=80=BC=E3=80=81=E6=A8=A1=E6=8B=9F=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E3=80=81=E9=AB=98=E4=BA=AE=E7=AD=89=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |    3 +
 plugin/lib/csharp/automation.cs               | 2443 +++++++++--------
 plugin/lib/csharp/index.js                    |   21 +-
 plugin/lib/csharp/sendmessage.cs              |  239 +-
 plugin/lib/csharp/window.cs                   |   14 +-
 .../lib/quickcomposer/windows/automation.js   |  264 +-
 .../lib/quickcomposer/windows/sendmessage.js  |  206 +-
 plugin/lib/quickcomposer/windows/window.js    |  323 +--
 .../composer/common/VariableInput.vue         |    4 +-
 src/js/composer/commands/windowsCommands.js   |  529 ++--
 src/js/composer/formatString.js               |   29 +-
 11 files changed, 2084 insertions(+), 1991 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 773e4568..b78ce7ea 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,8 @@
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
   "[vue]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[csharp]": {
+    "editor.defaultFormatter": "ms-dotnettools.csharp"
   }
 }
diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
index f66fc9e3..5ff9b965 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/automation.cs
@@ -13,1338 +13,1443 @@
 
 public class AutomationManager
 {
-    // UIA Control Type IDs
-    private static class UIA_ControlTypeIds
-    {
-        public const int Window = 50032;
-    }
-
-    // 用于缓存找到的元素
-    private static Dictionary<string, AutomationElement> elementCache = new Dictionary<string, AutomationElement>();
+  // UIA Control Type IDs
+  private static class UIA_ControlTypeIds
+  {
+    public const int Window = 50032;
+  }
 
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetForegroundWindow();
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct Point
-    {
-        public int X;
-        public int Y;
+  // 用于缓存找到的元素
+  private static Dictionary<string, AutomationElement> elementCache = new Dictionary<string, AutomationElement>();
 
-        public override bool Equals(object obj)
-        {
-            if (!(obj is Point)) return false;
-            Point other = (Point)obj;
-            return X == other.X && Y == other.Y;
-        }
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetForegroundWindow();
 
-        public static bool operator ==(Point a, Point b)
-        {
-            return a.Equals(b);
-        }
+  [StructLayout(LayoutKind.Sequential)]
+  private struct Point
+  {
+    public int X;
+    public int Y;
 
-        public static bool operator !=(Point a, Point b)
-        {
-            return !a.Equals(b);
-        }
-
-        public override int GetHashCode()
-        {
-            return X.GetHashCode() ^ Y.GetHashCode();
-        }
-
-        public System.Windows.Point ToWindowsPoint()
-        {
-            return new System.Windows.Point(X, Y);
-        }
+    public override bool Equals(object obj)
+    {
+      if (!(obj is Point)) return false;
+      Point other = (Point)obj;
+      return X == other.X && Y == other.Y;
     }
 
-    [DllImport("user32.dll")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool GetCursorPos(out Point lpPoint);
+    public static bool operator ==(Point a, Point b)
+    {
+      return a.Equals(b);
+    }
 
-    [DllImport("user32.dll")]
-    private static extern short GetAsyncKeyState(int vKey);
+    public static bool operator !=(Point a, Point b)
+    {
+      return !a.Equals(b);
+    }
 
-    [DllImport("user32.dll")]
-    private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+    public override int GetHashCode()
+    {
+      return X.GetHashCode() ^ Y.GetHashCode();
+    }
 
-    [DllImport("user32.dll")]
-    private static extern bool BlockInput(bool fBlockIt);
+    public System.Windows.Point ToWindowsPoint()
+    {
+      return new System.Windows.Point(X, Y);
+    }
+  }
+
+  [DllImport("user32.dll")]
+  [return: MarshalAs(UnmanagedType.Bool)]
+  private static extern bool GetCursorPos(out Point lpPoint);
+
+  [DllImport("user32.dll")]
+  static extern int GetWindowLong(IntPtr hwnd, int index);
+
+  [DllImport("user32.dll")]
+  static extern int SetWindowLong(IntPtr hwnd, int index, int newStyle);
+
+  private const int GWL_EXSTYLE = -20;
+  private const int WS_EX_TRANSPARENT = 0x20;
+  private const int WS_EX_LAYERED = 0x80000;
+  private const int WS_EX_TOOLWINDOW = 0x80;
+  private const int WS_EX_NOACTIVATE = 0x08000000;
+  private const int HWND_TOPMOST = -1;
+
+  [DllImport("user32.dll")]
+  static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+  [DllImport("user32.dll", CharSet = CharSet.Auto)]
+  private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+  [DllImport("user32.dll", CharSet = CharSet.Auto)]
+  private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+  [DllImport("user32.dll")]
+  private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
+
+  [StructLayout(LayoutKind.Sequential)]
+  private struct RECT
+  {
+    public int Left;
+    public int Top;
+    public int Right;
+    public int Bottom;
+  }
+
+  [DllImport("user32.dll")]
+  [return: MarshalAs(UnmanagedType.Bool)]
+  private static extern bool GetWindowRect(IntPtr hWnd, ref RECT lpRect);
+
+  [DllImport("user32.dll")]
+  private static extern bool SetCursorPos(int x, int y);
+
+  [DllImport("user32.dll")]
+  private static extern void mouse_event(uint dwFlags, int dx, int dy, uint dwData, int dwExtraInfo);
+
+  private const uint MOUSEEVENTF_LEFTDOWN = 0x0002;
+  private const uint MOUSEEVENTF_LEFTUP = 0x0004;
+
+  // 添加静态字段
+  private static System.Windows.Forms.Timer mouseTimer;
+  private static Form overlayForm;
+  private static Form previewForm;
+  private static AutomationElement lastElement;
+  private static bool completed;
+
+  private static CacheRequest CreateCacheRequest()
+  {
+    var cacheRequest = new CacheRequest();
+    cacheRequest.Add(AutomationElement.NameProperty);
+    cacheRequest.Add(AutomationElement.ClassNameProperty);
+    cacheRequest.Add(AutomationElement.ControlTypeProperty);
+    cacheRequest.Add(AutomationElement.BoundingRectangleProperty);
+    cacheRequest.Add(AutomationElement.IsOffscreenProperty);
+    cacheRequest.Add(AutomationElement.IsEnabledProperty);
+    cacheRequest.TreeScope = TreeScope.Element | TreeScope.Children | TreeScope.Descendants;
+    return cacheRequest;
+  }
+
+  private static AutomationElement GetTaskbarElement()
+  {
+    IntPtr taskbarHandle = FindWindow("Shell_TrayWnd", null);
+    if (taskbarHandle != IntPtr.Zero)
+    {
+      return AutomationElement.FromHandle(taskbarHandle);
+    }
+    return null;
+  }
 
-    [DllImport("user32.dll")]
-    private static extern bool SetForegroundWindow(IntPtr hWnd);
+  private static List<AutomationElement> GetTaskbarChildren(AutomationElement taskbarElement)
+  {
+    var children = new List<AutomationElement>();
+    if (taskbarElement == null) return children;
 
-    public static void Main(string[] args)
+    try
     {
-        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+      var cacheRequest = CreateCacheRequest();
+      cacheRequest.Push();
+      try
+      {
+        var conditions = new AndCondition(
+            new PropertyCondition(AutomationElement.IsOffscreenProperty, false),
+            new PropertyCondition(AutomationElement.IsEnabledProperty, true),
+            new PropertyCondition(AutomationElement.IsContentElementProperty, true)
+        );
+
+        var taskbarChildren = taskbarElement.FindAll(TreeScope.Children | TreeScope.Descendants, conditions);
+        foreach (AutomationElement child in taskbarChildren)
         {
-            ShowHelp();
-            return;
+          children.Add(child);
         }
+      }
+      finally
+      {
+        cacheRequest.Pop();
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+    }
 
-        string type = GetArgumentValue(args, "-type");
-        if (string.IsNullOrEmpty(type))
-        {
-            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
-            return;
-        }
+    return children;
+  }
 
-        try
-        {
-            switch (type.ToLower())
-            {
-                case "list":
-                case "find":
-                    // 列出所有元素或查找元素
-                    string filter = GetArgumentValue(args, "-value") ?? GetArgumentValue(args, "-filter"); // 兼容两种参数名
-                    ListElements(args, filter);
-                    break;
-
-                case "getinfo":
-                    // 获取元素信息
-                    GetElementInfo(args);
-                    break;
-
-                case "click":
-                    // 点击元素
-                    ClickElement(args);
-                    break;
-
-                case "setvalue":
-                    // 设置值
-                    string newValue = GetArgumentValue(args, "-value");
-                    SetElementValue(args, newValue);
-                    break;
-
-                case "getvalue":
-                    // 获取值
-                    GetElementValue(args);
-                    break;
-
-                case "select":
-                    // 选择项目
-                    string item = GetArgumentValue(args, "-item");
-                    SelectItem(args, item);
-                    break;
-
-                case "expand":
-                    // 展开/折叠
-                    string expandStr = GetArgumentValue(args, "-expand");
-                    bool expand = expandStr != null && expandStr.ToLower() == "true";
-                    ExpandElement(args, expand);
-                    break;
-
-                case "scroll":
-                    // 滚动
-                    string direction = GetArgumentValue(args, "-direction") ?? "vertical";
-                    double amount = double.Parse(GetArgumentValue(args, "-amount") ?? "0");
-                    ScrollElement(args, direction, amount);
-                    break;
-
-                case "wait":
-                    // 等待元素
-                    string by = GetArgumentValue(args, "-by") ?? "name";
-                    string value = GetArgumentValue(args, "-value");
-                    int timeout = int.Parse(GetArgumentValue(args, "-timeout") ?? "30");
-                    WaitForElement(args, by, value, timeout);
-                    break;
-
-                case "focus":
-                    // 设置焦点
-                    SetFocus(args);
-                    break;
-
-                case "sendkeys":
-                    // 发送按键
-                    string keys = GetArgumentValue(args, "-keys");
-                    SendKeys(args, keys);
-                    break;
-
-                case "getchild":
-                    // 获取子元素
-                    string childType = GetArgumentValue(args, "-type") ?? "all";
-                    GetChildElements(args, childType);
-                    break;
-
-                case "getparent":
-                    // 获取父元素
-                    GetParentElement(args);
-                    break;
-
-                case "highlight":
-                    // 高亮显示元素
-                    int duration = int.Parse(GetArgumentValue(args, "-duration") ?? "2");
-                    HighlightElement(args, duration);
-                    break;
-
-                case "inspect":
-                    // 生成元素识别器
-                    InspectElement(args);
-                    break;
-
-                default:
-                    Console.Error.WriteLine("Error: 不支持的操作类型");
-                    break;
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
-        }
+  private static void InspectElementByPosition(string position)
+  {
+    Point cursorPos;
+    if (string.IsNullOrEmpty(position))
+    {
+      // 获取当前鼠标位置
+      GetCursorPos(out cursorPos);
     }
-
-    private static void ShowHelp()
+    else
     {
-        string help = @"UI自动化工具 - 使用说明
-
-用法:
-  automation.exe -type <操作类型> [参数]
+      // 解析传入的坐标
+      string[] coords = position.Split(',');
+      cursorPos = new Point
+      {
+        X = int.Parse(coords[0]),
+        Y = int.Parse(coords[1])
+      };
+    }
 
-通用参数:
-  -window <窗口标识>  指定操作的窗口(可选)
-  -method <查找方式>  指定窗口查找方式(可选,默认active)
-    支持以下方式:
-    - title     窗口标题(支持模糊匹配)
-    - class     窗口类名
-    - handle    窗口句柄
-    - process   进程名
-    - active    当前活动窗口(默认)
-    不指定时默认在整个桌面范围内查找
-  -background       后台操作模式，不激活窗口(可选)
-
-元素识别参数:
-  -value <标识值>    要查找的元素的值
-  -by <识别方式>     识别方式(可选,默认name)
-  支持以下方式:
-  - name         按名称查找
-  - class        按类名查找
-  - type         按控件类型查找
-  - automationid 按AutomationId查找
-
-操作类型及示例:
-1. inspect - 生成元素识别器
-  示例:
-    automation.exe -type inspect
-  说明:
-    运行后点击要识别的元素，将返回元素的详细信息和示例命令
-
-2. list - 列出所有元素
-   参数:
-    -filter <过滤文本>  按名称/类名/AutomationId过滤(可选)
-   示例:
-     automation.exe -window ""记事本"" -method title -type list
-     automation.exe -window ""记事本"" -method title -type list -filter ""按钮""
-
-3. find - 查找元素
-   参数:
-     -by <查找方式>     name/class/type/automationid
-     -value <查找值>    要查找的值
-     -scope <查找范围>  children/descendants/subtree等(可选,默认children)
-   示例:
-     automation.exe -window ""计算器"" -method title -type find -by name -value ""等于""
-     automation.exe -window ""记事本"" -method class -type find -by type -value ""button""
-
-4. getinfo - 获取元素信息
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-   示例:
-     automation.exe -type getinfo -value ""确定"" -by name
-     automation.exe -type getinfo -value ""button"" -by type
-
-5. click - 点击元素
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -pattern <模式>   invoke/toggle/expand等(可选,默认invoke)
-   示例:
-     automation.exe -type click -value ""确定"" -by name
-     automation.exe -type click -value ""button"" -by type -pattern toggle
-
-6. setvalue - 设置值
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -newvalue <新值>   要设置的值
-   示例:
-     automation.exe -type setvalue -value ""文本框"" -by name -newvalue ""新内容""
-
-7. getvalue - 获取值
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-   示例:
-     automation.exe -type getvalue -value ""文本框"" -by name
-
-8. select - 选择项目
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -item <项目>      要选择的项目
-   示例:
-     automation.exe -type select -value ""下拉框"" -by name -item ""选项1""
-
-9. expand - 展开/折叠
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -expand <true/false> 是否展开
-   示例:
-     automation.exe -type expand -value ""树节点"" -by name -expand true
-
-10. scroll - 滚动
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -direction <方向>  vertical/horizontal(可选,默认vertical)
-     -amount <数值>     滚动量(0-100)
-   示例:
-     automation.exe -type scroll -value ""列表"" -by name -direction vertical -amount 50
-
-11. wait - 等待元素
-   参数:
-     -value <标识值>    要查找的值
-     -by <识别方式>     识别方式(可选,默认name)
-     -timeout <超时>    超时时间(秒,默认30)
-   示例:
-     automation.exe -type wait -value ""登录"" -by name -timeout 60
-
-12. focus - 设置焦点
-    参数:
-      -value <标识值>    要查找的值
-      -by <识别方式>     识别方式(可选,默认name)
-    示例:
-      automation.exe -type focus -value ""输入框"" -by name
+    var element = AutomationElement.FromPoint(cursorPos.ToWindowsPoint());
+    if (element != null)
+    {
+      InspectElementInfo(element, cursorPos);
+      return;
+    }
+    throw new Exception("在指定坐标未找到元素");
+  }
 
-13. sendkeys - 发送按键
-    参数:
-      -value <标识值>    要查找的值
-      -by <识别方式>     识别方式(可选,默认name)
-      -keys <按键序列>   要发送的按键
-    示例:
-      automation.exe -type sendkeys -value ""输入框"" -by name -keys ""Hello World""
+  public static void Main(string[] args)
+  {
+    if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+    {
+      ShowHelp();
+      return;
+    }
 
-14. getchild - 获取子元素
-    参数:
-      -value <标识值>    要查找的值
-      -by <识别方式>     识别方式(可选,默认name)
-      -type <控件类型>   筛选类型(可选,默认all)
-    示例:
-      automation.exe -type getchild -value ""窗口"" -by name -type button
+    string type = GetArgumentValue(args, "-type");
+    if (string.IsNullOrEmpty(type))
+    {
+      Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+      return;
+    }
 
-15. getparent - 获取父元素
-    参数:
-      -value <标识值>    要查找的值
-      -by <识别方式>     识别方式(可选,默认name)
-    示例:
-      automation.exe -type getparent -value ""按钮"" -by name
+    try
+    {
+      switch (type.ToLower())
+      {
+        case "inspect":
+          string position = GetArgumentValue(args, "-position");
+          if (position != null)  // 参数存在（一定会有值，可能是空字符串）
+          {
+            InspectElementByPosition(position);
+          }
+          else  // 参数不存在
+          {
+            InspectElement(args);
+          }
+          break;
+
+        case "click":
+          ClickElement(GetTargetElement(args));
+          break;
+
+        case "setvalue":
+          string value = GetArgumentValue(args, "-value");
+          SetElementValue(GetTargetElement(args), value);
+          string sendenter = GetArgumentValue(args, "-sendenter");
+          if (sendenter != null)
+          {
+            System.Windows.Forms.SendKeys.SendWait("{ENTER}");
+          }
+          break;
+
+        case "getvalue":
+          GetElementValue(GetTargetElement(args));
+          break;
+
+        case "select":
+          string item = GetArgumentValue(args, "-item");
+          SelectItem(GetTargetElement(args), item);
+          break;
+
+        case "expand":
+          string expandStr = GetArgumentValue(args, "-expand");
+          bool expand = false;
+          if (!string.IsNullOrEmpty(expandStr))
+          {
+            expand = expandStr.ToLower() == "true";
+          }
+          ExpandElement(GetTargetElement(args), expand);
+          break;
+
+        case "scroll":
+          string direction = GetArgumentValue(args, "-direction");
+          if (string.IsNullOrEmpty(direction))
+          {
+            direction = "vertical";
+          }
+          string amountStr = GetArgumentValue(args, "-amount");
+          double amount = 0;
+          if (!string.IsNullOrEmpty(amountStr))
+          {
+            amount = double.Parse(amountStr);
+          }
+          ScrollElement(GetTargetElement(args), direction, amount);
+          break;
+
+        case "wait":
+          string timeoutStr = GetArgumentValue(args, "-timeout");
+          int timeout = 30;
+          if (!string.IsNullOrEmpty(timeoutStr))
+          {
+            timeout = int.Parse(timeoutStr);
+          }
+          WaitForElement(args, timeout);
+          break;
+
+        case "focus":
+          SetFocus(GetTargetElement(args));
+          break;
+
+        case "highlight":
+          string durationStr = GetArgumentValue(args, "-duration");
+          int duration = 2;
+          if (!string.IsNullOrEmpty(durationStr))
+          {
+            duration = int.Parse(durationStr);
+          }
+          HighlightElement(GetTargetElement(args), duration);
+          break;
+
+        case "sendkeys":
+          string keys = GetArgumentValue(args, "-keys");
+          SendKeys(GetTargetElement(args), keys);
+          break;
+
+        default:
+          throw new Exception(string.Format("不支持的操作类型: {0}", type));
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+      Environment.Exit(1);
+    }
+  }
+
+  private static AutomationElement GetTargetElement(string[] args)
+  {
+    // 获取起始窗口
+    AutomationElement root;
+    string windowArg = GetArgumentValue(args, "-window");
+    if (!string.IsNullOrEmpty(windowArg))
+    {
+      // 通过窗口句柄查找
+      int handle = int.Parse(windowArg);
+      root = AutomationElement.FromHandle(new IntPtr(handle));
+    }
+    else
+    {
+      // 使用当前活动窗口
+      IntPtr activeHandle = GetForegroundWindow();
+      root = AutomationElement.FromHandle(activeHandle);
+    }
 
-16. highlight - 高亮显示元素
-    参数:
-      -value <标识值>    要查找的值
-      -by <识别方式>     识别方式(可选,默认name)
-      -duration <时长>   显示时长(秒,默认2)
-    示例:
-      automation.exe -type highlight -value ""按钮"" -by name -duration 5
-
-支持的控件类型:
-- button      (按钮)
-- edit        (编辑框)
-- combobox    (下拉框)
-- checkbox    (复选框)
-- radiobutton (单选按钮)
-- listitem    (列表项)
-- treeitem    (树项)
-- menu        (菜单)
-- menuitem    (菜单项)
-- tab         (选项卡)
-- window      (窗口)
-
-注意事项:
-1. 元素ID在find或list操作后返回，需要保存以供后续操作使用
-2. list操作会返回元素的完整路径，便于定位
-3. 所有操作都支持-timeout参数指定超时时间
-4. sendkeys支持特殊按键，如{ENTER}, {TAB}, {F1}, ^c(Ctrl+C)等
-5. 高亮显示功能会创建一个半透明黄色窗口覆盖在目标元素上
-6. 部分操作可能因目标元素不支持相应模式而失败
-";
-        Console.WriteLine(help);
+    if (root == null)
+    {
+      throw new Exception("无法获取指定的窗口");
     }
 
-    private static string GetArgumentValue(string[] args, string key)
+    // 通过 XPath 查找（优先）
+    string xpath = GetArgumentValue(args, "-xpath");
+    if (!string.IsNullOrEmpty(xpath))
     {
-        for (int i = 0; i < args.Length - 1; i++)
-        {
-            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
-            {
-                return args[i + 1];
-            }
-        }
-        return null;
+      var element = FindElementByXPath(xpath, root);
+      if (element != null) return element;
+      throw new Exception(string.Format("找不到指定的XPath: {0}", xpath));
     }
 
-    private static AutomationElement GetElementByIdentifier(string[] args, string identifier, string by = null)
+    // 通过 AutomationId 查找
+    string id = GetArgumentValue(args, "-id");
+    if (!string.IsNullOrEmpty(id))
     {
-        // 如果提供了id，优先使用缓存
-        if (by == null && elementCache.ContainsKey(identifier))
-        {
-            return elementCache[identifier];
-        }
+      var element = root.FindFirst(TreeScope.Subtree,
+          new PropertyCondition(AutomationElement.AutomationIdProperty, id));
+      if (element != null) return element;
+      throw new Exception(string.Format("找不到指定的AutomationId: {0}", id));
+    }
 
-        // 否则根据识别方式查找元素
-        AutomationElement root = GetRootElement(args);
-        by = by ?? "name";  // 默认使用name
+    // 通过 Name 查找
+    string name = GetArgumentValue(args, "-name");
+    if (!string.IsNullOrEmpty(name))
+    {
+      var element = root.FindFirst(TreeScope.Subtree,
+          new PropertyCondition(AutomationElement.NameProperty, name));
+      if (element != null) return element;
+      throw new Exception(string.Format("找不到指定的Name: {0}", name));
+    }
 
-        Condition condition;
-        switch (by.ToLower())
+    // 通过组合条件查找
+    string condition = GetArgumentValue(args, "-condition");
+    if (!string.IsNullOrEmpty(condition))
+    {
+      var conditions = new List<Condition>();
+      string[] parts = condition.Split(';');
+      foreach (string part in parts)
+      {
+        string[] keyValue = part.Split('=');
+        if (keyValue.Length == 2)
         {
+          switch (keyValue[0].ToLower())
+          {
             case "name":
-                condition = new PropertyCondition(AutomationElement.NameProperty, identifier);
-                break;
+              conditions.Add(new PropertyCondition(AutomationElement.NameProperty, keyValue[1]));
+              break;
             case "class":
-                condition = new PropertyCondition(AutomationElement.ClassNameProperty, identifier);
-                break;
+              conditions.Add(new PropertyCondition(AutomationElement.ClassNameProperty, keyValue[1]));
+              break;
+            case "automation":
+              conditions.Add(new PropertyCondition(AutomationElement.AutomationIdProperty, keyValue[1]));
+              break;
             case "type":
-                // 根据控件类型名称获取对应的ControlType
-                ControlType controlType = null;
-                switch (identifier.ToLower())
-                {
-                    case "button":
-                        controlType = ControlType.Button;
-                        break;
-                    case "edit":
-                        controlType = ControlType.Edit;
-                        break;
-                    case "combobox":
-                        controlType = ControlType.ComboBox;
-                        break;
-                    case "checkbox":
-                        controlType = ControlType.CheckBox;
-                        break;
-                    case "radiobutton":
-                        controlType = ControlType.RadioButton;
-                        break;
-                    case "listitem":
-                        controlType = ControlType.ListItem;
-                        break;
-                    case "treeitem":
-                        controlType = ControlType.TreeItem;
-                        break;
-                    case "menu":
-                        controlType = ControlType.Menu;
-                        break;
-                    case "menuitem":
-                        controlType = ControlType.MenuItem;
-                        break;
-                    case "tab":
-                        controlType = ControlType.Tab;
-                        break;
-                    case "window":
-                        controlType = ControlType.Window;
-                        break;
-                    default:
-                        throw new Exception("不支持的控件类型: " + identifier);
-                }
-                condition = new PropertyCondition(AutomationElement.ControlTypeProperty, controlType);
-                break;
-            case "automationid":
-                condition = new PropertyCondition(AutomationElement.AutomationIdProperty, identifier);
-                break;
-            default:
-                throw new Exception("不支持的识别方式: " + by);
+              string controlTypeName = keyValue[1];
+              if (controlTypeName.StartsWith("ControlType."))
+              {
+                controlTypeName = controlTypeName.Substring("ControlType.".Length);
+              }
+              var field = typeof(ControlType).GetField(controlTypeName);
+              if (field != null)
+              {
+                ControlType controlType = (ControlType)field.GetValue(null);
+                conditions.Add(new PropertyCondition(AutomationElement.ControlTypeProperty, controlType));
+              }
+              break;
+          }
         }
+      }
 
-        var element = root.FindFirst(TreeScope.Subtree, condition);
-        if (element == null)
+      if (conditions.Count > 0)
+      {
+        Condition searchCondition;
+        if (conditions.Count > 1)
         {
-            throw new Exception(string.Format("找不到{0}为'{1}'的元素", by, identifier));
+          searchCondition = new AndCondition(conditions.ToArray());
         }
-
-        return element;
-    }
-
-    private static void GetElementInfo(string[] args)
-    {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var info = new Dictionary<string, object>();
-        info.Add("name", element.Current.Name);
-        info.Add("class", element.Current.ClassName);
-        info.Add("controlType", element.Current.ControlType.ProgrammaticName);
-        info.Add("controlClass", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-        info.Add("localizedType", element.Current.LocalizedControlType);
-        info.Add("automationId", element.Current.AutomationId);
-        info.Add("processId", element.Current.ProcessId);
-        info.Add("boundingRectangle", new
+        else
         {
-            x = element.Current.BoundingRectangle.X,
-            y = element.Current.BoundingRectangle.Y,
-            width = element.Current.BoundingRectangle.Width,
-            height = element.Current.BoundingRectangle.Height
-        });
-        info.Add("patterns", GetSupportedPatterns(element));
-
-        var serializer = new JavaScriptSerializer();
-        Console.Write(serializer.Serialize(info));
+          searchCondition = conditions[0];
+        }
+        var element = root.FindFirst(TreeScope.Subtree, searchCondition);
+        if (element != null) return element;
+        throw new Exception(string.Format("找不到符合条件的元素: {0}", condition));
+      }
     }
 
-    private static void ClickElement(string[] args)
-    {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        string pattern = GetArgumentValue(args, "-pattern") ?? "invoke";
-        bool background = HasArgument(args, "-background");
+    throw new Exception("必须指定元素的识别方式: -xpath, -id, -name 或 -condition");
+  }
 
-        var element = GetElementByIdentifier(args, identifier, by);
+  private static void ShowHelp()
+  {
+    string help = @"UI自动化工具
 
-        // 只在非后台操作时激活窗口
-        if (!background)
-        {
-            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
-            SetForegroundWindow(hwnd);
-            Thread.Sleep(50); // 等待窗口激活
-        }
+用法: automation.exe -type <操作类型> [参数]
+
+通用参数:
+-window <窗口句柄>  指定要操作的窗口，如果不指定则使用当前活动窗口
+
+操作类型:
+1. inspect - 检查元素
+   无需其他参数，点击要检查的元素即可
+
+2. click - 点击元素
+   -xpath <XPath路径> 或
+   -id <AutomationId> 或
+   -name <名称> 或
+   -condition ""name=xx;type=Button""
+
+3. setvalue - 设置值
+   -xpath <XPath路径> -value <新值>
+
+4. getvalue - 获取值
+   -xpath <XPath路径>
+
+5. select - 选择项目
+   -xpath <XPath路径> -item <项目名称>
+
+6. expand - 展开/折叠
+   -xpath <XPath路径> -expand <true/false>
+
+7. scroll - 滚动
+   -xpath <XPath路径> -direction <vertical/horizontal> -amount <0-100>
+
+8. wait - 等待元素
+   -xpath <XPath路径> -timeout <秒数>
+
+9. focus - 设置焦点
+   -xpath <XPath路径>
+
+10. highlight - 高亮显示
+    -xpath <XPath路径> -duration <秒数>
+
+11. sendkeys - 发送按键
+   -xpath <XPath路径> -keys <按键>
+    按键格式说明:
+    - 普通字符直接输入，如 ""abc""
+    - 特殊按键用 {} 包围，如 {ENTER}、{TAB}
+    - 组合键，如 ^c 表示 Ctrl+C
+    - 支持的特殊按键:
+      {BACKSPACE}, {BS}, {BKSP}  - 退格键
+      {BREAK}                    - Break键
+      {CAPSLOCK}                 - Caps Lock键
+      {DELETE}, {DEL}           - Delete键
+      {DOWN}                    - 向下键
+      {END}                     - End键
+      {ENTER}, {RETURN}        - Enter键
+      {ESC}                     - Esc键
+      {HELP}                    - Help键
+      {HOME}                    - Home键
+      {INSERT}, {INS}          - Insert键
+      {LEFT}                    - 向左键
+      {NUMLOCK}                - Num Lock键
+      {PGDN}                   - Page Down键
+      {PGUP}                   - Page Up键
+      {PRTSC}                  - Print Screen键
+      {RIGHT}                  - 向右键
+      {SCROLLLOCK}             - Scroll Lock键
+      {TAB}                    - Tab键
+      {UP}                     - 向上键
+      {F1} - {F12}            - 功能键
+      {ADD}                    - 数字键盘加号键
+      {SUBTRACT}               - 数字键盘减号键
+      {MULTIPLY}               - 数字键盘乘号键
+      {DIVIDE}                 - 数字键盘除号键
+      {NUMPAD0} - {NUMPAD9}   - 数字键盘数字键
+
+    修饰键:
+      + (加号)     - SHIFT
+      ^ (脱字号)   - CTRL
+      % (百分号)   - ALT
 
-        switch (pattern.ToLower())
+    示例:
+      ""Hello""       - 输入 Hello
+      ""{ENTER}""     - 按 Enter 键
+      ""^c""          - 按 Ctrl+C
+      ""^{HOME}""     - 按 Ctrl+Home
+      ""%{F4}""       - 按 Alt+F4
+      ""+{TAB}""      - 按 Shift+Tab";
+
+    Console.WriteLine(help);
+  }
+
+  private static string GetArgumentValue(string[] args, string key, bool checkNextArg = true)
+  {
+    int index = Array.IndexOf(args, key);
+    if (index >= 0)
+    {
+      if (index < args.Length - 1)
+      {
+        // 如果需要检查下一个参数是否是参数名
+        if (checkNextArg && args[index + 1].StartsWith("-"))
         {
-            case "invoke":
-                var invokePattern = element.GetCurrentPattern(InvokePattern.Pattern) as InvokePattern;
-                if (invokePattern != null)
-                {
-                    invokePattern.Invoke();
-                    Console.WriteLine("成功执行点击操作");
-                    return;
-                }
-                break;
-
-            case "toggle":
-                var togglePattern = element.GetCurrentPattern(TogglePattern.Pattern) as TogglePattern;
-                if (togglePattern != null)
-                {
-                    togglePattern.Toggle();
-                    Console.WriteLine("成功执行切换操作");
-                    return;
-                }
-                break;
+          return "";  // 参数存在但没有值，返回空字符串
         }
-        throw new Exception("元素不支持指定的操作模式");
+        return args[index + 1];
+      }
+      return "";  // 参数存在但没有值，返回空字符串
     }
+    return null;  // 参数不存在
+  }
 
-    private static bool HasArgument(string[] args, string key)
+  private static void SetElementValue(AutomationElement element, string value)
+  {
+    if (string.IsNullOrEmpty(value))
     {
-        return args.Contains(key, StringComparer.OrdinalIgnoreCase);
+      throw new Exception("必须指定要设置的值");
     }
 
-    private static string[] GetSupportedPatterns(AutomationElement element)
+    try
     {
-        var patterns = new List<string>();
-        var supportedPatterns = element.GetSupportedPatterns();
-        foreach (var pattern in supportedPatterns)
-        {
-            patterns.Add(pattern.ProgrammaticName);
-        }
-        return patterns.ToArray();
+      var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+      if (valuePattern != null)
+      {
+        valuePattern.SetValue(value);
+        Console.WriteLine("true");
+        return;
+      }
+
+      throw new Exception("元素不支持设置值操作");
     }
-
-    private static void SetElementValue(string[] args, string newValue)
+    catch (Exception ex)
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        bool background = HasArgument(args, "-background");
-
-        var element = GetElementByIdentifier(args, identifier, by);
+      throw new Exception("设置值失败: " + ex.Message);
+    }
+  }
 
-        // 只在非后台操作时激活窗口
-        if (!background)
-        {
-            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
-            SetForegroundWindow(hwnd);
-            Thread.Sleep(50); // 等待窗口激活
-        }
+  private static void GetElementValue(AutomationElement element)
+  {
+    try
+    {
+      var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+      if (valuePattern != null)
+      {
+        Console.WriteLine(valuePattern.Current.Value);
+        return;
+      }
+
+      throw new Exception("元素不支持获取值操作");
+    }
+    catch (Exception ex)
+    {
+      throw new Exception("获取值失败: " + ex.Message);
+    }
+  }
 
-        // 尝试ValuePattern
-        var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
-        if (valuePattern != null)
-        {
-            valuePattern.SetValue(newValue);
-            Console.WriteLine("成功设置值");
-            return;
-        }
+  private static void SelectItem(AutomationElement element, string item)
+  {
+    if (string.IsNullOrEmpty(item))
+    {
+      throw new Exception("必须指定要选择的项目");
+    }
 
-        // 尝试TextPattern
-        var textPattern = element.GetCurrentPattern(TextPattern.Pattern) as TextPattern;
-        if (textPattern != null)
+    try
+    {
+      var selectionPattern = element.GetCurrentPattern(SelectionPattern.Pattern) as SelectionPattern;
+      if (selectionPattern != null)
+      {
+        var children = element.FindAll(TreeScope.Children, Condition.TrueCondition);
+        foreach (AutomationElement child in children)
         {
-            // 获取支持的文本选择单位
-            SupportedTextSelection supportedTextSelection = textPattern.SupportedTextSelection;
-            if (supportedTextSelection != SupportedTextSelection.None)
-            {
-                var documentRange = textPattern.DocumentRange;
-                // 选择所有文本
-                documentRange.Select();
-                // 替换文本
-                System.Windows.Forms.SendKeys.SendWait("^a"); // Ctrl+A 全选
-                System.Windows.Forms.SendKeys.SendWait(newValue);
-            }
-            else
+          if (child.Current.Name == item)
+          {
+            var selectionItemPattern = child.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+            if (selectionItemPattern != null)
             {
-                throw new Exception("元素不支持文本选择");
+              selectionItemPattern.Select();
+              Console.WriteLine("true");
+              return;
             }
-            Console.WriteLine("成功设置文本");
-            return;
+          }
         }
+        throw new Exception("找不到指定的项目: " + item);
+      }
 
-        throw new Exception("元素不支持设置值操作");
+      throw new Exception("元素不支持选择操作");
     }
-
-    private static void GetElementValue(string[] args)
+    catch (Exception ex)
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        string value = null;
+      throw new Exception("选择操作失败: " + ex.Message);
+    }
+  }
 
-        // 尝试ValuePattern
-        var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
-        if (valuePattern != null)
-        {
-            value = valuePattern.Current.Value;
-        }
-        // 尝试TextPattern
+  private static void ExpandElement(AutomationElement element, bool expand)
+  {
+    try
+    {
+      var expandCollapsePattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
+      if (expandCollapsePattern != null)
+      {
+        if (expand)
+          expandCollapsePattern.Expand();
         else
-        {
-            var textPattern = element.GetCurrentPattern(TextPattern.Pattern) as TextPattern;
-            if (textPattern != null)
-            {
-                value = textPattern.DocumentRange.GetText(int.MaxValue);
-            }
-        }
+          expandCollapsePattern.Collapse();
+        Console.WriteLine("true");
+        return;
+      }
 
-        if (value != null)
-        {
-            var result = new Dictionary<string, string>();
-            result.Add("value", value);
-            var serializer = new JavaScriptSerializer();
-            Console.Write(serializer.Serialize(result));
-            return;
-        }
-
-        throw new Exception("元素不支持获取值操作");
+      throw new Exception("元素不支持展开/折叠操作");
     }
-
-    private static void SelectItem(string[] args, string item)
+    catch (Exception ex)
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-
-        // 尝试SelectionItemPattern
-        var selectionItemPattern = element.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
-        if (selectionItemPattern != null)
-        {
-            selectionItemPattern.Select();
-            Console.WriteLine("成功选择项目");
-            return;
-        }
-
-        // 尝试ExpandCollapsePattern
-        var expandCollapsePattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
-        if (expandCollapsePattern != null)
-        {
-            // 如果是折叠状态，先展开
-            if (expandCollapsePattern.Current.ExpandCollapseState == ExpandCollapseState.Collapsed)
-            {
-                expandCollapsePattern.Expand();
-            }
-
-            // 查找并选择子项
-            Condition nameCondition = new PropertyCondition(AutomationElement.NameProperty, item);
-            AutomationElement child = element.FindFirst(TreeScope.Descendants, nameCondition);
-            if (child != null)
-            {
-                var childSelectionPattern = child.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
-                if (childSelectionPattern != null)
-                {
-                    childSelectionPattern.Select();
-                    Console.WriteLine("成功选择子项");
-                    return;
-                }
-            }
-        }
-
-        throw new Exception("元素不支持选择操作或未找到指定项目");
+      throw new Exception("展开/折叠操作失败: " + ex.Message);
     }
+  }
 
-    private static void ExpandElement(string[] args, bool expand)
+  private static void ScrollElement(AutomationElement element, string direction, double amount)
+  {
+    try
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var expandCollapsePattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
-
-        if (expandCollapsePattern != null)
-        {
-            if (expand)
-            {
-                expandCollapsePattern.Expand();
-                Console.WriteLine("成功展开元素");
-            }
-            else
-            {
-                expandCollapsePattern.Collapse();
-                Console.WriteLine("成功折叠元素");
-            }
-            return;
-        }
+      var scrollPattern = element.GetCurrentPattern(ScrollPattern.Pattern) as ScrollPattern;
+      if (scrollPattern != null)
+      {
+        if (direction.ToLower() == "horizontal")
+          scrollPattern.SetScrollPercent(amount, ScrollPattern.NoScroll);
+        else
+          scrollPattern.SetScrollPercent(ScrollPattern.NoScroll, amount);
+        Console.WriteLine("true");
+        return;
+      }
 
-        throw new Exception("元素不支持展开/折叠操作");
+      throw new Exception("元素不支持滚动操作");
+    }
+    catch (Exception ex)
+    {
+      throw new Exception("滚动操作失败: " + ex.Message);
     }
+  }
 
-    private static void ScrollElement(string[] args, string direction, double amount)
+  private static void WaitForElement(string[] args, int timeout)
+  {
+    DateTime endTime = DateTime.Now.AddSeconds(timeout);
+    while (DateTime.Now < endTime)
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var scrollPattern = element.GetCurrentPattern(ScrollPattern.Pattern) as ScrollPattern;
+      try
+      {
+        GetTargetElement(args);
+        Console.WriteLine("true");
+        return;
+      }
+      catch
+      {
+        Thread.Sleep(500);
+      }
+    }
+    throw new Exception("等待超时");
+  }
+
+  private static AutomationElement FindElementByXPath(string xpath, AutomationElement root)
+  {
+    string[] segments = xpath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+    AutomationElement current = root;
 
-        if (scrollPattern != null)
+    foreach (string segment in segments)
+    {
+      if (string.IsNullOrEmpty(segment)) continue;
+
+      // 解析控件类型和索引
+      string controlType = segment;
+      int index = 1;
+      string condition = "";
+
+      // 提取索引 [n]
+      int indexStart = segment.IndexOf('[');
+      if (indexStart > 0)
+      {
+        int indexEnd = segment.IndexOf(']', indexStart);
+        if (indexEnd > indexStart)
         {
-            if (direction.ToLower() == "horizontal")
-            {
-                scrollPattern.SetScrollPercent(amount, ScrollPattern.NoScroll);
-            }
-            else
+          controlType = segment.Substring(0, indexStart);
+          string indexStr = segment.Substring(indexStart + 1, indexEnd - indexStart - 1);
+
+          // 检查是否是属性条件
+          if (indexStr.StartsWith("@"))
+          {
+            condition = indexStr;
+          }
+          else
+          {
+            int parsedIndex;
+            if (int.TryParse(indexStr, out parsedIndex))
             {
-                scrollPattern.SetScrollPercent(ScrollPattern.NoScroll, amount);
+              index = parsedIndex;
             }
-            Console.WriteLine("成功执行滚动操作");
-            return;
+          }
         }
+      }
+
+      // 创建控件类型条件
+      List<Condition> conditions = new List<Condition>();
+      if (controlType.StartsWith("ControlType."))
+      {
+        controlType = controlType.Substring("ControlType.".Length);
+      }
+      var field = typeof(ControlType).GetField(controlType);
+      if (field != null)
+      {
+        ControlType type = (ControlType)field.GetValue(null);
+        conditions.Add(new PropertyCondition(AutomationElement.ControlTypeProperty, type));
+      }
+
+      // 添加属性条件
+      if (!string.IsNullOrEmpty(condition))
+      {
+        if (condition.StartsWith("@Name='"))
+        {
+          string name = condition.Substring("@Name='".Length).TrimEnd('\'');
+          conditions.Add(new PropertyCondition(AutomationElement.NameProperty, name));
+        }
+        else if (condition.StartsWith("@AutomationId='"))
+        {
+          string automationId = condition.Substring("@AutomationId='".Length).TrimEnd('\'');
+          conditions.Add(new PropertyCondition(AutomationElement.AutomationIdProperty, automationId));
+        }
+        else if (condition.StartsWith("@ClassName='"))
+        {
+          string className = condition.Substring("@ClassName='".Length).TrimEnd('\'');
+          conditions.Add(new PropertyCondition(AutomationElement.ClassNameProperty, className));
+        }
+      }
 
-        throw new Exception("元素不支持滚动操作");
+      // 查找元素
+      Condition finalCondition = conditions.Count > 1
+          ? new AndCondition(conditions.ToArray())
+          : conditions[0];
+
+      var elements = current.FindAll(TreeScope.Children, finalCondition);
+      if (elements.Count == 0) return null;
+
+      // 使用索引选择元素
+      if (index > elements.Count) return null;
+      current = elements[index - 1];  // 转换为0基索引
     }
 
-    private static void WaitForElement(string[] args, string by, string value, int timeout)
+    return current;
+  }
+
+  private static void SetFocus(AutomationElement element)
+  {
+    try
     {
-        DateTime endTime = DateTime.Now.AddSeconds(timeout);
-        while (DateTime.Now < endTime)
-        {
-            try
-            {
-                ListElements(args, value);
-                Console.WriteLine("成功找到元素");
-                return;
-            }
-            catch
-            {
-                Thread.Sleep(500);
-            }
-        }
-        throw new Exception("等待超时");
+      element.SetFocus();
+      Console.WriteLine("true");
     }
-
-    private static void FindElementByXPath(string xpath)
+    catch (Exception ex)
     {
-        // XPath查找的实现
-        throw new Exception("XPath查找暂未实现");
+      throw new Exception("设置焦点失败: " + ex.Message);
     }
+  }
 
-    private static void SetFocus(string[] args)
+  private static void HighlightElement(AutomationElement element, int duration)
+  {
+    var rect = element.Current.BoundingRectangle;
+    var highlightForm = new Form
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        try
-        {
-            element.SetFocus();
-            Console.WriteLine("成功设置焦点");
-        }
-        catch (Exception)
-        {
-            throw new Exception("无法设置焦点");
-        }
+      StartPosition = FormStartPosition.Manual,
+      Location = new System.Drawing.Point((int)rect.Left, (int)rect.Top),
+      Size = new System.Drawing.Size((int)rect.Width, (int)rect.Height),
+      BackColor = Color.Yellow,
+      Opacity = 0.3,
+      ShowInTaskbar = false,
+      FormBorderStyle = FormBorderStyle.None,
+      TopMost = true
+    };
+
+    try
+    {
+      highlightForm.Show();
+      Console.WriteLine("正在高亮显示元素");
+      Thread.Sleep(duration * 1000);
     }
-
-    private static void SendKeys(string[] args, string keys)
+    finally
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        bool background = HasArgument(args, "-background");
-
-        var element = GetElementByIdentifier(args, identifier, by);
-
-        // 只在非后台操作时激活窗口
-        if (!background)
+      highlightForm.Close();
+      highlightForm.Dispose();
+    }
+  }
+
+  private struct ElementHierarchyInfo
+  {
+    public string XPath;
+    public IntPtr WindowHandle;
+  }
+
+  // 获取元素的层次结构信息
+  private static ElementHierarchyInfo GetElementHierarchyInfo(AutomationElement element)
+  {
+    var path = new List<string>();
+    var current = element;
+    var walker = TreeWalker.ControlViewWalker;
+    IntPtr windowHandle = IntPtr.Zero;
+
+    // 循环直到找到根元素
+    while (current != null && current != AutomationElement.RootElement)
+    {
+      var parent = walker.GetParent(current);
+      // 是否是最后一个元素
+      bool isLastElement = (parent == AutomationElement.RootElement || parent == null);
+      // 是否是句柄不为0的窗口
+      bool isValidWindow = (current.Current.ControlType.Id == UIA_ControlTypeIds.Window && current.Current.NativeWindowHandle != 0);
+      // 是否是任务栏
+      bool isTaskbar = (current.Current.ClassName == "Shell_TrayWnd" ||
+                         current.Current.ClassName == "Shell_SecondaryTrayWnd");
+
+      // 如果是窗口/任务栏，或者是最后一个元素，获取其句柄
+      if (isValidWindow || isTaskbar || isLastElement)
+      {
+        windowHandle = new IntPtr(current.Current.NativeWindowHandle);
+        break;  // 获取到句柄后就停止遍历
+      }
+      else
+      {
+        // 获取同级元素中的索引
+        int index = 1;
+        var siblings = parent.FindAll(TreeScope.Children, new PropertyCondition(
+            AutomationElement.ControlTypeProperty, current.Current.ControlType));
+
+        foreach (AutomationElement sibling in siblings)
         {
-            var hwnd = new IntPtr(element.Current.NativeWindowHandle);
-            SetForegroundWindow(hwnd);
-            Thread.Sleep(50); // 等待窗口激活
+          if (sibling == current) break;
+          index++;
         }
 
-        if (string.IsNullOrEmpty(keys))
-        {
-            throw new Exception("必须指定要发送的按键");
-        }
+        // 构建路径段
+        string type = current.Current.ControlType.ProgrammaticName.Replace("ControlType.", "");
+        string pathSegment = type;
 
-        // 确保元素可以接收输入
-        if (!element.Current.IsKeyboardFocusable)
+        // 如果有多个同类型元素，添加索引
+        if (siblings.Count > 1)
         {
-            throw new Exception("元素不支持键盘输入");
+          pathSegment = string.Format("{0}[{1}]", type, index);
         }
 
-        element.SetFocus();
-        System.Windows.Forms.SendKeys.SendWait(keys);
-        Console.WriteLine("成功发送按键");
+        path.Insert(0, pathSegment);
+      }
+
+      current = parent;
     }
 
-    private static void GetChildElements(string[] args, string childType)
+    return new ElementHierarchyInfo
+    {
+      XPath = "/" + string.Join("/", path),
+      WindowHandle = windowHandle
+    };
+  }
+
+  private static void ClickElement(AutomationElement element)
+  {
+    if (element == null)
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var result = new List<Dictionary<string, string>>();
+      throw new Exception("未找到目标元素");
+    }
 
-        TreeScope scope = TreeScope.Children;
-        Condition condition = Condition.TrueCondition;
+    try
+    {
+      // 首先尝试使用 Invoke 模式（适用于按钮等）
+      object invokePattern;
+      if (element.TryGetCurrentPattern(InvokePattern.Pattern, out invokePattern))
+      {
+        ((InvokePattern)invokePattern).Invoke();
+        Console.WriteLine("true");
+        return;
+      }
+
+      // 尝试使用 SelectionItem 模式（适用于列表项、单选框等）
+      object selectionItemPattern;
+      if (element.TryGetCurrentPattern(SelectionItemPattern.Pattern, out selectionItemPattern))
+      {
+        ((SelectionItemPattern)selectionItemPattern).Select();
+        Console.WriteLine("true");
+        return;
+      }
+
+      // 尝试使用 Toggle 模式（适用于复选框等）
+      object togglePattern;
+      if (element.TryGetCurrentPattern(TogglePattern.Pattern, out togglePattern))
+      {
+        ((TogglePattern)togglePattern).Toggle();
+        Console.WriteLine("true");
+        return;
+      }
+
+      // 如果都不支持，尝试使用鼠标点击
+      try
+      {
+        // 激活元素
+        element.SetFocus();
 
-        // 根据类型筛选子元素
-        if (childType != "all")
-        {
-            // 根据控件类型名称获取对应的ControlType
-            ControlType controlType = null;
-            switch (childType.ToLower())
-            {
-                case "button":
-                    controlType = ControlType.Button;
-                    break;
-                case "edit":
-                    controlType = ControlType.Edit;
-                    break;
-                case "combobox":
-                    controlType = ControlType.ComboBox;
-                    break;
-                case "checkbox":
-                    controlType = ControlType.CheckBox;
-                    break;
-                case "radiobutton":
-                    controlType = ControlType.RadioButton;
-                    break;
-                case "listitem":
-                    controlType = ControlType.ListItem;
-                    break;
-                case "treeitem":
-                    controlType = ControlType.TreeItem;
-                    break;
-                case "menu":
-                    controlType = ControlType.Menu;
-                    break;
-                case "menuitem":
-                    controlType = ControlType.MenuItem;
-                    break;
-                case "tab":
-                    controlType = ControlType.Tab;
-                    break;
-                case "window":
-                    controlType = ControlType.Window;
-                    break;
-                default:
-                    throw new Exception("不支持的控件类型: " + childType);
-            }
+        // 获取元素的中心点坐标
+        System.Windows.Point clickablePoint = element.GetClickablePoint();
 
-            if (controlType != null)
-            {
-                condition = new PropertyCondition(
-                    AutomationElement.ControlTypeProperty,
-                    controlType
-                );
-            }
-        }
-
-        var children = element.FindAll(scope, condition);
-        foreach (AutomationElement child in children)
+        // 转换为屏幕坐标
+        var rect = element.Current.BoundingRectangle;
+        if (rect.IsEmpty)
         {
-            var childInfo = new Dictionary<string, string>();
-            childInfo.Add("id", CacheElement(child));
-            childInfo.Add("name", child.Current.Name);
-            childInfo.Add("class", child.Current.ClassName);
-            childInfo.Add("controlType", child.Current.ControlType.ProgrammaticName);
-            childInfo.Add("type", child.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-            childInfo.Add("localizedType", child.Current.LocalizedControlType);
-            childInfo.Add("automationId", child.Current.AutomationId);
-            result.Add(childInfo);
+          throw new Exception("无法获取元素位置");
         }
 
-        var serializer = new JavaScriptSerializer();
-        Console.Write(serializer.Serialize(result));
+        // 保存当前鼠标位置
+        Point currentMousePosition;
+        GetCursorPos(out currentMousePosition);
+
+        // 使用 mouse_event 执行点击
+        int x = (int)clickablePoint.X;
+        int y = (int)clickablePoint.Y;
+
+        // 移动鼠标到目标位置
+        SetCursorPos(x, y);
+        Thread.Sleep(50);  // 短暂延迟确保鼠标移动到位
+
+        // 模拟鼠标点击
+        mouse_event(MOUSEEVENTF_LEFTDOWN, x, y, 0, 0);
+        Thread.Sleep(50);  // 短暂延迟模拟真实点击
+        mouse_event(MOUSEEVENTF_LEFTUP, x, y, 0, 0);
+
+        // 恢复鼠标位置
+        SetCursorPos(currentMousePosition.X, currentMousePosition.Y);
+        Console.WriteLine("true");
+      }
+      catch (Exception ex)
+      {
+        throw new Exception(string.Format("鼠标点击失败: {0}", ex.Message));
+      }
     }
+    catch (Exception ex)
+    {
+      throw new Exception(string.Format("点击操作失败: {0}", ex.Message));
+    }
+  }
 
-    private static void GetParentElement(string[] args)
+  private static void SendKeys(AutomationElement element, string keys)
+  {
+    if (string.IsNullOrEmpty(keys))
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var parent = TreeWalker.ControlViewWalker.GetParent(element);
+      throw new Exception("必须指定要发送的按键");
+    }
 
-        if (parent != null)
+    try
+    {
+      // 确保元素可以接收输入
+      if (!element.Current.IsKeyboardFocusable)
+      {
+        throw new Exception("元素不支持键盘输入");
+      }
+
+      element.SetFocus();
+      System.Windows.Forms.SendKeys.SendWait(keys);
+      Console.WriteLine("true");
+    }
+    catch (Exception ex)
+    {
+      throw new Exception("发送按键失败: " + ex.Message);
+    }
+  }
+
+  // 将 HandleKeyPress 方法移到类级别
+  private static void HandleKeyPress(object sender, KeyPressEventArgs e)
+  {
+    if (e.KeyChar == (char)27)  // ESC键
+    {
+      mouseTimer.Stop();
+      overlayForm.Close();
+      previewForm.Close();
+      Environment.Exit(0);
+    }
+    else if (e.KeyChar == 'c' || e.KeyChar == 'C')  // 添加复制功能
+    {
+      if (lastElement != null)
+      {
+        try
         {
-            var parentInfo = new Dictionary<string, string>();
-            parentInfo.Add("id", CacheElement(parent));
-            parentInfo.Add("name", parent.Current.Name);
-            parentInfo.Add("class", parent.Current.ClassName);
-            parentInfo.Add("controlType", parent.Current.ControlType.ProgrammaticName);
-            parentInfo.Add("type", parent.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-            parentInfo.Add("localizedType", parent.Current.LocalizedControlType);
-            parentInfo.Add("automationId", parent.Current.AutomationId);
-
-            var serializer = new JavaScriptSerializer();
-            Console.Write(serializer.Serialize(parentInfo));
+          Clipboard.SetText(lastElement.Current.Name);
         }
-        else
+        catch (Exception ex)
         {
-            throw new Exception("元素没有父元素");
+          Console.Error.WriteLine(string.Format("Error copying name: {0}", ex.Message));
         }
+      }
     }
-
-    private static void HighlightElement(string[] args, int duration)
+  }
+
+  // 元素检查器
+  private static void InspectElement(string[] args)
+  {
+    // 创建一个半透明遮罩窗口
+    overlayForm = new Form();
+    overlayForm.FormBorderStyle = FormBorderStyle.None;
+    overlayForm.StartPosition = FormStartPosition.Manual;
+    overlayForm.TopMost = true;
+    overlayForm.BackColor = Color.Blue;
+    overlayForm.Opacity = 0.15;
+    overlayForm.ShowInTaskbar = false;
+    overlayForm.KeyPreview = true;
+
+    // 设置窗口样式，确保能显示在任务栏上方
+    overlayForm.Load += (sender, e) =>
     {
-        string identifier = GetArgumentValue(args, "-value");
-        string by = GetArgumentValue(args, "-by");
-        var element = GetElementByIdentifier(args, identifier, by);
-        var rect = element.Current.BoundingRectangle;
-
-        // 创建一个半透明的高亮窗口
-        var highlightForm = new System.Windows.Forms.Form
-        {
-            StartPosition = System.Windows.Forms.FormStartPosition.Manual,
-            Location = new System.Drawing.Point((int)rect.Left, (int)rect.Top),
-            Size = new System.Drawing.Size((int)rect.Width, (int)rect.Height),
-            BackColor = System.Drawing.Color.Yellow,
-            Opacity = 0.3,
-            ShowInTaskbar = false,
-            FormBorderStyle = System.Windows.Forms.FormBorderStyle.None,
-            TopMost = true
-        };
-
-        highlightForm.Show();
-        Console.WriteLine("正在高亮显示元素");
-
-        // 等待指定时间后关闭高亮
-        Thread.Sleep(duration * 1000);
-        highlightForm.Close();
-        highlightForm.Dispose();
-    }
+      var hwnd = overlayForm.Handle;
+      var extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+      SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_LAYERED);
+    };
 
-    private static void ListElements(string[] args, string filter)
+    // 创建预览窗口
+    previewForm = new Form
+    {
+      FormBorderStyle = FormBorderStyle.None,
+      StartPosition = FormStartPosition.Manual,
+      BackColor = Color.FromArgb(40, 40, 40),
+      ShowInTaskbar = false,
+      TopMost = true,
+      Opacity = 0.9,
+      AutoSize = true,  // 添加自动尺寸
+      AutoSizeMode = AutoSizeMode.GrowAndShrink,  // 根据内容调整大小
+      KeyPreview = true
+    };
+
+    Label previewLabel = new Label
+    {
+      AutoSize = true,
+      Dock = DockStyle.None,
+      TextAlign = ContentAlignment.MiddleLeft,
+      Font = new Font("楷体", 9),
+      ForeColor = Color.White,
+      Padding = new Padding(5),
+      AutoEllipsis = true,
+      UseMnemonic = false,
+      MaximumSize = new System.Drawing.Size(600, 0)
+    };
+    previewForm.Controls.Add(previewLabel);
+
+    // 设置预览窗口样式
+    previewForm.Load += (sender, e) =>
+    {
+      var hwnd = previewForm.Handle;
+      var extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+      SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE | WS_EX_LAYERED);
+
+      // 确保窗口显示在最顶层
+      SetWindowPos(
+          hwnd,
+          new IntPtr(HWND_TOPMOST),
+          previewForm.Left,
+          previewForm.Top,
+          previewForm.Width,
+          previewForm.Height,
+          0x0040 // SWP_SHOWWINDOW
+      );
+    };
+
+    // 获取根元素
+    var rootElement = AutomationElement.RootElement;
+
+    completed = false;  // 使用静态字段
+    Rectangle lastRect = Rectangle.Empty;
+    lastElement = null;
+    Point lastCursorPos = new Point();
+    AutomationElement taskbarElement = null;
+    List<AutomationElement> taskbarChildren = null;
+
+    // 设置/取消窗口鼠标穿透的辅助方法
+    Action<bool> setMousePenetrate = (penetrate) =>
+    {
+      var hwnd = overlayForm.Handle;
+      var extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+      if (penetrate)
+      {
+        SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_TRANSPARENT);
+      }
+      else
+      {
+        SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle & ~WS_EX_TRANSPARENT);
+      }
+    };
+
+    // 更新遮罩层位置的辅助方法
+    Action<Rectangle> updateOverlayPosition = (rect) =>
     {
-        var root = GetRootElement(args);
-        var result = new List<Dictionary<string, string>>();
-        string window = GetArgumentValue(args, "-window");
-        string method = GetArgumentValue(args, "-method") ?? "active";
-        string by = GetArgumentValue(args, "-by") ?? "name";
-        string scope = GetArgumentValue(args, "-scope") ?? "children";
+      overlayForm.Location = new System.Drawing.Point(rect.Left, rect.Top);
+      overlayForm.Size = new System.Drawing.Size(rect.Width, rect.Height);
+      // 确保遮罩层始终在最顶层
+      SetWindowPos(
+          overlayForm.Handle,
+          new IntPtr(HWND_TOPMOST),
+          rect.Left,
+          rect.Top,
+          rect.Width,
+          rect.Height,
+          0x0040 // SWP_SHOWWINDOW
+      );
+      overlayForm.Refresh();
+    };
+
+    // 添加一个新的辅助方法来更新预览窗口位置
+    Action<int, int> updatePreviewPosition = (x, y) =>
+    {
+      // 确保预览窗口始终在最顶层
+      SetWindowPos(
+          previewForm.Handle,
+          new IntPtr(HWND_TOPMOST),
+          x,
+          y,
+          previewForm.Width,
+          previewForm.Height,
+          0x0040 // SWP_SHOWWINDOW
+      );
+      previewForm.Refresh();
+    };
+
+    // 创建一个定时器来处理鼠标位置检测
+    mouseTimer = new System.Windows.Forms.Timer();
+    mouseTimer.Interval = 100;
+    mouseTimer.Tick += (sender, e) =>
+    {
+      try
+      {
+        Point cursorPos;
+        GetCursorPos(out cursorPos);
 
-        // 确定搜索范围
-        TreeScope searchScope = TreeScope.Children;
-        switch (scope.ToLower())
+        if (cursorPos == lastCursorPos)
         {
-            case "descendants":
-                searchScope = TreeScope.Descendants;
-                break;
-            case "subtree":
-                searchScope = TreeScope.Subtree;
-                break;
+          return;
         }
+        lastCursorPos = cursorPos;
 
-        Condition searchCondition = Condition.TrueCondition;
+        setMousePenetrate(true);
 
-        // 如果指定了过滤条件，创建一个组合条件
-        if (!string.IsNullOrEmpty(filter))
-        {
-            // 尝试直接使用ControlType
-            if (filter.StartsWith("ControlType."))
-            {
-                string controlTypeName = filter.Substring("ControlType.".Length);
-                ControlType controlType = (ControlType)typeof(ControlType).GetField(controlTypeName).GetValue(null);
-                searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, controlType);
-            }
-            else
-            {
-                switch (by.ToLower())
-                {
-                    case "name":
-                        searchCondition = new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase);
-                        break;
-                    case "class":
-                        searchCondition = new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase);
-                        break;
-                    case "automation":
-                        searchCondition = new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase);
-                        break;
-                    case "xpath":
-                        // XPath暂不支持
-                        throw new Exception("XPath查找暂未实现");
-                    default:
-                        // 如果没有指定查找方式，则使用组合条件
-                        searchCondition = new OrCondition(
-                            new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase),
-                            new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase),
-                            new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase)
-                        );
-                        break;
-                }
-            }
-        }
+        // 获取鼠标位置的元素
+        var element = AutomationElement.FromPoint(cursorPos.ToWindowsPoint());
 
-        // 如果是按标题搜索，先找到所有匹配的窗口
-        if (method.ToLower() == "title" && !string.IsNullOrEmpty(window))
-        {
-            searchScope = TreeScope.Children;
-            var windows = root.FindAll(searchScope, Condition.TrueCondition);
-            foreach (AutomationElement win in windows)
-            {
-                if (win.Current.Name.Contains(window))
-                {
-                    // 对每个匹配的窗口进行处理
-                    var windowElements = win.FindAll(TreeScope.Subtree, searchCondition);
-                    foreach (AutomationElement element in windowElements)
-                    {
-                        var elementInfo = new Dictionary<string, string>();
-                        elementInfo.Add("id", CacheElement(element));
-                        elementInfo.Add("name", element.Current.Name);
-                        elementInfo.Add("class", element.Current.ClassName);
-                        elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
-                        elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-                        elementInfo.Add("localizedType", element.Current.LocalizedControlType);
-                        elementInfo.Add("automationId", element.Current.AutomationId);
-                        elementInfo.Add("path", GetElementPath(element));
-
-                        // 添加控件文本值
-                        try
-                        {
-                            var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
-                            if (valuePattern != null)
-                            {
-                                elementInfo.Add("value", valuePattern.Current.Value);
-                            }
-                        }
-                        catch { }
-
-                        result.Add(elementInfo);
-                    }
-                }
-            }
-        }
-        else
+        setMousePenetrate(false);
+
+        if (element != null && element != rootElement)
         {
-            // 其他查找方式保持原有逻辑
-            var elements = root.FindAll(searchScope, searchCondition);
-            foreach (AutomationElement element in elements)
+          // AutomationElement.FromPoint只能获得到任务栏
+          // 无法获得到任务栏的子元素，所以需要遍历
+          element = HandleTaskbarElement(
+              element,
+              cursorPos,
+              ref taskbarElement,
+              ref taskbarChildren
+          );
+
+          var elementBounds = element.Current.BoundingRectangle;
+          Rectangle elementRect = new Rectangle(
+              (int)elementBounds.Left,
+              (int)elementBounds.Top,
+              (int)elementBounds.Width,
+              (int)elementBounds.Height
+          );
+
+          bool elementChanged = lastElement == null ||
+          !element.Equals(lastElement) ||
+                              elementRect != lastRect;
+
+          if (elementChanged)
+          {
+            lastElement = element;
+            lastRect = elementRect;
+
+            // 获取元素后，显示遮罩层
+            if (!overlayForm.Visible)
             {
-                var elementInfo = new Dictionary<string, string>();
-                elementInfo.Add("id", CacheElement(element));
-                elementInfo.Add("name", element.Current.Name);
-                elementInfo.Add("class", element.Current.ClassName);
-                elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
-                elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-                elementInfo.Add("localizedType", element.Current.LocalizedControlType);
-                elementInfo.Add("automationId", element.Current.AutomationId);
-                elementInfo.Add("path", GetElementPath(element));
-
-                // 添加控件文本值
-                try
-                {
-                    var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
-                    if (valuePattern != null)
-                    {
-                        elementInfo.Add("value", valuePattern.Current.Value);
-                    }
-                }
-                catch { }
-
-                result.Add(elementInfo);
+              overlayForm.Show();
             }
-        }
+            updateOverlayPosition(elementRect);
 
-        var serializer = new JavaScriptSerializer();
-        Console.Write(serializer.Serialize(result));
-    }
+            // 计算预览窗口位置
+            int previewX = elementRect.Right + 10;
+            int previewY = elementRect.Top;
 
-    private static string GetElementPath(AutomationElement element)
-    {
-        var path = new List<string>();
-        var current = element;
-
-        while (current != null && current != AutomationElement.RootElement)
-        {
-            string name = current.Current.Name;
-            string type = current.Current.ControlType.ProgrammaticName;
-            string automationId = current.Current.AutomationId;
-            // 构建简单的路径段
-            string pathSegment = type;
-            if (!string.IsNullOrEmpty(automationId))
+            // 确保预览窗口不会超出屏幕
+            Screen screen = Screen.FromPoint(new System.Drawing.Point(previewX, previewY));
+            if (previewX + previewForm.Width > screen.Bounds.Right)
             {
-                pathSegment += string.Format("[@AutomationId='{0}']", automationId);
+              previewX = elementRect.Left - previewForm.Width - 10;
             }
-            else if (!string.IsNullOrEmpty(name))
+
+            if (previewY + previewForm.Height > screen.Bounds.Bottom)
             {
-                pathSegment += string.Format("[@Name='{0}']", name.Replace("'", "&apos;"));
+              previewY = screen.Bounds.Bottom - previewForm.Height;
             }
 
-            path.Insert(0, pathSegment);
-            current = TreeWalker.ControlViewWalker.GetParent(current);
+            updatePreviewPosition(previewX, previewY);
+          }
+          // 处理名称长度
+          string elementName = element.Current.Name;
+          if (elementName.Length > 50)
+          {
+            elementName = elementName.Substring(0, 47) + "...";
+          }
+          // 更新预览窗口内容
+          previewLabel.Text = string.Format(
+              "坐标: {0}, {1}\r\n" +
+              "名称: {2}\r\n" +
+              "大小: {3}x{4}\r\n" +
+              "类型: {5}\r\n" +
+              "C：复制名称，ESC：退出",
+              cursorPos.X,
+              cursorPos.Y,
+              elementName,
+              elementRect.Width,
+              elementRect.Height,
+              element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+          previewForm.Show();
         }
-
-        return "//" + string.Join("/", path);
-    }
-
-    private static string CacheElement(AutomationElement element)
+      }
+      catch (Exception ex)
+      {
+        Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+      }
+    };
+
+    overlayForm.MouseClick += (sender, e) =>
     {
-        string elementId = Guid.NewGuid().ToString();
-        elementCache[elementId] = element;
-        return elementId;
-    }
-
-    private static AutomationElement GetRootElement(string[] args)
-    {
-        string window = GetArgumentValue(args, "-window");
-        string method = GetArgumentValue(args, "-method") ?? "active";
+      if (e.Button == MouseButtons.Left && lastElement != null)
+      {
+        try
+        {
+          mouseTimer.Stop();
+          overlayForm.Hide();
+          previewForm.Hide();
 
-        // 如果是active方法，直接返回当前活动窗口
-        if (method.ToLower() == "active")
+          InspectElementInfo(lastElement, lastCursorPos);
+          completed = true;
+        }
+        catch (Exception ex)
         {
-            IntPtr activeHandle = GetForegroundWindow();
-            return AutomationElement.FromHandle(activeHandle);
+          Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
         }
-
-        // 其他方法需要检查window参数
-        if (string.IsNullOrEmpty(window))
+        finally
         {
-            return AutomationElement.RootElement;
+          overlayForm.Close();
+          previewForm.Close();
         }
+      }
+    };
 
-        switch (method.ToLower())
-        {
-            case "handle":
-                // 通过窗口句柄查找
-                int handle = int.Parse(window);
-                return AutomationElement.FromHandle(new IntPtr(handle));
+    // 添加按键事件处理
+    overlayForm.KeyPress += (sender, e) =>
+    {
+      HandleKeyPress(sender, e);
+    };
+    previewForm.KeyPress += (sender, e) =>
+    {
+      HandleKeyPress(sender, e);
+    };
 
-            case "class":
-                // 通过窗口类名查找
-                var classElements = AutomationElement.RootElement.FindAll(
-                    TreeScope.Children,
-                    new PropertyCondition(AutomationElement.ClassNameProperty, window)
-                );
-                if (classElements.Count > 0)
-                {
-                    return classElements[0];
-                }
-                break;
-
-            case "process":
-                // 通过进程名查找
-                var processes = System.Diagnostics.Process.GetProcessesByName(window);
-                if (processes.Length > 0)
-                {
-                    return AutomationElement.FromHandle(processes[0].MainWindowHandle);
-                }
-                break;
-
-            case "title":
-            default:
-                // 返回根元素，让调用方自己处理查找逻辑
-                return AutomationElement.RootElement;
-        }
+    // 在新线程中显示窗口
+    Thread thread = new Thread(() =>
+    {
+      mouseTimer.Start();
+      while (!completed)
+      {
+        Application.DoEvents();
+        Thread.Sleep(100);
+      }
+      mouseTimer.Stop();
+    });
+    thread.SetApartmentState(ApartmentState.STA);
+    thread.Start();
+    thread.Join();
+  }
+
+  private static Dictionary<string, object> GetWindowInfoFromHandle(IntPtr hwnd)
+  {
+    var windowInfo = new Dictionary<string, object>();
+    if (hwnd != IntPtr.Zero)
+    {
+      StringBuilder title = new StringBuilder(256);
+      StringBuilder className = new StringBuilder(256);
+      GetWindowText(hwnd, title, title.Capacity);
+      GetClassName(hwnd, className, className.Capacity);
+
+      // 获取窗口位置和大小
+      RECT rect = new RECT();
+      GetWindowRect(hwnd, ref rect);
+
+      windowInfo.Add("title", title.ToString());
+      windowInfo.Add("class", className.ToString());
+      windowInfo.Add("handle", hwnd.ToInt32());
+      windowInfo.Add("x", rect.Left);
+      windowInfo.Add("y", rect.Top);
+      windowInfo.Add("width", rect.Right - rect.Left);
+      windowInfo.Add("height", rect.Bottom - rect.Top);
+
+      // 获取进程信息
+      uint processId;
+      GetWindowThreadProcessId(hwnd, out processId);
+      try
+      {
+        var process = System.Diagnostics.Process.GetProcessById((int)processId);
+        windowInfo.Add("processName", process.ProcessName);
+        windowInfo.Add("processPath", process.MainModule.FileName);
+      }
+      catch { }
+    }
+    return windowInfo;
+  }
+
+  // 打印元素的完整信息
+  private static void InspectElementInfo(AutomationElement element, Point position)
+  {
+    var hierarchyInfo = GetElementHierarchyInfo(element);
+
+    Dictionary<string, object> result = new Dictionary<string, object>();
+    // 元素信息
+    Dictionary<string, object> elementInfo = new Dictionary<string, object>();
+    elementInfo.Add("name", element.Current.Name);
+    elementInfo.Add("class", element.Current.ClassName);
+    elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
+    elementInfo.Add("automationId", element.Current.AutomationId);
+    elementInfo.Add("xpath", hierarchyInfo.XPath);
+    elementInfo.Add("handle", element.Current.NativeWindowHandle);
+
+    // 添加元素位置和大小信息
+    var bounds = element.Current.BoundingRectangle;
+    elementInfo.Add("x", (int)bounds.Left);
+    elementInfo.Add("y", (int)bounds.Top);
+    elementInfo.Add("width", (int)bounds.Width);
+    elementInfo.Add("height", (int)bounds.Height);
+
+    // 添加控件文本值
+    try
+    {
+      var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
+      if (valuePattern != null)
+      {
+        elementInfo.Add("value", valuePattern.Current.Value);
+      }
+    }
+    catch { }
 
-        throw new Exception("找不到指定的窗口");
+    // 根据传入的坐标获取窗口信息
+    if (hierarchyInfo.WindowHandle != IntPtr.Zero)
+    {
+      var windowInfo = GetWindowInfoFromHandle(hierarchyInfo.WindowHandle);
+      foreach (var kvp in windowInfo)
+      {
+        result.Add(kvp.Key, kvp.Value);
+      }
     }
 
-    private static void InspectElement(string[] args)
-    {
-        // 创建一个半透明的全屏窗口来捕获鼠标事件
-        Form overlayForm = new Form();
-        overlayForm.FormBorderStyle = FormBorderStyle.None;
-        overlayForm.WindowState = FormWindowState.Maximized;
-        overlayForm.TopMost = true;
-        overlayForm.BackColor = Color.Black;
-        overlayForm.Opacity = 0.1;  // 设置为淡淡的蒙版效果
-        overlayForm.Cursor = Cursors.Cross;
-        overlayForm.ShowInTaskbar = false;
-
-        bool completed = false;
-
-        overlayForm.MouseClick += (sender, e) => {
-            if (e.Button == MouseButtons.Left) {
-                try {
-                    Point clickPosition;
-                    GetCursorPos(out clickPosition);
-
-                    // 先关闭覆盖窗口
-                    overlayForm.Hide();
-
-                    // 等待一小段时间确保窗口完全消失
-                    Thread.Sleep(100);
-
-                    // 获取点击位置的元素
-                    var element = AutomationElement.FromPoint(clickPosition.ToWindowsPoint());
-
-                    if (element != null && element != AutomationElement.RootElement) {
-                        InspectElementInfo(element);
-                        completed = true;
-                    }
-                }
-                catch (Exception ex) {
-                    Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
-                }
-                finally {
-                    overlayForm.Close();
-                }
-            }
-        };
+    // 将元素信息添加到结果中
+    result.Add("element", elementInfo);
 
-        overlayForm.KeyPress += (sender, e) => {
-            if (e.KeyChar == (char)27) { // ESC键
-                overlayForm.Close();
-                Environment.Exit(0); // 直接退出程序
-            }
-        };
-
-        // 在新线程中显示窗口
-        Thread thread = new Thread(() => {
-            overlayForm.Show();
-            while (!completed) {
-                Application.DoEvents();
-                Thread.Sleep(100);
-            }
+    // 添加坐标信息
+    result.Add("position", new Dictionary<string, int> {
+            { "x", position.X },
+            { "y", position.Y }
         });
-        thread.SetApartmentState(ApartmentState.STA);
-        thread.Start();
-        thread.Join();
-    }
 
-    private static void InspectElementInfo(AutomationElement element)
+    var serializer = new JavaScriptSerializer();
+    Console.Write(serializer.Serialize(result));
+  }
+
+  private static AutomationElement HandleTaskbarElement(AutomationElement element, Point cursorPos, ref AutomationElement taskbarElement, ref List<AutomationElement> taskbarChildren)
+  {
+    // 检查是否是任务栏元素
+    bool isTaskbarElement = element.Current.ClassName == "Shell_TrayWnd" ||
+                           element.Current.ClassName == "Shell_SecondaryTrayWnd";
+
+    // 如果是新的任务栏元素，获取其所有子元素
+    if (isTaskbarElement && element != taskbarElement)
     {
-        Dictionary<string, object> elementInfo = new Dictionary<string, object>();
+      taskbarElement = GetTaskbarElement();
+      if (taskbarElement != null)
+      {
+        taskbarChildren = GetTaskbarChildren(taskbarElement);
+      }
+    }
 
-        // 基本信息
-        elementInfo.Add("id", element.Current.AutomationId);
-        elementInfo.Add("name", element.Current.Name);
-        elementInfo.Add("class", element.Current.ClassName);
-        elementInfo.Add("controlType", element.Current.ControlType.ProgrammaticName);
-        elementInfo.Add("type", element.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""));
-        elementInfo.Add("localizedType", element.Current.LocalizedControlType);
-        elementInfo.Add("automationId", element.Current.AutomationId);
-        elementInfo.Add("path", GetElementPath(element));
-        elementInfo.Add("handle", element.Current.NativeWindowHandle);
+    // 如果是任务栏区域，在缓存的子元素中查找
+    if (isTaskbarElement && taskbarChildren != null && taskbarChildren.Count > 0)
+    {
+      var point = cursorPos.ToWindowsPoint();
+      AutomationElement bestMatch = null;
+      double minArea = double.MaxValue;
 
-        // 添加控件文本值
+      foreach (var child in taskbarChildren)
+      {
         try
         {
-            var valuePattern = element.GetCurrentPattern(ValuePattern.Pattern) as ValuePattern;
-            if (valuePattern != null)
+          var childRect = child.Cached.BoundingRectangle;
+          if (childRect.Contains(point))
+          {
+            double area = childRect.Width * childRect.Height;
+            if (area < minArea && area > 0)
             {
-                elementInfo.Add("value", valuePattern.Current.Value);
+              minArea = area;
+              bestMatch = child;
             }
+          }
         }
         catch { }
+      }
 
-        // 获取窗口信息
-        var walker = TreeWalker.ControlViewWalker;
-        var parent = element;
-        while (parent != null && parent != AutomationElement.RootElement && parent.Current.ControlType.Id != UIA_ControlTypeIds.Window)
-        {
-            parent = walker.GetParent(parent);
-        }
-
-        // 添加窗口详细信息
-        if (parent != null && parent != AutomationElement.RootElement)
-        {
-            var processId = parent.Current.ProcessId;
-            var process = System.Diagnostics.Process.GetProcessById(processId);
-            elementInfo.Add("window", new
-            {
-                title = parent.Current.Name,
-                @class = parent.Current.ClassName,
-                handle = parent.Current.NativeWindowHandle,
-                processName = process.ProcessName,
-                processId = processId,
-                processPath = process.MainModule.FileName
-            });
-        }
-
-        // 添加父元素信息
-        var immediateParent = walker.GetParent(element);
-        if (immediateParent != null && immediateParent != AutomationElement.RootElement)
-        {
-            elementInfo.Add("parent", new
-            {
-                handle = immediateParent.Current.NativeWindowHandle,
-                path = GetElementPath(immediateParent),
-                @class = immediateParent.Current.ClassName,
-                name = immediateParent.Current.Name,
-                controlType = immediateParent.Current.ControlType.ProgrammaticName,
-                type = immediateParent.Current.ControlType.ProgrammaticName.Replace("ControlType.", ""),
-                localizedType = immediateParent.Current.LocalizedControlType,
-                automationId = immediateParent.Current.AutomationId
-            });
-        }
-
-        // 位置信息
-        elementInfo.Add("location", new {
-            x = element.Current.BoundingRectangle.X,
-            y = element.Current.BoundingRectangle.Y,
-            width = element.Current.BoundingRectangle.Width,
-            height = element.Current.BoundingRectangle.Height
-        });
-
-        // 支持的模式
-        List<string> patterns = new List<string>();
-        foreach (AutomationPattern pattern in element.GetSupportedPatterns())
-        {
-            patterns.Add(pattern.ProgrammaticName);
-        }
-        elementInfo.Add("patterns", patterns);
-
-        // 输出 JSON
-        var serializer = new JavaScriptSerializer();
-        Console.Write(serializer.Serialize(elementInfo));
+      if (bestMatch != null)
+      {
+        return bestMatch;
+      }
     }
 
-    // 序列化为 JSON 字符串
-    private static string JsonSerialize(object obj)
-    {
-        if (obj == null) return "null";
-
-        if (obj is string)
-        {
-            return string.Format("\"{0}\"", ((string)obj).Replace("\"", "\\\""));
-        }
-
-        if (obj is bool)
-        {
-            return obj.ToString().ToLower();
-        }
-
-        if (obj is int || obj is long || obj is float || obj is double)
-        {
-            return obj.ToString();
-        }
-
-        if (obj is Dictionary<string, object>)
-        {
-            var dict = obj as Dictionary<string, object>;
-            var pairs = dict.Select(kvp => string.Format("\"{0}\": {1}", kvp.Key, JsonSerialize(kvp.Value)));
-            return string.Format("{{{0}}}", string.Join(", ", pairs));
-        }
+    return element;
+  }
 
-        if (obj is System.Collections.IEnumerable)
-        {
-            var items = ((System.Collections.IEnumerable)obj).Cast<object>().Select(item => JsonSerialize(item));
-            return string.Format("[{0}]", string.Join(", ", items));
-        }
-
-        return "null";
-    }
 }
diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 147e3616..41609140 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -113,15 +113,13 @@ const buildCsharpFeature = async (feature) => {
 
     fs.copyFile(srcCsPath, destCsPath, (err) => {
       if (err) return reject(err.toString());
-      child_process.exec(
-        `${cscPath} /nologo ${references}/out:"${exePath}" "${destCsPath}"`,
-        { encoding: null },
-        (err, stdout) => {
-          if (err) return reject(iconv.decode(stdout, "gbk"));
-          else resolve(iconv.decode(stdout, "gbk"));
-          fs.unlink(destCsPath, () => {});
-        }
-      );
+      const command = `${cscPath} /nologo ${references}/out:"${exePath}" "${destCsPath}"`;
+      console.log(command);
+      child_process.exec(command, { encoding: null }, (err, stdout) => {
+        if (err) return reject(iconv.decode(stdout, "gbk"));
+        else resolve(iconv.decode(stdout, "gbk"));
+        fs.unlink(destCsPath, () => {});
+      });
     });
   });
 };
@@ -181,6 +179,11 @@ const runCsharpFeature = async (feature, args = [], options = {}) => {
           encoding: null,
         },
         (err, stdout, stderr) => {
+          console.log({
+            err,
+            stdout: iconv.decode(stdout, "gbk"),
+            stderr: iconv.decode(stderr, "gbk"),
+          });
           if (err || Buffer.byteLength(stderr) > 0)
             reject(iconv.decode(stderr || stdout, "gbk"));
           else reslove(iconv.decode(stdout, "gbk"));
diff --git a/plugin/lib/csharp/sendmessage.cs b/plugin/lib/csharp/sendmessage.cs
index 61fb173c..66789cc9 100644
--- a/plugin/lib/csharp/sendmessage.cs
+++ b/plugin/lib/csharp/sendmessage.cs
@@ -62,16 +62,20 @@ public class AutomationTool
     [DllImport("user32.dll")]
     private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
 
-    private const uint WM_KEYDOWN = 0x0100;
-    private const uint WM_KEYUP = 0x0101;
-    private const uint WM_KEYPRESS = 0x0102;
-    private const uint WM_CHAR = 0x0102;
-    private const uint WM_SETTEXT = 0x000C;
-    private const uint WM_LBUTTONDOWN = 0x0201;
-    private const uint WM_LBUTTONUP = 0x0202;
-    private const uint WM_RBUTTONDOWN = 0x0204;
-    private const uint WM_RBUTTONUP = 0x0205;
-    private const uint WM_LBUTTONDBLCLK = 0x0203;
+    private const int WM_KEYDOWN = 0x0100;
+    private const int WM_KEYUP = 0x0101;
+    private const int WM_CHAR = 0x0102;
+    private const int WM_SETTEXT = 0x000C;
+    private const int WM_LBUTTONDOWN = 0x0201;
+    private const int WM_LBUTTONUP = 0x0202;
+    private const int WM_RBUTTONDOWN = 0x0204;
+    private const int WM_RBUTTONUP = 0x0205;
+    private const int WM_LBUTTONDBLCLK = 0x0203;
+
+    // 添加按键状态标志
+    private const int KEYEVENTF_KEYDOWN = 0x0;
+    private const int KEYEVENTF_EXTENDEDKEY = 0x1;
+    private const int KEYEVENTF_KEYUP = 0x2;
 
     private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
     private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
@@ -131,6 +135,11 @@ private struct TBBUTTON
 
     [DllImport("user32.dll")]
     private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
+
+    private const uint MAPVK_VK_TO_VSC = 0x00;
+    private const uint MAPVK_VSC_TO_VK = 0x01;
+    private const uint MAPVK_VK_TO_CHAR = 0x02;
+    private const uint MAPVK_VSC_TO_VK_EX = 0x03;
     #endregion
 
     public static void Main(string[] args)
@@ -460,20 +469,54 @@ private static void SendKeys(IntPtr hWnd, string keys)
             // 按下修饰键
             foreach (byte modifier in modifierKeys)
             {
-                PostMessage(hWnd, WM_KEYDOWN, modifier, 0);
+                // 获取扫描码
+                uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
+
+                // 构造 lParam
+                int lParamDown = 0x00000001 | // repeat count = 1
+                               ((int)scanCode << 16) | // scan code
+                               (0x1 << 24);  // extended key for modifiers
+
+                PostMessage(hWnd, WM_KEYDOWN, modifier, lParamDown);
+                Thread.Sleep(10); // 短暂延迟确保修饰键被正确识别
             }
 
-            // 发送主键字符
+            // 发送主键
             if (mainKey > 0)
             {
-                PostMessage(hWnd, WM_CHAR, mainKey, 0);
+                // 获取主键的扫描码
+                uint scanCode = MapVirtualKey((uint)mainKey, MAPVK_VK_TO_VSC);
+
+                // 构造主键的 lParam
+                int lParamDown = 0x00000001 | // repeat count = 1
+                               ((int)scanCode << 16); // scan code
+
+                int lParamUp = 0x00000001 | // repeat count = 1
+                              ((int)scanCode << 16) | // scan code
+                              (0xC0 << 24);  // key up + previous key state
+
+                // 发送按键按下
+                PostMessage(hWnd, WM_KEYDOWN, mainKey, lParamDown);
+                Thread.Sleep(10); // 短暂延迟
+
+                // 发送按键释放
+                PostMessage(hWnd, WM_KEYUP, mainKey, lParamUp);
+                Thread.Sleep(10); // 短暂延迟
             }
 
-            // 释放修饰键
+            // 释放修饰键（反序释放）
             for (int i = modifierKeys.Count - 1; i >= 0; i--)
             {
                 byte modifier = modifierKeys[i];
-                PostMessage(hWnd, WM_KEYUP, modifier, 0);
+                uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
+
+                // 构造释放修饰键的 lParam
+                int lParamUp = 0x00000001 | // repeat count = 1
+                              ((int)scanCode << 16) | // scan code
+                              (0xC1 << 24);  // extended key + key up + previous key state
+
+                PostMessage(hWnd, WM_KEYUP, modifier, lParamUp);
+                Thread.Sleep(10); // 短暂延迟
             }
 
             // 如果有多个按键组合，等待一下
@@ -484,58 +527,6 @@ private static void SendKeys(IntPtr hWnd, string keys)
         }
     }
 
-    private static bool IsSpecialKey(byte vKey)
-    {
-        switch (vKey)
-        {
-            // 修饰键
-            case 0xA0: // VK_LSHIFT
-            case 0xA2: // VK_LCONTROL
-            case 0xA4: // VK_LMENU
-            case 0x5B: // VK_LWIN
-            // 控制键
-            case 0x08: // VK_BACK
-            case 0x09: // VK_TAB
-            case 0x0D: // VK_RETURN
-            case 0x1B: // VK_ESCAPE
-            case 0x20: // VK_SPACE
-            case 0x2E: // VK_DELETE
-            // 方向键
-            case 0x25: // VK_LEFT
-            case 0x26: // VK_UP
-            case 0x27: // VK_RIGHT
-            case 0x28: // VK_DOWN
-            // 导航键
-            case 0x24: // VK_HOME
-            case 0x23: // VK_END
-            case 0x21: // VK_PRIOR (PageUp)
-            case 0x22: // VK_NEXT (PageDown)
-            case 0x2D: // VK_INSERT
-            // 功能键
-            case 0x70: // VK_F1
-            case 0x71: // VK_F2
-            case 0x72: // VK_F3
-            case 0x73: // VK_F4
-            case 0x74: // VK_F5
-            case 0x75: // VK_F6
-            case 0x76: // VK_F7
-            case 0x77: // VK_F8
-            case 0x78: // VK_F9
-            case 0x79: // VK_F10
-            case 0x7A: // VK_F11
-            case 0x7B: // VK_F12
-            // 其他常用键
-            case 0x14: // VK_CAPITAL
-            case 0x90: // VK_NUMLOCK
-            case 0x91: // VK_SCROLL
-            case 0x2C: // VK_SNAPSHOT
-            case 0x13: // VK_PAUSE
-                return true;
-            default:
-                return false;
-        }
-    }
-
     private static void SendText(IntPtr hWnd, string text)
     {
         StringBuilder sb = new StringBuilder(text);
@@ -554,56 +545,74 @@ private static string GetArgumentValue(string[] args, string key)
         return null;
     }
 
-    private static bool HasArgument(string[] args, string key)
-    {
-        return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
-    }
-
     private static byte GetVirtualKeyCode(string key)
     {
-        switch (key.ToLower())
-        {
-            case "ctrl":
-            case "^": return 0xA2;  // VK_LCONTROL
-            case "alt": return 0xA4;  // VK_LMENU
-            case "shift": return 0xA0;  // VK_LSHIFT
-            case "win": return 0x5B;    // VK_LWIN
-            case "enter": return 0x0D;
-            case "tab": return 0x09;
-            case "esc": return 0x1B;
-            case "space": return 0x20;
-            case "backspace": return 0x08;
-            case "delete": return 0x2E;
-            // 方向键
-            case "left": return 0x25;    // VK_LEFT
-            case "up": return 0x26;      // VK_UP
-            case "right": return 0x27;   // VK_RIGHT
-            case "down": return 0x28;    // VK_DOWN
-            // 导航键
-            case "home": return 0x24;    // VK_HOME
-            case "end": return 0x23;     // VK_END
-            case "pageup": return 0x21;  // VK_PRIOR
-            case "pagedown": return 0x22; // VK_NEXT
-            case "insert": return 0x2D;  // VK_INSERT
-            // 功能键
-            case "f1": return 0x70;      // VK_F1
-            case "f2": return 0x71;
-            case "f3": return 0x72;
-            case "f4": return 0x73;
-            case "f5": return 0x74;
-            case "f6": return 0x75;
-            case "f7": return 0x76;
-            case "f8": return 0x77;
-            case "f9": return 0x78;
-            case "f10": return 0x79;
-            case "f11": return 0x7A;
-            case "f12": return 0x7B;
-            // 其他常用键
-            case "capslock": return 0x14; // VK_CAPITAL
-            case "numlock": return 0x90;  // VK_NUMLOCK
-            case "scrolllock": return 0x91; // VK_SCROLL
-            case "printscreen": return 0x2C; // VK_SNAPSHOT
-            case "pause": return 0x13;    // VK_PAUSE
+        switch (key.ToUpper())
+        {
+            // 修饰键
+            case "CTRL":
+            case "^": return 0x11;    // VK_CONTROL
+            case "ALT":
+            case "%": return 0x12;    // VK_MENU
+            case "SHIFT": return 0x10;    // VK_SHIFT
+
+            // 特殊按键
+            case "{BACKSPACE}":
+            case "{BS}":
+            case "{BKSP}": return 0x08;  // VK_BACK
+            case "{BREAK}": return 0x03;  // VK_CANCEL
+            case "{CAPSLOCK}": return 0x14;  // VK_CAPITAL
+            case "{DELETE}":
+            case "{DEL}": return 0x2E;  // VK_DELETE
+            case "{DOWN}": return 0x28;  // VK_DOWN
+            case "{END}": return 0x23;  // VK_END
+            case "{ENTER}":
+            case "{RETURN}": return 0x0D;  // VK_RETURN
+            case "{ESC}": return 0x1B;  // VK_ESCAPE
+            case "{HELP}": return 0x2F;  // VK_HELP
+            case "{HOME}": return 0x24;  // VK_HOME
+            case "{INSERT}":
+            case "{INS}": return 0x2D;  // VK_INSERT
+            case "{LEFT}": return 0x25;  // VK_LEFT
+            case "{NUMLOCK}": return 0x90;  // VK_NUMLOCK
+            case "{PGDN}": return 0x22;  // VK_NEXT
+            case "{PGUP}": return 0x21;  // VK_PRIOR
+            case "{PRTSC}": return 0x2C;  // VK_SNAPSHOT
+            case "{RIGHT}": return 0x27;  // VK_RIGHT
+            case "{SCROLLLOCK}": return 0x91;  // VK_SCROLL
+            case "{TAB}": return 0x09;  // VK_TAB
+            case "{UP}": return 0x26;  // VK_UP
+
+            // 功能键 F1-F16
+            case "{F1}": return 0x70;
+            case "{F2}": return 0x71;
+            case "{F3}": return 0x72;
+            case "{F4}": return 0x73;
+            case "{F5}": return 0x74;
+            case "{F6}": return 0x75;
+            case "{F7}": return 0x76;
+            case "{F8}": return 0x77;
+            case "{F9}": return 0x78;
+            case "{F10}": return 0x79;
+            case "{F11}": return 0x7A;
+            case "{F12}": return 0x7B;
+
+            // 数字键盘
+            case "{ADD}": return 0x6B;  // VK_ADD
+            case "{SUBTRACT}": return 0x6D;  // VK_SUBTRACT
+            case "{MULTIPLY}": return 0x6A;  // VK_MULTIPLY
+            case "{DIVIDE}": return 0x6F;  // VK_DIVIDE
+            case "{NUMPAD0}": return 0x60;  // VK_NUMPAD0
+            case "{NUMPAD1}": return 0x61;
+            case "{NUMPAD2}": return 0x62;
+            case "{NUMPAD3}": return 0x63;
+            case "{NUMPAD4}": return 0x64;
+            case "{NUMPAD5}": return 0x65;
+            case "{NUMPAD6}": return 0x66;
+            case "{NUMPAD7}": return 0x67;
+            case "{NUMPAD8}": return 0x68;
+            case "{NUMPAD9}": return 0x69;
+
             default:
                 if (key.Length == 1)
                 {
diff --git a/plugin/lib/csharp/window.cs b/plugin/lib/csharp/window.cs
index c9402571..2bdf3dfe 100644
--- a/plugin/lib/csharp/window.cs
+++ b/plugin/lib/csharp/window.cs
@@ -316,13 +316,20 @@ private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
         GetWindowText(hwnd, title, title.Capacity);
         GetClassName(hwnd, className, className.Capacity);
 
+        // 获取窗口位置和大小
+        RECT rect = new RECT();
+        GetWindowRect(hwnd, out rect);
+
+        // 获取进程信息
         uint processId = 0;
         GetWindowThreadProcessId(hwnd, out processId);
         string processName = "";
+        string processPath = "";
         try
         {
             var process = Process.GetProcessById((int)processId);
             processName = process.ProcessName;
+            processPath = process.MainModule.FileName;
         }
         catch { }
 
@@ -331,7 +338,12 @@ private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
             { "handle", hwnd.ToInt64() },
             { "title", title.ToString() },
             { "class", className.ToString() },
-            { "process", processName }
+            { "x", rect.Left },
+            { "y", rect.Top },
+            { "width", rect.Right - rect.Left },
+            { "height", rect.Bottom - rect.Top },
+            { "processName", processName },
+            { "processPath", processPath }
         };
     }
 
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index 521dc526..2acb0279 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -1,168 +1,144 @@
 const { runCsharpFeature } = require("../../csharp");
 
 /**
- * 列出所有元素
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {object} options 选项
- * @param {string} options.filter 过滤条件
- * @returns {object[]} 元素列表
+ * 执行自动化操作
+ * @param {string} type - 操作类型, 可选值: "inspect"|"click"|"setvalue"|"getvalue"|"select"|"expand"|"scroll"|"wait"|"focus"|"highlight"
+ * @param {Object} params - 参数对象
+ * @param {string} params.by - 查找方式："xpath"|"id"|"name"|"condition"
+ * @param {string} params.searchValue - 搜索值
+ * @param {string} params.window - 窗口标题、句柄、进程名、类名
+ * @param {Object} params.options - 附加选项
+ * @returns {Promise<Object>} - 操作结果
  */
-const listElements = async function (method, window, options = {}) {
-  const { filter, scope } = options;
-  const args = ["-type", "list"];
+async function runAutomation(
+  type,
+  window = "",
+  by = "xpath",
+  searchValue = "",
+  params = {}
+) {
+  const args = [];
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (filter) args.push("-filter", filter);
-  if (scope) args.push("-scope", scope);
-  try {
-    const result = await runCsharpFeature("automation", args);
-    console.log(result);
-    if (result) return JSON.parse(result);
-  } catch (err) {
-    console.log(err);
+  if (window) {
+    args.push("-window", window);
   }
-  return [];
-};
 
-/**
- * 点击元素
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
- * @param {string} value 查找值
- * @param {object} options 选项
- * @param {string} options.pattern 点击模式："invoke"|"toggle"
- * @param {boolean} options.background 是否后台操作
- * @returns {Object} 操作结果
- * @property {boolean} success 是否成功
- * @property {Object} element 操作的元素信息
- * @property {Object} element.window 操作的元素所在的窗口信息
- */
-const clickElement = async function (method, window, by, value, options = {}) {
-  const { pattern = "invoke", background = false } = options;
-  const args = ["-type", "click", "-by", by, "-value", value];
+  args.push("-type", type);
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (pattern) args.push("-pattern", pattern);
-  if (background) args.push("-background");
-  let error;
-  try {
-    const result = await runCsharpFeature("automation", args);
-    if (result) {
-      return { success: true, element: JSON.parse(result) };
+  // 通用参数处理
+  if (type !== "inspect") {
+    switch (by) {
+      case "xpath":
+        args.push("-xpath", searchValue);
+        break;
+      case "id":
+        args.push("-id", searchValue);
+        break;
+      case "name":
+        args.push("-name", searchValue);
+        break;
+      case "condition":
+        args.push("-condition", searchValue);
+        break;
     }
-  } catch (err) {
-    error = err.toString();
   }
-  return { success: true, error };
-};
 
-/**
- * 设置元素值
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
- * @param {string} value 查找值
- * @param {string} newValue 要设置的值
- * @param {object} options 选项
- * @param {boolean} options.background 是否后台操作
- * @returns {Object} 操作结果
- * @property {boolean} success 是否成功
- * @property {Object} element 操作的元素信息
- * @property {Object} element.window 操作的元素所在的窗口信息
- */
-const setElementValue = async function (
-  method,
-  window,
-  by,
-  value,
-  newValue,
-  options = {}
-) {
-  const { background = false } = options;
-  const args = [
-    "-type",
-    "setvalue",
-    "-by",
-    by,
-    "-value",
-    value,
-    "-newvalue",
-    newValue,
-  ];
+  // 特定命令的参数处理
+  switch (type) {
+    case "inspect":
+      if (params) {
+        args.push("-position");
+        if (params.x && params.y) {
+          args.push(`${params.x},${params.y}`);
+        }
+      }
+      break;
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (background) args.push("-background");
-  let error;
-  try {
-    const result = await runCsharpFeature("automation", args);
-    if (result) return { success: true, element: JSON.parse(result) };
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-};
+    case "setvalue":
+      if (params.newValue !== undefined) {
+        args.push("-value", params.newValue);
+      }
+      if (params.sendenter) {
+        args.push("-sendenter");
+      }
+      break;
 
-/**
- * 获取元素值
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} by 查找方式："name"|"class"|"type"|"automationid"
- * @param {string} value 查找值
- * @param {object} options 选项
- * @param {boolean} options.background 是否后台操作
- * @returns {object} 元素值
- */
-const getElementValue = async function (
-  method,
-  window,
-  by,
-  value,
-  options = {}
-) {
-  const { background = false } = options;
-  const args = ["-type", "getvalue", "-by", by, "-value", value];
+    case "select":
+      if (params.item) {
+        args.push("-item", params.item);
+      }
+      break;
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (background) args.push("-background");
+    case "expand":
+      if (params.expand !== undefined) {
+        args.push("-expand", params.expand);
+      }
+      break;
 
-  let error;
-  try {
-    const result = await runCsharpFeature("automation", args);
-    if (result) return JSON.parse(result);
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-};
+    case "scroll":
+      if (params.direction) {
+        args.push("-direction", params.direction);
+      }
+      if (params.amount !== undefined) {
+        args.push("-amount", params.amount);
+      }
+      break;
 
-/**
- * 检查元素
- * @param {object} options 选项
- * @param {number} options.timeout 超时时间(秒)
- * @returns {object} 元素信息
- */
-const inspectElement = async function () {
-  const args = ["-type", "inspect"];
+    case "wait":
+      if (params.condition) {
+        args.push("-condition", params.condition);
+      }
+      if (params.timeout !== undefined) {
+        args.push("-timeout", params.timeout);
+      }
+      break;
+
+    case "highlight":
+      if (params.duration !== undefined) {
+        args.push("-duration", params.duration);
+      }
+      break;
 
+    case "sendkeys":
+      if (params.keys) {
+        args.push("-keys", params.keys);
+      }
+      break;
+  }
+
+  let error;
   try {
     const result = await runCsharpFeature("automation", args);
-    if (result) return JSON.parse(result);
+    if (result) {
+      const resultStr = result.toString().trim();
+      if (type === "inspect") return JSON.parse(resultStr);
+      if (resultStr === "true") return { success: true };
+      try {
+        return { success: true, data: JSON.parse(resultStr) };
+      } catch (err) {
+        return { success: true, data: resultStr };
+      }
+    }
   } catch (err) {
-    console.log(err);
+    error = err.toString().trim();
   }
-  return [];
-};
+
+  if (type === "inspect") return { error };
+  return { success: false, error };
+}
 
 module.exports = {
-  listElements,
-  clickElement,
-  setElementValue,
-  getElementValue,
-  inspectElement,
+  inspect: () => runAutomation("inspect"),
+  inspectPosition: (position) =>
+    runAutomation("inspect", null, null, null, position || {}),
+  click: (...args) => runAutomation("click", ...args),
+  setvalue: (...args) => runAutomation("setvalue", ...args),
+  getvalue: (...args) => runAutomation("getvalue", ...args),
+  select: (...args) => runAutomation("select", ...args),
+  expand: (...args) => runAutomation("expand", ...args),
+  scroll: (...args) => runAutomation("scroll", ...args),
+  wait: (...args) => runAutomation("wait", ...args),
+  focus: (...args) => runAutomation("focus", ...args),
+  highlight: (...args) => runAutomation("highlight", ...args),
+  sendkeys: (...args) => runAutomation("sendkeys", ...args),
 };
diff --git a/plugin/lib/quickcomposer/windows/sendmessage.js b/plugin/lib/quickcomposer/windows/sendmessage.js
index 0b9bb448..a8288e40 100644
--- a/plugin/lib/quickcomposer/windows/sendmessage.js
+++ b/plugin/lib/quickcomposer/windows/sendmessage.js
@@ -1,140 +1,114 @@
 const { runCsharpFeature } = require("../../csharp");
 
 /**
- * 键盘操作
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} keys 键盘按键
- * @param {object} options 选项
- * @param {string} options.control 控件类名
- * @param {boolean} options.background 是否后台操作
- * @returns {Object} 操作结果
- * @property {boolean} success 是否成功
- * @property {Object} control 控件信息
- * @property {string} control.window 控件所在窗口的信息
+ * 执行消息发送操作
+ * @param {string} type - 操作类型, 可选值: "keyboard"|"mouse"|"inspect"
+ * @param {Object} params - 参数对象
+ * @param {string} params.method - 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} params.window - 窗口标题、句柄、进程名、类名
+ * @param {string} params.action - 动作类型，如 "keys"、"text"、"click" 等
+ * @param {string} params.value - 操作的值，如按键、文本等
+ * @param {Object} params.options - 附加选项
+ * @returns {Promise<Object>} - 操作结果
  */
-const sendKeys = async function (method, window, keys, options = {}) {
-  const { control, background = false } = options;
-  const args = ["-type", "keyboard", "-action", "keys", "-value", keys];
+async function runSendMessage(type, params = {}) {
+  const args = ["-type", type];
+  const { method = "active", window, action, value, options = {} } = params;
+  const { control, text, pos, filter, background = false } = options;
+
+  // 通用参数
   args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (control) args.push("-control", control);
-  args.push("-background", background.toString());
-  let error;
-  try {
-    const result = await runCsharpFeature("sendmessage", args);
-    if (result) {
-      return {
-        success: true,
-        control: JSON.parse(result),
-      };
-    }
-  } catch (err) {
-    error = err.toString();
+  if (method !== "active" && window) {
+    args.push("-window", window);
   }
-  return { success: false, error };
-};
 
-/**
- * 发送文本
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} text 文本
- * @param {object} options 选项
- * @param {string} options.control 控件类名
- * @param {boolean} options.background 是否后台操作
- * @returns {Object} 操作结果
- * @property {boolean} success 是否成功
- * @property {Object} control 控件信息
- * @property {string} control.window 控件所在窗口的信息
- */
-const sendText = async function (method, window, text, options = {}) {
-  const { control, background = false } = options;
-  const args = ["-type", "keyboard", "-action", "text", "-value", text];
+  // 特定命令的参数处理
+  switch (type) {
+    case "keyboard":
+      args.push("-action", action);
+      if (value) {
+        args.push("-value", value);
+      }
+      if (control) {
+        args.push("-control", control);
+      }
+      break;
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (control) args.push("-control", control);
-  args.push("-background", background.toString());
-  let error;
-  try {
-    const result = await runCsharpFeature("sendmessage", args);
-    if (result) {
-      return { success: true, control: JSON.parse(result) };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-};
+    case "mouse":
+      args.push("-action", action);
+      if (control) {
+        args.push("-control", control);
+      }
+      if (text) {
+        args.push("-text", text);
+      }
+      if (pos) {
+        args.push("-pos", pos);
+      }
+      break;
 
-/**
- * 鼠标点击
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {string} action 动作："click"|"doubleClick"|"rightClick"
- * @param {object} options 选项
- * @param {string} options.control 控件类名
- * @param {string} options.text 控件文本
- * @param {string} options.pos 点击位置：x,y
- * @param {boolean} options.background 是否后台操作
- * @returns {Object} 操作结果
- * @property {boolean} success 是否成功
- * @property {Object} control 控件信息
- * @property {string} control.window 控件所在窗口的信息
- */
-const click = async function (method, window, action = "click", options = {}) {
-  const { control, text, pos, background = false } = options;
-  const args = ["-type", "mouse", "-action", action];
+    case "inspect":
+      if (filter) {
+        args.push("-filter", filter);
+      }
+      break;
+  }
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (control) args.push("-control", control);
-  if (text) args.push("-text", text);
-  if (pos) args.push("-pos", pos);
+  // 后台操作参数
   args.push("-background", background.toString());
 
   let error;
   try {
     const result = await runCsharpFeature("sendmessage", args);
     if (result) {
-      return { success: true, control: JSON.parse(result) };
+      const jsonResult = JSON.parse(result);
+      if (type === "inspect") {
+        return jsonResult;
+      }
+      return { success: true, control: jsonResult };
     }
   } catch (err) {
-    error = err.toString();
+    error = err
+      .toString()
+      .replace(/^Error: /, "")
+      .trim();
   }
+
+  if (type === "inspect") return [];
   return { success: false, error };
-};
+}
 
-/**
- * 获取窗口控件树
- * @param {string} method 窗口类型："title"|"handle"|"process"|"class"|"active"
- * @param {string} window 窗口标题、句柄、进程名、类名
- * @param {object} options 选项
- * @param {string} options.filter 过滤条件
- * @param {boolean} options.background 是否后台操作
- * @returns {object} 控件树
- */
-const inspectWindow = async function (method, window, options = {}) {
-  const { filter, background = false } = options;
-  const args = ["-type", "inspect"];
+module.exports = {
+  sendKeys: (method, window, keys, options = {}) =>
+    runSendMessage("keyboard", {
+      method,
+      window,
+      action: "keys",
+      value: keys,
+      options,
+    }),
 
-  args.push("-method", method);
-  if (method !== "active" && window) args.push("-window", window);
-  if (filter) args.push("-filter", filter);
-  args.push("-background", background.toString());
-  try {
-    const result = await runCsharpFeature("sendmessage", args);
-    if (result) return JSON.parse(result);
-  } catch (error) {
-    console.log(error);
-  }
-  return [];
-};
+  sendText: (method, window, text, options = {}) =>
+    runSendMessage("keyboard", {
+      method,
+      window,
+      action: "text",
+      value: text,
+      options,
+    }),
 
-module.exports = {
-  sendKeys,
-  sendText,
-  click,
-  inspectWindow,
+  click: (method, window, action = "click", options = {}) =>
+    runSendMessage("mouse", {
+      method,
+      window,
+      action,
+      options,
+    }),
+
+  inspectWindow: (method, window, options = {}) =>
+    runSendMessage("inspect", {
+      method,
+      window,
+      options,
+    }),
 };
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
index 22b0f992..b2eca9a4 100644
--- a/plugin/lib/quickcomposer/windows/window.js
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -1,271 +1,98 @@
 const { runCsharpFeature } = require("../../csharp");
 
 /**
- * 窗口置顶，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被置顶的窗口信息
+ * 执行窗口操作
+ * @param {string} type - 操作类型, 可选值: "topmost"|"opacity"|"rect"|"state"|"close"|"focus"|"border"|"clickthrough"|"info"
+ * @param {Object} params - 参数对象
+ * @param {string} params.method - 查找方式："title"|"handle"|"process"|"class"|"active"
+ * @param {string} params.window - 窗口标题、句柄、进程名、类名
+ * @param {*} params.value - 操作的值，不同操作类型对应不同的值类型
+ * @returns {Promise<Object>} - 操作结果
  */
-async function setTopMost(method, value, isTopMost) {
-  const args = [
-    "-type",
-    "topmost",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    isTopMost.toString(),
-  ];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return {
-        success: true,
-        window: JSON.parse(windowInfo),
-      };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-}
+async function runWindow(type, params = {}) {
+  const args = ["-type", type];
+  const { method = "active", window, value } = params;
 
-/**
- * 设置窗口透明度，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {number} opacity 透明度 0-100
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置透明度的窗口信息
- */
-async function setOpacity(method, value, opacity) {
-  const args = [
-    "-type",
-    "opacity",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    opacity.toString(),
-  ];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
+  // 通用参数
+  args.push("-method", method);
+  if (window) {
+    args.push("-window", window);
   }
-  return { success: false, error };
-}
 
-/**
- * 设置窗口位置和大小，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {number} x X坐标
- * @param {number} y Y坐标
- * @param {number} width 宽度
- * @param {number} height 高度
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置位置和大小的窗口信息
- */
-async function setWindowRect(method, value, x, y, width, height) {
-  const args = [
-    "-type",
-    "rect",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    `${x},${y},${width},${height}`,
-  ];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-}
+  // 特定命令的参数处理
+  switch (type) {
+    case "topmost":
+    case "border":
+    case "clickthrough":
+      if (value !== undefined) {
+        args.push("-value", value.toString());
+      }
+      break;
 
-/**
- * 设置窗口状态，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {string} state 状态："normal"|"maximize"|"minimize"
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置状态的窗口信息
- */
-async function setWindowState(method, value, state) {
-  const args = [
-    "-type",
-    "state",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    state,
-  ];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-}
+    case "opacity":
+      if (value !== undefined) {
+        args.push("-value", value.toString());
+      }
+      break;
 
-/**
- * 关闭窗口，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被关闭的窗口信息
- */
-async function closeWindow(method, value) {
-  const args = ["-type", "close", "-method", method, "-window", value];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
-  return { success: false, error };
-}
+    case "rect":
+      if (value && typeof value === "object") {
+        const { x = 0, y = 0, width = 0, height = 0 } = value;
+        args.push("-value", `${x},${y},${width},${height}`);
+      }
+      break;
 
-/**
- * 设置窗口焦点，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置焦点的窗口信息
- */
-async function setFocus(method, value) {
-  const args = ["-type", "focus", "-method", method, "-window", value];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
+    case "state":
+      if (value) {
+        args.push("-value", value);
+      }
+      break;
   }
-  return { success: false, error };
-}
 
-/**
- * 设置窗口边框，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {boolean} hasBorder 是否显示边框
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置边框的窗口信息
- */
-async function setBorder(method, value, hasBorder) {
-  const args = [
-    "-type",
-    "border",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    hasBorder.toString(),
-  ];
   let error;
   try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
+    const result = await runCsharpFeature("window", args);
+    if (result) {
+      const jsonResult = JSON.parse(result);
+      if (type === "info") {
+        return jsonResult;
+      }
+      return { success: true, window: jsonResult };
     }
   } catch (err) {
-    error = err.toString();
+    error = err
+      .toString()
+      .replace(/^Error: /, "")
+      .trim();
+    console.log(error);
   }
-  return { success: false, error };
-}
 
-/**
- * 设置窗口点击穿透，只操作第一个找到的窗口
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @param {boolean} isTransparent 是否点击穿透
- * @param {Object} result 结果
- * @param {boolean} result.success 是否成功
- * @param {Object} result.window 被设置点击穿透的窗口信息
- */
-async function setClickThrough(method, value, isTransparent) {
-  const args = [
-    "-type",
-    "clickthrough",
-    "-method",
-    method,
-    "-window",
-    value,
-    "-value",
-    isTransparent.toString(),
-  ];
-  let error;
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) {
-      return { success: true, window: JSON.parse(windowInfo) };
-    }
-  } catch (err) {
-    error = err.toString();
-  }
+  if (type === "info") return [];
   return { success: false, error };
 }
 
-/**
- * 获取窗口信息，返回所有匹配的窗口信息
- * @param {string} method 查找方式："title"|"handle"|"process"|"class"|"active"
- * @param {string} value 窗口标题、句柄、进程名、类名
- * @returns {Object} 所有匹配的窗口信息
- */
-async function getWindowInfo(method, value) {
-  const args = ["-type", "info", "-method", method, "-window", value];
-  try {
-    const windowInfo = await runCsharpFeature("window", args);
-    if (windowInfo) return JSON.parse(windowInfo);
-  } catch (err) {
-    console.log(err);
-  }
-  return [];
-}
-
 module.exports = {
-  setTopMost,
-  setOpacity,
-  setWindowRect,
-  setWindowState,
-  closeWindow,
-  setFocus,
-  setBorder,
-  setClickThrough,
-  getWindowInfo,
+  setTopMost: (method, window, isTopMost) =>
+    runWindow("topmost", { method, window, value: isTopMost }),
+
+  setOpacity: (method, window, opacity) =>
+    runWindow("opacity", { method, window, value: opacity }),
+
+  setWindowRect: (method, window, x, y, width, height) =>
+    runWindow("rect", { method, window, value: { x, y, width, height } }),
+
+  setWindowState: (method, window, state) =>
+    runWindow("state", { method, window, value: state }),
+
+  closeWindow: (method, window) => runWindow("close", { method, window }),
+
+  setFocus: (method, window) => runWindow("focus", { method, window }),
+
+  setBorder: (method, window, hasBorder) =>
+    runWindow("border", { method, window, value: hasBorder }),
+
+  setClickThrough: (method, window, isTransparent) =>
+    runWindow("clickthrough", { method, window, value: isTransparent }),
+
+  getWindowInfo: (method, window) => runWindow("info", { method, window }),
 };
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index de8cf483..9fd9b8c1 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -329,7 +329,9 @@ export default defineComponent({
       if (this.options.multiSelect) {
         this.toggleSelectItem(option);
       } else {
-        const value = this.getItemValue(option);
+        const value = this.options.appendItem
+          ? `${this.inputValue}${this.getItemValue(option)}`
+          : this.getItemValue(option);
         this.$emit("update:modelValue", newVarInputVal("str", value));
       }
     },
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index f898aef7..0d6a1cc3 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager.js";
+
 const controlClass = [
   // 基础控件
   { value: "Button", label: "按钮 (Button)" },
@@ -45,6 +47,53 @@ const controlClass = [
   { value: "GroupBox", label: "分组框 (GroupBox)" },
 ];
 
+const sendKeys = [
+  // 特殊按键
+  { value: "{ENTER}", label: "回车键 (Enter)" },
+  { value: "{BACKSPACE}", label: "退格键 (Backspace)" },
+  { value: "{BREAK}", label: "Break键" },
+  { value: "{CAPSLOCK}", label: "大写锁定 (Caps Lock)" },
+  { value: "{DELETE}", label: "删除键 (Delete)" },
+  { value: "{END}", label: "End键" },
+  { value: "{ESC}", label: "ESC键" },
+  { value: "{HELP}", label: "帮助键" },
+  { value: "{HOME}", label: "Home键" },
+  { value: "{INSERT}", label: "插入键 (Insert)" },
+  { value: "{INS}", label: "插入键 (Ins)" },
+  { value: "{NUMLOCK}", label: "数字锁定键" },
+  { value: "{PGDN}", label: "下一页 (Page Down)" },
+  { value: "{PGUP}", label: "上一页 (Page Up)" },
+  { value: "{PRTSC}", label: "打印屏幕键" },
+  { value: "{SCROLLLOCK}", label: "滚动锁定键" },
+  { value: "{TAB}", label: "Tab键" },
+  { value: "{DOWN}", label: "向下键" },
+  { value: "{LEFT}", label: "向左键" },
+  { value: "{RIGHT}", label: "向右键" },
+  { value: "{UP}", label: "向上键" },
+  // 功能键
+  ...new Array(12).fill(0).map((_, index) => ({
+    value: `{F${index + 1}}`,
+    label: `F${index + 1}`,
+  })),
+  // 数字键盘
+  ...new Array(10).fill(0).map((_, index) => ({
+    value: `{NUMPAD${index}}`,
+    label: `小键盘 ${index}`,
+  })),
+  { value: "{ADD}", label: "小键盘加号" },
+  { value: "{SUBTRACT}", label: "小键盘减号" },
+  { value: "{MULTIPLY}", label: "小键盘乘号" },
+  { value: "{DIVIDE}", label: "小键盘除号" },
+];
+
+const modifierKeys = [
+  // 修饰键组合示例
+  { value: "^", label: "Ctrl" },
+  { value: "%", label: "Alt" },
+  { value: "+", label: "Shift" },
+  { value: "^c", label: "Ctrl+C" },
+];
+
 const registryPaths = [
   // 系统设置
   {
@@ -130,25 +179,100 @@ const searchWindowConfig = [
   },
 ];
 
+const searchElementConfig = [
+  {
+    label: "窗口句柄",
+    component: "VariableInput",
+    icon: "window",
+    width: 12,
+    placeholder: "留空则使用当前活动窗口",
+    defaultValue: newVarInputVal("str", ""),
+  },
+  {
+    label: "元素查找方式",
+    component: "q-select",
+    icon: "search",
+    width: 4,
+    options: [
+      { label: "XPath", value: "xpath" },
+      { label: "AutomationId", value: "id" },
+      { label: "Name", value: "name" },
+      { label: "组合条件", value: "condition" },
+    ],
+    defaultValue: "xpath",
+  },
+  {
+    label: "查找值",
+    component: "VariableInput",
+    icon: "account_tree",
+    width: 8,
+    placeholder: "XPath: /Pane[3]/Edit[2], 组合条件: name=按钮&type=Button",
+  },
+];
+
 export const windowsCommands = {
   label: "Win自动化",
   icon: "window",
   defaultOpened: false,
   commands: [
+    // 获取窗口
     {
       value: "quickcomposer.windows.window.getWindowInfo",
-      label: "窗口控制",
-      desc: "Windows窗口操作",
+      label: "搜索/选择窗口",
+      desc: "搜索/选择窗口",
       icon: "window",
-      config: searchWindowConfig,
+      isAsync: true,
+      config: [],
       subCommands: [
         {
+          config: searchWindowConfig,
           value: "quickcomposer.windows.window.getWindowInfo",
-          label: "窗口信息",
-          icon: "info",
+          label: "搜索窗口",
+          icon: "search",
           outputVariable: "windowInfo",
           saveOutput: true,
         },
+        {
+          value: "quickcomposer.windows.automation.inspect",
+          label: "手动选择窗口",
+          icon: "my_location",
+        },
+        {
+          value: "quickcomposer.windows.automation.inspectPosition",
+          label: "从坐标选择窗口",
+          icon: "location_on",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                x: {
+                  label: "X坐标",
+                  component: "NumberInput",
+                  icon: "arrow_right",
+                  placeholder: "留空使用当前鼠标位置",
+                  width: 6,
+                },
+                y: {
+                  label: "Y坐标",
+                  component: "NumberInput",
+                  icon: "arrow_drop_down",
+                  placeholder: "留空使用当前鼠标位置",
+                  width: 6,
+                },
+              },
+            },
+          ],
+        },
+      ],
+    },
+    // 窗口
+    {
+      value: "quickcomposer.windows.window.setTopMost",
+      label: "窗口控制",
+      desc: "Windows窗口操作",
+      icon: "window",
+      config: searchWindowConfig,
+      subCommands: [
         {
           value: "quickcomposer.windows.window.setTopMost",
           label: "窗口置顶",
@@ -293,9 +417,220 @@ export const windowsCommands = {
       ],
       isAsync: true,
     },
+    // automation
+    {
+      value: "quickcomposer.windows.automation.click",
+      label: "界面自动化",
+      desc: "Windows界面自动化操作",
+      icon: "smart_button",
+      isAsync: true,
+      config: searchElementConfig,
+      subCommands: [
+        {
+          value: "quickcomposer.windows.automation.click",
+          label: "点击元素",
+          icon: "mouse",
+        },
+        {
+          value: "quickcomposer.windows.automation.sendkeys",
+          label: "模拟键盘输入",
+          icon: "keyboard",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                keys: {
+                  label: "输入内容",
+                  component: "VariableInput",
+                  icon: "keyboard",
+                  width: 12,
+                  placeholder:
+                    "模拟键盘输入，支持按键、组合键、中文，如：ab中文^a{BACKSPACE}",
+                  options: {
+                    items: [...modifierKeys, ...sendKeys],
+                    appendItem: true,
+                  },
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.setvalue",
+          label: "设置值",
+          icon: "edit",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                newValue: {
+                  label: "新值",
+                  component: "VariableInput",
+                  icon: "edit",
+                  width: 9,
+                  placeholder: "要设置的新值",
+                },
+                sendenter: {
+                  label: "发送回车",
+                  component: "CheckButton",
+                  icon: "keyboard",
+                  width: 3,
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.getvalue",
+          label: "获取值",
+          icon: "content_paste",
+          outputVariable: "elementValue",
+        },
+        {
+          value: "quickcomposer.windows.automation.select",
+          label: "选择项目",
+          icon: "list",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                item: {
+                  label: "选择项",
+                  component: "VariableInput",
+                  icon: "check_box",
+                  width: 12,
+                  placeholder: "要选择的项目名称",
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.expand",
+          label: "展开/折叠",
+          icon: "unfold_more",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                expand: {
+                  label: "操作",
+                  component: "ButtonGroup",
+                  icon: "unfold_more",
+                  width: 12,
+                  options: [
+                    { label: "展开", value: "true" },
+                    { label: "折叠", value: "false" },
+                  ],
+                },
+              },
+              defaultValue: {
+                expand: "true",
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.scroll",
+          label: "滚动",
+          icon: "swap_vert",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                direction: {
+                  label: "方向",
+                  component: "ButtonGroup",
+                  icon: "swap_vert",
+                  width: 6,
+                  options: [
+                    { label: "垂直", value: "vertical" },
+                    { label: "水平", value: "horizontal" },
+                  ],
+                },
+                amount: {
+                  label: "位置",
+                  component: "NumberInput",
+                  icon: "straighten",
+                  width: 6,
+                  min: 0,
+                  max: 100,
+                  step: 10,
+                },
+              },
+              defaultValue: {
+                direction: "vertical",
+                amount: 0,
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.wait",
+          label: "等待元素",
+          icon: "hourglass_empty",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                condition: {
+                  label: "条件",
+                  component: "VariableInput",
+                  icon: "filter_alt",
+                  width: 8,
+                  placeholder: "name=xx;type=Button",
+                },
+                timeout: {
+                  label: "超时(秒)",
+                  component: "NumberInput",
+                  icon: "timer",
+                  width: 4,
+                  min: 1,
+                  max: 3600,
+                  step: 10,
+                },
+              },
+              defaultValue: {
+                timeout: 30,
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.windows.automation.focus",
+          label: "设置焦点",
+          icon: "center_focus_strong",
+        },
+        {
+          value: "quickcomposer.windows.automation.highlight",
+          label: "高亮显示",
+          icon: "highlight",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                duration: {
+                  label: "持续时间(秒)",
+                  component: "NumberInput",
+                  icon: "timer",
+                  width: 12,
+                  min: 1,
+                  max: 60,
+                  step: 5,
+                },
+              },
+              defaultValue: {
+                duration: 2,
+              },
+            },
+          ],
+        },
+      ],
+    },
+    // sendmessage
     {
       value: "quickcomposer.windows.sendmessage.inspectWindow",
-      label: "界面自动化(sendmessage)",
+      label: "界面自动化(后台)",
       desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,
@@ -446,7 +781,11 @@ export const windowsCommands = {
               component: "VariableInput",
               icon: "keyboard",
               width: 12,
-              placeholder: "按键组合，多个逗号隔开，如：ctrl+a,a,b",
+              placeholder: "多个逗号隔开，如：a,b,{ENTER}，不支持组合键",
+              options: {
+                items: sendKeys,
+                appendItem: true,
+              },
             },
             {
               key: "options",
@@ -478,6 +817,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 监控
     {
       value: "quickcomposer.windows.monitor.watchClipboard",
       label: "剪贴板/文件监控",
@@ -543,6 +883,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 进程
     {
       value: "quickcomposer.windows.process.listProcesses",
       label: "进程管理",
@@ -610,6 +951,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 注册表
     {
       value: "quickcomposer.windows.registry.listKeys",
       label: "注册表管理",
@@ -748,6 +1090,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 服务
     {
       value: "quickcomposer.windows.service.listServices",
       label: "服务管理",
@@ -794,6 +1137,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 软件
     {
       value: "quickcomposer.windows.software.listSoftware",
       label: "软件管理",
@@ -826,6 +1170,7 @@ export const windowsCommands = {
         },
       ],
     },
+    // 系统工具
     {
       value: "quickcomposer.windows.utils.setWallpaper",
       label: "系统工具",
@@ -1061,175 +1406,5 @@ export const windowsCommands = {
         },
       ],
     },
-    {
-      value: "quickcomposer.windows.automation.inspectElement",
-      label: "UI自动化",
-      desc: "Windows界面自动化操作",
-      icon: "smart_button",
-      isAsync: true,
-      config: [],
-      subCommands: [
-        {
-          value: "quickcomposer.windows.automation.inspectElement",
-          label: "检查元素",
-          icon: "search",
-        },
-        {
-          value: "quickcomposer.windows.automation.listElements",
-          label: "列出元素",
-          icon: "list",
-          config: [
-            ...searchWindowConfig,
-            {
-              component: "OptionEditor",
-              icon: "settings",
-              width: 12,
-              options: {
-                scope: {
-                  label: "范围",
-                  component: "q-select",
-                  icon: "account_tree",
-                  width: 3,
-                  options: [
-                    { label: "子元素", value: "children" },
-                    { label: "所有后代", value: "descendants" },
-                    { label: "整个子树", value: "subtree" },
-                  ],
-                },
-                filter: {
-                  label: "过滤条件",
-                  component: "VariableInput",
-                  icon: "filter_alt",
-                  width: 9,
-                  placeholder: "可选，按名称/类名/ControlType/AutomationId过滤",
-                },
-              },
-              defaultValue: {
-                scope: "children",
-              },
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.windows.automation.clickElement",
-          label: "点击元素",
-          icon: "mouse",
-          config: [
-            ...searchWindowConfig,
-            {
-              key: "by",
-              label: "元素查找方式",
-              component: "q-select",
-              icon: "search",
-              width: 3,
-              options: [
-                { label: "名称", value: "name" },
-                { label: "类名", value: "class" },
-                { label: "类型", value: "type" },
-                { label: "AutomationId", value: "automationid" },
-              ],
-              defaultValue: "name",
-            },
-            {
-              key: "value",
-              label: "查找值",
-              component: "VariableInput",
-              icon: "text_fields",
-              width: 9,
-              placeholder: "要点击的元素值",
-            },
-            {
-              key: "pattern",
-              label: "点击模式",
-              component: "ButtonGroup",
-              icon: "touch_app",
-              width: 12,
-              options: [
-                { label: "普通点击", value: "invoke" },
-                { label: "切换状态", value: "toggle" },
-              ],
-              defaultValue: "invoke",
-            },
-            {
-              key: "background",
-              label: "后台操作",
-              component: "CheckButton",
-              icon: "back_hand",
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.windows.automation.setElementValue",
-          label: "设置值",
-          icon: "edit",
-          config: [
-            ...searchWindowConfig,
-            {
-              key: "by",
-              label: "查找方式",
-              component: "q-select",
-              icon: "search",
-              width: 4,
-              options: [
-                { label: "名称", value: "name" },
-                { label: "类名", value: "class" },
-                { label: "类型", value: "type" },
-                { label: "AutomationId", value: "automationid" },
-              ],
-              defaultValue: "name",
-            },
-            {
-              key: "value",
-              label: "查找值",
-              component: "VariableInput",
-              icon: "text_fields",
-              width: 8,
-              placeholder: "要设置值的元素",
-            },
-            {
-              key: "newValue",
-              label: "新值",
-              component: "VariableInput",
-              icon: "edit",
-              width: 12,
-              placeholder: "要设置的新值",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.windows.automation.getElementValue",
-          label: "获取值",
-          icon: "content_paste",
-          outputVariable: "elementValue",
-          saveOutput: true,
-          config: [
-            ...searchWindowConfig,
-            {
-              key: "by",
-              label: "查找方式",
-              component: "q-select",
-              icon: "search",
-              width: 4,
-              options: [
-                { label: "名称", value: "name" },
-                { label: "类名", value: "class" },
-                { label: "类型", value: "type" },
-                { label: "AutomationId", value: "automationid" },
-              ],
-              defaultValue: "name",
-            },
-            {
-              key: "value",
-              label: "查找值",
-              component: "VariableInput",
-              icon: "text_fields",
-              width: 8,
-              placeholder: "要获取值的元素",
-            },
-          ],
-        },
-      ],
-    },
   ],
 };
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 9364d745..2c68019a 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -211,6 +211,20 @@ const isPathMatched = (path, patterns) => {
   return includeMatch && !excludeMatch;
 };
 
+/**
+ * 递归获取完整的成员访问路径
+ * @param {Object} node 节点
+ * @returns {string} 完整的成员访问路径
+ */
+const getMemberPath = (node) => {
+  if (node.type === "Identifier") {
+    return node.name;
+  } else if (node.type === "MemberExpression") {
+    return `${getMemberPath(node.object)}.${node.property.name}`;
+  }
+  return "";
+};
+
 /**
  * 解析函数调用字符串，返回函数名和参数
  * @param {string} functionStr 要解析的函数字符串
@@ -267,15 +281,6 @@ export const parseFunction = (functionStr, options = {}) => {
     // 处理函数名，支持成员方法调用
     let name;
     if (callExpression.callee.type === "MemberExpression") {
-      // 递归获取完整的成员访问路径
-      const getMemberPath = (node) => {
-        if (node.type === "Identifier") {
-          return node.name;
-        } else if (node.type === "MemberExpression") {
-          return `${getMemberPath(node.object)}.${node.property.name}`;
-        }
-        return "";
-      };
       name = getMemberPath(callExpression.callee);
     } else {
       name = callExpression.callee.name;
@@ -289,7 +294,6 @@ export const parseFunction = (functionStr, options = {}) => {
         currentPath &&
         options.variableFormatPaths?.length > 0 &&
         isPathMatched(currentPath, options.variableFormatPaths);
-
       switch (node.type) {
         case "StringLiteral":
           // 字符串字面量总是带引号的
@@ -349,7 +353,10 @@ export const parseFunction = (functionStr, options = {}) => {
           return processNode(node.value, currentPath);
         case "MemberExpression":
           // 处理成员表达式
-          return getMemberPath(node);
+          const memberPath = functionStr.slice(node.start, node.end);
+          return shouldUseVariableFormat
+            ? newVarInputVal("var", memberPath)
+            : getMemberPath(node);
         default:
           console.warn("Unhandled node type:", node.type);
           return null;

From 76f710323e353603a6f14f8d56e895d1dd3d7505 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 17 Jan 2025 21:22:21 +0800
Subject: [PATCH 064/332] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/fileCommands.js    |  2 +-
 src/js/composer/commands/index.js           | 27 +++++++++------------
 src/js/composer/commands/networkCommands.js |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index d4659f8a..bd43b78c 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -1,7 +1,7 @@
 export const fileCommands = {
   label: "文件操作",
   icon: "folder_open",
-  defaultOpened: true,
+  defaultOpened: false,
   commands: [
     {
       value: "quickcomposer.file.operation",
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 05fe3206..f2c510c0 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -18,34 +18,31 @@ import { windowsCommands } from "./windowsCommands";
 import { statusCommands } from "./statusCommands";
 import { macosCommands } from "./macosCommands";
 import { scriptCommands } from "./scriptCommands";
-let commands = [
+
+const platformCommands = {
+  win32: [windowsCommands],
+  darwin: [macosCommands],
+  linux: [],
+};
+
+export const commandCategories = [
   fileCommands,
   networkCommands,
   systemCommands,
-  statusCommands,
   audioCommands,
   imageCommands,
-  notifyCommands,
   utoolsCommands,
+  ...platformCommands[window.processPlatform],
   dataCommands,
   codingCommands,
   controlCommands,
   scriptCommands,
   uiCommands,
   simulateCommands,
+  statusCommands,
   mathCommands,
   userdataCommands,
   screenCommands,
+  notifyCommands,
+  otherCommands,
 ];
-
-if (window.utools.isWindows()) {
-  commands.push(windowsCommands);
-}
-
-if (window.utools.isMacOS()) {
-  commands.push(macosCommands);
-}
-
-commands.push(otherCommands);
-
-export const commandCategories = commands;
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index c26995ed..cec7c324 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -3,7 +3,7 @@ import { newVarInputVal } from "../varInputValManager";
 export const networkCommands = {
   label: "网络操作",
   icon: "language",
-  defaultOpened: true,
+  defaultOpened: false,
   commands: [
     {
       value: "utools.shellOpenExternal",

From 053e9793c3aaff8f0271f5ea82dee878be9e63f0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 01:14:40 +0800
Subject: [PATCH 065/332] =?UTF-8?q?=E5=AE=8C=E5=96=84UI=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E7=9A=84=E9=80=89=E6=8B=A9=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E3=80=81=E6=BB=9A=E5=8A=A8=E5=85=83=E7=B4=A0=E3=80=81=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E5=85=83=E7=B4=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/automation.cs               | 538 +++++++++++++-----
 plugin/lib/csharp/index.js                    |  50 +-
 .../lib/quickcomposer/windows/automation.js   |   7 +-
 src/js/composer/commands/windowsCommands.js   |   2 +-
 4 files changed, 428 insertions(+), 169 deletions(-)

diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
index 5ff9b965..175aa4d1 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/automation.cs
@@ -63,6 +63,9 @@ public System.Windows.Point ToWindowsPoint()
   [return: MarshalAs(UnmanagedType.Bool)]
   private static extern bool GetCursorPos(out Point lpPoint);
 
+  [DllImport("user32.dll")]
+  private static extern IntPtr WindowFromPoint(Point point);
+
   [DllImport("user32.dll")]
   static extern int GetWindowLong(IntPtr hwnd, int index);
 
@@ -335,7 +338,14 @@ private static AutomationElement GetTargetElement(string[] args)
     {
       // 通过窗口句柄查找
       int handle = int.Parse(windowArg);
-      root = AutomationElement.FromHandle(new IntPtr(handle));
+      try
+      {
+        root = AutomationElement.FromHandle(new IntPtr(handle));
+      }
+      catch
+      {
+        throw new Exception("无法获取指定的窗口");
+      }
     }
     else
     {
@@ -439,95 +449,175 @@ private static AutomationElement GetTargetElement(string[] args)
 
   private static void ShowHelp()
   {
-    string help = @"UI自动化工具
+    Console.WriteLine(@"UI自动化工具 v1.0
 
-用法: automation.exe -type <操作类型> [参数]
-
-通用参数:
--window <窗口句柄>  指定要操作的窗口，如果不指定则使用当前活动窗口
+用法: automation.exe <操作类型> [参数]
 
 操作类型:
+
 1. inspect - 检查元素
    无需其他参数，点击要检查的元素即可
 
-2. click - 点击元素
-   -xpath <XPath路径> 或
-   -id <AutomationId> 或
-   -name <名称> 或
-   -condition ""name=xx;type=Button""
+2. click - 点击指定元素
+   参数: -xpath <XPath路径> [-window <窗口句柄>]
+   适用控件: 所有可点击的控件，包括：
+   - Button (按钮)
+   - MenuItem (菜单项)
+   - TreeItem (树项)
+   - ListItem (列表项)
+   - TabItem (标签页)
+   - RadioButton (单选按钮)
+   - CheckBox (复选框)
+   示例:
+   - 点击按钮: -xpath ""//Button[@Name='确定']""
+   - 点击菜单项: -xpath ""//MenuBar/MenuItem[@Name='文件']/MenuItem[@Name='打开']""
+   - 点击树节点: -xpath ""//Tree/TreeItem[@Name='节点1']""
 
 3. setvalue - 设置值
-   -xpath <XPath路径> -value <新值>
+   参数: -xpath <XPath路径> -value <新值> [-window <窗口句柄>]
 
 4. getvalue - 获取值
-   -xpath <XPath路径>
-
-5. select - 选择项目
-   -xpath <XPath路径> -item <项目名称>
+   参数: -xpath <XPath路径> [-window <窗口句柄>]
+
+5. select - 选择指定项目
+   参数: -xpath <XPath路径> -item <项目名称> [-window <窗口句柄>]
+   适用控件及其特性:
+   - ComboBox (组合框)
+     * 自动展开下拉列表
+     * 支持选择 ListItem
+   - TreeView (树视图)
+     * 支持选择所有层级的 TreeItem
+     * 使用完整路径查找
+   - ListBox (列表框)
+     * 支持选择直接子项 ListItem
+   - DataGrid (数据网格)
+     * 支持选择 DataItem 和 ListItem
+   - Table (表格)
+     * 支持选择 DataItem 和 ListItem
+   - Tab (标签页)
+     * 支持选择直接子项 TabItem
+   - MenuBar/Menu (菜单)
+     * 支持选择所有层级的 MenuItem
+   - RadioButton (单选按钮)
+     * 直接选择匹配名称的按钮
+   - CheckBox (复选框)
+     * 直接选择匹配名称的复选框
+   示例:
+   - 选择下拉框选项: -xpath ""//ComboBox"" -item ""选项1""
+   - 选择树节点: -xpath ""//Tree"" -item ""父节点/子节点""
+   - 选择列表项: -xpath ""//List"" -item ""列表项1""
+   - 选择标签页: -xpath ""//Tab"" -item ""标签页2""
+   - 选择菜单项: -xpath ""//MenuBar"" -item ""文件""
+   - 选择单选按钮: -xpath ""//RadioButton[@Name='选项1']"" -item ""选项1""
 
 6. expand - 展开/折叠
-   -xpath <XPath路径> -expand <true/false>
+   参数: -xpath <XPath路径> -expand <true/false> [-window <窗口句柄>]
+   适用控件及其特性:
+   - TreeItem (树节点) 展开/折叠子节点
+   - ComboBox (组合框) 展开/折叠下拉列表
+   - Menu (菜单) 支持展开/折叠子菜单
+   - GroupBox (分组框) 展开/折叠内容区域
+   - Expander (展开器) 展开/折叠详细内容
+   示例:
+   - 展开树节点: -xpath ""//Tree/TreeItem[@Name='父节点']"" -expand true
+   - 折叠树节点: -xpath ""//Tree/TreeItem[@Name='父节点']"" -expand false
+   - 展开下拉框: -xpath ""//ComboBox"" -expand true
+   - 折叠下拉框: -xpath ""//ComboBox"" -expand false
+   - 展开菜单: -xpath ""//Menu/MenuItem[@Name='文件']"" -expand true
+   - 展开分组: -xpath ""//GroupBox[@Name='详细信息']"" -expand true
+   - 展开内容: -xpath ""//Expander"" -expand true
 
 7. scroll - 滚动
-   -xpath <XPath路径> -direction <vertical/horizontal> -amount <0-100>
+   参数: -xpath <XPath路径> -direction <vertical/horizontal> -amount <0-100> [-window <窗口句柄>]
+   适用控件及其特性:
+   - ScrollBar (滚动条)
+   - ListBox (列表框)
+   - ComboBox (组合框)
+   - DataGrid (数据网格)
+   - TreeView (树视图)
+   - TextBox (文本框)
+   - Document (文档)
+   示例:
+   - 垂直滚动列表到底部: -xpath ""//List"" -direction vertical -amount 100
+   - 水平滚动表格到中间: -xpath ""//DataGrid"" -direction horizontal -amount 50
+   - 垂直滚动文本框到顶部: -xpath ""//Edit"" -direction vertical -amount 0
+   - 水平滚动文档到最右: -xpath ""//Document"" -direction horizontal -amount 100
 
 8. wait - 等待元素
-   -xpath <XPath路径> -timeout <秒数>
+   参数: -xpath <XPath路径> -timeout <秒数> [-window <窗口句柄>]
 
 9. focus - 设置焦点
-   -xpath <XPath路径>
+   参数: -xpath <XPath路径> [-window <窗口句柄>]
 
 10. highlight - 高亮显示
-    -xpath <XPath路径> -duration <秒数>
+    参数: -xpath <XPath路径> -duration <秒数> [-window <窗口句柄>]
 
 11. sendkeys - 发送按键
-   -xpath <XPath路径> -keys <按键>
+    参数: -xpath <XPath路径> -keys <按键> [-window <窗口句柄>]
     按键格式说明:
     - 普通字符直接输入，如 ""abc""
-    - 特殊按键用 {} 包围，如 {ENTER}、{TAB}
-    - 组合键，如 ^c 表示 Ctrl+C
-    - 支持的特殊按键:
-      {BACKSPACE}, {BS}, {BKSP}  - 退格键
-      {BREAK}                    - Break键
-      {CAPSLOCK}                 - Caps Lock键
-      {DELETE}, {DEL}           - Delete键
-      {DOWN}                    - 向下键
-      {END}                     - End键
-      {ENTER}, {RETURN}        - Enter键
-      {ESC}                     - Esc键
-      {HELP}                    - Help键
-      {HOME}                    - Home键
-      {INSERT}, {INS}          - Insert键
-      {LEFT}                    - 向左键
-      {NUMLOCK}                - Num Lock键
-      {PGDN}                   - Page Down键
-      {PGUP}                   - Page Up键
-      {PRTSC}                  - Print Screen键
-      {RIGHT}                  - 向右键
-      {SCROLLLOCK}             - Scroll Lock键
-      {TAB}                    - Tab键
-      {UP}                     - 向上键
-      {F1} - {F12}            - 功能键
-      {ADD}                    - 数字键盘加号键
-      {SUBTRACT}               - 数字键盘减号键
-      {MULTIPLY}               - 数字键盘乘号键
-      {DIVIDE}                 - 数字键盘除号键
-      {NUMPAD0} - {NUMPAD9}   - 数字键盘数字键
+    - 特殊按键用 {} 包围，如 ""{ENTER}""、""{TAB}""
+    - 组合键，如 ""^c"" 表示 Ctrl+C
+    支持的特殊按键:
+    - {BACKSPACE}, {BS}, {BKSP} - 退格键
+    - {BREAK} - Break键
+    - {CAPSLOCK} - Caps Lock键
+    - {DELETE}, {DEL} - Delete键
+    - {DOWN} - 向下键
+    - {END} - End键
+    - {ENTER}, {RETURN} - Enter键
+    - {ESC} - Esc键
+    - {HELP} - Help键
+    - {HOME} - Home键
+    - {INSERT}, {INS} - Insert键
+    - {LEFT} - 向左键
+    - {NUMLOCK} - Num Lock键
+    - {PGDN} - Page Down键
+    - {PGUP} - Page Up键
+    - {PRTSC} - Print Screen键
+    - {RIGHT} - 向右键
+    - {SCROLLLOCK} - Scroll Lock键
+    - {TAB} - Tab键
+    - {UP} - 向上键
+    - {F1} - {F12} - 功能键
+    - {ADD} - 数字键盘加号键
+    - {SUBTRACT} - 数字键盘减号键
+    - {MULTIPLY} - 数字键盘乘号键
+    - {DIVIDE} - 数字键盘除号键
+    - {NUMPAD0} - {NUMPAD9} - 数字键盘数字键
 
     修饰键:
-      + (加号)     - SHIFT
-      ^ (脱字号)   - CTRL
-      % (百分号)   - ALT
+    + (加号) - SHIFT
+    ^ (脱字号) - CTRL
+    % (百分号) - ALT
 
     示例:
-      ""Hello""       - 输入 Hello
-      ""{ENTER}""     - 按 Enter 键
-      ""^c""          - 按 Ctrl+C
-      ""^{HOME}""     - 按 Ctrl+Home
-      ""%{F4}""       - 按 Alt+F4
-      ""+{TAB}""      - 按 Shift+Tab";
-
-    Console.WriteLine(help);
+    - 输入文本: -keys ""Hello""
+    - 按Enter键: -keys ""{ENTER}""
+    - 按Ctrl+C: -keys ""^c""
+    - 按Ctrl+Home: -keys ""^{HOME}""
+    - 按Alt+F4: -keys ""%{F4}""
+    - 按Shift+Tab: -keys ""+{TAB}""
+
+通用参数:
+-window <窗口句柄> 指定要操作的窗口，如果不指定则使用当前活动窗口
+
+元素定位方式:
+1. XPath定位（推荐）
+   -xpath <XPath路径>
+   示例: -xpath ""//Button[@Name='确定']""
+
+2. AutomationId定位
+   -id <AutomationId>
+   示例: -id ""btnOK""
+
+3. Name定位
+   -name <名称>
+   示例: -name ""确定""
+
+4. 组合条件定位
+   -condition ""name=xx;type=Button;class=xx;automation=xx""
+   示例: -condition ""name=确定;type=Button""");
   }
 
   private static string GetArgumentValue(string[] args, string key, bool checkNextArg = true)
@@ -600,34 +690,105 @@ private static void SelectItem(AutomationElement element, string item)
       throw new Exception("必须指定要选择的项目");
     }
 
-    try
+    // 根据控件类型使用不同的查找策略
+    TreeScope searchScope;
+    Condition searchCondition;
+
+    int controlTypeId = element.Current.ControlType.Id;
+
+    if (controlTypeId == ControlType.ComboBox.Id)
     {
-      var selectionPattern = element.GetCurrentPattern(SelectionPattern.Pattern) as SelectionPattern;
-      if (selectionPattern != null)
+      // ComboBox需要先展开
+      var expandPattern = element.GetCurrentPattern(ExpandCollapsePattern.Pattern) as ExpandCollapsePattern;
+      if (expandPattern != null)
       {
-        var children = element.FindAll(TreeScope.Children, Condition.TrueCondition);
-        foreach (AutomationElement child in children)
+        expandPattern.Expand();
+        System.Threading.Thread.Sleep(100);
+      }
+      searchScope = TreeScope.Descendants;
+      searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.ListItem);
+    }
+    else if (controlTypeId == ControlType.Tree.Id)
+    {
+      // TreeView查找所有TreeItem
+      searchScope = TreeScope.Descendants;
+      searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.TreeItem);
+    }
+    else if (controlTypeId == ControlType.List.Id || controlTypeId == ControlType.DataGrid.Id || controlTypeId == ControlType.Table.Id)
+    {
+      // ListBox, DataGrid, Table 查找直接子项
+      searchScope = TreeScope.Children;
+      searchCondition = new OrCondition(
+        new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.ListItem),
+        new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.DataItem)
+      );
+    }
+    else if (controlTypeId == ControlType.Tab.Id)
+    {
+      // Tab查找直接子项
+      searchScope = TreeScope.Children;
+      searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.TabItem);
+    }
+    else if (controlTypeId == ControlType.MenuBar.Id || controlTypeId == ControlType.Menu.Id)
+    {
+      // 菜单项查找
+      searchScope = TreeScope.Descendants;
+      searchCondition = new PropertyCondition(AutomationElement.ControlTypeProperty, ControlType.MenuItem);
+    }
+    else if (controlTypeId == ControlType.RadioButton.Id || controlTypeId == ControlType.CheckBox.Id)
+    {
+      // 单选框和复选框直接选择自身
+      if (element.Current.Name == item)
+      {
+        var selectionItemPattern = element.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+        if (selectionItemPattern != null)
         {
-          if (child.Current.Name == item)
-          {
-            var selectionItemPattern = child.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
-            if (selectionItemPattern != null)
-            {
-              selectionItemPattern.Select();
-              Console.WriteLine("true");
-              return;
-            }
-          }
+          selectionItemPattern.Select();
+          Console.WriteLine("true");
+          return;
         }
-        throw new Exception("找不到指定的项目: " + item);
       }
+      throw new Exception(string.Format("找不到指定的选项: {0}", item));
+    }
+    else
+    {
+      // 对于其他类型的控件，尝试直接使用SelectionPattern
+      var selectionPattern = element.GetCurrentPattern(SelectionPattern.Pattern) as SelectionPattern;
+      if (selectionPattern != null)
+      {
+        searchScope = TreeScope.Children;
+        searchCondition = Condition.TrueCondition;
+      }
+      else
+      {
+        throw new Exception("不支持的控件类型");
+      }
+    }
 
-      throw new Exception("元素不支持选择操作");
+    // 查找所有子项
+    var children = element.FindAll(searchScope, searchCondition);
+    if (children.Count == 0)
+    {
+      throw new Exception("未找到可选择的项目");
     }
-    catch (Exception ex)
+
+    // 遍历查找匹配项并选择
+    foreach (AutomationElement child in children)
     {
-      throw new Exception("选择操作失败: " + ex.Message);
+      if (child.Current.Name == item)
+      {
+        // 尝试使用SelectionItemPattern选择
+        var selectionItemPattern = child.GetCurrentPattern(SelectionItemPattern.Pattern) as SelectionItemPattern;
+        if (selectionItemPattern != null)
+        {
+          selectionItemPattern.Select();
+          Console.WriteLine("true");
+          return;
+        }
+      }
     }
+
+    throw new Exception(string.Format("找不到指定的项目: {0}", item));
   }
 
   private static void ExpandElement(AutomationElement element, bool expand)
@@ -655,24 +816,82 @@ private static void ExpandElement(AutomationElement element, bool expand)
 
   private static void ScrollElement(AutomationElement element, string direction, double amount)
   {
+    if (element == null)
+    {
+      throw new Exception("未找到目标元素");
+    }
+
     try
     {
-      var scrollPattern = element.GetCurrentPattern(ScrollPattern.Pattern) as ScrollPattern;
-      if (scrollPattern != null)
+      // 首先尝试使用 ScrollPattern
+      object scrollPattern;
+      if (element.TryGetCurrentPattern(ScrollPattern.Pattern, out scrollPattern))
       {
+        var scroll = scrollPattern as ScrollPattern;
         if (direction.ToLower() == "horizontal")
-          scrollPattern.SetScrollPercent(amount, ScrollPattern.NoScroll);
+        {
+          if (!scroll.Current.HorizontallyScrollable)
+          {
+            throw new Exception("元素不支持水平滚动");
+          }
+          scroll.SetScrollPercent(amount, ScrollPattern.NoScroll);
+        }
         else
-          scrollPattern.SetScrollPercent(ScrollPattern.NoScroll, amount);
+        {
+          if (!scroll.Current.VerticallyScrollable)
+          {
+            throw new Exception("元素不支持垂直滚动");
+          }
+          scroll.SetScrollPercent(ScrollPattern.NoScroll, amount);
+        }
+        Console.WriteLine("true");
+        return;
+      }
+
+      // 尝试使用 ScrollItemPattern
+      object scrollItemPattern;
+      if (element.TryGetCurrentPattern(ScrollItemPattern.Pattern, out scrollItemPattern))
+      {
+        var scrollItem = scrollItemPattern as ScrollItemPattern;
+        scrollItem.ScrollIntoView();
         Console.WriteLine("true");
         return;
       }
 
+      // 检查是否有滚动条子元素
+      var scrollBars = element.FindAll(TreeScope.Children, new PropertyCondition(
+          AutomationElement.ControlTypeProperty, ControlType.ScrollBar));
+
+      if (scrollBars.Count > 0)
+      {
+        foreach (AutomationElement scrollBar in scrollBars)
+        {
+          // 获取滚动条的方向
+          bool isHorizontal = scrollBar.Current.BoundingRectangle.Width > scrollBar.Current.BoundingRectangle.Height;
+
+          if ((direction.ToLower() == "horizontal" && isHorizontal) ||
+              (direction.ToLower() == "vertical" && !isHorizontal))
+          {
+            // 使用 RangeValuePattern 设置滚动条的值
+            var rangeValuePattern = scrollBar.GetCurrentPattern(RangeValuePattern.Pattern) as RangeValuePattern;
+            if (rangeValuePattern != null)
+            {
+              double maxValue = rangeValuePattern.Current.Maximum;
+              double minValue = rangeValuePattern.Current.Minimum;
+              double targetValue = minValue + ((maxValue - minValue) * amount / 100);
+              rangeValuePattern.SetValue(targetValue);
+              Console.WriteLine("true");
+              return;
+            }
+          }
+        }
+      }
+
       throw new Exception("元素不支持滚动操作");
     }
     catch (Exception ex)
     {
-      throw new Exception("滚动操作失败: " + ex.Message);
+      throw new Exception(string.Format("滚动操作失败: {0}", ex.Message));
     }
   }
 
@@ -842,48 +1061,63 @@ private static ElementHierarchyInfo GetElementHierarchyInfo(AutomationElement el
     // 循环直到找到根元素
     while (current != null && current != AutomationElement.RootElement)
     {
-      var parent = walker.GetParent(current);
-      // 是否是最后一个元素
-      bool isLastElement = (parent == AutomationElement.RootElement || parent == null);
-      // 是否是句柄不为0的窗口
-      bool isValidWindow = (current.Current.ControlType.Id == UIA_ControlTypeIds.Window && current.Current.NativeWindowHandle != 0);
-      // 是否是任务栏
-      bool isTaskbar = (current.Current.ClassName == "Shell_TrayWnd" ||
-                         current.Current.ClassName == "Shell_SecondaryTrayWnd");
-
-      // 如果是窗口/任务栏，或者是最后一个元素，获取其句柄
-      if (isValidWindow || isTaskbar || isLastElement)
-      {
-        windowHandle = new IntPtr(current.Current.NativeWindowHandle);
-        break;  // 获取到句柄后就停止遍历
-      }
-      else
+      // 获取父元素,如果获取失败，则停止遍历
+      AutomationElement parent;
+      try
       {
-        // 获取同级元素中的索引
-        int index = 1;
-        var siblings = parent.FindAll(TreeScope.Children, new PropertyCondition(
-            AutomationElement.ControlTypeProperty, current.Current.ControlType));
-
-        foreach (AutomationElement sibling in siblings)
+        parent = walker.GetParent(current);
+        // 是否是最后一个元素
+        bool isLastElement = (parent == AutomationElement.RootElement || parent == null);
+        // 是否是句柄不为0的窗口
+        bool isValidWindow = (current.Current.ControlType.Id == UIA_ControlTypeIds.Window && current.Current.NativeWindowHandle != 0);
+        // 是否是任务栏
+        bool isTaskbar = (current.Current.ClassName == "Shell_TrayWnd" ||
+                           current.Current.ClassName == "Shell_SecondaryTrayWnd");
+
+        // 如果是窗口/任务栏，或者是最后一个元素，获取其句柄
+        if (isValidWindow || isTaskbar || isLastElement)
         {
-          if (sibling == current) break;
-          index++;
+          windowHandle = new IntPtr(current.Current.NativeWindowHandle);
+          break;  // 获取到句柄后就停止遍历
         }
+        else
+        {
+          // 获取同级元素中的索引
+          int index = 1;
+          var siblings = parent.FindAll(TreeScope.Children, new PropertyCondition(
+              AutomationElement.ControlTypeProperty, current.Current.ControlType));
 
-        // 构建路径段
-        string type = current.Current.ControlType.ProgrammaticName.Replace("ControlType.", "");
-        string pathSegment = type;
+          foreach (AutomationElement sibling in siblings)
+          {
+            if (sibling == current) break;
+            index++;
+          }
 
-        // 如果有多个同类型元素，添加索引
-        if (siblings.Count > 1)
-        {
-          pathSegment = string.Format("{0}[{1}]", type, index);
-        }
+          // 构建路径段
+          string type = current.Current.ControlType.ProgrammaticName.Replace("ControlType.", "");
+          string pathSegment = type;
 
-        path.Insert(0, pathSegment);
-      }
+          // 如果有多个同类型元素，添加索引
+          if (siblings.Count > 1)
+          {
+            pathSegment = string.Format("{0}[{1}]", type, index);
+          }
 
+          path.Insert(0, pathSegment);
+        }
+      }
+      catch
+      {
+        break;
+      }
       current = parent;
+
+    }
+    if (windowHandle == IntPtr.Zero)
+    {
+      Point currentMousePosition;
+      GetCursorPos(out currentMousePosition);
+      windowHandle = WindowFromPoint(currentMousePosition);
     }
 
     return new ElementHierarchyInfo
@@ -1002,32 +1236,6 @@ private static void SendKeys(AutomationElement element, string keys)
     }
   }
 
-  // 将 HandleKeyPress 方法移到类级别
-  private static void HandleKeyPress(object sender, KeyPressEventArgs e)
-  {
-    if (e.KeyChar == (char)27)  // ESC键
-    {
-      mouseTimer.Stop();
-      overlayForm.Close();
-      previewForm.Close();
-      Environment.Exit(0);
-    }
-    else if (e.KeyChar == 'c' || e.KeyChar == 'C')  // 添加复制功能
-    {
-      if (lastElement != null)
-      {
-        try
-        {
-          Clipboard.SetText(lastElement.Current.Name);
-        }
-        catch (Exception ex)
-        {
-          Console.Error.WriteLine(string.Format("Error copying name: {0}", ex.Message));
-        }
-      }
-    }
-  }
-
   // 元素检查器
   private static void InspectElement(string[] args)
   {
@@ -1243,7 +1451,8 @@ ref taskbarChildren
               "名称: {2}\r\n" +
               "大小: {3}x{4}\r\n" +
               "类型: {5}\r\n" +
-              "C：复制名称，ESC：退出",
+              "C：复制名称，X：复制名称并退出\r\n" +
+              "ESC：退出",
               cursorPos.X,
               cursorPos.Y,
               elementName,
@@ -1452,4 +1661,39 @@ private static AutomationElement HandleTaskbarElement(AutomationElement element,
     return element;
   }
 
+  private static void stopInspect()
+  {
+    mouseTimer.Stop();
+    overlayForm.Close();
+    previewForm.Close();
+    Environment.Exit(0);
+  }
+
+  private static void HandleKeyPress(object sender, KeyPressEventArgs e)
+  {
+    if (e.KeyChar == (char)27)  // ESC键
+    {
+      stopInspect();
+    }
+    else if (e.KeyChar == 'c' || e.KeyChar == 'C' || e.KeyChar == 'x' || e.KeyChar == 'X')  // 添加复制功能
+    {
+      if (lastElement != null)
+      {
+        try
+        {
+          Clipboard.SetText(lastElement.Current.Name);
+          if (e.KeyChar == 'x' || e.KeyChar == 'X')
+          {
+            stopInspect();
+          }
+        }
+        catch (Exception ex)
+        {
+          Console.Error.WriteLine(string.Format("Error copying name: {0}", ex.Message));
+        }
+      }
+    }
+  }
+
+
 }
diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 41609140..9dd9ae22 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -164,31 +164,43 @@ const runCsharpFeature = async (feature, args = [], options = {}) => {
     const { alwaysBuildNewExe = window.utools.isDev(), killPrevious = true } =
       options;
     try {
+      if (killPrevious && currentChild) {
+        currentChild.kill();
+      }
       const featureExePath = await getCsharpFeatureExe(
         feature,
         alwaysBuildNewExe
       );
-      if (killPrevious && currentChild) {
-        quickcommand.kill(currentChild.pid, "SIGKILL");
-      }
       console.log(featureExePath, args.join(" "));
-      currentChild = child_process.execFile(
-        featureExePath,
-        args,
-        {
-          encoding: null,
-        },
-        (err, stdout, stderr) => {
-          console.log({
-            err,
-            stdout: iconv.decode(stdout, "gbk"),
-            stderr: iconv.decode(stderr, "gbk"),
-          });
-          if (err || Buffer.byteLength(stderr) > 0)
-            reject(iconv.decode(stderr || stdout, "gbk"));
-          else reslove(iconv.decode(stdout, "gbk"));
+      currentChild = child_process.spawn(featureExePath, args, {
+        encoding: null,
+        windowsHide: true,
+      });
+
+      let stdoutData = Buffer.from([]);
+      let stderrData = Buffer.from([]);
+
+      currentChild.stdout.on("data", (data) => {
+        stdoutData = Buffer.concat([stdoutData, data]);
+      });
+
+      currentChild.stderr.on("data", (data) => {
+        stderrData = Buffer.concat([stderrData, data]);
+      });
+
+      currentChild.on("error", (err) => {
+        reject(err.toString());
+      });
+
+      currentChild.on("close", (code) => {
+        if (code !== 0 || stderrData.length > 0) {
+          reject(
+            iconv.decode(stderrData.length ? stderrData : stdoutData, "gbk")
+          );
+        } else {
+          reslove(iconv.decode(stdoutData, "gbk"));
         }
-      );
+      });
     } catch (error) {
       return reject(error.toString());
     }
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index 2acb0279..4587175a 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -46,7 +46,7 @@ async function runAutomation(
   // 特定命令的参数处理
   switch (type) {
     case "inspect":
-      if (params) {
+      if (params.usePosition) {
         args.push("-position");
         if (params.x && params.y) {
           args.push(`${params.x},${params.y}`);
@@ -130,7 +130,10 @@ async function runAutomation(
 module.exports = {
   inspect: () => runAutomation("inspect"),
   inspectPosition: (position) =>
-    runAutomation("inspect", null, null, null, position || {}),
+    runAutomation("inspect", null, null, null, {
+      ...position,
+      usePosition: true,
+    }),
   click: (...args) => runAutomation("click", ...args),
   setvalue: (...args) => runAutomation("setvalue", ...args),
   getvalue: (...args) => runAutomation("getvalue", ...args),
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 0d6a1cc3..f8e5a0f4 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -630,7 +630,7 @@ export const windowsCommands = {
     // sendmessage
     {
       value: "quickcomposer.windows.sendmessage.inspectWindow",
-      label: "界面自动化(后台)",
+      label: "发送控制消息",
       desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,

From cf4d38c3b1534c17c41bd7b0af41b4488d56bad1 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 01:15:01 +0800
Subject: [PATCH 066/332] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/audioCommands.js    |  5 --
 src/js/composer/commands/codingCommand.js    |  2 -
 src/js/composer/commands/controlCommands.js  | 16 ----
 src/js/composer/commands/dataCommands.js     | 95 --------------------
 src/js/composer/commands/fileCommands.js     | 10 ---
 src/js/composer/commands/imageCommands.js    | 41 ---------
 src/js/composer/commands/macosCommands.js    | 89 ------------------
 src/js/composer/commands/mathCommands.js     | 23 -----
 src/js/composer/commands/networkCommands.js  |  6 --
 src/js/composer/commands/notifyCommands.js   |  2 -
 src/js/composer/commands/otherCommands.js    |  1 -
 src/js/composer/commands/screenCommands.js   |  5 --
 src/js/composer/commands/simulateCommands.js |  8 --
 src/js/composer/commands/statusCommands.js   |  5 --
 src/js/composer/commands/systemCommands.js   |  9 --
 src/js/composer/commands/uiCommands.js       |  7 --
 src/js/composer/commands/utoolsCommand.js    | 19 ----
 src/js/composer/commands/windowsCommands.js  | 59 ------------
 18 files changed, 402 deletions(-)

diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index 3a5ba171..8e045648 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -106,7 +106,6 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.speech.speak",
       label: "文本朗读",
-      desc: "系统语音朗读",
       icon: "record_voice_over",
       subCommands: [
         {
@@ -133,7 +132,6 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.media.play",
       label: "音频播放",
-      desc: "播放音频文件",
       icon: "music_note",
       isAsync: true,
       subCommands: [
@@ -176,7 +174,6 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.record",
       label: "音频录制",
-      desc: "录制系统音频",
       icon: "mic",
       isAsync: true,
       config: [
@@ -214,7 +211,6 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.media.beep",
       label: "系统音效",
-      desc: "播放系统内置音效",
       isAsync: true,
       icon: "notifications_active",
       config: [
@@ -241,7 +237,6 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.media.analyze",
       label: "音频信息",
-      desc: "分析音频文件信息",
       icon: "analytics",
       isAsync: true,
       config: [
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
index b020706c..caabe85f 100644
--- a/src/js/composer/commands/codingCommand.js
+++ b/src/js/composer/commands/codingCommand.js
@@ -6,7 +6,6 @@ export const codingCommands = {
     {
       value: "quickcomposer.coding.base64Encode",
       label: "编解码",
-      desc: "文本编解码",
       icon: "code",
       outputVariable: "processedText",
       saveOutput: true,
@@ -77,7 +76,6 @@ export const codingCommands = {
     {
       value: "quickcomposer.coding.md5Hash",
       label: "哈希计算",
-      desc: "计算文本的哈希值",
       icon: "enhanced_encryption",
       outputVariable: "hashValue",
       saveOutput: true,
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index e54730f9..de71d626 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -15,7 +15,6 @@ export const controlCommands = {
           codeTemplate: "if (${condition}) {",
           config: [
             {
-              key: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -36,7 +35,6 @@ export const controlCommands = {
           codeTemplate: "} else if (${condition}) {",
           config: [
             {
-              key: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -65,14 +63,12 @@ export const controlCommands = {
             "for (let ${indexVar} = ${startValue}; ${indexVar} <= ${endValue}; ${indexVar} += ${stepValue}) {",
           config: [
             {
-              key: "indexVar",
               label: "变量",
               component: "ControlInput",
               defaultValue: "i",
               width: 3,
             },
             {
-              key: "startValue",
               label: "从",
               component: "ControlInput",
               icon: "first_page",
@@ -80,7 +76,6 @@ export const controlCommands = {
               width: 3,
             },
             {
-              key: "endValue",
               label: "到",
               component: "ControlInput",
               icon: "last_page",
@@ -88,7 +83,6 @@ export const controlCommands = {
               width: 3,
             },
             {
-              key: "stepValue",
               label: "步进",
               component: "ControlInput",
               icon: "trending_up",
@@ -131,21 +125,18 @@ export const controlCommands = {
             "for (let [${indexVar}, ${itemVar}] of ${arrayVar}.entries()) {",
           config: [
             {
-              key: "itemVar",
               label: "元素",
               component: "ControlInput",
               defaultValue: "item",
               width: 4,
             },
             {
-              key: "indexVar",
               label: "索引",
               component: "ControlInput",
               defaultValue: "i",
               width: 4,
             },
             {
-              key: "arrayVar",
               label: "数组",
               component: "ControlInput",
               icon: "list",
@@ -188,21 +179,18 @@ export const controlCommands = {
             "for (const ${keyVar} in ${objectVar}) { const ${valueVar} = ${objectVar}[${keyVar}];",
           config: [
             {
-              key: "keyVar",
               label: "键名",
               component: "ControlInput",
               defaultValue: "key",
               width: 4,
             },
             {
-              key: "valueVar",
               label: "值",
               component: "ControlInput",
               defaultValue: "value",
               width: 4,
             },
             {
-              key: "objectVar",
               label: "对象",
               component: "ControlInput",
               defaultValue: "object",
@@ -243,7 +231,6 @@ export const controlCommands = {
           codeTemplate: "while (${condition}) {",
           config: [
             {
-              key: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -284,7 +271,6 @@ export const controlCommands = {
           codeTemplate: "switch (${expression}) {",
           config: [
             {
-              key: "expression",
               label: "变量",
               component: "ControlInput",
               placeholder: "变量或表达式",
@@ -299,7 +285,6 @@ export const controlCommands = {
           codeTemplate: "case ${value}:",
           config: [
             {
-              key: "value",
               label: "值",
               component: "ControlInput",
             },
@@ -338,7 +323,6 @@ export const controlCommands = {
           codeTemplate: "} catch (${errorVar}) {",
           config: [
             {
-              key: "errorVar",
               label: "错误",
               component: "ControlInput",
               defaultValue: "error",
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index c8296b1b..f2d0ac07 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -8,7 +8,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.string.reverse",
       label: "字符串处理",
-      desc: "字符串处理和转换",
       icon: "text_fields",
       subCommands: [
         {
@@ -17,7 +16,6 @@ export const dataCommands = {
           icon: "swap_horiz",
           config: [
             {
-              key: "text",
               label: "要反转的文本",
               component: "VariableInput",
               icon: "text_fields",
@@ -31,21 +29,18 @@ export const dataCommands = {
           icon: "find_replace",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 12,
             },
             {
-              key: "oldStr",
               label: "要替换的文本",
               component: "VariableInput",
               icon: "find_replace",
               width: 6,
             },
             {
-              key: "newStr",
               label: "替换为",
               component: "VariableInput",
               icon: "text_fields",
@@ -59,14 +54,12 @@ export const dataCommands = {
           icon: "content_cut",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 12,
             },
             {
-              key: "start",
               label: "起始位置",
               component: "NumberInput",
               min: 0,
@@ -75,7 +68,6 @@ export const dataCommands = {
               width: 6,
             },
             {
-              key: "end",
               label: "结束位置",
               component: "NumberInput",
               icon: "last_page",
@@ -91,14 +83,12 @@ export const dataCommands = {
           icon: "format_align_justify",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "mode",
               label: "模式",
               component: "q-select",
               icon: "settings",
@@ -118,14 +108,12 @@ export const dataCommands = {
           icon: "text_fields",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "mode",
               label: "转换为",
               component: "q-select",
               icon: "settings",
@@ -149,14 +137,12 @@ export const dataCommands = {
           icon: "format_size",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 12,
             },
             {
-              key: "length",
               label: "目标长度",
               component: "NumberInput",
               min: 0,
@@ -165,7 +151,6 @@ export const dataCommands = {
               width: 4,
             },
             {
-              key: "padString",
               label: "填充字符",
               component: "VariableInput",
               icon: "space_bar",
@@ -173,7 +158,6 @@ export const dataCommands = {
               defaultValue: newVarInputVal("str", " "),
             },
             {
-              key: "mode",
               label: "填充位置",
               component: "q-select",
               icon: "settings",
@@ -193,14 +177,12 @@ export const dataCommands = {
           icon: "splitscreen",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "separator",
               label: "分隔符",
               component: "VariableInput",
               icon: "space_bar",
@@ -215,14 +197,12 @@ export const dataCommands = {
           icon: "merge",
           config: [
             {
-              key: "array",
               label: "字符串数组",
               component: "VariableInput",
               icon: "view_list",
               width: 8,
             },
             {
-              key: "separator",
               label: "连接符",
               component: "VariableInput",
               icon: "space_bar",
@@ -237,14 +217,12 @@ export const dataCommands = {
           icon: "copy_all",
           config: [
             {
-              key: "text",
               label: "要重复的文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "count",
               label: "重复次数",
               component: "NumberInput",
               min: 0,
@@ -261,14 +239,12 @@ export const dataCommands = {
           icon: "content_cut",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "mode",
               label: "提取类型",
               component: "q-select",
               icon: "settings",
@@ -290,14 +266,12 @@ export const dataCommands = {
           icon: "numbers",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "mode",
               label: "统计类型",
               component: "q-select",
               icon: "settings",
@@ -321,14 +295,12 @@ export const dataCommands = {
           icon: "wrap_text",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 8,
             },
             {
-              key: "width",
               label: "每行字符数",
               component: "NumberInput",
               min: 1,
@@ -345,14 +317,12 @@ export const dataCommands = {
           icon: "format_align_center",
           config: [
             {
-              key: "text",
               label: "原始文本",
               component: "VariableInput",
               icon: "text_fields",
               width: 12,
             },
             {
-              key: "mode",
               label: "对齐方式",
               component: "q-select",
               icon: "settings",
@@ -366,7 +336,6 @@ export const dataCommands = {
               width: 6,
             },
             {
-              key: "width",
               label: "总宽度",
               component: "NumberInput",
               min: 1,
@@ -392,7 +361,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.buffer.from",
       label: "Buffer操作",
-      desc: "Buffer创建、转换和操作",
       config: [],
       icon: "memory",
       subCommands: [
@@ -741,7 +709,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.zlib",
       label: "数据压缩解压",
-      desc: "使用 zlib 进行数据压缩和解压",
       component: "ZlibEditor",
       icon: "compress",
       isAsync: true,
@@ -749,7 +716,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.htmlParser",
       label: "HTML解析",
-      desc: "解析 HTML 字符串",
       icon: "html",
       config: [
         {
@@ -787,7 +753,6 @@ export const dataCommands = {
     {
       value: "JSON.stringify",
       label: "JSON处理",
-      desc: "JSON处理",
       icon: "data_object",
       subCommands: [
         {
@@ -840,7 +805,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.array.filter",
       label: "数组处理",
-      desc: "对象数组的常用操作",
       icon: "view_list",
       subCommands: [
         {
@@ -849,7 +813,6 @@ export const dataCommands = {
           icon: "filter_alt",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -860,7 +823,6 @@ export const dataCommands = {
                 '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              key: "condition",
               label: "过滤条件",
               component: "VariableInput",
               icon: "code",
@@ -875,7 +837,6 @@ export const dataCommands = {
           icon: "transform",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -884,7 +845,6 @@ export const dataCommands = {
                 '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              key: "transform",
               label: "转换函数",
               component: "VariableInput",
               icon: "code",
@@ -899,7 +859,6 @@ export const dataCommands = {
           icon: "sort",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -908,7 +867,6 @@ export const dataCommands = {
                 '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              key: "key",
               label: "排序字段",
               component: "VariableInput",
               icon: "key",
@@ -916,7 +874,6 @@ export const dataCommands = {
               placeholder: "age",
             },
             {
-              key: "order",
               label: "排序方式",
               component: "q-select",
               icon: "sort",
@@ -935,7 +892,6 @@ export const dataCommands = {
           icon: "group_work",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -944,7 +900,6 @@ export const dataCommands = {
                 '[{"id":1,"name":"张三","dept":"技术"},{"id":2,"name":"李四","dept":"技术"}]',
             },
             {
-              key: "key",
               label: "分组字段",
               component: "VariableInput",
               icon: "key",
@@ -959,7 +914,6 @@ export const dataCommands = {
           icon: "filter_1",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -967,7 +921,6 @@ export const dataCommands = {
               placeholder: '[{"id":1,"dept":"技术"},{"id":2,"dept":"技术"}]',
             },
             {
-              key: "key",
               label: "去重字段",
               component: "VariableInput",
               icon: "key",
@@ -982,7 +935,6 @@ export const dataCommands = {
           icon: "search",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -990,7 +942,6 @@ export const dataCommands = {
               placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
             },
             {
-              key: "condition",
               label: "查找条件",
               component: "VariableInput",
               icon: "code",
@@ -1005,7 +956,6 @@ export const dataCommands = {
           icon: "functions",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -1013,7 +963,6 @@ export const dataCommands = {
               placeholder: '[{"id":1,"amount":100},{"id":2,"amount":200}]',
             },
             {
-              key: "operation",
               label: "聚合操作",
               component: "q-select",
               icon: "functions",
@@ -1028,7 +977,6 @@ export const dataCommands = {
               width: 6,
             },
             {
-              key: "key",
               label: "聚合字段",
               component: "VariableInput",
               icon: "key",
@@ -1043,7 +991,6 @@ export const dataCommands = {
           icon: "content_cut",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -1051,7 +998,6 @@ export const dataCommands = {
               placeholder: "[1,2,3,4,5]",
             },
             {
-              key: "start",
               label: "起始位置",
               component: "NumberInput",
               icon: "first_page",
@@ -1061,7 +1007,6 @@ export const dataCommands = {
               placeholder: "1",
             },
             {
-              key: "end",
               label: "结束位置",
               component: "NumberInput",
               icon: "last_page",
@@ -1078,7 +1023,6 @@ export const dataCommands = {
           icon: "unfold_less",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -1086,7 +1030,6 @@ export const dataCommands = {
               placeholder: "[[1,2],[3,4],[[5,6]]]",
             },
             {
-              key: "depth",
               label: "扁平化深度",
               component: "NumberInput",
               icon: "format_indent_decrease",
@@ -1103,7 +1046,6 @@ export const dataCommands = {
           icon: "difference",
           config: [
             {
-              key: "array1",
               label: "数组1",
               component: "VariableInput",
               icon: "view_list",
@@ -1111,7 +1053,6 @@ export const dataCommands = {
               placeholder: "[1,2,3,4]",
             },
             {
-              key: "array2",
               label: "数组2",
               component: "VariableInput",
               icon: "view_list",
@@ -1119,7 +1060,6 @@ export const dataCommands = {
               placeholder: "[3,4,5,6]",
             },
             {
-              key: "key",
               label: "比较字段",
               component: "VariableInput",
               icon: "key",
@@ -1134,7 +1074,6 @@ export const dataCommands = {
           icon: "join_full",
           config: [
             {
-              key: "array1",
               label: "数组1",
               component: "VariableInput",
               icon: "view_list",
@@ -1142,7 +1081,6 @@ export const dataCommands = {
               placeholder: "[1,2,3,4]",
             },
             {
-              key: "array2",
               label: "数组2",
               component: "VariableInput",
               icon: "view_list",
@@ -1150,7 +1088,6 @@ export const dataCommands = {
               placeholder: "[3,4,5,6]",
             },
             {
-              key: "key",
               label: "比较字段",
               component: "VariableInput",
               icon: "key",
@@ -1165,7 +1102,6 @@ export const dataCommands = {
           icon: "join_inner",
           config: [
             {
-              key: "array1",
               label: "数组1",
               component: "VariableInput",
               icon: "view_list",
@@ -1173,7 +1109,6 @@ export const dataCommands = {
               placeholder: "[1,2,3,4]",
             },
             {
-              key: "array2",
               label: "数组2",
               component: "VariableInput",
               icon: "view_list",
@@ -1181,7 +1116,6 @@ export const dataCommands = {
               placeholder: "[3,4,5,6]",
             },
             {
-              key: "key",
               label: "比较字段",
               component: "VariableInput",
               icon: "key",
@@ -1196,7 +1130,6 @@ export const dataCommands = {
           icon: "grid_view",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -1204,7 +1137,6 @@ export const dataCommands = {
               placeholder: "[1,2,3,4,5,6]",
             },
             {
-              key: "size",
               label: "块大小",
               component: "NumberInput",
               icon: "straighten",
@@ -1221,7 +1153,6 @@ export const dataCommands = {
           icon: "shuffle",
           config: [
             {
-              key: "array",
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
@@ -1235,7 +1166,6 @@ export const dataCommands = {
     {
       value: "quickcomposer.data.time.format",
       label: "时间处理",
-      desc: "时间日期的常用操作",
       icon: "schedule",
       subCommands: [
         {
@@ -1244,7 +1174,6 @@ export const dataCommands = {
           icon: "event",
           config: [
             {
-              key: "time",
               label: "时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1252,7 +1181,6 @@ export const dataCommands = {
               placeholder: "2024-01-01 或 now 或 timestamp",
             },
             {
-              key: "format",
               label: "格式",
               component: "q-select",
               icon: "format_shapes",
@@ -1279,7 +1207,6 @@ export const dataCommands = {
           icon: "input",
           config: [
             {
-              key: "time",
               label: "时间字符串",
               component: "VariableInput",
               icon: "schedule",
@@ -1287,7 +1214,6 @@ export const dataCommands = {
               placeholder: "2024-01-01 12:00:00",
             },
             {
-              key: "format",
               label: "原格式",
               component: "q-select",
               icon: "format_shapes",
@@ -1311,7 +1237,6 @@ export const dataCommands = {
           icon: "add",
           config: [
             {
-              key: "time",
               label: "基准时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1319,7 +1244,6 @@ export const dataCommands = {
               placeholder: "2024-01-01 或 now",
             },
             {
-              key: "value",
               label: "数值",
               component: "NumberInput",
               icon: "exposure",
@@ -1327,7 +1251,6 @@ export const dataCommands = {
               defaultValue: 1,
             },
             {
-              key: "unit",
               label: "单位",
               component: "q-select",
               icon: "straighten",
@@ -1351,7 +1274,6 @@ export const dataCommands = {
           icon: "difference",
           config: [
             {
-              key: "time1",
               label: "时间1",
               component: "VariableInput",
               icon: "schedule",
@@ -1359,7 +1281,6 @@ export const dataCommands = {
               placeholder: "2024-01-01",
             },
             {
-              key: "time2",
               label: "时间2",
               component: "VariableInput",
               icon: "schedule",
@@ -1367,7 +1288,6 @@ export const dataCommands = {
               placeholder: "2024-02-01",
             },
             {
-              key: "unit",
               label: "返回单位",
               component: "q-select",
               icon: "straighten",
@@ -1385,7 +1305,6 @@ export const dataCommands = {
               defaultValue: "days",
             },
             {
-              key: "absolute",
               label: "绝对值",
               component: "CheckButton",
               width: 6,
@@ -1399,7 +1318,6 @@ export const dataCommands = {
           icon: "first_page",
           config: [
             {
-              key: "time",
               label: "时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1407,7 +1325,6 @@ export const dataCommands = {
               placeholder: "2024-01-01 或 now",
             },
             {
-              key: "unit",
               label: "单位",
               component: "q-select",
               icon: "straighten",
@@ -1424,7 +1341,6 @@ export const dataCommands = {
               defaultValue: "day",
             },
             {
-              key: "type",
               label: "类型",
               component: "q-select",
               icon: "settings",
@@ -1443,7 +1359,6 @@ export const dataCommands = {
           icon: "check_circle",
           config: [
             {
-              key: "time",
               label: "时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1451,7 +1366,6 @@ export const dataCommands = {
               placeholder: "2024-01-01",
             },
             {
-              key: "format",
               label: "格式",
               component: "q-select",
               icon: "format_shapes",
@@ -1473,7 +1387,6 @@ export const dataCommands = {
           icon: "calendar_month",
           config: [
             {
-              key: "time",
               label: "时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1488,7 +1401,6 @@ export const dataCommands = {
           icon: "work",
           config: [
             {
-              key: "startTime",
               label: "开始时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1496,7 +1408,6 @@ export const dataCommands = {
               placeholder: "2024-01-01",
             },
             {
-              key: "days",
               label: "工作日天数",
               component: "NumberInput",
               icon: "exposure",
@@ -1504,14 +1415,12 @@ export const dataCommands = {
               defaultValue: 1,
             },
             {
-              key: "weekends",
               label: "包含周末",
               component: "CheckButton",
               width: 4,
               defaultValue: false,
             },
             {
-              key: "holidays",
               label: "节假日",
               component: "ArrayEditor",
               icon: "event_busy",
@@ -1526,7 +1435,6 @@ export const dataCommands = {
           icon: "date_range",
           config: [
             {
-              key: "time",
               label: "判断时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1534,7 +1442,6 @@ export const dataCommands = {
               placeholder: "2024-01-01 或 now",
             },
             {
-              key: "startTime",
               label: "开始时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1542,7 +1449,6 @@ export const dataCommands = {
               placeholder: "2024-01-01",
             },
             {
-              key: "endTime",
               label: "结束时间",
               component: "VariableInput",
               icon: "schedule",
@@ -1550,7 +1456,6 @@ export const dataCommands = {
               placeholder: "2024-02-01",
             },
             {
-              key: "inclusive",
               label: "包含边界",
               component: "CheckButton",
               width: 4,
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index bd43b78c..5fb1fab8 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -7,7 +7,6 @@ export const fileCommands = {
       value: "quickcomposer.file.operation",
       label: "文件/文件夹操作",
       component: "FileOperationEditor",
-      desc: "文件和文件夹的读写、删除、重命名等操作",
       isAsync: true,
     },
     {
@@ -15,7 +14,6 @@ export const fileCommands = {
       label: "默认程序打开",
       config: [
         {
-          key: "path",
           label: "文件、文件夹或软件的绝对路径",
           component: "VariableInput",
           icon: "folder_open",
@@ -33,7 +31,6 @@ export const fileCommands = {
       label: "文件管理器中显示",
       config: [
         {
-          key: "path",
           label: "文件、文件夹或软件的绝对路径",
           component: "VariableInput",
           icon: "location_on",
@@ -51,7 +48,6 @@ export const fileCommands = {
       label: "获取文件图标",
       config: [
         {
-          key: "path",
           label: "文件或软件的绝对路径",
           component: "VariableInput",
           icon: "folder_open",
@@ -70,12 +66,10 @@ export const fileCommands = {
     {
       value: "quickcomposer.file.archive",
       label: "文件归档",
-      desc: "压缩和解压文件",
       icon: "archive",
       isAsync: true,
       config: [
         {
-          key: "operation",
           label: "操作类型",
           component: "q-select",
           icon: "settings",
@@ -87,7 +81,6 @@ export const fileCommands = {
           ],
         },
         {
-          key: "format",
           label: "归档格式",
           component: "q-select",
           icon: "format_shapes",
@@ -100,7 +93,6 @@ export const fileCommands = {
           ],
         },
         {
-          key: "source",
           label: "源文件/文件夹",
           component: "VariableInput",
           icon: "folder_open",
@@ -115,7 +107,6 @@ export const fileCommands = {
           },
         },
         {
-          key: "destination",
           label: "目标路径",
           component: "VariableInput",
           icon: "save",
@@ -135,7 +126,6 @@ export const fileCommands = {
       icon: "delete",
       config: [
         {
-          key: "path",
           label: "文件或文件夹的绝对路径",
           component: "VariableInput",
           icon: "folder_open",
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index 54de9ae7..396e17e4 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -24,12 +24,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.analyze",
       label: "图片信息",
-      desc: "分析图片基本信息",
       icon: "analytics",
       isAsync: true,
       config: [
         {
-          key: "file",
           label: "图片文件",
           component: "VariableInput",
           icon: "image",
@@ -55,12 +53,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.resize",
       label: "调整大小",
-      desc: "调整图片尺寸",
       icon: "aspect_ratio",
       isAsync: true,
       config: [
         {
-          key: "inputFile",
           label: "输入文件",
           component: "VariableInput",
           icon: "image",
@@ -82,7 +78,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputFile",
           label: "输出文件",
           component: "VariableInput",
           icon: "save",
@@ -103,7 +98,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "width",
           label: "宽度(像素)",
           component: "NumberInput",
           icon: "compare_arrows",
@@ -113,7 +107,6 @@ export const imageCommands = {
           defaultValue: "",
         },
         {
-          key: "height",
           label: "高度(像素)",
           component: "NumberInput",
           icon: "height",
@@ -123,7 +116,6 @@ export const imageCommands = {
           defaultValue: "",
         },
         {
-          key: "keepAspectRatio",
           label: "保持宽高比",
           component: "q-select",
           icon: "aspect_ratio",
@@ -135,7 +127,6 @@ export const imageCommands = {
           ],
         },
         {
-          key: "quality",
           label: "图片质量(0-1)",
           component: "NumberInput",
           icon: "high_quality",
@@ -150,12 +141,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.rotate",
       label: "旋转图片",
-      desc: "旋转图片角度",
       icon: "rotate_right",
       isAsync: true,
       config: [
         {
-          key: "inputFile",
           label: "输入文件",
           component: "VariableInput",
           icon: "image",
@@ -177,7 +166,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputFile",
           label: "输出文件",
           component: "VariableInput",
           icon: "save",
@@ -198,7 +186,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "angle",
           label: "旋转角度",
           component: "NumberInput",
           icon: "rotate_right",
@@ -207,7 +194,6 @@ export const imageCommands = {
           defaultValue: 90,
         },
         {
-          key: "quality",
           label: "图片质量(0-1)",
           component: "NumberInput",
           icon: "high_quality",
@@ -222,12 +208,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.crop",
       label: "裁剪图片",
-      desc: "裁剪图片区域",
       icon: "crop",
       isAsync: true,
       config: [
         {
-          key: "inputFile",
           label: "输入文件",
           component: "VariableInput",
           icon: "image",
@@ -249,7 +233,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputFile",
           label: "输出文件",
           component: "VariableInput",
           icon: "save",
@@ -270,7 +253,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "x",
           label: "起始X坐标",
           component: "NumberInput",
           icon: "arrow_right",
@@ -280,7 +262,6 @@ export const imageCommands = {
           defaultValue: 0,
         },
         {
-          key: "y",
           label: "起始Y坐标",
           component: "NumberInput",
           icon: "arrow_downward",
@@ -290,7 +271,6 @@ export const imageCommands = {
           defaultValue: 0,
         },
         {
-          key: "width",
           label: "裁剪宽度",
           component: "NumberInput",
           icon: "compare_arrows",
@@ -300,7 +280,6 @@ export const imageCommands = {
           defaultValue: "",
         },
         {
-          key: "height",
           label: "裁剪高度",
           component: "NumberInput",
           icon: "height",
@@ -310,7 +289,6 @@ export const imageCommands = {
           defaultValue: "",
         },
         {
-          key: "quality",
           label: "图片质量(0-1)",
           component: "NumberInput",
           icon: "high_quality",
@@ -325,12 +303,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.watermark",
       label: "添加水印",
-      desc: "添加文字水印",
       icon: "format_color_text",
       isAsync: true,
       config: [
         {
-          key: "inputFile",
           label: "输入文件",
           component: "VariableInput",
           icon: "image",
@@ -352,7 +328,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputFile",
           label: "输出文件",
           component: "VariableInput",
           icon: "save",
@@ -373,7 +348,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "text",
           label: "水印文字",
           component: "VariableInput",
           icon: "text_fields",
@@ -381,7 +355,6 @@ export const imageCommands = {
           defaultValue: newVarInputVal("str", "水印文字"),
         },
         {
-          key: "font",
           label: "字体设置",
           component: "VariableInput",
           icon: "font_download",
@@ -389,7 +362,6 @@ export const imageCommands = {
           defaultValue: newVarInputVal("str", "24px Arial"),
         },
         {
-          key: "color",
           label: "文字颜色",
           component: "VariableInput",
           icon: "format_color_text",
@@ -397,7 +369,6 @@ export const imageCommands = {
           defaultValue: newVarInputVal("str", "rgba(255, 255, 255, 0.5)"),
         },
         {
-          key: "position",
           label: "位置",
           component: "q-select",
           icon: "place",
@@ -406,7 +377,6 @@ export const imageCommands = {
           options: WATERMARK_POSITIONS,
         },
         {
-          key: "margin",
           label: "边距",
           component: "NumberInput",
           icon: "space_bar",
@@ -416,7 +386,6 @@ export const imageCommands = {
           defaultValue: 20,
         },
         {
-          key: "opacity",
           label: "不透明度(0-1)",
           component: "NumberInput",
           icon: "opacity",
@@ -427,7 +396,6 @@ export const imageCommands = {
           defaultValue: 0.5,
         },
         {
-          key: "quality",
           label: "图片质量(0-1)",
           component: "NumberInput",
           icon: "high_quality",
@@ -442,12 +410,10 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.convert",
       label: "格式转换",
-      desc: "转换图片格式",
       icon: "transform",
       isAsync: true,
       config: [
         {
-          key: "inputFile",
           label: "输入文件",
           component: "VariableInput",
           icon: "image",
@@ -469,7 +435,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputFile",
           label: "输出文件",
           component: "VariableInput",
           icon: "save",
@@ -490,7 +455,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "format",
           label: "输出格式",
           component: "q-select",
           icon: "transform",
@@ -499,7 +463,6 @@ export const imageCommands = {
           options: IMAGE_FORMATS,
         },
         {
-          key: "quality",
           label: "图片质量(0-1)",
           component: "NumberInput",
           icon: "high_quality",
@@ -514,11 +477,9 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.pngToIcon",
       label: "PNG转图标",
-      desc: "将PNG图片转换为图标",
       icon: "transform",
       config: [
         {
-          key: "inputFile",
           label: "PNG路径/Base64",
           component: "VariableInput",
           icon: "image",
@@ -540,7 +501,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "outputDir",
           label: "输出目录",
           component: "VariableInput",
           icon: "save",
@@ -558,7 +518,6 @@ export const imageCommands = {
           },
         },
         {
-          key: "type",
           label: "输出格式",
           component: "q-select",
           icon: "transform",
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 8d54cc26..a72fbf82 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -8,30 +8,25 @@ export const macosCommands = {
     {
       value: "quickcomposer.macos.app.getFrontmost",
       label: "应用及窗口控制",
-      desc: "应用程序管理功能",
       icon: "apps",
       isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.macos.app.getFrontmost",
           label: "获取前台应用",
-          desc: "获取当前前台运行的应用信息",
           icon: "front_hand",
         },
         {
           value: "quickcomposer.macos.app.getRunningApps",
           label: "获取活动应用",
-          desc: "获取所有正在运行的应用列表",
           icon: "list",
         },
         {
           value: "quickcomposer.macos.app.launch",
           label: "启动应用",
-          desc: "启动指定的应用程序",
           icon: "launch",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -43,11 +38,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.quit",
           label: "退出应用",
-          desc: "退出指定的应用程序",
           icon: "close",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -59,11 +52,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.hide",
           label: "隐藏应用",
-          desc: "隐藏指定的应用程序",
           icon: "visibility_off",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -75,11 +66,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.show",
           label: "显示应用",
-          desc: "显示指定的应用程序",
           icon: "visibility",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -91,11 +80,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.minimize",
           label: "最小化窗口",
-          desc: "最小化指定应用的窗口",
           icon: "minimize",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -107,11 +94,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.maximize",
           label: "最大化窗口",
-          desc: "最大化指定应用的窗口",
           icon: "maximize",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -123,11 +108,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.getWindows",
           label: "获取窗口信息",
-          desc: "获取指定应用的所有窗口信息",
           icon: "window",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -139,11 +122,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.app.getScriptDictionary",
           label: "获取应用脚本字典",
-          desc: "获取应用程序的AppleScript字典内容",
           icon: "code",
           config: [
             {
-              key: "appName",
               label: "应用名称",
               component: "VariableInput",
               icon: "apps",
@@ -157,18 +138,15 @@ export const macosCommands = {
     {
       value: "quickcomposer.macos.system.setVolume",
       label: "系统管理",
-      desc: "系统级别的控制功能",
       icon: "settings",
       isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.macos.system.setVolume",
           label: "系统音量",
-          desc: "调整系统音量",
           icon: "volume_up",
           config: [
             {
-              key: "volume",
               label: "音量",
               component: "NumberInput",
               icon: "volume_up",
@@ -183,23 +161,19 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.lockScreen",
           label: "锁定屏幕",
-          desc: "锁定系统屏幕",
           icon: "lock",
         },
         {
           value: "quickcomposer.macos.system.sleep",
           label: "进入睡眠",
-          desc: "使系统进入睡眠状态",
           icon: "bedtime",
         },
         {
           value: "quickcomposer.macos.system.setDockPosition",
           label: "设置Dock位置",
-          desc: "设置Dock栏的显示位置",
           icon: "dock",
           config: [
             {
-              key: "position",
               label: "位置",
               component: "ButtonGroup",
               defaultValue: "bottom",
@@ -224,11 +198,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.setDockSize",
           label: "设置Dock大小",
-          desc: "设置Dock栏的图标大小",
           icon: "dock",
           config: [
             {
-              key: "size",
               label: "大小",
               component: "NumberInput",
               icon: "dock",
@@ -242,11 +214,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.toggleDockAutohide",
           label: "Dock自动隐藏",
-          desc: "设置Dock栏是否自动隐藏",
           icon: "dock",
           config: [
             {
-              key: "enabled",
               label: "启用",
               component: "CheckButton",
               defaultValue: false,
@@ -258,11 +228,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.toggleMenuBarAutohide",
           label: "菜单栏自动隐藏",
-          desc: "设置菜单栏是否自动隐藏",
           icon: "menu",
           config: [
             {
-              key: "enabled",
               label: "启用",
               component: "CheckButton",
               defaultValue: false,
@@ -274,11 +242,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.system.toggleDarkMode",
           label: "深色模式",
-          desc: "切换系统深色模式",
           icon: "dark_mode",
           config: [
             {
-              key: "enabled",
               label: "启用",
               component: "CheckButton",
               defaultValue: true,
@@ -292,7 +258,6 @@ export const macosCommands = {
     {
       value: "quickcomposer.macos.finder.getSelection",
       label: "访达管理",
-      desc: "访达操作和文件管理功能",
       icon: "folder",
       isAsync: true,
       subCommands: [
@@ -312,7 +277,6 @@ export const macosCommands = {
           icon: "visibility",
           config: [
             {
-              key: "show",
               label: "显示",
               component: "CheckButton",
               width: 12,
@@ -323,17 +287,14 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.finder.getWindows",
           label: "获取窗口列表",
-          desc: "获取所有访达窗口信息",
           icon: "window",
         },
         {
           value: "quickcomposer.macos.finder.activateWindow",
           label: "激活窗口",
-          desc: "激活指定的访达窗口",
           icon: "open_in_new",
           config: [
             {
-              key: "index",
               label: "窗口索引",
               component: "NumberInput",
               icon: "window",
@@ -348,18 +309,15 @@ export const macosCommands = {
     {
       value: "quickcomposer.macos.browser.getUrl",
       label: "浏览器控制",
-      desc: "浏览器管理功能",
       icon: "web",
       isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.macos.browser.getUrl",
           label: "获取当前地址",
-          desc: "获取当前标签页的URL地址",
           icon: "link",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -379,11 +337,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.setUrl",
           label: "设置当前地址",
-          desc: "设置当前标签页的URL地址",
           icon: "link",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -399,7 +355,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "url",
               label: "网址",
               component: "VariableInput",
               icon: "link",
@@ -411,11 +366,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.getTabs",
           label: "获取标签列表",
-          desc: "获取所有打开的标签页信息",
           icon: "tab",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -435,11 +388,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.activateTab",
           label: "切换标签",
-          desc: "切换到指定的标签页",
           icon: "tab_unselected",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -455,7 +406,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "index",
               label: "标签索引",
               component: "NumberInput",
               icon: "tab",
@@ -468,11 +418,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.executeScript",
           label: "执行脚本",
-          desc: "在当前标签页执行JavaScript脚本",
           icon: "code",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -488,7 +436,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "script",
               label: "脚本内容",
               component: "CodeEditor",
               icon: "code",
@@ -496,7 +443,6 @@ export const macosCommands = {
               placeholder: "输入JavaScript代码",
             },
             {
-              key: "args",
               topLabel: "要传递的参数",
               component: "DictEditor",
               icon: "data_array",
@@ -507,11 +453,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.clickElement",
           label: "点击元素",
-          desc: "点击指定的页面元素",
           icon: "mouse",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -527,7 +471,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -539,11 +482,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.inputText",
           label: "输入文本",
-          desc: "在指定输入框中输入文本",
           icon: "edit",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -559,7 +500,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -567,7 +507,6 @@ export const macosCommands = {
               placeholder: "输入CSS选择器",
             },
             {
-              key: "text",
               label: "文本内容",
               component: "VariableInput",
               icon: "edit",
@@ -579,11 +518,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.getText",
           label: "获取文本",
-          desc: "获取指定元素的文本内容",
           icon: "text_fields",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -599,7 +536,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -611,11 +547,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.hideElement",
           label: "隐藏元素",
-          desc: "隐藏指定的页面元素",
           icon: "visibility_off",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -631,7 +565,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -643,11 +576,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.showElement",
           label: "显示元素",
-          desc: "显示指定的页面元素",
           icon: "visibility",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -663,7 +594,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -675,11 +605,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.injectCSS",
           label: "注入CSS",
-          desc: "向页面注入CSS样式",
           icon: "style",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -695,7 +623,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "css",
               label: "CSS内容",
               component: "CodeEditor",
               icon: "style",
@@ -707,11 +634,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.setCookie",
           label: "设置Cookie",
-          desc: "设置浏览器Cookie",
           icon: "cookie",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -791,11 +716,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.getCookie",
           label: "获取Cookie",
-          desc: "获取指定的Cookie值",
           icon: "cookie",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -811,7 +734,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "name",
               label: "名称",
               component: "VariableInput",
               icon: "label",
@@ -823,11 +745,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.scrollTo",
           label: "滚动到位置",
-          desc: "滚动到指定坐标位置",
           icon: "open_in_full",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -843,7 +763,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "x",
               label: "X坐标",
               component: "NumberInput",
               icon: "arrow_right",
@@ -851,7 +770,6 @@ export const macosCommands = {
               defaultValue: 0,
             },
             {
-              key: "y",
               label: "Y坐标",
               component: "NumberInput",
               icon: "arrow_drop_down",
@@ -863,11 +781,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.scrollToElement",
           label: "滚动到元素",
-          desc: "滚动到指定元素位置",
           icon: "open_in_full",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -883,7 +799,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -895,11 +810,9 @@ export const macosCommands = {
         {
           value: "quickcomposer.macos.browser.waitForElement",
           label: "等待元素",
-          desc: "等待指定元素出现",
           icon: "hourglass_empty",
           config: [
             {
-              key: "browser",
               component: "ButtonGroup",
               defaultValue: "Microsoft Edge",
               options: [
@@ -915,7 +828,6 @@ export const macosCommands = {
               width: 12,
             },
             {
-              key: "selector",
               label: "选择器",
               component: "VariableInput",
               icon: "code",
@@ -923,7 +835,6 @@ export const macosCommands = {
               placeholder: "输入CSS选择器",
             },
             {
-              key: "timeout",
               label: "超时时间",
               component: "NumberInput",
               icon: "timer",
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 1d121aca..4c456304 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -8,11 +8,9 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.basic.evaluate",
       label: "基础运算",
-      desc: "基础数学运算",
       icon: "exposure",
       config: [
         {
-          key: "expression",
           label: "表达式",
           component: "VariableInput",
           icon: "functions",
@@ -33,7 +31,6 @@ export const mathCommands = {
           icon: "exposure",
           config: [
             {
-              key: "decimals",
               label: "小数位数",
               component: "NumberInput",
               icon: "pin",
@@ -68,11 +65,9 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.random.number",
       label: "随机数",
-      desc: "生成随机数",
       icon: "casino",
       config: [
         {
-          key: "min",
           label: "最小值",
           component: "NumberInput",
           icon: "arrow_downward",
@@ -80,7 +75,6 @@ export const mathCommands = {
           defaultValue: 0,
         },
         {
-          key: "max",
           label: "最大值",
           component: "NumberInput",
           icon: "arrow_upward",
@@ -88,7 +82,6 @@ export const mathCommands = {
           defaultValue: 100,
         },
         {
-          key: "count",
           label: "生成数量",
           component: "NumberInput",
           icon: "format_list_numbered",
@@ -97,7 +90,6 @@ export const mathCommands = {
           defaultValue: 1,
         },
         {
-          key: "decimals",
           label: "小数位数",
           component: "NumberInput",
           icon: "pin",
@@ -122,11 +114,9 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.statistics.mean",
       label: "统计计算",
-      desc: "统计学相关计算",
       icon: "bar_chart",
       config: [
         {
-          key: "numbers",
           label: "数据集合",
           component: "VariableInput",
           icon: "dataset",
@@ -192,7 +182,6 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.geometry.circle",
       label: "几何计算",
-      desc: "几何图形计算",
       icon: "architecture",
       subCommands: [
         {
@@ -201,7 +190,6 @@ export const mathCommands = {
           icon: "circle",
           config: [
             {
-              key: "radius",
               label: "半径",
               component: "NumberInput",
               icon: "radio_button_checked",
@@ -216,7 +204,6 @@ export const mathCommands = {
           icon: "rectangle",
           config: [
             {
-              key: "width",
               label: "宽度",
               component: "NumberInput",
               icon: "swap_horiz",
@@ -224,7 +211,6 @@ export const mathCommands = {
               min: 0,
             },
             {
-              key: "height",
               label: "高度",
               component: "NumberInput",
               icon: "height",
@@ -239,7 +225,6 @@ export const mathCommands = {
           icon: "change_history",
           config: [
             {
-              key: "a",
               label: "边长a",
               component: "NumberInput",
               icon: "straighten",
@@ -247,7 +232,6 @@ export const mathCommands = {
               min: 0,
             },
             {
-              key: "b",
               label: "边长b",
               component: "NumberInput",
               icon: "straighten",
@@ -255,7 +239,6 @@ export const mathCommands = {
               min: 0,
             },
             {
-              key: "c",
               label: "边长c",
               component: "NumberInput",
               icon: "straighten",
@@ -269,11 +252,9 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.trigonometry.sin",
       label: "三角函数",
-      desc: "三角函数计算",
       icon: "show_chart",
       config: [
         {
-          key: "angle",
           label: "角度值",
           component: "NumberInput",
           icon: "rotate_right",
@@ -316,11 +297,9 @@ export const mathCommands = {
     {
       value: "quickcomposer.math.conversion.base",
       label: "进制转换",
-      desc: "数字进制转换",
       icon: "swap_horiz",
       config: [
         {
-          key: "value",
           label: "数值",
           component: "VariableInput",
           icon: "pin",
@@ -328,7 +307,6 @@ export const mathCommands = {
           defaultValue: newVarInputVal("var", ""),
         },
         {
-          key: "from",
           label: "从",
           component: "ButtonGroup",
           icon: "input",
@@ -342,7 +320,6 @@ export const mathCommands = {
           defaultValue: "decimal",
         },
         {
-          key: "to",
           label: "到",
           component: "ButtonGroup",
           icon: "output",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index cec7c324..d3cabd3f 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -10,7 +10,6 @@ export const networkCommands = {
       label: "默认浏览器打开网址",
       config: [
         {
-          key: "visit",
           label: "要访问的网址链接",
           component: "VariableInput",
           icon: "language",
@@ -22,7 +21,6 @@ export const networkCommands = {
       label: "ubrowser打开网址",
       config: [
         {
-          key: "url",
           label: "要访问的网址链接",
           component: "VariableInput",
           icon: "public",
@@ -51,7 +49,6 @@ export const networkCommands = {
     {
       value: "quickcomposer.network.url.parse",
       label: "URL操作",
-      desc: "URL解析、格式化和参数处理",
       icon: "link",
       config: [],
       subCommands: [
@@ -250,7 +247,6 @@ export const networkCommands = {
     {
       value: "quickcomposer.network.dns.lookupHost",
       label: "DNS操作",
-      desc: "DNS解析和查询",
       icon: "dns",
       isAsync: true,
       config: [],
@@ -394,7 +390,6 @@ export const networkCommands = {
     {
       value: "quickcommand.downloadFile",
       label: "下载文件",
-      desc: "下载文件",
       icon: "file_download",
       isAsync: true,
       config: [
@@ -417,7 +412,6 @@ export const networkCommands = {
     {
       value: "quickcommand.uploadFile",
       label: "上传文件",
-      desc: "上传文件",
       icon: "file_upload",
       isAsync: true,
       config: [
diff --git a/src/js/composer/commands/notifyCommands.js b/src/js/composer/commands/notifyCommands.js
index 817afb72..718542f8 100644
--- a/src/js/composer/commands/notifyCommands.js
+++ b/src/js/composer/commands/notifyCommands.js
@@ -8,7 +8,6 @@ export const notifyCommands = {
       label: "显示消息",
       config: [
         {
-          key: "log",
           label: "要打印的消息文本",
           component: "VariableInput",
           icon: "info",
@@ -20,7 +19,6 @@ export const notifyCommands = {
       label: "发送系统消息",
       config: [
         {
-          key: "notification",
           label: "要发送的系统消息文本",
           component: "VariableInput",
           icon: "message",
diff --git a/src/js/composer/commands/otherCommands.js b/src/js/composer/commands/otherCommands.js
index 92c9e96c..4268ac36 100644
--- a/src/js/composer/commands/otherCommands.js
+++ b/src/js/composer/commands/otherCommands.js
@@ -8,7 +8,6 @@ export const otherCommands = {
       label: "添加延时",
       config: [
         {
-          key: "ms",
           label: "延迟的毫秒数",
           component: "NumberInput",
           min: 0,
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
index fb90e32c..92f66378 100644
--- a/src/js/composer/commands/screenCommands.js
+++ b/src/js/composer/commands/screenCommands.js
@@ -72,7 +72,6 @@ export const screenCommands = {
     {
       value: "utools.getPrimaryDisplay",
       label: "获取显示器信息",
-      desc: "获取显示器信息",
       icon: "monitor",
       outputVariable: "display",
       saveOutput: true,
@@ -104,7 +103,6 @@ export const screenCommands = {
     {
       value: "utools.screenToDipPoint",
       label: "物理/DIP坐标转换",
-      desc: "屏幕物理坐标和 DIP 坐标转换",
       icon: "transform",
       outputVariable: "{x,y}",
       saveOutput: true,
@@ -125,7 +123,6 @@ export const screenCommands = {
     {
       value: "utools.screenToDipRect",
       label: "物理/DIP区域转换",
-      desc: "屏幕物理区域和 DIP 区域转换",
       icon: "transform",
       outputVariable: "{x,y,width,height}",
       saveOutput: true,
@@ -134,13 +131,11 @@ export const screenCommands = {
         {
           value: "utools.screenToDipRect",
           label: "物理区域转DIP区域",
-          desc: "屏幕物理区域转 DIP 区域",
           icon: "transform",
         },
         {
           value: "utools.dipToScreenRect",
           label: "DIP区域转物理区域",
-          desc: "DIP 区域转屏幕物理区域",
           icon: "transform",
         },
       ],
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 54d72079..0a0f70d3 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -14,7 +14,6 @@ export const simulateCommands = {
     {
       value: "quickcomposer.simulate.keySequence",
       label: "按键序列",
-      description: "按顺序执行多个按键操作",
       component: "KeySequenceEditor",
     },
     {
@@ -39,7 +38,6 @@ export const simulateCommands = {
       label: "发送文本",
       config: [
         {
-          key: "text",
           label: "要发送的文本内容",
           component: "VariableInput",
           icon: "send",
@@ -70,7 +68,6 @@ export const simulateCommands = {
           icon: "file_copy",
           config: [
             {
-              key: "file",
               label: "文件路径",
               component: "VariableInput",
               icon: "description",
@@ -97,7 +94,6 @@ export const simulateCommands = {
           icon: "image",
           config: [
             {
-              key: "image",
               label: "图片路径/base64",
               component: "VariableInput",
               icon: "image",
@@ -198,7 +194,6 @@ export const simulateCommands = {
     {
       value: "quickcomposer.simulate.screenColorPick",
       label: "屏幕取色",
-      desc: "获取用户选择的颜色，会弹出一个系统取色器",
       icon: "colorize",
       isAsync: true,
       outputVariable: "{hex,rgb}",
@@ -207,14 +202,12 @@ export const simulateCommands = {
     {
       value: "quickcomposer.simulate.captureScreen",
       label: "屏幕截图",
-      desc: "屏幕截图，进行区域截图或全屏截图",
       icon: "screenshot_monitor",
       isAsync: true,
       outputVariable: "base64Data",
       saveOutput: true,
       config: [
         {
-          key: "range",
           label: "截图范围",
           component: "ButtonGroup",
           options: [
@@ -243,7 +236,6 @@ export const simulateCommands = {
           icon: "file_copy",
           config: [
             {
-              key: "path",
               label: "截图保存路径",
               component: "VariableInput",
               defaultValue: newVarInputVal(
diff --git a/src/js/composer/commands/statusCommands.js b/src/js/composer/commands/statusCommands.js
index 3d295993..ce2bf110 100644
--- a/src/js/composer/commands/statusCommands.js
+++ b/src/js/composer/commands/statusCommands.js
@@ -5,7 +5,6 @@ export const statusCommands = {
     {
       value: "utools.readCurrentFolderPath",
       label: "获取当前文件管理器路径",
-      desc: "获取当前文件管理器窗口路径",
       icon: "folder",
       isAsync: true,
       outputVariable: "currentFolderPath",
@@ -14,7 +13,6 @@ export const statusCommands = {
     {
       value: "utools.readCurrentBrowserUrl",
       label: "获取当前浏览器地址",
-      desc: "获取当前浏览器窗口URL",
       icon: "language",
       isAsync: true,
       outputVariable: "currentBrowserUrl",
@@ -23,7 +21,6 @@ export const statusCommands = {
     {
       value: "quickcomposer.status.getSelectedText",
       label: "获取选中文本",
-      desc: "获取选中的文本",
       icon: "text_fields",
       isAsync: true,
       outputVariable: "selectedText",
@@ -32,7 +29,6 @@ export const statusCommands = {
     {
       value: "quickcomposer.status.getSelectedImage",
       label: "获取选中的图片",
-      desc: "获取选中的图片",
       icon: "image",
       isAsync: true,
       outputVariable: "selectedImage",
@@ -41,7 +37,6 @@ export const statusCommands = {
     {
       value: "quickcomposer.status.getSelectedFiles",
       label: "获取选中的文件",
-      desc: "获取选中的文件",
       icon: "file_present",
       isAsync: true,
       outputVariable: "selectedFiles",
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 9d2eb3c8..afe9c75d 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -15,7 +15,6 @@ export const systemCommands = {
           icon: "content_copy",
           config: [
             {
-              key: "content",
               label: "要写入剪切板的内容",
               component: "VariableInput",
               icon: "content_copy",
@@ -28,7 +27,6 @@ export const systemCommands = {
           icon: "image",
           config: [
             {
-              key: "image",
               label: "图片路径/base64",
               component: "VariableInput",
               icon: "image",
@@ -50,7 +48,6 @@ export const systemCommands = {
           icon: "file_copy",
           config: [
             {
-              key: "file",
               label: "文件路径",
               component: "VariableInput",
               icon: "file_copy",
@@ -108,7 +105,6 @@ export const systemCommands = {
     {
       value: "quickcomposer.system.exec",
       label: "执行系统命令",
-      desc: "执行系统命令并返回输出结果",
       component: "SystemCommandEditor",
       icon: "terminal",
       isAsync: true,
@@ -116,7 +112,6 @@ export const systemCommands = {
     {
       value: "utools.getPath",
       label: "获取系统路径",
-      desc: "获取系统路径",
       outputVariable: "systemPath",
       saveOutput: true,
       defaultValue: "home",
@@ -188,7 +183,6 @@ export const systemCommands = {
     {
       value: "utools.isMacOS",
       label: "判断系统类型",
-      desc: "判断系统类型",
       subCommands: [
         {
           value: "utools.isMacOS",
@@ -210,7 +204,6 @@ export const systemCommands = {
     {
       value: "quickcomposer.system.os.arch",
       label: "系统信息",
-      desc: "获取操作系统相关信息",
       icon: "computer",
       config: [],
       subCommands: [
@@ -306,7 +299,6 @@ export const systemCommands = {
     {
       value: "quickcomposer.system.path.normalize",
       label: "路径操作",
-      desc: "路径解析和处理",
       icon: "folder",
       config: [],
       subCommands: [
@@ -493,7 +485,6 @@ export const systemCommands = {
     {
       value: "quickcommand.kill",
       label: "关闭进程",
-      desc: "关闭指定进程",
       icon: "dangerous",
       config: [
         {
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index ec4d9aa5..0254d85a 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -111,7 +111,6 @@ export const uiCommands = {
     {
       value: "quickcommand.showMessageBox",
       label: "消息提示",
-      desc: "显示一个自动消失的提示框",
       isAsync: true,
       config: [
         {
@@ -169,7 +168,6 @@ export const uiCommands = {
     {
       value: "quickcommand.showConfirmBox",
       label: "确认框",
-      desc: "显示一个确认框，返回是否点击了确认",
       isAsync: true,
       outputVariable: "confirmed",
       saveOutput: true,
@@ -310,14 +308,12 @@ export const uiCommands = {
     {
       value: "quickcommand.showSelectList",
       label: "选择列表",
-      desc: "显示一个支持搜索的选项列表，可以动态更新选项",
       component: "SelectListEditor",
       isAsync: true,
     },
     {
       value: "quickcommand.showTextArea",
       label: "文本框",
-      desc: "显示一个文本框，可以输入多行文本",
       isAsync: true,
       outputVariable: "textareaValue",
       saveOutput: true,
@@ -365,14 +361,12 @@ export const uiCommands = {
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
-      desc: "显示一个文件选择框，返回选择的文件路径",
       outputVariable: "filePaths",
       saveOutput: true,
       subCommands: [
         {
           value: "utools.showOpenDialog",
           label: "打开文件对话框",
-          desc: "打开文件对话框",
           icon: "folder_open",
           config: [
             {
@@ -389,7 +383,6 @@ export const uiCommands = {
         {
           value: "utools.showSaveDialog",
           label: "保存文件对话框",
-          desc: "保存文件对话框",
           icon: "save",
           config: [
             {
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 961aa564..24e0f483 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -5,23 +5,19 @@ export const utoolsCommands = {
     {
       value: "utools.hideMainWindow",
       label: "隐藏主窗口",
-      desc: "隐藏主窗口",
       icon: "visibility_off",
     },
     {
       value: "quickcommand.wakeUtools",
       label: "唤醒uTools",
-      desc: "唤醒uTools",
       icon: "visibility",
     },
     {
       value: "utools.setExpendHeight",
       label: "设置uTools高度",
-      desc: "设置uTools高度",
       icon: "height",
       config: [
         {
-          key: "height",
           label: "高度",
           component: "NumberInput",
           min: 0,
@@ -34,11 +30,9 @@ export const utoolsCommands = {
     {
       value: "utools.outPlugin",
       label: "退出插件",
-      desc: "退出插件",
       icon: "exit_to_app",
       config: [
         {
-          key: "isKill",
           component: "q-select",
           options: [
             { label: "杀死插件进程", value: true },
@@ -52,7 +46,6 @@ export const utoolsCommands = {
     {
       value: "utools.isDarkColors",
       label: "是否深色模式",
-      desc: "是否深色模式",
       icon: "dark_mode",
       outputVariable: "isDark",
       saveOutput: true,
@@ -60,7 +53,6 @@ export const utoolsCommands = {
     {
       value: "utools.getUser",
       label: "获取用户信息",
-      desc: "获取用户信息",
       icon: "person",
       outputVariable: "{avatar,nickname,type}",
       saveOutput: true,
@@ -70,14 +62,12 @@ export const utoolsCommands = {
       label: "转至指定插件",
       config: [
         {
-          key: "pluginName",
           label: "要跳转至的插件名称",
           component: "VariableInput",
           icon: "alt_route",
           width: 6,
         },
         {
-          key: "payload",
           label: "传递给插件的文本",
           component: "VariableInput",
           icon: "alt_route",
@@ -88,24 +78,20 @@ export const utoolsCommands = {
     {
       value: "utools.findInPage",
       label: "插件内查找",
-      desc: "插件内查找",
       icon: "search",
       subCommands: [
         {
           value: "utools.findInPage",
           label: "查找文本",
-          desc: "查找文本",
           icon: "search",
           config: [
             {
-              key: "text",
               label: "文本",
               component: "VariableInput",
               icon: "search",
               width: 12,
             },
             {
-              key: "options",
               label: "选项",
               component: "OptionEditor",
               icon: "settings",
@@ -155,11 +141,9 @@ export const utoolsCommands = {
         {
           value: "utools.stopFindInPage",
           label: "停止查找",
-          desc: "停止查找",
           icon: "stop",
           config: [
             {
-              key: "action",
               label: "动作",
               component: "ButtonGroup",
               icon: "settings",
@@ -178,7 +162,6 @@ export const utoolsCommands = {
     {
       value: "utools.getWindowType",
       label: "获取当前窗口类型",
-      desc: "获取当前窗口类型",
       icon: "window",
       outputVariable: "windowType",
       saveOutput: true,
@@ -186,14 +169,12 @@ export const utoolsCommands = {
     {
       value: "utools.getNativeId",
       label: "获取本地ID",
-      desc: "获取本地ID",
       outputVariable: "nativeId",
       saveOutput: true,
     },
     {
       value: "utools.getAppVersion",
       label: "获取uTools版本",
-      desc: "获取uTools版本",
       outputVariable: "appVersion",
       saveOutput: true,
     },
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index f8e5a0f4..63a61db8 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -155,7 +155,6 @@ const registryPaths = [
 
 const searchWindowConfig = [
   {
-    key: "method",
     label: "窗口查找方式",
     component: "q-select",
     icon: "search",
@@ -170,7 +169,6 @@ const searchWindowConfig = [
     defaultValue: "title",
   },
   {
-    key: "value",
     label: "窗口标题/类名/句柄/进程名/活动窗口",
     component: "VariableInput",
     icon: "title",
@@ -219,7 +217,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.window.getWindowInfo",
       label: "搜索/选择窗口",
-      desc: "搜索/选择窗口",
       icon: "window",
       isAsync: true,
       config: [],
@@ -269,7 +266,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.window.setTopMost",
       label: "窗口控制",
-      desc: "Windows窗口操作",
       icon: "window",
       config: searchWindowConfig,
       subCommands: [
@@ -279,7 +275,6 @@ export const windowsCommands = {
           icon: "vertical_align_top",
           config: [
             {
-              key: "isTopMost",
               component: "ButtonGroup",
               icon: "push_pin",
               width: 12,
@@ -297,7 +292,6 @@ export const windowsCommands = {
           icon: "opacity",
           config: [
             {
-              key: "opacity",
               label: "透明度",
               component: "NumberInput",
               icon: "opacity",
@@ -314,7 +308,6 @@ export const windowsCommands = {
           icon: "aspect_ratio",
           config: [
             {
-              key: "x",
               label: "X坐标",
               component: "NumberInput",
               icon: "arrow_right",
@@ -322,7 +315,6 @@ export const windowsCommands = {
               defaultValue: 0,
             },
             {
-              key: "y",
               label: "Y坐标",
               component: "NumberInput",
               icon: "arrow_drop_down",
@@ -330,7 +322,6 @@ export const windowsCommands = {
               defaultValue: 0,
             },
             {
-              key: "width",
               label: "宽度",
               component: "NumberInput",
               icon: "swap_horiz",
@@ -339,7 +330,6 @@ export const windowsCommands = {
               defaultValue: 800,
             },
             {
-              key: "height",
               label: "高度",
               component: "NumberInput",
               icon: "height",
@@ -355,7 +345,6 @@ export const windowsCommands = {
           icon: "open_in_full",
           config: [
             {
-              key: "state",
               component: "ButtonGroup",
               icon: "aspect_ratio",
               width: 12,
@@ -384,7 +373,6 @@ export const windowsCommands = {
           icon: "border_style",
           config: [
             {
-              key: "hasBorder",
               component: "ButtonGroup",
               icon: "border_style",
               width: 12,
@@ -402,7 +390,6 @@ export const windowsCommands = {
           icon: "touch_app",
           config: [
             {
-              key: "isTransparent",
               component: "ButtonGroup",
               icon: "touch_app",
               width: 12,
@@ -421,7 +408,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.automation.click",
       label: "界面自动化",
-      desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,
       config: searchElementConfig,
@@ -631,7 +617,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.sendmessage.inspectWindow",
       label: "发送控制消息",
-      desc: "Windows界面自动化操作",
       icon: "smart_button",
       isAsync: true,
       config: searchWindowConfig,
@@ -644,7 +629,6 @@ export const windowsCommands = {
           saveOutput: true,
           config: [
             {
-              key: "options",
               component: "OptionEditor",
               width: 12,
               options: {
@@ -677,7 +661,6 @@ export const windowsCommands = {
           icon: "mouse",
           config: [
             {
-              key: "action",
               component: "ButtonGroup",
               width: 12,
               options: [
@@ -688,7 +671,6 @@ export const windowsCommands = {
               defaultValue: "click",
             },
             {
-              key: "options",
               component: "OptionEditor",
               width: 12,
               options: {
@@ -735,7 +717,6 @@ export const windowsCommands = {
           icon: "keyboard",
           config: [
             {
-              key: "text",
               label: "文本内容",
               component: "VariableInput",
               icon: "text_fields",
@@ -743,7 +724,6 @@ export const windowsCommands = {
               placeholder: "要发送的文本内容",
             },
             {
-              key: "options",
               component: "OptionEditor",
               width: 12,
               options: {
@@ -776,7 +756,6 @@ export const windowsCommands = {
           icon: "keyboard_alt",
           config: [
             {
-              key: "keys",
               label: "按键序列",
               component: "VariableInput",
               icon: "keyboard",
@@ -788,7 +767,6 @@ export const windowsCommands = {
               },
             },
             {
-              key: "options",
               component: "OptionEditor",
               width: 12,
               options: {
@@ -821,7 +799,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.monitor.watchClipboard",
       label: "剪贴板/文件监控",
-      desc: "监控系统变化",
       icon: "monitor_heart",
       isAsync: true,
       outputVariable: "monitorEvent",
@@ -856,7 +833,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "options",
               component: "OptionEditor",
               width: 12,
               options: {
@@ -887,7 +863,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.process.listProcesses",
       label: "进程管理",
-      desc: "Windows进程操作",
       icon: "memory",
       isAsync: true,
       subCommands: [
@@ -904,7 +879,6 @@ export const windowsCommands = {
           icon: "stop_circle",
           config: [
             {
-              key: "target",
               label: "进程ID/名称",
               component: "VariableInput",
               icon: "tag",
@@ -920,7 +894,6 @@ export const windowsCommands = {
           icon: "play_circle",
           config: [
             {
-              key: "path",
               label: "程序路径",
               component: "VariableInput",
               icon: "folder",
@@ -940,7 +913,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "arguments",
               label: "启动参数",
               component: "VariableInput",
               icon: "code",
@@ -955,12 +927,10 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.registry.listKeys",
       label: "注册表管理",
-      desc: "Windows注册表操作",
       icon: "settings",
       isAsync: true,
       config: [
         {
-          key: "path",
           label: "注册表路径",
           component: "VariableInput",
           icon: "folder",
@@ -986,7 +956,6 @@ export const windowsCommands = {
           icon: "search",
           config: [
             {
-              key: "path",
               label: "注册表路径",
               component: "VariableInput",
               icon: "folder",
@@ -998,7 +967,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "name",
               label: "值名称",
               component: "VariableInput",
               icon: "label",
@@ -1015,7 +983,6 @@ export const windowsCommands = {
           icon: "edit",
           config: [
             {
-              key: "path",
               label: "注册表路径",
               component: "VariableInput",
               icon: "folder",
@@ -1027,7 +994,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "name",
               label: "值名称",
               component: "VariableInput",
               icon: "label",
@@ -1036,7 +1002,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "value",
               label: "值内容",
               component: "VariableInput",
               icon: "text_fields",
@@ -1044,7 +1009,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "valueType",
               label: "值类型",
               component: "q-select",
               icon: "category",
@@ -1067,7 +1031,6 @@ export const windowsCommands = {
           icon: "delete",
           config: [
             {
-              key: "path",
               label: "注册表路径",
               component: "VariableInput",
               icon: "folder",
@@ -1079,7 +1042,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "name",
               label: "值名称",
               component: "VariableInput",
               icon: "label",
@@ -1094,7 +1056,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.service.listServices",
       label: "服务管理",
-      desc: "Windows服务操作",
       icon: "miscellaneous_services",
       isAsync: true,
       subCommands: [
@@ -1111,7 +1072,6 @@ export const windowsCommands = {
           icon: "settings",
           config: [
             {
-              key: "name",
               label: "服务名称",
               component: "VariableInput",
               icon: "label",
@@ -1120,7 +1080,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "operation",
               label: "操作",
               component: "ButtonGroup",
               icon: "play_circle",
@@ -1141,7 +1100,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.software.listSoftware",
       label: "软件管理",
-      desc: "Windows软件操作",
       icon: "apps",
       isAsync: true,
       subCommands: [
@@ -1158,7 +1116,6 @@ export const windowsCommands = {
           icon: "delete",
           config: [
             {
-              key: "target",
               label: "软件ID",
               component: "VariableInput",
               icon: "tag",
@@ -1174,7 +1131,6 @@ export const windowsCommands = {
     {
       value: "quickcomposer.windows.utils.setWallpaper",
       label: "系统工具",
-      desc: "Windows系统工具",
       icon: "build",
       isAsync: true,
       subCommands: [
@@ -1184,7 +1140,6 @@ export const windowsCommands = {
           icon: "wallpaper",
           config: [
             {
-              key: "path",
               label: "壁纸路径",
               component: "VariableInput",
               icon: "image",
@@ -1213,7 +1168,6 @@ export const windowsCommands = {
           icon: "desktop_windows",
           config: [
             {
-              key: "action",
               component: "ButtonGroup",
               icon: "power_settings_new",
               width: 12,
@@ -1231,7 +1185,6 @@ export const windowsCommands = {
           icon: "power",
           config: [
             {
-              key: "mode",
               component: "ButtonGroup",
               icon: "power_settings_new",
               width: 12,
@@ -1251,7 +1204,6 @@ export const windowsCommands = {
           icon: "network_check",
           config: [
             {
-              key: "interfaceName",
               label: "网卡名称",
               component: "VariableInput",
               icon: "settings_ethernet",
@@ -1260,7 +1212,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "ip",
               label: "IP地址",
               component: "VariableInput",
               icon: "router",
@@ -1269,7 +1220,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "mask",
               label: "子网掩码",
               component: "VariableInput",
               icon: "filter_alt",
@@ -1278,7 +1228,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "gateway",
               label: "默认网关",
               component: "VariableInput",
               icon: "dns",
@@ -1286,7 +1235,6 @@ export const windowsCommands = {
               placeholder: "可选",
             },
             {
-              key: "dns",
               label: "DNS服务器",
               component: "VariableInput",
               icon: "dns",
@@ -1301,7 +1249,6 @@ export const windowsCommands = {
           icon: "power",
           config: [
             {
-              key: "path",
               label: "程序路径",
               component: "VariableInput",
               icon: "folder",
@@ -1321,7 +1268,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "name",
               label: "启动项名称",
               component: "VariableInput",
               icon: "label",
@@ -1329,7 +1275,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "remove",
               label: "移除",
               component: "CheckButton",
               icon: "delete",
@@ -1343,7 +1288,6 @@ export const windowsCommands = {
           icon: "link",
           config: [
             {
-              key: "targetPath",
               label: "目标路径",
               component: "VariableInput",
               icon: "folder",
@@ -1360,7 +1304,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "shortcutPath",
               label: "快捷方式路径",
               component: "VariableInput",
               icon: "save",
@@ -1377,7 +1320,6 @@ export const windowsCommands = {
               required: true,
             },
             {
-              key: "args",
               label: "启动参数",
               component: "VariableInput",
               icon: "code",
@@ -1392,7 +1334,6 @@ export const windowsCommands = {
           icon: "brightness_medium",
           config: [
             {
-              key: "level",
               label: "亮度级别",
               component: "NumberInput",
               icon: "brightness_medium",

From 7a7cb8dd544496794f12cd1b5b34455fa1e4ad56 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 09:02:00 +0800
Subject: [PATCH 067/332] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E6=B7=BB=E5=8A=A0=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/automation.cs               | 53 +++++++++++--------
 .../lib/quickcomposer/windows/automation.js   | 16 +++---
 src/js/composer/commands/windowsCommands.js   | 29 +++++++---
 3 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
index 175aa4d1..704e2daa 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/automation.cs
@@ -94,6 +94,9 @@ public System.Windows.Point ToWindowsPoint()
   [DllImport("user32.dll")]
   private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
 
+  [DllImport("user32.dll")]
+  private static extern bool EnableWindow(IntPtr hWnd, bool bEnable);
+
   [StructLayout(LayoutKind.Sequential)]
   private struct RECT
   {
@@ -121,6 +124,7 @@ private struct RECT
   private static Form overlayForm;
   private static Form previewForm;
   private static AutomationElement lastElement;
+  private static Point lastCursorPos;
   private static bool completed;
 
   private static CacheRequest CreateCacheRequest()
@@ -318,6 +322,11 @@ public static void Main(string[] args)
           SendKeys(GetTargetElement(args), keys);
           break;
 
+        case "enable":
+          bool enable = GetArgumentValue(args, "-enable") == "true";
+          EnableElement(GetTargetElement(args), enable);
+          break;
+
         default:
           throw new Exception(string.Format("不支持的操作类型: {0}", type));
       }
@@ -586,18 +595,10 @@ 11. sendkeys - 发送按键
     - {DIVIDE} - 数字键盘除号键
     - {NUMPAD0} - {NUMPAD9} - 数字键盘数字键
 
-    修饰键:
-    + (加号) - SHIFT
-    ^ (脱字号) - CTRL
-    % (百分号) - ALT
-
+12. enable - 启用/禁用元素
+    参数: -xpath <XPath路径> -enable <true/false> [-window <窗口句柄>]
     示例:
-    - 输入文本: -keys ""Hello""
-    - 按Enter键: -keys ""{ENTER}""
-    - 按Ctrl+C: -keys ""^c""
-    - 按Ctrl+Home: -keys ""^{HOME}""
-    - 按Alt+F4: -keys ""%{F4}""
-    - 按Shift+Tab: -keys ""+{TAB}""
+    - 启用按钮: -xpath ""//Button[@Name='确定']"" -enable true
 
 通用参数:
 -window <窗口句柄> 指定要操作的窗口，如果不指定则使用当前活动窗口
@@ -1127,6 +1128,23 @@ private static ElementHierarchyInfo GetElementHierarchyInfo(AutomationElement el
     };
   }
 
+  private static void EnableElement(AutomationElement element, bool enable)
+  {
+    if (element == null)
+    {
+      throw new Exception("元素不能为空");
+    }
+    try
+    {
+      EnableWindow((IntPtr)element.Current.NativeWindowHandle, enable);
+      Console.WriteLine("true");
+    }
+    catch (Exception ex)
+    {
+      throw new Exception("无法更改元素的启用/禁用状态: " + ex.Message);
+    }
+  }
+
   private static void ClickElement(AutomationElement element)
   {
     if (element == null)
@@ -1310,7 +1328,7 @@ private static void InspectElement(string[] args)
     completed = false;  // 使用静态字段
     Rectangle lastRect = Rectangle.Empty;
     lastElement = null;
-    Point lastCursorPos = new Point();
+    lastCursorPos = new Point();
     AutomationElement taskbarElement = null;
     List<AutomationElement> taskbarChildren = null;
 
@@ -1474,12 +1492,7 @@ ref taskbarChildren
       {
         try
         {
-          mouseTimer.Stop();
-          overlayForm.Hide();
-          previewForm.Hide();
-
           InspectElementInfo(lastElement, lastCursorPos);
-          completed = true;
         }
         catch (Exception ex)
         {
@@ -1487,8 +1500,7 @@ ref taskbarChildren
         }
         finally
         {
-          overlayForm.Close();
-          previewForm.Close();
+          stopInspect();
         }
       }
     };
@@ -1684,6 +1696,7 @@ private static void HandleKeyPress(object sender, KeyPressEventArgs e)
           Clipboard.SetText(lastElement.Current.Name);
           if (e.KeyChar == 'x' || e.KeyChar == 'X')
           {
+            InspectElementInfo(lastElement, lastCursorPos);
             stopInspect();
           }
         }
@@ -1694,6 +1707,4 @@ private static void HandleKeyPress(object sender, KeyPressEventArgs e)
       }
     }
   }
-
-
 }
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index 4587175a..a834d37a 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -64,7 +64,7 @@ async function runAutomation(
       break;
 
     case "select":
-      if (params.item) {
+      if (params.item !== undefined) {
         args.push("-item", params.item);
       }
       break;
@@ -76,7 +76,7 @@ async function runAutomation(
       break;
 
     case "scroll":
-      if (params.direction) {
+      if (params.direction !== undefined) {
         args.push("-direction", params.direction);
       }
       if (params.amount !== undefined) {
@@ -85,9 +85,6 @@ async function runAutomation(
       break;
 
     case "wait":
-      if (params.condition) {
-        args.push("-condition", params.condition);
-      }
       if (params.timeout !== undefined) {
         args.push("-timeout", params.timeout);
       }
@@ -100,10 +97,16 @@ async function runAutomation(
       break;
 
     case "sendkeys":
-      if (params.keys) {
+      if (params.keys !== undefined) {
         args.push("-keys", params.keys);
       }
       break;
+
+    case "enable":
+      if (params.enable !== undefined) {
+        args.push("-enable", params.enable);
+      }
+      break;
   }
 
   let error;
@@ -144,4 +147,5 @@ module.exports = {
   focus: (...args) => runAutomation("focus", ...args),
   highlight: (...args) => runAutomation("highlight", ...args),
   sendkeys: (...args) => runAutomation("sendkeys", ...args),
+  enable: (...args) => runAutomation("enable", ...args),
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 63a61db8..b81d8252 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -491,6 +491,28 @@ export const windowsCommands = {
             },
           ],
         },
+        {
+          value: "quickcomposer.windows.automation.enable",
+          label: "启用/禁用元素",
+          icon: "toggle_on",
+          config: [
+            {
+              component: "OptionEditor",
+              options: {
+                enable: {
+                  component: "ButtonGroup",
+                  options: [
+                    { label: "启用", value: true },
+                    { label: "禁用", value: false },
+                  ],
+                },
+              },
+              defaultValue: {
+                enable: true,
+              },
+            },
+          ],
+        },
         {
           value: "quickcomposer.windows.automation.expand",
           label: "展开/折叠",
@@ -559,13 +581,6 @@ export const windowsCommands = {
             {
               component: "OptionEditor",
               options: {
-                condition: {
-                  label: "条件",
-                  component: "VariableInput",
-                  icon: "filter_alt",
-                  width: 8,
-                  placeholder: "name=xx;type=Button",
-                },
                 timeout: {
                   label: "超时(秒)",
                   component: "NumberInput",

From 0ee3647261dc1deaf57a60e687bd6a038078f309 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 11:18:08 +0800
Subject: [PATCH 068/332] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E7=AA=97=E5=8F=A3=E7=AE=A1=E7=90=86=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=8F=A5=E6=9F=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/sendmessage.cs              | 1538 ++++++++---------
 plugin/lib/csharp/window.cs                   |  643 +++----
 .../lib/quickcomposer/windows/automation.js   |    5 +-
 .../lib/quickcomposer/windows/sendmessage.js  |   41 +-
 plugin/lib/quickcomposer/windows/window.js    |   84 +-
 src/js/composer/commands/windowsCommands.js   |   16 +-
 6 files changed, 1142 insertions(+), 1185 deletions(-)

diff --git a/plugin/lib/csharp/sendmessage.cs b/plugin/lib/csharp/sendmessage.cs
index 66789cc9..484c110c 100644
--- a/plugin/lib/csharp/sendmessage.cs
+++ b/plugin/lib/csharp/sendmessage.cs
@@ -10,867 +10,827 @@
 
 public class AutomationTool
 {
-    #region Win32 API
-    [DllImport("user32.dll")]
-    private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+  #region Win32 API
+  [DllImport("user32.dll")]
+  private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
 
-    [DllImport("user32.dll")]
-    private static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
+  [DllImport("user32.dll")]
+  private static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
 
-    [DllImport("user32.dll")]
-    private static extern bool PostMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+  [DllImport("user32.dll")]
+  private static extern bool PostMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, StringBuilder lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool SetForegroundWindow(IntPtr hWnd);
 
-    [DllImport("user32.dll")]
-    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetFocus();
 
-    [DllImport("user32.dll")]
-    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, StringBuilder lParam);
+  [DllImport("user32.dll")]
+  private static extern int EnumChildWindows(IntPtr hWnd, EnumWindowProc lpEnumFunc, IntPtr lParam);
 
-    [DllImport("user32.dll")]
-    private static extern bool SetForegroundWindow(IntPtr hWnd);
+  [DllImport("user32.dll")]
+  private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetForegroundWindow();
 
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetFocus();
-
-    [DllImport("user32.dll")]
-    private static extern int EnumChildWindows(IntPtr hWnd, EnumWindowProc lpEnumFunc, IntPtr lParam);
-
-    [DllImport("user32.dll")]
-    private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
-
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetForegroundWindow();
-
-    [DllImport("user32.dll")]
-    private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-
-    [DllImport("user32.dll")]
-    private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
-
-    [DllImport("user32.dll")]
-    private static extern int GetWindowTextLength(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern bool IsWindowVisible(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-    [DllImport("user32.dll")]
-    private static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
-
-    [DllImport("user32.dll")]
-    private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+  [DllImport("user32.dll")]
+  private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+
+  [DllImport("user32.dll")]
+  private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+  [DllImport("user32.dll")]
+  private static extern int GetWindowTextLength(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsWindowVisible(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsWindow(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+  [DllImport("user32.dll")]
+  private static extern bool ScreenToClient(IntPtr hWnd, ref POINT lpPoint);
+
+  [DllImport("user32.dll")]
+  private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+  private const int WM_KEYDOWN = 0x0100;
+  private const int WM_KEYUP = 0x0101;
+  private const int WM_CHAR = 0x0102;
+  private const int WM_SETTEXT = 0x000C;
+  private const int WM_LBUTTONDOWN = 0x0201;
+  private const int WM_LBUTTONUP = 0x0202;
+  private const int WM_RBUTTONDOWN = 0x0204;
+  private const int WM_RBUTTONUP = 0x0205;
+  private const int WM_LBUTTONDBLCLK = 0x0203;
+
+  private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
+  private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+  [StructLayout(LayoutKind.Sequential)]
+  private struct RECT
+  {
+    public int Left;
+    public int Top;
+    public int Right;
+    public int Bottom;
+  }
+
+  [StructLayout(LayoutKind.Sequential)]
+  private struct POINT
+  {
+    public int X;
+    public int Y;
+  }
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetParent(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetAncestor(IntPtr hwnd, int flags);
+
+  private const int GA_ROOT = 2;
+
+  // 添加工具栏相关的常量和结构体
+  private const uint TB_BUTTONCOUNT = 0x0418;
+  private const uint TB_GETBUTTON = 0x0417;
+  private const uint TB_GETBUTTONTEXT = 0x042D;
+  private const uint TB_GETITEMRECT = 0x041D;
+
+  [StructLayout(LayoutKind.Sequential)]
+  private struct TBBUTTON
+  {
+    public int iBitmap;
+    public int idCommand;
+    public byte fsState;
+    public byte fsStyle;
+    public byte bReserved1;
+    public byte bReserved2;
+    public IntPtr dwData;
+    public IntPtr iString;
+  }
+
+  // 添加 SendMessage 重载
+  [DllImport("user32.dll")]
+  private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref TBBUTTON lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref RECT lParam);
+
+  [DllImport("user32.dll")]
+  private static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+  [DllImport("user32.dll")]
+  private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
+
+  private const uint MAPVK_VK_TO_VSC = 0x00;
+  private const uint MAPVK_VSC_TO_VK = 0x01;
+  private const uint MAPVK_VK_TO_CHAR = 0x02;
+  private const uint MAPVK_VSC_TO_VK_EX = 0x03;
+  #endregion
+
+  public static void Main(string[] args)
+  {
+    if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+    {
+      ShowHelp();
+      return;
+    }
 
-    private const int WM_KEYDOWN = 0x0100;
-    private const int WM_KEYUP = 0x0101;
-    private const int WM_CHAR = 0x0102;
-    private const int WM_SETTEXT = 0x000C;
-    private const int WM_LBUTTONDOWN = 0x0201;
-    private const int WM_LBUTTONUP = 0x0202;
-    private const int WM_RBUTTONDOWN = 0x0204;
-    private const int WM_RBUTTONUP = 0x0205;
-    private const int WM_LBUTTONDBLCLK = 0x0203;
+    try
+    {
+      List<IntPtr> targetWindows = FindTargetWindows(args);
+      if (targetWindows.Count == 0)
+      {
+        throw new Exception("未找到目标窗口");
+      }
+
+      string type = GetArgumentValue(args, "-type");
+      IntPtr targetHandle = targetWindows[0];  // 总是使用第一个窗口
+      Dictionary<string, object> operatedWindow = null;
+
+      switch (type.ToLower())
+      {
+        case "list":
+          // list 操作只获取第一个匹配窗口的控件树
+          string filter = GetArgumentValue(args, "-filter");
+          bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+
+          // 只在非后台操作时激活窗口
+          if (!background)
+          {
+            SetForegroundWindow(targetHandle);
+            Thread.Sleep(50);
+          }
+
+          string treeJson = GetControlsTree(targetHandle, filter);
+          if (!string.IsNullOrEmpty(treeJson))
+          {
+            Console.WriteLine("[" + treeJson + "]");
+          }
+          return;  // 直接返回，不输出窗口信息
+
+        case "keyboard":
+          HandleKeyboardOperation(targetHandle, args);
+          Console.WriteLine("true");
+          break;
+
+        case "mouse":
+          HandleMouseOperation(targetHandle, args);
+          Console.WriteLine("true");
+          break;
+
+        default:
+          throw new Exception("不支持的操作类型");
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+    }
+  }
 
-    // 添加按键状态标志
-    private const int KEYEVENTF_KEYDOWN = 0x0;
-    private const int KEYEVENTF_EXTENDEDKEY = 0x1;
-    private const int KEYEVENTF_KEYUP = 0x2;
+  private static List<IntPtr> FindTargetWindows(string[] args)
+  {
+    List<IntPtr> targetWindows = new List<IntPtr>();
+    string method = GetArgumentValue(args, "-method") ?? "title";
+    string value = GetArgumentValue(args, "-window") ?? "";
 
-    private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
-    private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+    // 如果是active方法，直接返回当前活动窗口
+    if (method.ToLower() == "active")
+    {
+      targetWindows.Add(GetForegroundWindow());
+      return targetWindows;
+    }
 
-    [StructLayout(LayoutKind.Sequential)]
-    private struct RECT
+    // 如果是handle方法，直接返回指定句柄
+    if (method.ToLower() == "handle")
     {
-        public int Left;
-        public int Top;
-        public int Right;
-        public int Bottom;
+      IntPtr handle = new IntPtr(long.Parse(value));
+      if (!IsWindow(handle))
+      {
+        throw new Exception("指定的句柄不是一个有效的窗口句柄");
+      }
+      targetWindows.Add(handle);
+      return targetWindows;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
-    private struct POINT
+    // 如果没有指定窗口值，返回空列表
+    if (string.IsNullOrEmpty(value))
     {
-        public int X;
-        public int Y;
+      return targetWindows;
     }
 
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetParent(IntPtr hWnd);
+    switch (method.ToLower())
+    {
+      case "process":
+        // 通过进程名查找
+        var processes = System.Diagnostics.Process.GetProcessesByName(value);
+        foreach (var process in processes)
+        {
+          if (process.MainWindowHandle != IntPtr.Zero)
+          {
+            targetWindows.Add(process.MainWindowHandle);
+          }
+        }
+        break;
 
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetAncestor(IntPtr hwnd, int flags);
+      case "class":
+        // 通过窗口类名查找
+        EnumWindows((hwnd, param) =>
+        {
+          if (!IsWindowVisible(hwnd))
+          {
+            return true;
+          }
 
-    private const int GA_ROOT = 2;
+          StringBuilder className = new StringBuilder(256);
+          GetClassName(hwnd, className, className.Capacity);
+          string windowClassName = className.ToString();
 
-    // 添加工具栏相关的常量和结构体
-    private const uint TB_BUTTONCOUNT = 0x0418;
-    private const uint TB_GETBUTTON = 0x0417;
-    private const uint TB_GETBUTTONTEXT = 0x042D;
-    private const uint TB_GETITEMRECT = 0x041D;
+          if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+          {
+            targetWindows.Add(hwnd);
+          }
+          return true;
+        }, IntPtr.Zero);
+        break;
+
+      case "title":
+      default:
+        // 通过窗口标题查找（支持模糊匹配）
+        EnumWindows((hwnd, param) =>
+        {
+          StringBuilder title = new StringBuilder(256);
+          GetWindowText(hwnd, title, title.Capacity);
+          string windowTitle = title.ToString();
+
+          if (!string.IsNullOrEmpty(windowTitle) &&
+                      windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+          {
+            targetWindows.Add(hwnd);
+          }
+          return true;
+        }, IntPtr.Zero);
+        break;
+    }
 
-    [StructLayout(LayoutKind.Sequential)]
-    private struct TBBUTTON
+    if (targetWindows.Count == 0)
     {
-        public int iBitmap;
-        public int idCommand;
-        public byte fsState;
-        public byte fsStyle;
-        public byte bReserved1;
-        public byte bReserved2;
-        public IntPtr dwData;
-        public IntPtr iString;
+      Console.WriteLine(string.Format("Error: 未找到匹配的窗口 (method={0}, value={1})", method, value));
     }
 
-    // 添加 SendMessage 重载
-    [DllImport("user32.dll")]
-    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref TBBUTTON lParam);
+    return targetWindows;
+  }
 
-    [DllImport("user32.dll")]
-    private static extern bool SendMessage(IntPtr hWnd, uint Msg, int wParam, ref RECT lParam);
+  private static void HandleKeyboardOperation(IntPtr targetHandle, string[] args)
+  {
+    string control = GetArgumentValue(args, "-control");
+    string action = GetArgumentValue(args, "-action");
+    string value = GetArgumentValue(args, "-value");
+    bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
 
-    [DllImport("user32.dll")]
-    private static extern uint MapVirtualKey(uint uCode, uint uMapType);
-
-    [DllImport("user32.dll")]
-    private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
-
-    private const uint MAPVK_VK_TO_VSC = 0x00;
-    private const uint MAPVK_VSC_TO_VK = 0x01;
-    private const uint MAPVK_VK_TO_CHAR = 0x02;
-    private const uint MAPVK_VSC_TO_VK_EX = 0x03;
-    #endregion
-
-    public static void Main(string[] args)
+    // 如果指定了控件，递归查找控件句柄
+    IntPtr controlHandle = IntPtr.Zero;
+    if (!string.IsNullOrEmpty(control))
     {
-        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
-        {
-            ShowHelp();
-            return;
-        }
-
-        try
-        {
-            List<IntPtr> targetWindows = FindTargetWindows(args);
-            if (targetWindows.Count == 0)
-            {
-                throw new Exception("未找到目标窗口");
-            }
-
-            string type = GetArgumentValue(args, "-type");
-            IntPtr targetHandle = targetWindows[0];  // 总是使用第一个窗口
-            Dictionary<string, object> operatedWindow = null;
-
-            switch (type.ToLower())
-            {
-                case "inspect":
-                    // inspect 操作只获取第一个匹配窗口的控件树
-                    string filter = GetArgumentValue(args, "-filter");
-                    bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
-
-                    // 只在非后台操作时激活窗口
-                    if (!background)
-                    {
-                        SetForegroundWindow(targetHandle);
-                        Thread.Sleep(50);
-                    }
-
-                    string treeJson = GetControlsTree(targetHandle, filter);
-                    if (!string.IsNullOrEmpty(treeJson))
-                    {
-                        Console.WriteLine("[" + treeJson + "]");
-                    }
-                    return;  // 直接返回，不输出窗口信息
-
-                case "keyboard":
-                    operatedWindow = HandleKeyboardOperation(targetHandle, args);
-                    break;
-
-                case "mouse":
-                    operatedWindow = HandleMouseOperation(targetHandle, args);
-                    break;
-
-                default:
-                    throw new Exception("不支持的操作类型");
-            }
-
-            // 输出操作的窗口信息
-            if (operatedWindow != null)
-            {
-                var serializer = new JavaScriptSerializer();
-                Console.WriteLine(serializer.Serialize(operatedWindow));
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
-        }
+      StringBuilder windowTitle = new StringBuilder(256);
+      GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
+
+      controlHandle = FindControl(targetHandle, control);
+      if (controlHandle == IntPtr.Zero)
+      {
+        throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\")",
+            targetHandle.ToInt64(), windowTitle.ToString(), control));
+      }
+      targetHandle = controlHandle;
     }
 
-    private static List<IntPtr> FindTargetWindows(string[] args)
+    // 只在非后台操作时激活窗口
+    if (!background)
     {
-        List<IntPtr> targetWindows = new List<IntPtr>();
-        string method = GetArgumentValue(args, "-method") ?? "title";
-        string value = GetArgumentValue(args, "-window") ?? "";
-
-        // 如果是active方法，直接返回当前活动窗口
-        if (method.ToLower() == "active")
-        {
-            targetWindows.Add(GetForegroundWindow());
-            return targetWindows;
-        }
+      SetForegroundWindow(targetHandle);
+      Thread.Sleep(50);
+    }
 
-        // 如果是handle方法，直接返回指定句柄
-        if (method.ToLower() == "handle")
+    switch (action.ToLower())
+    {
+      case "keys":
+        if (string.IsNullOrEmpty(value))
         {
-            targetWindows.Add(new IntPtr(long.Parse(value)));
-            return targetWindows;
+          throw new Exception("发送按键需要指定 -value 参数");
         }
+        SendKeys(targetHandle, value);
+        break;
 
-        // 如果没有指定窗口值，返回空列表
+      case "text":
         if (string.IsNullOrEmpty(value))
         {
-            return targetWindows;
+          throw new Exception("发送文本需要指定 -value 参数");
         }
+        SendText(targetHandle, value);
+        break;
 
-        switch (method.ToLower())
-        {
-            case "process":
-                // 通过进程名查找
-                var processes = System.Diagnostics.Process.GetProcessesByName(value);
-                foreach (var process in processes)
-                {
-                    if (process.MainWindowHandle != IntPtr.Zero)
-                    {
-                        targetWindows.Add(process.MainWindowHandle);
-                    }
-                }
-                break;
-
-            case "class":
-                // 通过窗口类名查找
-                EnumWindows((hwnd, param) =>
-                {
-                    if (!IsWindowVisible(hwnd))
-                    {
-                        return true;
-                    }
-
-                    StringBuilder className = new StringBuilder(256);
-                    GetClassName(hwnd, className, className.Capacity);
-                    string windowClassName = className.ToString();
-
-                    if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
-                    {
-                        targetWindows.Add(hwnd);
-                    }
-                    return true;
-                }, IntPtr.Zero);
-                break;
-
-            case "title":
-            default:
-                // 通过窗口标题查找（支持模糊匹配）
-                EnumWindows((hwnd, param) =>
-                {
-                    StringBuilder title = new StringBuilder(256);
-                    GetWindowText(hwnd, title, title.Capacity);
-                    string windowTitle = title.ToString();
-
-                    if (!string.IsNullOrEmpty(windowTitle) &&
-                        windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
-                    {
-                        targetWindows.Add(hwnd);
-                    }
-                    return true;
-                }, IntPtr.Zero);
-                break;
-        }
+      default:
+        throw new Exception("不支持的keyboard操作类型");
+    }
 
-        if (targetWindows.Count == 0)
-        {
-            Console.WriteLine(string.Format("Error: 未找到匹配的窗口 (method={0}, value={1})", method, value));
-        }
+    // 返回操作结果
+    return;
+  }
 
-        return targetWindows;
-    }
+  private static void HandleMouseOperation(IntPtr targetHandle, string[] args)
+  {
+    string control = GetArgumentValue(args, "-control");
+    string controlText = GetArgumentValue(args, "-text");
+    string action = GetArgumentValue(args, "-action");
+    string position = GetArgumentValue(args, "-pos");
+    bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
 
-    private static Dictionary<string, object> HandleKeyboardOperation(IntPtr targetHandle, string[] args)
+    if (string.IsNullOrEmpty(action))
     {
-        string control = GetArgumentValue(args, "-control");
-        string action = GetArgumentValue(args, "-action");
-        string value = GetArgumentValue(args, "-value");
-        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
-
-        // 如果指定了控件，递归查找控件句柄
-        IntPtr controlHandle = IntPtr.Zero;
-        if (!string.IsNullOrEmpty(control))
-        {
-            StringBuilder windowTitle = new StringBuilder(256);
-            GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
-
-            controlHandle = FindControl(targetHandle, control);
-            if (controlHandle == IntPtr.Zero)
-            {
-                throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\")",
-                    targetHandle.ToInt64(), windowTitle.ToString(), control));
-            }
-            targetHandle = controlHandle;
-        }
+      throw new Exception("mouse操作需要指定 -action 参数");
+    }
 
-        // 只在非后台操作时激活窗口
-        if (!background)
-        {
-            SetForegroundWindow(targetHandle);
-            Thread.Sleep(50);
-        }
+    // 如果指定了控件类名和文本，查找匹配的控件
+    IntPtr controlHandle = IntPtr.Zero;
+    if (!string.IsNullOrEmpty(control) || !string.IsNullOrEmpty(controlText))
+    {
+      StringBuilder windowTitle = new StringBuilder(256);
+      GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
+
+      controlHandle = FindControlByTextAndClass(targetHandle, controlText, control);
+      if (controlHandle == IntPtr.Zero)
+      {
+        throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\", 控件文本=\"{3}\")",
+            targetHandle.ToInt64(), windowTitle.ToString(), control ?? "", controlText ?? ""));
+      }
+      targetHandle = controlHandle;
+    }
 
-        switch (action.ToLower())
-        {
-            case "keys":
-                if (string.IsNullOrEmpty(value))
-                {
-                    throw new Exception("发送按键需要指定 -value 参数");
-                }
-                SendKeys(targetHandle, value);
-                break;
-
-            case "text":
-                if (string.IsNullOrEmpty(value))
-                {
-                    throw new Exception("发送文本需要指定 -value 参数");
-                }
-                SendText(targetHandle, value);
-                break;
-
-            default:
-                throw new Exception("不支持的keyboard操作类型");
-        }
+    // 只在非后台操作时激活窗口
+    if (!background)
+    {
+      SetForegroundWindow(targetHandle);
+      Thread.Sleep(50);
+    }
 
-        // 返回操作结果
-        return GetBasicWindowInfo(targetHandle, controlHandle);
+    // 获取点击坐标
+    int x = 0, y = 0;
+    if (!string.IsNullOrEmpty(position))
+    {
+      // 使用指定坐标
+      string[] pos = position.Split(',');
+      if (pos.Length == 2)
+      {
+        x = int.Parse(pos[0]);
+        y = int.Parse(pos[1]);
+      }
     }
+    else
+    {
+      // 如果没有指定坐标，点击控件中心
+      RECT rect;
+      if (GetWindowRect(targetHandle, out rect))
+      {
+        x = (rect.Right - rect.Left) / 2;
+        y = (rect.Bottom - rect.Top) / 2;
+      }
+    }
+
+    int lParam = (y << 16) | (x & 0xFFFF);
 
-    private static Dictionary<string, object> HandleMouseOperation(IntPtr targetHandle, string[] args)
+    switch (action.ToLower())
     {
-        string control = GetArgumentValue(args, "-control");
-        string controlText = GetArgumentValue(args, "-text");
-        string action = GetArgumentValue(args, "-action");
-        string position = GetArgumentValue(args, "-pos");
-        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
+      case "click":
+        SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+        SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+        break;
+
+      case "rightclick":
+        SendMessage(targetHandle, WM_RBUTTONDOWN, 0, lParam);
+        SendMessage(targetHandle, WM_RBUTTONUP, 0, lParam);
+        break;
+
+      case "doubleclick":
+        SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
+        SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+        SendMessage(targetHandle, WM_LBUTTONDBLCLK, 0, lParam);
+        SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
+        break;
+
+      default:
+        Console.WriteLine("Error: 不支持的mouse操作类型");
+        break;
+    }
 
-        if (string.IsNullOrEmpty(action))
-        {
-            throw new Exception("mouse操作需要指定 -action 参数");
-        }
+    // 返回操作结果
+    return;
+  }
 
-        // 如果指定了控件类名和文本，查找匹配的控件
-        IntPtr controlHandle = IntPtr.Zero;
-        if (!string.IsNullOrEmpty(control) || !string.IsNullOrEmpty(controlText))
-        {
-            StringBuilder windowTitle = new StringBuilder(256);
-            GetWindowText(targetHandle, windowTitle, windowTitle.Capacity);
-
-            controlHandle = FindControlByTextAndClass(targetHandle, controlText, control);
-            if (controlHandle == IntPtr.Zero)
-            {
-                throw new Exception(string.Format("在窗口中未找到指定控件 (窗口句柄={0}, 标题=\"{1}\", 控件类名=\"{2}\", 控件文本=\"{3}\")",
-                    targetHandle.ToInt64(), windowTitle.ToString(), control ?? "", controlText ?? ""));
-            }
-            targetHandle = controlHandle;
-        }
+  private static void SendKeys(IntPtr hWnd, string keys)
+  {
+    // 解析按键组合
+    string[] keyArray = keys.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
 
-        // 只在非后台操作时激活窗口
-        if (!background)
-        {
-            SetForegroundWindow(targetHandle);
-            Thread.Sleep(50);
-        }
+    foreach (string keyCombo in keyArray)
+    {
+      string[] modifiers = keyCombo.Trim().Split('+');
+      List<byte> modifierKeys = new List<byte>();
+      byte mainKey = 0;
 
-        // 获取点击坐标
-        int x = 0, y = 0;
-        if (!string.IsNullOrEmpty(position))
+      // 处理每个按键
+      for (int i = 0; i < modifiers.Length; i++)
+      {
+        byte vKey = GetVirtualKeyCode(modifiers[i].Trim());
+        if (i < modifiers.Length - 1)
         {
-            // 使用指定坐标
-            string[] pos = position.Split(',');
-            if (pos.Length == 2)
-            {
-                x = int.Parse(pos[0]);
-                y = int.Parse(pos[1]);
-            }
+          modifierKeys.Add(vKey);
         }
         else
         {
-            // 如果没有指定坐标，点击控件中心
-            RECT rect;
-            if (GetWindowRect(targetHandle, out rect))
-            {
-                x = (rect.Right - rect.Left) / 2;
-                y = (rect.Bottom - rect.Top) / 2;
-            }
+          mainKey = vKey;
         }
-
-        int lParam = (y << 16) | (x & 0xFFFF);
-
-        switch (action.ToLower())
-        {
-            case "click":
-                SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
-                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                break;
-
-            case "rightclick":
-                SendMessage(targetHandle, WM_RBUTTONDOWN, 0, lParam);
-                SendMessage(targetHandle, WM_RBUTTONUP, 0, lParam);
-                break;
-
-            case "doubleclick":
-                SendMessage(targetHandle, WM_LBUTTONDOWN, 0, lParam);
-                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                SendMessage(targetHandle, WM_LBUTTONDBLCLK, 0, lParam);
-                SendMessage(targetHandle, WM_LBUTTONUP, 0, lParam);
-                break;
-
-            default:
-                Console.WriteLine("Error: 不支持的mouse操作类型");
-                break;
-        }
-
-        // 返回操作结果
-        return GetBasicWindowInfo(targetHandle, controlHandle);
+      }
+
+      // 按下修饰键
+      foreach (byte modifier in modifierKeys)
+      {
+        // 获取扫描码
+        uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
+
+        // 构造 lParam
+        int lParamDown = 0x00000001 | // repeat count = 1
+                       ((int)scanCode << 16) | // scan code
+                       (0x1 << 24);  // extended key for modifiers
+
+        PostMessage(hWnd, WM_KEYDOWN, modifier, lParamDown);
+        Thread.Sleep(10); // 短暂延迟确保修饰键被正确识别
+      }
+
+      // 发送主键
+      if (mainKey > 0)
+      {
+        // 获取主键的扫描码
+        uint scanCode = MapVirtualKey((uint)mainKey, MAPVK_VK_TO_VSC);
+
+        // 构造主键的 lParam
+        int lParamDown = 0x00000001 | // repeat count = 1
+                       ((int)scanCode << 16); // scan code
+
+        int lParamUp = 0x00000001 | // repeat count = 1
+                      ((int)scanCode << 16) | // scan code
+                      (0xC0 << 24);  // key up + previous key state
+
+        // 发送按键按下
+        PostMessage(hWnd, WM_KEYDOWN, mainKey, lParamDown);
+        Thread.Sleep(10); // 短暂延迟
+
+        // 发送按键释放
+        PostMessage(hWnd, WM_KEYUP, mainKey, lParamUp);
+        Thread.Sleep(10); // 短暂延迟
+      }
+
+      // 释放修饰键（反序释放）
+      for (int i = modifierKeys.Count - 1; i >= 0; i--)
+      {
+        byte modifier = modifierKeys[i];
+        uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
+
+        // 构造释放修饰键的 lParam
+        int lParamUp = 0x00000001 | // repeat count = 1
+                      ((int)scanCode << 16) | // scan code
+                      (0xC1 << 24);  // extended key + key up + previous key state
+
+        PostMessage(hWnd, WM_KEYUP, modifier, lParamUp);
+        Thread.Sleep(10); // 短暂延迟
+      }
+
+      // 如果有多个按键组合，等待一下
+      if (keyArray.Length > 1)
+      {
+        Thread.Sleep(50);
+      }
     }
+  }
 
-    private static void SendKeys(IntPtr hWnd, string keys)
-    {
-        // 解析按键组合
-        string[] keyArray = keys.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-        foreach (string keyCombo in keyArray)
-        {
-            string[] modifiers = keyCombo.Trim().Split('+');
-            List<byte> modifierKeys = new List<byte>();
-            byte mainKey = 0;
-
-            // 处理每个按键
-            for (int i = 0; i < modifiers.Length; i++)
-            {
-                byte vKey = GetVirtualKeyCode(modifiers[i].Trim());
-                if (i < modifiers.Length - 1)
-                {
-                    modifierKeys.Add(vKey);
-                }
-                else
-                {
-                    mainKey = vKey;
-                }
-            }
-
-            // 按下修饰键
-            foreach (byte modifier in modifierKeys)
-            {
-                // 获取扫描码
-                uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
-
-                // 构造 lParam
-                int lParamDown = 0x00000001 | // repeat count = 1
-                               ((int)scanCode << 16) | // scan code
-                               (0x1 << 24);  // extended key for modifiers
-
-                PostMessage(hWnd, WM_KEYDOWN, modifier, lParamDown);
-                Thread.Sleep(10); // 短暂延迟确保修饰键被正确识别
-            }
-
-            // 发送主键
-            if (mainKey > 0)
-            {
-                // 获取主键的扫描码
-                uint scanCode = MapVirtualKey((uint)mainKey, MAPVK_VK_TO_VSC);
-
-                // 构造主键的 lParam
-                int lParamDown = 0x00000001 | // repeat count = 1
-                               ((int)scanCode << 16); // scan code
-
-                int lParamUp = 0x00000001 | // repeat count = 1
-                              ((int)scanCode << 16) | // scan code
-                              (0xC0 << 24);  // key up + previous key state
-
-                // 发送按键按下
-                PostMessage(hWnd, WM_KEYDOWN, mainKey, lParamDown);
-                Thread.Sleep(10); // 短暂延迟
-
-                // 发送按键释放
-                PostMessage(hWnd, WM_KEYUP, mainKey, lParamUp);
-                Thread.Sleep(10); // 短暂延迟
-            }
-
-            // 释放修饰键（反序释放）
-            for (int i = modifierKeys.Count - 1; i >= 0; i--)
-            {
-                byte modifier = modifierKeys[i];
-                uint scanCode = MapVirtualKey((uint)modifier, MAPVK_VK_TO_VSC);
-
-                // 构造释放修饰键的 lParam
-                int lParamUp = 0x00000001 | // repeat count = 1
-                              ((int)scanCode << 16) | // scan code
-                              (0xC1 << 24);  // extended key + key up + previous key state
-
-                PostMessage(hWnd, WM_KEYUP, modifier, lParamUp);
-                Thread.Sleep(10); // 短暂延迟
-            }
-
-            // 如果有多个按键组合，等待一下
-            if (keyArray.Length > 1)
-            {
-                Thread.Sleep(50);
-            }
-        }
-    }
+  private static void SendText(IntPtr hWnd, string text)
+  {
+    StringBuilder sb = new StringBuilder(text);
+    SendMessage(hWnd, WM_SETTEXT, 0, sb);
+  }
 
-    private static void SendText(IntPtr hWnd, string text)
+  private static string GetArgumentValue(string[] args, string key)
+  {
+    for (int i = 0; i < args.Length - 1; i++)
     {
-        StringBuilder sb = new StringBuilder(text);
-        SendMessage(hWnd, WM_SETTEXT, 0, sb);
+      if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+      {
+        return args[i + 1];
+      }
     }
+    return null;
+  }
 
-    private static string GetArgumentValue(string[] args, string key)
+  private static byte GetVirtualKeyCode(string key)
+  {
+    switch (key.ToUpper())
     {
-        for (int i = 0; i < args.Length - 1; i++)
-        {
-            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
-            {
-                return args[i + 1];
-            }
+      // 修饰键
+      case "CTRL":
+      case "^": return 0x11;    // VK_CONTROL
+      case "ALT":
+      case "%": return 0x12;    // VK_MENU
+      case "SHIFT": return 0x10;    // VK_SHIFT
+
+      // 特殊按键
+      case "{BACKSPACE}":
+      case "{BS}":
+      case "{BKSP}": return 0x08;  // VK_BACK
+      case "{BREAK}": return 0x03;  // VK_CANCEL
+      case "{CAPSLOCK}": return 0x14;  // VK_CAPITAL
+      case "{DELETE}":
+      case "{DEL}": return 0x2E;  // VK_DELETE
+      case "{DOWN}": return 0x28;  // VK_DOWN
+      case "{END}": return 0x23;  // VK_END
+      case "{ENTER}":
+      case "{RETURN}": return 0x0D;  // VK_RETURN
+      case "{ESC}": return 0x1B;  // VK_ESCAPE
+      case "{HELP}": return 0x2F;  // VK_HELP
+      case "{HOME}": return 0x24;  // VK_HOME
+      case "{INSERT}":
+      case "{INS}": return 0x2D;  // VK_INSERT
+      case "{LEFT}": return 0x25;  // VK_LEFT
+      case "{NUMLOCK}": return 0x90;  // VK_NUMLOCK
+      case "{PGDN}": return 0x22;  // VK_NEXT
+      case "{PGUP}": return 0x21;  // VK_PRIOR
+      case "{PRTSC}": return 0x2C;  // VK_SNAPSHOT
+      case "{RIGHT}": return 0x27;  // VK_RIGHT
+      case "{SCROLLLOCK}": return 0x91;  // VK_SCROLL
+      case "{TAB}": return 0x09;  // VK_TAB
+      case "{UP}": return 0x26;  // VK_UP
+
+      // 功能键 F1-F16
+      case "{F1}": return 0x70;
+      case "{F2}": return 0x71;
+      case "{F3}": return 0x72;
+      case "{F4}": return 0x73;
+      case "{F5}": return 0x74;
+      case "{F6}": return 0x75;
+      case "{F7}": return 0x76;
+      case "{F8}": return 0x77;
+      case "{F9}": return 0x78;
+      case "{F10}": return 0x79;
+      case "{F11}": return 0x7A;
+      case "{F12}": return 0x7B;
+
+      // 数字键盘
+      case "{ADD}": return 0x6B;  // VK_ADD
+      case "{SUBTRACT}": return 0x6D;  // VK_SUBTRACT
+      case "{MULTIPLY}": return 0x6A;  // VK_MULTIPLY
+      case "{DIVIDE}": return 0x6F;  // VK_DIVIDE
+      case "{NUMPAD0}": return 0x60;  // VK_NUMPAD0
+      case "{NUMPAD1}": return 0x61;
+      case "{NUMPAD2}": return 0x62;
+      case "{NUMPAD3}": return 0x63;
+      case "{NUMPAD4}": return 0x64;
+      case "{NUMPAD5}": return 0x65;
+      case "{NUMPAD6}": return 0x66;
+      case "{NUMPAD7}": return 0x67;
+      case "{NUMPAD8}": return 0x68;
+      case "{NUMPAD9}": return 0x69;
+
+      default:
+        if (key.Length == 1)
+        {
+          return (byte)key.ToUpper()[0];
         }
-        return null;
+        throw new ArgumentException(string.Format("不支持的按键: {0}", key));
     }
+  }
 
-    private static byte GetVirtualKeyCode(string key)
-    {
-        switch (key.ToUpper())
-        {
-            // 修饰键
-            case "CTRL":
-            case "^": return 0x11;    // VK_CONTROL
-            case "ALT":
-            case "%": return 0x12;    // VK_MENU
-            case "SHIFT": return 0x10;    // VK_SHIFT
-
-            // 特殊按键
-            case "{BACKSPACE}":
-            case "{BS}":
-            case "{BKSP}": return 0x08;  // VK_BACK
-            case "{BREAK}": return 0x03;  // VK_CANCEL
-            case "{CAPSLOCK}": return 0x14;  // VK_CAPITAL
-            case "{DELETE}":
-            case "{DEL}": return 0x2E;  // VK_DELETE
-            case "{DOWN}": return 0x28;  // VK_DOWN
-            case "{END}": return 0x23;  // VK_END
-            case "{ENTER}":
-            case "{RETURN}": return 0x0D;  // VK_RETURN
-            case "{ESC}": return 0x1B;  // VK_ESCAPE
-            case "{HELP}": return 0x2F;  // VK_HELP
-            case "{HOME}": return 0x24;  // VK_HOME
-            case "{INSERT}":
-            case "{INS}": return 0x2D;  // VK_INSERT
-            case "{LEFT}": return 0x25;  // VK_LEFT
-            case "{NUMLOCK}": return 0x90;  // VK_NUMLOCK
-            case "{PGDN}": return 0x22;  // VK_NEXT
-            case "{PGUP}": return 0x21;  // VK_PRIOR
-            case "{PRTSC}": return 0x2C;  // VK_SNAPSHOT
-            case "{RIGHT}": return 0x27;  // VK_RIGHT
-            case "{SCROLLLOCK}": return 0x91;  // VK_SCROLL
-            case "{TAB}": return 0x09;  // VK_TAB
-            case "{UP}": return 0x26;  // VK_UP
-
-            // 功能键 F1-F16
-            case "{F1}": return 0x70;
-            case "{F2}": return 0x71;
-            case "{F3}": return 0x72;
-            case "{F4}": return 0x73;
-            case "{F5}": return 0x74;
-            case "{F6}": return 0x75;
-            case "{F7}": return 0x76;
-            case "{F8}": return 0x77;
-            case "{F9}": return 0x78;
-            case "{F10}": return 0x79;
-            case "{F11}": return 0x7A;
-            case "{F12}": return 0x7B;
-
-            // 数字键盘
-            case "{ADD}": return 0x6B;  // VK_ADD
-            case "{SUBTRACT}": return 0x6D;  // VK_SUBTRACT
-            case "{MULTIPLY}": return 0x6A;  // VK_MULTIPLY
-            case "{DIVIDE}": return 0x6F;  // VK_DIVIDE
-            case "{NUMPAD0}": return 0x60;  // VK_NUMPAD0
-            case "{NUMPAD1}": return 0x61;
-            case "{NUMPAD2}": return 0x62;
-            case "{NUMPAD3}": return 0x63;
-            case "{NUMPAD4}": return 0x64;
-            case "{NUMPAD5}": return 0x65;
-            case "{NUMPAD6}": return 0x66;
-            case "{NUMPAD7}": return 0x67;
-            case "{NUMPAD8}": return 0x68;
-            case "{NUMPAD9}": return 0x69;
-
-            default:
-                if (key.Length == 1)
-                {
-                    return (byte)key.ToUpper()[0];
-                }
-                throw new ArgumentException(string.Format("不支持的按键: {0}", key));
-        }
-    }
+  private static IntPtr FindControlRecursive(IntPtr parentHandle, string targetClassName)
+  {
+    if (string.IsNullOrEmpty(targetClassName))
+      return IntPtr.Zero;
+
+    IntPtr foundHandle = IntPtr.Zero;
+    List<IntPtr> childHandles = new List<IntPtr>();
 
-    private static IntPtr FindControlRecursive(IntPtr parentHandle, string targetClassName)
+    // 枚举所有子窗口
+    EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
     {
-        if (string.IsNullOrEmpty(targetClassName))
-            return IntPtr.Zero;
+      // 获取类名
+      StringBuilder classNameBuffer = new StringBuilder(256);
+      GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
 
-        IntPtr foundHandle = IntPtr.Zero;
-        List<IntPtr> childHandles = new List<IntPtr>();
+      // 检查是否匹配
+      if (classNameBuffer.ToString().Equals(targetClassName, StringComparison.OrdinalIgnoreCase))
+      {
+        foundHandle = handle;
+        return false; // 找到后停止枚举
+      }
 
-        // 枚举所有子窗口
-        EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
-        {
-            // 获取类名
-            StringBuilder classNameBuffer = new StringBuilder(256);
-            GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
-
-            // 检查是否匹配
-            if (classNameBuffer.ToString().Equals(targetClassName, StringComparison.OrdinalIgnoreCase))
-            {
-                foundHandle = handle;
-                return false; // 找到后停止枚举
-            }
-
-            childHandles.Add(handle);
-            return true;
-        });
+      childHandles.Add(handle);
+      return true;
+    });
 
-        EnumChildWindows(parentHandle, childProc, IntPtr.Zero);
+    EnumChildWindows(parentHandle, childProc, IntPtr.Zero);
 
-        // 如果在当前层级没找到，递归查找子窗口
-        if (foundHandle == IntPtr.Zero)
-        {
-            foreach (IntPtr childHandle in childHandles)
-            {
-                foundHandle = FindControlRecursive(childHandle, targetClassName);
-                if (foundHandle != IntPtr.Zero)
-                    break;
-            }
-        }
-
-        return foundHandle;
+    // 如果在当前层级没找到，递归查找子窗口
+    if (foundHandle == IntPtr.Zero)
+    {
+      foreach (IntPtr childHandle in childHandles)
+      {
+        foundHandle = FindControlRecursive(childHandle, targetClassName);
+        if (foundHandle != IntPtr.Zero)
+          break;
+      }
     }
 
-    // 修改 HandleKeyboardOperation 和 HandleMouseOperation 中查找控件的部分
-    private static IntPtr FindControl(IntPtr parentHandle, string controlClass)
-    {
-        // 先尝试直接查找
-        IntPtr hControl = FindWindowEx(parentHandle, IntPtr.Zero, controlClass, null);
-        if (hControl != IntPtr.Zero)
-            return hControl;
+    return foundHandle;
+  }
 
-        // 如果直接查找失败，进行递归查找
-        return FindControlRecursive(parentHandle, controlClass);
-    }
+  // 修改 HandleKeyboardOperation 和 HandleMouseOperation 中查找控件的部分
+  private static IntPtr FindControl(IntPtr parentHandle, string controlClass)
+  {
+    // 先尝试直接查找
+    IntPtr hControl = FindWindowEx(parentHandle, IntPtr.Zero, controlClass, null);
+    if (hControl != IntPtr.Zero)
+      return hControl;
 
-    private static IntPtr FindControlByTextAndClass(IntPtr parentHandle, string controlText, string className)
-    {
-        if (string.IsNullOrEmpty(controlText) && string.IsNullOrEmpty(className))
-            return IntPtr.Zero;
+    // 如果直接查找失败，进行递归查找
+    return FindControlRecursive(parentHandle, controlClass);
+  }
 
-        List<IntPtr> matchedControls = new List<IntPtr>();
-        Queue<IntPtr> searchQueue = new Queue<IntPtr>();
-        searchQueue.Enqueue(parentHandle);
+  private static IntPtr FindControlByTextAndClass(IntPtr parentHandle, string controlText, string className)
+  {
+    if (string.IsNullOrEmpty(controlText) && string.IsNullOrEmpty(className))
+      return IntPtr.Zero;
 
-        while (searchQueue.Count > 0)
-        {
-            IntPtr currentHandle = searchQueue.Dequeue();
-            List<IntPtr> children = new List<IntPtr>();
-
-            // 枚举当前层级的子窗口
-            EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
-            {
-                bool match = true;
-
-                // 检查类名（如果指定）
-                if (!string.IsNullOrEmpty(className))
-                {
-                    StringBuilder classNameBuffer = new StringBuilder(256);
-                    GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
-                    if (!className.Equals(classNameBuffer.ToString(), StringComparison.OrdinalIgnoreCase))
-                    {
-                        match = false;
-                    }
-                }
-
-                // 检查控件文本（如果指定）
-                if (match && !string.IsNullOrEmpty(controlText))
-                {
-                    StringBuilder textBuffer = new StringBuilder(256);
-                    GetWindowText(handle, textBuffer, textBuffer.Capacity);
-                    string windowText = textBuffer.ToString();
-                    if (!windowText.Contains(controlText))
-                    {
-                        match = false;
-                    }
-                }
-
-                // 检查控件是否可见
-                if (match && !IsWindowVisible(handle))
-                {
-                    match = false;
-                }
-
-                if (match)
-                {
-                    matchedControls.Add(handle);
-                }
-
-                // 将子窗口加入搜索队列
-                children.Add(handle);
-                return true;
-            });
-
-            EnumChildWindows(currentHandle, childProc, IntPtr.Zero);
-
-            // 将所有子窗口加入搜索队列
-            foreach (IntPtr child in children)
-            {
-                searchQueue.Enqueue(child);
-            }
+    List<IntPtr> matchedControls = new List<IntPtr>();
+    Queue<IntPtr> searchQueue = new Queue<IntPtr>();
+    searchQueue.Enqueue(parentHandle);
+
+    while (searchQueue.Count > 0)
+    {
+      IntPtr currentHandle = searchQueue.Dequeue();
+      List<IntPtr> children = new List<IntPtr>();
+
+      // 枚举当前层级的子窗口
+      EnumWindowProc childProc = new EnumWindowProc((handle, param) =>
+      {
+        bool match = true;
+
+        // 检查类名（如果指定）
+        if (!string.IsNullOrEmpty(className))
+        {
+          StringBuilder classNameBuffer = new StringBuilder(256);
+          GetClassName(handle, classNameBuffer, classNameBuffer.Capacity);
+          if (!className.Equals(classNameBuffer.ToString(), StringComparison.OrdinalIgnoreCase))
+          {
+            match = false;
+          }
         }
 
-        if (matchedControls.Count == 0)
+        // 检查控件文本（如果指定）
+        if (match && !string.IsNullOrEmpty(controlText))
         {
-            return IntPtr.Zero;
+          StringBuilder textBuffer = new StringBuilder(256);
+          GetWindowText(handle, textBuffer, textBuffer.Capacity);
+          string windowText = textBuffer.ToString();
+          if (!windowText.Contains(controlText))
+          {
+            match = false;
+          }
         }
-        else if (matchedControls.Count > 1)
+
+        // 检查控件是否可见
+        if (match && !IsWindowVisible(handle))
         {
-            Console.WriteLine("Warning: 找到多个匹配控件:");
-            foreach (IntPtr handle in matchedControls)
-            {
-                StringBuilder text = new StringBuilder(256);
-                GetWindowText(handle, text, text.Capacity);
-                StringBuilder classBuffer = new StringBuilder(256);
-                GetClassName(handle, classBuffer, classBuffer.Capacity);
-                Console.WriteLine(string.Format("0x{0:X} - Class: {1}, Text: {2}",
-                    handle.ToInt64(), classBuffer, text));
-            }
+          match = false;
         }
 
-        return matchedControls[0];
-    }
-
-    private static void HandleInspectOperation(string[] args)
-    {
-        string filter = GetArgumentValue(args, "-filter");
-        bool background = bool.Parse(GetArgumentValue(args, "-background") ?? "false");
-
-        var targetWindows = FindTargetWindows(args);
-        if (targetWindows.Count == 0)
+        if (match)
         {
-            return;
+          matchedControls.Add(handle);
         }
 
-        // 创建一个列表存储所有窗口的控件树数组
-        List<string> allWindowTrees = new List<string>();
+        // 将子窗口加入搜索队列
+        children.Add(handle);
+        return true;
+      });
 
-        foreach (IntPtr hWnd in targetWindows)
-        {
-            // 只在非后台操作时激活窗口
-            if (!background)
-            {
-                SetForegroundWindow(hWnd);
-                Thread.Sleep(50);
-            }
-
-            // 获取当前窗口的控件树并添加到列表
-            // 注意：每个控件树已经是一个数组
-            string treeJson = GetControlsTree(hWnd, filter);
-            if (!string.IsNullOrEmpty(treeJson) && treeJson != "{}")
-            {
-                // 将每个控件树作为一个数组元素添加
-                allWindowTrees.Add("[" + treeJson + "]");
-            }
-        }
+      EnumChildWindows(currentHandle, childProc, IntPtr.Zero);
 
-        // 将所有窗口的控件树数组合并成一个大数组
-        Console.WriteLine("[" + string.Join(",", allWindowTrees) + "]");
+      // 将所有子窗口加入搜索队列
+      foreach (IntPtr child in children)
+      {
+        searchQueue.Enqueue(child);
+      }
     }
 
-    private static string GetControlsTree(IntPtr parentHandle, string filter, int depth = 0)
+    if (matchedControls.Count == 0)
     {
-        if (parentHandle == IntPtr.Zero)
-            return "{}";
-
-        StringBuilder json = new StringBuilder();
-        json.Append("{");
-
-        // 获取窗口信息
-        StringBuilder title = new StringBuilder(256);
-        StringBuilder className = new StringBuilder(256);
-        GetWindowText(parentHandle, title, title.Capacity);
-        GetClassName(parentHandle, className, className.Capacity);
+      return IntPtr.Zero;
+    }
+    else if (matchedControls.Count > 1)
+    {
+      foreach (IntPtr handle in matchedControls)
+      {
+        StringBuilder text = new StringBuilder(256);
+        GetWindowText(handle, text, text.Capacity);
+        StringBuilder classBuffer = new StringBuilder(256);
+        GetClassName(handle, classBuffer, classBuffer.Capacity);
+        Console.WriteLine(string.Format("0x{0:X} - Class: {1}, Text: {2}",
+            handle.ToInt64(), classBuffer, text));
+      }
+    }
 
-        // 获取窗口位置和大小
-        RECT windowRect;
-        GetWindowRect(parentHandle, out windowRect);
+    return matchedControls[0];
+  }
 
-        bool isVisible = IsWindowVisible(parentHandle);
+  private static string GetControlsTree(IntPtr parentHandle, string filter, int depth = 0)
+  {
+    if (parentHandle == IntPtr.Zero)
+      return "{}";
 
-        // 检查当前节点是否匹配过滤条件
-        bool matchFilter = true;
-        if (!string.IsNullOrEmpty(filter))
-        {
-            matchFilter =
-                title.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0 ||
-                className.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
-        }
+    StringBuilder json = new StringBuilder();
+    json.Append("{");
 
-        // 添加节点信息 - 将句柄改为十进制格式
-        json.AppendFormat(
-            "\"handle\":\"{0}\",\"class\":\"{1}\",\"text\":\"{2}\",\"visible\":{3},\"location\":{{\"x\":{4},\"y\":{5},\"width\":{6},\"height\":{7}}},\"matched\":{8},\"children\":[",
-            parentHandle.ToInt64(),  // 直接使用十进制格式
-            className.ToString().Replace("\"", "\\\""),
-            title.ToString().Replace("\"", "\\\""),
-            isVisible.ToString().ToLower(),
-            windowRect.Left,
-            windowRect.Top,
-            windowRect.Right - windowRect.Left,
-            windowRect.Bottom - windowRect.Top,
-            matchFilter.ToString().ToLower()
-        );
-
-        // 递归获取子控件树
-        List<string> childJsons = new List<string>();
-
-        EnumChildWindows(parentHandle, (hwnd, param) =>
-        {
-            string childJson = GetControlsTree(hwnd, filter, depth + 1);
-            if (!string.IsNullOrEmpty(childJson) && childJson != "{}")
-            {
-                childJsons.Add(childJson);
-            }
-            return true;
-        }, IntPtr.Zero);
+    // 获取窗口信息
+    StringBuilder title = new StringBuilder(256);
+    StringBuilder className = new StringBuilder(256);
+    GetWindowText(parentHandle, title, title.Capacity);
+    GetClassName(parentHandle, className, className.Capacity);
 
-        // 添加子节点JSON
-        if (childJsons.Count > 0)
-        {
-            json.Append(string.Join(",", childJsons));
-        }
+    // 获取窗口位置和大小
+    RECT windowRect;
+    GetWindowRect(parentHandle, out windowRect);
 
-        json.Append("]}");
+    bool isVisible = IsWindowVisible(parentHandle);
 
-        return json.ToString();
+    // 检查当前节点是否匹配过滤条件
+    bool matchFilter = true;
+    if (!string.IsNullOrEmpty(filter))
+    {
+      matchFilter =
+          title.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0 ||
+          className.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) >= 0;
     }
 
-    private static void ShowHelp()
+    // 添加节点信息 - 将句柄改为十进制格式
+    json.AppendFormat(
+        "\"handle\":\"{0}\",\"class\":\"{1}\",\"text\":\"{2}\",\"visible\":{3},\"location\":{{\"x\":{4},\"y\":{5},\"width\":{6},\"height\":{7}}},\"matched\":{8},\"children\":[",
+        parentHandle.ToInt64(),  // 直接使用十进制格式
+        className.ToString().Replace("\"", "\\\""),
+        title.ToString().Replace("\"", "\\\""),
+        isVisible.ToString().ToLower(),
+        windowRect.Left,
+        windowRect.Top,
+        windowRect.Right - windowRect.Left,
+        windowRect.Bottom - windowRect.Top,
+        matchFilter.ToString().ToLower()
+    );
+
+    // 递归获取子控件树
+    List<string> childJsons = new List<string>();
+
+    EnumChildWindows(parentHandle, (hwnd, param) =>
     {
-        string help = @"
+      string childJson = GetControlsTree(hwnd, filter, depth + 1);
+      if (!string.IsNullOrEmpty(childJson) && childJson != "{}")
+      {
+        childJsons.Add(childJson);
+      }
+      return true;
+    }, IntPtr.Zero);
+
+    // 添加子节点JSON
+    if (childJsons.Count > 0)
+    {
+      json.Append(string.Join(",", childJsons));
+    }
+
+    json.Append("]}");
+
+    return json.ToString();
+  }
+
+  private static void ShowHelp()
+  {
+    string help = @"
 Windows 界面自动化工具使用说明
 ==========================
 
@@ -881,7 +841,7 @@ Windows 界面自动化工具使用说明
 --------
 1. keyboard - 键盘操作
 2. mouse   - 鼠标操作
-3. inspect - 获取控件树
+3. list - 获取控件树
 
 通用参数:
 --------
@@ -927,7 +887,7 @@ 4. 后台发送文本：
    sendmessage.exe -type keyboard -action text -window ""记事本"" -value ""Hello"" -background
 
 5. 获取窗口控件树：
-   sendmessage.exe -type inspect -window ""记事本"" -filter ""button""
+   sendmessage.exe -type list -window ""记事本"" -filter ""button""
 
 6. 使用句柄查找窗口：
    sendmessage.exe -type keyboard -method handle -window ""0x12345"" -value ""Hello""
@@ -945,7 +905,7 @@ 9. 通过窗口类名查找：
 返回值:
 ------
 1. 均为JSON格式
-2. inspect操作返回控件树信息
+2. list操作返回控件树信息
 3. 其他操作返回操作的控件信息及其所在窗口信息
 4. 失败均抛出异常
 
@@ -954,58 +914,6 @@ 4. 失败均抛出异常
 1. 窗口标题、类名支持模糊匹配，active方式可不提供window参数
 2. 所有操作都只会处理第一个匹配的窗口
 ";
-        Console.WriteLine(help);
-    }
-
-    private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd, IntPtr controlHandle = default(IntPtr))
-    {
-        var info = new Dictionary<string, object>();
-
-        // 获取窗口信息
-        StringBuilder title = new StringBuilder(256);
-        StringBuilder className = new StringBuilder(256);
-        GetWindowText(hwnd, title, title.Capacity);
-        GetClassName(hwnd, className, className.Capacity);
-
-        int processId = 0;
-        GetWindowThreadProcessId(hwnd, out processId);
-        string processName = "";
-        try
-        {
-            var process = System.Diagnostics.Process.GetProcessById(processId);
-            processName = process.ProcessName;
-        }
-        catch { }
-
-        // 窗口信息放在 window 键下
-        info["window"] = new Dictionary<string, object>
-        {
-            { "handle", hwnd.ToInt64() },
-            { "title", title.ToString() },
-            { "class", className.ToString() },
-            { "process", processName }
-        };
-
-        // 如果有控件信息，添加到顶层
-        if (controlHandle != IntPtr.Zero)
-        {
-            StringBuilder controlTitle = new StringBuilder(256);
-            StringBuilder controlClassName = new StringBuilder(256);
-            GetWindowText(controlHandle, controlTitle, controlTitle.Capacity);
-            GetClassName(controlHandle, controlClassName, controlClassName.Capacity);
-
-            info["handle"] = controlHandle.ToInt64();
-            info["title"] = controlTitle.ToString();
-            info["class"] = controlClassName.ToString();
-        }
-        else
-        {
-            // 如果没有控件，设置为 null
-            info["handle"] = null;
-            info["title"] = null;
-            info["class"] = null;
-        }
-
-        return info;
-    }
+    Console.WriteLine(help);
+  }
 }
diff --git a/plugin/lib/csharp/window.cs b/plugin/lib/csharp/window.cs
index 2bdf3dfe..18eeeb82 100644
--- a/plugin/lib/csharp/window.cs
+++ b/plugin/lib/csharp/window.cs
@@ -7,333 +7,340 @@
 
 public class WindowManager
 {
-    #region Win32 API
-    [DllImport("user32.dll")]
-    private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
-
-    [DllImport("user32.dll")]
-    private static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
-
-    [DllImport("user32.dll")]
-    private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
-    [DllImport("user32.dll")]
-    private static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-    [DllImport("user32.dll")]
-    private static extern bool SetForegroundWindow(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
-
-    [DllImport("user32.dll")]
-    private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-    [DllImport("user32.dll")]
-    private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-    [DllImport("user32.dll")]
-    private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
-
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetForegroundWindow();
-
-    [DllImport("user32.dll")]
-    private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-    [DllImport("user32.dll")]
-    private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
-
-    [DllImport("user32.dll")]
-    private static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
-
-    [DllImport("user32.dll")]
-    private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
-
-    [DllImport("user32.dll")]
-    private static extern bool IsWindowVisible(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern bool IsIconic(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern bool IsZoomed(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
-
-    [DllImport("user32.dll")]
-    private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
-
-    [StructLayout(LayoutKind.Sequential)]
-    private struct RECT
+  #region Win32 API
+  [DllImport("user32.dll")]
+  private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+  [DllImport("user32.dll")]
+  private static extern bool MoveWindow(IntPtr hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint);
+
+  [DllImport("user32.dll")]
+  private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+  [DllImport("user32.dll")]
+  private static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
+
+  [DllImport("user32.dll")]
+  private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+  [DllImport("user32.dll")]
+  private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetForegroundWindow();
+
+  [DllImport("user32.dll")]
+  private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+  [DllImport("user32.dll")]
+  private static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+  [DllImport("user32.dll")]
+  private static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
+
+  [DllImport("user32.dll")]
+  private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsWindowVisible(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsIconic(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsZoomed(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsWindow(IntPtr hWnd);
+  [DllImport("user32.dll")]
+  private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+  [DllImport("user32.dll")]
+  private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+  [StructLayout(LayoutKind.Sequential)]
+  private struct RECT
+  {
+    public int Left;
+    public int Top;
+    public int Right;
+    public int Bottom;
+  }
+
+  private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+  private static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
+  private const uint SWP_NOMOVE = 0x0002;
+  private const uint SWP_NOSIZE = 0x0001;
+  private const uint WM_CLOSE = 0x0010;
+  private const int GWL_STYLE = -16;
+  private const int GWL_EXSTYLE = -20;
+  private const int WS_BORDER = 0x00800000;
+  private const int WS_CAPTION = 0x00C00000;
+  private const int WS_CHILD = 0x40000000;
+  private const int WS_POPUP = unchecked((int)0x80000000);
+  private const int WS_SYSMENU = 0x00080000;
+  private const int WS_MINIMIZEBOX = 0x00020000;
+  private const int WS_MAXIMIZEBOX = 0x00010000;
+  private const int WS_EX_TOPMOST = 0x00000008;
+  private const int WS_EX_TRANSPARENT = 0x00000020;
+  private const int WS_EX_TOOLWINDOW = 0x00000080;
+  private const int WS_EX_LAYERED = 0x00080000;
+  private const uint LWA_ALPHA = 0x2;
+  private const int SW_HIDE = 0;
+  private const int SW_SHOW = 5;
+  private const int SW_NORMAL = 1;
+  private const int SW_MAXIMIZE = 3;
+  private const int SW_MINIMIZE = 6;
+  private const int SW_RESTORE = 9;
+
+  private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+  #endregion
+
+  public static void Main(string[] args)
+  {
+    if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
     {
-        public int Left;
-        public int Top;
-        public int Right;
-        public int Bottom;
+      ShowHelp();
+      return;
     }
 
-    private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
-    private static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
-    private const uint SWP_NOMOVE = 0x0002;
-    private const uint SWP_NOSIZE = 0x0001;
-    private const uint WM_CLOSE = 0x0010;
-    private const int GWL_STYLE = -16;
-    private const int GWL_EXSTYLE = -20;
-    private const int WS_BORDER = 0x00800000;
-    private const int WS_CAPTION = 0x00C00000;
-    private const int WS_CHILD = 0x40000000;
-    private const int WS_POPUP = unchecked((int)0x80000000);
-    private const int WS_SYSMENU = 0x00080000;
-    private const int WS_MINIMIZEBOX = 0x00020000;
-    private const int WS_MAXIMIZEBOX = 0x00010000;
-    private const int WS_EX_TOPMOST = 0x00000008;
-    private const int WS_EX_TRANSPARENT = 0x00000020;
-    private const int WS_EX_TOOLWINDOW = 0x00000080;
-    private const int WS_EX_LAYERED = 0x00080000;
-    private const uint LWA_ALPHA = 0x2;
-    private const int SW_HIDE = 0;
-    private const int SW_SHOW = 5;
-    private const int SW_NORMAL = 1;
-    private const int SW_MAXIMIZE = 3;
-    private const int SW_MINIMIZE = 6;
-    private const int SW_RESTORE = 9;
-
-    private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
-    #endregion
-
-    public static void Main(string[] args)
+    try
     {
-        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+      List<IntPtr> targetWindows = GetTargetWindows(args);
+      if (targetWindows.Count == 0)
+      {
+        throw new Exception("未找到目标窗口");
+      }
+
+      string type = GetArgumentValue(args, "-type");
+      if (type.ToLower() == "info")
+      {
+        var allWindowInfo = new List<Dictionary<string, object>>();
+        foreach (IntPtr windowHandle in targetWindows)
         {
-            ShowHelp();
-            return;
+          var windowInfo = GetBasicWindowInfo(windowHandle);
+          if (windowInfo != null)
+          {
+            allWindowInfo.Add(windowInfo);
+          }
         }
+        var serializer = new JavaScriptSerializer();
+        Console.WriteLine(serializer.Serialize(allWindowInfo));
+        return;
+      }
+
+      IntPtr targetHandle = targetWindows[0];
+      Dictionary<string, object> operatedWindow = null;
+
+      switch (type.ToLower())
+      {
+        case "topmost":
+          bool isTopMost = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+          SetWindowPos(targetHandle, isTopMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "opacity":
+          int opacity = int.Parse(GetArgumentValue(args, "-value") ?? "100");
+          SetWindowLong(targetHandle, GWL_EXSTYLE, GetWindowLong(targetHandle, GWL_EXSTYLE) | WS_EX_LAYERED);
+          SetLayeredWindowAttributes(targetHandle, 0, (byte)(opacity * 2.55), LWA_ALPHA);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "rect":
+          string[] rectValues = (GetArgumentValue(args, "-value") ?? "").Split(',');
+          if (rectValues.Length == 4)
+          {
+            int x = int.Parse(rectValues[0]);
+            int y = int.Parse(rectValues[1]);
+            int width = int.Parse(rectValues[2]);
+            int height = int.Parse(rectValues[3]);
+            MoveWindow(targetHandle, x, y, width, height, true);
+          }
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "state":
+          string state = GetArgumentValue(args, "-value") ?? "normal";
+          int cmdShow = state == "maximize" ? SW_MAXIMIZE :
+                      state == "minimize" ? SW_MINIMIZE : SW_NORMAL;
+          ShowWindow(targetHandle, cmdShow);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "visible":
+          bool visible = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+          ShowWindow(targetHandle, visible ? SW_SHOW : SW_HIDE);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "close":
+          PostMessage(targetHandle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "focus":
+          if (IsIconic(targetHandle))
+          {
+            ShowWindow(targetHandle, SW_RESTORE);
+          }
+          SetForegroundWindow(targetHandle);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "border":
+          bool hasBorder = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+          int style = GetWindowLong(targetHandle, GWL_STYLE);
+          style = hasBorder ? style | WS_CAPTION : style & ~WS_CAPTION;
+          SetWindowLong(targetHandle, GWL_STYLE, style);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "clickthrough":
+          bool isTransparent = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
+          int exStyle = GetWindowLong(targetHandle, GWL_EXSTYLE);
+          exStyle |= WS_EX_LAYERED;
+          exStyle = isTransparent ? exStyle | WS_EX_TRANSPARENT : exStyle & ~WS_EX_TRANSPARENT;
+          SetWindowLong(targetHandle, GWL_EXSTYLE, exStyle);
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        case "info":
+          operatedWindow = GetBasicWindowInfo(targetHandle);
+          break;
+
+        default:
+          Console.Error.WriteLine("Error: 不支持的操作类型");
+          return;
+      }
+
+      if (operatedWindow != null)
+      {
+        var serializer = new JavaScriptSerializer();
+        Console.WriteLine(serializer.Serialize(operatedWindow));
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+    }
+  }
 
-        try
-        {
-            List<IntPtr> targetWindows = GetTargetWindows(args);
-            if (targetWindows.Count == 0)
-            {
-                throw new Exception("未找到目标窗口");
-            }
-
-            string type = GetArgumentValue(args, "-type");
-            if (type.ToLower() == "info")
-            {
-                var allWindowInfo = new List<Dictionary<string, object>>();
-                foreach (IntPtr windowHandle in targetWindows)
-                {
-                    var windowInfo = GetBasicWindowInfo(windowHandle);
-                    if (windowInfo != null)
-                    {
-                        allWindowInfo.Add(windowInfo);
-                    }
-                }
-                var serializer = new JavaScriptSerializer();
-                Console.WriteLine(serializer.Serialize(allWindowInfo));
-                return;
-            }
-
-            IntPtr targetHandle = targetWindows[0];
-            Dictionary<string, object> operatedWindow = null;
+  private static List<IntPtr> GetTargetWindows(string[] args)
+  {
+    List<IntPtr> targetWindows = new List<IntPtr>();
+    string method = GetArgumentValue(args, "-method") ?? "title";
+    string value = GetArgumentValue(args, "-window") ?? "";
 
-            switch (type.ToLower())
-            {
-                case "topmost":
-                    bool isTopMost = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    SetWindowPos(targetHandle, isTopMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "opacity":
-                    int opacity = int.Parse(GetArgumentValue(args, "-value") ?? "100");
-                    SetWindowLong(targetHandle, GWL_EXSTYLE, GetWindowLong(targetHandle, GWL_EXSTYLE) | WS_EX_LAYERED);
-                    SetLayeredWindowAttributes(targetHandle, 0, (byte)(opacity * 2.55), LWA_ALPHA);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "rect":
-                    string[] rectValues = (GetArgumentValue(args, "-value") ?? "").Split(',');
-                    if (rectValues.Length == 4)
-                    {
-                        int x = int.Parse(rectValues[0]);
-                        int y = int.Parse(rectValues[1]);
-                        int width = int.Parse(rectValues[2]);
-                        int height = int.Parse(rectValues[3]);
-                        MoveWindow(targetHandle, x, y, width, height, true);
-                    }
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "state":
-                    string state = GetArgumentValue(args, "-value") ?? "normal";
-                    int cmdShow = state == "maximize" ? SW_MAXIMIZE :
-                                state == "minimize" ? SW_MINIMIZE : SW_NORMAL;
-                    ShowWindow(targetHandle, cmdShow);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "visible":
-                    bool visible = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    ShowWindow(targetHandle, visible ? SW_SHOW : SW_HIDE);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "close":
-                    PostMessage(targetHandle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "focus":
-                    if (IsIconic(targetHandle))
-                    {
-                        ShowWindow(targetHandle, SW_RESTORE);
-                    }
-                    SetForegroundWindow(targetHandle);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "border":
-                    bool hasBorder = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    int style = GetWindowLong(targetHandle, GWL_STYLE);
-                    style = hasBorder ? style | WS_CAPTION : style & ~WS_CAPTION;
-                    SetWindowLong(targetHandle, GWL_STYLE, style);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "clickthrough":
-                    bool isTransparent = bool.Parse(GetArgumentValue(args, "-value") ?? "true");
-                    int exStyle = GetWindowLong(targetHandle, GWL_EXSTYLE);
-                    exStyle |= WS_EX_LAYERED;
-                    exStyle = isTransparent ? exStyle | WS_EX_TRANSPARENT : exStyle & ~WS_EX_TRANSPARENT;
-                    SetWindowLong(targetHandle, GWL_EXSTYLE, exStyle);
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                case "info":
-                    operatedWindow = GetBasicWindowInfo(targetHandle);
-                    break;
-
-                default:
-                    Console.Error.WriteLine("Error: 不支持的操作类型");
-                    return;
-            }
-
-            if (operatedWindow != null)
-            {
-                var serializer = new JavaScriptSerializer();
-                Console.WriteLine(serializer.Serialize(operatedWindow));
-            }
-        }
-        catch (Exception ex)
+    switch (method.ToLower())
+    {
+      case "handle":
+        IntPtr handle = new IntPtr(long.Parse(value));
+        if (!IsWindow(handle))
         {
-            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+          throw new Exception("指定的句柄不是一个有效的窗口句柄");
         }
-    }
+        targetWindows.Add(handle);
+        break;
 
-    private static List<IntPtr> GetTargetWindows(string[] args)
-    {
-        List<IntPtr> targetWindows = new List<IntPtr>();
-        string method = GetArgumentValue(args, "-method") ?? "title";
-        string value = GetArgumentValue(args, "-window") ?? "";
+      case "active":
+        targetWindows.Add(GetForegroundWindow());
+        break;
 
-        switch (method.ToLower())
+      case "process":
+        var processes = Process.GetProcessesByName(value);
+        foreach (var process in processes)
         {
-            case "handle":
-                targetWindows.Add(new IntPtr(long.Parse(value)));
-                break;
-
-            case "active":
-                targetWindows.Add(GetForegroundWindow());
-                break;
-
-            case "process":
-                var processes = Process.GetProcessesByName(value);
-                foreach (var process in processes)
-                {
-                    if (process.MainWindowHandle != IntPtr.Zero)
-                    {
-                        targetWindows.Add(process.MainWindowHandle);
-                    }
-                }
-                break;
-
-            case "class":
-                EnumWindows((hwnd, param) =>
-                {
-                    if (!IsWindowVisible(hwnd))
-                    {
-                        return true;
-                    }
-
-                    StringBuilder className = new StringBuilder(256);
-                    GetClassName(hwnd, className, className.Capacity);
-                    string windowClassName = className.ToString();
-
-                    if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
-                    {
-                        targetWindows.Add(hwnd);
-                    }
-                    return true;
-                }, IntPtr.Zero);
-                break;
-
-            case "title":
-            default:
-                if (!string.IsNullOrEmpty(value))
-                {
-                    EnumWindows((hwnd, param) =>
-                    {
-                        StringBuilder title = new StringBuilder(256);
-                        GetWindowText(hwnd, title, title.Capacity);
-                        string windowTitle = title.ToString();
-
-                        if (!string.IsNullOrEmpty(windowTitle) &&
-                            windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
-                        {
-                            targetWindows.Add(hwnd);
-                        }
-                        return true;
-                    }, IntPtr.Zero);
-                }
-                break;
+          if (process.MainWindowHandle != IntPtr.Zero)
+          {
+            targetWindows.Add(process.MainWindowHandle);
+          }
         }
+        break;
 
-        if (targetWindows.Count == 0)
+      case "class":
+        EnumWindows((hwnd, param) =>
+        {
+          if (!IsWindowVisible(hwnd))
+          {
+            return true;
+          }
+
+          StringBuilder className = new StringBuilder(256);
+          GetClassName(hwnd, className, className.Capacity);
+          string windowClassName = className.ToString();
+
+          if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+          {
+            targetWindows.Add(hwnd);
+          }
+          return true;
+        }, IntPtr.Zero);
+        break;
+
+      case "title":
+      default:
+        if (!string.IsNullOrEmpty(value))
         {
-            throw new Exception("未找到匹配的窗口");
+          EnumWindows((hwnd, param) =>
+          {
+            StringBuilder title = new StringBuilder(256);
+            GetWindowText(hwnd, title, title.Capacity);
+            string windowTitle = title.ToString();
+
+            if (!string.IsNullOrEmpty(windowTitle) &&
+                          windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+            {
+              targetWindows.Add(hwnd);
+            }
+            return true;
+          }, IntPtr.Zero);
         }
+        break;
+    }
 
-        return targetWindows;
+    if (targetWindows.Count == 0)
+    {
+      throw new Exception("未找到匹配的窗口");
     }
 
-    private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
+    return targetWindows;
+  }
+
+  private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
+  {
+    StringBuilder title = new StringBuilder(256);
+    StringBuilder className = new StringBuilder(256);
+    GetWindowText(hwnd, title, title.Capacity);
+    GetClassName(hwnd, className, className.Capacity);
+
+    // 获取窗口位置和大小
+    RECT rect = new RECT();
+    GetWindowRect(hwnd, out rect);
+
+    // 获取进程信息
+    uint processId = 0;
+    GetWindowThreadProcessId(hwnd, out processId);
+    string processName = "";
+    string processPath = "";
+    try
     {
-        StringBuilder title = new StringBuilder(256);
-        StringBuilder className = new StringBuilder(256);
-        GetWindowText(hwnd, title, title.Capacity);
-        GetClassName(hwnd, className, className.Capacity);
-
-        // 获取窗口位置和大小
-        RECT rect = new RECT();
-        GetWindowRect(hwnd, out rect);
-
-        // 获取进程信息
-        uint processId = 0;
-        GetWindowThreadProcessId(hwnd, out processId);
-        string processName = "";
-        string processPath = "";
-        try
-        {
-            var process = Process.GetProcessById((int)processId);
-            processName = process.ProcessName;
-            processPath = process.MainModule.FileName;
-        }
-        catch { }
+      var process = Process.GetProcessById((int)processId);
+      processName = process.ProcessName;
+      processPath = process.MainModule.FileName;
+    }
+    catch { }
 
-        return new Dictionary<string, object>
+    return new Dictionary<string, object>
         {
             { "handle", hwnd.ToInt64() },
             { "title", title.ToString() },
@@ -345,21 +352,21 @@ private static Dictionary<string, object> GetBasicWindowInfo(IntPtr hwnd)
             { "processName", processName },
             { "processPath", processPath }
         };
-    }
+  }
 
-    private static string GetArgumentValue(string[] args, string key)
+  private static string GetArgumentValue(string[] args, string key)
+  {
+    int index = Array.IndexOf(args, key);
+    if (index >= 0 && index < args.Length - 1)
     {
-        int index = Array.IndexOf(args, key);
-        if (index >= 0 && index < args.Length - 1)
-        {
-            return args[index + 1];
-        }
-        return null;
+      return args[index + 1];
     }
+    return null;
+  }
 
-    private static void ShowHelp()
-    {
-        string help = @"
+  private static void ShowHelp()
+  {
+    string help = @"
 Windows 窗口管理工具使用说明
 ==========================
 
@@ -455,6 +462,6 @@ 4. 失败均抛出异常
 1. 窗口标题、类名支持模糊匹配，active方式可不提供window参数
 2. 只有info操作会返回所有匹配窗口的信息，其他操作只会操作第一个匹配的窗口
 ";
-        Console.WriteLine(help);
-    }
+    Console.WriteLine(help);
+  }
 }
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index a834d37a..7bc59a3f 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -123,7 +123,10 @@ async function runAutomation(
       }
     }
   } catch (err) {
-    error = err.toString().trim();
+    error = err
+      .toString()
+      .replace(/^Error: /, "")
+      .trim();
   }
 
   if (type === "inspect") return { error };
diff --git a/plugin/lib/quickcomposer/windows/sendmessage.js b/plugin/lib/quickcomposer/windows/sendmessage.js
index a8288e40..392cced3 100644
--- a/plugin/lib/quickcomposer/windows/sendmessage.js
+++ b/plugin/lib/quickcomposer/windows/sendmessage.js
@@ -2,7 +2,7 @@ const { runCsharpFeature } = require("../../csharp");
 
 /**
  * 执行消息发送操作
- * @param {string} type - 操作类型, 可选值: "keyboard"|"mouse"|"inspect"
+ * @param {string} type - 操作类型, 可选值: "keyboard"|"mouse"|"list"
  * @param {Object} params - 参数对象
  * @param {string} params.method - 查找方式："title"|"handle"|"process"|"class"|"active"
  * @param {string} params.window - 窗口标题、句柄、进程名、类名
@@ -47,7 +47,7 @@ async function runSendMessage(type, params = {}) {
       }
       break;
 
-    case "inspect":
+    case "list":
       if (filter) {
         args.push("-filter", filter);
       }
@@ -61,54 +61,53 @@ async function runSendMessage(type, params = {}) {
   try {
     const result = await runCsharpFeature("sendmessage", args);
     if (result) {
-      const jsonResult = JSON.parse(result);
-      if (type === "inspect") {
-        return jsonResult;
-      }
-      return { success: true, control: jsonResult };
+      const resultStr = result.toString().trim();
+      if (type === "list") return JSON.parse(resultStr);
+      if (resultStr === "true") return { success: true };
     }
   } catch (err) {
     error = err
       .toString()
       .replace(/^Error: /, "")
       .trim();
+    console.log(error);
   }
 
-  if (type === "inspect") return [];
+  if (type === "list") return [];
   return { success: false, error };
 }
 
 module.exports = {
-  sendKeys: (method, window, keys, options = {}) =>
+  sendKeys: (windowHandle, keys, options = {}) =>
     runSendMessage("keyboard", {
-      method,
-      window,
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
       action: "keys",
       value: keys,
       options,
     }),
 
-  sendText: (method, window, text, options = {}) =>
+  sendText: (windowHandle, text, options = {}) =>
     runSendMessage("keyboard", {
-      method,
-      window,
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
       action: "text",
       value: text,
       options,
     }),
 
-  click: (method, window, action = "click", options = {}) =>
+  click: (windowHandle, action = "click", options = {}) =>
     runSendMessage("mouse", {
-      method,
-      window,
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
       action,
       options,
     }),
 
-  inspectWindow: (method, window, options = {}) =>
-    runSendMessage("inspect", {
-      method,
-      window,
+  listControls: (windowHandle, options = {}) =>
+    runSendMessage("list", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
       options,
     }),
 };
diff --git a/plugin/lib/quickcomposer/windows/window.js b/plugin/lib/quickcomposer/windows/window.js
index b2eca9a4..6ac6a82e 100644
--- a/plugin/lib/quickcomposer/windows/window.js
+++ b/plugin/lib/quickcomposer/windows/window.js
@@ -57,7 +57,7 @@ async function runWindow(type, params = {}) {
       if (type === "info") {
         return jsonResult;
       }
-      return { success: true, window: jsonResult };
+      return { success: true };
     }
   } catch (err) {
     error = err
@@ -72,27 +72,63 @@ async function runWindow(type, params = {}) {
 }
 
 module.exports = {
-  setTopMost: (method, window, isTopMost) =>
-    runWindow("topmost", { method, window, value: isTopMost }),
-
-  setOpacity: (method, window, opacity) =>
-    runWindow("opacity", { method, window, value: opacity }),
-
-  setWindowRect: (method, window, x, y, width, height) =>
-    runWindow("rect", { method, window, value: { x, y, width, height } }),
-
-  setWindowState: (method, window, state) =>
-    runWindow("state", { method, window, value: state }),
-
-  closeWindow: (method, window) => runWindow("close", { method, window }),
-
-  setFocus: (method, window) => runWindow("focus", { method, window }),
-
-  setBorder: (method, window, hasBorder) =>
-    runWindow("border", { method, window, value: hasBorder }),
-
-  setClickThrough: (method, window, isTransparent) =>
-    runWindow("clickthrough", { method, window, value: isTransparent }),
-
-  getWindowInfo: (method, window) => runWindow("info", { method, window }),
+  setTopMost: (windowHandle, isTopMost) =>
+    runWindow("topmost", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: isTopMost,
+    }),
+
+  setOpacity: (windowHandle, opacity) =>
+    runWindow("opacity", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: opacity,
+    }),
+
+  setWindowRect: (windowHandle, x, y, width, height) =>
+    runWindow("rect", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: { x, y, width, height },
+    }),
+
+  setWindowState: (windowHandle, state) =>
+    runWindow("state", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: state,
+    }),
+
+  closeWindow: (windowHandle) =>
+    runWindow("close", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+    }),
+
+  setFocus: (windowHandle) =>
+    runWindow("focus", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+    }),
+
+  setBorder: (windowHandle, hasBorder) =>
+    runWindow("border", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: hasBorder,
+    }),
+
+  setClickThrough: (windowHandle, isTransparent) =>
+    runWindow("clickthrough", {
+      method: windowHandle ? "handle" : "active",
+      window: windowHandle,
+      value: isTransparent,
+    }),
+
+  getWindowInfo: (method, window) =>
+    runWindow("info", {
+      method,
+      window,
+    }),
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index b81d8252..904dfd00 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -177,15 +177,19 @@ const searchWindowConfig = [
   },
 ];
 
-const searchElementConfig = [
+const windowHandleConfig = [
   {
     label: "窗口句柄",
     component: "VariableInput",
     icon: "window",
     width: 12,
-    placeholder: "留空则使用当前活动窗口",
+    placeholder: "可从搜索/选择窗口获取，留空则使用当前活动窗口",
     defaultValue: newVarInputVal("str", ""),
   },
+];
+
+const searchElementConfig = [
+  windowHandleConfig,
   {
     label: "元素查找方式",
     component: "q-select",
@@ -267,7 +271,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.window.setTopMost",
       label: "窗口控制",
       icon: "window",
-      config: searchWindowConfig,
+      config: windowHandleConfig,
       subCommands: [
         {
           value: "quickcomposer.windows.window.setTopMost",
@@ -630,14 +634,14 @@ export const windowsCommands = {
     },
     // sendmessage
     {
-      value: "quickcomposer.windows.sendmessage.inspectWindow",
+      value: "quickcomposer.windows.sendmessage.listControls",
       label: "发送控制消息",
       icon: "smart_button",
       isAsync: true,
-      config: searchWindowConfig,
+      config: windowHandleConfig,
       subCommands: [
         {
-          value: "quickcomposer.windows.sendmessage.inspectWindow",
+          value: "quickcomposer.windows.sendmessage.listControls",
           label: "获取控件树",
           icon: "account_tree",
           outputVariable: "controlsTree",

From a8e0fe9e8f191442f30171e6b4bff8ab46ab95a9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 13:39:54 +0800
Subject: [PATCH 069/332] =?UTF-8?q?Varinput=E7=BB=84=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=89=E6=8B=A9=E7=AA=97=E5=8F=A3=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=BF=AB=E9=80=9F=E5=A1=AB=E5=85=A5?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8F=8A=E5=85=83=E7=B4=A0=E7=9A=84=E5=8F=A5?=
 =?UTF-8?q?=E6=9F=84=E3=80=81=E6=A0=87=E9=A2=98=E7=AD=89=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/VariableInput.vue         | 397 +++---------------
 .../composer/common/varinput/FileSelector.vue |  39 ++
 .../composer/common/varinput/ItemList.vue     | 174 ++++++++
 .../composer/common/varinput/VariableList.vue | 150 +++++++
 .../common/varinput/WindowSelector.vue        |  38 ++
 src/js/composer/commands/windowsCommands.js   |  92 ++--
 6 files changed, 490 insertions(+), 400 deletions(-)
 create mode 100644 src/components/composer/common/varinput/FileSelector.vue
 create mode 100644 src/components/composer/common/varinput/ItemList.vue
 create mode 100644 src/components/composer/common/varinput/VariableList.vue
 create mode 100644 src/components/composer/common/varinput/WindowSelector.vue

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 9fd9b8c1..bb5b6056 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -9,154 +9,39 @@
   >
     <template v-slot:append>
       <q-btn
-        v-if="hasSelectedVariable"
         flat
         dense
-        icon="close"
-        size="sm"
-        class="clear-btn prepend-btn"
-        @click="clearVariable"
-      >
-        <q-tooltip>清除选中的变量</q-tooltip>
-      </q-btn>
-      <q-btn
-        flat
-        dense
-        :icon="isString ? 'format_quote' : 'data_object'"
         size="sm"
         class="string-toggle prepend-btn"
+        :icon="isString ? 'format_quote' : 'data_object'"
         @click="toggleType"
-        v-if="!hasSelectedVariable"
       >
-        <q-tooltip>{{
-          (isString
-            ? "当前类型是：字符串"
-            : "当前类型是：变量、数字、表达式等") +
-          (disableToggleType ? "" : "，点击切换")
-        }}</q-tooltip>
+        <q-tooltip>{{ typeToggleTooltip }}</q-tooltip>
       </q-btn>
       <!-- 选项下拉按钮 -->
-      <q-btn-dropdown
-        v-if="options.items && !hasSelectedVariable"
-        flat
-        dense
-        size="sm"
-        dropdown-icon="menu"
-        no-icon-animation
-        class="options-dropdown prepend-btn"
-      >
-        <q-list class="options-item-list">
-          <template v-if="options.multiSelect">
-            <q-item
-              v-for="item in normalizedItems"
-              :key="getItemValue(item)"
-              clickable
-              class="option-item"
-              @click="toggleSelectItem(item)"
-            >
-              <q-checkbox
-                size="xs"
-                :model-value="isItemSelected(item)"
-                @update:model-value="toggleSelectItem(item)"
-              />
-              <div class="option-item-label">{{ getItemLabel(item) }}</div>
-            </q-item>
-            <q-separator />
-            <q-item
-              clickable
-              class="option-item"
-              @click="confirmMultiSelect"
-              v-close-popup
-            >
-              <q-item-section class="text-primary">
-                确定 (已选择 {{ selectedItems.length }} 项)
-              </q-item-section>
-            </q-item>
-          </template>
-          <template v-else>
-            <q-item
-              v-for="item in normalizedItems"
-              :key="getItemValue(item)"
-              clickable
-              v-close-popup
-              @click="selectItem(item)"
-              class="option-item"
-            >
-              <q-item-section>
-                {{ getItemLabel(item) }}
-              </q-item-section>
-            </q-item>
-          </template>
-        </q-list>
-      </q-btn-dropdown>
-      <q-btn
-        v-if="!hasSelectedVariable && options.dialog"
-        flat
-        dense
-        icon="file_open"
-        size="sm"
+      <ItemList
+        v-if="options.items"
+        :items="options.items"
+        :multiSelect="options.multiSelect"
+        @emit-value="updateValBySelect"
         class="prepend-btn"
-        @click="handleFileOpen(options.dialog)"
-      >
-        <q-tooltip>选择文件</q-tooltip>
-      </q-btn>
+      />
+      <!-- 文件选择按钮 -->
+      <FileSelector
+        v-if="options.dialog"
+        :dialog="options.dialog"
+        @emit-value="updateValBySelect"
+        class="prepend-btn"
+      />
+      <!-- 窗口选择按钮 -->
+      <WindowSelector
+        v-if="options.window"
+        :window="options.window"
+        @emit-value="updateValBySelect"
+        class="prepend-btn"
+      />
       <!-- 变量选择下拉 -->
-      <q-btn-dropdown
-        flat
-        dense
-        stretch
-        class="variable-dropdown prepend-btn"
-        size="sm"
-        @click="variables = getAvailableVariables()"
-      >
-        <q-list class="variable-list">
-          <q-item-label header class="variable-label">
-            <q-icon name="functions" size="15px" />
-            选择变量
-          </q-item-label>
-
-          <q-separator class="q-my-xs" />
-
-          <template v-if="variables.length">
-            <q-item
-              v-for="variable in variables"
-              :key="variable.name"
-              clickable
-              v-close-popup
-              @click="insertVariable(variable)"
-              class="variable-item"
-            >
-              <q-item-section>
-                <q-item-label class="variable-name">
-                  {{ variable.name }}
-                </q-item-label>
-                <q-item-label caption class="variable-source">
-                  来自: {{ variable.sourceCommand.label }}
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </template>
-          <template v-else>
-            <q-item>
-              <q-item-section>
-                <q-item-label class="empty-variables-tip">
-                  <div class="q-gutter-md">
-                    <div class="row items-center justify-center text-grey-6">
-                      <q-icon name="info" size="20px" class="q-mr-sm" />
-                      <span>当前命令没有可用变量</span>
-                    </div>
-                    <div class="row items-center justify-center text-grey-7">
-                      <div class="text-grey-7">点击其他命令卡片右上角的</div>
-                      <q-icon name="output" size="16px" class="q-mx-xs" />
-                      <div>按钮添加输出变量</div>
-                    </div>
-                  </div>
-                </q-item-label>
-              </q-item-section>
-            </q-item>
-          </template>
-        </q-list>
-      </q-btn-dropdown>
+      <VariableList @emit-value="updateValBySelect" class="prepend-btn" />
     </template>
     <template v-slot:prepend>
       <q-icon v-if="!noIcon" :name="icon || 'code'" />
@@ -165,10 +50,17 @@
 </template>
 
 <script>
-import { defineComponent, inject } from "vue";
+import { defineComponent } from "vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
+import ItemList from "./varinput/ItemList.vue";
+import FileSelector from "./varinput/FileSelector.vue";
+import VariableList from "./varinput/VariableList.vue";
+import WindowSelector from "./varinput/WindowSelector.vue";
+
 /**
+
  * 变量输入框组件
+
  * @description 支持变量选择和字符串输入的输入框组件
  *
  * @property {Object} modelValue - 输入框的值对象
@@ -206,6 +98,13 @@ import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "VariableInput",
 
+  components: {
+    ItemList,
+    FileSelector,
+    VariableList,
+    WindowSelector,
+  },
+
   props: {
     modelValue: {
       type: Object,
@@ -227,36 +126,14 @@ export default defineComponent({
   },
 
   emits: ["update:modelValue"],
-  setup() {
-    const getCurrentVariables = inject("getCurrentVariables");
-    const commandIndex = inject("commandIndex", null);
-
-    const getAvailableVariables = () => {
-      // commandIndex 是响应式的，所以需要使用 value 来获取其值
-      return getCurrentVariables().filter(
-        (variable) => variable.sourceCommand.index < commandIndex.value
-      );
-    };
-
-    return {
-      getAvailableVariables,
-    };
-  },
 
   data() {
     return {
       selectedVariable: null,
-      variables: [],
-      selectedItems: [],
     };
   },
 
   computed: {
-    // 判断是否有选中的变量，用于控制UI显示和行为
-    hasSelectedVariable() {
-      return this.selectedVariable !== null;
-    },
-
     isString: {
       get() {
         return this.modelValue.isString;
@@ -267,6 +144,11 @@ export default defineComponent({
           isString: value,
         });
       },
+      typeToggleTooltip() {
+        const currentType = this.isString ? "字符串" : "变量、数字、表达式等";
+        const toggleText = this.disableToggleType ? "" : "，点击切换";
+        return `当前类型是：${currentType}${toggleText}`;
+      },
     },
 
     inputValue: {
@@ -280,27 +162,9 @@ export default defineComponent({
         });
       },
     },
-
-    // 标准化选项格式
-    normalizedItems() {
-      if (!this.options.items) return [];
-      return this.options.items.map((item) => {
-        if (typeof item === "string") {
-          return { label: item, value: item };
-        }
-        return item;
-      });
-    },
   },
 
   methods: {
-    // 插入变量时的处理
-    insertVariable(variable) {
-      this.selectedVariable = variable;
-      this.isString = false; // 变量模式下不需要字符串处理
-      this.$emit("update:modelValue", newVarInputVal("var", variable.name));
-    },
-
     // 清除变量时的处理
     clearVariable() {
       this.selectedVariable = null;
@@ -317,75 +181,12 @@ export default defineComponent({
       });
     },
 
-    getItemLabel(option) {
-      return typeof option === "string" ? option : option.label;
-    },
-
-    getItemValue(option) {
-      return typeof option === "string" ? option : option.value;
-    },
-
-    selectItem(option) {
-      if (this.options.multiSelect) {
-        this.toggleSelectItem(option);
-      } else {
-        const value = this.options.appendItem
-          ? `${this.inputValue}${this.getItemValue(option)}`
-          : this.getItemValue(option);
-        this.$emit("update:modelValue", newVarInputVal("str", value));
-      }
-    },
-    handleFileOpen(dialog) {
-      let { type, options } = window.lodashM.cloneDeep(dialog);
-      if (!type) type = "open";
-      if (type === "open") {
-        const files = utools.showOpenDialog(options);
-        if (!files) return;
-        if (files.length > 1) {
-          this.$emit("update:modelValue", newVarInputVal("var", files));
-        } else if (files.length === 1) {
-          this.$emit("update:modelValue", newVarInputVal("str", files[0]));
-        }
-      } else {
-        const file = utools.showSaveDialog(options);
-        if (!file) return;
-        this.$emit("update:modelValue", newVarInputVal("str", file));
-      }
-    },
-
-    // 新增：判断选项是否被选中
-    isItemSelected(item) {
-      return this.selectedItems.includes(this.getItemValue(item));
-    },
-
-    // 新增：切换选项选中状态
-    toggleSelectItem(item) {
-      const value = this.getItemValue(item);
-      const index = this.selectedItems.indexOf(value);
-      if (index === -1) {
-        this.selectedItems.push(value);
-      } else {
-        this.selectedItems.splice(index, 1);
-      }
+    updateValBySelect(type, value) {
+      const newValue = this.options.appendItem
+        ? this.inputValue + value
+        : value;
+      this.$emit("update:modelValue", newVarInputVal(type, newValue));
     },
-
-    // 新增：确认多选
-    confirmMultiSelect() {
-      if (this.selectedItems.length === 0) return;
-      this.$emit(
-        "update:modelValue",
-        newVarInputVal(
-          "var",
-          JSON.stringify(this.selectedItems).replace(/,/g, ", ")
-        )
-      );
-      this.selectedItems = []; // 清空选择
-    },
-  },
-
-  // 在组件销毁时清空选择
-  beforeUnmount() {
-    this.selectedItems = [];
   },
 });
 </script>
@@ -427,106 +228,4 @@ export default defineComponent({
   margin-left: 5px;
   transition: all 0.6s ease;
 }
-
-.variable-dropdown.prepend-btn {
-  background-color: rgba(0, 0, 0, 0.02);
-}
-
-.body--dark .variable-dropdown.prepend-btn {
-  background-color: rgba(255, 255, 255, 0.02);
-}
-
-.clear-btn:hover {
-  color: var(--q-negative);
-}
-
-/* 变量列表样式 */
-.variable-list {
-  min-width: 200px;
-  padding: 4px;
-}
-
-.variable-item {
-  border-radius: 4px;
-  padding: 0px 16px;
-  transition: all 0.3s ease;
-  min-height: 40px;
-}
-
-.variable-item:hover {
-  background-color: var(--q-primary-opacity-10);
-}
-
-.variable-label {
-  padding: 4px 8px;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-
-.variable-name {
-  font-size: 12px;
-  font-weight: 500;
-}
-
-.variable-source {
-  font-size: 11px;
-  opacity: 0.7;
-}
-
-/* 暗色模式适配 */
-.body--dark .variable-item:hover {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-.options-item-list {
-  min-width: 120px;
-  padding: 4px;
-}
-
-.option-item {
-  border-radius: 4px;
-  padding: 0px 16px;
-  transition: all 0.3s ease;
-  min-height: 40px;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-}
-
-.option-item:hover {
-  background-color: var(--q-primary-opacity-10);
-}
-
-.option-item-label {
-  text-align: center;
-  flex: 1;
-}
-
-/* 暗色模式适配 */
-.body--dark .option-item:hover {
-  background-color: rgba(255, 255, 255, 0.1);
-}
-
-.empty-variables-tip {
-  text-align: center;
-  font-size: 13px;
-  opacity: 0.9;
-  transition: opacity 0.3s ease;
-}
-
-.empty-variables-tip:hover {
-  opacity: 1;
-}
-
-/* 多选确认按钮样式 */
-.option-item.text-primary {
-  justify-content: center;
-  font-weight: 500;
-}
-
-/* 多选项样式 */
-.option-item .q-checkbox {
-  margin-right: 4px;
-}
 </style>
diff --git a/src/components/composer/common/varinput/FileSelector.vue b/src/components/composer/common/varinput/FileSelector.vue
new file mode 100644
index 00000000..eca8635a
--- /dev/null
+++ b/src/components/composer/common/varinput/FileSelector.vue
@@ -0,0 +1,39 @@
+<template>
+  <q-btn flat dense icon="file_open" size="sm" @click="handleFileOpen">
+    <q-tooltip>选择文件</q-tooltip>
+  </q-btn>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "FileSelector",
+  props: {
+    dialog: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["emitValue"],
+  methods: {
+    handleFileOpen() {
+      let { type, options } = window.lodashM.cloneDeep(this.dialog);
+      if (!type) type = "open";
+      if (type === "open") {
+        const files = utools.showOpenDialog(options);
+        if (!files) return;
+        if (files.length > 1) {
+          this.$emit("emitValue", "var", files);
+        } else if (files.length === 1) {
+          this.$emit("emitValue", "str", files[0]);
+        }
+      } else {
+        const file = utools.showSaveDialog(options);
+        if (!file) return;
+        this.$emit("emitValue", "str", file);
+      }
+    },
+  },
+});
+</script>
diff --git a/src/components/composer/common/varinput/ItemList.vue b/src/components/composer/common/varinput/ItemList.vue
new file mode 100644
index 00000000..5e53edf0
--- /dev/null
+++ b/src/components/composer/common/varinput/ItemList.vue
@@ -0,0 +1,174 @@
+<template>
+  <!-- 选项下拉按钮 -->
+  <q-btn-dropdown flat dense size="sm" dropdown-icon="menu" no-icon-animation>
+    <q-list class="options-item-list">
+      <template v-if="multiSelect">
+        <q-item
+          v-for="item in normalizedItems"
+          :key="getItemValue(item)"
+          clickable
+          class="option-item"
+          @click="toggleSelectItem(item)"
+        >
+          <q-checkbox
+            size="xs"
+            :model-value="isItemSelected(item)"
+            @update:model-value="toggleSelectItem(item)"
+          />
+          <div class="option-item-label">{{ getItemLabel(item) }}</div>
+        </q-item>
+        <q-separator />
+        <q-item
+          clickable
+          class="option-item"
+          @click="confirmMultiSelect"
+          v-close-popup
+        >
+          <q-item-section class="text-primary">
+            确定 (已选择 {{ selectedItems.length }} 项)
+          </q-item-section>
+        </q-item>
+      </template>
+      <template v-else>
+        <q-item
+          v-for="item in normalizedItems"
+          :key="getItemValue(item)"
+          clickable
+          v-close-popup
+          @click="selectItem(item)"
+          class="option-item"
+        >
+          <q-item-section>
+            {{ getItemLabel(item) }}
+          </q-item-section>
+        </q-item>
+      </template>
+    </q-list>
+  </q-btn-dropdown>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "ItemList",
+  emits: ["emitValue"],
+  props: {
+    items: {
+      type: Array,
+      required: true,
+    },
+    multiSelect: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      selectedItems: [],
+    };
+  },
+  computed: {
+    // 标准化选项格式
+    normalizedItems() {
+      if (!this.items) return [];
+      return this.items.map((item) => {
+        if (typeof item === "string") {
+          return { label: item, value: item };
+        }
+        return item;
+      });
+    },
+  },
+  methods: {
+    getItemLabel(item) {
+      return typeof item === "string" ? item : item.label;
+    },
+
+    getItemValue(item) {
+      return typeof item === "string" ? item : item.value;
+    },
+
+    selectItem(item) {
+      if (this.multiSelect) {
+        this.toggleSelectItem(item);
+      } else {
+        this.$emit("emitValue", "str", this.getItemValue(item));
+      }
+    },
+
+    // 新增：判断选项是否被选中
+    isItemSelected(item) {
+      return this.selectedItems.includes(this.getItemValue(item));
+    },
+
+    // 新增：切换选项选中状态
+    toggleSelectItem(item) {
+      const value = this.getItemValue(item);
+      const index = this.selectedItems.indexOf(value);
+      if (index === -1) {
+        this.selectedItems.push(value);
+      } else {
+        this.selectedItems.splice(index, 1);
+      }
+    },
+
+    // 新增：确认多选
+    confirmMultiSelect() {
+      if (this.selectedItems.length === 0) return;
+      this.$emit(
+        "emitValue",
+        "var",
+        JSON.stringify(this.selectedItems).replace(/,/g, ", ")
+      );
+      this.selectedItems = []; // 清空选择
+    },
+  },
+  // 在组件销毁时清空选择
+  beforeUnmount() {
+    this.selectedItems = [];
+  },
+});
+</script>
+
+<style scoped>
+.options-item-list {
+  min-width: 120px;
+  padding: 4px;
+}
+
+.option-item {
+  border-radius: 4px;
+  padding: 0px 16px;
+  transition: all 0.3s ease;
+  min-height: 40px;
+  font-size: 12px;
+  display: flex;
+  align-items: center;
+}
+
+.option-item:hover {
+  background-color: var(--q-primary-opacity-10);
+}
+
+.option-item-label {
+  text-align: center;
+  flex: 1;
+}
+
+/* 暗色模式适配 */
+.body--dark .option-item:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+/* 多选确认按钮样式 */
+.option-item.text-primary {
+  justify-content: center;
+  font-weight: 500;
+}
+
+/* 多选项样式 */
+.option-item .q-checkbox {
+  margin-right: 4px;
+}
+</style>
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
new file mode 100644
index 00000000..90b22922
--- /dev/null
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -0,0 +1,150 @@
+<template>
+  <q-btn-dropdown
+    flat
+    dense
+    stretch
+    size="sm"
+    class="variable-dropdown"
+    @click="variables = getAvailableVariables()"
+  >
+    <q-list class="variable-list">
+      <q-item-label header class="variable-label">
+        <q-icon name="functions" />
+        <span>选择变量</span>
+      </q-item-label>
+
+      <q-separator class="q-my-xs" />
+
+      <template v-if="variables.length">
+        <q-item
+          v-for="variable in variables"
+          :key="variable.name"
+          clickable
+          v-close-popup
+          @click="insertVariable(variable)"
+          class="variable-item"
+        >
+          <q-item-section>
+            <q-item-label class="variable-name">
+              {{ variable.name }}
+            </q-item-label>
+            <q-item-label caption class="variable-source">
+              来自: {{ variable.sourceCommand.label }}
+            </q-item-label>
+          </q-item-section>
+        </q-item>
+      </template>
+      <template v-else>
+        <q-item>
+          <q-item-section>
+            <q-item-label class="empty-variables-tip">
+              <div class="q-gutter-md">
+                <div class="row items-center justify-center text-grey-6">
+                  <q-icon name="info" size="20px" class="q-mr-sm" />
+                  <span>当前命令没有可用变量</span>
+                </div>
+                <div class="row items-center justify-center text-grey-7">
+                  <div class="text-grey-7">点击其他命令卡片右上角的</div>
+                  <q-icon name="output" size="16px" class="q-mx-xs" />
+                  <div>按钮添加输出变量</div>
+                </div>
+              </div>
+            </q-item-label>
+          </q-item-section>
+        </q-item>
+      </template>
+    </q-list>
+  </q-btn-dropdown>
+</template>
+
+<script>
+import { defineComponent, inject } from "vue";
+
+export default defineComponent({
+  name: "VariableList",
+  emits: ["emitValue"],
+  setup() {
+    const getCurrentVariables = inject("getCurrentVariables");
+    const commandIndex = inject("commandIndex", null);
+
+    const getAvailableVariables = () => {
+      return getCurrentVariables().filter(
+        (variable) => variable.sourceCommand.index < commandIndex.value
+      );
+    };
+
+    return {
+      getAvailableVariables,
+    };
+  },
+  data() {
+    return {
+      variables: [],
+    };
+  },
+  methods: {
+    insertVariable(variable) {
+      this.$emit("emitValue", "var", variable.name);
+    },
+  },
+});
+</script>
+
+<style scoped>
+.variable-dropdown {
+  background-color: rgba(0, 0, 0, 0.02);
+}
+.body--dark .variable-dropdown {
+  background-color: rgba(255, 255, 255, 0.02);
+}
+/* 变量列表样式 */
+.variable-list {
+  min-width: 200px;
+  padding: 4px;
+}
+
+.variable-item {
+  border-radius: 4px;
+  padding: 0px 16px;
+  transition: all 0.3s ease;
+  min-height: 40px;
+}
+
+.variable-item:hover {
+  background-color: var(--q-primary-opacity-10);
+}
+
+.variable-label {
+  padding: 4px 8px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 13px;
+}
+
+.variable-name {
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.variable-source {
+  font-size: 11px;
+  opacity: 0.7;
+}
+
+/* 暗色模式适配 */
+.body--dark .variable-item:hover {
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.empty-variables-tip {
+  text-align: center;
+  font-size: 13px;
+  opacity: 0.9;
+  transition: opacity 0.3s ease;
+}
+
+.empty-variables-tip:hover {
+  opacity: 1;
+}
+</style>
diff --git a/src/components/composer/common/varinput/WindowSelector.vue b/src/components/composer/common/varinput/WindowSelector.vue
new file mode 100644
index 00000000..89d3d469
--- /dev/null
+++ b/src/components/composer/common/varinput/WindowSelector.vue
@@ -0,0 +1,38 @@
+<template>
+  <q-btn @click="inspectWindow" icon="my_location" flat dense size="sm" />
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "WindowSelector",
+  emits: ["emitValue"],
+  props: {
+    window: {
+      type: Object,
+      required: true,
+    },
+  },
+  methods: {
+    async inspectWindow() {
+      const { props } = this.window;
+      window.utools.hideMainWindow();
+      const selectWindow = await quickcomposer.windows.automation.inspect();
+      window.utools.showMainWindow()
+      let propKeys = [];
+      if (typeof props === "object") {
+        const result = await quickcommand.showButtonBox(
+          props.map((item) => item.label),
+          "请选择要填入的属性"
+        );
+        propKeys = props[result.id].value.split(".");
+      } else {
+        propKeys = props.split(".");
+      }
+      const propValue = propKeys.reduce((acc, key) => acc[key], selectWindow);
+      this.$emit("emitValue", "str", propValue || "");
+    },
+  },
+});
+</script>
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 904dfd00..502d1767 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,52 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager.js";
 
-const controlClass = [
-  // 基础控件
-  { value: "Button", label: "按钮 (Button)" },
-  { value: "Edit", label: "编辑框 (Edit)" },
-  { value: "Static", label: "静态文本 (Static)" },
-  { value: "ComboBox", label: "下拉框 (ComboBox)" },
-  { value: "ListBox", label: "列表框 (ListBox)" },
-  { value: "CheckBox", label: "复选框 (CheckBox)" },
-  { value: "RadioButton", label: "单选框 (RadioButton)" },
-
-  // 常见对话框控件
-  { value: "SysListView32", label: "列表视图 (SysListView32)" },
-  { value: "SysTreeView32", label: "树形视图 (SysTreeView32)" },
-  { value: "SysTabControl32", label: "选项卡 (SysTabControl32)" },
-  { value: "msctls_progress32", label: "进度条 (msctls_progress32)" },
-  { value: "msctls_trackbar32", label: "滑块 (msctls_trackbar32)" },
-  { value: "msctls_updown32", label: "数字调节器 (msctls_updown32)" },
-
-  // 文件对话框相关
-  { value: "DirectUIHWND", label: "文件浏览器 (DirectUIHWND)" },
-  { value: "ToolbarWindow32", label: "工具栏 (ToolbarWindow32)" },
-  { value: "ComboBoxEx32", label: "扩展下拉框 (ComboBoxEx32)" },
-
-  // 常见应用程序控件
-  { value: "RICHEDIT50W", label: "富文本编辑框 (RICHEDIT50W)" },
-  { value: "Scintilla", label: "代码编辑器 (Scintilla)" },
-  { value: "WebView2", label: "Edge浏览器 (WebView2)" },
-  {
-    value: "Chrome_RenderWidgetHostHWND",
-    label: "Chrome渲染 (Chrome_RenderWidgetHostHWND)",
-  },
-
-  // 系统控件
-  { value: "Shell_TrayWnd", label: "任务栏 (Shell_TrayWnd)" },
-  { value: "TrayNotifyWnd", label: "通知区域 (TrayNotifyWnd)" },
-  { value: "ReBarWindow32", label: "工具条容器 (ReBarWindow32)" },
-  { value: "TaskListThumbnailWnd", label: "任务预览 (TaskListThumbnailWnd)" },
-
-  // 通用容器
-  { value: "Window", label: "窗口 (Window)" },
-  { value: "Dialog", label: "对话框 (Dialog)" },
-  { value: "#32770", label: "标准对话框 (#32770)" },
-  { value: "MDIClient", label: "MDI客户区 (MDIClient)" },
-  { value: "ScrollBar", label: "滚动条 (ScrollBar)" },
-  { value: "GroupBox", label: "分组框 (GroupBox)" },
-];
-
 const sendKeys = [
   // 特殊按键
   { value: "{ENTER}", label: "回车键 (Enter)" },
@@ -174,6 +127,16 @@ const searchWindowConfig = [
     icon: "title",
     width: 9,
     placeholder: "标题、类名支持模糊匹配，选择活动窗口无需输入",
+    options: {
+      window: {
+        props: [
+          { label: "标题", value: "title" },
+          { label: "类名", value: "class" },
+          { label: "句柄", value: "handle" },
+          { label: "进程名", value: "processName" },
+        ],
+      },
+    },
   },
 ];
 
@@ -185,6 +148,11 @@ const windowHandleConfig = [
     width: 12,
     placeholder: "可从搜索/选择窗口获取，留空则使用当前活动窗口",
     defaultValue: newVarInputVal("str", ""),
+    options: {
+      window: {
+        props: "handle",
+      },
+    },
   },
 ];
 
@@ -207,6 +175,15 @@ const searchElementConfig = [
     label: "查找值",
     component: "VariableInput",
     icon: "account_tree",
+    options: {
+      window: {
+        props: [
+          { label: "XPath", value: "element.xpath" },
+          { label: "AutomationId", value: "element.automationId" },
+          { label: "Name", value: "element.name" },
+        ],
+      },
+    },
     width: 8,
     placeholder: "XPath: /Pane[3]/Edit[2], 组合条件: name=按钮&type=Button",
   },
@@ -656,7 +633,9 @@ export const windowsCommands = {
                   component: "VariableInput",
                   icon: "filter_alt",
                   options: {
-                    items: controlClass,
+                    window: {
+                      props: "element.type",
+                    },
                   },
                   width: 8,
                   placeholder: "可选，输入要过滤的控件类型或文本",
@@ -698,7 +677,9 @@ export const windowsCommands = {
                   component: "VariableInput",
                   icon: "class",
                   options: {
-                    items: controlClass,
+                    window: {
+                      props: "element.type",
+                    },
                   },
                   width: 6,
                   placeholder: "可选，和文本至少输入一个",
@@ -707,6 +688,11 @@ export const windowsCommands = {
                   label: "控件文本",
                   component: "VariableInput",
                   icon: "text_fields",
+                  options: {
+                    window: {
+                      props: "element.name",
+                    },
+                  },
                   width: 6,
                   placeholder: "可选，和控件类型至少输入一个",
                 },
@@ -750,7 +736,9 @@ export const windowsCommands = {
                   label: "目标控件",
                   component: "VariableInput",
                   options: {
-                    items: controlClass,
+                    window: {
+                      props: "element.type",
+                    },
                   },
                   icon: "class",
                   width: 8,
@@ -793,7 +781,9 @@ export const windowsCommands = {
                   label: "目标控件",
                   component: "VariableInput",
                   options: {
-                    items: controlClass,
+                    window: {
+                      props: "element.type",
+                    },
                   },
                   icon: "class",
                   width: 8,

From 3b49adcd596b2297bd3f296ee17166116fb01dd9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 18 Jan 2025 15:58:16 +0800
Subject: [PATCH 070/332] =?UTF-8?q?automation.cs=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E6=89=BEwindows?=
 =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E4=BE=9D=E7=84=B6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=8F=AA=E9=80=9A=E8=BF=87=E5=8F=A5=E6=9F=84=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/automation.cs               | 120 ++++++++++++++++--
 .../lib/quickcomposer/windows/automation.js   |   4 +-
 src/js/composer/commands/windowsCommands.js   |   2 +-
 3 files changed, 110 insertions(+), 16 deletions(-)

diff --git a/plugin/lib/csharp/automation.cs b/plugin/lib/csharp/automation.cs
index 704e2daa..c58013e3 100644
--- a/plugin/lib/csharp/automation.cs
+++ b/plugin/lib/csharp/automation.cs
@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Drawing;
+using System.Diagnostics;
 
 public class AutomationManager
 {
@@ -72,6 +73,17 @@ public System.Windows.Point ToWindowsPoint()
   [DllImport("user32.dll")]
   static extern int SetWindowLong(IntPtr hwnd, int index, int newStyle);
 
+  [DllImport("user32.dll")]
+  static extern bool IsWindow(IntPtr hWnd);
+
+  [DllImport("user32.dll")]
+  private static extern bool EnumWindows(EnumWindowsProc lpEnumFunc, IntPtr lParam);
+
+  [DllImport("user32.dll")]
+  private static extern bool IsWindowVisible(IntPtr hWnd);
+
+  private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
   private const int GWL_EXSTYLE = -20;
   private const int WS_EX_TRANSPARENT = 0x20;
   private const int WS_EX_LAYERED = 0x80000;
@@ -342,25 +354,22 @@ private static AutomationElement GetTargetElement(string[] args)
   {
     // 获取起始窗口
     AutomationElement root;
-    string windowArg = GetArgumentValue(args, "-window");
-    if (!string.IsNullOrEmpty(windowArg))
+    try
     {
-      // 通过窗口句柄查找
-      int handle = int.Parse(windowArg);
-      try
+      List<IntPtr> targetWindows = GetTargetWindows(args);
+      if (targetWindows.Count == 0)
       {
-        root = AutomationElement.FromHandle(new IntPtr(handle));
-      }
-      catch
-      {
-        throw new Exception("无法获取指定的窗口");
+        throw new Exception("未找到目标窗口");
       }
+
+      // 总是使用第一个窗口
+      IntPtr handle = targetWindows[0];
+
+      root = AutomationElement.FromHandle(handle);
     }
-    else
+    catch
     {
-      // 使用当前活动窗口
-      IntPtr activeHandle = GetForegroundWindow();
-      root = AutomationElement.FromHandle(activeHandle);
+      throw new Exception("无法获取指定的窗口");
     }
 
     if (root == null)
@@ -456,6 +465,89 @@ private static AutomationElement GetTargetElement(string[] args)
     throw new Exception("必须指定元素的识别方式: -xpath, -id, -name 或 -condition");
   }
 
+  private static List<IntPtr> GetTargetWindows(string[] args)
+  {
+    List<IntPtr> targetWindows = new List<IntPtr>();
+    string method = GetArgumentValue(args, "-method") ?? "handle";
+    string value = GetArgumentValue(args, "-window") ?? "";
+
+    switch (method.ToLower())
+    {
+      case "handle":
+        IntPtr handle = new IntPtr(long.Parse(value));
+        if (!IsWindow(handle))
+        {
+          throw new Exception("指定的句柄不是一个有效的窗口句柄");
+        }
+        targetWindows.Add(handle);
+        break;
+
+      case "active":
+        targetWindows.Add(GetForegroundWindow());
+        break;
+
+      case "process":
+        var processes = Process.GetProcessesByName(value);
+        foreach (var process in processes)
+        {
+          if (process.MainWindowHandle != IntPtr.Zero)
+          {
+            targetWindows.Add(process.MainWindowHandle);
+          }
+        }
+        break;
+
+      case "class":
+        EnumWindows((hwnd, param) =>
+        {
+          if (!IsWindowVisible(hwnd))
+          {
+            return true;
+          }
+
+          StringBuilder className = new StringBuilder(256);
+          GetClassName(hwnd, className, className.Capacity);
+          string windowClassName = className.ToString();
+
+          if (windowClassName.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+          {
+            targetWindows.Add(hwnd);
+          }
+          return true;
+        }, IntPtr.Zero);
+        break;
+
+      case "title":
+      default:
+        if (!string.IsNullOrEmpty(value))
+        {
+          EnumWindows((hwnd, param) =>
+          {
+            StringBuilder title = new StringBuilder(256);
+            GetWindowText(hwnd, title, title.Capacity);
+            string windowTitle = title.ToString();
+
+            if (!string.IsNullOrEmpty(windowTitle) &&
+                          windowTitle.IndexOf(value, StringComparison.OrdinalIgnoreCase) >= 0)
+            {
+              targetWindows.Add(hwnd);
+            }
+            return true;
+          }, IntPtr.Zero);
+        }
+        break;
+    }
+
+    if (targetWindows.Count == 0)
+    {
+      throw new Exception("未找到匹配的窗口");
+    }
+
+    return targetWindows;
+  }
+
+
+
   private static void ShowHelp()
   {
     Console.WriteLine(@"UI自动化工具 v1.0
diff --git a/plugin/lib/quickcomposer/windows/automation.js b/plugin/lib/quickcomposer/windows/automation.js
index 7bc59a3f..682af3fb 100644
--- a/plugin/lib/quickcomposer/windows/automation.js
+++ b/plugin/lib/quickcomposer/windows/automation.js
@@ -20,7 +20,9 @@ async function runAutomation(
   const args = [];
 
   if (window) {
-    args.push("-window", window);
+    args.push("-method", "handle", "-window", window);
+  } else {
+    args.push("-method", "active");
   }
 
   args.push("-type", type);
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 502d1767..04b90e53 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -157,7 +157,7 @@ const windowHandleConfig = [
 ];
 
 const searchElementConfig = [
-  windowHandleConfig,
+  ...windowHandleConfig,
   {
     label: "元素查找方式",
     component: "q-select",

From 1a1ec4b45f4f9c3770ff153147ab2b90e7c0bac9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 19 Jan 2025 13:43:10 +0800
Subject: [PATCH 071/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=9A=E6=B5=8F=E8=A7=88=E5=99=A8=E6=8E=A7=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8ECDP=E5=AF=B9edge=E5=92=8Cchrome=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=87=AA=E5=8A=A8=E5=8C=96=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 400 +++++++++++
 plugin/lib/quickcomposer/browser/index.js   |   3 +
 plugin/package-lock.json                    | 706 +++++++++++---------
 plugin/package.json                         |  23 +-
 src/js/composer/commands/browserCommands.js | 399 +++++++++++
 src/js/composer/commands/index.js           |   2 +
 6 files changed, 1198 insertions(+), 335 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/browser/browser.js
 create mode 100644 plugin/lib/quickcomposer/browser/index.js
 create mode 100644 src/js/composer/commands/browserCommands.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
new file mode 100644
index 00000000..a632786a
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -0,0 +1,400 @@
+const CDP = require("chrome-remote-interface");
+const { exec } = require("child_process");
+const path = require("path");
+const os = require("os");
+const http = require("http");
+const axios = require("axios");
+const fs = require("fs");
+
+let client = null;
+let Page = null;
+let Runtime = null;
+let DOM = null;
+
+const getBrowserPath = (browser = "msedge") => {
+  const platform = os.platform();
+  let paths = null;
+  if (platform === "win32") {
+    paths = {
+      chrome: [
+        path.join(
+          process.env["ProgramFiles"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+        path.join(
+          process.env["ProgramFiles(x86)"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+        path.join(
+          process.env["LocalAppData"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+      ],
+      msedge: [
+        path.join(
+          process.env["ProgramFiles"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+        path.join(
+          process.env["ProgramFiles(x86)"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+        path.join(
+          process.env["LocalAppData"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+      ],
+    };
+  } else if (platform === "darwin") {
+    paths = {
+      chrome: ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"],
+      msedge: [
+        "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+      ],
+    };
+  } else if (platform === "linux") {
+    paths = {
+      chrome: [
+        "/opt/google/chrome/chrome",
+        "/usr/bin/google-chrome",
+        "/usr/bin/google-chrome-stable",
+      ],
+      msedge: [
+        "/opt/microsoft/msedge/msedge",
+        "/usr/bin/microsoft-edge",
+        "/usr/bin/microsoft-edge-stable",
+      ],
+    };
+  } else {
+    throw new Error("不支持的操作系统");
+  }
+  return paths[browser].find((p) => fs.existsSync(p));
+};
+
+const isPortAvailable = (port) => {
+  return new Promise((resolve) => {
+    const server = http.createServer();
+    server.listen(port, () => {
+      server.close(() => resolve(true));
+    });
+    server.on("error", () => resolve(false));
+  });
+};
+
+const waitForPort = async (port, timeout = 30000) => {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    try {
+      const response = await axios.get(`http://localhost:${port}/json/version`);
+      if (response.status === 200) return true;
+    } catch (e) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+  return false;
+};
+
+const findAvailablePort = async (startPort) => {
+  let port = startPort;
+  while (port < startPort + 100) {
+    const available = await isPortAvailable(port);
+    if (available) {
+      return port;
+    }
+    port++;
+  }
+  throw new Error("无法找到可用的调试端口");
+};
+
+const launchBrowser = async (options) => {
+  const {
+    browserType = "msedge",
+    useSingleUserDataDir = true,
+    headless = false,
+    proxy = null,
+    browserPath = getBrowserPath(browserType),
+    windowSize = null,
+  } = options;
+
+  if (!browserPath) {
+    throw new Error("未找到浏览器，或未指定浏览器路径");
+  }
+
+  // 查找可用端口
+  const port = await findAvailablePort(9222);
+
+  const args = [
+    `--remote-debugging-port=${port}`,
+    "--no-first-run",
+    "--no-default-browser-check",
+    "--start-maximized",
+    headless ? "--headless" : "",
+    windowSize ? `--window-size=${windowSize}` : "",
+    proxy ? `--proxy-server=${proxy}` : "",
+    useSingleUserDataDir
+      ? `--user-data-dir=${path.join(
+          os.tmpdir(),
+          `${browserType}-debug-${port}`
+        )}`
+      : "",
+  ].filter(Boolean);
+
+  return new Promise(async (resolve, reject) => {
+    // 如果使用独立用户数据目录，则需要先杀死已有的浏览器进程
+    if (!useSingleUserDataDir) {
+      try {
+        await killRunningBrowser(browserType);
+      } catch (e) {
+        reject(e);
+        return;
+      }
+    }
+    const child = exec(
+      `"${browserPath}" ${args.join(" ")}`,
+      {
+        windowsHide: true,
+      },
+      async (error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+      }
+    );
+
+    // 等待端口可用
+    waitForPort(port).then((success) => {
+      if (success) {
+        resolve({
+          pid: child.pid,
+          port,
+        }); // 返回使用的端口号
+      } else {
+        reject(new Error("浏览器启动超时，请检查是否有权限问题或防火墙限制"));
+      }
+    });
+  });
+};
+
+const killRunningBrowser = (browserType = "msedge") => {
+  return new Promise((resolve, reject) => {
+    if (os.platform() === "win32") {
+      exec(`taskkill /F /IM ${browserType}.exe`, (error) => {
+        if (error) reject(error);
+        else resolve();
+      });
+    } else {
+      exec(`kill -9 $(pgrep ${browserType})`, (error) => {
+        if (error) reject(error);
+        else resolve();
+      });
+    }
+  });
+};
+
+const initCDP = async (port) => {
+  if (!client) {
+    try {
+      client = await CDP({ port });
+      ({ Page, Runtime, DOM } = client);
+      await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
+    } catch (err) {
+      console.log(err);
+      throw new Error(
+        `请确保浏览器已启动，且开启了远程调试端口(--remote-debugging-port=${port})`
+      );
+    }
+  }
+  return { Page, Runtime, DOM };
+};
+
+const getUrl = async () => {
+  const { Page } = await initCDP();
+  const { frameTree } = await Page.getFrameTree();
+  return frameTree.frame.url;
+};
+
+const setUrl = async (url) => {
+  const { Page } = await initCDP();
+  await Page.navigate({ url });
+  await Page.loadEventFired();
+};
+
+const executeScript = async (script, args = {}) => {
+  const { Runtime } = await initCDP();
+  // 构建参数列表
+  const argNames = Object.keys(args);
+  const argValues = Object.values(args).map((v) => JSON.stringify(v));
+
+  const wrappedScript = `
+        (function(${argNames.join(", ")}) {
+          ${script}
+        })(${argValues.join(", ")})
+      `;
+  const { result } = await Runtime.evaluate({
+    expression: wrappedScript,
+    returnByValue: true,
+    awaitPromise: true,
+  });
+  return result.value;
+};
+
+const getTabs = async () => {
+  const targets = await CDP.List();
+  return targets
+    .filter((target) => target.type === "page")
+    .map((target) => ({
+      url: target.url,
+      title: target.title,
+    }));
+};
+
+const activateTab = async (index) => {
+  const targets = await CDP.List();
+  const pages = targets.filter((target) => target.type === "page");
+  if (index > 0 && index <= pages.length) {
+    const targetId = pages[index - 1].id;
+    await CDP.Activate({ id: targetId });
+  }
+};
+
+const clickElement = async (selector) => {
+  return await executeScript(`document.querySelector('${selector}').click()`);
+};
+
+const inputText = async (selector, text) => {
+  return await executeScript(
+    `
+      const el = document.querySelector('${selector}');
+      el.value = '${text}';
+      el.dispatchEvent(new Event('input'));
+      el.dispatchEvent(new Event('change'));
+    `
+  );
+};
+
+const getText = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}')?.textContent || ''`
+  );
+};
+
+const getHtml = async (selector) => {
+  return await executeScript(
+    `const element = document.querySelector('${selector}');
+      return element ? element.innerHTML : '';`
+  );
+};
+
+const hideElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').style.display = 'none'`
+  );
+};
+
+const showElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').style.display = ''`
+  );
+};
+
+const injectCSS = async (css) => {
+  return await executeScript(
+    `
+      const style = document.createElement('style');
+      style.textContent = \`${css}\`;
+      document.head.appendChild(style);
+    `
+  );
+};
+
+const setCookie = async (cookies, options = {}) => {
+  const { Network } = await initCDP();
+  for (const cookie of cookies) {
+    await Network.setCookie({
+      name: cookie.name,
+      value: cookie.value,
+      domain: options.domain || undefined,
+      path: options.path || "/",
+      secure: options.secure || false,
+      expires: options.expires
+        ? Math.floor(Date.now() / 1000) + options.expires * 3600
+        : undefined,
+    });
+  }
+};
+
+const getCookie = async (name) => {
+  const { Network } = await initCDP();
+  const cookies = await Network.getCookies();
+  return cookies.find((cookie) => cookie.name === name);
+};
+
+const scrollTo = async (x, y) => {
+  return await executeScript(`window.scrollTo(${x}, ${y})`);
+};
+
+const scrollToElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').scrollIntoView()`
+  );
+};
+
+const getScrollPosition = async () => {
+  return await executeScript(`
+      return JSON.stringify({
+        x: window.pageXOffset || document.documentElement.scrollLeft,
+        y: window.pageYOffset || document.documentElement.scrollTop
+      });
+    `);
+};
+
+const getPageSize = async () => {
+  return await executeScript(`
+      return JSON.stringify({
+        width: Math.max(
+          document.documentElement.scrollWidth,
+          document.documentElement.clientWidth
+        ),
+        height: Math.max(
+          document.documentElement.scrollHeight,
+          document.documentElement.clientHeight
+        )
+      });
+    `);
+};
+
+const waitForElement = async (selector, timeout = 5000) => {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    const result = await executeScript(
+      `!!document.querySelector('${selector}')`
+    );
+    if (result) return;
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  throw new Error(`等待元素 ${selector} 超时`);
+};
+
+module.exports = {
+  launchBrowser,
+  getUrl,
+  setUrl,
+  executeScript,
+  getTabs,
+  activateTab,
+  clickElement,
+  inputText,
+  getText,
+  getHtml,
+  hideElement,
+  showElement,
+  injectCSS,
+  setCookie,
+  getCookie,
+  scrollTo,
+  scrollToElement,
+  getScrollPosition,
+  getPageSize,
+  waitForElement,
+};
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
new file mode 100644
index 00000000..bc979db4
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -0,0 +1,3 @@
+const browser = require("./browser");
+
+module.exports = browser;
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 4aae12c5..6a50566b 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,330 +1,388 @@
 {
-    "name": "plugin",
-    "lockfileVersion": 2,
-    "requires": true,
-    "packages": {
-        "": {
-            "dependencies": {
-                "axios": "^1.7.9",
-                "crypto-js": "^4.2.0",
-                "exif-reader": "^2.0.1",
-                "iconv-lite": "^0.6.3",
-                "node-forge": "^1.3.1",
-                "png2icons": "^2.0.1",
-                "ses": "^1.10.0",
-                "sm-crypto": "^0.3.13",
-                "tree-kill": "^1.2.2"
-            }
-        },
-        "node_modules/@endo/env-options": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
-            "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg==",
-            "license": "Apache-2.0"
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "license": "MIT"
-        },
-        "node_modules/axios": {
-            "version": "1.7.9",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-            "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.0",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "license": "MIT",
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/crypto-js": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
-            "license": "MIT"
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/exif-reader": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
-            "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g==",
-            "license": "MIT"
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.9",
-            "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
-            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "license": "MIT",
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/form-data": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
-            "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
-            "license": "MIT",
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/iconv-lite": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/jsbn": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-            "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-            "license": "MIT"
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "license": "MIT",
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/node-forge": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-            "license": "(BSD-3-Clause OR GPL-2.0)",
-            "engines": {
-                "node": ">= 6.13.0"
-            }
-        },
-        "node_modules/png2icons": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
-            "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA==",
-            "license": "MIT",
-            "bin": {
-                "png2icons": "png2icons-cli.js"
-            }
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "license": "MIT"
-        },
-        "node_modules/safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-        },
-        "node_modules/ses": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
-            "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@endo/env-options": "^1.1.8"
-            }
-        },
-        "node_modules/sm-crypto": {
-            "version": "0.3.13",
-            "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
-            "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
-            "license": "MIT",
-            "dependencies": {
-                "jsbn": "^1.1.0"
-            }
-        },
-        "node_modules/tree-kill": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz",
-            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-            "bin": {
-                "tree-kill": "cli.js"
-            }
+  "name": "plugin",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "axios": "^1.7.9",
+        "chrome-remote-interface": "^0.33.2",
+        "crypto-js": "^4.2.0",
+        "exif-reader": "^2.0.1",
+        "iconv-lite": "^0.6.3",
+        "node-forge": "^1.3.1",
+        "png2icons": "^2.0.1",
+        "ses": "^1.10.0",
+        "sm-crypto": "^0.3.13",
+        "tree-kill": "^1.2.2"
+      }
+    },
+    "node_modules/@endo/env-options": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
+      "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
+    "node_modules/axios": {
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/chrome-remote-interface": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.33.2.tgz",
+      "integrity": "sha512-wvm9cOeBTrb218EC+6DteGt92iXr2iY0+XJP30f15JVDhqvWvJEVACh9GvUm8b9Yd8bxQivaLSb8k7mgrbyomQ==",
+      "dependencies": {
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      },
+      "bin": {
+        "chrome-remote-interface": "bin/client.js"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+    },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+      "license": "MIT"
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/exif-reader": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
+      "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g==",
+      "license": "MIT"
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
         }
+      }
     },
-    "dependencies": {
-        "@endo/env-options": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
-            "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg=="
-        },
-        "asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-        },
-        "axios": {
-            "version": "1.7.9",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-            "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
-            "requires": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.0",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "requires": {
-                "delayed-stream": "~1.0.0"
-            }
-        },
-        "crypto-js": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-        },
-        "delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-        },
-        "exif-reader": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
-            "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g=="
-        },
-        "follow-redirects": {
-            "version": "1.15.9",
-            "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
-            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
-        },
-        "form-data": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
-            "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
-            "requires": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            }
-        },
-        "iconv-lite": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3.0.0"
-            }
-        },
-        "jsbn": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-            "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-        },
-        "mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-        },
-        "mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "requires": {
-                "mime-db": "1.52.0"
-            }
-        },
-        "node-forge": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
-        },
-        "png2icons": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
-            "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA=="
-        },
-        "proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-        },
-        "ses": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
-            "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
-            "requires": {
-                "@endo/env-options": "^1.1.8"
-            }
-        },
-        "sm-crypto": {
-            "version": "0.3.13",
-            "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
-            "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
-            "requires": {
-                "jsbn": "^1.1.0"
-            }
-        },
-        "tree-kill": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz",
-            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
+    "node_modules/form-data": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "license": "MIT"
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/png2icons": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
+      "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA==",
+      "license": "MIT",
+      "bin": {
+        "png2icons": "png2icons-cli.js"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/ses": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
+      "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@endo/env-options": "^1.1.8"
+      }
+    },
+    "node_modules/sm-crypto": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
+      "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
+      "license": "MIT",
+      "dependencies": {
+        "jsbn": "^1.1.0"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
         }
+      }
+    }
+  },
+  "dependencies": {
+    "@endo/env-options": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
+      "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "axios": {
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "requires": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "chrome-remote-interface": {
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.33.2.tgz",
+      "integrity": "sha512-wvm9cOeBTrb218EC+6DteGt92iXr2iY0+XJP30f15JVDhqvWvJEVACh9GvUm8b9Yd8bxQivaLSb8k7mgrbyomQ==",
+      "requires": {
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+    },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+    },
+    "exif-reader": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
+      "integrity": "sha512-gCQ/86RiAWSjeSlalj1G99IC6XnxbwkvB91HLqhh8somj/YBtC/2xuplvyjDjlfO7NsmYREPPElu/Syuy/H52g=="
+    },
+    "follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
+    },
+    "form-data": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+    },
+    "png2icons": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
+      "integrity": "sha512-GDEQJr8OG4e6JMp7mABtXFSEpgJa1CCpbQiAR+EjhkHJHnUL9zPPtbOrjsMD8gUbikgv3j7x404b0YJsV3aVFA=="
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "ses": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
+      "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
+      "requires": {
+        "@endo/env-options": "^1.1.8"
+      }
+    },
+    "sm-crypto": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.13.tgz",
+      "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
+      "requires": {
+        "jsbn": "^1.1.0"
+      }
+    },
+    "tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
+    },
+    "ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "requires": {}
     }
+  }
 }
diff --git a/plugin/package.json b/plugin/package.json
index 8a1b6200..d1ef758e 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,13 +1,14 @@
 {
-    "dependencies": {
-        "axios": "^1.7.9",
-        "crypto-js": "^4.2.0",
-        "exif-reader": "^2.0.1",
-        "iconv-lite": "^0.6.3",
-        "node-forge": "^1.3.1",
-        "png2icons": "^2.0.1",
-        "ses": "^1.10.0",
-        "sm-crypto": "^0.3.13",
-        "tree-kill": "^1.2.2"
-    }
+  "dependencies": {
+    "axios": "^1.7.9",
+    "chrome-remote-interface": "^0.33.2",
+    "crypto-js": "^4.2.0",
+    "exif-reader": "^2.0.1",
+    "iconv-lite": "^0.6.3",
+    "node-forge": "^1.3.1",
+    "png2icons": "^2.0.1",
+    "ses": "^1.10.0",
+    "sm-crypto": "^0.3.13",
+    "tree-kill": "^1.2.2"
+  }
 }
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
new file mode 100644
index 00000000..9cbe762c
--- /dev/null
+++ b/src/js/composer/commands/browserCommands.js
@@ -0,0 +1,399 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+export const browserCommands = {
+  label: "浏览器控制",
+  icon: "web",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.browser.launchBrowser",
+      label: "启动浏览器",
+      icon: "launch",
+      isAsync: true,
+      config: [
+        {
+          component: "OptionEditor",
+          icon: "settings",
+          width: 12,
+          options: {
+            browserType: {
+              component: "ButtonGroup",
+              defaultValue: "msedge",
+              options: [
+                { label: "Edge", value: "msedge" },
+                { label: "Chrome", value: "chrome" },
+              ],
+              width: 12,
+            },
+            useSingleUserDataDir: {
+              label: "使用独立用户数据目录",
+              component: "CheckButton",
+              width: 6,
+            },
+            headless: {
+              label: "启用无头模式",
+              component: "CheckButton",
+              width: 6,
+            },
+            windowSize: {
+              label: "窗口尺寸",
+              component: "VariableInput",
+              icon: "window",
+              width: 6,
+              placeholder: "如1920x1080，不设置则最大化",
+            },
+            proxy: {
+              label: "代理",
+              component: "VariableInput",
+              icon: "vpn_lock",
+              width: 6,
+              placeholder: "如 socks5://127.0.0.1:7890",
+            },
+            browserPath: {
+              label: "浏览器路径",
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择浏览器",
+                    properties: ["openFile"],
+                  },
+                },
+              },
+              placeholder: "二进制绝对路径，留空则自动查找",
+            },
+          },
+          defaultValue: {
+            browserType: "msedge",
+            useSingleUserDataDir: true,
+            headless: false,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.getUrl",
+      label: "浏览器操作",
+      icon: "web",
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.browser.getUrl",
+          label: "获取当前地址",
+          icon: "link",
+        },
+        {
+          value: "quickcomposer.browser.setUrl",
+          label: "设置当前地址",
+          icon: "link",
+          config: [
+            {
+              label: "网址",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "输入网址",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getTabs",
+          label: "获取标签列表",
+          icon: "tab",
+        },
+        {
+          value: "quickcomposer.browser.activateTab",
+          label: "切换标签",
+          icon: "tab_unselected",
+          config: [
+            {
+              label: "标签索引",
+              component: "NumberInput",
+              icon: "tab",
+              min: 1,
+              defaultValue: 1,
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.executeScript",
+          label: "执行脚本",
+          icon: "code",
+          config: [
+            {
+              label: "脚本内容",
+              component: "CodeEditor",
+              icon: "code",
+              width: 12,
+              placeholder: "输入JavaScript代码",
+            },
+            {
+              topLabel: "要传递的参数",
+              component: "DictEditor",
+              icon: "data_array",
+              width: 12,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.clickElement",
+          label: "点击元素",
+          icon: "mouse",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.inputText",
+          label: "输入文本",
+          icon: "edit",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+            {
+              label: "文本内容",
+              component: "VariableInput",
+              icon: "edit",
+              width: 12,
+              placeholder: "输入要填写的文本",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getText",
+          label: "获取文本",
+          icon: "text_fields",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getHtml",
+          label: "获取HTML",
+          icon: "code",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.hideElement",
+          label: "隐藏元素",
+          icon: "visibility_off",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.showElement",
+          label: "显示元素",
+          icon: "visibility",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.injectCSS",
+          label: "注入CSS",
+          icon: "style",
+          config: [
+            {
+              label: "CSS内容",
+              component: "CodeEditor",
+              icon: "style",
+              width: 12,
+              placeholder: "输入CSS代码",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.setCookie",
+          label: "设置Cookie",
+          icon: "cookie",
+          config: [
+            {
+              label: "Cookie",
+              component: "ArrayEditor",
+              icon: "cookie",
+              width: 12,
+              columns: {
+                name: {
+                  label: "名称",
+                  defaultValue: newVarInputVal("str"),
+                },
+                value: {
+                  label: "值",
+                  defaultValue: newVarInputVal("str"),
+                },
+              },
+            },
+            {
+              label: "选项",
+              component: "OptionEditor",
+              icon: "settings",
+              width: 12,
+              options: {
+                expires: {
+                  label: "过期时间",
+                  component: "QSelect",
+                  icon: "timer",
+                  width: 6,
+                  options: [
+                    { label: "关闭浏览器失效", value: false },
+                    { label: "1小时", value: 1 },
+                    { label: "1天", value: 24 },
+                    { label: "1年", value: 24 * 365 },
+                  ],
+                },
+                path: {
+                  label: "路径",
+                  component: "VariableInput",
+                  icon: "folder",
+                  width: 6,
+                },
+                domain: {
+                  label: "域名",
+                  component: "VariableInput",
+                  icon: "domain",
+                  width: 6,
+                },
+                secure: {
+                  label: "安全",
+                  component: "CheckButton",
+                  icon: "lock",
+                  width: 6,
+                },
+              },
+              defaultValue: {
+                expires: false,
+                path: newVarInputVal("str", "/"),
+                domain: newVarInputVal("str", ""),
+                secure: false,
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getCookie",
+          label: "获取Cookie",
+          icon: "cookie",
+          config: [
+            {
+              label: "名称",
+              component: "VariableInput",
+              icon: "label",
+              width: 12,
+              placeholder: "输入Cookie名称",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.scrollTo",
+          label: "滚动到位置",
+          icon: "open_in_full",
+          config: [
+            {
+              label: "X坐标",
+              component: "NumberInput",
+              icon: "arrow_right",
+              width: 12,
+              defaultValue: 0,
+            },
+            {
+              label: "Y坐标",
+              component: "NumberInput",
+              icon: "arrow_drop_down",
+              width: 12,
+              defaultValue: 0,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.scrollToElement",
+          label: "滚动到元素",
+          icon: "open_in_full",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getScrollPosition",
+          label: "获取滚动位置",
+          icon: "open_in_full",
+        },
+        {
+          value: "quickcomposer.browser.getPageSize",
+          label: "获取页面尺寸",
+          icon: "open_in_full",
+        },
+        {
+          value: "quickcomposer.browser.waitForElement",
+          label: "等待元素",
+          icon: "hourglass_empty",
+          config: [
+            {
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
+              width: 12,
+              placeholder: "输入CSS选择器",
+            },
+            {
+              label: "超时时间",
+              component: "NumberInput",
+              icon: "timer",
+              width: 12,
+              defaultValue: 5000,
+              min: 1000,
+              step: 1000,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index f2c510c0..961f9d22 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -18,6 +18,7 @@ import { windowsCommands } from "./windowsCommands";
 import { statusCommands } from "./statusCommands";
 import { macosCommands } from "./macosCommands";
 import { scriptCommands } from "./scriptCommands";
+import { browserCommands } from "./browserCommands";
 
 const platformCommands = {
   win32: [windowsCommands],
@@ -33,6 +34,7 @@ export const commandCategories = [
   imageCommands,
   utoolsCommands,
   ...platformCommands[window.processPlatform],
+  browserCommands,
   dataCommands,
   codingCommands,
   controlCommands,

From 59b5c220edc158b88a0308146ba4e80f82d6fcfa Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 19 Jan 2025 13:43:42 +0800
Subject: [PATCH 072/332] =?UTF-8?q?windows=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E4=BA=8EC#=E7=9A=84=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=8E=A7=E5=88=B6=EF=BC=8C=E5=92=8Cmacos?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=B8=8B=E5=9F=BA=E4=BA=8EAppleScri?=
 =?UTF-8?q?pt=E7=9A=84=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=B8=80=E8=B5=B7=E4=BD=9C=E4=B8=BA=E5=A4=87=E9=80=89?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer.js                 |   1 +
 plugin/lib/quickcomposer/windows/browser.js | 296 ++++++++++++++++++++
 plugin/lib/quickcomposer/windows/index.js   |   2 +
 src/js/composer/commands/windowsCommands.js |  51 +++-
 4 files changed, 346 insertions(+), 4 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/windows/browser.js

diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index b79aaa14..2052497f 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -11,6 +11,7 @@ const quickcomposer = {
   windows: require("./quickcomposer/windows"),
   macos: require("./quickcomposer/macos"),
   status: require("./quickcomposer/status"),
+  browser: require("./quickcomposer/browser"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/windows/browser.js b/plugin/lib/quickcomposer/windows/browser.js
new file mode 100644
index 00000000..f919be1e
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/browser.js
@@ -0,0 +1,296 @@
+const { runCsharpFeature } = require("../../csharp");
+
+const addressBarName = "地址和搜索栏";
+const addressBarXpath =
+  "/Pane[3]/Pane/Pane[1]/Pane[2]/Pane[1]/ToolBar/Pane/Group/Edit";
+
+const runBrowserAutomation = async (params) => {
+  const { value, browser = "msedge" } = params;
+  const baseArgs = ["-method", "process", "-window", browser];
+
+  if (value) {
+    baseArgs.push("-type", "setvalue", "-value", value, "-sendenter");
+  } else {
+    baseArgs.push("-type", "getvalue");
+  }
+
+  try {
+    return await runCsharpFeature("automation", [
+      ...baseArgs,
+      "-name",
+      addressBarName,
+    ]);
+  } catch (error) {
+    console.log(error);
+    try {
+      return await runCsharpFeature("automation", [
+        ...baseArgs,
+        "-xpath",
+        addressBarXpath,
+      ]);
+    } catch (error) {
+      console.log(error);
+      throw "获取浏览器地址栏失败";
+    }
+  }
+};
+
+const setUrl = async (browser = "msedge", url) => {
+  return await runBrowserAutomation({ value: url, browser });
+};
+
+const getUrl = async (browser = "msedge") => {
+  return await runBrowserAutomation({ browser });
+};
+
+const executeScript = async (browser = "msedge", script, args = {}) => {
+  // 构建参数列表
+  const argNames = Object.keys(args);
+  const argValues = Object.values(args).map((v) => JSON.stringify(v));
+
+  const wrapperScript = `
+        (function(${argNames.join(", ")}) {
+          ${script}
+        })(${argValues.join(", ")})
+      `;
+  return await runBrowserAutomation({
+    value: `javascript:${encodeURIComponent(wrapperScript)}`,
+    browser,
+  });
+};
+
+// 点击元素
+const clickElement = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.click();
+        return '##execute_script_success##';
+      } else {
+        return '##execute_script_failed##';
+      }
+    `;
+  return await executeScript(browser, script);
+};
+
+// 输入文本
+const inputText = async (browser = "msedge", selector, text) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.value = '${text}';
+        element.dispatchEvent(new Event('input'));
+        element.dispatchEvent(new Event('change'));
+        return '##execute_script_success##';
+      } else {
+        return '##execute_script_failed##';
+      }
+    `;
+  return await executeScript(browser, script);
+};
+
+// 获取文本
+const getText = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      return element ? element.textContent : '';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 获取HTML
+const getHtml = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      return element ? element.innerHTML : '';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 隐藏元素
+const hideElement = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.style.display = 'none';
+        return '##execute_script_success##';
+      } else {
+        return '##execute_script_failed##';
+      }
+    `;
+  return await executeScript(browser, script);
+};
+
+// 显示元素
+const showElement = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.style.display = '';
+        return '##execute_script_success##';
+      } else {
+        return '##execute_script_failed##';
+      }
+    `;
+  return await executeScript(browser, script);
+};
+
+// 注入CSS
+const injectCSS = async (browser = "msedge", css) => {
+  const script = `
+      const style = document.createElement('style');
+      style.textContent = \`${css}\`;
+      document.head.appendChild(style);
+      return '##execute_script_success##';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 设置Cookie
+const setCookie = async (browser = "msedge", cookies, options = {}) => {
+  const cookieStatements = cookies
+    .map((cookie) => {
+      let cookieString = `${cookie.name}=${cookie.value}`;
+      if (options.expires) {
+        const expiresDate = new Date(
+          Date.now() + options.expires * 60 * 60 * 1000
+        );
+        cookieString += `;expires=${expiresDate.toUTCString()}`;
+      }
+      if (options.path) cookieString += `;path=${options.path}`;
+      if (options.domain) cookieString += `;domain=${options.domain}`;
+      if (options.secure) cookieString += ";secure";
+      return `document.cookie = ${JSON.stringify(cookieString)};`;
+    })
+    .join("\n");
+
+  const script = `
+      ${cookieStatements}
+      return '##execute_script_success##';
+    `;
+
+  return await this.executeScript(browser, script);
+};
+
+// 获取Cookie
+const getCookie = async (browser = "msedge", name) => {
+  const script = `
+      const value = document.cookie
+        .split('; ')
+        .find(row => row.startsWith('${name}='))
+        ?.split('=')[1];
+      return value || '';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 删除Cookie
+const deleteCookie = async (
+  browser = "msedge",
+  name,
+  path = "/",
+  domain = ""
+) => {
+  const script = `
+      document.cookie = '${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
+        (${domain ? `'; domain=${domain}'` : "''"}) +
+        (${path ? `'; path=${path}'` : "''"});
+      return '##execute_script_success##';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 滚动到指定位置
+const scrollTo = async (browser = "msedge", x, y) => {
+  const script = `
+      window.scrollTo(${x}, ${y});
+      return '##execute_script_success##';
+    `;
+  return await executeScript(browser, script);
+};
+
+// 滚动到元素位置
+const scrollToElement = async (browser = "msedge", selector) => {
+  const script = `
+      const element = document.querySelector('${selector}');
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+        return '##execute_script_success##';
+      } else {
+        return '##execute_script_failed##';
+      }
+    `;
+  return await executeScript(browser, script);
+};
+
+// 获取滚动位置
+const getScrollPosition = async (browser = "msedge") => {
+  const script = `
+      return JSON.stringify({
+        x: window.pageXOffset || document.documentElement.scrollLeft,
+        y: window.pageYOffset || document.documentElement.scrollTop
+      });
+    `;
+  return await executeScript(browser, script);
+};
+
+// 获取页面尺寸
+const getPageSize = async (browser = "msedge") => {
+  const script = `
+      return JSON.stringify({
+        width: Math.max(
+          document.documentElement.scrollWidth,
+          document.documentElement.clientWidth
+        ),
+        height: Math.max(
+          document.documentElement.scrollHeight,
+          document.documentElement.clientHeight
+        )
+      });
+    `;
+  return await executeScript(browser, script);
+};
+
+// 等待元素出现
+const waitForElement = async (browser = "msedge", selector, timeout = 5000) => {
+  const startTime = Date.now();
+
+  // 检查元素是否存在的函数
+  const checkScript = `
+      const element = document.querySelector('${selector}');
+      return element ? '##execute_script_success##' : '##execute_script_failed##';
+    `;
+
+  // 轮询检查元素
+  while (Date.now() - startTime < timeout) {
+    const result = await executeScript(browser, checkScript);
+    if (result === true) {
+      return true;
+    }
+    // 等待100ms再次检查
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+
+  return false;
+};
+
+module.exports = {
+  getUrl,
+  setUrl,
+  executeScript,
+  clickElement,
+  inputText,
+  getText,
+  getHtml,
+  hideElement,
+  showElement,
+  injectCSS,
+  setCookie,
+  getCookie,
+  deleteCookie,
+  scrollTo,
+  scrollToElement,
+  getScrollPosition,
+  getPageSize,
+  waitForElement,
+};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index ebd0a721..2efecb4e 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -7,6 +7,7 @@ const service = require("./service");
 const software = require("./software");
 const utils = require("./utils");
 const automation = require("./automation");
+const browser = require("./browser");
 
 module.exports = {
   window,
@@ -18,4 +19,5 @@ module.exports = {
   software,
   utils,
   automation,
+  browser,
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 04b90e53..a8f30a24 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,5 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager.js";
-
+import { browserCommands } from "js/composer/commands/browserCommands.js";
 const sendKeys = [
   // 特殊按键
   { value: "{ENTER}", label: "回车键 (Enter)" },
@@ -109,7 +109,7 @@ const registryPaths = [
 const searchWindowConfig = [
   {
     label: "窗口查找方式",
-    component: "q-select",
+    component: "QSelect",
     icon: "search",
     width: 3,
     options: [
@@ -160,7 +160,7 @@ const searchElementConfig = [
   ...windowHandleConfig,
   {
     label: "元素查找方式",
-    component: "q-select",
+    component: "QSelect",
     icon: "search",
     width: 4,
     options: [
@@ -804,6 +804,49 @@ export const windowsCommands = {
         },
       ],
     },
+    // 浏览器
+    {
+      value: "quickcomposer.windows.browser.getUrl",
+      label: "浏览器控制",
+      icon: "language",
+      isAsync: true,
+      config: [
+        {
+          component: "ButtonGroup",
+          width: 12,
+          options: [
+            { label: "Microsoft Edge", value: "msedge" },
+            { label: "Google Chrome", value: "chrome" },
+          ],
+          defaultValue: "msedge",
+        },
+      ],
+      subCommands: browserCommands.commands
+        .find((command) => command.label === "浏览器操作")
+        .subCommands.map((command) => ({
+          ...command,
+          value: command.value.replace(
+            "quickcomposer.browser.",
+            "quickcomposer.windows.browser."
+          ),
+        }))
+        // 无法获得输出，过滤相关命令
+        .filter(
+          (command) =>
+            ![
+              "getTabs",
+              "activateTab",
+              "getText",
+              "getHtml",
+              "getCookie",
+              "getScrollPosition",
+              "getPageSize",
+              "waitForElement",
+            ]
+              .map((func) => `quickcomposer.windows.browser.${func}`)
+              .includes(command.value)
+        ),
+    },
     // 监控
     {
       value: "quickcomposer.windows.monitor.watchClipboard",
@@ -1019,7 +1062,7 @@ export const windowsCommands = {
             },
             {
               label: "值类型",
-              component: "q-select",
+              component: "QSelect",
               icon: "category",
               width: 4,
               options: [

From c1775842749fe987e11b8ec56b7342dc65b2a178 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 19 Jan 2025 13:44:12 +0800
Subject: [PATCH 073/332] =?UTF-8?q?=E8=B0=83=E6=95=B4quasar=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=9C=A8paramimporter=E4=B8=AD=E7=9A=84=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/param/ParamImporter.vue          |  33 +-
 src/js/composer/commands/audioCommands.js     |   8 +-
 src/js/composer/commands/dataCommands.js      |  42 +-
 src/js/composer/commands/fileCommands.js      |   4 +-
 src/js/composer/commands/imageCommands.js     |   8 +-
 src/js/composer/commands/macosCommands.js     | 543 +-----------------
 src/js/composer/commands/networkCommands.js   |   2 +-
 src/js/composer/commands/systemCommands.js    |   2 +-
 src/js/composer/commands/uiCommands.js        |   2 +-
 src/js/composer/commands/userdataCommands.js  |  10 +-
 src/js/composer/commands/utoolsCommand.js     |   2 +-
 11 files changed, 81 insertions(+), 575 deletions(-)

diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 53d04d21..5ef69781 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -5,7 +5,7 @@
     v-bind="componentProps"
     @update:model-value="$emit('update:modelValue', $event)"
   >
-    <template v-if="isQuasarInput" #prepend>
+    <template #prepend>
       <q-icon v-if="config.icon" :name="config.icon" />
     </template>
   </component>
@@ -23,6 +23,7 @@ import ControlInput from "components/composer/common/ControlInput.vue";
 import CheckGroup from "components/composer/common/CheckGroup.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
 import CodeEditor from "components/composer/common/CodeEditor.vue";
+import { QInput, QSelect, QToggle, QCheckbox } from "quasar";
 
 export default defineComponent({
   name: "ParamInput",
@@ -36,6 +37,10 @@ export default defineComponent({
     CheckGroup,
     CheckButton,
     CodeEditor,
+    QToggle,
+    QInput,
+    QSelect,
+    QCheckbox,
   },
   props: {
     config: {
@@ -58,19 +63,27 @@ export default defineComponent({
       },
     },
     isQuasarInput() {
-      return ["q-select", "q-input"].includes(this.config?.component);
+      return (
+        this.config.component === "QInput" ||
+        this.config.component === "QSelect"
+      );
     },
     isQuasarSelect() {
-      return ["q-select"].includes(this.config?.component);
+      return this.config.component === "QSelect";
     },
     componentProps() {
-      return {
-        ...this.config,
-        filled: true,
-        dense: true,
-        emitValue: this.isQuasarSelect,
-        mapOptions: this.isQuasarSelect,
-      };
+      const props = { ...this.config, dense: true };
+
+      if (this.isQuasarInput) {
+        props.filled = true;
+      }
+
+      if (this.isQuasarSelect) {
+        props.emitValue = true;
+        props.mapOptions = true;
+      }
+
+      return props;
     },
   },
 });
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index 8e045648..c5d1502e 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -59,7 +59,7 @@ const SPEECH_CONFIG = {
     },
     lang: {
       label: "语言",
-      component: "q-select",
+      component: "QSelect",
       options: LANGUAGES,
       width: 3,
     },
@@ -87,12 +87,12 @@ const MEDIA_PLAY_CONFIG = {
     },
     loop: {
       label: "循环播放",
-      component: "q-toggle",
+      component: "CheckButton",
       width: 4,
     },
     autoPlay: {
       label: "自动播放",
-      component: "q-toggle",
+      component: "CheckButton",
       width: 4,
     },
   },
@@ -216,7 +216,7 @@ export const audioCommands = {
       config: [
         {
           label: "音效类型",
-          component: "q-select",
+          component: "QSelect",
           icon: "music_note",
           width: 6,
           options: SYSTEM_SOUNDS,
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index f2d0ac07..b3ba694c 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -90,7 +90,7 @@ export const dataCommands = {
             },
             {
               label: "模式",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "两端", value: "both" },
@@ -115,7 +115,7 @@ export const dataCommands = {
             },
             {
               label: "转换为",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "大写", value: "upper" },
@@ -159,7 +159,7 @@ export const dataCommands = {
             },
             {
               label: "填充位置",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "左侧", value: "start" },
@@ -246,7 +246,7 @@ export const dataCommands = {
             },
             {
               label: "提取类型",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "数字", value: "number" },
@@ -273,7 +273,7 @@ export const dataCommands = {
             },
             {
               label: "统计类型",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "字符数", value: "char" },
@@ -324,7 +324,7 @@ export const dataCommands = {
             },
             {
               label: "对齐方式",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               options: [
                 { label: "左对齐", value: "left" },
@@ -377,7 +377,7 @@ export const dataCommands = {
             },
             {
               label: "编码",
-              component: "q-select",
+              component: "QSelect",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -407,7 +407,7 @@ export const dataCommands = {
             },
             {
               label: "编码",
-              component: "q-select",
+              component: "QSelect",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -469,7 +469,7 @@ export const dataCommands = {
             },
             {
               label: "编码",
-              component: "q-select",
+              component: "QSelect",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -517,7 +517,7 @@ export const dataCommands = {
             },
             {
               label: "编码",
-              component: "q-select",
+              component: "QSelect",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -662,7 +662,7 @@ export const dataCommands = {
             },
             {
               label: "编码",
-              component: "q-select",
+              component: "QSelect",
               icon: "code",
               options: [
                 { label: "UTF-8", value: "utf8" },
@@ -692,7 +692,7 @@ export const dataCommands = {
             },
             {
               label: "字节大小",
-              component: "q-select",
+              component: "QSelect",
               icon: "memory",
               options: [
                 { label: "16位", value: 16 },
@@ -875,7 +875,7 @@ export const dataCommands = {
             },
             {
               label: "排序方式",
-              component: "q-select",
+              component: "QSelect",
               icon: "sort",
               options: [
                 { label: "升序", value: "asc" },
@@ -964,7 +964,7 @@ export const dataCommands = {
             },
             {
               label: "聚合操作",
-              component: "q-select",
+              component: "QSelect",
               icon: "functions",
               options: [
                 { label: "求和", value: "sum" },
@@ -1182,7 +1182,7 @@ export const dataCommands = {
             },
             {
               label: "格式",
-              component: "q-select",
+              component: "QSelect",
               icon: "format_shapes",
               width: 4,
               options: [
@@ -1215,7 +1215,7 @@ export const dataCommands = {
             },
             {
               label: "原格式",
-              component: "q-select",
+              component: "QSelect",
               icon: "format_shapes",
               width: 4,
               options: [
@@ -1252,7 +1252,7 @@ export const dataCommands = {
             },
             {
               label: "单位",
-              component: "q-select",
+              component: "QSelect",
               icon: "straighten",
               width: 6,
               options: [
@@ -1289,7 +1289,7 @@ export const dataCommands = {
             },
             {
               label: "返回单位",
-              component: "q-select",
+              component: "QSelect",
               icon: "straighten",
               width: 6,
               options: [
@@ -1326,7 +1326,7 @@ export const dataCommands = {
             },
             {
               label: "单位",
-              component: "q-select",
+              component: "QSelect",
               icon: "straighten",
               width: 3,
               options: [
@@ -1342,7 +1342,7 @@ export const dataCommands = {
             },
             {
               label: "类型",
-              component: "q-select",
+              component: "QSelect",
               icon: "settings",
               width: 3,
               options: [
@@ -1367,7 +1367,7 @@ export const dataCommands = {
             },
             {
               label: "格式",
-              component: "q-select",
+              component: "QSelect",
               icon: "format_shapes",
               width: 4,
               options: [
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index 5fb1fab8..40555ef4 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -71,7 +71,7 @@ export const fileCommands = {
       config: [
         {
           label: "操作类型",
-          component: "q-select",
+          component: "QSelect",
           icon: "settings",
           width: 6,
           defaultValue: "compress",
@@ -82,7 +82,7 @@ export const fileCommands = {
         },
         {
           label: "归档格式",
-          component: "q-select",
+          component: "QSelect",
           icon: "format_shapes",
           width: 6,
           defaultValue: "zip",
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index 396e17e4..0a0f24f9 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -117,7 +117,7 @@ export const imageCommands = {
         },
         {
           label: "保持宽高比",
-          component: "q-select",
+          component: "QSelect",
           icon: "aspect_ratio",
           width: 6,
           defaultValue: "true",
@@ -370,7 +370,7 @@ export const imageCommands = {
         },
         {
           label: "位置",
-          component: "q-select",
+          component: "QSelect",
           icon: "place",
           width: 6,
           defaultValue: "bottomRight",
@@ -456,7 +456,7 @@ export const imageCommands = {
         },
         {
           label: "输出格式",
-          component: "q-select",
+          component: "QSelect",
           icon: "transform",
           width: 6,
           defaultValue: "jpeg",
@@ -519,7 +519,7 @@ export const imageCommands = {
         },
         {
           label: "输出格式",
-          component: "q-select",
+          component: "QSelect",
           icon: "transform",
           width: 3,
           defaultValue: "ico",
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index a72fbf82..ef08a913 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,4 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
+import { browserCommands } from "js/composer/commands/browserCommands";
 
 export const macosCommands = {
   label: "Mac自动化",
@@ -311,541 +312,29 @@ export const macosCommands = {
       label: "浏览器控制",
       icon: "web",
       isAsync: true,
-      subCommands: [
-        {
-          value: "quickcomposer.macos.browser.getUrl",
-          label: "获取当前地址",
-          icon: "link",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.setUrl",
-          label: "设置当前地址",
-          icon: "link",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "网址",
-              component: "VariableInput",
-              icon: "link",
-              width: 12,
-              placeholder: "输入网址",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.getTabs",
-          label: "获取标签列表",
-          icon: "tab",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.activateTab",
-          label: "切换标签",
-          icon: "tab_unselected",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "标签索引",
-              component: "NumberInput",
-              icon: "tab",
-              min: 1,
-              defaultValue: 1,
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.executeScript",
-          label: "执行脚本",
-          icon: "code",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "脚本内容",
-              component: "CodeEditor",
-              icon: "code",
-              width: 12,
-              placeholder: "输入JavaScript代码",
-            },
-            {
-              topLabel: "要传递的参数",
-              component: "DictEditor",
-              icon: "data_array",
-              width: 12,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.clickElement",
-          label: "点击元素",
-          icon: "mouse",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.inputText",
-          label: "输入文本",
-          icon: "edit",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-            {
-              label: "文本内容",
-              component: "VariableInput",
-              icon: "edit",
-              width: 12,
-              placeholder: "输入要填写的文本",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.getText",
-          label: "获取文本",
-          icon: "text_fields",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.hideElement",
-          label: "隐藏元素",
-          icon: "visibility_off",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.showElement",
-          label: "显示元素",
-          icon: "visibility",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.injectCSS",
-          label: "注入CSS",
-          icon: "style",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "CSS内容",
-              component: "CodeEditor",
-              icon: "style",
-              width: 12,
-              placeholder: "输入CSS代码",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.setCookie",
-          label: "设置Cookie",
-          icon: "cookie",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "Cookie",
-              component: "ArrayEditor",
-              icon: "cookie",
-              width: 12,
-              columns: {
-                name: {
-                  label: "名称",
-                  defaultValue: newVarInputVal("str"),
-                },
-                value: {
-                  label: "值",
-                  defaultValue: newVarInputVal("str"),
-                },
-              },
-            },
-            {
-              label: "选项",
-              component: "OptionEditor",
-              icon: "settings",
-              width: 12,
-              options: {
-                expires: {
-                  label: "过期时间",
-                  component: "q-select",
-                  icon: "timer",
-                  width: 6,
-                  options: [
-                    { label: "关闭浏览器失效", value: false },
-                    { label: "1小时", value: 1 },
-                    { label: "1天", value: 24 },
-                    { label: "1年", value: 24 * 365 },
-                  ],
-                },
-                path: {
-                  label: "路径",
-                  component: "VariableInput",
-                  icon: "folder",
-                  width: 6,
-                },
-                domain: {
-                  label: "域名",
-                  component: "VariableInput",
-                  icon: "domain",
-                  width: 6,
-                },
-                secure: {
-                  label: "安全",
-                  component: "CheckButton",
-                  icon: "lock",
-                  width: 6,
-                },
-              },
-              defaultValue: {
-                expires: false,
-                path: newVarInputVal("str", "/"),
-                domain: newVarInputVal("str", ""),
-                secure: false,
-              },
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.getCookie",
-          label: "获取Cookie",
-          icon: "cookie",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "名称",
-              component: "VariableInput",
-              icon: "label",
-              width: 12,
-              placeholder: "输入Cookie名称",
-            },
-          ],
-        },
+      config: [
         {
-          value: "quickcomposer.macos.browser.scrollTo",
-          label: "滚动到位置",
-          icon: "open_in_full",
-          config: [
+          component: "ButtonGroup",
+          defaultValue: "Microsoft Edge",
+          options: [
             {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
+              label: "Edge 浏览器",
+              value: "Microsoft Edge",
             },
             {
-              label: "X坐标",
-              component: "NumberInput",
-              icon: "arrow_right",
-              width: 12,
-              defaultValue: 0,
-            },
-            {
-              label: "Y坐标",
-              component: "NumberInput",
-              icon: "arrow_drop_down",
-              width: 12,
-              defaultValue: 0,
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.scrollToElement",
-          label: "滚动到元素",
-          icon: "open_in_full",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.macos.browser.waitForElement",
-          label: "等待元素",
-          icon: "hourglass_empty",
-          config: [
-            {
-              component: "ButtonGroup",
-              defaultValue: "Microsoft Edge",
-              options: [
-                {
-                  label: "Edge 浏览器",
-                  value: "Microsoft Edge",
-                },
-                {
-                  label: "Chrome 浏览器",
-                  value: "Google Chrome",
-                },
-              ],
-              width: 12,
-            },
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-            {
-              label: "超时时间",
-              component: "NumberInput",
-              icon: "timer",
-              width: 12,
-              defaultValue: 5000,
-              min: 1000,
-              step: 1000,
+              label: "Chrome 浏览器",
+              value: "Google Chrome",
             },
           ],
+          width: 12,
         },
       ],
+      subCommands: browserCommands.commands.find(
+        (command) => command.label === "浏览器操作"
+      ).subCommands.map((command) => ({
+        ...command,
+        value: command.value.replace("quickcomposer.browser.", "quickcomposer.macos.browser."),
+      })),
     },
   ],
 };
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index d3cabd3f..dd6cde28 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -265,7 +265,7 @@ export const networkCommands = {
             {
               label: "IP版本",
               icon: "settings_ethernet",
-              component: "q-select",
+              component: "QSelect",
               options: [
                 { label: "自动", value: 0 },
                 { label: "IPv4", value: 4 },
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index afe9c75d..f1161d75 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -497,7 +497,7 @@ export const systemCommands = {
         },
         {
           label: "信号",
-          component: "q-select",
+          component: "QSelect",
           icon: "signal_cellular_alt",
           options: [
             { label: "正常终止 (15)", value: "SIGTERM" },
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 0254d85a..f5aa1d84 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -129,7 +129,7 @@ export const uiCommands = {
           config: [
             {
               label: "图标类型",
-              component: "q-select",
+              component: "QSelect",
               defaultValue: "success",
               icon: "lightbulb",
               width: 6,
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
index 95db7f1d..16f8d9ba 100644
--- a/src/js/composer/commands/userdataCommands.js
+++ b/src/js/composer/commands/userdataCommands.js
@@ -10,7 +10,8 @@ export const userdataCommands = {
       config: [
         {
           label: "数据标识",
-          component: "q-input",
+          component: "QInput",
+          icon: "title",
         },
       ],
       outputVariable: "userData",
@@ -31,11 +32,13 @@ export const userdataCommands = {
         {
           label: "数据",
           component: "VariableInput",
+          icon: "text_fields",
           width: 7,
         },
         {
           label: "数据标识",
-          component: "q-input",
+          component: "QInput",
+          icon: "title",
           width: 3,
         },
         {
@@ -53,7 +56,8 @@ export const userdataCommands = {
       config: [
         {
           label: "数据标识",
-          component: "q-input",
+          component: "QInput",
+          icon: "title",
         },
       ],
     },
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 24e0f483..2d6f4699 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -33,7 +33,7 @@ export const utoolsCommands = {
       icon: "exit_to_app",
       config: [
         {
-          component: "q-select",
+          component: "QSelect",
           options: [
             { label: "杀死插件进程", value: true },
             { label: "插件隐藏到后台", value: false },

From 272cf488a37cb80975cd86fe6ad968ebd1c496d9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 19 Jan 2025 16:07:06 +0800
Subject: [PATCH 074/332] =?UTF-8?q?=E7=A7=BB=E9=99=A4quickcommand.runCShar?=
 =?UTF-8?q?p=EF=BC=8C=E6=A8=A1=E6=8B=9F=E6=93=8D=E4=BD=9C=E4=B8=ADwin?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=B1=8F=E5=B9=95=E6=88=AA=E5=9B=BE=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8runCsharpFeature=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/index.js                    |   1 -
 plugin/lib/csharp/utils.cs                    | 676 ++++++++++--------
 .../quickcomposer/simulate/screenCapture.js   | 111 +--
 src/js/composer/commands/scriptCommands.js    |   7 -
 .../monaco/types/quickcommand.api.d.ts        |  31 +-
 5 files changed, 396 insertions(+), 430 deletions(-)

diff --git a/plugin/lib/csharp/index.js b/plugin/lib/csharp/index.js
index 9dd9ae22..339b2681 100644
--- a/plugin/lib/csharp/index.js
+++ b/plugin/lib/csharp/index.js
@@ -174,7 +174,6 @@ const runCsharpFeature = async (feature, args = [], options = {}) => {
       console.log(featureExePath, args.join(" "));
       currentChild = child_process.spawn(featureExePath, args, {
         encoding: null,
-        windowsHide: true,
       });
 
       let stdoutData = Buffer.from([]);
diff --git a/plugin/lib/csharp/utils.cs b/plugin/lib/csharp/utils.cs
index 9a87308b..1002e6ee 100644
--- a/plugin/lib/csharp/utils.cs
+++ b/plugin/lib/csharp/utils.cs
@@ -5,328 +5,413 @@
 using System.Diagnostics;
 using System.IO;
 using Microsoft.Win32;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 public class SystemUtils
 {
-    #region Win32 API
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern int SystemParametersInfo(int uAction, int uParam, string lpvParam, int fuWinIni);
-
-    [DllImport("user32.dll")]
-    private static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
-
-    [DllImport("user32.dll")]
-    private static extern IntPtr GetForegroundWindow();
-
-    [DllImport("PowrProf.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
-    private static extern bool SetSuspendState(bool hibernate, bool forceCritical, bool disableWakeEvent);
-
-    [DllImport("kernel32.dll")]
-    private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
-
-    private const int SPI_SETDESKWALLPAPER = 20;
-    private const int SPIF_UPDATEINIFILE = 0x01;
-    private const int SPIF_SENDCHANGE = 0x02;
-    private const int WM_SYSCOMMAND = 0x0112;
-    private const int SC_MONITORPOWER = 0xF170;
+  #region Win32 API
+  [DllImport("user32.dll", CharSet = CharSet.Auto)]
+  private static extern int SystemParametersInfo(int uAction, int uParam, string lpvParam, int fuWinIni);
+
+  [DllImport("user32.dll")]
+  private static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr GetForegroundWindow();
+
+  [DllImport("PowrProf.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+  private static extern bool SetSuspendState(bool hibernate, bool forceCritical, bool disableWakeEvent);
+
+  [DllImport("kernel32.dll")]
+  private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+
+  [DllImport("user32.dll")]
+  static extern IntPtr GetDesktopWindow();
+
+  [DllImport("user32.dll")]
+  static extern IntPtr GetWindowDC(IntPtr hWnd);
+
+  [DllImport("gdi32.dll")]
+  static extern bool BitBlt(IntPtr hdcDest, int nXDest, int nYDest,
+      int nWidth, int nHeight, IntPtr hdcSrc,
+      int nXSrc, int nYSrc, int dwRop);
+
+  [DllImport("gdi32.dll")]
+  static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int nWidth, int nHeight);
+
+  [DllImport("gdi32.dll")]
+  static extern IntPtr CreateCompatibleDC(IntPtr hDC);
+
+  [DllImport("gdi32.dll")]
+  static extern bool DeleteDC(IntPtr hDC);
+
+  [DllImport("gdi32.dll")]
+  static extern bool DeleteObject(IntPtr hObject);
+
+  [DllImport("gdi32.dll")]
+  static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+
+  [StructLayout(LayoutKind.Sequential)]
+  public struct RECT
+  {
+    public int left;
+    public int top;
+    public int right;
+    public int bottom;
+  }
+
+  [DllImport("user32.dll")]
+  private static extern int GetWindowRect(IntPtr hWnd, ref RECT rect);
+
+  [DllImport("user32.dll")]
+  private static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+  private const int SPI_SETDESKWALLPAPER = 20;
+  private const int SPIF_UPDATEINIFILE = 0x01;
+  private const int SPIF_SENDCHANGE = 0x02;
+  private const int WM_SYSCOMMAND = 0x0112;
+  private const int SC_MONITORPOWER = 0xF170;
+
+  [Flags]
+  private enum EXECUTION_STATE : uint
+  {
+    ES_AWAYMODE_REQUIRED = 0x00000040,
+    ES_CONTINUOUS = 0x80000000,
+    ES_DISPLAY_REQUIRED = 0x00000002,
+    ES_SYSTEM_REQUIRED = 0x00000001
+  }
+  #endregion
+
+  public static void Main(string[] args)
+  {
+    if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+    {
+      ShowHelp();
+      return;
+    }
 
-    [Flags]
-    private enum EXECUTION_STATE : uint
+    string type = GetArgumentValue(args, "-type");
+    if (string.IsNullOrEmpty(type))
     {
-        ES_AWAYMODE_REQUIRED = 0x00000040,
-        ES_CONTINUOUS = 0x80000000,
-        ES_DISPLAY_REQUIRED = 0x00000002,
-        ES_SYSTEM_REQUIRED = 0x00000001
+      Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+      return;
     }
-    #endregion
 
-    public static void Main(string[] args)
+    try
     {
-        if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
-        {
-            ShowHelp();
+      switch (type.ToLower())
+      {
+        case "wallpaper":
+          string wallpaperPath = GetArgumentValue(args, "-path");
+          if (string.IsNullOrEmpty(wallpaperPath))
+          {
+            Console.Error.WriteLine("Error: 必须指定壁纸路径 (-path)");
             return;
-        }
-
-        string type = GetArgumentValue(args, "-type");
-        if (string.IsNullOrEmpty(type))
-        {
-            Console.Error.WriteLine("Error: 必须指定操作类型 (-type)");
+          }
+          SetWallpaper(wallpaperPath);
+          break;
+
+        case "monitor":
+          string action = GetArgumentValue(args, "-action");
+          if (string.IsNullOrEmpty(action))
+          {
+            Console.Error.WriteLine("Error: 必须指定动作 (-action)");
             return;
-        }
-
-        try
-        {
-            switch (type.ToLower())
-            {
-                case "wallpaper":
-                    string wallpaperPath = GetArgumentValue(args, "-path");
-                    if (string.IsNullOrEmpty(wallpaperPath))
-                    {
-                        Console.Error.WriteLine("Error: 必须指定壁纸路径 (-path)");
-                        return;
-                    }
-                    SetWallpaper(wallpaperPath);
-                    break;
-
-                case "monitor":
-                    string action = GetArgumentValue(args, "-action");
-                    if (string.IsNullOrEmpty(action))
-                    {
-                        Console.Error.WriteLine("Error: 必须指定动作 (-action)");
-                        return;
-                    }
-                    ControlMonitor(action);
-                    break;
-
-                case "power":
-                    string mode = GetArgumentValue(args, "-mode");
-                    if (string.IsNullOrEmpty(mode))
-                    {
-                        Console.Error.WriteLine("Error: 必须指定电源模式 (-mode)");
-                        return;
-                    }
-                    PowerControl(mode);
-                    break;
-
-                case "network":
-                    string interfaceName = GetArgumentValue(args, "-interface");
-                    string ip = GetArgumentValue(args, "-ip");
-                    string mask = GetArgumentValue(args, "-mask");
-                    string gateway = GetArgumentValue(args, "-gateway");
-                    string dns = GetArgumentValue(args, "-dns");
-                    ConfigureNetwork(interfaceName, ip, mask, gateway, dns);
-                    break;
-
-                case "startup":
-                    string appPath = GetArgumentValue(args, "-path");
-                    string appName = GetArgumentValue(args, "-name");
-                    bool remove = HasArgument(args, "-remove");
-                    ManageStartup(appPath, appName, remove);
-                    break;
-
-                case "shortcut":
-                    string targetPath = GetArgumentValue(args, "-target");
-                    string shortcutPath = GetArgumentValue(args, "-path");
-                    string shortcutArgs = GetArgumentValue(args, "-args");
-                    CreateShortcut(targetPath, shortcutPath, shortcutArgs);
-                    break;
-
-                case "brightness":
-                    string brightness = GetArgumentValue(args, "-level");
-                    if (string.IsNullOrEmpty(brightness))
-                    {
-                        Console.Error.WriteLine("Error: 必须指定亮度级别 (-level)");
-                        return;
-                    }
-                    SetBrightness(int.Parse(brightness));
-                    break;
-
-                default:
-                    Console.Error.WriteLine("Error: 不支持的操作类型");
-                    break;
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
-        }
+          }
+          ControlMonitor(action);
+          break;
+
+        case "power":
+          string mode = GetArgumentValue(args, "-mode");
+          if (string.IsNullOrEmpty(mode))
+          {
+            Console.Error.WriteLine("Error: 必须指定电源模式 (-mode)");
+            return;
+          }
+          PowerControl(mode);
+          break;
+
+        case "network":
+          string interfaceName = GetArgumentValue(args, "-interface");
+          string ip = GetArgumentValue(args, "-ip");
+          string mask = GetArgumentValue(args, "-mask");
+          string gateway = GetArgumentValue(args, "-gateway");
+          string dns = GetArgumentValue(args, "-dns");
+          ConfigureNetwork(interfaceName, ip, mask, gateway, dns);
+          break;
+
+        case "startup":
+          string appPath = GetArgumentValue(args, "-path");
+          string appName = GetArgumentValue(args, "-name");
+          bool remove = HasArgument(args, "-remove");
+          ManageStartup(appPath, appName, remove);
+          break;
+
+        case "shortcut":
+          string targetPath = GetArgumentValue(args, "-target");
+          string shortcutPath = GetArgumentValue(args, "-path");
+          string shortcutArgs = GetArgumentValue(args, "-args");
+          CreateShortcut(targetPath, shortcutPath, shortcutArgs);
+          break;
+
+        case "brightness":
+          string brightness = GetArgumentValue(args, "-level");
+          if (string.IsNullOrEmpty(brightness))
+          {
+            Console.Error.WriteLine("Error: 必须指定亮度级别 (-level)");
+            return;
+          }
+          SetBrightness(int.Parse(brightness));
+          break;
+
+        case "screenshot":
+          string savePath = GetArgumentValue(args, "-path");
+          if (string.IsNullOrEmpty(savePath))
+          {
+            Console.Error.WriteLine("Error: 必须指定保存路径 (-path)");
+            return;
+          }
+          CaptureScreenToFile(savePath);
+          Console.WriteLine("成功保存截图");
+          break;
+
+        default:
+          Console.Error.WriteLine("Error: 不支持的操作类型");
+          break;
+      }
     }
-
-    private static void SetWallpaper(string path)
+    catch (Exception ex)
     {
-        if (!File.Exists(path))
-        {
-            throw new Exception("壁纸文件不存在");
-        }
-
-        SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, path, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
-        Console.WriteLine("成功设置壁纸");
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
     }
+  }
 
-    private static void ControlMonitor(string action)
+  private static void SetWallpaper(string path)
+  {
+    if (!File.Exists(path))
     {
-        IntPtr hWnd = GetForegroundWindow();
-        switch (action.ToLower())
-        {
-            case "off":
-                SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, 2);
-                break;
-            case "on":
-                SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, -1);
-                break;
-            default:
-                throw new Exception("不支持的显示器操作");
-        }
-        Console.WriteLine("成功控制显示器");
+      throw new Exception("壁纸文件不存在");
     }
 
-    private static void PowerControl(string mode)
+    SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, path, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
+    Console.WriteLine("成功设置壁纸");
+  }
+
+  private static void ControlMonitor(string action)
+  {
+    IntPtr hWnd = GetForegroundWindow();
+    switch (action.ToLower())
     {
-        switch (mode.ToLower())
-        {
-            case "sleep":
-                SetSuspendState(false, false, false);
-                break;
-            case "hibernate":
-                SetSuspendState(true, false, false);
-                break;
-            case "awake":
-                SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_DISPLAY_REQUIRED | EXECUTION_STATE.ES_SYSTEM_REQUIRED);
-                break;
-            case "normal":
-                SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS);
-                break;
-            default:
-                throw new Exception("不支持的电源模式");
-        }
-        Console.WriteLine("成功设置电源模式");
+      case "off":
+        SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, 2);
+        break;
+      case "on":
+        SendMessage(hWnd, WM_SYSCOMMAND, SC_MONITORPOWER, -1);
+        break;
+      default:
+        throw new Exception("不支持的显示器操作");
     }
+    Console.WriteLine("成功控制显示器");
+  }
 
-    private static void ConfigureNetwork(string interfaceName, string ip, string mask, string gateway, string dns)
+  private static void PowerControl(string mode)
+  {
+    switch (mode.ToLower())
     {
-        // 使用netsh命令配置网络
-        StringBuilder command = new StringBuilder();
-        command.AppendFormat("interface ip set address \"{0}\" static {1} {2}", interfaceName, ip, mask);
-        if (!string.IsNullOrEmpty(gateway))
-        {
-            command.AppendFormat(" {0}", gateway);
-        }
-
-        ProcessStartInfo startInfo = new ProcessStartInfo
-        {
-            FileName = "netsh",
-            Arguments = command.ToString(),
-            UseShellExecute = false,
-            RedirectStandardOutput = true,
-            CreateNoWindow = true
-        };
-
-        using (Process process = Process.Start(startInfo))
-        {
-            process.WaitForExit();
-            if (process.ExitCode != 0)
-            {
-                throw new Exception("设置IP地址失败");
-            }
-        }
-
-        if (!string.IsNullOrEmpty(dns))
-        {
-            command.Clear();
-            command.AppendFormat("interface ip set dns \"{0}\" static {1}", interfaceName, dns);
-            startInfo.Arguments = command.ToString();
-
-            using (Process process = Process.Start(startInfo))
-            {
-                process.WaitForExit();
-                if (process.ExitCode != 0)
-                {
-                    throw new Exception("设置DNS失败");
-                }
-            }
-        }
+      case "sleep":
+        SetSuspendState(false, false, false);
+        break;
+      case "hibernate":
+        SetSuspendState(true, false, false);
+        break;
+      case "awake":
+        SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_DISPLAY_REQUIRED | EXECUTION_STATE.ES_SYSTEM_REQUIRED);
+        break;
+      case "normal":
+        SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS);
+        break;
+      default:
+        throw new Exception("不支持的电源模式");
+    }
+    Console.WriteLine("成功设置电源模式");
+  }
+
+  private static void ConfigureNetwork(string interfaceName, string ip, string mask, string gateway, string dns)
+  {
+    // 使用netsh命令配置网络
+    StringBuilder command = new StringBuilder();
+    command.AppendFormat("interface ip set address \"{0}\" static {1} {2}", interfaceName, ip, mask);
+    if (!string.IsNullOrEmpty(gateway))
+    {
+      command.AppendFormat(" {0}", gateway);
+    }
 
-        Console.WriteLine("成功配置网络");
+    ProcessStartInfo startInfo = new ProcessStartInfo
+    {
+      FileName = "netsh",
+      Arguments = command.ToString(),
+      UseShellExecute = false,
+      RedirectStandardOutput = true,
+      CreateNoWindow = true
+    };
+
+    using (Process process = Process.Start(startInfo))
+    {
+      process.WaitForExit();
+      if (process.ExitCode != 0)
+      {
+        throw new Exception("设置IP地址失败");
+      }
     }
 
-    private static void ManageStartup(string appPath, string appName, bool remove)
+    if (!string.IsNullOrEmpty(dns))
     {
-        string keyPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
-        using (RegistryKey key = Registry.CurrentUser.OpenSubKey(keyPath, true))
+      command.Clear();
+      command.AppendFormat("interface ip set dns \"{0}\" static {1}", interfaceName, dns);
+      startInfo.Arguments = command.ToString();
+
+      using (Process process = Process.Start(startInfo))
+      {
+        process.WaitForExit();
+        if (process.ExitCode != 0)
         {
-            if (key == null)
-            {
-                throw new Exception("无法访问启动项注册表");
-            }
-
-            if (remove)
-            {
-                key.DeleteValue(appName, false);
-                Console.WriteLine("成功移除开机启动项");
-            }
-            else
-            {
-                key.SetValue(appName, appPath);
-                Console.WriteLine("成功添加开机启动项");
-            }
+          throw new Exception("设置DNS失败");
         }
+      }
     }
 
-    private static void CreateShortcut(string targetPath, string shortcutPath, string args)
+    Console.WriteLine("成功配置网络");
+  }
+
+  private static void ManageStartup(string appPath, string appName, bool remove)
+  {
+    string keyPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
+    using (RegistryKey key = Registry.CurrentUser.OpenSubKey(keyPath, true))
     {
-        // 使用PowerShell创建快捷方式
-        StringBuilder command = new StringBuilder();
-        command.AppendFormat(@"
+      if (key == null)
+      {
+        throw new Exception("无法访问启动项注册表");
+      }
+
+      if (remove)
+      {
+        key.DeleteValue(appName, false);
+        Console.WriteLine("成功移除开机启动项");
+      }
+      else
+      {
+        key.SetValue(appName, appPath);
+        Console.WriteLine("成功添加开机启动项");
+      }
+    }
+  }
+
+  private static void CreateShortcut(string targetPath, string shortcutPath, string args)
+  {
+    // 使用PowerShell创建快捷方式
+    StringBuilder command = new StringBuilder();
+    command.AppendFormat(@"
             $WshShell = New-Object -comObject WScript.Shell
             $Shortcut = $WshShell.CreateShortcut('{0}')
             $Shortcut.TargetPath = '{1}'",
-            shortcutPath.Replace("'", "''"),
-            targetPath.Replace("'", "''"));
+        shortcutPath.Replace("'", "''"),
+        targetPath.Replace("'", "''"));
 
-        if (!string.IsNullOrEmpty(args))
-        {
-            command.AppendFormat(@"
+    if (!string.IsNullOrEmpty(args))
+    {
+      command.AppendFormat(@"
                 $Shortcut.Arguments = '{0}'",
-                args.Replace("'", "''"));
-        }
+          args.Replace("'", "''"));
+    }
 
-        command.Append(@"
+    command.Append(@"
             $Shortcut.Save()");
 
-        ProcessStartInfo startInfo = new ProcessStartInfo
-        {
-            FileName = "powershell",
-            Arguments = command.ToString(),
-            UseShellExecute = false,
-            RedirectStandardOutput = true,
-            CreateNoWindow = true
-        };
-
-        using (Process process = Process.Start(startInfo))
-        {
-            process.WaitForExit();
-            if (process.ExitCode != 0)
-            {
-                throw new Exception("创建快捷方式失败");
-            }
-        }
-
-        Console.WriteLine("成功创建快捷方式");
-    }
-
-    private static void SetBrightness(int level)
+    ProcessStartInfo startInfo = new ProcessStartInfo
     {
-        if (level < 0 || level > 100)
-        {
-            throw new Exception("亮度级别必须在0-100之间");
-        }
+      FileName = "powershell",
+      Arguments = command.ToString(),
+      UseShellExecute = false,
+      RedirectStandardOutput = true,
+      CreateNoWindow = true
+    };
+
+    using (Process process = Process.Start(startInfo))
+    {
+      process.WaitForExit();
+      if (process.ExitCode != 0)
+      {
+        throw new Exception("创建快捷方式失败");
+      }
+    }
 
-        // 使用PowerShell命令设置亮度
-        ProcessStartInfo startInfo = new ProcessStartInfo
-        {
-            FileName = "powershell",
-            Arguments = string.Format("(Get-WmiObject -Namespace root/WMI -Class WmiMonitorBrightnessMethods).WmiSetBrightness(1,{0})", level),
-            UseShellExecute = false,
-            RedirectStandardOutput = true,
-            CreateNoWindow = true
-        };
-
-        using (Process process = Process.Start(startInfo))
-        {
-            process.WaitForExit();
-            if (process.ExitCode != 0)
-            {
-                throw new Exception("设置亮度失败");
-            }
-        }
+    Console.WriteLine("成功创建快捷方式");
+  }
 
-        Console.WriteLine("成功设置亮度");
+  private static void SetBrightness(int level)
+  {
+    if (level < 0 || level > 100)
+    {
+      throw new Exception("亮度级别必须在0-100之间");
     }
 
-    private static void ShowHelp()
+    // 使用PowerShell命令设置亮度
+    ProcessStartInfo startInfo = new ProcessStartInfo
+    {
+      FileName = "powershell",
+      Arguments = string.Format("(Get-WmiObject -Namespace root/WMI -Class WmiMonitorBrightnessMethods).WmiSetBrightness(1,{0})", level),
+      UseShellExecute = false,
+      RedirectStandardOutput = true,
+      CreateNoWindow = true
+    };
+
+    using (Process process = Process.Start(startInfo))
     {
-        string help = @"
+      process.WaitForExit();
+      if (process.ExitCode != 0)
+      {
+        throw new Exception("设置亮度失败");
+      }
+    }
+
+    Console.WriteLine("成功设置亮度");
+  }
+
+  private static Image CaptureScreen()
+  {
+    IntPtr handle = GetDesktopWindow();
+    IntPtr hdcSrc = GetWindowDC(handle);
+    RECT windowRect = new RECT();
+    GetWindowRect(handle, ref windowRect);
+    int width = windowRect.right - windowRect.left;
+    int height = windowRect.bottom - windowRect.top;
+
+    IntPtr hdcDest = CreateCompatibleDC(hdcSrc);
+    IntPtr hBitmap = CreateCompatibleBitmap(hdcSrc, width, height);
+    IntPtr hOld = SelectObject(hdcDest, hBitmap);
+
+    BitBlt(hdcDest, 0, 0, width, height, hdcSrc, 0, 0, 0x00CC0020);
+    SelectObject(hdcDest, hOld);
+    DeleteDC(hdcDest);
+
+    Image img = Image.FromHbitmap(hBitmap);
+    DeleteObject(hBitmap);
+    ReleaseDC(handle, hdcSrc);
+
+    return img;
+  }
+
+  private static void CaptureScreenToFile(string path)
+  {
+    Image img = CaptureScreen();
+    img.Save(path, ImageFormat.Png);
+    img.Dispose();
+  }
+
+  private static void ShowHelp()
+  {
+    string help = @"
 Windows 系统工具使用说明
 ===================
 
@@ -378,6 +463,11 @@ 7. brightness - 控制亮度
       -level <亮度>  亮度级别（0-100）
     示例: utils.exe -type brightness -level 75
 
+8. screenshot - 屏幕截图
+   参数:
+     -path <保存路径>  截图保存路径
+   示例: utils.exe -type screenshot -path ""C:\screenshot.png""
+
 注意事项:
 --------
 1. 某些操作可能需要管理员权限
@@ -385,23 +475,23 @@ 2. 网络配置更改可能会暂时断开网络连接
 3. 电源控制可能会影响正在运行的程序
 4. 建议在更改系统设置前先备份当前配置
 ";
-        Console.WriteLine(help);
-    }
+    Console.WriteLine(help);
+  }
 
-    private static string GetArgumentValue(string[] args, string key)
+  private static string GetArgumentValue(string[] args, string key)
+  {
+    for (int i = 0; i < args.Length - 1; i++)
     {
-        for (int i = 0; i < args.Length - 1; i++)
-        {
-            if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
-            {
-                return args[i + 1];
-            }
-        }
-        return null;
+      if (args[i].Equals(key, StringComparison.OrdinalIgnoreCase))
+      {
+        return args[i + 1];
+      }
     }
+    return null;
+  }
 
-    private static bool HasArgument(string[] args, string key)
-    {
-        return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
-    }
+  private static bool HasArgument(string[] args, string key)
+  {
+    return Array.Exists(args, arg => arg.Equals(key, StringComparison.OrdinalIgnoreCase));
+  }
 }
diff --git a/plugin/lib/quickcomposer/simulate/screenCapture.js b/plugin/lib/quickcomposer/simulate/screenCapture.js
index 14c4eaea..9bb7fa91 100644
--- a/plugin/lib/quickcomposer/simulate/screenCapture.js
+++ b/plugin/lib/quickcomposer/simulate/screenCapture.js
@@ -3,122 +3,29 @@ const { promisify } = require("util");
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
+const { runCsharpFeature } = require("../../csharp");
 
 const execFileAsync = promisify(execFile);
 const readFileAsync = promisify(fs.readFile);
 const unlinkAsync = promisify(fs.unlink);
 
-// Windows C# 截图代码
-const csharpScript = `
-using System;
-using System.Runtime.InteropServices;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Collections.Generic;
-using Microsoft.VisualBasic;
-
-public class ScreenCapture
-{
-    [DllImport("user32.dll")]
-    static extern IntPtr GetDC(IntPtr hwnd);
-
-    [DllImport("user32.dll")]
-    static extern IntPtr GetDesktopWindow();
-
-    [DllImport("user32.dll")]
-    static extern IntPtr GetWindowDC(IntPtr hWnd);
-
-    [DllImport("user32.dll")]
-    static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-    [DllImport("gdi32.dll")]
-    static extern bool BitBlt(IntPtr hdcDest, int nXDest, int nYDest,
-        int nWidth, int nHeight, IntPtr hdcSrc,
-        int nXSrc, int nYSrc, int dwRop);
-
-    [DllImport("gdi32.dll")]
-    static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int nWidth, int nHeight);
-
-    [DllImport("gdi32.dll")]
-    static extern IntPtr CreateCompatibleDC(IntPtr hDC);
-
-    [DllImport("gdi32.dll")]
-    static extern bool DeleteDC(IntPtr hDC);
-
-    [DllImport("gdi32.dll")]
-    static extern bool DeleteObject(IntPtr hObject);
-
-    [DllImport("gdi32.dll")]
-    static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
-
-    public Image CaptureScreen()
-    {
-        return CaptureWindow(GetDesktopWindow());
-    }
-
-    private Image CaptureWindow(IntPtr handle)
-    {
-        IntPtr hdcSrc = GetWindowDC(handle);
-        User32.RECT windowRect = new User32.RECT();
-        User32.GetWindowRect(handle, ref windowRect);
-        int width = windowRect.right - windowRect.left;
-        int height = windowRect.bottom - windowRect.top;
-
-        IntPtr hdcDest = CreateCompatibleDC(hdcSrc);
-        IntPtr hBitmap = CreateCompatibleBitmap(hdcSrc, width, height);
-        IntPtr hOld = SelectObject(hdcDest, hBitmap);
-
-        BitBlt(hdcDest, 0, 0, width, height, hdcSrc, 0, 0, 0x00CC0020);
-        SelectObject(hdcDest, hOld);
-        DeleteDC(hdcDest);
-
-        Image img = Image.FromHbitmap(hBitmap);
-        DeleteObject(hBitmap);
-        ReleaseDC(handle, hdcSrc);
-
-        return img;
-    }
-
-    public void CaptureScreenToFile(string filename, ImageFormat format)
-    {
-        Image img = CaptureScreen();
-        img.Save(filename, format);
-    }
-
-    public class User32
-    {
-        public struct RECT
-        {
-            public int left;
-            public int top;
-            public int right;
-            public int bottom;
-        }
-
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowRect(IntPtr hWnd, ref RECT rect);
-    }
-
-    public static void Main()
-    {
-        ScreenCapture sc = new ScreenCapture();
-        sc.CaptureScreenToFile(">>tempscreenshot<<", ImageFormat.Png);
-    }
-}
-`;
-
 // Windows 截图实现
 async function captureWindowsScreen() {
   const tmpFile = path.join(os.tmpdir(), `screen-${Date.now()}.png`);
   try {
-    await window.quickcommand.runCsharp(
-      csharpScript.replace(">>tempscreenshot<<", tmpFile.replace(/\\/g, "\\\\"))
-    );
+    await runCsharpFeature("utils", [
+      "-type",
+      "screenshot",
+      "-path",
+      tmpFile,
+    ]);
     const imageBuffer = await readFileAsync(tmpFile);
     return `data:image/png;base64,${imageBuffer.toString("base64")}`;
   } catch (error) {
     console.error("Windows截图失败:", error);
     return null;
+  } finally {
+    await unlinkAsync(tmpFile).catch(() => {});
   }
 }
 
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index 1b5ebe94..f33a5f72 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -42,12 +42,5 @@ export const scriptCommands = {
         },
       ],
     },
-    {
-      value: "quickcommand.runCsharp",
-      label: "执行C#脚本",
-      icon: "script",
-      outputVariable: "result",
-      saveOutput: true,
-    },
   ],
 };
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 5fb9062a..3e230de8 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -57,11 +57,11 @@ interface quickcommandApi {
    * for (var i = 0; i < 15; i++) {
    *     // 每一个选项为 json 格式, 使用clickFn注册选项单击事件时id属性是必需的
    *     opt.push({
-   *        id: i, 
-   *        title: `选项${i}`, 
-   *        description: `选项${i}的描述`, 
+   *        id: i,
+   *        title: `选项${i}`,
+   *        description: `选项${i}的描述`,
    *        icon: `http://www.u.tools/favicon.ico`,
-   *        abcd: `选项${i}的自定义属性`, 
+   *        abcd: `选项${i}的自定义属性`,
    *        clickFn:function(e){console.log(e)}
    *     })
    * }
@@ -347,29 +347,6 @@ interface quickcommandApi {
    */
   runPowerShell(script: string): Promise<string>;
 
-  /**
-   * 运行C#脚本，并返回运行结果 (Promise)
-   *
-   * 需要安装.NET Framework
-   *
-   * ```js
-   * const script = `using System;
-   * class Program {
-   *   static void Main(string[] args) {
-   *     Console.WriteLine("Hello, World!");
-   *   }
-   * }`
-   * quickcommand.runCsharp(script).then(res => {
-   *   console.log(res)
-   * }).catch(err => {
-   *   console.log(err)
-   * })
-   * ```
-   *
-   * @param script C# 脚本代码
-   */
-  runCsharp(script: string): Promise<string>;
-
   /**
    * MacOS 下运行 AppleScript 脚本并返回运行结果 (Promise)
    *

From 1b1c79deb57272d95a13bc39fc20a7a81878c314 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 19 Jan 2025 23:08:31 +0800
Subject: [PATCH 075/332] =?UTF-8?q?=E6=94=B9=E7=94=A8browserwindows?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0systemdialog=EF=BC=8C=E5=92=8C=E7=8E=B0?=
 =?UTF-8?q?=E6=9C=89=E5=BC=B9=E7=AA=97UI=E7=BB=9F=E4=B8=80=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               | 192 ++++++++++
 plugin/lib/dialog/service.js                  | 163 +++++++++
 plugin/lib/dialog/view.html                   | 344 ++++++++++++++++++
 plugin/lib/quickcommand.js                    |  64 +---
 plugin/lib/systemDialog.js                    | 303 ---------------
 src/js/composer/commands/uiCommands.js        |  99 ++---
 .../monaco/types/quickcommand.api.d.ts        |  44 +--
 7 files changed, 760 insertions(+), 449 deletions(-)
 create mode 100644 plugin/lib/dialog/controller.js
 create mode 100644 plugin/lib/dialog/service.js
 create mode 100644 plugin/lib/dialog/view.html
 delete mode 100644 plugin/lib/systemDialog.js

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
new file mode 100644
index 00000000..5d172f3b
--- /dev/null
+++ b/plugin/lib/dialog/controller.js
@@ -0,0 +1,192 @@
+const { ipcRenderer } = require("electron");
+
+// 等待 DOM 加载完成
+document.addEventListener("DOMContentLoaded", () => {
+  let parentId = null;
+  let dialogType = null;
+
+  // 监听父窗口发来的对话框配置
+  ipcRenderer.on("dialog-config", (event, config) => {
+    parentId = event.senderId;
+    dialogType = config.type;
+
+    // 设置主题
+    document.documentElement.setAttribute(
+      "data-theme",
+      config.isDark ? "dark" : "light"
+    );
+
+    // 设置对话框标题
+    document.getElementById("title-text").textContent = config.title || "提示";
+
+    // 设置对话框内容
+    if (config.content) {
+      document.getElementById("content").textContent = config.content;
+    }
+
+    // 根据类型设置不同的对话框内容
+    switch (config.type) {
+      case "message":
+        document.body.classList.add("dialog-message"); // 添加消息对话框的类
+        break;
+
+      case "input":
+        document.getElementById("input").style.display = "block";
+        document.body.classList.add("dialog-input");
+        // 创建输入框
+        const inputContainer = document.getElementById("input-container");
+        inputContainer.innerHTML = ""; // 清空现有内容
+        config.inputOptions.forEach((inputOption, index) => {
+          console.log(inputOption);
+          const div = document.createElement("div");
+          div.className = "input-group";
+
+          const label = document.createElement("label");
+          label.textContent =
+            typeof inputOption === "string" ? inputOption : inputOption.label;
+
+          const input = document.createElement("input");
+          input.type = "text";
+          input.id = `input-${index}`;
+          if (typeof inputOption !== "string") {
+            input.value = inputOption.value || "";
+            input.placeholder = inputOption.hint || "";
+          }
+
+          div.appendChild(label);
+          div.appendChild(input);
+          inputContainer.appendChild(div);
+        });
+        document.getElementById("input-0").focus();
+        break;
+
+      case "confirm":
+        document.getElementById("confirm").style.display = "block";
+        document.body.classList.add("dialog-confirm");
+        break;
+
+      case "buttons":
+        document.getElementById("buttons").style.display = "block";
+        document.body.classList.add("dialog-buttons");
+        // 创建按钮
+        const buttonContainer = document.getElementById("button-container");
+        buttonContainer.innerHTML = "";
+        config.buttons.forEach((btn, index) => {
+          const button = document.createElement("button");
+          button.textContent = btn;
+          button.onclick = () => {
+            ipcRenderer.sendTo(parentId, "dialog-result", {
+              id: index,
+              text: btn,
+            });
+          };
+          buttonContainer.appendChild(button);
+        });
+        break;
+
+      case "textarea":
+        document.getElementById("textarea").style.display = "block";
+        document.body.classList.add("dialog-textarea");
+        const textarea = document.getElementById("text-content");
+        if (config.placeholder) {
+          textarea.placeholder = config.placeholder;
+        }
+        if (config.defaultText) {
+          textarea.value = config.defaultText;
+        }
+        textarea.focus();
+        break;
+    }
+    ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
+  });
+
+  const calculateHeight = () => {
+    const titleBar = document.querySelector(".title-bar");
+    const buttonBar = document.querySelector(".button-bar");
+    const contentWrapper = document.querySelector(".content-wrapper");
+
+    // 计算总高度
+    const totalHeight =
+      titleBar.offsetHeight +
+      contentWrapper.scrollHeight +
+      (buttonBar.style.display !== "none" ? buttonBar.offsetHeight : 0);
+
+    // 确保高度在最小值和最大值之间
+    return Math.min(Math.max(totalHeight, 100), 520);
+  };
+
+  // 确定按钮点击事件
+  document.getElementById("ok-btn").onclick = () => {
+    let result;
+
+    switch (dialogType) {
+      case "message":
+        result = true;
+        break;
+
+      case "input":
+        const inputs = document.querySelectorAll("#input-container input");
+        result = Array.from(inputs).map((input) => input.value);
+        break;
+
+      case "confirm":
+        result = true;
+        break;
+
+      case "textarea":
+        result = document.getElementById("text-content").value;
+        break;
+    }
+
+    ipcRenderer.sendTo(parentId, "dialog-result", result);
+  };
+
+  const cancelDialog = () => {
+    let result;
+    switch (dialogType) {
+      case "input":
+        result = [];
+        break;
+      case "textarea":
+        result = "";
+        break;
+      case "confirm":
+        result = false;
+        break;
+      case "buttons":
+        result = {};
+        break;
+      default:
+        result = null;
+    }
+    ipcRenderer.sendTo(parentId, "dialog-result", result);
+  };
+
+  // 取消按钮点击事件
+  document.getElementById("cancel-btn").onclick = () => {
+    cancelDialog();
+  };
+
+  // ESC键关闭窗口
+  document.addEventListener("keydown", (e) => {
+    if (e.key === "Escape") {
+      cancelDialog();
+    }
+  });
+
+  // 回车键确认
+  document.addEventListener("keydown", (e) => {
+    // 如果是文本区域且按下回车，不触发确认
+    if (e.key === "Enter") {
+      if (dialogType === "textarea" && !e.ctrlKey) {
+        return;
+      }
+      document.getElementById("ok-btn").click();
+    }
+  });
+
+  // 关闭按钮点击事件
+  document.querySelector(".close-btn").onclick = () => {
+    cancelDialog();
+  };
+});
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
new file mode 100644
index 00000000..5e98bbcc
--- /dev/null
+++ b/plugin/lib/dialog/service.js
@@ -0,0 +1,163 @@
+const { ipcRenderer } = require("electron");
+const { createBrowserWindow } = utools;
+/**
+ * 创建对话框窗口
+ * @param {object} config - 对话框配置
+ * @returns {Promise} 返回对话框结果
+ */
+const createDialog = (config) => {
+  return new Promise((resolve) => {
+    const dialogPath = "lib/dialog/view.html";
+    const preloadPath = "lib/dialog/controller.js";
+
+    const dialogOptions = {
+      title: config.title || "对话框",
+      width: 470,
+      height: 80,
+      resizable: false,
+      minimizable: false,
+      maximizable: false,
+      fullscreenable: false,
+      skipTaskbar: true,
+      alwaysOnTop: true,
+      frame: false,
+      webPreferences: {
+        preload: preloadPath,
+      },
+    };
+
+    // 创建窗口
+    const UBrowser = createBrowserWindow(dialogPath, dialogOptions, () => {
+      const dialogResultHandler = (event, result) => {
+        resolve(result);
+        // 移除监听器
+        ipcRenderer.removeListener("dialog-result", dialogResultHandler);
+        UBrowser.destroy();
+      };
+
+      const dialogReadyHandler = (event, height) => {
+        // 获取当前窗口位置
+        const bounds = UBrowser.getBounds();
+        // 调整y坐标，保持窗口中心点不变
+        const y = Math.round(bounds.y - (height - bounds.height) / 2);
+        // 确保坐标和尺寸都是有效的整数
+        const newBounds = {
+          x: Math.round(bounds.x),
+          y: Math.max(0, y), // 确保不会超出屏幕顶部
+          width: 470,
+          height: Math.round(height),
+        };
+        // 设置新的位置和大小
+        UBrowser.setBounds(newBounds);
+        ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
+      };
+      ipcRenderer.on("dialog-ready", dialogReadyHandler);
+
+      // 添加监听器
+      ipcRenderer.on("dialog-result", dialogResultHandler);
+
+      // 发送配置到子窗口
+      ipcRenderer.sendTo(UBrowser.webContents.id, "dialog-config", {
+        ...config,
+        isDark: utools.isDarkColors(),
+      });
+    });
+  });
+};
+
+/**
+ * 显示一个系统级消息框
+ * @param {string} content - 消息内容
+ * @param {string} [title] - 标题，默认为空
+ * @returns {Promise<void>} Promise
+ */
+const showSystemMessageBox = async (content, title = "") => {
+  await createDialog({
+    type: "message",
+    title,
+    content,
+  });
+};
+
+/**
+ * 显示一个系统级输入框组对话框
+ * @param {string[]|{label:string,value:string,hint:string}[]} options - 输入框配置，可以是标签数组或者带属性的对象数组
+ * @param {string} [title] - 标题，默认为空
+ * @returns {Promise<string[]|null>} 输入的内容数组
+ */
+const showSystemInputBox = async (options, title = "") => {
+  // 确保 options 是数组
+  const optionsArray = Array.isArray(options) ? options : [options];
+
+  // 转换每个选项为正确的格式
+  const inputOptions = optionsArray.map((opt) => {
+    if (typeof opt === "string") {
+      return opt;
+    }
+    if (typeof opt === "object" && opt.label) {
+      return {
+        label: opt.label,
+        value: opt.value || "",
+        hint: opt.hint || "",
+      };
+    }
+    throw new Error("输入框配置格式错误");
+  });
+
+  return await createDialog({
+    type: "input",
+    title,
+    inputOptions,
+  });
+};
+
+/**
+ * 显示一个系统级确认框，返回是否点击了确认
+ * @param {string} content - 确认内容
+ * @param {string} [title] - 标题，默认为空
+ * @returns {Promise<boolean>} 是否确认
+ */
+const showSystemConfirmBox = async (content, title = "") => {
+  const result = await createDialog({
+    type: "confirm",
+    title,
+    content,
+  });
+  return !!result;
+};
+
+/**
+ * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本
+ * @param {string[]} buttons - 按钮文本数组
+ * @param {string} [title] - 标题，默认为空
+ * @returns {Promise<{id: number, text: string}|null>} 选择的按钮信息
+ */
+const showSystemButtonBox = async (buttons, title = "") => {
+  return await createDialog({
+    type: "buttons",
+    title,
+    buttons: Array.isArray(buttons) ? buttons : [buttons],
+  });
+};
+
+/**
+ * 显示一个系统级多行文本输入框
+ * @param {string} [placeholder] - 输入框的提示文本
+ * @param {string} [defaultText] - 输入框的默认文本，默认为空
+ * @returns {Promise<string|null>} 编辑后的文本
+ */
+const showSystemTextArea = async (placeholder = "请输入", defaultText = "") => {
+  return await createDialog({
+    type: "textarea",
+    placeholder,
+    defaultText,
+  });
+};
+
+module.exports = {
+  showSystemMessageBox,
+  showSystemInputBox,
+  showSystemConfirmBox,
+  showSystemButtonBox,
+  showSystemTextArea,
+};
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
new file mode 100644
index 00000000..83e99cbd
--- /dev/null
+++ b/plugin/lib/dialog/view.html
@@ -0,0 +1,344 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>对话框</title>
+    <style>
+      :root {
+        --bg-color: #fff;
+        --text-color: #333;
+        --border-color: #ddd;
+        --title-bg: #f5f5f5;
+        --input-bg: #fff;
+        --input-border: #ddd;
+        --input-focus: #0d6efd;
+        --button-bg: #0d6efd;
+        --button-hover: #0b5ed7;
+        --button-text: #fff;
+        --cancel-bg: #6c757d;
+        --cancel-border: #6c757d;
+      }
+
+      :root[data-theme="dark"] {
+        --bg-color: #282727;
+        --text-color: #e0e0e0;
+        --border-color: #404040;
+        --title-bg: #2d2d2d;
+        --input-bg: #2d2d2d;
+        --input-border: #404040;
+        --input-focus: #0d6efd;
+        --button-bg: #0d6efd;
+        --button-hover: #0b5ed7;
+        --button-text: #fff;
+        --cancel-bg: #4a4a4a;
+        --cancel-border: #4a4a4a;
+      }
+
+      body {
+        margin: 0;
+        padding: 0;
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+          "Helvetica Neue", Arial, sans-serif;
+        background: var(--bg-color);
+        color: var(--text-color);
+        user-select: none;
+        height: 100vh;
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+      }
+
+      /* 标题栏样式 */
+      .title-bar {
+        background: var(--title-bg);
+        border-bottom: 1px solid var(--border-color);
+        padding: 4px 12px;
+        -webkit-app-region: drag;
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+      }
+
+      .title-left {
+        flex: 1;
+        display: flex;
+        align-items: center;
+      }
+
+      .logo {
+        width: 20px;
+        height: 20px;
+        margin-right: 6px;
+      }
+
+      .title-text {
+        font-size: 13px;
+        font-weight: 500;
+        color: var(--text-color);
+        margin: 0;
+      }
+
+      .close-btn {
+        -webkit-app-region: no-drag;
+        background-color: rgba(0, 0, 0, 0.05);
+        width: 16px;
+        height: 16px;
+        min-width: 16px;
+        min-height: 16px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 50%;
+        cursor: pointer;
+        opacity: 0.8;
+        transition: all 0.2s;
+        margin-left: 8px;
+        position: relative;
+      }
+
+      :root[data-theme="dark"] .close-btn {
+        background-color: rgba(255, 255, 255, 0.1);
+      }
+
+      .close-btn:hover {
+        opacity: 1;
+        background-color: #ff4d4d;
+      }
+
+      .close-btn::before,
+      .close-btn::after {
+        content: "";
+        position: absolute;
+        width: 8px;
+        height: 1px;
+        background-color: var(--text-color);
+        transform-origin: center;
+      }
+
+      .close-btn::before {
+        transform: rotate(45deg);
+      }
+
+      .close-btn::after {
+        transform: rotate(-45deg);
+      }
+
+      .close-btn:hover::before,
+      .close-btn:hover::after {
+        background-color: #fff;
+      }
+
+      .container {
+        display: flex;
+        flex-direction: column;
+        height: 100vh;
+      }
+
+      .content-wrapper {
+        padding: 16px;
+        min-height: 60px;
+        max-height: 449px;
+        overflow-y: auto;
+        overflow-x: hidden;
+        flex: 1;
+      }
+
+      #content {
+        line-height: 1.4;
+        font-size: 13px;
+        user-select: text;
+      }
+
+      .button-bar {
+        display: flex;
+        justify-content: flex-end;
+        gap: 8px;
+        padding: 0 16px 16px;
+        flex-shrink: 0;
+        background: var(--bg-color);
+      }
+
+      button {
+        padding: 4px 12px;
+        border-radius: 4px;
+        border: 1px solid var(--button-bg);
+        background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 0.08) 0%,
+            rgba(0, 0, 0, 0.05) 100%
+          ),
+          var(--button-bg);
+        color: var(--button-text);
+        cursor: pointer;
+        font-size: 13px;
+        min-width: 70px;
+        transition: all 0.2s ease;
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
+      }
+
+      button:hover {
+        background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 0.1) 0%,
+            rgba(0, 0, 0, 0.05) 100%
+          ),
+          var(--button-hover);
+      }
+
+      button:active {
+        background: linear-gradient(
+            180deg,
+            rgba(0, 0, 0, 0.05) 0%,
+            rgba(255, 255, 255, 0.08) 100%
+          ),
+          var(--button-bg);
+        box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+      }
+
+      #ok-btn {
+        padding: 0 12px;
+        height: 20px;
+      }
+
+      #cancel-btn {
+        padding: 0 12px;
+        background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 0.08) 0%,
+            rgba(0, 0, 0, 0.05) 100%
+          ),
+          var(--cancel-bg);
+        border: 1px solid var(--cancel-border);
+        height: 20px;
+      }
+
+      #cancel-btn:hover {
+        background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 0.1) 0%,
+            rgba(0, 0, 0, 0.05) 100%
+          ),
+          var(--cancel-bg);
+      }
+
+      #input-container {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+      }
+
+      .input-group label {
+        display: block;
+        padding: 0 0 4px 2px;
+        color: var(--text-color);
+        font-size: 13px;
+      }
+
+      .input-group input {
+        width: 100%;
+        padding: 6px 8px;
+        border: 1px solid var(--input-border);
+        border-radius: 4px;
+        font-size: 13px;
+        box-sizing: border-box;
+        background: var(--input-bg);
+        color: var(--text-color);
+      }
+
+      .input-group input:focus {
+        border-color: var(--input-focus);
+        outline: none;
+        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+      }
+
+      /* 文本区域样式 */
+      textarea {
+        width: 100%;
+        height: 400px;
+        padding: 6px 8px;
+        border: 1px solid var(--input-border);
+        border-radius: 4px;
+        font-size: 13px;
+        resize: none;
+        box-sizing: border-box;
+        background: var(--input-bg);
+        color: var(--text-color);
+      }
+
+      textarea:focus {
+        border-color: var(--input-focus);
+        outline: none;
+        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+      }
+
+      /* 按钮组样式 */
+      #button-container {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        padding-top: 4px;
+      }
+
+      #button-container button {
+        width: 100%;
+        text-align: center;
+        padding: 6px 12px;
+      }
+
+      /* 根据对话框类型显示/隐藏取消按钮 */
+      .dialog-message #cancel-btn {
+        display: none;
+      }
+
+      .dialog-buttons .button-bar {
+        display: none;
+      }
+
+      /* 隐藏所有对话框内容 */
+      #input,
+      #confirm,
+      #buttons,
+      #textarea {
+        display: none;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <!-- 标题栏 -->
+      <div class="title-bar">
+        <div class="title-left">
+          <img src="http://github.com/logo.png" alt="logo" class="logo" />
+          <h1 class="title-text" id="title-text">对话框</h1>
+        </div>
+        <div class="close-btn"></div>
+      </div>
+
+      <div class="content-wrapper">
+        <div id="content"></div>
+
+        <!-- 输入对话框 -->
+        <div id="input">
+          <div id="input-container"></div>
+        </div>
+
+        <!-- 确认对话框 -->
+        <div id="confirm"></div>
+
+        <!-- 按钮选择对话框 -->
+        <div id="buttons">
+          <div id="button-container"></div>
+        </div>
+
+        <!-- 文本区域对话框 -->
+        <div id="textarea">
+          <textarea id="text-content"></textarea>
+        </div>
+      </div>
+      <div class="button-bar">
+        <button id="cancel-btn">取消</button>
+        <button id="ok-btn">确定</button>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 91dcce28..c24ce33c 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -6,7 +6,7 @@ const iconv = require("iconv-lite");
 const path = require("path");
 const axios = require("axios");
 
-const systemDialog = require("./systemDialog");
+const systemDialog = require("./dialog/service");
 
 const { getQuickcommandTempFile } = require("./getQuickcommandFile");
 
@@ -178,60 +178,7 @@ const quickcommand = {
     }
     return null;
   },
-
-  // 运行C#脚本
-  runCsharp: function (script, args = []) {
-    return new Promise((reslove, reject) => {
-      let cscPath = path.join(
-        process.env.WINDIR,
-        "Microsoft.NET",
-        "Framework",
-        "v4.0.30319",
-        "csc.exe"
-      );
-      if (!fs.existsSync(cscPath)) {
-        cscPath = path.join(
-          process.env.WINDIR,
-          "Microsoft.NET",
-          "Framework",
-          "v3.5",
-          "csc.exe"
-        );
-      }
-      if (!fs.existsSync(cscPath)) {
-        return reject("未安装.NET Framework");
-      }
-      let tempCsharpFile = getQuickcommandTempFile("cs");
-      let tempBuildFile = getQuickcommandTempFile("exe");
-
-      fs.writeFile(tempCsharpFile, iconv.encode(script, "gbk"), (err) => {
-        if (err) return reject(err.toString());
-        // 添加命令行参数
-        const argsStr =
-          args.length > 0
-            ? " " +
-              args
-                .map((arg) =>
-                  arg.startsWith("-") ? arg : `"${arg}"`
-                )
-                .join(" ")
-            : "";
-        child_process.exec(
-          `${cscPath} /nologo /out:${tempBuildFile} ${tempCsharpFile} && ${tempBuildFile}${argsStr}`,
-          {
-            encoding: "buffer",
-            windowsHide: true,
-          },
-          (err, stdout) => {
-            if (err) reject(iconv.decode(stdout, "gbk"));
-            else reslove(iconv.decode(stdout, "gbk"));
-            fs.unlink(tempCsharpFile, () => {});
-            fs.unlink(tempBuildFile, () => {});
-          }
-        );
-      });
-    });
-  },
+  ...systemDialog,
 };
 
 if (process.platform === "win32") {
@@ -272,8 +219,6 @@ if (process.platform === "win32") {
       );
     });
   };
-
-  quickcommand.showSystemTextArea = systemDialog.showSystemTextArea;
 }
 
 if (process.platform === "darwin") {
@@ -316,11 +261,6 @@ if (process.platform !== "linux") {
     let command = createTerminalCommand(cmdline, options);
     child_process.exec(command);
   };
-  // 系统级弹窗
-  quickcommand.showSystemMessageBox = systemDialog.showSystemMessageBox;
-  quickcommand.showSystemInputBox = systemDialog.showSystemInputBox;
-  quickcommand.showSystemConfirmBox = systemDialog.showSystemConfirmBox;
-  quickcommand.showSystemButtonBox = systemDialog.showSystemButtonBox;
 }
 
 module.exports = quickcommand;
diff --git a/plugin/lib/systemDialog.js b/plugin/lib/systemDialog.js
deleted file mode 100644
index d9e74daf..00000000
--- a/plugin/lib/systemDialog.js
+++ /dev/null
@@ -1,303 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const { exec } = require("child_process");
-const { getQuickcommandFolderFile } = require("./getQuickcommandFile");
-const { runCsharpFeature } = require("./csharp");
-
-// 辅助函数
-const execCommand = (cmd) => {
-  return new Promise((resolve, reject) => {
-    exec(cmd, (error, stdout, stderr) => {
-      if (error) {
-        reject(stderr);
-      } else {
-        resolve(stdout);
-      }
-    });
-  });
-};
-
-const checkZenity = async () => {
-  try {
-    await execCommand("which zenity");
-    return true;
-  } catch (error) {
-    window.utools.showNotification(
-      "请先安装 zenity：\nsudo apt install zenity 或\nsudo yum install zenity 或\nsudo pacman -S zenity"
-    );
-    return false;
-  }
-};
-
-const getQuickcommandIconPath = () => {
-  try {
-    const iconPath = getQuickcommandFolderFile("logo", "png");
-    if (!fs.existsSync(iconPath)) {
-      const sourcePath = path.join(__dirname, "..", "logo.png");
-      if (!fs.existsSync(sourcePath)) {
-        console.error("Source icon not found:", sourcePath);
-        return "";
-      }
-      fs.copyFileSync(sourcePath, iconPath);
-    }
-    return iconPath;
-  } catch (error) {
-    console.error("Error getting icon path:", error);
-    return "";
-  }
-};
-
-// 修改对话框函数，使用新的 dialog.cs
-const showSystemMessageBox = async function (content, title = "提示") {
-  try {
-    const iconPath = getQuickcommandIconPath();
-    if (window.utools.isWindows()) {
-      const args = [
-        "-type",
-        "message",
-        "-title",
-        title,
-        "-content",
-        content.replace(/\r\n|\n/g, ""),
-      ];
-
-      if (iconPath) {
-        args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
-      }
-
-      const result = await runCsharpFeature("dialog", args);
-      if (result && result.startsWith("Error:")) {
-        throw new Error(result.substring(7));
-      }
-      return true;
-    }
-    if (window.utools.isMacOs()) {
-      let iconParam = "note";
-      if (iconPath) {
-        const posixPath = iconPath.replace(/\\/g, "/");
-        iconParam = `alias POSIX file "${posixPath}"`;
-      }
-      const script = `display dialog "${content}" with title "${title}" buttons {"确定"} default button "确定" with icon ${iconParam}`;
-      await this.runAppleScript(script);
-      return true;
-    } else if (window.utools.isLinux()) {
-      if (!(await checkZenity())) return false;
-      try {
-        const script = `zenity --info --title="${title}" --text="${content}" --width=400`;
-        await execCommand(script);
-        return true;
-      } catch (error) {
-        return false;
-      }
-    }
-  } catch (error) {
-    console.error("Dialog error:", error);
-    window.utools.showNotification(`对话框错误: ${error.message}`);
-    return false;
-  }
-};
-
-const showSystemInputBox = async function (placeholders, title = "请输入") {
-  if (!Array.isArray(placeholders)) {
-    placeholders = [placeholders];
-  }
-
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isMacOs()) {
-    let iconParam = "note";
-    if (iconPath) {
-      const posixPath = iconPath.replace(/\\/g, "/");
-      iconParam = `alias POSIX file "${posixPath}"`;
-    }
-    try {
-      const results = [];
-      for (let i = 0; i < placeholders.length; i++) {
-        const isLast = i === placeholders.length - 1;
-        const buttons = isLast ? '{"取消", "确定"}' : '{"取消", "继续"}';
-        const defaultButton = isLast ? '"确定"' : '"继续"';
-        const script = `display dialog "${placeholders[i]}" with title "${title}" default answer "" buttons ${buttons} default button ${defaultButton} with icon ${iconParam}`;
-        const result = await this.runAppleScript(script);
-        const buttonClicked = isLast ? "确定" : "继续";
-        if (!result.includes(`button returned:${buttonClicked}`)) {
-          return null;
-        }
-        const text = result.match(/text returned:(.+)/)[1];
-        results.push(text);
-      }
-      return results;
-    } catch (err) {
-      console.error(err);
-      return [];
-    }
-  } else if (window.utools.isWindows()) {
-    const args = [
-      "-type",
-      "input",
-      "-title",
-      title,
-      "-content",
-      placeholders.join("|||||"),
-    ];
-
-    if (iconPath) {
-      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
-    }
-
-    const result = await runCsharpFeature("dialog", args);
-    return result ? JSON.parse(result) : [];
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return null;
-    const results = [];
-    for (let i = 0; i < placeholders.length; i++) {
-      try {
-        const script = `zenity --entry --title="${title}" --text="${placeholders[i]}" --width=400`;
-        const result = await execCommand(script);
-        if (!result) return [];
-        results.push(result.trim());
-      } catch (error) {
-        console.error("执行 zenity 命令失败:", error);
-        return [];
-      }
-    }
-    return results;
-  }
-};
-
-const showSystemConfirmBox = async function (content, title = "请确认") {
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isMacOs()) {
-    let iconParam = "note";
-    if (iconPath) {
-      const posixPath = iconPath.replace(/\\/g, "/");
-      iconParam = `alias POSIX file "${posixPath}"`;
-    }
-    const script = `display dialog "${content}" with title "${title}" buttons {"取消", "确定"} default button "确定" with icon ${iconParam}`;
-    try {
-      const result = await this.runAppleScript(script);
-      return result.includes("button returned:确定");
-    } catch (err) {
-      console.error(err);
-      return false;
-    }
-  } else if (window.utools.isWindows()) {
-    const args = [
-      "-type",
-      "confirm",
-      "-title",
-      title,
-      "-content",
-      content.replace(/\r\n|\n/g, "\\n"),
-    ];
-
-    if (iconPath) {
-      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
-    }
-
-    const result = await runCsharpFeature("dialog", args);
-    return result === "true";
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return false;
-    try {
-      const script = `zenity --question --title="${title}" --text="${content}" --width=400`;
-      await execCommand(script);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  }
-};
-
-const showSystemButtonBox = async function (buttons, title = "请选择") {
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isMacOs()) {
-    const itemList = buttons.map((item) => `"${item}"`).join(", ");
-    const script = `choose from list {${itemList}} with title "${title}" default items {"${buttons[0]}"}`;
-    try {
-      const result = await this.runAppleScript(script);
-      if (result.includes("false")) return {};
-      const text = result.trim();
-      const id = buttons.findIndex((item) => item === text);
-      return { id, text };
-    } catch (err) {
-      console.error(err);
-      return {};
-    }
-  } else if (window.utools.isWindows()) {
-    const args = [
-      "-type",
-      "buttons",
-      "-title",
-      title,
-      "-content",
-      buttons.join("|||||"),
-    ];
-
-    if (iconPath) {
-      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
-    }
-
-    const result = await runCsharpFeature("dialog", args);
-    if (result) {
-      return JSON.parse(result);
-    }
-    return {};
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return null;
-    try {
-      const script1 = `zenity --info --title="${title}" --width=400`;
-      await execCommand(script1);
-
-      const itemsList = buttons
-        .map((btn, index) => `"${index}" "${btn}"`)
-        .join(" ");
-      const script2 = `zenity --list --title="${title}" --column="序号" --column="选项" ${itemsList} --width=400 --height=300`;
-      const result = await execCommand(script2);
-      if (!result) return {};
-      const text = result.trim();
-      const id = buttons.findIndex((btn) => btn === text);
-      return { id, text };
-    } catch (error) {
-      console.error("执行 zenity 命令失败:", error);
-      return null;
-    }
-  }
-};
-
-const showSystemTextArea = async function (defaultText = "", title = "请输入") {
-  const iconPath = getQuickcommandIconPath();
-  if (window.utools.isWindows()) {
-    const args = [
-      "-type",
-      "textarea",
-      "-title",
-      title,
-      "-content",
-      defaultText,
-    ];
-
-    if (iconPath) {
-      args.push("-iconpath", iconPath.replace(/\\/g, "\\\\"));
-    }
-
-    const result = await runCsharpFeature("dialog", args);
-    return result || null;
-  } else if (window.utools.isLinux()) {
-    if (!(await checkZenity())) return null;
-    try {
-      const script = `zenity --text-info --title="${title}" --editable --width=450 --height=350 --filename=<(echo "${defaultText}")`;
-      const result = await execCommand(script);
-      return result ? result.trim() : null;
-    } catch (error) {
-      console.error("执行 zenity 命令失败:", error);
-      return null;
-    }
-  }
-};
-
-module.exports = {
-  showSystemMessageBox,
-  showSystemInputBox,
-  showSystemConfirmBox,
-  showSystemButtonBox,
-  showSystemTextArea,
-};
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index f5aa1d84..2ccc9568 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -258,50 +258,37 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "[inputValue1]",
       saveOutput: true,
+      config: [
+        {
+          label: "输入框",
+          component: "ArrayEditor",
+          width: 12,
+          columns: {
+            label: {
+              label: "标签",
+            },
+            value: {
+              label: "默认值",
+            },
+          },
+          defaultValue: [
+            {
+              label: newVarInputVal("str", "请输入"),
+              value: newVarInputVal("str"),
+            },
+          ],
+        },
+      ],
       subCommands: [
         {
           value: "quickcommand.showInputBox",
           icon: "call_to_action",
           label: "插件内弹窗",
-          config: [
-            {
-              label: "输入框",
-              component: "ArrayEditor",
-              width: 12,
-              columns: {
-                label: {
-                  label: "标签",
-                },
-                value: {
-                  label: "默认值",
-                },
-              },
-              defaultValue: [
-                {
-                  label: newVarInputVal("str", "请输入"),
-                  value: newVarInputVal("str"),
-                },
-              ],
-            },
-          ],
         },
         {
           value: "quickcommand.showSystemInputBox",
           icon: "report",
           label: "系统弹窗",
-          config: [
-            {
-              label: "提示信息",
-              component: "ArrayEditor",
-              width: 12,
-            },
-            {
-              label: "标题",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str", "请输入"),
-              width: 12,
-            },
-          ],
         },
       ],
     },
@@ -317,44 +304,30 @@ export const uiCommands = {
       isAsync: true,
       outputVariable: "textareaValue",
       saveOutput: true,
+      config: [
+        {
+          label: "文本框占位符",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str", "请输入"),
+          width: 6,
+        },
+        {
+          label: "文本框默认值",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("str"),
+          width: 6,
+        },
+      ],
       subCommands: [
         {
           value: "quickcommand.showTextArea",
           icon: "call_to_action",
           label: "插件内弹窗",
-          config: [
-            {
-              label: "文本框占位符",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str", "请输入"),
-              width: 6,
-            },
-            {
-              label: "文本框默认值",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str"),
-              width: 6,
-            },
-          ],
         },
         {
           value: "quickcommand.showSystemTextArea",
           icon: "report",
-          label: "系统弹窗(Mac不支持)",
-          config: [
-            {
-              label: "文本框默认值",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str"),
-              width: 6,
-            },
-            {
-              label: "标题",
-              component: "VariableInput",
-              defaultValue: newVarInputVal("str", "请输入"),
-              width: 6,
-            },
-          ],
+          label: "系统弹窗",
         },
       ],
     },
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 3e230de8..e6475d91 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -131,9 +131,9 @@ interface quickcommandApi {
    * ```
    *
    * @param placeholder 文本框占位符
-   * @param value 默认的文本值
+   * @param defaultText 默认的文本值
    */
-  showTextArea(placeholder?: string, value?: string): Promise<string>;
+  showTextArea(placeholder?: string, defaultText?: string): Promise<string>;
 
   /**
    * 显示一个自动消失的提示框
@@ -483,7 +483,7 @@ interface quickcommandApi {
   };
 
   /**
-   * 显示一个系统级消息框（不支持Linux）
+   * 显示一个系统级消息框
    *
    * ```js
    * quickcommand.showSystemMessageBox("这是一条消息", "标题")
@@ -495,30 +495,33 @@ interface quickcommandApi {
   showSystemMessageBox(content: string, title?: string): Promise<void>;
 
   /**
-   * 显示一个系统级输入框组，返回所有输入框的值（不支持Linux）
+   * 显示一个系统级输入框组对话框，返回所有输入框的值
    *
    * ```js
-   * // 单个输入框
-   * quickcommand.showSystemInputBox("请输入：", "标题").then(results => {
-   *   console.log(results[0]) // 第一个输入框的值
+   * // 简单数组形式
+   * quickcommand.showSystemInputBox(["姓名", "年龄", "地址"], "个人信息").then(values => {
+   *   console.log(values) // ["张三", "25", "北京"]
    * })
    *
-   * // 多个输入框
-   * quickcommand.showSystemInputBox(["姓名：", "年龄：", "地址："], "个人信息").then(results => {
-   *   console.log(results) // ["张三", "25", "北京"]
+   * // 对象数组形式
+   * quickcommand.showSystemInputBox([
+   *   { label: "姓名", value: "张三", hint: "请输入姓名" },
+   *   { label: "年龄", value: "25", hint: "请输入年龄" }
+   * ], "个人信息").then(values => {
+   *   console.log(values) // ["张三", "25"]
    * })
    * ```
    *
-   * @param placeholders 输入框的提示文本，可以是单个字符串或字符串数组
+   * @param options 输入框配置，可以是标签数组或者带属性的对象数组
    * @param title 标题，默认为空
    */
   showSystemInputBox(
-    placeholders: string | string[],
+    options: string[] | { label: string; value?: string; hint?: string }[],
     title?: string
   ): Promise<string[] | null>;
 
   /**
-   * 显示一个系统级确认框，返回是否点击了确认（不支持Linux）
+   * 显示一个系统级确认框，返回是否点击了确认
    *
    * ```js
    * quickcommand.showSystemConfirmBox("确定要删除吗？", "确认删除").then(confirmed => {
@@ -533,9 +536,8 @@ interface quickcommandApi {
    */
   showSystemConfirmBox(content: string, title?: string): Promise<boolean>;
 
-
   /**
-   * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本（不支持Linux）
+   * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本
    *
    * ```js
    * quickcommand.showSystemButtonBox(["保存", "不保存", "取消"], "保存确认").then(result => {
@@ -554,22 +556,22 @@ interface quickcommandApi {
   ): Promise<{ id: number; text: string } | null>;
 
   /**
-   * 显示一个系统级多行文本输入框（仅Windows支持）
+   * 显示一个系统级多行文本输入框
    *
    * ```js
-   * quickcommand.showSystemTextArea("默认内容", "文本编辑").then(text => {
+   * quickcommand.showSystemTextArea("请输入内容", "").then(text => {
    *   if (text) {
    *     console.log("输入的文本：", text)
    *   }
    * })
    * ```
    *
-     * @param defaultText 默认文本，默认为空
-   * @param title 标题，默认为空
+   * @param placeholder 输入框的提示文本，默认为空
+   * @param defaultText 输入框的默认文本，默认为空
    */
   showSystemTextArea(
-    defaultText?: string,
-    title?: string
+    placeholder?: string,
+    defaultText?: string
   ): Promise<string | null>;
 
   /**

From 5b13f5c2a13322b70392eeb9ff7b221a089c14f3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 00:58:08 +0800
Subject: [PATCH 076/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Equickcommand.showSyst?=
 =?UTF-8?q?emSelectList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               | 220 +++++++++++++++++-
 plugin/lib/dialog/service.js                  |  27 ++-
 plugin/lib/dialog/view.html                   | 163 ++++++++++++-
 .../monaco/types/quickcommand.api.d.ts        |  44 ++++
 4 files changed, 449 insertions(+), 5 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index 5d172f3b..d834cfa2 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -1,4 +1,5 @@
 const { ipcRenderer } = require("electron");
+const pinyinMatch = require("pinyin-match");
 
 // 等待 DOM 加载完成
 document.addEventListener("DOMContentLoaded", () => {
@@ -96,6 +97,218 @@ document.addEventListener("DOMContentLoaded", () => {
         }
         textarea.focus();
         break;
+
+      case "select":
+        document.getElementById("select").style.display = "block";
+        document.body.classList.add("dialog-select");
+        const selectContainer = document.getElementById("select-container");
+        const filterInput = document.getElementById("filter-input");
+        const selectList = document.querySelector(".select-list");
+        selectContainer.innerHTML = "";
+        let currentSelected = null;
+        let allItems = [];
+        let filteredItems = [];
+        let hoverTimeout = null;
+        let isKeyboardNavigation = false;
+
+        // 创建选项
+        const createSelectItem = (item, index) => {
+          const div = document.createElement("div");
+          div.className = "select-item";
+
+          // 点击事件
+          div.onclick = () => {
+            const originalIndex = allItems.indexOf(item);
+            const result =
+              typeof item === "string"
+                ? {
+                    id: originalIndex,
+                    text: item,
+                  }
+                : item;
+            ipcRenderer.sendTo(parentId, "dialog-result", result);
+          };
+
+          // 鼠标移入事件（带防抖）
+          div.onmouseenter = () => {
+            if (isKeyboardNavigation) return;
+            if (hoverTimeout) {
+              clearTimeout(hoverTimeout);
+            }
+            hoverTimeout = setTimeout(() => {
+              if (currentSelected) {
+                currentSelected.classList.remove("selected");
+              }
+              div.classList.add("selected");
+              currentSelected = div;
+            }, 50);
+          };
+
+          // 鼠标移动事件
+          div.onmousemove = () => {
+            if (isKeyboardNavigation) {
+              isKeyboardNavigation = false;
+              selectList.classList.remove("keyboard-nav");
+            }
+          };
+
+          // 高亮文本
+          const highlightText = (text, filterText) => {
+            if (!filterText) return text;
+            const matchResult = pinyinMatch.match(text, filterText);
+            if (!matchResult) return text;
+
+            const [start, end] = matchResult;
+            return (
+              text.slice(0, start) +
+              `<span class="highlight">${text.slice(start, end + 1)}</span>` +
+              text.slice(end + 1)
+            );
+          };
+
+          if (typeof item === "string" || typeof item === "number") {
+            const highlightedText = highlightText(
+              String(item),
+              filterInput.value
+            );
+            div.innerHTML = `
+              <div class="select-item-content">
+                <p class="select-item-title">${highlightedText}</p>
+              </div>
+            `;
+          } else {
+            const highlightedTitle = highlightText(
+              item.title,
+              filterInput.value
+            );
+            const highlightedDesc = item.description
+              ? highlightText(item.description, filterInput.value)
+              : "";
+            div.innerHTML = `
+              ${
+                item.icon
+                  ? `
+                <div class="select-item-icon">
+                  <img src="http://github.com/$%7Bitem.icon%7D" alt="">
+                </div>
+              `
+                  : ""
+              }
+              <div class="select-item-content">
+                <p class="select-item-title">${highlightedTitle}</p>
+                ${
+                  item.description
+                    ? `
+                  <p class="select-item-description">${highlightedDesc}</p>
+                `
+                    : ""
+                }
+              </div>
+            `;
+          }
+          return div;
+        };
+
+        // 过滤并更新列表
+        const updateList = (filterText = "") => {
+          selectContainer.innerHTML = "";
+          filteredItems = allItems.filter((item) => {
+            if (typeof item === "string" || typeof item === "number") {
+              return (
+                filterText === "" || pinyinMatch.match(String(item), filterText)
+              );
+            } else {
+              const titleMatch = pinyinMatch.match(item.title, filterText);
+              const descMatch = item.description
+                ? pinyinMatch.match(item.description, filterText)
+                : false;
+              return filterText === "" || titleMatch || descMatch;
+            }
+          });
+
+          filteredItems.forEach((item, index) => {
+            const div = createSelectItem(item, index);
+            selectContainer.appendChild(div);
+          });
+
+          // 默认选中第一项
+          if (selectContainer.firstChild) {
+            selectContainer.firstChild.classList.add("selected");
+            currentSelected = selectContainer.firstChild;
+          }
+        };
+
+        // 初始化列表
+        allItems = config.items;
+        updateList();
+
+        // 添加筛选功能
+        let filterTimeout = null;
+        filterInput.addEventListener("input", (e) => {
+          if (filterTimeout) {
+            clearTimeout(filterTimeout);
+          }
+          filterTimeout = setTimeout(() => {
+            updateList(e.target.value);
+          }, 100);
+        });
+
+        // 添加键盘导航
+        const keydownHandler = (e) => {
+          const items = selectContainer.children;
+          if (!items.length) return;
+
+          if (
+            !isKeyboardNavigation &&
+            (e.key === "ArrowUp" || e.key === "ArrowDown")
+          ) {
+            isKeyboardNavigation = true;
+            selectList.classList.add("keyboard-nav");
+          }
+
+          const currentIndex = Array.from(items).indexOf(currentSelected);
+          let newIndex = currentIndex;
+
+          switch (e.key) {
+            case "ArrowUp":
+              e.preventDefault();
+              if (currentIndex > 0) {
+                newIndex = currentIndex - 1;
+              }
+              break;
+            case "ArrowDown":
+              e.preventDefault();
+              if (currentIndex < items.length - 1) {
+                newIndex = currentIndex + 1;
+              }
+              break;
+            case "Enter":
+              e.preventDefault();
+              if (currentSelected) {
+                currentSelected.click();
+              }
+              break;
+            case "Escape":
+              e.preventDefault();
+              cancelDialog();
+              break;
+          }
+
+          if (newIndex !== currentIndex) {
+            if (currentSelected) {
+              currentSelected.classList.remove("selected");
+            }
+            items[newIndex].classList.add("selected");
+            currentSelected = items[newIndex];
+            currentSelected.scrollIntoView({ block: "nearest" });
+          }
+        };
+
+        document.addEventListener("keydown", keydownHandler);
+
+        // 聚焦筛选框
+        filterInput.focus();
+        break;
     }
     ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
   });
@@ -111,8 +324,10 @@ document.addEventListener("DOMContentLoaded", () => {
       contentWrapper.scrollHeight +
       (buttonBar.style.display !== "none" ? buttonBar.offsetHeight : 0);
 
+    const maxHeight = dialogType === "select" ? 620 : 520;
+
     // 确保高度在最小值和最大值之间
-    return Math.min(Math.max(totalHeight, 100), 520);
+    return Math.min(Math.max(totalHeight, 100), maxHeight);
   };
 
   // 确定按钮点击事件
@@ -156,6 +371,9 @@ document.addEventListener("DOMContentLoaded", () => {
       case "buttons":
         result = {};
         break;
+      case "select":
+        result = {};
+        break;
       default:
         result = null;
     }
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 5e98bbcc..d45a8dbe 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -83,7 +83,7 @@ const showSystemMessageBox = async (content, title = "") => {
  * 显示一个系统级输入框组对话框
  * @param {string[]|{label:string,value:string,hint:string}[]} options - 输入框配置，可以是标签数组或者带属性的对象数组
  * @param {string} [title] - 标题，默认为空
- * @returns {Promise<string[]|null>} 输入的内容数组
+ * @returns {Promise<string[]>} 输入的内容数组
  */
 const showSystemInputBox = async (options, title = "") => {
   // 确保 options 是数组
@@ -130,7 +130,7 @@ const showSystemConfirmBox = async (content, title = "") => {
  * 显示一个系统级按钮组对话框，返回点击的按钮的索引和文本
  * @param {string[]} buttons - 按钮文本数组
  * @param {string} [title] - 标题，默认为空
- * @returns {Promise<{id: number, text: string}|null>} 选择的按钮信息
+ * @returns {Promise<{id: number, text: string}>} 选择的按钮信息
  */
 const showSystemButtonBox = async (buttons, title = "") => {
   return await createDialog({
@@ -144,7 +144,7 @@ const showSystemButtonBox = async (buttons, title = "") => {
  * 显示一个系统级多行文本输入框
  * @param {string} [placeholder] - 输入框的提示文本
  * @param {string} [defaultText] - 输入框的默认文本，默认为空
- * @returns {Promise<string|null>} 编辑后的文本
+ * @returns {Promise<string>} 编辑后的文本
  */
 const showSystemTextArea = async (placeholder = "请输入", defaultText = "") => {
   return await createDialog({
@@ -154,10 +154,31 @@ const showSystemTextArea = async (placeholder = "请输入", defaultText = "") =
   });
 };
 
+/**
+ * 显示一个系统级选择列表对话框
+ * @param {Array<string|{title: string, description?: string, icon?: string}>} items - 选项列表
+ * @param {object} [options] - 配置选项
+ * @param {string} [options.title] - 对话框标题
+ * @returns {Promise<{id: number, text: string, data: any}>} 选择的结果
+ */
+const showSystemSelectList = async (items, options = {}) => {
+  const defaultOptions = {
+    title: "",
+  };
+  const finalOptions = { ...defaultOptions, ...options };
+
+  return await createDialog({
+    type: "select",
+    title: finalOptions.title,
+    items: items,
+  });
+};
+
 module.exports = {
   showSystemMessageBox,
   showSystemInputBox,
   showSystemConfirmBox,
   showSystemButtonBox,
   showSystemTextArea,
+  showSystemSelectList,
 };
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
index 83e99cbd..396039b9 100644
--- a/plugin/lib/dialog/view.html
+++ b/plugin/lib/dialog/view.html
@@ -143,6 +143,12 @@
         flex: 1;
       }
 
+      /* 选择列表对话框的内容区域padding和高度 */
+      .dialog-select .content-wrapper {
+        padding: 16px 5px;
+        max-height: 600px;
+      }
+
       #content {
         line-height: 1.4;
         font-size: 13px;
@@ -298,7 +304,150 @@
       #input,
       #confirm,
       #buttons,
-      #textarea {
+      #textarea,
+      #select {
+        display: none;
+      }
+
+      /* 选择列表样式 */
+      .select-list {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        max-height: 505px;
+        overflow-y: auto;
+      }
+
+      .filter-input {
+        margin-bottom: 8px;
+        padding: 0 2px;
+      }
+
+      .filter-input input {
+        width: 100%;
+        padding: 6px 8px;
+        border: 1px solid var(--input-border);
+        border-radius: 4px;
+        font-size: 13px;
+        box-sizing: border-box;
+        background: var(--input-bg);
+        color: var(--text-color);
+      }
+
+      .filter-input input:focus {
+        border-color: var(--input-focus);
+        outline: none;
+        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+      }
+
+      .select-list-container {
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
+        max-height: 360px;
+        overflow-y: auto;
+      }
+
+      .select-item {
+        display: flex;
+        align-items: center;
+        padding: 6px 8px;
+        border-radius: 8px;
+        cursor: pointer;
+        position: relative;
+        transform: translateY(0) scale(1);
+        transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+        will-change: transform;
+      }
+
+      .select-item.selected {
+        background-color: rgba(13, 110, 253, 0.1);
+        position: relative;
+        transform: translateY(-1px) scale(0.995);
+        will-change: transform;
+      }
+
+      .select-item-icon {
+        transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+        will-change: transform;
+      }
+
+      .select-item.selected .select-item-icon {
+        transform: scale(1.05);
+        filter: brightness(1.05);
+      }
+
+      :root[data-theme="dark"]
+        .select-list:not(.keyboard-nav)
+        .select-item:hover {
+        background-color: rgba(13, 110, 253, 0.2);
+      }
+
+      :root[data-theme="dark"] .select-item.selected {
+        background-color: rgba(13, 110, 253, 0.2);
+      }
+
+      /* 添加选择时的轻微阴影效果 */
+      .select-item.selected,
+      .select-list:not(.keyboard-nav) .select-item:hover {
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
+      }
+
+      :root[data-theme="dark"] .select-item.selected,
+      :root[data-theme="dark"]
+        .select-list:not(.keyboard-nav)
+        .select-item:hover {
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+      }
+
+      .select-item-icon {
+        width: 34px;
+        height: 34px;
+        margin-right: 8px;
+        border-radius: 4px;
+        overflow: hidden;
+      }
+
+      .select-item-icon img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+
+      .select-item-content {
+        flex: 1;
+        min-width: 0;
+      }
+
+      .select-item-title {
+        font-size: 13px;
+        line-height: 1.4;
+        margin: 0;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .select-item-description {
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.6);
+        margin: 0;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      :root[data-theme="dark"] .select-item-description {
+        color: rgba(255, 255, 255, 0.6);
+      }
+
+      /* 搜索结果高亮样式 */
+      .highlight {
+        color: #ec3535;
+      }
+
+      /* 隐藏确定和取消按钮 */
+      .dialog-select .button-bar {
         display: none;
       }
     </style>
@@ -330,6 +479,18 @@ <h1 class="title-text" id="title-text">对话框</h1>
           <div id="button-container"></div>
         </div>
 
+        <!-- 选择列表对话框 -->
+        <div id="select">
+          <div class="filter-input">
+            <input
+              type="text"
+              id="filter-input"
+              placeholder="输入关键字进行筛选"
+            />
+          </div>
+          <div id="select-container" class="select-list"></div>
+        </div>
+
         <!-- 文本区域对话框 -->
         <div id="textarea">
           <textarea id="text-content"></textarea>
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index e6475d91..c32c442f 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -574,6 +574,50 @@ interface quickcommandApi {
     defaultText?: string
   ): Promise<string | null>;
 
+  /**
+   * 显示一个支持搜索的系统级选项列表，选项类型为文本时，返回选择的索引和文本，为对象时，返回选择的对象
+   *
+   * ```js
+   * // plaintext
+   * var opt = []
+   * for (var i = 0; i < 15; i++) {
+   *     // 每一个选项为文本格式
+   *     opt.push(`选项` + i)
+   * }
+   * quickcommand.showSystemSelectList(opt).then(choise => {
+   *     console.log(`选择的选项为${choise.text}`)
+   * })
+   * ​
+   * // json
+   * var opt = []
+   * for (var i = 0; i < 15; i++) {
+   *     // 每一个选项为 json 格式, 使用clickFn注册选项单击事件时id属性是必需的
+   *     opt.push({
+   *        id: i,
+   *        title: `选项${i}`,
+   *        description: `选项${i}的描述`,
+   *        icon: `http://www.u.tools/favicon.ico`,
+   *        abcd: `选项${i}的自定义属性`,
+   *        clickFn:function(e){console.log(e)}
+   *     })
+   * }
+   * quickcommand.showSystemSelectList(opt, {optionType: 'json'}).then(choise => {
+   *     console.log(`选择的选项为${choise.title}`)
+   * })
+   * ​
+   * ```
+   *
+   * @param selects 每一个列表选项
+   * @param options 列表的选项。placeholder: 搜索框占位符；optionType: 选项的格式，默认为plaintext；
+   */
+  showSystemSelectList(
+    selects: string[] | object[],
+    options?: {
+      placeholder: string;
+      optionType: "plaintext" | "json";
+    }
+  ): Promise<{ id: number; text: string | object }>;
+
   /**
    * 运行代码
    * @param code 代码

From bd678e75bfc221674de1a33ab0b01fb6742456ec Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 10:50:55 +0800
Subject: [PATCH 077/332] =?UTF-8?q?=E7=BB=9F=E4=B8=80showSystemSelectList?=
 =?UTF-8?q?=E5=92=8CshowSelect=E7=9A=84=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E6=8E=92=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=BC=B9=E7=AA=97=E7=9A=84=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               |  36 +-
 plugin/lib/dialog/service.js                  |  21 +-
 plugin/lib/dialog/style.css                   | 461 ++++++++++++++++++
 plugin/lib/dialog/view.html                   | 449 +----------------
 .../composer/ui/SelectListEditor.vue          | 196 ++++----
 .../monaco/types/quickcommand.api.d.ts        |  28 +-
 6 files changed, 631 insertions(+), 560 deletions(-)
 create mode 100644 plugin/lib/dialog/style.css

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index d834cfa2..d753babb 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -111,6 +111,14 @@ document.addEventListener("DOMContentLoaded", () => {
         let hoverTimeout = null;
         let isKeyboardNavigation = false;
 
+        if (!config.enableSearch) {
+          filterInput.style.display = "none";
+        }
+
+        if (config.placeholder) {
+          filterInput.placeholder = config.placeholder;
+        }
+
         // 创建选项
         const createSelectItem = (item, index) => {
           const div = document.createElement("div");
@@ -129,7 +137,7 @@ document.addEventListener("DOMContentLoaded", () => {
             ipcRenderer.sendTo(parentId, "dialog-result", result);
           };
 
-          // 鼠标移入事件（带防抖）
+          // 鼠标移入事件
           div.onmouseenter = () => {
             if (isKeyboardNavigation) return;
             if (hoverTimeout) {
@@ -141,7 +149,7 @@ document.addEventListener("DOMContentLoaded", () => {
               }
               div.classList.add("selected");
               currentSelected = div;
-            }, 50);
+            }, 0);
           };
 
           // 鼠标移动事件
@@ -243,15 +251,17 @@ document.addEventListener("DOMContentLoaded", () => {
         updateList();
 
         // 添加筛选功能
-        let filterTimeout = null;
-        filterInput.addEventListener("input", (e) => {
-          if (filterTimeout) {
-            clearTimeout(filterTimeout);
-          }
-          filterTimeout = setTimeout(() => {
-            updateList(e.target.value);
-          }, 100);
-        });
+        if (config.enableSearch) {
+          let filterTimeout = null;
+          filterInput.addEventListener("input", (e) => {
+            if (filterTimeout) {
+              clearTimeout(filterTimeout);
+            }
+            filterTimeout = setTimeout(() => {
+              updateList(e.target.value);
+            }, 100);
+          });
+        }
 
         // 添加键盘导航
         const keydownHandler = (e) => {
@@ -307,7 +317,9 @@ document.addEventListener("DOMContentLoaded", () => {
         document.addEventListener("keydown", keydownHandler);
 
         // 聚焦筛选框
-        filterInput.focus();
+        if (config.enableSearch) {
+          filterInput.focus();
+        }
         break;
     }
     ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index d45a8dbe..25025647 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -21,6 +21,7 @@ const createDialog = (config) => {
       skipTaskbar: true,
       alwaysOnTop: true,
       frame: false,
+      opacity: 0,
       webPreferences: {
         preload: preloadPath,
       },
@@ -49,6 +50,7 @@ const createDialog = (config) => {
         };
         // 设置新的位置和大小
         UBrowser.setBounds(newBounds);
+        UBrowser.setOpacity(1);
         ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
       };
       ipcRenderer.on("dialog-ready", dialogReadyHandler);
@@ -159,18 +161,25 @@ const showSystemTextArea = async (placeholder = "请输入", defaultText = "") =
  * @param {Array<string|{title: string, description?: string, icon?: string}>} items - 选项列表
  * @param {object} [options] - 配置选项
  * @param {string} [options.title] - 对话框标题
+ * @param {string} [options.placeholder] - 输入框占位符
+ * @param {boolean} [options.enableSearch] - 是否启用搜索
  * @returns {Promise<{id: number, text: string, data: any}>} 选择的结果
  */
 const showSystemSelectList = async (items, options = {}) => {
-  const defaultOptions = {
-    title: "",
-  };
-  const finalOptions = { ...defaultOptions, ...options };
+  const {
+    title = "请选择",
+    placeholder = "",
+    enableSearch = true,
+    optionType = "plaintext",
+  } = options;
 
   return await createDialog({
     type: "select",
-    title: finalOptions.title,
-    items: items,
+    title,
+    placeholder,
+    enableSearch,
+    items,
+    optionType,
   });
 };
 
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
new file mode 100644
index 00000000..7747ca05
--- /dev/null
+++ b/plugin/lib/dialog/style.css
@@ -0,0 +1,461 @@
+ :root {
+   --bg-color: #fff;
+   --text-color: #333;
+   --border-color: #ddd;
+   --title-bg: #f5f5f5;
+   --input-bg: #fff;
+   --input-border: #ddd;
+   --input-focus: #0d6efd;
+   --button-bg: #0d6efd;
+   --button-hover: #0b5ed7;
+   --button-text: #fff;
+   --cancel-bg: #6c757d;
+   --cancel-border: #6c757d;
+ }
+
+ :root[data-theme="dark"] {
+   --bg-color: #282727;
+   --text-color: #e0e0e0;
+   --border-color: #404040;
+   --title-bg: #2d2d2d;
+   --input-bg: #2d2d2d;
+   --input-border: #404040;
+   --input-focus: #0d6efd;
+   --button-bg: #0d6efd;
+   --button-hover: #0b5ed7;
+   --button-text: #fff;
+   --cancel-bg: #4a4a4a;
+   --cancel-border: #4a4a4a;
+ }
+
+ body {
+   margin: 0;
+   padding: 0;
+   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+     "Helvetica Neue", Arial, sans-serif;
+   background: var(--bg-color);
+   color: var(--text-color);
+   user-select: none;
+   height: 100vh;
+   display: flex;
+   flex-direction: column;
+   overflow: hidden;
+ }
+
+ /* 自定义滚动条样式 */
+ ::-webkit-scrollbar {
+   width: 4px;
+   height: 4px;
+ }
+
+ ::-webkit-scrollbar-track {
+   background: transparent;
+ }
+
+ ::-webkit-scrollbar-thumb {
+   background: rgba(0, 0, 0, 0);
+   transition: background-color 0.3s;
+ }
+
+ :root[data-theme="dark"] ::-webkit-scrollbar-thumb {
+   background: rgba(255, 255, 255, 0);
+ }
+
+ /* 悬浮时显示滚动条 */
+ *:hover::-webkit-scrollbar-thumb {
+   background: rgba(0, 0, 0, 0.3);
+   transition: background-color 0.3s;
+ }
+
+ :root[data-theme="dark"] *:hover::-webkit-scrollbar-thumb {
+   background: rgba(255, 255, 255, 0.3);
+ }
+
+ /* 标题栏样式 */
+ .title-bar {
+   background: var(--title-bg);
+   border-bottom: 1px solid var(--border-color);
+   padding: 4px 12px;
+   -webkit-app-region: drag;
+   display: flex;
+   align-items: center;
+   flex-shrink: 0;
+ }
+
+ .title-left {
+   flex: 1;
+   display: flex;
+   align-items: center;
+ }
+
+ .logo {
+   width: 20px;
+   height: 20px;
+   margin-right: 6px;
+ }
+
+ .title-text {
+   font-size: 13px;
+   font-weight: 500;
+   color: var(--text-color);
+   margin: 0;
+ }
+
+ .close-btn {
+   -webkit-app-region: no-drag;
+   background-color: rgba(0, 0, 0, 0.05);
+   width: 16px;
+   height: 16px;
+   min-width: 16px;
+   min-height: 16px;
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   border-radius: 50%;
+   cursor: pointer;
+   opacity: 0.8;
+   transition: all 0.2s;
+   margin-left: 8px;
+   position: relative;
+ }
+
+ :root[data-theme="dark"] .close-btn {
+   background-color: rgba(255, 255, 255, 0.1);
+ }
+
+ .close-btn:hover {
+   opacity: 1;
+   background-color: #ff4d4d;
+ }
+
+ .close-btn::before,
+ .close-btn::after {
+   content: "";
+   position: absolute;
+   width: 8px;
+   height: 1px;
+   background-color: var(--text-color);
+   transform-origin: center;
+ }
+
+ .close-btn::before {
+   transform: rotate(45deg);
+ }
+
+ .close-btn::after {
+   transform: rotate(-45deg);
+ }
+
+ .close-btn:hover::before,
+ .close-btn:hover::after {
+   background-color: #fff;
+ }
+
+ .container {
+   display: flex;
+   flex-direction: column;
+   height: 100vh;
+ }
+
+ .content-wrapper {
+   padding: 16px;
+   min-height: 60px;
+   max-height: 449px;
+   overflow-y: auto;
+   overflow-x: hidden;
+   flex: 1;
+ }
+
+ /* 选择列表对话框的内容区域padding和高度 */
+ .dialog-select .content-wrapper {
+   padding: 16px 8px;
+   max-height: 600px;
+ }
+
+ #content {
+   line-height: 1.4;
+   font-size: 13px;
+   user-select: text;
+ }
+
+ .button-bar {
+   display: flex;
+   justify-content: flex-end;
+   gap: 8px;
+   padding: 0 16px 16px;
+   flex-shrink: 0;
+   background: var(--bg-color);
+ }
+
+ button {
+   padding: 4px 12px;
+   border-radius: 4px;
+   border: 1px solid var(--button-bg);
+   background: linear-gradient(180deg,
+       rgba(255, 255, 255, 0.08) 0%,
+       rgba(0, 0, 0, 0.05) 100%),
+     var(--button-bg);
+   color: var(--button-text);
+   cursor: pointer;
+   font-size: 13px;
+   min-width: 70px;
+   transition: all 0.2s ease;
+   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
+ }
+
+ button:hover {
+   background: linear-gradient(180deg,
+       rgba(255, 255, 255, 0.1) 0%,
+       rgba(0, 0, 0, 0.05) 100%),
+     var(--button-hover);
+ }
+
+ button:active {
+   background: linear-gradient(180deg,
+       rgba(0, 0, 0, 0.05) 0%,
+       rgba(255, 255, 255, 0.08) 100%),
+     var(--button-bg);
+   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+ }
+
+ #ok-btn {
+   padding: 0 12px;
+   height: 20px;
+ }
+
+ #cancel-btn {
+   padding: 0 12px;
+   background: linear-gradient(180deg,
+       rgba(255, 255, 255, 0.08) 0%,
+       rgba(0, 0, 0, 0.05) 100%),
+     var(--cancel-bg);
+   border: 1px solid var(--cancel-border);
+   height: 20px;
+ }
+
+ #cancel-btn:hover {
+   background: linear-gradient(180deg,
+       rgba(255, 255, 255, 0.1) 0%,
+       rgba(0, 0, 0, 0.05) 100%),
+     var(--cancel-bg);
+ }
+
+ #input-container {
+   display: flex;
+   flex-direction: column;
+   gap: 8px;
+ }
+
+ .input-group label {
+   display: block;
+   padding: 0 0 4px 2px;
+   color: var(--text-color);
+   font-size: 13px;
+ }
+
+ .input-group input {
+   width: 100%;
+   padding: 6px 8px;
+   border: 1px solid var(--input-border);
+   border-radius: 4px;
+   font-size: 13px;
+   box-sizing: border-box;
+   background: var(--input-bg);
+   color: var(--text-color);
+ }
+
+ .input-group input:focus {
+   border-color: var(--input-focus);
+   outline: none;
+   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+ }
+
+ /* 文本区域样式 */
+ textarea {
+   width: 100%;
+   height: 400px;
+   padding: 6px 8px;
+   border: 1px solid var(--input-border);
+   border-radius: 4px;
+   font-size: 13px;
+   resize: none;
+   box-sizing: border-box;
+   background: var(--input-bg);
+   color: var(--text-color);
+ }
+
+ textarea:focus {
+   border-color: var(--input-focus);
+   outline: none;
+   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+ }
+
+ /* 按钮组样式 */
+ #button-container {
+   display: flex;
+   flex-direction: column;
+   gap: 10px;
+   padding-top: 4px;
+ }
+
+ #button-container button {
+   width: 100%;
+   text-align: center;
+   padding: 6px 12px;
+ }
+
+ /* 根据对话框类型显示/隐藏取消按钮 */
+ .dialog-message #cancel-btn {
+   display: none;
+ }
+
+ .dialog-buttons .button-bar {
+   display: none;
+ }
+
+ /* 隐藏所有对话框内容 */
+ #input,
+ #confirm,
+ #buttons,
+ #textarea,
+ #select {
+   display: none;
+ }
+
+ /* 选择列表样式 */
+ .select-list {
+   display: flex;
+   flex-direction: column;
+   gap: 4px;
+   max-height: 505px;
+   overflow-y: auto;
+ }
+
+ .filter-input {
+   padding: 0 2px 8px 2px;
+ }
+
+ .filter-input input {
+   width: 100%;
+   padding: 6px 8px;
+   border: 1px solid var(--input-border);
+   border-radius: 4px;
+   font-size: 13px;
+   box-sizing: border-box;
+   background: var(--input-bg);
+   color: var(--text-color);
+ }
+
+ .filter-input input:focus {
+   border-color: var(--input-focus);
+   outline: none;
+   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+ }
+
+ .select-list-container {
+   display: flex;
+   flex-direction: column;
+   gap: 4px;
+   max-height: 360px;
+   overflow-y: auto;
+ }
+
+ .select-item {
+   display: flex;
+   align-items: center;
+   padding: 6px 8px;
+   border-radius: 8px;
+   cursor: pointer;
+   position: relative;
+   transform: translateY(0) scale(1);
+   transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+   will-change: transform;
+ }
+
+ .select-item.selected {
+   background-color: rgba(13, 110, 253, 0.1);
+   position: relative;
+   transform: translateY(-1px) scale(0.995);
+   will-change: transform;
+ }
+
+ .select-item-icon {
+   transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+   will-change: transform;
+   padding-right: 8px;
+ }
+
+ .select-item.selected .select-item-icon {
+   transform: scale(1.05);
+   filter: brightness(1.05);
+ }
+
+ :root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
+   background-color: rgba(13, 110, 253, 0.2);
+ }
+
+ :root[data-theme="dark"] .select-item.selected {
+   background-color: rgba(13, 110, 253, 0.2);
+ }
+
+ /* 添加选择时的轻微阴影效果 */
+ .select-item.selected,
+ .select-list:not(.keyboard-nav) .select-item:hover {
+   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
+ }
+
+ :root[data-theme="dark"] .select-item.selected,
+ :root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
+   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+ }
+
+ .select-item-icon {
+   width: 34px;
+   height: 34px;
+   margin-right: 8px;
+   border-radius: 4px;
+   overflow: hidden;
+ }
+
+ .select-item-icon img {
+   width: 100%;
+   height: 100%;
+   object-fit: cover;
+ }
+
+ .select-item-content {
+   flex: 1;
+   min-width: 0;
+ }
+
+ .select-item-title {
+   font-size: 13px;
+   line-height: 1.4;
+   margin: 0;
+   white-space: nowrap;
+   overflow: hidden;
+   text-overflow: ellipsis;
+ }
+
+ .select-item-description {
+   font-size: 12px;
+   color: rgba(0, 0, 0, 0.6);
+   margin: 0;
+   white-space: nowrap;
+   overflow: hidden;
+   text-overflow: ellipsis;
+ }
+
+ :root[data-theme="dark"] .select-item-description {
+   color: rgba(255, 255, 255, 0.6);
+ }
+
+ /* 搜索结果高亮样式 */
+ .highlight {
+   color: #ec3535;
+ }
+
+ /* 隐藏确定和取消按钮 */
+ .dialog-select .button-bar {
+   display: none;
+ }
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
index 396039b9..b0f4904b 100644
--- a/plugin/lib/dialog/view.html
+++ b/plugin/lib/dialog/view.html
@@ -3,454 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <title>对话框</title>
-    <style>
-      :root {
-        --bg-color: #fff;
-        --text-color: #333;
-        --border-color: #ddd;
-        --title-bg: #f5f5f5;
-        --input-bg: #fff;
-        --input-border: #ddd;
-        --input-focus: #0d6efd;
-        --button-bg: #0d6efd;
-        --button-hover: #0b5ed7;
-        --button-text: #fff;
-        --cancel-bg: #6c757d;
-        --cancel-border: #6c757d;
-      }
-
-      :root[data-theme="dark"] {
-        --bg-color: #282727;
-        --text-color: #e0e0e0;
-        --border-color: #404040;
-        --title-bg: #2d2d2d;
-        --input-bg: #2d2d2d;
-        --input-border: #404040;
-        --input-focus: #0d6efd;
-        --button-bg: #0d6efd;
-        --button-hover: #0b5ed7;
-        --button-text: #fff;
-        --cancel-bg: #4a4a4a;
-        --cancel-border: #4a4a4a;
-      }
-
-      body {
-        margin: 0;
-        padding: 0;
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-          "Helvetica Neue", Arial, sans-serif;
-        background: var(--bg-color);
-        color: var(--text-color);
-        user-select: none;
-        height: 100vh;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-      }
-
-      /* 标题栏样式 */
-      .title-bar {
-        background: var(--title-bg);
-        border-bottom: 1px solid var(--border-color);
-        padding: 4px 12px;
-        -webkit-app-region: drag;
-        display: flex;
-        align-items: center;
-        flex-shrink: 0;
-      }
-
-      .title-left {
-        flex: 1;
-        display: flex;
-        align-items: center;
-      }
-
-      .logo {
-        width: 20px;
-        height: 20px;
-        margin-right: 6px;
-      }
-
-      .title-text {
-        font-size: 13px;
-        font-weight: 500;
-        color: var(--text-color);
-        margin: 0;
-      }
-
-      .close-btn {
-        -webkit-app-region: no-drag;
-        background-color: rgba(0, 0, 0, 0.05);
-        width: 16px;
-        height: 16px;
-        min-width: 16px;
-        min-height: 16px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 50%;
-        cursor: pointer;
-        opacity: 0.8;
-        transition: all 0.2s;
-        margin-left: 8px;
-        position: relative;
-      }
-
-      :root[data-theme="dark"] .close-btn {
-        background-color: rgba(255, 255, 255, 0.1);
-      }
-
-      .close-btn:hover {
-        opacity: 1;
-        background-color: #ff4d4d;
-      }
-
-      .close-btn::before,
-      .close-btn::after {
-        content: "";
-        position: absolute;
-        width: 8px;
-        height: 1px;
-        background-color: var(--text-color);
-        transform-origin: center;
-      }
-
-      .close-btn::before {
-        transform: rotate(45deg);
-      }
-
-      .close-btn::after {
-        transform: rotate(-45deg);
-      }
-
-      .close-btn:hover::before,
-      .close-btn:hover::after {
-        background-color: #fff;
-      }
-
-      .container {
-        display: flex;
-        flex-direction: column;
-        height: 100vh;
-      }
-
-      .content-wrapper {
-        padding: 16px;
-        min-height: 60px;
-        max-height: 449px;
-        overflow-y: auto;
-        overflow-x: hidden;
-        flex: 1;
-      }
-
-      /* 选择列表对话框的内容区域padding和高度 */
-      .dialog-select .content-wrapper {
-        padding: 16px 5px;
-        max-height: 600px;
-      }
-
-      #content {
-        line-height: 1.4;
-        font-size: 13px;
-        user-select: text;
-      }
-
-      .button-bar {
-        display: flex;
-        justify-content: flex-end;
-        gap: 8px;
-        padding: 0 16px 16px;
-        flex-shrink: 0;
-        background: var(--bg-color);
-      }
-
-      button {
-        padding: 4px 12px;
-        border-radius: 4px;
-        border: 1px solid var(--button-bg);
-        background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 0.08) 0%,
-            rgba(0, 0, 0, 0.05) 100%
-          ),
-          var(--button-bg);
-        color: var(--button-text);
-        cursor: pointer;
-        font-size: 13px;
-        min-width: 70px;
-        transition: all 0.2s ease;
-        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
-      }
-
-      button:hover {
-        background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 0.1) 0%,
-            rgba(0, 0, 0, 0.05) 100%
-          ),
-          var(--button-hover);
-      }
-
-      button:active {
-        background: linear-gradient(
-            180deg,
-            rgba(0, 0, 0, 0.05) 0%,
-            rgba(255, 255, 255, 0.08) 100%
-          ),
-          var(--button-bg);
-        box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-      }
-
-      #ok-btn {
-        padding: 0 12px;
-        height: 20px;
-      }
-
-      #cancel-btn {
-        padding: 0 12px;
-        background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 0.08) 0%,
-            rgba(0, 0, 0, 0.05) 100%
-          ),
-          var(--cancel-bg);
-        border: 1px solid var(--cancel-border);
-        height: 20px;
-      }
-
-      #cancel-btn:hover {
-        background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 0.1) 0%,
-            rgba(0, 0, 0, 0.05) 100%
-          ),
-          var(--cancel-bg);
-      }
-
-      #input-container {
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-      }
-
-      .input-group label {
-        display: block;
-        padding: 0 0 4px 2px;
-        color: var(--text-color);
-        font-size: 13px;
-      }
-
-      .input-group input {
-        width: 100%;
-        padding: 6px 8px;
-        border: 1px solid var(--input-border);
-        border-radius: 4px;
-        font-size: 13px;
-        box-sizing: border-box;
-        background: var(--input-bg);
-        color: var(--text-color);
-      }
-
-      .input-group input:focus {
-        border-color: var(--input-focus);
-        outline: none;
-        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
-      }
-
-      /* 文本区域样式 */
-      textarea {
-        width: 100%;
-        height: 400px;
-        padding: 6px 8px;
-        border: 1px solid var(--input-border);
-        border-radius: 4px;
-        font-size: 13px;
-        resize: none;
-        box-sizing: border-box;
-        background: var(--input-bg);
-        color: var(--text-color);
-      }
-
-      textarea:focus {
-        border-color: var(--input-focus);
-        outline: none;
-        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
-      }
-
-      /* 按钮组样式 */
-      #button-container {
-        display: flex;
-        flex-direction: column;
-        gap: 10px;
-        padding-top: 4px;
-      }
-
-      #button-container button {
-        width: 100%;
-        text-align: center;
-        padding: 6px 12px;
-      }
-
-      /* 根据对话框类型显示/隐藏取消按钮 */
-      .dialog-message #cancel-btn {
-        display: none;
-      }
-
-      .dialog-buttons .button-bar {
-        display: none;
-      }
-
-      /* 隐藏所有对话框内容 */
-      #input,
-      #confirm,
-      #buttons,
-      #textarea,
-      #select {
-        display: none;
-      }
-
-      /* 选择列表样式 */
-      .select-list {
-        display: flex;
-        flex-direction: column;
-        gap: 4px;
-        max-height: 505px;
-        overflow-y: auto;
-      }
-
-      .filter-input {
-        margin-bottom: 8px;
-        padding: 0 2px;
-      }
-
-      .filter-input input {
-        width: 100%;
-        padding: 6px 8px;
-        border: 1px solid var(--input-border);
-        border-radius: 4px;
-        font-size: 13px;
-        box-sizing: border-box;
-        background: var(--input-bg);
-        color: var(--text-color);
-      }
-
-      .filter-input input:focus {
-        border-color: var(--input-focus);
-        outline: none;
-        box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
-      }
-
-      .select-list-container {
-        display: flex;
-        flex-direction: column;
-        gap: 4px;
-        max-height: 360px;
-        overflow-y: auto;
-      }
-
-      .select-item {
-        display: flex;
-        align-items: center;
-        padding: 6px 8px;
-        border-radius: 8px;
-        cursor: pointer;
-        position: relative;
-        transform: translateY(0) scale(1);
-        transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-        will-change: transform;
-      }
-
-      .select-item.selected {
-        background-color: rgba(13, 110, 253, 0.1);
-        position: relative;
-        transform: translateY(-1px) scale(0.995);
-        will-change: transform;
-      }
-
-      .select-item-icon {
-        transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-        will-change: transform;
-      }
-
-      .select-item.selected .select-item-icon {
-        transform: scale(1.05);
-        filter: brightness(1.05);
-      }
-
-      :root[data-theme="dark"]
-        .select-list:not(.keyboard-nav)
-        .select-item:hover {
-        background-color: rgba(13, 110, 253, 0.2);
-      }
-
-      :root[data-theme="dark"] .select-item.selected {
-        background-color: rgba(13, 110, 253, 0.2);
-      }
-
-      /* 添加选择时的轻微阴影效果 */
-      .select-item.selected,
-      .select-list:not(.keyboard-nav) .select-item:hover {
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
-      }
-
-      :root[data-theme="dark"] .select-item.selected,
-      :root[data-theme="dark"]
-        .select-list:not(.keyboard-nav)
-        .select-item:hover {
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-      }
-
-      .select-item-icon {
-        width: 34px;
-        height: 34px;
-        margin-right: 8px;
-        border-radius: 4px;
-        overflow: hidden;
-      }
-
-      .select-item-icon img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-      }
-
-      .select-item-content {
-        flex: 1;
-        min-width: 0;
-      }
-
-      .select-item-title {
-        font-size: 13px;
-        line-height: 1.4;
-        margin: 0;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .select-item-description {
-        font-size: 12px;
-        color: rgba(0, 0, 0, 0.6);
-        margin: 0;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      :root[data-theme="dark"] .select-item-description {
-        color: rgba(255, 255, 255, 0.6);
-      }
-
-      /* 搜索结果高亮样式 */
-      .highlight {
-        color: #ec3535;
-      }
-
-      /* 隐藏确定和取消按钮 */
-      .dialog-select .button-bar {
-        display: none;
-      }
-    </style>
+    <link rel="stylesheet" href="http://github.com/style.css" />
   </head>
   <body>
     <div class="container">
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 85e707a7..861df43e 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -1,17 +1,20 @@
 <template>
   <div class="row q-col-gutter-sm">
     <!-- 控制区 -->
+    <div class="sub-command-card col-12">
+      <OperationCard
+        :model-value="argvs.subCommand"
+        :options="subCommands"
+        @update:model-value="handleSubCommandChange"
+      />
+    </div>
     <div class="col-12">
       <div class="row items-center q-gutter-sm">
         <!-- 选项类型选择 -->
         <div class="col model-type-select">
           <OperationCard
             :model-value="argvs.optionType"
-            :options="[
-              { label: '纯文本', value: 'plaintext', icon: 'text_fields' },
-              { label: 'HTML', value: 'html', icon: 'code' },
-              { label: 'JSON', value: 'json', icon: 'data_object' },
-            ]"
+            :options="optionTypes"
             square
             height="36px"
             @update:model-value="handleOptionTypeChange"
@@ -54,67 +57,9 @@
             </template>
           </q-select>
         </div>
-
-        <!-- 设置按钮 -->
-        <div class="col-auto">
-          <q-btn
-            flat
-            round
-            dense
-            icon="settings"
-            color="primary"
-            @click="showSettings = !showSettings"
-          >
-            <q-tooltip>高级设置</q-tooltip>
-          </q-btn>
-        </div>
       </div>
     </div>
 
-    <!-- 设置面板 -->
-    <q-slide-transition>
-      <div v-show="showSettings" class="row q-col-gutter-sm">
-        <!-- 搜索框占位符 -->
-        <div class="col">
-          <VariableInput
-            :disabled="!argvs.enableSearch"
-            :model-value="argvs.placeholder"
-            label="搜索框占位符"
-            icon="search"
-            dense
-            @update:model-value="updateArgvs('placeholder', $event)"
-          />
-        </div>
-
-        <!-- 开关选项 -->
-        <div class="col-auto items-center row">
-          <div class="row q-col-gutter-x-md">
-            <q-checkbox
-              :model-value="argvs.enableSearch"
-              label="启用搜索"
-              dense
-              class="toggle-option"
-              @update:model-value="updateArgvs('enableSearch', $event)"
-            />
-            <q-checkbox
-              :model-value="argvs.showCancelButton"
-              label="关闭按钮"
-              dense
-              class="toggle-option"
-              @update:model-value="updateArgvs('showCancelButton', $event)"
-            />
-            <q-checkbox
-              :model-value="argvs.closeOnSelect"
-              label="选择后关闭"
-              dense
-              class="toggle-option"
-              @update:model-value="updateArgvs('closeOnSelect', $event)"
-            />
-          </div>
-        </div>
-      </div>
-    </q-slide-transition>
-
     <!-- 变量输入模式 -->
     <div v-if="argvs.inputMode === 'variable'" class="col-12">
       <VariableInput
@@ -154,14 +99,58 @@
         </ArrayEditor>
       </template>
     </div>
+    <div class="col-12">
+      <BorderLabel label="设置" icon="settings">
+        <div class="row q-col-gutter-sm items-center">
+          <!-- 搜索框占位符 -->
+          <div class="col">
+            <VariableInput
+              :disabled="!argvs.enableSearch"
+              :model-value="argvs.placeholder"
+              :disable="!argvs.enableSearch"
+              label="搜索框占位符"
+              icon="search"
+              dense
+              @update:model-value="updateArgvs('placeholder', $event)"
+            />
+          </div>
+
+          <!-- 开关选项 -->
+          <q-toggle
+            :model-value="argvs.enableSearch"
+            label="启用搜索"
+            dense
+            class="toggle-option"
+            @update:model-value="updateArgvs('enableSearch', $event)"
+          />
+          <q-toggle
+            v-if="hasHtmlOption(argvs.subCommand)"
+            :model-value="argvs.showCancelButton"
+            label="关闭按钮"
+            dense
+            class="toggle-option"
+            @update:model-value="updateArgvs('showCancelButton', $event)"
+          />
+          <q-toggle
+            v-if="hasHtmlOption(argvs.subCommand)"
+            :model-value="argvs.closeOnSelect"
+            label="选择后关闭"
+            dense
+            class="toggle-option"
+            @update:model-value="updateArgvs('closeOnSelect', $event)"
+          />
+        </div>
+      </BorderLabel>
+    </div>
   </div>
 </template>
 
 <script>
 import { defineComponent } from "vue";
-import VariableInput from "../common/VariableInput.vue";
-import ArrayEditor from "../common/ArrayEditor.vue";
-import OperationCard from "../common/OperationCard.vue";
+import VariableInput from "components/composer/common/VariableInput.vue";
+import ArrayEditor from "components/composer/common/ArrayEditor.vue";
+import OperationCard from "components/composer/common/OperationCard.vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
 import { newVarInputVal, isVarInputVal } from "js/composer/varInputValManager";
 
@@ -185,6 +174,7 @@ export default defineComponent({
     VariableInput,
     ArrayEditor,
     OperationCard,
+    BorderLabel,
   },
   props: {
     modelValue: {
@@ -195,21 +185,6 @@ export default defineComponent({
   emits: ["update:modelValue"],
   data() {
     return {
-      showSettings: false,
-      optionTypes: [
-        { label: "纯文本", value: "plaintext" },
-        { label: "HTML", value: "html" },
-        { label: "JSON", value: "json" },
-      ],
-      defaultArgvs: {
-        inputMode: "manual",
-        selects: defaultSelects.json,
-        optionType: "json",
-        placeholder: newVarInputVal("str", "搜索..."),
-        enableSearch: true,
-        showCancelButton: false,
-        closeOnSelect: true,
-      },
       arrayEditorDefaultRowValue: {
         id: newVarInputVal("var"),
         title: newVarInputVal("str"),
@@ -231,6 +206,28 @@ export default defineComponent({
           width: 5,
         },
       },
+      subCommands: [
+        {
+          label: "插件内弹窗",
+          value: "quickcommand.showSelectList",
+          icon: "call_to_action",
+        },
+        {
+          label: "系统弹窗",
+          value: "quickcommand.showSystemSelectList",
+          icon: "report",
+        },
+      ],
+      defaultArgvs: {
+        subCommand: "quickcommand.showSelectList",
+        inputMode: "manual",
+        selects: defaultSelects.json,
+        optionType: "json",
+        placeholder: newVarInputVal("str", "搜索..."),
+        enableSearch: true,
+        showCancelButton: false,
+        closeOnSelect: true,
+      },
     };
   },
   computed: {
@@ -239,6 +236,15 @@ export default defineComponent({
         this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
       );
     },
+    optionTypes() {
+      return [
+        { label: "纯文本", value: "plaintext", icon: "text_fields" },
+        this.hasHtmlOption(this.argvs.subCommand)
+          ? { label: "HTML", value: "html", icon: "html" }
+          : "",
+        { label: "JSON", value: "json", icon: "data_object" },
+      ].filter(Boolean);
+    },
   },
   methods: {
     /**
@@ -262,6 +268,19 @@ export default defineComponent({
       });
       this.updateModelValue(argvs);
     },
+    hasHtmlOption(subCommand) {
+      return subCommand === "quickcommand.showSelectList";
+    },
+    handleSubCommandChange(newSubCommand) {
+      const newArgvs = { ...this.argvs, subCommand: newSubCommand };
+      if (
+        !this.hasHtmlOption(newSubCommand) &&
+        this.argvs.optionType === "html"
+      ) {
+        newArgvs.optionType = "plaintext";
+      }
+      this.updateModelValue(newArgvs);
+    },
     generateCode(argvs = this.argvs) {
       const {
         selects,
@@ -270,6 +289,7 @@ export default defineComponent({
         enableSearch,
         showCancelButton,
         closeOnSelect,
+        subCommand,
       } = argvs;
 
       // 构建选项对象
@@ -277,12 +297,14 @@ export default defineComponent({
         ...(enableSearch && placeholder?.value && { placeholder: placeholder }),
         ...(optionType !== "plaintext" && { optionType }),
         ...(enableSearch !== true && { enableSearch }),
-        ...(showCancelButton && { showCancelButton }),
-        ...(closeOnSelect !== true && { closeOnSelect }),
+        ...(showCancelButton &&
+          hasHtmlOption(subCommand) && { showCancelButton }),
+        ...(closeOnSelect !== true &&
+          hasHtmlOption(subCommand) && { closeOnSelect }),
       };
 
       // 生成代码
-      return `${this.modelValue.value}(${stringifyArgv(selects)}${
+      return `${subCommand}(${stringifyArgv(selects)}${
         Object.keys(options).length ? `, ${stringifyArgv(options)}` : ""
       })`;
     },
@@ -296,16 +318,19 @@ export default defineComponent({
 
         if (!result) return this.defaultArgvs;
 
+        const subCommand = result.name;
+
         const [selects, options = {}] = result.argvs;
         const inputMode = isVarInputVal(selects) ? "variable" : "manual";
         return {
           ...this.defaultArgvs,
           inputMode,
           selects,
+          subCommand,
           ...options,
         };
       } catch (e) {
-        console.warn("选择列表参数解析失败:", code);
+        console.warn("选择列表参数解析失败:" + e, code);
         return this.defaultArgvs;
       }
     },
@@ -373,6 +398,7 @@ export default defineComponent({
 <style scoped>
 .toggle-option {
   font-size: 12px;
+  margin-left: 8px;
 }
 
 .toggle-option :deep(.q-toggle__label) {
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index c32c442f..585020c8 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -60,7 +60,7 @@ interface quickcommandApi {
    *        id: i,
    *        title: `选项${i}`,
    *        description: `选项${i}的描述`,
-   *        icon: `http://www.u.tools/favicon.ico`,
+   *        icon: `https://yuanliao.info/favicon.ico`,
    *        abcd: `选项${i}的自定义属性`,
    *        clickFn:function(e){console.log(e)}
    *     })
@@ -81,9 +81,12 @@ interface quickcommandApi {
    * ```
    *
    * @param selects 每一个列表选项
-   * @param options 列表的选项。placeholder: 搜索框占位符；optionType: 选项的格式，默认为plaintext；
-   * enableSearch：启用搜索，默认 true；showCancelButton：显示关闭按钮，默认 false；closeOnSelect：
-   * 点击后关闭，默认 true
+   * @param options 配置选项
+   * @param options.placeholder 搜索框占位符，默认为空
+   * @param options.optionType 选项的格式，plaintext|html|json，默认为plaintext
+   * @param options.enableSearch 启用搜索，默认 true
+   * @param options.showCancelButton 显示关闭按钮，默认 false
+   * @param options.closeOnSelect 点击后关闭，默认 true
    */
   showSelectList(
     selects: string[] | object[],
@@ -591,14 +594,12 @@ interface quickcommandApi {
    * // json
    * var opt = []
    * for (var i = 0; i < 15; i++) {
-   *     // 每一个选项为 json 格式, 使用clickFn注册选项单击事件时id属性是必需的
    *     opt.push({
    *        id: i,
    *        title: `选项${i}`,
    *        description: `选项${i}的描述`,
-   *        icon: `http://www.u.tools/favicon.ico`,
+   *        icon: `https://yuanliao.info/favicon.ico`,
    *        abcd: `选项${i}的自定义属性`,
-   *        clickFn:function(e){console.log(e)}
    *     })
    * }
    * quickcommand.showSystemSelectList(opt, {optionType: 'json'}).then(choise => {
@@ -607,13 +608,22 @@ interface quickcommandApi {
    * ​
    * ```
    *
-   * @param selects 每一个列表选项
-   * @param options 列表的选项。placeholder: 搜索框占位符；optionType: 选项的格式，默认为plaintext；
+   * @param selects 每一个列表选项，可以为文本或对象
+   * @param selects.title 选项的标题
+   * @param selects.description 选项的描述
+   * @param selects.icon 选项的图标
+   * @param options 配置选项
+   * @param options.placeholder 搜索框占位符，默认为空
+   * @param options.enableSearch 是否启用搜索，默认为 true
+   * @param options.title 对话框标题，默认为请选择
+   * @param options.optionType 选项的格式，plaintext|json，默认为plainText
    */
   showSystemSelectList(
     selects: string[] | object[],
     options?: {
       placeholder: string;
+      enableSearch: boolean;
+      title: string;
       optionType: "plaintext" | "json";
     }
   ): Promise<{ id: number; text: string | object }>;

From 7dc7e0bbd1fb77672c8a52f7207e35bf5a0e0861 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 12:03:50 +0800
Subject: [PATCH 078/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Equickcommand.showSyst?=
 =?UTF-8?q?emWaitButton=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BA=A4=E4=BA=92=E5=88=86=E7=B1=BB=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               | 33 +++++++
 plugin/lib/dialog/service.js                  | 88 ++++++++++++++++++-
 plugin/lib/dialog/style.css                   | 58 +++++++++++-
 plugin/lib/dialog/view.html                   |  3 +
 src/js/composer/commands/uiCommands.js        | 38 ++++++++
 .../monaco/types/quickcommand.api.d.ts        | 21 +++++
 6 files changed, 234 insertions(+), 7 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index d753babb..f5e9fb2a 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -321,6 +321,39 @@ document.addEventListener("DOMContentLoaded", () => {
           filterInput.focus();
         }
         break;
+
+      case "wait-button":
+        document.getElementById("wait-button").style.display = "block";
+        document.body.classList.add("dialog-wait-button");
+
+        // 创建按钮组
+        const waitButtonContainer = document.getElementById("wait-button");
+        const buttonGroup = document.createElement("div");
+        buttonGroup.className = "wait-button-group";
+
+        // 创建主按钮
+        const waitBtn = document.createElement("button");
+        waitBtn.id = "wait-btn";
+        waitBtn.textContent = config.text;
+        waitBtn.onclick = () => {
+          ipcRenderer.sendTo(parentId, "dialog-result", true);
+        };
+
+        buttonGroup.appendChild(waitBtn);
+
+        // 如果需要显示取消按钮
+        if (config.showCancel) {
+          const cancelBtn = document.createElement("button");
+          cancelBtn.id = "wait-cancel-btn";
+          cancelBtn.innerHTML = "&#x2715;"; // 使用 × 符号
+          cancelBtn.onclick = () => {
+            ipcRenderer.sendTo(parentId, "dialog-result", false);
+          };
+          buttonGroup.appendChild(cancelBtn);
+        }
+
+        waitButtonContainer.appendChild(buttonGroup);
+        break;
     }
     ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
   });
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 25025647..06b064e0 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -3,9 +3,10 @@ const { createBrowserWindow } = utools;
 /**
  * 创建对话框窗口
  * @param {object} config - 对话框配置
+ * @param {object} [customOptions] - 自定义窗口选项
  * @returns {Promise} 返回对话框结果
  */
-const createDialog = (config) => {
+const createDialog = (config, customOptions = {}) => {
   return new Promise((resolve) => {
     const dialogPath = "lib/dialog/view.html";
     const preloadPath = "lib/dialog/controller.js";
@@ -24,7 +25,9 @@ const createDialog = (config) => {
       opacity: 0,
       webPreferences: {
         preload: preloadPath,
+        devTools: utools.isDev(),
       },
+      ...customOptions, // 合并自定义选项
     };
 
     // 创建窗口
@@ -53,9 +56,12 @@ const createDialog = (config) => {
         UBrowser.setOpacity(1);
         ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
       };
-      ipcRenderer.on("dialog-ready", dialogReadyHandler);
 
-      // 添加监听器
+      // 监听子窗口返回的计算高度, 等待按钮有自己的计算逻辑
+      config.type !== "wait-button" &&
+        ipcRenderer.on("dialog-ready", dialogReadyHandler);
+
+      // 监听子窗口返回的返回值
       ipcRenderer.on("dialog-result", dialogResultHandler);
 
       // 发送配置到子窗口
@@ -183,6 +189,81 @@ const showSystemSelectList = async (items, options = {}) => {
   });
 };
 
+/**
+ * 显示一个系统级等待按钮
+ * @param {object} options - 配置选项
+ * @param {string} [options.text="等待操作"] - 按钮文本
+ * @param {string} [options.position="bottom-right"] - 按钮位置，可选值：top-left, top-right, bottom-left, bottom-right
+ * @param {boolean} [options.showCancel=false] - 是否显示取消按钮
+ * @returns {Promise<boolean>} 点击确定返回true，点击取消返回false
+ */
+const showSystemWaitButton = async (options = {}) => {
+  const {
+    text = "等待操作",
+    position = "bottom-right",
+    showCancel = true,
+  } = options;
+
+  // 创建临时span计算文本宽度
+  const span = document.createElement("span");
+  span.style.font =
+    '14px -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif';
+  span.style.visibility = "hidden";
+  span.style.position = "absolute";
+  span.textContent = text;
+  document.body.appendChild(span);
+
+  // 计算窗口尺寸
+  const textWidth = span.offsetWidth;
+  document.body.removeChild(span);
+
+  const dialogOptions = {
+    width: Math.max(textWidth + 32 + (showCancel ? 25 : 0), 80), // 文本宽度 + padding + 取消按钮宽度(如果有)
+    height: 36,
+    opacity: 1,
+  };
+
+  // 获取主屏幕尺寸
+  const primaryDisplay = utools.getPrimaryDisplay();
+  const { width, height } = primaryDisplay.workAreaSize;
+
+  // 根据position计算窗口位置
+  const padding = 20;
+  let x, y;
+
+  switch (position) {
+    case "top-left":
+      x = padding;
+      y = padding;
+      break;
+    case "top-right":
+      x = width - dialogOptions.width - padding;
+      y = padding;
+      break;
+    case "bottom-left":
+      x = padding;
+      y = height - dialogOptions.height - padding;
+      break;
+    case "bottom-right":
+    default:
+      x = width - dialogOptions.width - padding;
+      y = height - dialogOptions.height - padding;
+      break;
+  }
+
+  dialogOptions.x = x;
+  dialogOptions.y = y;
+
+  return await createDialog(
+    {
+      type: "wait-button",
+      text,
+      showCancel,
+    },
+    dialogOptions
+  );
+};
+
 module.exports = {
   showSystemMessageBox,
   showSystemInputBox,
@@ -190,4 +271,5 @@ module.exports = {
   showSystemButtonBox,
   showSystemTextArea,
   showSystemSelectList,
+  showSystemWaitButton,
 };
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 7747ca05..406dffa9 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -20,10 +20,6 @@
    --title-bg: #2d2d2d;
    --input-bg: #2d2d2d;
    --input-border: #404040;
-   --input-focus: #0d6efd;
-   --button-bg: #0d6efd;
-   --button-hover: #0b5ed7;
-   --button-text: #fff;
    --cancel-bg: #4a4a4a;
    --cancel-border: #4a4a4a;
  }
@@ -459,3 +455,57 @@
  .dialog-select .button-bar {
    display: none;
  }
+
+ .dialog-wait-button .title-bar,
+ .dialog-wait-button .button-bar {
+   display: none;
+ }
+
+ .dialog-wait-button .content-wrapper {
+   padding: 0;
+ }
+
+ /* 按钮容器和按钮样式 */
+ #wait-button {
+   display: none;
+   position: absolute;
+   inset: 0;
+ }
+
+ .wait-button-group {
+   display: flex;
+   height: 100%;
+   border: none;
+   background: none;
+ }
+
+ #wait-btn,
+ #wait-cancel-btn {
+   height: 100%;
+   border-radius: 0;
+   cursor: pointer;
+   color: white;
+ }
+
+ #wait-btn:hover,
+ #wait-cancel-btn:hover {
+   filter: brightness(1.1);
+ }
+
+ #wait-btn {
+   width: 100%;
+   background: var(--button-bg);
+   font-size: 14px;
+   white-space: nowrap;
+ }
+
+ #wait-cancel-btn {
+   width: 25px;
+   min-width: 25px;
+   font-size: 18px;
+   padding: 0;
+ }
+
+ #wait-cancel-btn:hover {
+   background-color: #ec3535;
+ }
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
index b0f4904b..2f28cd95 100644
--- a/plugin/lib/dialog/view.html
+++ b/plugin/lib/dialog/view.html
@@ -48,6 +48,9 @@ <h1 class="title-text" id="title-text">对话框</h1>
         <div id="textarea">
           <textarea id="text-content"></textarea>
         </div>
+
+        <!-- 等待按钮对话框 -->
+        <div id="wait-button"></div>
       </div>
       <div class="button-bar">
         <button id="cancel-btn">取消</button>
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 2ccc9568..e2d227b5 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -331,6 +331,44 @@ export const uiCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.showSystemWaitButton",
+      label: "等待操作按钮",
+      isAsync: true,
+      config: [
+        {
+          component: "OptionEditor",
+          options: {
+            text: {
+              label: "按钮文本",
+              component: "VariableInput",
+              width: 6,
+            },
+            position: {
+              label: "按钮位置",
+              component: "QSelect",
+              width: 3,
+              options: [
+                { label: "屏幕左上角", value: "top-left" },
+                { label: "屏幕右上角", value: "top-right" },
+                { label: "屏幕左下角", value: "bottom-left" },
+                { label: "屏幕右下角", value: "bottom-right" },
+              ],
+            },
+            showCancel: {
+              label: "显示取消按钮",
+              component: "CheckButton",
+              width: 3,
+            },
+          },
+          defaultValue: {
+            text: newVarInputVal("str", "点击继续"),
+            position: "bottom-right",
+            showCancel: true,
+          },
+        },
+      ],
+    },
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 585020c8..2b57b675 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -628,6 +628,27 @@ interface quickcommandApi {
     }
   ): Promise<{ id: number; text: string | object }>;
 
+  /**
+   * 显示一个系统级等待按钮
+   * @param options 配置选项
+   * @param options.text 按钮文本
+   * @param options.position 按钮位置，可选值：top-left, top-right, bottom-left, bottom-right
+   * @param options.showCancel 是否显示取消按钮，默认 true
+   *
+   * ```js
+   * const result = await quickcommand.showSystemWaitButton({
+   *   text: "等待操作",
+   *   position: "bottom-right",
+   * })
+   * console.log(result) // true 或 false
+   * ```
+   */
+  showSystemWaitButton(options?: {
+    text?: string;
+    position?: "top-left" | "top-right" | "bottom-left" | "bottom-right";
+    showCancel?: boolean;
+  }): Promise<boolean>;
+
   /**
    * 运行代码
    * @param code 代码

From e6bd6df5501a8fba2b24e59aac1d333d5914a4b3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 15:43:39 +0800
Subject: [PATCH 079/332] =?UTF-8?q?selectList=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=AB=98=E4=BA=AE=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/SelectList.vue | 133 ++++++++++++++++---
 1 file changed, 111 insertions(+), 22 deletions(-)

diff --git a/src/components/quickcommandUI/SelectList.vue b/src/components/quickcommandUI/SelectList.vue
index 23d5e97f..b0c610dd 100644
--- a/src/components/quickcommandUI/SelectList.vue
+++ b/src/components/quickcommandUI/SelectList.vue
@@ -16,6 +16,7 @@
           @click="clickOK"
           :class="{
             'item-selected': index === currentIndex,
+            item: true,
           }"
           :style="{
             height: itemHeight + 'px',
@@ -26,7 +27,10 @@
           <!-- 纯文本 -->
           <q-item v-if="is.text">
             <q-item-section>
-              <q-item-label lines="1">{{ item }}</q-item-label>
+              <q-item-label
+                lines="1"
+                v-html="highlightText(item)"
+              ></q-item-label>
             </q-item-section>
           </q-item>
           <!-- json -->
@@ -37,10 +41,15 @@
               </q-avatar>
             </q-item-section>
             <q-item-section>
-              <q-item-label lines="1">{{ item.title }}</q-item-label>
-              <q-item-label lines="1" caption>{{
-                item.description
-              }}</q-item-label>
+              <q-item-label
+                lines="1"
+                v-html="highlightText(item.title)"
+              ></q-item-label>
+              <q-item-label
+                lines="1"
+                caption
+                v-html="highlightText(item.description)"
+              ></q-item-label>
             </q-item-section>
           </q-item>
           <!-- html -->
@@ -67,9 +76,9 @@
     </div>
     <q-btn
       v-if="options.options.showCancelButton"
-      class="absolute-bottom-right q-ma-xs"
+      class="close-btn"
       round
-      color="primary"
+      flat
       icon="close"
       @click="hide"
     />
@@ -103,13 +112,18 @@ export default {
   },
   computed: {
     matchedItems() {
-      let matchedItems = this.searchWords
-        ? this.items.filter((x) =>
-            pinyinMatch.match(x.title ? x.title : x, this.searchWords)
-          )
-        : this.items;
-      this.setUtoolsHeight(this.itemHeight * matchedItems.length);
-      return matchedItems;
+      if (!this.searchWords) return this.items;
+
+      return this.items.filter((x) => {
+        if (this.is.json) {
+          const titleMatch = pinyinMatch.match(x.title, this.searchWords);
+          const descMatch =
+            x.description && pinyinMatch.match(x.description, this.searchWords);
+          return titleMatch || descMatch;
+        } else {
+          return pinyinMatch.match(x, this.searchWords);
+        }
+      });
     },
     matchedItemsSize() {
       return this.matchedItems.length;
@@ -144,7 +158,9 @@ export default {
             id: this.currentIndex,
             text: this.matchedItems[this.currentIndex],
           };
-      this.is.json && selected.clickFn ? selected.clickFn(this.matchedItems[this.currentIndex].id) : this.$emit("clickOK", selected);
+      this.is.json && selected.clickFn
+        ? selected.clickFn(this.matchedItems[this.currentIndex].id)
+        : this.$emit("clickOK", selected);
       this.options.options.closeOnSelect && this.hide();
     },
 
@@ -196,7 +212,8 @@ export default {
     setSubInput() {
       utools.setSubInput(({ text }) => {
         this.searchWords = text;
-        if (this.matchedItems.length < this.currentIndex + 1) this.currentIndex = 0
+        if (this.matchedItems.length < this.currentIndex + 1)
+          this.currentIndex = 0;
       }, this.options.options.placeholder);
     },
 
@@ -216,23 +233,95 @@ export default {
         document.removeEventListener(...this.$root.subInputEvent);
       document.addEventListener("keydown", this.keyHandler, true);
     },
+
+    highlightText(text) {
+      if (!text || !this.searchWords) return text;
+
+      const matchInfo = pinyinMatch.match(text, this.searchWords);
+      if (!matchInfo) return text;
+
+      let result = text;
+      // 从后往前替换，避免位置变化
+      for (let i = matchInfo.length - 2; i >= 0; i -= 2) {
+        const start = matchInfo[i];
+        const end = matchInfo[i + 1] + 1; // 增加1来包含最后一个字符
+        const highlightedText = `<span class="select-list-highlight">${text.slice(
+          start,
+          end
+        )}</span>`;
+        result = result.slice(0, start) + highlightedText + result.slice(end);
+      }
+      return result;
+    },
   },
 };
 </script>
 
 <style scoped>
+.q-card {
+  background: #f4f4f4;
+}
+
 .q-card--dark {
-  background: var(--q-dark-page);
+  background: #303133;
 }
-.q-item,
+
 .shortcut {
   user-select: none;
-  transition: 0s;
+  transition: 0;
 }
+
+.item {
+  transform: scale(1);
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+  border-radius: 8px;
+  height: 50px;
+}
+
 .item-selected {
-  background: #dfe2e6;
+  transform: scale(0.996);
+  background-color: rgba(13, 110, 253, 0.1);
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.q-item .q-avatar {
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.item-selected .q-avatar {
+  transform: scale(1.01);
+  filter: brightness(1.1);
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.q-card--dark .item-selected {
+  background: rgba(255, 255, 255, 0.15);
+}
+
+:deep(.select-list-highlight) {
+  color: var(--q-primary);
+  font-weight: bold;
 }
-.body--dark .item-selected {
-  background: #515151;
+
+.close-btn {
+  position: absolute;
+  bottom: 12px;
+  right: 12px;
+  backdrop-filter: blur(8px);
+  background: rgba(255, 255, 255, 0.2);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.close-btn:hover {
+  background: rgba(255, 255, 255, 0.3);
+  transform: scale(1.05);
+}
+
+.q-card--dark .close-btn {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.q-card--dark .close-btn:hover {
+  background: rgba(0, 0, 0, 0.3);
 }
 </style>

From d64f00a8b442056286bbf060bbbb831e1d064e2d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 16:55:43 +0800
Subject: [PATCH 080/332] =?UTF-8?q?quickcommandUI=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/ButtonBox.vue   |  8 +-
 src/components/quickcommandUI/ConfirmBox.vue  | 28 +++++--
 src/components/quickcommandUI/InputBox.vue    | 28 +++++--
 .../quickcommandUI/QuickCommand.vue           | 12 ++-
 src/components/quickcommandUI/SelectList.vue  | 10 +--
 src/components/quickcommandUI/TextArea.vue    | 77 ++++++++++++++++---
 6 files changed, 124 insertions(+), 39 deletions(-)

diff --git a/src/components/quickcommandUI/ButtonBox.vue b/src/components/quickcommandUI/ButtonBox.vue
index 9f941b66..e40b4fb4 100644
--- a/src/components/quickcommandUI/ButtonBox.vue
+++ b/src/components/quickcommandUI/ButtonBox.vue
@@ -1,9 +1,9 @@
 <template>
-  <q-card class="q-dialog-plugin">
-    <q-card-section>
-      <div class="text-h5" align="center" v-text="options.title"></div>
+  <q-card class="q-dialog-plugin quickcommand-ui">
+    <q-card-section v-if="options.title">
+      <div class="text-h8" align="center" v-text="options.title"></div>
     </q-card-section>
-    <q-card-section class="q-gutter-lg">
+    <q-card-section class="q-gutter-md">
       <div v-for="(label, index) in options.labels" :key="index">
         <q-btn
           class="full-width"
diff --git a/src/components/quickcommandUI/ConfirmBox.vue b/src/components/quickcommandUI/ConfirmBox.vue
index fa6136db..6a5930dd 100644
--- a/src/components/quickcommandUI/ConfirmBox.vue
+++ b/src/components/quickcommandUI/ConfirmBox.vue
@@ -1,11 +1,19 @@
 <template>
-  <q-card class="q-dialog-plugin" :style="{
-    width: options.width ? options.width + 'px' : '450px'
-  }">
-    <q-card-section>
-      <div class="text-h5" align="left" v-text="options.title"></div>
+  <q-card
+    class="quickcommand-ui q-dialog-plugin"
+    :style="{
+      width: options.width ? options.width + 'px' : '450px',
+    }"
+  >
+    <q-card-section class="row items-center q-gutter-sm">
+      <q-img src="http://github.com/logo.png" width="1.5rem" />
+      <div class="text-h8" align="left" v-text="options.title"></div>
     </q-card-section>
-    <q-card-section v-if="options.isHtml" v-html="options.message" class="content" />
+    <q-card-section
+      v-if="options.isHtml"
+      v-html="options.message"
+      class="content"
+    />
     <q-card-section v-else v-text="options.message" class="content" />
     <q-card-section class="flex justify-end q-gutter-sm">
       <q-btn flat label="取消" color="grey" @click="hide" />
@@ -36,4 +44,12 @@ export default {
   overflow: auto;
   max-height: 350px;
 }
+
+.q-card {
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
+}
+
+.q-card--dark {
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
+}
 </style>
diff --git a/src/components/quickcommandUI/InputBox.vue b/src/components/quickcommandUI/InputBox.vue
index 8eae34f5..98872448 100644
--- a/src/components/quickcommandUI/InputBox.vue
+++ b/src/components/quickcommandUI/InputBox.vue
@@ -1,14 +1,15 @@
 <template>
-  <q-card class="q-dialog-plugin">
-    <q-card-section>
+  <q-card class="quickcommand-ui q-dialog-plugin" style="width: 60vw">
+    <q-card-section v-if="options.title">
       <div class="text-h5" align="center" v-text="options.title"></div>
     </q-card-section>
-    <q-card-section class="q-gutter-sm">
+    <q-card-section class="input-container">
       <div v-for="(label, index) in options.labels" :key="index">
+        <div class="q-pa-xs">{{ label }}</div>
         <q-input
           outlined
+          dense
           v-model="results[index]"
-          :label="label"
           :hint="options.hints[index]"
           hide-hint
           :autofocus="index === 0"
@@ -16,9 +17,9 @@
         />
       </div>
     </q-card-section>
-    <q-card-actions align="right">
-      <q-btn color="negative" label="取消" @click="hide" />
-      <q-btn color="blue-9" label="确定" @click="clickOK" />
+    <q-card-actions align="right" class="button-container">
+      <q-btn label="取消" color="grey" flat @click="hide" />
+      <q-btn color="primary" label="确定" flat @click="clickOK" />
     </q-card-actions>
   </q-card>
 </template>
@@ -44,3 +45,16 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.input-container {
+  padding: 15px 15px 0 15px;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.button-container {
+  padding: 5px 15px;
+}
+</style>
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index b89b9313..731c5665 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -188,7 +188,7 @@ export default {
        *
        * 如需对每个选项单独注册点击事件，可以在initItems的元素中添加id和clickFn，如：
        * initItems = [{id:1, title: "1", description: "1", clickFn:function(e){console.log(e)}}, {id:2, title: "2", description: "2", clickFn:function(e){console.log(e)}}]
-       * 
+       *
        * @example
        * initItems = ["<div>1</div>", "<div>2</div>", "<div>3</div>"]
        * options = {placeholder: "输入进行筛选，支持拼音", optionType: "html", enableSearch: true, showCancelButton: false, closeOnSelect: true}
@@ -315,3 +315,13 @@ export default {
   },
 };
 </script>
+
+<style>
+.quickcommand-ui.q-card {
+  background-color: #f4f4f4;
+}
+
+.body--dark .quickcommand-ui.q-card {
+  background-color: var(--q-dark-page);
+}
+</style>
diff --git a/src/components/quickcommandUI/SelectList.vue b/src/components/quickcommandUI/SelectList.vue
index b0c610dd..5fc99182 100644
--- a/src/components/quickcommandUI/SelectList.vue
+++ b/src/components/quickcommandUI/SelectList.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-card @mousewheel="mouseHandler">
+  <q-card class="quickcommand-ui q-dialog-plugin" @mousewheel="mouseHandler">
     <q-virtual-scroll
       ref="scrollBar"
       @scroll="scrollHandler"
@@ -258,14 +258,6 @@ export default {
 </script>
 
 <style scoped>
-.q-card {
-  background: #f4f4f4;
-}
-
-.q-card--dark {
-  background: #303133;
-}
-
 .shortcut {
   user-select: none;
   transition: 0;
diff --git a/src/components/quickcommandUI/TextArea.vue b/src/components/quickcommandUI/TextArea.vue
index 6d43d462..8ecc33c9 100644
--- a/src/components/quickcommandUI/TextArea.vue
+++ b/src/components/quickcommandUI/TextArea.vue
@@ -1,25 +1,22 @@
 <template>
-  <q-card class="q-dialog-plugin">
+  <q-card class="quickcommand-ui q-dialog-plugin">
     <textarea
       v-model="result"
       :placeholder="options.placeholder"
       autofocus
       class="fixed container"
       :style="{
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0,
-        background: '#00000000',
-        fontSize: '16px',
         outline: 'none',
-        border: '3px solid #3577cb',
-        borderRadius: '5px',
       }"
     />
-    <div class="fixed-bottom-right q-pa-md q-gutter-sm">
-      <q-btn round color="blue-grey" icon="arrow_back" @click="hide" />
-      <q-btn round color="primary" icon="done" @click="clickOK" />
+    <div class="fixed-bottom-right q-gutter-xs button-container">
+      <q-btn flat @click="hide" class="action-btn cancel-btn" label="取消" />
+      <q-btn
+        flat
+        @click="clickOK"
+        class="action-btn confirm-btn"
+        label="确定"
+      />
     </div>
   </q-card>
 </template>
@@ -45,3 +42,59 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+textarea {
+  top: 10px;
+  bottom: 10px;
+  left: 10px;
+  right: 10px;
+  background: rgba(0, 0, 0, 0.03);
+  font-size: 16px;
+  padding: 16px;
+  border-radius: 4px;
+  border: none;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+textarea:focus {
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.1);
+  background: rgba(0, 0, 0, 0.05);
+}
+
+.body--dark textarea {
+  background: rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.1);
+  color: #fff;
+}
+
+.body--dark textarea:focus {
+  background: rgba(255, 255, 255, 0.08);
+}
+
+.button-container {
+  padding-bottom: 25px;
+  padding-right: 30px;
+}
+
+.action-btn {
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  padding: 0 5px;
+}
+
+.action-btn:hover {
+  transform: scale(1.05);
+}
+
+.confirm-btn {
+  color: var(--q-primary);
+}
+
+.cancel-btn {
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.body--dark .cancel-btn {
+  color: rgba(255, 255, 255, 0.5);
+}
+</style>

From b71f47ec56bec01c602c3d0b47dbc7e2f4c9da26 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 18:30:49 +0800
Subject: [PATCH 081/332] =?UTF-8?q?systemDialog=E6=A0=B7=E5=BC=8F=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js |    3 +
 plugin/lib/dialog/service.js    |   17 +-
 plugin/lib/dialog/style.css     | 1152 +++++++++++++++++--------------
 3 files changed, 656 insertions(+), 516 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index f5e9fb2a..fb7bd155 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -25,6 +25,9 @@ document.addEventListener("DOMContentLoaded", () => {
       document.getElementById("content").textContent = config.content;
     }
 
+    // 添加平台类名
+    document.body.classList.add(`platform-${config.platform}`);
+
     // 根据类型设置不同的对话框内容
     switch (config.type) {
       case "message":
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 06b064e0..c307afd9 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -1,19 +1,25 @@
 const { ipcRenderer } = require("electron");
+const os = require("os");
 const { createBrowserWindow } = utools;
 /**
  * 创建对话框窗口
  * @param {object} config - 对话框配置
- * @param {object} [customOptions] - 自定义窗口选项
+ * @param {object} [customDialogOptions] - 自定义窗口选项
  * @returns {Promise} 返回对话框结果
  */
-const createDialog = (config, customOptions = {}) => {
+const createDialog = (config, customDialogOptions = {}) => {
   return new Promise((resolve) => {
     const dialogPath = "lib/dialog/view.html";
     const preloadPath = "lib/dialog/controller.js";
 
+    const platform = os.platform();
+
+    const dialogWidth =
+      platform === "win32" && config.type !== "textarea" ? 370 : 470;
+
     const dialogOptions = {
       title: config.title || "对话框",
-      width: 470,
+      width: dialogWidth,
       height: 80,
       resizable: false,
       minimizable: false,
@@ -27,7 +33,7 @@ const createDialog = (config, customOptions = {}) => {
         preload: preloadPath,
         devTools: utools.isDev(),
       },
-      ...customOptions, // 合并自定义选项
+      ...customDialogOptions, // 合并自定义选项
     };
 
     // 创建窗口
@@ -48,7 +54,7 @@ const createDialog = (config, customOptions = {}) => {
         const newBounds = {
           x: Math.round(bounds.x),
           y: Math.max(0, y), // 确保不会超出屏幕顶部
-          width: 470,
+          width: dialogWidth,
           height: Math.round(height),
         };
         // 设置新的位置和大小
@@ -68,6 +74,7 @@ const createDialog = (config, customOptions = {}) => {
       ipcRenderer.sendTo(UBrowser.webContents.id, "dialog-config", {
         ...config,
         isDark: utools.isDarkColors(),
+        platform,
       });
     });
   });
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 406dffa9..ffdf2c05 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -1,511 +1,641 @@
- :root {
-   --bg-color: #fff;
-   --text-color: #333;
-   --border-color: #ddd;
-   --title-bg: #f5f5f5;
-   --input-bg: #fff;
-   --input-border: #ddd;
-   --input-focus: #0d6efd;
-   --button-bg: #0d6efd;
-   --button-hover: #0b5ed7;
-   --button-text: #fff;
-   --cancel-bg: #6c757d;
-   --cancel-border: #6c757d;
- }
-
- :root[data-theme="dark"] {
-   --bg-color: #282727;
-   --text-color: #e0e0e0;
-   --border-color: #404040;
-   --title-bg: #2d2d2d;
-   --input-bg: #2d2d2d;
-   --input-border: #404040;
-   --cancel-bg: #4a4a4a;
-   --cancel-border: #4a4a4a;
- }
-
- body {
-   margin: 0;
-   padding: 0;
-   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-     "Helvetica Neue", Arial, sans-serif;
-   background: var(--bg-color);
-   color: var(--text-color);
-   user-select: none;
-   height: 100vh;
-   display: flex;
-   flex-direction: column;
-   overflow: hidden;
- }
-
- /* 自定义滚动条样式 */
- ::-webkit-scrollbar {
-   width: 4px;
-   height: 4px;
- }
-
- ::-webkit-scrollbar-track {
-   background: transparent;
- }
-
- ::-webkit-scrollbar-thumb {
-   background: rgba(0, 0, 0, 0);
-   transition: background-color 0.3s;
- }
-
- :root[data-theme="dark"] ::-webkit-scrollbar-thumb {
-   background: rgba(255, 255, 255, 0);
- }
-
- /* 悬浮时显示滚动条 */
- *:hover::-webkit-scrollbar-thumb {
-   background: rgba(0, 0, 0, 0.3);
-   transition: background-color 0.3s;
- }
-
- :root[data-theme="dark"] *:hover::-webkit-scrollbar-thumb {
-   background: rgba(255, 255, 255, 0.3);
- }
-
- /* 标题栏样式 */
- .title-bar {
-   background: var(--title-bg);
-   border-bottom: 1px solid var(--border-color);
-   padding: 4px 12px;
-   -webkit-app-region: drag;
-   display: flex;
-   align-items: center;
-   flex-shrink: 0;
- }
-
- .title-left {
-   flex: 1;
-   display: flex;
-   align-items: center;
- }
-
- .logo {
-   width: 20px;
-   height: 20px;
-   margin-right: 6px;
- }
-
- .title-text {
-   font-size: 13px;
-   font-weight: 500;
-   color: var(--text-color);
-   margin: 0;
- }
-
- .close-btn {
-   -webkit-app-region: no-drag;
-   background-color: rgba(0, 0, 0, 0.05);
-   width: 16px;
-   height: 16px;
-   min-width: 16px;
-   min-height: 16px;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   border-radius: 50%;
-   cursor: pointer;
-   opacity: 0.8;
-   transition: all 0.2s;
-   margin-left: 8px;
-   position: relative;
- }
-
- :root[data-theme="dark"] .close-btn {
-   background-color: rgba(255, 255, 255, 0.1);
- }
-
- .close-btn:hover {
-   opacity: 1;
-   background-color: #ff4d4d;
- }
-
- .close-btn::before,
- .close-btn::after {
-   content: "";
-   position: absolute;
-   width: 8px;
-   height: 1px;
-   background-color: var(--text-color);
-   transform-origin: center;
- }
-
- .close-btn::before {
-   transform: rotate(45deg);
- }
-
- .close-btn::after {
-   transform: rotate(-45deg);
- }
-
- .close-btn:hover::before,
- .close-btn:hover::after {
-   background-color: #fff;
- }
-
- .container {
-   display: flex;
-   flex-direction: column;
-   height: 100vh;
- }
-
- .content-wrapper {
-   padding: 16px;
-   min-height: 60px;
-   max-height: 449px;
-   overflow-y: auto;
-   overflow-x: hidden;
-   flex: 1;
- }
-
- /* 选择列表对话框的内容区域padding和高度 */
- .dialog-select .content-wrapper {
-   padding: 16px 8px;
-   max-height: 600px;
- }
-
- #content {
-   line-height: 1.4;
-   font-size: 13px;
-   user-select: text;
- }
-
- .button-bar {
-   display: flex;
-   justify-content: flex-end;
-   gap: 8px;
-   padding: 0 16px 16px;
-   flex-shrink: 0;
-   background: var(--bg-color);
- }
-
- button {
-   padding: 4px 12px;
-   border-radius: 4px;
-   border: 1px solid var(--button-bg);
-   background: linear-gradient(180deg,
-       rgba(255, 255, 255, 0.08) 0%,
-       rgba(0, 0, 0, 0.05) 100%),
-     var(--button-bg);
-   color: var(--button-text);
-   cursor: pointer;
-   font-size: 13px;
-   min-width: 70px;
-   transition: all 0.2s ease;
-   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
- }
-
- button:hover {
-   background: linear-gradient(180deg,
-       rgba(255, 255, 255, 0.1) 0%,
-       rgba(0, 0, 0, 0.05) 100%),
-     var(--button-hover);
- }
-
- button:active {
-   background: linear-gradient(180deg,
-       rgba(0, 0, 0, 0.05) 0%,
-       rgba(255, 255, 255, 0.08) 100%),
-     var(--button-bg);
-   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
- }
-
- #ok-btn {
-   padding: 0 12px;
-   height: 20px;
- }
-
- #cancel-btn {
-   padding: 0 12px;
-   background: linear-gradient(180deg,
-       rgba(255, 255, 255, 0.08) 0%,
-       rgba(0, 0, 0, 0.05) 100%),
-     var(--cancel-bg);
-   border: 1px solid var(--cancel-border);
-   height: 20px;
- }
-
- #cancel-btn:hover {
-   background: linear-gradient(180deg,
-       rgba(255, 255, 255, 0.1) 0%,
-       rgba(0, 0, 0, 0.05) 100%),
-     var(--cancel-bg);
- }
-
- #input-container {
-   display: flex;
-   flex-direction: column;
-   gap: 8px;
- }
-
- .input-group label {
-   display: block;
-   padding: 0 0 4px 2px;
-   color: var(--text-color);
-   font-size: 13px;
- }
-
- .input-group input {
-   width: 100%;
-   padding: 6px 8px;
-   border: 1px solid var(--input-border);
-   border-radius: 4px;
-   font-size: 13px;
-   box-sizing: border-box;
-   background: var(--input-bg);
-   color: var(--text-color);
- }
-
- .input-group input:focus {
-   border-color: var(--input-focus);
-   outline: none;
-   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
- }
-
- /* 文本区域样式 */
- textarea {
-   width: 100%;
-   height: 400px;
-   padding: 6px 8px;
-   border: 1px solid var(--input-border);
-   border-radius: 4px;
-   font-size: 13px;
-   resize: none;
-   box-sizing: border-box;
-   background: var(--input-bg);
-   color: var(--text-color);
- }
-
- textarea:focus {
-   border-color: var(--input-focus);
-   outline: none;
-   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
- }
-
- /* 按钮组样式 */
- #button-container {
-   display: flex;
-   flex-direction: column;
-   gap: 10px;
-   padding-top: 4px;
- }
-
- #button-container button {
-   width: 100%;
-   text-align: center;
-   padding: 6px 12px;
- }
-
- /* 根据对话框类型显示/隐藏取消按钮 */
- .dialog-message #cancel-btn {
-   display: none;
- }
-
- .dialog-buttons .button-bar {
-   display: none;
- }
-
- /* 隐藏所有对话框内容 */
- #input,
- #confirm,
- #buttons,
- #textarea,
- #select {
-   display: none;
- }
-
- /* 选择列表样式 */
- .select-list {
-   display: flex;
-   flex-direction: column;
-   gap: 4px;
-   max-height: 505px;
-   overflow-y: auto;
- }
-
- .filter-input {
-   padding: 0 2px 8px 2px;
- }
-
- .filter-input input {
-   width: 100%;
-   padding: 6px 8px;
-   border: 1px solid var(--input-border);
-   border-radius: 4px;
-   font-size: 13px;
-   box-sizing: border-box;
-   background: var(--input-bg);
-   color: var(--text-color);
- }
-
- .filter-input input:focus {
-   border-color: var(--input-focus);
-   outline: none;
-   box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
- }
-
- .select-list-container {
-   display: flex;
-   flex-direction: column;
-   gap: 4px;
-   max-height: 360px;
-   overflow-y: auto;
- }
-
- .select-item {
-   display: flex;
-   align-items: center;
-   padding: 6px 8px;
-   border-radius: 8px;
-   cursor: pointer;
-   position: relative;
-   transform: translateY(0) scale(1);
-   transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-   will-change: transform;
- }
-
- .select-item.selected {
-   background-color: rgba(13, 110, 253, 0.1);
-   position: relative;
-   transform: translateY(-1px) scale(0.995);
-   will-change: transform;
- }
-
- .select-item-icon {
-   transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
-   will-change: transform;
-   padding-right: 8px;
- }
-
- .select-item.selected .select-item-icon {
-   transform: scale(1.05);
-   filter: brightness(1.05);
- }
-
- :root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
-   background-color: rgba(13, 110, 253, 0.2);
- }
-
- :root[data-theme="dark"] .select-item.selected {
-   background-color: rgba(13, 110, 253, 0.2);
- }
-
- /* 添加选择时的轻微阴影效果 */
- .select-item.selected,
- .select-list:not(.keyboard-nav) .select-item:hover {
-   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02);
- }
-
- :root[data-theme="dark"] .select-item.selected,
- :root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
-   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
- }
-
- .select-item-icon {
-   width: 34px;
-   height: 34px;
-   margin-right: 8px;
-   border-radius: 4px;
-   overflow: hidden;
- }
-
- .select-item-icon img {
-   width: 100%;
-   height: 100%;
-   object-fit: cover;
- }
-
- .select-item-content {
-   flex: 1;
-   min-width: 0;
- }
-
- .select-item-title {
-   font-size: 13px;
-   line-height: 1.4;
-   margin: 0;
-   white-space: nowrap;
-   overflow: hidden;
-   text-overflow: ellipsis;
- }
-
- .select-item-description {
-   font-size: 12px;
-   color: rgba(0, 0, 0, 0.6);
-   margin: 0;
-   white-space: nowrap;
-   overflow: hidden;
-   text-overflow: ellipsis;
- }
-
- :root[data-theme="dark"] .select-item-description {
-   color: rgba(255, 255, 255, 0.6);
- }
-
- /* 搜索结果高亮样式 */
- .highlight {
-   color: #ec3535;
- }
-
- /* 隐藏确定和取消按钮 */
- .dialog-select .button-bar {
-   display: none;
- }
-
- .dialog-wait-button .title-bar,
- .dialog-wait-button .button-bar {
-   display: none;
- }
-
- .dialog-wait-button .content-wrapper {
-   padding: 0;
- }
-
- /* 按钮容器和按钮样式 */
- #wait-button {
-   display: none;
-   position: absolute;
-   inset: 0;
- }
-
- .wait-button-group {
-   display: flex;
-   height: 100%;
-   border: none;
-   background: none;
- }
-
- #wait-btn,
- #wait-cancel-btn {
-   height: 100%;
-   border-radius: 0;
-   cursor: pointer;
-   color: white;
- }
-
- #wait-btn:hover,
- #wait-cancel-btn:hover {
-   filter: brightness(1.1);
- }
-
- #wait-btn {
-   width: 100%;
-   background: var(--button-bg);
-   font-size: 14px;
-   white-space: nowrap;
- }
-
- #wait-cancel-btn {
-   width: 25px;
-   min-width: 25px;
-   font-size: 18px;
-   padding: 0;
- }
-
- #wait-cancel-btn:hover {
-   background-color: #ec3535;
- }
+:root {
+  --bg-color: #fff;
+  --text-color: #333;
+  --border-color: #ddd;
+  --title-bg: #f5f5f5;
+  --input-bg: #fff;
+  --input-border: #ddd;
+  --input-focus: #0d6efd;
+  --button-bg: #0d6efd;
+  --button-hover: #0b5ed7;
+  --button-text: #fff;
+  --cancel-bg: #6c757d;
+  --cancel-border: #6c757d;
+  --mac-close-btn: #ff5f57;
+  --win-title-bg: #F9F1EF;
+  --win-button-bar-bg: #F0F0F0;
+  --win-button-bg: #fdfdfd;
+  --win-button-hover-border: #3C96DB;
+  --win-button-hover-bg: #E0EEF9;
+  --win-close-hover: #e81123;
+  --mac-close-x: rgba(0, 0, 0, 0.5);
+  --win-border: rgba(0, 0, 0, 0.1);
+  --win-text: #000;
+  --win-text-dark: #fdfdfd;
+  --select-item-hover: rgba(13, 110, 253, 0.1);
+  --select-item-hover-dark: rgba(13, 110, 253, 0.2);
+  --select-item-shadow: rgba(0, 0, 0, 0.02);
+  --select-item-shadow-dark: rgba(0, 0, 0, 0.1);
+  --select-description: rgba(0, 0, 0, 0.6);
+  --select-description-dark: rgba(255, 255, 255, 0.6);
+  --highlight-color: #ec3535;
+  --wait-btn-hover: #ec3535;
+  --scrollbar-thumb: rgba(0, 0, 0, 0.3);
+  --scrollbar-thumb-dark: rgba(255, 255, 255, 0.3);
+}
+
+:root[data-theme="dark"] {
+  --bg-color: #282727;
+  --text-color: #e0e0e0;
+  --border-color: #404040;
+  --title-bg: #2d2d2d;
+  --input-bg: #2d2d2d;
+  --input-border: #404040;
+  --cancel-bg: #4a4a4a;
+  --cancel-border: #4a4a4a;
+  --win-title-bg: #17040B;
+  --win-button-bar-bg: #1C1C1C;
+  --win-button-bg: #353B3A;
+  --content-bg: #191919;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+    "Helvetica Neue", Arial, sans-serif;
+  background: var(--bg-color);
+  color: var(--text-color);
+  user-select: none;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+/* 自定义滚动条样式 */
+::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+}
+
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+  background: rgba(0, 0, 0, 0);
+  transition: background-color 0.3s;
+}
+
+:root[data-theme="dark"] ::-webkit-scrollbar-thumb {
+  background: rgba(255, 255, 255, 0);
+}
+
+/* 悬浮时显示滚动条 */
+*:hover::-webkit-scrollbar-thumb {
+  background: var(--scrollbar-thumb);
+  transition: background-color 0.3s;
+}
+
+:root[data-theme="dark"] *:hover::-webkit-scrollbar-thumb {
+  background: var(--scrollbar-thumb-dark);
+}
+
+/* 标题栏样式 */
+.title-bar {
+  background: var(--title-bg);
+  padding: 2px 12px;
+  -webkit-app-region: drag;
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+  height: 20px;
+}
+
+.title-text {
+  font-size: 12px;
+  font-weight: normal;
+}
+
+.title-left {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+.logo {
+  width: 20px;
+  height: 20px;
+  margin-right: 6px;
+}
+
+.platform-darwin .title-left,
+.platform-linux .title-left {
+  padding-left: 20px;
+}
+
+/* macOS 和 Linux 样式 */
+.platform-darwin .title-bar,
+.platform-linux .title-bar {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.platform-darwin .close-btn,
+.platform-linux .close-btn {
+  position: absolute;
+  left: 8px;
+  top: 7px;
+  background-color: var(--mac-close-btn);
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  opacity: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  -webkit-app-region: no-drag;
+}
+
+.platform-darwin .close-btn::before,
+.platform-darwin .close-btn::after,
+.platform-linux .close-btn::before,
+.platform-linux .close-btn::after {
+  content: "";
+  position: absolute;
+  width: 8px;
+  height: 1px;
+  background-color: var(--mac-close-x);
+  transform-origin: center;
+  opacity: 0;
+  transition: opacity 0.2s;
+}
+
+.platform-darwin .close-btn::before,
+.platform-linux .close-btn::before {
+  transform: rotate(45deg);
+}
+
+.platform-darwin .close-btn::after,
+.platform-linux .close-btn::after {
+  transform: rotate(-45deg);
+}
+
+.platform-darwin .close-btn:hover,
+.platform-linux .close-btn:hover {
+  background-color: var(--mac-close-btn);
+}
+
+.platform-darwin .close-btn:hover::before,
+.platform-darwin .close-btn:hover::after,
+.platform-linux .close-btn:hover::before,
+.platform-linux .close-btn:hover::after {
+  opacity: 1;
+}
+
+/* Windows 样式 */
+.platform-win32 .title-bar {
+  padding: 4px 0 4px 12px;
+  background: var(--win-title-bg);
+}
+
+:root[data-theme="dark"] .platform-win32 .title-bar {
+  background: #17040B;
+}
+
+.platform-win32 .close-btn {
+  -webkit-app-region: no-drag;
+  width: 46px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0;
+  position: relative;
+  opacity: 1;
+  background: transparent;
+}
+
+.platform-win32 .close-btn::before,
+.platform-win32 .close-btn::after {
+  content: '';
+  position: absolute;
+  width: 12px;
+  height: 1px;
+  background-color: var(--win-text);
+}
+
+:root[data-theme="dark"] .platform-win32 .close-btn::before,
+:root[data-theme="dark"] .platform-win32 .close-btn::after {
+  background-color: var(--win-text-dark);
+}
+
+.platform-win32 .close-btn::before {
+  transform: rotate(45deg);
+}
+
+.platform-win32 .close-btn::after {
+  transform: rotate(-45deg);
+}
+
+.platform-win32 .close-btn:hover {
+  background-color: var(--win-close-hover);
+}
+
+.platform-win32 .close-btn:hover::before,
+.platform-win32 .close-btn:hover::after {
+  background-color: #fff;
+}
+
+/* 按钮栏样式 */
+.platform-win32 .button-bar {
+  padding: 6px 16px 12px 16px;
+  background: var(--win-button-bar-bg);
+  border-top: 1px solid #e0e0e0;
+}
+
+:root[data-theme="dark"] .platform-win32 .button-bar {
+  background: #1C1C1C;
+  border-top: 1px solid #1C1C1C;
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+}
+
+.content-wrapper {
+  padding: 16px;
+  min-height: 60px;
+  max-height: 449px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  flex: 1;
+}
+
+:root[data-theme="dark"] .content-wrapper {
+  background: var(--content-bg);
+}
+
+/* 选择列表对话框的内容区域padding和高度 */
+.dialog-select .content-wrapper {
+  padding: 16px 8px;
+  max-height: 600px;
+}
+
+#content {
+  line-height: 1.4;
+  font-size: 13px;
+  user-select: text;
+}
+
+.button-bar {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  padding: 0 16px 16px;
+  background: var(--content-bg);
+  flex-shrink: 0;
+}
+
+button {
+  padding: 4px 12px;
+  border-radius: 4px;
+  border: 1px solid var(--button-bg);
+  background: linear-gradient(180deg,
+      rgba(255, 255, 255, 0.08) 0%,
+      rgba(0, 0, 0, 0.05) 100%),
+    var(--button-bg);
+  color: var(--button-text);
+  cursor: pointer;
+  font-size: 13px;
+  min-width: 70px;
+  transition: all 0.2s ease;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
+}
+
+button:hover {
+  background: linear-gradient(180deg,
+      rgba(255, 255, 255, 0.1) 0%,
+      rgba(0, 0, 0, 0.05) 100%),
+    var(--button-hover);
+}
+
+button:active {
+  background: linear-gradient(180deg,
+      rgba(0, 0, 0, 0.05) 0%,
+      rgba(255, 255, 255, 0.08) 100%),
+    var(--button-bg);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.platform-win32 #ok-btn,
+.platform-win32 #cancel-btn {
+  background: var(--win-button-bg);
+  color: var(--win-text);
+  border: 1px solid var(--win-border);
+  padding: 2px 12px;
+  height: 24px;
+  border-radius: 2px;
+  box-shadow: none;
+}
+
+:root[data-theme="dark"] .platform-win32 #ok-btn,
+:root[data-theme="dark"] .platform-win32 #cancel-btn {
+  background: #353B3A;
+  color: var(--win-text-dark);
+}
+
+.platform-win32 #ok-btn:hover,
+.platform-win32 #cancel-btn:hover {
+  border: 1px solid var(--win-button-hover-border);
+  background-color: var(--win-button-hover-bg);
+}
+
+#ok-btn {
+  padding: 0 12px;
+  height: 20px;
+}
+
+#cancel-btn {
+  padding: 0 12px;
+  background: linear-gradient(180deg,
+      rgba(255, 255, 255, 0.08) 0%,
+      rgba(0, 0, 0, 0.05) 100%),
+    var(--cancel-bg);
+  border: 1px solid var(--cancel-border);
+  height: 20px;
+}
+
+#cancel-btn:hover {
+  background: linear-gradient(180deg,
+      rgba(255, 255, 255, 0.2) 0%,
+      rgba(0, 0, 0, 0.1) 100%),
+    var(--cancel-bg);
+}
+
+#input-container {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.input-group label {
+  display: block;
+  padding: 0 0 4px 2px;
+  color: var(--text-color);
+  font-size: 13px;
+}
+
+.input-group input {
+  width: 100%;
+  padding: 6px 8px;
+  border: 1px solid var(--input-border);
+  border-radius: 4px;
+  font-size: 13px;
+  box-sizing: border-box;
+  background: var(--input-bg);
+  color: var(--text-color);
+}
+
+.input-group input:focus {
+  border-color: var(--input-focus);
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+}
+
+/* 文本区域样式 */
+textarea {
+  width: 100%;
+  height: 400px;
+  padding: 6px 8px;
+  border: 1px solid var(--input-border);
+  border-radius: 4px;
+  font-size: 13px;
+  resize: none;
+  box-sizing: border-box;
+  background: var(--input-bg);
+  color: var(--text-color);
+}
+
+textarea:focus {
+  border-color: var(--input-focus);
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+}
+
+/* 按钮组样式 */
+#button-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding-top: 4px;
+}
+
+#button-container button {
+  width: 100%;
+  text-align: center;
+  padding: 6px 12px;
+}
+
+/* 根据对话框类型显示/隐藏取消按钮 */
+.dialog-message #cancel-btn {
+  display: none;
+}
+
+.dialog-buttons .button-bar {
+  display: none;
+}
+
+/* 隐藏所有对话框内容 */
+#input,
+#confirm,
+#buttons,
+#textarea,
+#select {
+  display: none;
+}
+
+/* 选择列表样式 */
+.select-list {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  max-height: 505px;
+  overflow-y: auto;
+}
+
+.filter-input {
+  padding: 0 2px 8px 2px;
+}
+
+.filter-input input {
+  width: 100%;
+  padding: 6px 8px;
+  border: 1px solid var(--input-border);
+  border-radius: 4px;
+  font-size: 13px;
+  box-sizing: border-box;
+  background: var(--input-bg);
+  color: var(--text-color);
+}
+
+.filter-input input:focus {
+  border-color: var(--input-focus);
+  outline: none;
+  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+}
+
+.select-list-container {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  max-height: 360px;
+  overflow-y: auto;
+}
+
+.select-item {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  border-radius: 8px;
+  cursor: pointer;
+  position: relative;
+  transform: translateY(0) scale(1);
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+  will-change: transform;
+}
+
+.select-item.selected {
+  background-color: var(--select-item-hover);
+  position: relative;
+  transform: translateY(-1px) scale(0.995);
+  will-change: transform;
+}
+
+.select-item-icon {
+  transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+  will-change: transform;
+  padding-right: 8px;
+}
+
+.select-item.selected .select-item-icon {
+  transform: scale(1.05);
+  filter: brightness(1.05);
+}
+
+:root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
+  background-color: var(--select-item-hover-dark);
+}
+
+:root[data-theme="dark"] .select-item.selected {
+  background-color: var(--select-item-hover-dark);
+}
+
+/* 添加选择时的轻微阴影效果 */
+.select-item.selected,
+.select-list:not(.keyboard-nav) .select-item:hover {
+  box-shadow: 0 1px 2px var(--select-item-shadow);
+}
+
+:root[data-theme="dark"] .select-item.selected,
+:root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
+  box-shadow: 0 1px 2px var(--select-item-shadow-dark);
+}
+
+.select-item-icon {
+  width: 34px;
+  height: 34px;
+  margin-right: 8px;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.select-item-icon img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.select-item-content {
+  flex: 1;
+  min-width: 0;
+}
+
+.select-item-title {
+  font-size: 13px;
+  line-height: 1.4;
+  margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.select-item-description {
+  font-size: 12px;
+  color: var(--select-description);
+  margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+:root[data-theme="dark"] .select-item-description {
+  color: var(--select-description-dark);
+}
+
+/* 搜索结果高亮样式 */
+.highlight {
+  color: var(--highlight-color);
+}
+
+/* 隐藏确定和取消按钮 */
+.dialog-select .button-bar {
+  display: none;
+}
+
+.dialog-wait-button .title-bar,
+.dialog-wait-button .button-bar {
+  display: none;
+}
+
+.dialog-wait-button .content-wrapper {
+  padding: 0;
+}
+
+/* 按钮容器和按钮样式 */
+#wait-button {
+  display: none;
+  position: absolute;
+  inset: 0;
+}
+
+.wait-button-group {
+  display: flex;
+  height: 100%;
+  border: none;
+  background: none;
+}
+
+#wait-btn,
+#wait-cancel-btn {
+  height: 100%;
+  border-radius: 0;
+  cursor: pointer;
+  color: white;
+}
+
+#wait-btn:hover,
+#wait-cancel-btn:hover {
+  filter: brightness(1.1);
+}
+
+#wait-btn {
+  width: 100%;
+  background: var(--button-bg);
+  font-size: 14px;
+  white-space: nowrap;
+}
+
+#wait-cancel-btn {
+  width: 25px;
+  min-width: 25px;
+  font-size: 18px;
+  padding: 0;
+}
+
+#wait-cancel-btn:hover {
+  background-color: var(--wait-btn-hover);
+}

From 79d841e0b429d2c448a57633549183aaeada932c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 20:17:54 +0800
Subject: [PATCH 082/332] =?UTF-8?q?systemDialog=E6=A0=B7=E5=BC=8F=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/service.js |   6 +-
 plugin/lib/dialog/style.css  | 148 +++++++++++------------------------
 2 files changed, 51 insertions(+), 103 deletions(-)

diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index c307afd9..7f29567c 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -15,7 +15,11 @@ const createDialog = (config, customDialogOptions = {}) => {
     const platform = os.platform();
 
     const dialogWidth =
-      platform === "win32" && config.type !== "textarea" ? 370 : 470;
+      config.type === "textarea" || config.type === "select"
+        ? 500
+        : platform === "win32"
+        ? 370
+        : 420;
 
     const dialogOptions = {
       title: config.title || "对话框",
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index ffdf2c05..30d7bc99 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -2,18 +2,18 @@
   --bg-color: #fff;
   --text-color: #333;
   --border-color: #ddd;
-  --title-bg: #f5f5f5;
+  --mac-title-bg: #f5f5f5;
   --input-bg: #fff;
   --input-border: #ddd;
   --input-focus: #0d6efd;
-  --button-bg: #0d6efd;
-  --button-hover: #0b5ed7;
+  --button-bg: #2767cf;
   --button-text: #fff;
-  --cancel-bg: #6c757d;
-  --cancel-border: #6c757d;
+  --cancel-bg: #67696B;
+  --cancel-border: #67696B;
   --mac-close-btn: #ff5f57;
   --win-title-bg: #F9F1EF;
   --win-button-bar-bg: #F0F0F0;
+  --win-button-bar-border: #E0E0E0;
   --win-button-bg: #fdfdfd;
   --win-button-hover-border: #3C96DB;
   --win-button-hover-bg: #E0EEF9;
@@ -21,32 +21,34 @@
   --mac-close-x: rgba(0, 0, 0, 0.5);
   --win-border: rgba(0, 0, 0, 0.1);
   --win-text: #000;
-  --win-text-dark: #fdfdfd;
   --select-item-hover: rgba(13, 110, 253, 0.1);
-  --select-item-hover-dark: rgba(13, 110, 253, 0.2);
   --select-item-shadow: rgba(0, 0, 0, 0.02);
   --select-item-shadow-dark: rgba(0, 0, 0, 0.1);
   --select-description: rgba(0, 0, 0, 0.6);
-  --select-description-dark: rgba(255, 255, 255, 0.6);
   --highlight-color: #ec3535;
   --wait-btn-hover: #ec3535;
   --scrollbar-thumb: rgba(0, 0, 0, 0.3);
-  --scrollbar-thumb-dark: rgba(255, 255, 255, 0.3);
+  --input-box-shadow: rgba(13, 110, 253, 0.25)
 }
 
 :root[data-theme="dark"] {
   --bg-color: #282727;
   --text-color: #e0e0e0;
   --border-color: #404040;
-  --title-bg: #2d2d2d;
+  --mac-title-bg: #404143;
   --input-bg: #2d2d2d;
   --input-border: #404040;
-  --cancel-bg: #4a4a4a;
-  --cancel-border: #4a4a4a;
   --win-title-bg: #17040B;
   --win-button-bar-bg: #1C1C1C;
+  --win-button-bar-border: #1C1C1C;
   --win-button-bg: #353B3A;
-  --content-bg: #191919;
+  --win-button-hover-bg: #495150;
+  --win-text: #fdfdfd;
+  --content-bg: #36383A;
+  --win-content-bg: #191919;
+  --scrollbar-thumb: rgba(255, 255, 255, 0.3);
+  --select-item-hover: rgba(13, 110, 253, 0.2);
+  --select-description: rgba(255, 255, 255, 0.6);
 }
 
 body {
@@ -74,27 +76,19 @@ body {
 }
 
 ::-webkit-scrollbar-thumb {
-  background: rgba(0, 0, 0, 0);
+  background: var(--scrollbar-thumb);
   transition: background-color 0.3s;
 }
 
-:root[data-theme="dark"] ::-webkit-scrollbar-thumb {
-  background: rgba(255, 255, 255, 0);
-}
-
 /* 悬浮时显示滚动条 */
 *:hover::-webkit-scrollbar-thumb {
   background: var(--scrollbar-thumb);
   transition: background-color 0.3s;
 }
 
-:root[data-theme="dark"] *:hover::-webkit-scrollbar-thumb {
-  background: var(--scrollbar-thumb-dark);
-}
-
 /* 标题栏样式 */
 .title-bar {
-  background: var(--title-bg);
+  background: var(--mac-title-bg);
   padding: 2px 12px;
   -webkit-app-region: drag;
   display: flex;
@@ -122,7 +116,9 @@ body {
 
 .platform-darwin .title-left,
 .platform-linux .title-left {
-  padding-left: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center
 }
 
 /* macOS 和 Linux 样式 */
@@ -190,14 +186,10 @@ body {
   background: var(--win-title-bg);
 }
 
-:root[data-theme="dark"] .platform-win32 .title-bar {
-  background: #17040B;
-}
-
 .platform-win32 .close-btn {
   -webkit-app-region: no-drag;
-  width: 46px;
-  height: 32px;
+  width: 35px;
+  height: 27px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -216,11 +208,6 @@ body {
   background-color: var(--win-text);
 }
 
-:root[data-theme="dark"] .platform-win32 .close-btn::before,
-:root[data-theme="dark"] .platform-win32 .close-btn::after {
-  background-color: var(--win-text-dark);
-}
-
 .platform-win32 .close-btn::before {
   transform: rotate(45deg);
 }
@@ -240,14 +227,10 @@ body {
 
 /* 按钮栏样式 */
 .platform-win32 .button-bar {
-  padding: 6px 16px 12px 16px;
+  padding: 6px 16px;
   background: var(--win-button-bar-bg);
-  border-top: 1px solid #e0e0e0;
-}
-
-:root[data-theme="dark"] .platform-win32 .button-bar {
-  background: #1C1C1C;
-  border-top: 1px solid #1C1C1C;
+  border-top: 1px solid var(--win-button-bar-border);
+  height: 24px;
 }
 
 .container {
@@ -257,7 +240,7 @@ body {
 }
 
 .content-wrapper {
-  padding: 16px;
+  padding: 16px 16px 0 16px;
   min-height: 60px;
   max-height: 449px;
   overflow-y: auto;
@@ -265,10 +248,19 @@ body {
   flex: 1;
 }
 
-:root[data-theme="dark"] .content-wrapper {
+.platform-win32 .content-wrapper,
+.dialog-buttons .content-wrapper {
+  padding-bottom: 16px;
+}
+
+.content-wrapper {
   background: var(--content-bg);
 }
 
+.platform-win32 .content-wrapper {
+  background: var(--win-content-bg);
+}
+
 /* 选择列表对话框的内容区域padding和高度 */
 .dialog-select .content-wrapper {
   padding: 16px 8px;
@@ -285,7 +277,7 @@ body {
   display: flex;
   justify-content: flex-end;
   gap: 8px;
-  padding: 0 16px 16px;
+  padding: 16px;
   background: var(--content-bg);
   flex-shrink: 0;
 }
@@ -294,31 +286,16 @@ button {
   padding: 4px 12px;
   border-radius: 4px;
   border: 1px solid var(--button-bg);
-  background: linear-gradient(180deg,
-      rgba(255, 255, 255, 0.08) 0%,
-      rgba(0, 0, 0, 0.05) 100%),
-    var(--button-bg);
+  background: var(--button-bg);
   color: var(--button-text);
   cursor: pointer;
   font-size: 13px;
   min-width: 70px;
   transition: all 0.2s ease;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
 }
 
 button:hover {
-  background: linear-gradient(180deg,
-      rgba(255, 255, 255, 0.1) 0%,
-      rgba(0, 0, 0, 0.05) 100%),
-    var(--button-hover);
-}
-
-button:active {
-  background: linear-gradient(180deg,
-      rgba(0, 0, 0, 0.05) 0%,
-      rgba(255, 255, 255, 0.08) 100%),
-    var(--button-bg);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  filter: brightness(1.2);
 }
 
 .platform-win32 #ok-btn,
@@ -332,38 +309,22 @@ button:active {
   box-shadow: none;
 }
 
-:root[data-theme="dark"] .platform-win32 #ok-btn,
-:root[data-theme="dark"] .platform-win32 #cancel-btn {
-  background: #353B3A;
-  color: var(--win-text-dark);
-}
-
 .platform-win32 #ok-btn:hover,
 .platform-win32 #cancel-btn:hover {
   border: 1px solid var(--win-button-hover-border);
   background-color: var(--win-button-hover-bg);
 }
 
-#ok-btn {
+#ok-btn,
+#cancel-btn {
   padding: 0 12px;
   height: 20px;
+  width: 78px;
 }
 
 #cancel-btn {
-  padding: 0 12px;
-  background: linear-gradient(180deg,
-      rgba(255, 255, 255, 0.08) 0%,
-      rgba(0, 0, 0, 0.05) 100%),
-    var(--cancel-bg);
+  background: var(--cancel-bg);
   border: 1px solid var(--cancel-border);
-  height: 20px;
-}
-
-#cancel-btn:hover {
-  background: linear-gradient(180deg,
-      rgba(255, 255, 255, 0.2) 0%,
-      rgba(0, 0, 0, 0.1) 100%),
-    var(--cancel-bg);
 }
 
 #input-container {
@@ -393,7 +354,7 @@ button:active {
 .input-group input:focus {
   border-color: var(--input-focus);
   outline: none;
-  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+  box-shadow: 0 0 0 2px var(--input-box-shadow);
 }
 
 /* 文本区域样式 */
@@ -413,7 +374,7 @@ textarea {
 textarea:focus {
   border-color: var(--input-focus);
   outline: none;
-  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+  box-shadow: 0 0 0 2px var(--input-box-shadow);
 }
 
 /* 按钮组样式 */
@@ -475,7 +436,7 @@ textarea:focus {
 .filter-input input:focus {
   border-color: var(--input-focus);
   outline: none;
-  box-shadow: 0 0 0 2px rgba(13, 110, 253, 0.25);
+  box-shadow: 0 0 0 2px var(--input-box-shadow);
 }
 
 .select-list-container {
@@ -516,25 +477,12 @@ textarea:focus {
   filter: brightness(1.05);
 }
 
-:root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
-  background-color: var(--select-item-hover-dark);
-}
-
-:root[data-theme="dark"] .select-item.selected {
-  background-color: var(--select-item-hover-dark);
-}
-
 /* 添加选择时的轻微阴影效果 */
 .select-item.selected,
 .select-list:not(.keyboard-nav) .select-item:hover {
   box-shadow: 0 1px 2px var(--select-item-shadow);
 }
 
-:root[data-theme="dark"] .select-item.selected,
-:root[data-theme="dark"] .select-list:not(.keyboard-nav) .select-item:hover {
-  box-shadow: 0 1px 2px var(--select-item-shadow-dark);
-}
-
 .select-item-icon {
   width: 34px;
   height: 34px;
@@ -572,10 +520,6 @@ textarea:focus {
   text-overflow: ellipsis;
 }
 
-:root[data-theme="dark"] .select-item-description {
-  color: var(--select-description-dark);
-}
-
 /* 搜索结果高亮样式 */
 .highlight {
   color: var(--highlight-color);

From db281ce38c0eb59aaecffb11c4dd732221043d1c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 22:09:50 +0800
Subject: [PATCH 083/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F=E5=BC=82=E5=B8=B8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/control/ControlCommand.vue          |  6 +++---
 src/js/composer/commands/controlCommands.js      | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
index e5f68208..981ed294 100644
--- a/src/components/composer/control/ControlCommand.vue
+++ b/src/components/composer/control/ControlCommand.vue
@@ -73,7 +73,7 @@ export default defineComponent({
     values() {
       if (!this.currentFunction?.config) return [];
       return this.currentFunction.config.map(
-        (input) => this.argvs[input.key] || ""
+        (input) => this.argvs[input.name] || ""
       );
     },
     showBranchButton() {
@@ -94,7 +94,7 @@ export default defineComponent({
   methods: {
     handleInputUpdate(index, value) {
       const input = this.currentFunction.config[index];
-      this.updateArgvs(input.key, value);
+      this.updateArgvs(input.name, value);
     },
     updateArgvs(key, value) {
       const argvs = {
@@ -175,7 +175,7 @@ export default defineComponent({
     // 初始化默认值
     if (this.currentFunction?.config) {
       this.currentFunction.config.forEach((config) => {
-        this.defaultArgvs[config.key] = config.defaultValue || "";
+        this.defaultArgvs[config.name] = config.defaultValue || "";
       });
     }
   },
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index de71d626..3ff5ad71 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -15,6 +15,7 @@ export const controlCommands = {
           codeTemplate: "if (${condition}) {",
           config: [
             {
+              name: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -35,6 +36,7 @@ export const controlCommands = {
           codeTemplate: "} else if (${condition}) {",
           config: [
             {
+              name: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -63,12 +65,14 @@ export const controlCommands = {
             "for (let ${indexVar} = ${startValue}; ${indexVar} <= ${endValue}; ${indexVar} += ${stepValue}) {",
           config: [
             {
+              name: "indexVar",
               label: "变量",
               component: "ControlInput",
               defaultValue: "i",
               width: 3,
             },
             {
+              name: "startValue",
               label: "从",
               component: "ControlInput",
               icon: "first_page",
@@ -76,6 +80,7 @@ export const controlCommands = {
               width: 3,
             },
             {
+              name: "endValue",
               label: "到",
               component: "ControlInput",
               icon: "last_page",
@@ -83,6 +88,7 @@ export const controlCommands = {
               width: 3,
             },
             {
+              name: "stepValue",
               label: "步进",
               component: "ControlInput",
               icon: "trending_up",
@@ -125,18 +131,21 @@ export const controlCommands = {
             "for (let [${indexVar}, ${itemVar}] of ${arrayVar}.entries()) {",
           config: [
             {
+              name: "indexVar",
               label: "元素",
               component: "ControlInput",
               defaultValue: "item",
               width: 4,
             },
             {
+              name: "indexVar",
               label: "索引",
               component: "ControlInput",
               defaultValue: "i",
               width: 4,
             },
             {
+              name: "arrayVar",
               label: "数组",
               component: "ControlInput",
               icon: "list",
@@ -179,18 +188,21 @@ export const controlCommands = {
             "for (const ${keyVar} in ${objectVar}) { const ${valueVar} = ${objectVar}[${keyVar}];",
           config: [
             {
+              name: "keyVar",
               label: "键名",
               component: "ControlInput",
               defaultValue: "key",
               width: 4,
             },
             {
+              name: "valueVar",
               label: "值",
               component: "ControlInput",
               defaultValue: "value",
               width: 4,
             },
             {
+              name: "objectVar",
               label: "对象",
               component: "ControlInput",
               defaultValue: "object",
@@ -231,6 +243,7 @@ export const controlCommands = {
           codeTemplate: "while (${condition}) {",
           config: [
             {
+              name: "condition",
               label: "条件",
               component: "ControlInput",
               placeholder: "表达式",
@@ -271,6 +284,7 @@ export const controlCommands = {
           codeTemplate: "switch (${expression}) {",
           config: [
             {
+              name: "expression",
               label: "变量",
               component: "ControlInput",
               placeholder: "变量或表达式",
@@ -285,6 +299,7 @@ export const controlCommands = {
           codeTemplate: "case ${value}:",
           config: [
             {
+              name: "value",
               label: "值",
               component: "ControlInput",
             },
@@ -323,6 +338,7 @@ export const controlCommands = {
           codeTemplate: "} catch (${errorVar}) {",
           config: [
             {
+              name: "errorVar",
               label: "错误",
               component: "ControlInput",
               defaultValue: "error",

From b026b484f7f4fde19ca02c14e8016ffb970ccea6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 20 Jan 2025 23:00:01 +0800
Subject: [PATCH 084/332] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=A2=9E=E5=8A=A0=E5=BE=AA=E7=8E=AF=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/simulate/index.js    |  2 +
 .../lib/quickcomposer/simulate/mouseClick.js  | 18 ++++
 src/js/composer/commands/simulateCommands.js  | 87 ++++++++++++-------
 3 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/simulate/mouseClick.js

diff --git a/plugin/lib/quickcomposer/simulate/index.js b/plugin/lib/quickcomposer/simulate/index.js
index f8bc9f9d..941d1fe2 100644
--- a/plugin/lib/quickcomposer/simulate/index.js
+++ b/plugin/lib/quickcomposer/simulate/index.js
@@ -2,6 +2,7 @@ const { findImage } = require("./imageFinder");
 const { keyboardTap, keySequence } = require("./keyboardTap");
 const { screenColorPick } = require("./screenColorPick");
 const screenCapture = require("./screenCapture");
+const mouseClick = require("./mouseClick");
 
 module.exports = {
   findImage,
@@ -9,5 +10,6 @@ module.exports = {
   keyboardTap,
   keySequence,
   screenColorPick,
+  mouseClick,
   ...screenCapture,
 };
diff --git a/plugin/lib/quickcomposer/simulate/mouseClick.js b/plugin/lib/quickcomposer/simulate/mouseClick.js
new file mode 100644
index 00000000..65b029d9
--- /dev/null
+++ b/plugin/lib/quickcomposer/simulate/mouseClick.js
@@ -0,0 +1,18 @@
+const mouseClick = (mouseAction = "Click", options) => {
+  const { x, y, count = 1, interval = 0 } = options;
+  let mouseActionFn = () => {};
+  if (x !== undefined && y !== undefined) {
+    mouseActionFn = () => utools["simulateMouse" + mouseAction](x, y);
+  } else {
+    mouseActionFn = () => utools["simulateMouse" + mouseAction]();
+  }
+  
+  for (let i = 0; i < count; i++) {
+    mouseActionFn();
+    if (interval > 0 && i < count - 1) {
+      quickcommand.sleep(interval);
+    }
+  }
+};
+
+module.exports = mouseClick;
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 0a0f70d3..8d6e86d2 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -110,41 +110,68 @@ export const simulateCommands = {
       ],
     },
     {
-      value: "utools.simulateMouseClick",
+      value: "quickcomposer.simulate.mouseClick",
       label: "鼠标点击",
       config: [
         {
-          label: "X坐标（留空则原地点击）",
-          icon: "drag_handle",
-          component: "NumberInput",
-          min: 0,
-          step: 10,
-          width: 6,
-        },
-        {
-          label: "Y坐标（留空则原地点击）",
-          icon: "drag_handle",
-          component: "NumberInput",
-          min: 0,
-          step: 10,
-          width: 6,
-        },
-      ],
-      subCommands: [
-        {
-          label: "单击",
-          value: "utools.simulateMouseClick",
-          icon: "mouse",
-        },
-        {
-          label: "右击",
-          value: "utools.simulateMouseRightClick",
-          icon: "mouse",
+          component: "ButtonGroup",
+          options: [
+            {
+              label: "单击",
+              value: "Click",
+            },
+            {
+              label: "右击",
+              value: "RightClick",
+            },
+            {
+              label: "双击",
+              value: "DoubleClick",
+            },
+          ],
+          defaultValue: "Click",
+          width: 12,
         },
         {
-          label: "双击",
-          value: "utools.simulateMouseDoubleClick",
-          icon: "mouse",
+          component: "OptionEditor",
+          options: {
+            x: {
+              label: "X坐标",
+              icon: "drag_handle",
+              component: "NumberInput",
+              min: 0,
+              step: 10,
+              width: 6,
+              placeholder: "XY任意留空原地点击",
+            },
+            y: {
+              label: "Y坐标",
+              icon: "drag_handle",
+              component: "NumberInput",
+              min: 0,
+              step: 10,
+              width: 6,
+              placeholder: "XY任意留空原地点击",
+            },
+            count: {
+              label: "点击次数",
+              component: "NumberInput",
+              min: 1,
+              step: 1,
+              width: 6,
+              defaultValue: 1,
+            },
+            interval: {
+              label: "点击间隔（毫秒）",
+              component: "NumberInput",
+              min: 0,
+              step: 100,
+              width: 6,
+            },
+          },
+          defaultValue: {
+            count: 1,
+          },
         },
       ],
     },

From 7a224be9f4b27781f99ffd8809f51c462b4b7587 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 01:20:03 +0800
Subject: [PATCH 085/332] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E7=9A=84=E5=91=BD=E4=BB=A4=E5=8D=A1=E7=89=87=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=A6=81=E7=94=A8=EF=BC=8C=E5=A4=8D=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/CommandComposer.vue   |   2 +-
 src/components/composer/ComposerCard.vue      | 177 +++++++++++++++++-
 src/components/composer/ComposerFlow.vue      |  58 ++++++
 src/components/composer/MultiParams.vue       |   5 +-
 .../composer/card/CommandButtons.vue          |  53 +++++-
 .../coding/AsymmetricCryptoEditor.vue         |   6 +-
 .../composer/coding/SymmetricCryptoEditor.vue |   5 +-
 src/components/composer/data/ZlibEditor.vue   |   5 +-
 .../composer/data/regex/RegexEditor.vue       |   5 +-
 .../composer/file/FileOperationEditor.vue     |   5 +-
 .../composer/network/AxiosConfigEditor.vue    |   5 +-
 .../composer/simulate/ImageSearchEditor.vue   |   5 +-
 .../composer/simulate/KeyEditor.vue           |   7 +-
 .../composer/simulate/KeySequenceEditor.vue   |   5 +-
 .../composer/system/SystemCommandEditor.vue   |   5 +-
 .../composer/ui/SelectListEditor.vue          |   5 +-
 src/js/composer/commands/imageCommands.js     |   2 -
 src/js/composer/customComponentGuide.js       |   7 +-
 src/js/composer/generateCode.js               |   2 +
 19 files changed, 320 insertions(+), 44 deletions(-)

diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 0de8d9f1..e4197222 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -123,7 +123,7 @@ export default defineComponent({
       const flow = window.lodashM.cloneDeep(this.commandFlow);
       const uselessProps = [
         "config",
-        "argvs",
+        "code",
         "label",
         "component",
         "subCommands",
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index c0d044f9..f924047f 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -6,6 +6,25 @@
     }"
     v-bind="$attrs"
   >
+    <!-- 禁用遮罩层 -->
+    <div
+      v-if="localCommand.disabled"
+      class="disabled-overlay"
+      :class="{
+        showToggleBtn: canToggleDisable,
+      }"
+      @click.stop="handleToggleDisable"
+    >
+      <div
+        class="enable-btn-wrapper row items-center text-primary"
+        :style="{
+          fontSize: localCommand.isCollapsed ? '12px' : '16px',
+        }"
+      >
+        <q-icon name="layers" class="q-mr-sm" />
+        <div>点击启用</div>
+      </div>
+    </div>
     <q-card class="command-item">
       <q-card-section
         class="card-section"
@@ -20,6 +39,9 @@
           @toggle-collapse="handleToggleCollapse"
           @run="runCommand"
           @remove="$emit('remove')"
+          @copy="handleCopy"
+          @toggle-disable="handleToggleDisable"
+          @add-print="handleAddPrint"
         >
           <!-- 控制流程组件，直接把组件放在head中 -->
           <template v-if="localCommand.isControlFlow">
@@ -74,6 +96,7 @@ import MultiParams from "components/composer/MultiParams.vue";
 import CommandHead from "components/composer/card/CommandHead.vue";
 import * as CardComponents from "js/composer/cardComponents";
 import { processVariable } from "js/composer/variableManager";
+import { newVarInputVal } from "js/composer/varInputValManager";
 import ControlCommand from "components/composer/control/ControlCommand.vue";
 
 export default defineComponent({
@@ -95,7 +118,15 @@ export default defineComponent({
       required: true,
     },
   },
-  emits: ["remove", "run", "addBranch", "toggle-collapse", "update:modelValue"],
+  emits: [
+    "remove",
+    "run",
+    "addBranch",
+    "toggle-collapse",
+    "update:modelValue",
+    "add-command",
+    "toggle-disable",
+  ],
   computed: {
     localCommand: {
       get() {
@@ -105,18 +136,15 @@ export default defineComponent({
         this.$emit("update:modelValue", value);
       },
     },
-    showRunBtn() {
-      return !this.command.isControlFlow;
-    },
-    showOutputBtn() {
-      return !this.command.isControlFlow;
-    },
-    isLastCommandInChain() {
-      if (!this.command.commandChain) return false;
+    isFirstCommandInChain() {
+      if (!this.localCommand.commandChain) return false;
       return (
-        this.command.commandType === this.command.commandChain?.slice(-1)[0]
+        this.localCommand.commandType === this.localCommand.commandChain?.[0]
       );
     },
+    canToggleDisable() {
+      return !this.localCommand.isControlFlow || this.isFirstCommandInChain;
+    },
   },
   setup(props) {
     const getCurrentVariables = inject("getCurrentVariables");
@@ -171,6 +199,68 @@ export default defineComponent({
         this.localCommand.isCollapsed = !this.localCommand.isCollapsed;
       }
     },
+    handleCopy() {
+      if (this.localCommand.isControlFlow && this.localCommand.chainId) {
+        // 如果是控制流程命令，通知父组件复制整个链
+        this.$emit("add-command", {
+          command: this.localCommand,
+          type: "chain",
+        });
+      } else {
+        // 非控制流程命令的复制逻辑保持不变
+        const copiedCommand = window.lodashM.cloneDeep(this.localCommand);
+        delete copiedCommand.id;
+        delete copiedCommand.chainId;
+        delete copiedCommand.commandType;
+        this.$emit("add-command", {
+          command: copiedCommand,
+          type: "single",
+        });
+      }
+    },
+    handleToggleDisable() {
+      if (!this.canToggleDisable) return;
+      if (this.localCommand.isControlFlow && this.localCommand.chainId) {
+        console.log(
+          "handleToggleDisable card",
+          this.localCommand.isControlFlow,
+          this.localCommand.chainId
+        );
+        // 如果是控制流程命令，通知父组件切换整个链的禁用状态
+        this.$emit("toggle-disable", {
+          chainId: this.localCommand.chainId,
+          disabled: !this.localCommand.disabled,
+        });
+      } else {
+        // 非控制流程命令的禁用逻辑保持不变
+        this.localCommand.disabled = !this.localCommand.disabled;
+      }
+    },
+    handleAddPrint() {
+      // 创建一个打印命令
+      if (!this.localCommand.outputVariable) {
+        this.localCommand.outputVariable = `temp_${parseInt(
+          new Date().getTime() / 1000
+        )}`;
+        this.localCommand.saveOutput = true;
+      }
+      const printCommand = {
+        value: "console.log",
+        label: "显示消息",
+        config: [
+          {
+            label: "要打印的消息文本",
+            component: "VariableInput",
+            icon: "info",
+          },
+        ],
+        argvs: [newVarInputVal("var", this.localCommand.outputVariable)],
+      };
+      this.$emit("add-command", {
+        command: printCommand,
+        type: "single",
+      });
+    },
   },
 });
 </script>
@@ -268,4 +358,71 @@ export default defineComponent({
 .command-item :deep(.condition-type-btn) {
   margin-left: -8px;
 }
+
+/* 禁用状态样式 */
+.composer-card.disabled {
+  position: relative;
+}
+
+/* 禁用遮罩层 */
+.disabled-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(255, 255, 255, 0.05);
+  backdrop-filter: blur(1px);
+  border: 1px dashed rgba(0, 0, 0, 0.2);
+  z-index: 10;
+  border-radius: inherit;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer !important;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.body--dark .disabled-overlay {
+  background: rgba(0, 0, 0, 0.05);
+  border-color: rgba(255, 255, 255, 0.15);
+}
+
+/* 斜纹背景 */
+.disabled-overlay::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: repeating-linear-gradient(
+    -45deg,
+    rgba(0, 0, 0, 0.02),
+    rgba(0, 0, 0, 0.02) 10px,
+    rgba(0, 0, 0, 0.04) 10px,
+    rgba(0, 0, 0, 0.04) 20px
+  );
+  border-radius: inherit;
+  pointer-events: none;
+}
+
+.enable-btn-wrapper {
+  opacity: 0;
+  transform: scale(0.9);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  user-select: none;
+  cursor: pointer !important;
+}
+
+.disabled-overlay.showToggleBtn:hover .enable-btn-wrapper {
+  opacity: 1;
+  transform: scale(1);
+}
+
+.disabled-overlay.showToggleBtn:hover {
+  backdrop-filter: blur(0.5px);
+  border-color: transparent;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
 </style>
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index fa34140e..da346d8e 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -55,6 +55,8 @@
                   @run="handleRunCommand"
                   @add-branch="addBranch"
                   @toggle-collapse="(event) => handleControlFlowCollapse(event)"
+                  @add-command="(event) => handleAddCommand(event, index)"
+                  @toggle-disable="handleToggleDisable"
                 />
               </div>
             </transition>
@@ -435,6 +437,62 @@ export default defineComponent({
         this.$emit("action", action, payload);
       }
     },
+    getChainCommands(chainId) {
+      const startIndex = this.commands.findIndex(
+        (cmd) => cmd.chainId === chainId
+      );
+      const endIndex = this.commands.findLastIndex(
+        (cmd) => cmd.chainId === chainId
+      );
+      return {
+        chainCommands: this.commands.slice(startIndex, endIndex + 1),
+        startIndex,
+        endIndex,
+      };
+    },
+    copyChainCommands(chainCommands) {
+      // 生成新的chainId
+      const newChainId = this.$root.getUniqueId();
+      // 复制并修改每个命令
+      const newChainCommands = [];
+      chainCommands.forEach((cmd) => {
+        const copiedCommand = window.lodashM.cloneDeep(cmd);
+        copiedCommand.id = this.$root.getUniqueId();
+        if (copiedCommand.chainId) copiedCommand.chainId = newChainId;
+        newChainCommands.push(copiedCommand);
+      });
+      return newChainCommands;
+    },
+    handleAddCommand({ command, type }, index) {
+      if (type === "chain") {
+        // 如果是复制链式命令
+        const { chainCommands, endIndex } = this.getChainCommands(
+          command.chainId
+        );
+        const newChainCommands = this.copyChainCommands(chainCommands);
+        const newCommands = [...this.commands];
+        newCommands.splice(endIndex + 1, 0, ...newChainCommands);
+        this.$emit("update:modelValue", newCommands);
+      } else {
+        // 单个命令的复制逻辑
+        const newCommand = {
+          ...command,
+          id: this.$root.getUniqueId(),
+        };
+        const newCommands = [...this.commands];
+        newCommands.splice(index + 1, 0, newCommand);
+        this.$emit("update:modelValue", newCommands);
+      }
+    },
+    handleToggleDisable({ chainId, disabled }) {
+      console.log("handleToggleDisable", chainId, disabled);
+      const { chainCommands } = this.getChainCommands(chainId);
+      // 更新所有相关命令的禁用状态
+      const newCommands = chainCommands.map((cmd) => {
+        return { ...cmd, disabled };
+      });
+      this.$emit("update:modelValue", newCommands);
+    },
     collapseAll() {
       const newCommands = this.commands.map((cmd) => ({
         ...cmd,
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index e1aafb11..79f77148 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -199,8 +199,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.funcName, this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(this.funcName, argvs);
     }
   },
 });
diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 0ab583d7..7c894f7a 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -54,6 +54,50 @@
           <q-tooltip>单独运行此命令并打印输出</q-tooltip>
         </q-icon>
 
+        <!-- 更多操作按钮 -->
+        <q-icon
+          name="more_vert"
+          class="more-btn"
+          v-if="!isControlFlow || isFirstCommandInChain"
+        >
+          <q-menu>
+            <q-list style="min-width: 150px">
+              <q-item clickable v-close-popup @click="$emit('copy')">
+                <q-item-section avatar>
+                  <q-icon name="content_copy" />
+                </q-item-section>
+                <q-item-section>复制命令</q-item-section>
+              </q-item>
+
+              <q-item
+                clickable
+                v-close-popup
+                @click="$emit('toggle-disable')"
+                x
+              >
+                <q-item-section avatar>
+                  <q-icon :name="command.disabled ? 'check_circle' : 'block'" />
+                </q-item-section>
+                <q-item-section>{{
+                  command.disabled ? "启用命令" : "禁用命令"
+                }}</q-item-section>
+              </q-item>
+
+              <q-item
+                clickable
+                v-close-popup
+                @click="$emit('add-print')"
+                v-if="!isControlFlow"
+              >
+                <q-item-section avatar>
+                  <q-icon name="chat" />
+                </q-item-section>
+                <q-item-section>打印输出</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+        </q-icon>
+
         <q-icon
           name="close"
           @click="$emit('remove')"
@@ -109,6 +153,9 @@ export default {
     "run",
     "remove",
     "toggle-collapse",
+    "copy",
+    "toggle-disable",
+    "add-print",
   ],
   methods: {
     handleBlur() {
@@ -167,7 +214,8 @@ export default {
 /* 按钮样式 */
 .output-btn,
 .run-btn,
-.remove-btn {
+.remove-btn,
+.more-btn {
   font-size: 18px;
   min-height: 25px;
   cursor: pointer;
@@ -178,7 +226,8 @@ export default {
 
 .output-btn:hover,
 .run-btn:hover,
-.remove-btn:hover {
+.remove-btn:hover,
+.more-btn:hover {
   opacity: 1;
   transform: scale(1.1) translateY(-1px);
   transition: all 0.3s ease;
diff --git a/src/components/composer/coding/AsymmetricCryptoEditor.vue b/src/components/composer/coding/AsymmetricCryptoEditor.vue
index 8c3a6f74..f4f2c5a5 100644
--- a/src/components/composer/coding/AsymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/AsymmetricCryptoEditor.vue
@@ -317,9 +317,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    // 只在没有 argvs 和 code 的情况下生成默认代码
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/coding/SymmetricCryptoEditor.vue b/src/components/composer/coding/SymmetricCryptoEditor.vue
index 9f21bac0..1f137a62 100644
--- a/src/components/composer/coding/SymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/SymmetricCryptoEditor.vue
@@ -350,8 +350,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/data/ZlibEditor.vue b/src/components/composer/data/ZlibEditor.vue
index 3751d868..9806e3f7 100644
--- a/src/components/composer/data/ZlibEditor.vue
+++ b/src/components/composer/data/ZlibEditor.vue
@@ -300,8 +300,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/data/regex/RegexEditor.vue b/src/components/composer/data/regex/RegexEditor.vue
index 327ecd78..a1ec7f6b 100644
--- a/src/components/composer/data/regex/RegexEditor.vue
+++ b/src/components/composer/data/regex/RegexEditor.vue
@@ -274,8 +274,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index 9320ff00..450636d0 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -675,8 +675,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index b0a16092..a436b3ee 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -493,8 +493,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/simulate/ImageSearchEditor.vue b/src/components/composer/simulate/ImageSearchEditor.vue
index 7712de09..e12feb18 100644
--- a/src/components/composer/simulate/ImageSearchEditor.vue
+++ b/src/components/composer/simulate/ImageSearchEditor.vue
@@ -249,8 +249,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/simulate/KeyEditor.vue b/src/components/composer/simulate/KeyEditor.vue
index 9371ff46..6ff60ff6 100644
--- a/src/components/composer/simulate/KeyEditor.vue
+++ b/src/components/composer/simulate/KeyEditor.vue
@@ -705,11 +705,12 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.code && !this.modelValue.argvs) {
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
       this.$emit("update:modelValue", {
         ...this.modelValue,
-        argvs: this.defaultArgvs,
-        code: this.generateCode(this.defaultArgvs),
+        argvs,
+        code: this.generateCode(argvs),
       });
     }
   },
diff --git a/src/components/composer/simulate/KeySequenceEditor.vue b/src/components/composer/simulate/KeySequenceEditor.vue
index 645a02a9..99cd59e4 100644
--- a/src/components/composer/simulate/KeySequenceEditor.vue
+++ b/src/components/composer/simulate/KeySequenceEditor.vue
@@ -678,8 +678,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.code && !this.modelValue.argvs) {
-      this.updateValue();
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 38ae6a6c..5a129c27 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -271,8 +271,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 861df43e..90044468 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -388,8 +388,9 @@ export default defineComponent({
     },
   },
   mounted() {
-    if (!this.modelValue.argvs && !this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
     }
   },
 });
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index 0a0f24f9..300508b9 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -104,7 +104,6 @@ export const imageCommands = {
           width: 6,
           min: 1,
           step: 10,
-          defaultValue: "",
         },
         {
           label: "高度(像素)",
@@ -113,7 +112,6 @@ export const imageCommands = {
           width: 6,
           min: 1,
           step: 10,
-          defaultValue: "",
         },
         {
           label: "保持宽高比",
diff --git a/src/js/composer/customComponentGuide.js b/src/js/composer/customComponentGuide.js
index afe4821b..ce8ad4c8 100644
--- a/src/js/composer/customComponentGuide.js
+++ b/src/js/composer/customComponentGuide.js
@@ -172,11 +172,12 @@ const customComponentGuide = {
           description: "组件初始化时的处理",
           implementation: `
             // 如果没有 argvs 和 code，使用默认值初始化
-            if (!this.modelValue.argvs && !this.modelValue.code) {
+            const argvs = this.modelValue.argvs || this.defaultArgvs;
+            if (!this.modelValue.code) {
               this.$emit("update:modelValue", {
                 ...this.modelValue,
-                argvs: this.defaultArgvs,
-                code: this.generateCode(this.defaultArgvs)
+                argvs,
+                code: this.generateCode(argvs),
               });
             }
           `,
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 3409184a..91a2a159 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -6,6 +6,8 @@ export function generateCode(commandFlow) {
   const indent = hasAsyncFunction ? "  " : "";
 
   commandFlow.forEach((cmd) => {
+    // 跳过禁用的命令
+    if (cmd.disabled) return;
     if (!cmd.code) return;
     let line = indent;
 

From 7d67ef9ae68ab866adc9392150b88f5006b10dad Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 08:56:12 +0800
Subject: [PATCH 086/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=B5=81=E5=91=BD=E4=BB=A4=E7=9A=84=E7=A6=81=E7=94=A8=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue | 26 ++++-----
 src/components/composer/ComposerFlow.vue | 72 ++++++++++--------------
 2 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index f924047f..94b80661 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -15,14 +15,15 @@
       }"
       @click.stop="handleToggleDisable"
     >
-      <div
-        class="enable-btn-wrapper row items-center text-primary"
-        :style="{
-          fontSize: localCommand.isCollapsed ? '12px' : '16px',
-        }"
-      >
-        <q-icon name="layers" class="q-mr-sm" />
-        <div>点击启用</div>
+      <div class="enable-btn-wrapper row items-center text-primary">
+        <q-icon
+          name="layers"
+          class="q-mr-sm"
+          :size="localCommand.isCollapsed ? '14px' : '18px'"
+        />
+        <div :style="{ fontSize: localCommand.isCollapsed ? '12px' : '15px' }">
+          点击启用
+        </div>
       </div>
     </div>
     <q-card class="command-item">
@@ -125,7 +126,7 @@ export default defineComponent({
     "toggle-collapse",
     "update:modelValue",
     "add-command",
-    "toggle-disable",
+    "toggle-chain-disable",
   ],
   computed: {
     localCommand: {
@@ -221,13 +222,8 @@ export default defineComponent({
     handleToggleDisable() {
       if (!this.canToggleDisable) return;
       if (this.localCommand.isControlFlow && this.localCommand.chainId) {
-        console.log(
-          "handleToggleDisable card",
-          this.localCommand.isControlFlow,
-          this.localCommand.chainId
-        );
         // 如果是控制流程命令，通知父组件切换整个链的禁用状态
-        this.$emit("toggle-disable", {
+        this.$emit("toggle-chain-disable", {
           chainId: this.localCommand.chainId,
           disabled: !this.localCommand.disabled,
         });
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index da346d8e..07bd1396 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -56,7 +56,7 @@
                   @add-branch="addBranch"
                   @toggle-collapse="(event) => handleControlFlowCollapse(event)"
                   @add-command="(event) => handleAddCommand(event, index)"
-                  @toggle-disable="handleToggleDisable"
+                  @toggle-chain-disable="handleToggleChainDisable"
                 />
               </div>
             </transition>
@@ -311,17 +311,11 @@ export default defineComponent({
           .showButtonBox(["全部删除", "保留内部命令", "手抖👋🏻"])
           .then(({ id }) => {
             if (id !== 0 && id !== 1) return;
-            const newCommands = [...this.commands];
             const chainId = command.chainId;
-            const lastIndex = newCommands.findLastIndex(
-              (cmd) => cmd.chainId === chainId
-            );
-            const startIndex = newCommands.findIndex(
-              (cmd) => cmd.chainId === chainId
-            );
+            const { startIndex, endIndex } = this.getChainIndex(chainId);
             this.removeRangeCommand(
               startIndex,
-              lastIndex,
+              endIndex,
               id === 0 ? null : chainId
             );
           });
@@ -362,13 +356,11 @@ export default defineComponent({
       };
 
       // 找到对应的 chainId 的最后一个命令位置
-      const lastIndex = newCommands.findLastIndex(
-        (cmd) => cmd.chainId === chainId
-      );
+      const { endIndex } = this.getChainIndex(chainId);
 
       // 在最后一个命令之前插入新的分支命令
-      if (lastIndex !== -1) {
-        newCommands.splice(lastIndex, 0, branchCommand);
+      if (endIndex !== -1) {
+        newCommands.splice(endIndex, 0, branchCommand);
         this.$emit("update:modelValue", newCommands);
       }
     },
@@ -378,12 +370,7 @@ export default defineComponent({
       if (!chainId) return;
 
       // 遍历commands找到相同chainId的第一个和最后一个命令的index
-      const startIndex = this.commands.findIndex(
-        (cmd) => cmd.chainId === chainId
-      );
-      const endIndex = this.commands.findLastIndex(
-        (cmd) => cmd.chainId === chainId
-      );
+      const { startIndex, endIndex } = this.getChainIndex(chainId);
 
       if (startIndex === -1 || endIndex === -1) return;
 
@@ -437,39 +424,34 @@ export default defineComponent({
         this.$emit("action", action, payload);
       }
     },
-    getChainCommands(chainId) {
+    getChainIndex(chainId) {
       const startIndex = this.commands.findIndex(
         (cmd) => cmd.chainId === chainId
       );
       const endIndex = this.commands.findLastIndex(
         (cmd) => cmd.chainId === chainId
       );
-      return {
-        chainCommands: this.commands.slice(startIndex, endIndex + 1),
-        startIndex,
-        endIndex,
-      };
+      return { startIndex, endIndex };
     },
-    copyChainCommands(chainCommands) {
+    copyCommands(commands) {
       // 生成新的chainId
-      const newChainId = this.$root.getUniqueId();
+      const newChainId = this.getUniqueId();
       // 复制并修改每个命令
-      const newChainCommands = [];
-      chainCommands.forEach((cmd) => {
+      const newCommands = [];
+      commands.forEach((cmd) => {
         const copiedCommand = window.lodashM.cloneDeep(cmd);
-        copiedCommand.id = this.$root.getUniqueId();
+        copiedCommand.id = this.getUniqueId();
         if (copiedCommand.chainId) copiedCommand.chainId = newChainId;
-        newChainCommands.push(copiedCommand);
+        newCommands.push(copiedCommand);
       });
-      return newChainCommands;
+      return newCommands;
     },
     handleAddCommand({ command, type }, index) {
       if (type === "chain") {
         // 如果是复制链式命令
-        const { chainCommands, endIndex } = this.getChainCommands(
-          command.chainId
-        );
-        const newChainCommands = this.copyChainCommands(chainCommands);
+        const { startIndex, endIndex } = this.getChainIndex(command.chainId);
+        const chainCommands = this.commands.slice(startIndex, endIndex + 1);
+        const newChainCommands = this.copyCommands(chainCommands);
         const newCommands = [...this.commands];
         newCommands.splice(endIndex + 1, 0, ...newChainCommands);
         this.$emit("update:modelValue", newCommands);
@@ -477,19 +459,23 @@ export default defineComponent({
         // 单个命令的复制逻辑
         const newCommand = {
           ...command,
-          id: this.$root.getUniqueId(),
+          id: this.getUniqueId(),
         };
         const newCommands = [...this.commands];
         newCommands.splice(index + 1, 0, newCommand);
         this.$emit("update:modelValue", newCommands);
       }
     },
-    handleToggleDisable({ chainId, disabled }) {
-      console.log("handleToggleDisable", chainId, disabled);
-      const { chainCommands } = this.getChainCommands(chainId);
+    handleToggleChainDisable({ chainId, disabled }) {
+      // 禁用的话先折叠这个Chain
+      this.handleControlFlowCollapse({ chainId, isCollapsed: !disabled });
+      const { startIndex, endIndex } = this.getChainIndex(chainId);
       // 更新所有相关命令的禁用状态
-      const newCommands = chainCommands.map((cmd) => {
-        return { ...cmd, disabled };
+      const newCommands = [...this.commands];
+      newCommands.forEach((cmd, idx) => {
+        if (idx >= startIndex && idx <= endIndex) {
+          cmd.disabled = disabled;
+        }
       });
       this.$emit("update:modelValue", newCommands);
     },

From 020eb2fb060ae8079e99de29deed08983877fa0e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 16:36:14 +0800
Subject: [PATCH 087/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=8E=A7=E5=88=B6=E6=B5=81=E7=A8=8B=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=B1=95=E5=BC=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerFlow.vue | 329 +++++++++++++++--------
 1 file changed, 220 insertions(+), 109 deletions(-)

diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 07bd1396..5dfcb1a7 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -54,7 +54,7 @@
                   @remove="removeCommand(index)"
                   @run="handleRunCommand"
                   @add-branch="addBranch"
-                  @toggle-collapse="(event) => handleControlFlowCollapse(event)"
+                  @toggle-collapse="(event) => handleChainCollapse(event)"
                   @add-command="(event) => handleAddCommand(event, index)"
                   @toggle-chain-disable="handleToggleChainDisable"
                 />
@@ -80,6 +80,9 @@ import DropArea from "./flow/DropArea.vue";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { processVariable } from "js/composer/variableManager";
 
+// 拖拽前的命令列表，非响应式
+let commandsBeforeDrag = [];
+
 export default defineComponent({
   name: "ComposerFlow",
   components: {
@@ -115,7 +118,6 @@ export default defineComponent({
       dragIndex: -1,
       isDragging: false,
       draggedCommand: null,
-      collapsedRanges: [],
       isAllCollapsed: false,
     };
   },
@@ -136,37 +138,72 @@ export default defineComponent({
     getPlaceholder(element, index) {
       return element.desc;
     },
+    // 拖拽开始
     onDragStart(event) {
+      // 保存拖拽前的命令列表
+      commandsBeforeDrag = [...this.commands];
       this.isDragging = true;
+      // 拖拽的命令
       this.draggedCommand = this.commands[event.oldIndex];
+      // 如果是链式命令的拖拽，先折叠
+      if (this.isFirstCommandInChain(this.draggedCommand)) {
+        this.handleChainCollapse({
+          chainId: this.draggedCommand.chainId,
+          isCollapsed: false,
+        });
+      }
     },
+    // 拖拽结束
     onDragEnd() {
       this.isDragging = false;
       this.dragIndex = -1;
       this.draggedCommand = null;
+      commandsBeforeDrag = [];
     },
+    // 拖拽生效
     onDragChange(event) {
+      const oldCommands = [...commandsBeforeDrag];
       let newCommands = [...this.commands];
 
-      if (event.moved || event.added) {
-        // 检查所有链式命令的顺序
-        const isValidOrder = this.checkAllChainOrders(newCommands);
-
-        if (!isValidOrder) {
-          // 如果顺序无效，恢复原始状态
-          if (event.moved) {
-            const { oldIndex, newIndex } = event.moved;
-            const [item] = newCommands.splice(newIndex, 1);
-            newCommands.splice(oldIndex, 0, item);
-          } else if (event.added) {
-            const { newIndex } = event.added;
-            newCommands.splice(newIndex, 1);
+      if (event.moved) {
+        const { oldIndex, newIndex } = event.moved;
+        const draggedCommand = oldCommands[oldIndex];
+
+        // 检查新位置是否在折叠的链中
+        let adjustedNewIndex = newIndex;
+        for (let i = 0; i < newCommands.length; i++) {
+          const cmd = newCommands[i];
+          if (cmd?.chainId && cmd.isCollapsed) {
+            const { startIndex, endIndex } = this.getChainIndex(
+              cmd.chainId,
+              newCommands
+            );
+            // 如果新位置在折叠的链中间，调整到链的后面
+            if (newIndex > startIndex && newIndex <= endIndex) {
+              adjustedNewIndex = endIndex + 1;
+              break;
+            }
           }
         }
+
+        if (draggedCommand.chainId) {
+          newCommands = this.handleChainCommandDrag(
+            draggedCommand,
+            oldCommands,
+            adjustedNewIndex
+          );
+        } else {
+          // 处理普通命令的拖拽
+          newCommands = oldCommands.filter(
+            (cmd) => cmd.id !== draggedCommand.id
+          );
+          newCommands.splice(adjustedNewIndex, 0, draggedCommand);
+        }
       }
 
       this.$emit("update:modelValue", newCommands);
     },
+    // 拖拽经过
     onDragOver(event) {
       if (!this.isDragging) {
         const items = this.$el.querySelectorAll(".flow-item");
@@ -175,8 +212,14 @@ export default defineComponent({
         // 找到最近的插入位置
         let closestIndex = -1;
         let minDistance = Infinity;
+        let lastVisibleIndex = -1;
 
         items.forEach((item, index) => {
+          // 跳过隐藏的命令
+          if (item.classList.contains("collapsed-chain-hidden")) {
+            return;
+          }
+
           const itemRect = item.getBoundingClientRect();
           const itemCenter = itemRect.top + itemRect.height / 2;
           const distance = Math.abs(mouseY - itemCenter);
@@ -185,50 +228,44 @@ export default defineComponent({
             minDistance = distance;
             closestIndex = index;
           }
+          lastVisibleIndex = index;
         });
 
-        // 如果鼠标在最后一个元素下方，则设置为末尾
-        const lastItem = items[items.length - 1];
-        if (lastItem && mouseY > lastItem.getBoundingClientRect().bottom) {
+        // 如果最近的是折叠的链式命令
+        if (closestIndex !== -1) {
+          const command = this.commands[closestIndex];
+          if (command?.chainId && command.isCollapsed) {
+            // 找到这个链的结束位置
+            const { endIndex } = this.getChainIndex(command.chainId);
+            // 如果鼠标在链式命令的下半部分，将插入位置设置到链的后面
+            const closestItem = items[closestIndex];
+            const itemRect = closestItem.getBoundingClientRect();
+            const itemCenter = itemRect.top + itemRect.height / 2;
+            if (mouseY > itemCenter) {
+              closestIndex = endIndex + 1;
+            }
+          }
+        }
+
+        // 如果鼠标在最后一个可见元素下方，则设置为末尾
+        const lastVisibleItem = items[lastVisibleIndex];
+        if (
+          lastVisibleItem &&
+          mouseY > lastVisibleItem.getBoundingClientRect().bottom
+        ) {
           closestIndex = this.commands.length;
         }
 
         this.dragIndex = closestIndex;
       }
     },
+    // 拖拽离开
     onDragLeave() {
       if (!this.isDragging) {
         this.dragIndex = -1;
       }
     },
-    checkAllChainOrders(commands) {
-      // 按chainId分组
-      const chainGroups = commands.reduce((groups, cmd) => {
-        if (cmd.chainId) {
-          if (!groups[cmd.chainId]) {
-            groups[cmd.chainId] = [];
-          }
-          groups[cmd.chainId].push(cmd);
-        }
-        return groups;
-      }, {});
-
-      // 如果没有链式命令，直接返回true
-      if (Object.keys(chainGroups).length === 0) return true;
-
-      // 检查每个链的命令顺序
-      return Object.values(chainGroups).every((chainCommands) => {
-        const commandChain = chainCommands[0].commandChain;
-        const firstCommand = chainCommands[0];
-        const lastCommand = chainCommands[chainCommands.length - 1];
-        // 对于每个chain来说，第一个命令必须是chainCommands的第一个命令
-        if (firstCommand.commandType !== commandChain[0]) return false;
-        // 最后一个命令必须是chainCommands的最后一个命令
-        if (lastCommand.commandType !== commandChain[commandChain.length - 1])
-          return false;
-        return true;
-      });
-    },
+    // 从命令列表拖到命令流程的事件，非命令流程内部拖拽
     onDrop(event) {
       try {
         const actionData = event.dataTransfer.getData("action");
@@ -304,11 +341,11 @@ export default defineComponent({
     removeCommand(index) {
       const command = this.commands[index];
 
-      // 如果是控制流程的起始命令
+      // 如果是链式命令的起始命令
       if (this.isFirstCommandInChain(command)) {
         // 显示确认对话框
         quickcommand
-          .showButtonBox(["全部删除", "保留内部命令", "手抖👋🏻"])
+          .showButtonBox(["全部删除", "保留内部命令", "手抖👋"])
           .then(({ id }) => {
             if (id !== 0 && id !== 1) return;
             const chainId = command.chainId;
@@ -320,7 +357,7 @@ export default defineComponent({
             );
           });
       } else {
-        // 如果不是控制流程的起始命令，直接删除
+        // 如果不是链式命令的起始命令，直接删除
         this.removeRangeCommand(index);
       }
     },
@@ -344,6 +381,7 @@ export default defineComponent({
         (cmd) => cmd.chainId === chainId && cmd.commandType === commandType
       );
     },
+    // 链式命令添加分支命令
     addBranch({ chainId, commandType, value }) {
       if (this.findUniqueBranch(chainId, commandType))
         return quickcommand.showMessageBox("该分支仅允许存在一个", "warning");
@@ -364,56 +402,37 @@ export default defineComponent({
         this.$emit("update:modelValue", newCommands);
       }
     },
-    handleControlFlowCollapse(event) {
-      const chainId = event.chainId;
-      const isCollapsed = !event.isCollapsed; // 取反，因为我们要切换状态
-      if (!chainId) return;
-
-      // 遍历commands找到相同chainId的第一个和最后一个命令的index
-      const { startIndex, endIndex } = this.getChainIndex(chainId);
-
-      if (startIndex === -1 || endIndex === -1) return;
-
-      // 更新命令的折叠状态
-      const newCommands = [...this.commands];
-      newCommands[startIndex] = {
-        ...newCommands[startIndex],
-        isCollapsed,
-      };
+    // 获取链式命令的折叠样式
+    getCollapsedChainClass(index) {
+      const command = this.commands[index];
 
-      this.$emit("update:modelValue", newCommands);
+      // 检查当前命令是否在某个折叠的链中
+      for (let i = index - 1; i >= 0; i--) {
+        const prevCommand = this.commands[i];
+        if (!prevCommand?.chainId) continue;
 
-      if (isCollapsed) {
-        // 折叠命令：添加新的折叠区间
-        this.collapsedRanges.push({
-          chainId,
-          start: startIndex,
-          end: endIndex,
-        });
-      } else {
-        // 展开命令：移除对应的折叠区间
-        const existingRangeIndex = this.collapsedRanges.findIndex(
-          (range) => range.chainId === chainId
+        // 找到链式命令
+        const { startIndex, endIndex } = this.getChainIndex(
+          prevCommand.chainId
         );
-        if (existingRangeIndex !== -1) {
-          this.collapsedRanges.splice(existingRangeIndex, 1);
+        if (i === startIndex && prevCommand.isCollapsed) {
+          // 如果这个链式命令是折叠的，且当前命令在这个链的范围内
+          if (index > startIndex && index <= endIndex) {
+            return { "collapsed-chain-hidden": true };
+          }
         }
       }
-    },
-    getCollapsedChainClass(index) {
-      // 找出所有包含当前index的折叠区间
-      const matchingRanges = this.collapsedRanges.filter(
-        (range) => index >= range.start && index <= range.end
-      );
-      if (!matchingRanges.length) return {};
-      // 检查是否是任意区间的中间或结束位置
-      const isAnyMiddleEnd = matchingRanges.some(
-        (range) => index > range.start && index <= range.end
-      );
-      // 只要在任何区间内部，无论是否是开始位置，都返回hidden样式，解决嵌套问题
-      return isAnyMiddleEnd
-        ? { "collapsed-chain-hidden": true }
-        : { "collapsed-chain-start": true };
+
+      // 只有当命令不在任何折叠的链中时，才检查它自己的折叠状态
+      if (
+        command?.chainId &&
+        this.isFirstCommandInChain(command) &&
+        command.isCollapsed
+      ) {
+        return { "collapsed-chain-start": true };
+      }
+
+      return {};
     },
     handleAction(action, payload) {
       if (action === "collapseAll") {
@@ -424,13 +443,9 @@ export default defineComponent({
         this.$emit("action", action, payload);
       }
     },
-    getChainIndex(chainId) {
-      const startIndex = this.commands.findIndex(
-        (cmd) => cmd.chainId === chainId
-      );
-      const endIndex = this.commands.findLastIndex(
-        (cmd) => cmd.chainId === chainId
-      );
+    getChainIndex(chainId, commands = this.commands) {
+      const startIndex = commands.findIndex((cmd) => cmd.chainId === chainId);
+      const endIndex = commands.findLastIndex((cmd) => cmd.chainId === chainId);
       return { startIndex, endIndex };
     },
     copyCommands(commands) {
@@ -467,10 +482,12 @@ export default defineComponent({
       }
     },
     handleToggleChainDisable({ chainId, disabled }) {
-      // 禁用的话先折叠这个Chain
-      this.handleControlFlowCollapse({ chainId, isCollapsed: !disabled });
+      // 禁用时折叠链式命令
+      if (disabled) {
+        this.handleChainCollapse({ chainId, isCollapsed: false });
+      }
+
       const { startIndex, endIndex } = this.getChainIndex(chainId);
-      // 更新所有相关命令的禁用状态
       const newCommands = [...this.commands];
       newCommands.forEach((cmd, idx) => {
         if (idx >= startIndex && idx <= endIndex) {
@@ -480,21 +497,115 @@ export default defineComponent({
       this.$emit("update:modelValue", newCommands);
     },
     collapseAll() {
-      const newCommands = this.commands.map((cmd) => ({
-        ...cmd,
-        isCollapsed: true,
-      }));
+      const newCommands = [...this.commands];
+      let i = 0;
+
+      while (i < newCommands.length) {
+        const cmd = newCommands[i];
+
+        if (cmd.chainId && this.isFirstCommandInChain(cmd)) {
+          // 如果是链式命令的起始命令
+          const { endIndex } = this.getChainIndex(cmd.chainId);
+          // 设置为折叠状态
+          newCommands[i] = {
+            ...cmd,
+            isCollapsed: true,
+          };
+          // 跳过这个链中的所有命令
+          i = endIndex + 1;
+        } else if (!cmd.chainId) {
+          // 如果是普通命令，设置为折叠状态
+          newCommands[i] = {
+            ...cmd,
+            isCollapsed: true,
+          };
+          i++;
+        } else {
+          // 如果是链中的其他命令，跳过
+          i++;
+        }
+      }
+
       this.$emit("update:modelValue", newCommands);
       this.isAllCollapsed = true;
     },
     expandAll() {
       const newCommands = this.commands.map((cmd) => ({
         ...cmd,
-        isCollapsed: false,
+        isCollapsed: false, // 所有命令都设置为展开状态
       }));
+
       this.$emit("update:modelValue", newCommands);
       this.isAllCollapsed = false;
     },
+    // 检查链式命令的顺序
+    checkChainOrders(commands, chainId) {
+      // 获取该链的起始和结束位置
+      const { startIndex, endIndex } = this.getChainIndex(chainId, commands);
+
+      // 如果没有找到命令，返回true
+      if (startIndex === -1 || endIndex === -1) return true;
+
+      // 获取该链的所有命令
+      const chainCommands = commands.slice(startIndex, endIndex + 1);
+      const commandChain = chainCommands[0].commandChain;
+      const firstCommand = chainCommands[0];
+      const lastCommand = chainCommands[chainCommands.length - 1];
+
+      // 第一个命令必须是chainCommands的第一个命令
+      if (firstCommand.commandType !== commandChain[0]) return false;
+      // 最后一个命令必须是chainCommands的最后一个命令
+      if (lastCommand.commandType !== commandChain[commandChain.length - 1])
+        return false;
+      return true;
+    },
+    // 处理链式命令的拖拽
+    handleChainCommandDrag(draggedCommand, oldCommands, newIndex) {
+      let newCommands = [...this.commands];
+
+      if (this.isFirstCommandInChain(draggedCommand)) {
+        const { startIndex, endIndex } = this.getChainIndex(
+          draggedCommand.chainId,
+          oldCommands
+        );
+
+        const chainCommands = oldCommands.slice(startIndex, endIndex + 1);
+        newCommands = oldCommands.filter(
+          (cmd) => !chainCommands.some((chainCmd) => chainCmd.id === cmd.id)
+        );
+        newCommands.splice(newIndex, 0, ...chainCommands);
+      } else {
+        // 检查当前链的命令顺序
+        const isValidOrder = this.checkChainOrders(
+          newCommands,
+          draggedCommand.chainId
+        );
+        if (!isValidOrder) {
+          newCommands = [...oldCommands];
+        }
+      }
+
+      return newCommands;
+    },
+    // 链式命令折叠
+    handleChainCollapse(event) {
+      const chainId = event.chainId;
+      const isCollapsed = !event.isCollapsed; // 取反，因为我们要切换状态
+      if (!chainId) return;
+
+      // 遍历commands找到相同chainId的第一个命令的index
+      const { startIndex } = this.getChainIndex(chainId);
+      if (startIndex === -1) return;
+
+      // 更新命令的折叠状态
+      const newCommands = [...this.commands];
+      newCommands[startIndex] = {
+        ...newCommands[startIndex],
+        isCollapsed,
+      };
+
+      this.$emit("update:modelValue", newCommands);
+    },
   },
 });
 </script>

From 2728c5783fc4ccd33fb7d38d5b2586c93cdac4e5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 17:04:24 +0800
Subject: [PATCH 088/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=93=BE=E5=BC=8F?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E6=AF=8F=E4=B8=AA=E9=93=BE=E5=BC=8F=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/flow/ChainStyles.vue | 57 ++++++++++----------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/components/composer/flow/ChainStyles.vue b/src/components/composer/flow/ChainStyles.vue
index 2d33a676..42c4400c 100644
--- a/src/components/composer/flow/ChainStyles.vue
+++ b/src/components/composer/flow/ChainStyles.vue
@@ -3,11 +3,10 @@
 </template>
 
 <script>
-import { defineComponent, ref, watchEffect, computed } from "vue";
+import { defineComponent, computed } from "vue";
 
 // 样式常量
 const STYLE_CONSTANTS = {
-  goldenRatio: 0.618033988749895,
   hueStep: 360 * 0.618033988749895,
   indent: 5,
   lightSl: "70%, 60%",
@@ -15,6 +14,15 @@ const STYLE_CONSTANTS = {
 };
 
 // 工具函数
+const hashString = (str) => {
+  let hash = 0;
+  for (let i = 0; i < str.length; i++) {
+    hash = (hash << 5) - hash + str.charCodeAt(i);
+    hash = hash & hash;
+  }
+  return hash;
+};
+
 const generateStyleString = (selector, rules) => {
   return `${selector} {
 ${Object.entries(rules)
@@ -26,18 +34,11 @@ ${Object.entries(rules)
 }`;
 };
 
-const generateShadows = (
-  parentChainIds,
-  hue,
-  indent,
-  lightSl,
-  darkSl,
-  uniqueChainIds
-) => {
+const generateShadows = (parentChainIds, hue, indent, lightSl, darkSl) => {
   return parentChainIds.reduce(
     (acc, parentChainId, i) => {
-      const parentIndex = uniqueChainIds.indexOf(parentChainId);
-      const parentHue = (parentIndex * STYLE_CONSTANTS.hueStep) % 360;
+      const parentHue =
+        (Math.abs(hashString(parentChainId)) * STYLE_CONSTANTS.hueStep) % 360;
       const start = -((i + 2) * indent);
       acc.light.push(`${start}px 0 0 0 hsl(${parentHue}, ${lightSl})`);
       acc.dark.push(`${start}px 0 0 0 hsl(${parentHue}, ${darkSl})`);
@@ -88,15 +89,18 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const styles = ref("");
     const chainGroups = computed(() => getChainGroups(props.commands));
 
-    // 使用 watchEffect 监听 commands 变化并重新计算样式
-    watchEffect(() => {
-      // 如果 commands 为空，不生成样式
+    // 根据 chainId 获取固定的色相值
+    const getChainHue = (chainId) => {
+      const hash = Math.abs(hashString(chainId));
+      return (hash * STYLE_CONSTANTS.hueStep) % 360;
+    };
+
+    // 将样式生成逻辑移到 computed 中
+    const styles = computed(() => {
       if (!props.commands?.length) {
-        styles.value = "";
-        return;
+        return "";
       }
 
       try {
@@ -117,10 +121,11 @@ export default defineComponent({
 
         // 3. 生成样式
         const styleRules = {};
-        const { hueStep, indent, lightSl, darkSl } = STYLE_CONSTANTS;
+        const { indent, lightSl, darkSl } = STYLE_CONSTANTS;
 
-        uniqueChainIds.forEach((chainId, index) => {
-          const hue = (index * hueStep) % 360;
+        uniqueChainIds.forEach((chainId) => {
+          // 使用固定的色相值
+          const hue = getChainHue(chainId);
           const className = "chain-group-" + chainId;
 
           // 计算深度
@@ -145,8 +150,7 @@ export default defineComponent({
             hue,
             indent,
             lightSl,
-            darkSl,
-            uniqueChainIds
+            darkSl
           );
 
           const commonStyle = {
@@ -173,12 +177,12 @@ export default defineComponent({
         });
 
         // 4. 生成最终的样式字符串
-        styles.value = Object.entries(styleRules)
+        return Object.entries(styleRules)
           .map(([selector, rules]) => generateStyleString(selector, rules))
           .join("\n\n");
       } catch (error) {
         console.error("Error generating chain styles:", error);
-        styles.value = "";
+        return "";
       }
     });
 
@@ -186,8 +190,6 @@ export default defineComponent({
       styles,
       getChainGroupClass(index) {
         const classes = {};
-
-        // 使用计算好的链组
         for (const group of chainGroups.value) {
           if (index >= group.startIndex && index <= group.endIndex) {
             classes[`chain-group-${group.chainId}`] = true;
@@ -204,7 +206,6 @@ export default defineComponent({
             }
           }
         }
-
         return classes;
       },
     };

From e0208eb119b77d3b65f63fb5ad4bc947f0549a0a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 18:14:46 +0800
Subject: [PATCH 089/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=90=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E4=BD=9C=E4=B8=BA=E5=87=BD=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/CommandComposer.vue   |  79 +---
 src/components/composer/ComposerFlow.vue      |  89 +----
 src/components/composer/FlowTabs.vue          | 367 ++++++++++++++++++
 .../composer/flow/ComposerButtons.vue         |  17 +-
 src/js/composer/generateCode.js               |  19 +-
 5 files changed, 413 insertions(+), 158 deletions(-)
 create mode 100644 src/components/composer/FlowTabs.vue

diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index e4197222..c894ed39 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -9,12 +9,9 @@
 
       <!-- 右侧命令流程 -->
       <div class="col command-section">
-        <ComposerFlow
-          v-model="commandFlow"
-          :generate-code="generateFlowCode"
-          :show-close-button="showCloseButton"
-          @add-command="addCommand"
+        <FlowTabs
           @action="http://github.com/handleComposer"
+          :show-close-button="showCloseButton"
         />
       </div>
     </div>
@@ -27,19 +24,15 @@
 <script>
 import { defineComponent, provide, ref } from "vue";
 import ComposerList from "./ComposerList.vue";
-import ComposerFlow from "./ComposerFlow.vue";
-import {
-  availableCommands,
-  findCommandByValue,
-} from "js/composer/composerConfig";
-import { generateCode } from "js/composer/generateCode";
+import FlowTabs from "./FlowTabs.vue";
+import { availableCommands } from "js/composer/composerConfig";
 import { parseVariables } from "js/composer/variableManager";
 
 export default defineComponent({
   name: "CommandComposer",
   components: {
     ComposerList,
-    ComposerFlow,
+    FlowTabs,
   },
   setup() {
     const commandFlow = ref([]);
@@ -94,65 +87,9 @@ export default defineComponent({
         outputVariable: null,
       });
     },
-    generateFlowCode() {
-      return generateCode(this.commandFlow);
-    },
-    handleComposer(type, flow) {
-      switch (type) {
-        case "save":
-          return this.saveFlow();
-        case "load":
-          return this.loadFlow();
-        case "run":
-          return this.runFlow(flow);
-        default:
-          return this.$emit("use-composer", {
-            type,
-            code: this.generateFlowCode(),
-          });
-      }
-    },
-    // 传入临时flow说明是运行单独的命令，否则是运行整个命令流
-    runFlow(flow) {
-      this.hasCommandNeedLoading = this.findCommandNeedLoading(flow);
-      const code = generateCode(flow || this.commandFlow);
-      this.$emit("use-composer", { type: "run", code });
-      if (!code.includes("console.log")) quickcommand.showMessageBox("已运行");
-    },
-    saveFlow() {
-      const flow = window.lodashM.cloneDeep(this.commandFlow);
-      const uselessProps = [
-        "config",
-        "code",
-        "label",
-        "component",
-        "subCommands",
-        "options",
-        "defaultValue",
-        "icon",
-        "width",
-        "placeholder",
-      ];
-      // 移除不必要属性
-      flow.forEach((cmd) => {
-        for (const props of uselessProps) {
-          delete cmd[props];
-        }
-      });
-      localStorage.setItem("quickcomposer.flow", JSON.stringify(flow));
-      quickcommand.showMessageBox("保存成功");
-    },
-    loadFlow() {
-      const savedFlow = localStorage.getItem("quickcomposer.flow");
-      if (!savedFlow) return;
-      this.commandFlow = JSON.parse(savedFlow).map((cmd) => {
-        // 获取完整命令
-        const command = findCommandByValue(cmd.value);
-        return {
-          ...command,
-          ...cmd,
-        };
-      });
+    handleComposer(type, code) {
+      // 直接转发事件和代码
+      this.$emit("use-composer", { type, code });
     },
     findCommandNeedLoading(flow) {
       // 暂时只在运行单独命令时显示载入界面，因为运行整个命令流时，如果不打印输出，是无法判断什么时候运行结束的，
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 5dfcb1a7..d94171a3 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -1,19 +1,6 @@
 <template>
   <div class="composer-flow">
     <ChainStyles ref="chainStyles" :commands="commands" />
-    <div class="section-header flow-header">
-      <div class="flow-title">
-        <q-icon name="timeline" size="20px" class="q-mx-sm text-primary" />
-        <span class="text-subtitle1">命令流程</span>
-      </div>
-      <ComposerButtons
-        :generate-code="generateCode"
-        :is-all-collapsed="isAllCollapsed"
-        :show-close-button="showCloseButton"
-        @action="http://github.com/handleAction"
-        class="flex-grow"
-      />
-    </div>
 
     <q-scroll-area class="command-scroll">
       <div
@@ -73,7 +60,6 @@
 import { defineComponent, inject } from "vue";
 import draggable from "vuedraggable";
 import ComposerCard from "./ComposerCard.vue";
-import ComposerButtons from "./flow/ComposerButtons.vue";
 import ChainStyles from "./flow/ChainStyles.vue";
 import EmptyFlow from "./flow/EmptyFlow.vue";
 import DropArea from "./flow/DropArea.vue";
@@ -88,7 +74,6 @@ export default defineComponent({
   components: {
     draggable,
     ComposerCard,
-    ComposerButtons,
     ChainStyles,
     EmptyFlow,
     DropArea,
@@ -118,7 +103,6 @@ export default defineComponent({
       dragIndex: -1,
       isDragging: false,
       draggedCommand: null,
-      isAllCollapsed: false,
     };
   },
   computed: {
@@ -363,13 +347,16 @@ export default defineComponent({
     },
     handleRunCommand(command) {
       // 创建一个临时的命令流程
-      const tempFlow = [
-        command,
-        {
-          //没有输出，则不打印
-          code: `if(${command.outputVariable}!==undefined){console.log(${command.outputVariable})}`,
-        },
-      ];
+      const tempFlow = {
+        name: "main",
+        commands: [
+          command,
+          {
+            //没有输出，则不打印
+            code: `if(${command.outputVariable}!==undefined){console.log(${command.outputVariable})}`,
+          },
+        ],
+      };
       // 触发运行事件
       this.$emit("action", "run", tempFlow);
     },
@@ -497,46 +484,20 @@ export default defineComponent({
       this.$emit("update:modelValue", newCommands);
     },
     collapseAll() {
-      const newCommands = [...this.commands];
-      let i = 0;
-
-      while (i < newCommands.length) {
-        const cmd = newCommands[i];
-
-        if (cmd.chainId && this.isFirstCommandInChain(cmd)) {
-          // 如果是链式命令的起始命令
-          const { endIndex } = this.getChainIndex(cmd.chainId);
-          // 设置为折叠状态
-          newCommands[i] = {
-            ...cmd,
-            isCollapsed: true,
-          };
-          // 跳过这个链中的所有命令
-          i = endIndex + 1;
-        } else if (!cmd.chainId) {
-          // 如果是普通命令，设置为折叠状态
-          newCommands[i] = {
-            ...cmd,
-            isCollapsed: true,
-          };
-          i++;
-        } else {
-          // 如果是链中的其他命令，跳过
-          i++;
-        }
-      }
-
+      // 遍历所有命令，设置折叠状态
+      const newCommands = this.commands.map((cmd) => ({
+        ...cmd,
+        isCollapsed: true,
+      }));
       this.$emit("update:modelValue", newCommands);
-      this.isAllCollapsed = true;
     },
     expandAll() {
+      // 遍历所有命令，展开状态
       const newCommands = this.commands.map((cmd) => ({
         ...cmd,
-        isCollapsed: false, // 所有命令都设置为展开状态
+        isCollapsed: false,
       }));
-
       this.$emit("update:modelValue", newCommands);
-      this.isAllCollapsed = false;
     },
     // 检查链式命令的顺序
     checkChainOrders(commands, chainId) {
@@ -618,22 +579,6 @@ export default defineComponent({
   border-radius: 10px;
 }
 
-.section-header {
-  flex-shrink: 0;
-  padding: 0 8px;
-  height: 30px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.flow-title {
-  display: flex;
-  align-items: center;
-  flex-shrink: 0;
-}
-
 .flex-grow {
   flex-grow: 1;
 }
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
new file mode 100644
index 00000000..2cbe65b4
--- /dev/null
+++ b/src/components/composer/FlowTabs.vue
@@ -0,0 +1,367 @@
+<template>
+  <div class="flow-tabs">
+    <div class="tabs-header">
+      <div class="header-content">
+        <div class="tabs-container">
+          <!-- main 作为固定按钮 -->
+          <q-btn
+            flat
+            dense
+            :color="activeTab === 'main' ? 'primary' : 'grey'"
+            label="main"
+            class="main-btn"
+            @click="activeTab = 'main'"
+          />
+
+          <!-- 其他流程标签可滚动 -->
+          <q-tabs
+            v-model="activeTab"
+            dense
+            class="text-grey"
+            active-color="primary"
+            indicator-color="primary"
+            align="left"
+            narrow-indicator
+          >
+            <template v-for="flow in nonMainFlows" :key="flow.id">
+              <q-tab :name="flow.id" class="flow-tab">
+                <div class="flow-tab-content">
+                  <q-input
+                    v-model="flow.name"
+                    dense
+                    borderless
+                    class="flow-name-input"
+                    @keydown.space.prevent
+                    @blur="validateFlowName(flow)"
+                  />
+                  <q-btn
+                    flat
+                    dense
+                    round
+                    icon="close"
+                    size="xs"
+                    @click.stop="removeFlow(flow)"
+                  />
+                </div>
+              </q-tab>
+            </template>
+          </q-tabs>
+
+          <q-btn
+            flat
+            dense
+            round
+            icon="add"
+            size="sm"
+            class="q-ml-sm add-btn"
+            @click="addFlow"
+          />
+        </div>
+
+        <ComposerButtons
+          :generate-code="generateAllFlowCode"
+          :is-all-collapsed="isAllCollapsed"
+          :show-close-button="showCloseButton"
+          @action="http://github.com/handleAction"
+        />
+      </div>
+    </div>
+
+    <div class="flow-container">
+      <ComposerFlow
+        v-for="flow in flows"
+        v-show="activeTab === flow.id"
+        :key="flow.id"
+        v-model="flow.commands"
+        :generate-code="() => generateFlowCode(flow)"
+        :show-close-button="flows.length > 1"
+        @action="http://github.com/(type,%20payload)%20=%3E%20handleFlowAction(type,%20payload,%20flow)"
+        ref="flowRefs"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import ComposerFlow from "./ComposerFlow.vue";
+import ComposerButtons from "./flow/ComposerButtons.vue";
+import { generateCode } from "js/composer/generateCode";
+import { findCommandByValue } from "js/composer/composerConfig";
+
+export default defineComponent({
+  name: "FlowTabs",
+  components: {
+    ComposerFlow,
+    ComposerButtons,
+  },
+  props: {
+    showCloseButton: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      flows: [
+        {
+          id: "main",
+          name: "main",
+          commands: [],
+        },
+      ],
+      activeTab: "main",
+      isAllCollapsed: false,
+    };
+  },
+  computed: {
+    nonMainFlows() {
+      return this.flows.filter((f) => f.id !== "main");
+    },
+  },
+  methods: {
+    addFlow() {
+      const id = `flow_${this.$root.getUniqueId()}`;
+      const name = `flow${this.flows.length}`;
+      this.flows.push({
+        id,
+        name,
+        commands: [],
+      });
+      this.activeTab = id;
+      this.$nextTick(this.updateWidths);
+    },
+    removeFlow(flow) {
+      const index = this.flows.findIndex((f) => f.id === flow.id);
+      if (index > -1 && flow.id !== "main") {
+        this.flows.splice(index, 1);
+        this.activeTab = this.flows[0].id;
+        this.$nextTick(this.updateWidths);
+      }
+    },
+    validateFlowName(flow) {
+      if (flow.id === "main") return;
+      // 移除空格并确保名字唯一
+      let newName = flow.name.replace(/\s+/g, "_");
+      let counter = 1;
+      const baseName = newName;
+
+      while (this.flows.some((f) => f.id !== flow.id && f.name === newName)) {
+        newName = `${baseName}_${counter++}`;
+      }
+
+      flow.name = newName;
+    },
+    generateFlowCode(flow) {
+      return generateCode(flow.commands, flow.name);
+    },
+    generateAllFlowCode() {
+      // 生成所有flow的代码
+      return this.flows.map((flow) => this.generateFlowCode(flow)).join("\n\n");
+    },
+    handleFlowAction(type, payload, flow) {
+      if (type === "close") {
+        const index = this.flows.findIndex((f) => f.id === flow.id);
+        if (index > -1 && this.flows.length > 1) {
+          this.flows.splice(index, 1);
+          this.activeTab = this.flows[0].id;
+        }
+      } else {
+        this.handleAction(type, payload);
+      }
+    },
+    handleAction(type, payload) {
+      switch (type) {
+        case "save":
+          this.saveFlows();
+          break;
+        case "load":
+          this.loadFlows();
+          break;
+        case "run":
+          this.runFlows(payload);
+          break;
+        case "collapseAll":
+          this.collapseAll();
+          break;
+        case "expandAll":
+          this.expandAll();
+          break;
+        default:
+          this.$emit("action", type, this.generateAllFlowCode());
+      }
+    },
+    saveFlows() {
+      const flowsData = this.flows.map((flow) => ({
+        id: flow.id,
+        name: flow.name,
+        commands: flow.commands.map((cmd) => {
+          const cmdCopy = { ...cmd };
+          // 移除不必要的属性
+          const uselessProps = [
+            "config",
+            "code",
+            "label",
+            "component",
+            "subCommands",
+            "options",
+            "defaultValue",
+            "icon",
+            "width",
+            "placeholder",
+          ];
+          uselessProps.forEach((prop) => delete cmdCopy[prop]);
+          return cmdCopy;
+        }),
+      }));
+      localStorage.setItem("quickcomposer.flows", JSON.stringify(flowsData));
+      quickcommand.showMessageBox("保存成功");
+    },
+    loadFlows() {
+      const savedFlows = localStorage.getItem("quickcomposer.flows");
+      if (!savedFlows) return;
+
+      const flowsData = JSON.parse(savedFlows);
+      this.flows = flowsData.map((flow) => ({
+        ...flow,
+        commands: flow.commands.map((cmd) => {
+          const command = findCommandByValue(cmd.value);
+          return {
+            ...command,
+            ...cmd,
+          };
+        }),
+      }));
+      this.activeTab = this.flows[0].id;
+    },
+    runFlows(flow) {
+      const code = flow
+        ? this.generateFlowCode(flow)
+        : this.generateAllFlowCode();
+      this.$emit("action", "run", code);
+      if (!code.includes("console.log")) {
+        quickcommand.showMessageBox("已运行");
+      }
+    },
+    collapseAll() {
+      this.$refs.flowRefs.forEach((flow) => {
+        if (flow.collapseAll) flow.collapseAll();
+      });
+      this.isAllCollapsed = true;
+    },
+    expandAll() {
+      this.$refs.flowRefs.forEach((flow) => {
+        if (flow.expandAll) flow.expandAll();
+      });
+      this.isAllCollapsed = false;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.flow-tabs {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.tabs-header {
+  flex-shrink: 0;
+  height: 28px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.header-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.tabs-container {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  min-width: 0;
+  margin-right: 8px;
+}
+
+/* 限制在当前组件内的tabs样式 */
+.tabs-container :deep(.q-tabs) {
+  flex: 1;
+  height: 28px;
+  min-height: 28px;
+  overflow-x: auto;
+  overflow-y: hidden;
+  margin-left: 4px; /* 与 main 按钮保持间距 */
+}
+
+/* 隐藏滚动条 */
+.tabs-container :deep(.q-tabs)::-webkit-scrollbar {
+  display: none;
+}
+
+.tabs-container :deep(.q-tab) {
+  min-height: 28px;
+  height: 28px;
+  padding: 0 8px;
+}
+
+.tabs-container :deep(.q-tab__content) {
+  min-width: 0;
+}
+
+.flow-tab {
+  min-width: 80px;
+}
+
+.flow-tab-content {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.flow-name-input {
+  max-width: 100px;
+}
+
+.flow-name-input :deep(.q-field__native) {
+  padding: 0;
+  font-size: 12px;
+}
+
+/* 添加按钮样式 */
+.tabs-container .q-btn {
+  height: 28px;
+  min-height: 28px;
+}
+
+.add-btn {
+  flex-shrink: 0;
+  height: 28px;
+  min-height: 28px;
+}
+
+.flow-container {
+  flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+
+.body--dark .tabs-header {
+  border-bottom-color: rgba(255, 255, 255, 0.05);
+}
+
+.main-btn {
+  height: 28px;
+  min-height: 28px;
+  padding: 0 12px;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 500;
+  margin-right: 4px;
+  flex-shrink: 0;
+}
+</style>
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index c08d28a0..312eac4f 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="composer-buttons">
-    <div class="left-buttons">
+    <div class="right-buttons">
       <q-btn
         :icon="isAllCollapsed ? 'unfold_more' : 'unfold_less'"
         dense
@@ -11,9 +11,7 @@
       >
         <q-tooltip>{{ isAllCollapsed ? "展开所有" : "折叠所有" }}</q-tooltip>
       </q-btn>
-    </div>
-
-    <div class="right-buttons">
+      <q-separator vertical />
       <q-btn
         @click="$q.dark.toggle()"
         :icon="$q.dark.isActive ? 'dark_mode' : 'light_mode'"
@@ -135,24 +133,25 @@ export default defineComponent({
 .composer-buttons {
   position: relative;
   display: flex;
-  justify-content: space-between;
   align-items: center;
-  width: 100%;
+  height: 28px;
 }
 
-.left-buttons,
 .right-buttons {
   display: flex;
   align-items: center;
+  height: 100%;
 }
 
-.composer-buttons > div > .q-btn {
+.right-buttons .q-btn {
+  height: 28px;
+  min-height: 28px;
   opacity: 0.6;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
   font-size: 12px;
 }
 
-.composer-buttons > div > .q-btn:hover {
+.right-buttons .q-btn:hover {
   opacity: 1;
   transform: translateY(-1px);
   color: var(--q-primary);
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 91a2a159..45b07623 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -1,9 +1,14 @@
-export function generateCode(commandFlow) {
+export function generateCode(commandFlow, functionName = null) {
   // 检查是否包含异步函数
   const hasAsyncFunction = commandFlow.some((cmd) => cmd.isAsync);
 
-  let code = hasAsyncFunction ? ["async function run() {"] : [];
-  const indent = hasAsyncFunction ? "  " : "";
+  let code = [];
+  const funcName = functionName || "run";
+
+  // 生成函数声明
+  code.push(`${hasAsyncFunction ? "async " : ""}function ${funcName}() {`);
+
+  const indent = "  ";
 
   commandFlow.forEach((cmd) => {
     // 跳过禁用的命令
@@ -20,9 +25,11 @@ export function generateCode(commandFlow) {
     code.push(line);
   });
 
-  if (hasAsyncFunction) {
-    code.push("}"); // Close the async function
-    code.push("run();"); // Call the function
+  code.push("}"); // Close the function
+
+  // 如果是主函数，则自动执行
+  if (functionName === "main") {
+    code.push("\nmain();"); // Call the main function
   }
 
   return code.join("\n");

From db0ce31c7daf399bfe320703becee0815afd163a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 22:26:37 +0800
Subject: [PATCH 090/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=A0=87=E7=AD=BE=E6=A0=8F=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/CommandComposer.vue   |   4 +-
 src/components/composer/ComposerList.vue      |   2 +-
 src/components/composer/FlowTabs.vue          | 264 +++++++++++-------
 .../composer/flow/ComposerButtons.vue         |   3 +-
 src/js/composer/generateCode.js               |  12 +-
 src/js/composer/variableManager.js            |  21 +-
 6 files changed, 179 insertions(+), 127 deletions(-)

diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index c894ed39..5b0dccf0 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -3,7 +3,7 @@
     <!-- 主体内容 -->
     <div class="composer-body row no-wrap">
       <!-- 左侧命令列表 -->
-      <div class="col-3 command-section">
+      <div class="command-section" style="width: 180px">
         <ComposerList :commands="availableCommands" @add-command="addCommand" />
       </div>
 
@@ -134,7 +134,7 @@ export default defineComponent({
 }
 
 .body--dark .command-section {
-  background: #1d1d1d;
+  background: #232323;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
 }
 
diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index 394cf39c..c2260ce6 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -230,7 +230,7 @@ export default defineComponent({
 }
 
 .body--dark .composer-list {
-  background-color: rgba(32, 32, 32, 0.8);
+  background-color: #232323;
 }
 
 .category-item {
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 2cbe65b4..6e8a8b4c 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -1,70 +1,71 @@
 <template>
   <div class="flow-tabs">
     <div class="tabs-header">
-      <div class="header-content">
-        <div class="tabs-container">
-          <!-- main 作为固定按钮 -->
-          <q-btn
-            flat
-            dense
-            :color="activeTab === 'main' ? 'primary' : 'grey'"
-            label="main"
-            class="main-btn"
-            @click="activeTab = 'main'"
-          />
+      <div class="tabs-container">
+        <!-- main 作为固定按钮 -->
+        <q-btn
+          flat
+          dense
+          label="主流程"
+          class="main-btn"
+          :class="{ 'main-btn-active': activeTab === 'main' }"
+          @click="activeTab = 'main'"
+        />
 
-          <!-- 其他流程标签可滚动 -->
-          <q-tabs
-            v-model="activeTab"
-            dense
-            class="text-grey"
-            active-color="primary"
-            indicator-color="primary"
-            align="left"
-            narrow-indicator
-          >
-            <template v-for="flow in nonMainFlows" :key="flow.id">
-              <q-tab :name="flow.id" class="flow-tab">
-                <div class="flow-tab-content">
+        <!-- 其他流程标签可滚动 -->
+        <q-tabs
+          v-model="activeTab"
+          dense
+          class="text-grey"
+          active-color="primary"
+          indicator-color="primary"
+          align="left"
+          narrow-indicator
+          outside-arrows
+        >
+          <template v-for="flow in nonMainFlows" :key="flow.id">
+            <q-tab :name="flow.id" class="flow-tab">
+              <div class="flow-tab-content">
+                <template v-if="flow.isEditing">
                   <q-input
-                    v-model="flow.name"
+                    v-model="flow.label"
                     dense
                     borderless
                     class="flow-name-input"
                     @keydown.space.prevent
-                    @blur="validateFlowName(flow)"
-                  />
-                  <q-btn
-                    flat
-                    dense
-                    round
-                    icon="close"
-                    size="xs"
-                    @click.stop="removeFlow(flow)"
+                    @blur="finishEdit(flow)"
+                    @keyup.enter="finishEdit(flow)"
+                    ref="inputRefs"
                   />
-                </div>
-              </q-tab>
-            </template>
-          </q-tabs>
+                </template>
+                <template v-else>
+                  <span class="flow-name-text" @dblclick="startEdit(flow)">{{
+                    flow.label
+                  }}</span>
+                </template>
+                <q-btn
+                  flat
+                  dense
+                  round
+                  icon="close"
+                  size="xs"
+                  @click.stop="removeFlow(flow)"
+                />
+              </div>
+              <q-tooltip> 双击修改名称 </q-tooltip>
+            </q-tab>
+          </template>
+        </q-tabs>
 
-          <q-btn
-            flat
-            dense
-            round
-            icon="add"
-            size="sm"
-            class="q-ml-sm add-btn"
-            @click="addFlow"
-          />
-        </div>
-
-        <ComposerButtons
-          :generate-code="generateAllFlowCode"
-          :is-all-collapsed="isAllCollapsed"
-          :show-close-button="showCloseButton"
-          @action="http://github.com/handleAction"
-        />
+        <q-icon dense name="add" class="add-btn" @click="addFlow" />
       </div>
+
+      <ComposerButtons
+        :generate-code="generateAllFlowCode"
+        :is-all-collapsed="isAllCollapsed"
+        :show-close-button="showCloseButton"
+        @action="http://github.com/handleAction"
+      />
     </div>
 
     <div class="flow-container">
@@ -88,6 +89,7 @@ import ComposerFlow from "./ComposerFlow.vue";
 import ComposerButtons from "./flow/ComposerButtons.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
+import { generateUniqSuffix } from "js/composer/variableManager";
 
 export default defineComponent({
   name: "FlowTabs",
@@ -107,6 +109,7 @@ export default defineComponent({
         {
           id: "main",
           name: "main",
+          label: "主流程",
           commands: [],
         },
       ],
@@ -120,44 +123,43 @@ export default defineComponent({
     },
   },
   methods: {
+    generateFlowName(baseName = "flow_") {
+      return (
+        baseName +
+        generateUniqSuffix(
+          baseName,
+          this.flows.map((f) => f.name),
+          false
+        )
+      );
+    },
     addFlow() {
-      const id = `flow_${this.$root.getUniqueId()}`;
-      const name = `flow${this.flows.length}`;
+      const id = this.$root.getUniqueId();
+      const name = this.generateFlowName();
       this.flows.push({
         id,
         name,
+        label: name.replace("flow_", "子流程"),
         commands: [],
       });
       this.activeTab = id;
-      this.$nextTick(this.updateWidths);
     },
     removeFlow(flow) {
       const index = this.flows.findIndex((f) => f.id === flow.id);
       if (index > -1 && flow.id !== "main") {
         this.flows.splice(index, 1);
         this.activeTab = this.flows[0].id;
-        this.$nextTick(this.updateWidths);
       }
     },
-    validateFlowName(flow) {
-      if (flow.id === "main") return;
-      // 移除空格并确保名字唯一
-      let newName = flow.name.replace(/\s+/g, "_");
-      let counter = 1;
-      const baseName = newName;
-
-      while (this.flows.some((f) => f.id !== flow.id && f.name === newName)) {
-        newName = `${baseName}_${counter++}`;
-      }
-
-      flow.name = newName;
-    },
     generateFlowCode(flow) {
-      return generateCode(flow.commands, flow.name);
+      return generateCode(flow);
     },
     generateAllFlowCode() {
       // 生成所有flow的代码
-      return this.flows.map((flow) => this.generateFlowCode(flow)).join("\n\n");
+      return this.flows
+        .reverse()
+        .map((flow) => this.generateFlowCode(flow))
+        .join("\n\n");
     },
     handleFlowAction(type, payload, flow) {
       if (type === "close") {
@@ -255,6 +257,21 @@ export default defineComponent({
       });
       this.isAllCollapsed = false;
     },
+    startEdit(flow) {
+      flow.isEditing = true;
+      this.$nextTick(() => {
+        const input = this.$refs.inputRefs?.[0];
+        if (input) {
+          input.focus();
+        }
+      });
+    },
+    finishEdit(flow) {
+      flow.isEditing = false;
+      if (!flow.label) {
+        flow.label = this.generateFlowName().replace("flow_", "子流程");
+      }
+    },
   },
 });
 </script>
@@ -268,15 +285,11 @@ export default defineComponent({
 
 .tabs-header {
   flex-shrink: 0;
-  height: 28px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-}
-
-.header-content {
+  height: 30px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 100%;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 .tabs-container {
@@ -285,63 +298,94 @@ export default defineComponent({
   align-items: center;
   height: 100%;
   min-width: 0;
-  margin-right: 8px;
+  width: 0;
 }
 
 /* 限制在当前组件内的tabs样式 */
 .tabs-container :deep(.q-tabs) {
-  flex: 1;
-  height: 28px;
-  min-height: 28px;
-  overflow-x: auto;
-  overflow-y: hidden;
-  margin-left: 4px; /* 与 main 按钮保持间距 */
+  height: 30px;
+  min-height: 30px;
+  min-width: 0;
+  width: auto;
+  max-width: 100%;
 }
 
-/* 隐藏滚动条 */
-.tabs-container :deep(.q-tabs)::-webkit-scrollbar {
-  display: none;
+.body--dark .tabs-container :deep(.q-tabs) {
+  background-color: #232323 !important;
 }
 
 .tabs-container :deep(.q-tab) {
-  min-height: 28px;
-  height: 28px;
-  padding: 0 8px;
+  min-height: 30px;
+  height: 30px;
+  padding: 0;
+  text-align: center;
+  background-color: transparent;
+}
+
+.tabs-container
+  :deep(.q-tabs--scrollable.q-tabs__arrows--outside.q-tabs--horizontal) {
+  padding: 0 15px;
+}
+
+.tabs-container :deep(.q-tabs__arrow) {
+  min-width: 0;
+  width: 15px;
+  font-size: 15px;
 }
 
 .tabs-container :deep(.q-tab__content) {
   min-width: 0;
+  width: 100%;
 }
 
 .flow-tab {
   min-width: 80px;
+  max-width: 120px;
 }
 
 .flow-tab-content {
   display: flex;
   align-items: center;
-  gap: 4px;
+  user-select: none;
+  width: 100%;
 }
 
 .flow-name-input {
-  max-width: 100px;
+  max-width: 100%;
+  min-width: 0;
 }
 
-.flow-name-input :deep(.q-field__native) {
-  padding: 0;
+.flow-name-input :deep(.q-field__control),
+.flow-name-input :deep(.q-field__control *) {
   font-size: 12px;
+  height: 30px;
+  text-align: center;
 }
 
-/* 添加按钮样式 */
-.tabs-container .q-btn {
-  height: 28px;
-  min-height: 28px;
+.flow-name-text {
+  font-size: 12px;
+  padding: 0 2px;
+  cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  flex: 1;
+  min-width: 0;
 }
 
+/* 添加按钮样式 */
 .add-btn {
   flex-shrink: 0;
-  height: 28px;
-  min-height: 28px;
+  padding: 0 5px;
+  font-size: 16px;
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+}
+
+.add-btn:hover {
+  color: var(--q-primary);
+  transform: scale(1.2);
+  transition: all 0.2s ease-in-out;
 }
 
 .flow-container {
@@ -355,13 +399,19 @@ export default defineComponent({
 }
 
 .main-btn {
-  height: 28px;
-  min-height: 28px;
+  height: 30px;
+  min-height: 30px;
   padding: 0 12px;
-  border-radius: 4px;
+  border-radius: 8px 0 0 0;
   font-size: 12px;
   font-weight: 500;
-  margin-right: 4px;
   flex-shrink: 0;
+  color: var(--q-text-color);
+}
+
+.main-btn-active {
+  color: var(--q-primary);
+  border-bottom: 2px solid var(--q-primary);
+  transition: all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 </style>
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 312eac4f..8a95b0f8 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="composer-buttons">
     <div class="right-buttons">
+      <q-separator vertical />
       <q-btn
         :icon="isAllCollapsed ? 'unfold_more' : 'unfold_less'"
         dense
         flat
-        rounded
-        size="9px"
         @click="$emit('action', isAllCollapsed ? 'expandAll' : 'collapseAll')"
       >
         <q-tooltip>{{ isAllCollapsed ? "展开所有" : "折叠所有" }}</q-tooltip>
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 45b07623..81bada81 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -1,16 +1,18 @@
-export function generateCode(commandFlow, functionName = null) {
+export function generateCode(flow) {
+  const { commands, name, label } = flow;
   // 检查是否包含异步函数
-  const hasAsyncFunction = commandFlow.some((cmd) => cmd.isAsync);
+  const hasAsyncFunction = commands.some((cmd) => cmd.isAsync);
 
   let code = [];
-  const funcName = functionName || "run";
+  const funcName = name || "func_" + new Date().getTime();
 
+  code.push(`// ${label}`);
   // 生成函数声明
   code.push(`${hasAsyncFunction ? "async " : ""}function ${funcName}() {`);
 
   const indent = "  ";
 
-  commandFlow.forEach((cmd) => {
+  commands.forEach((cmd) => {
     // 跳过禁用的命令
     if (cmd.disabled) return;
     if (!cmd.code) return;
@@ -28,7 +30,7 @@ export function generateCode(commandFlow, functionName = null) {
   code.push("}"); // Close the function
 
   // 如果是主函数，则自动执行
-  if (functionName === "main") {
+  if (funcName === "main") {
     code.push("\nmain();"); // Call the main function
   }
 
diff --git a/src/js/composer/variableManager.js b/src/js/composer/variableManager.js
index 332e478d..53ad32e7 100644
--- a/src/js/composer/variableManager.js
+++ b/src/js/composer/variableManager.js
@@ -5,7 +5,7 @@ import { validateVariableName } from "js/common/variableValidator";
  * @param {number} varCount - 当前变量数量
  * @returns {string} 随机后缀
  */
-function generateRandomSuffix(varCount) {
+function generateRandomSuffix(varCount, withPrefix = true) {
   // 根据变量数量决定后缀长度
   let length = 1; // 默认1位
   if (varCount >= 100) {
@@ -15,7 +15,7 @@ function generateRandomSuffix(varCount) {
   }
 
   return (
-    "_" +
+    (withPrefix ? "_" : "") +
     Math.random()
       .toString(36)
       .substring(2, 2 + length)
@@ -66,18 +66,19 @@ function generateValidVarName(baseName, existingVars, currentName = null) {
   }
 
   // 如果变量名重复，添加随机后缀直到不重复
-  let finalName = baseName;
-  while (existingVars.includes(finalName)) {
-    let suffix;
-    do {
-      suffix = generateRandomSuffix(existingVars.length);
-    } while (existingVars.includes(baseName + suffix));
-    finalName = baseName + suffix;
-  }
+  let finalName = baseName + generateUniqSuffix(baseName, existingVars);
 
   return finalName;
 }
 
+export function generateUniqSuffix(baseName, existingVars, withPrefix = true) {
+  let suffix;
+  do {
+    suffix = generateRandomSuffix(existingVars.length, withPrefix);
+  } while (existingVars.includes(baseName + suffix));
+  return suffix;
+}
+
 /**
  * 处理变量更新
  * @param {Object} params - 参数对象

From ab0ab8a7a4db6ba3763632436b38f26402f6db06 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 23:14:00 +0800
Subject: [PATCH 091/332] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8varInput?=
 =?UTF-8?q?=E4=B8=AD=E9=80=89=E6=8B=A9=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue          | 71 ++++++++++---------
 .../composer/common/VariableInput.vue         |  4 +-
 .../composer/common/varinput/VariableList.vue | 50 ++++++++++---
 3 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 6e8a8b4c..18bc9d61 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -23,8 +23,8 @@
           narrow-indicator
           outside-arrows
         >
-          <template v-for="flow in nonMainFlows" :key="flow.id">
-            <q-tab :name="flow.id" class="flow-tab">
+          <template v-for="flow in subFlows" :key="flow.id">
+            <q-tab :name="flow.id" class="flow-tab" no-caps>
               <div class="flow-tab-content">
                 <template v-if="flow.isEditing">
                   <q-input
@@ -76,7 +76,7 @@
         v-model="flow.commands"
         :generate-code="() => generateFlowCode(flow)"
         :show-close-button="flows.length > 1"
-        @action="http://github.com/(type,%20payload)%20=%3E%20handleFlowAction(type,%20payload,%20flow)"
+        @action="http://github.com/(type,%20payload)%20=%3E%20handleAction(type,%20payload)"
         ref="flowRefs"
       />
     </div>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { defineComponent } from "vue";
+import { defineComponent, provide, reactive } from "vue";
 import ComposerFlow from "./ComposerFlow.vue";
 import ComposerButtons from "./flow/ComposerButtons.vue";
 import { generateCode } from "js/composer/generateCode";
@@ -103,27 +103,44 @@ export default defineComponent({
       default: true,
     },
   },
+  setup() {
+    const subFlows = reactive([]);
+    const getCurrentFunctions = () => {
+      return subFlows.map((flow) => {
+        return {
+          label: flow.label,
+          value: flow.name,
+        };
+      });
+    };
+    provide("getCurrentFunctions", getCurrentFunctions);
+    return { subFlows };
+  },
   data() {
     return {
-      flows: [
-        {
-          id: "main",
-          name: "main",
-          label: "主流程",
-          commands: [],
-        },
-      ],
       activeTab: "main",
       isAllCollapsed: false,
+      mainFlow: {
+        id: "main",
+        name: "main",
+        label: "主流程",
+        commands: [],
+      },
     };
   },
   computed: {
-    nonMainFlows() {
-      return this.flows.filter((f) => f.id !== "main");
+    flows: {
+      get() {
+        return [this.mainFlow, ...this.subFlows];
+      },
+      set(value) {
+        this.mainFlow = value[0];
+        this.subFlows = value.slice(1);
+      },
     },
   },
   methods: {
-    generateFlowName(baseName = "flow_") {
+    generateFlowName(baseName = "func_") {
       return (
         baseName +
         generateUniqSuffix(
@@ -136,18 +153,18 @@ export default defineComponent({
     addFlow() {
       const id = this.$root.getUniqueId();
       const name = this.generateFlowName();
-      this.flows.push({
+      this.subFlows.push({
         id,
         name,
-        label: name.replace("flow_", "子流程"),
+        label: name.replace("func_", "函数"),
         commands: [],
       });
       this.activeTab = id;
     },
     removeFlow(flow) {
       const index = this.flows.findIndex((f) => f.id === flow.id);
-      if (index > -1 && flow.id !== "main") {
-        this.flows.splice(index, 1);
+      if (index > -1) {
+        this.subFlows.splice(index, 1);
         this.activeTab = this.flows[0].id;
       }
     },
@@ -156,22 +173,10 @@ export default defineComponent({
     },
     generateAllFlowCode() {
       // 生成所有flow的代码
-      return this.flows
-        .reverse()
+      return [...this.subFlows, this.mainFlow]
         .map((flow) => this.generateFlowCode(flow))
         .join("\n\n");
     },
-    handleFlowAction(type, payload, flow) {
-      if (type === "close") {
-        const index = this.flows.findIndex((f) => f.id === flow.id);
-        if (index > -1 && this.flows.length > 1) {
-          this.flows.splice(index, 1);
-          this.activeTab = this.flows[0].id;
-        }
-      } else {
-        this.handleAction(type, payload);
-      }
-    },
     handleAction(type, payload) {
       switch (type) {
         case "save":
@@ -269,7 +274,7 @@ export default defineComponent({
     finishEdit(flow) {
       flow.isEditing = false;
       if (!flow.label) {
-        flow.label = this.generateFlowName().replace("flow_", "子流程");
+        flow.label = this.generateFlowName().replace("func_", "函数");
       }
     },
   },
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index bb5b6056..da9071aa 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -145,7 +145,9 @@ export default defineComponent({
         });
       },
       typeToggleTooltip() {
-        const currentType = this.isString ? "字符串" : "变量、数字、表达式等";
+        const currentType = this.isString
+          ? "字符串"
+          : "变量、数字、表达式、函数等";
         const toggleText = this.disableToggleType ? "" : "，点击切换";
         return `当前类型是：${currentType}${toggleText}`;
       },
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index 90b22922..148af199 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -5,23 +5,23 @@
     stretch
     size="sm"
     class="variable-dropdown"
-    @click="variables = getAvailableVariables()"
+    @click="({ variables, functions } = getAvailableVariablesAndFunctions())"
   >
     <q-list class="variable-list">
       <q-item-label header class="variable-label">
         <q-icon name="functions" />
-        <span>选择变量</span>
+        <span>选择变量或函数</span>
       </q-item-label>
 
       <q-separator class="q-my-xs" />
 
-      <template v-if="variables.length">
+      <template v-if="variables.length || functions.length">
         <q-item
           v-for="variable in variables"
           :key="variable.name"
           clickable
           v-close-popup
-          @click="insertVariable(variable)"
+          @click="insertValue(variable.name)"
           class="variable-item"
         >
           <q-item-section>
@@ -33,6 +33,21 @@
             </q-item-label>
           </q-item-section>
         </q-item>
+        <q-separator v-if="variables.length" />
+        <q-item
+          v-for="func in functions"
+          :key="func.value"
+          clickable
+          v-close-popup
+          @click="insertValue(func.value + '()')"
+          class="variable-item"
+        >
+          <q-item-section>
+            <q-item-label class="variable-name">
+              {{ func.label }}
+            </q-item-label>
+          </q-item-section>
+        </q-item>
       </template>
       <template v-else>
         <q-item>
@@ -41,12 +56,17 @@
               <div class="q-gutter-md">
                 <div class="row items-center justify-center text-grey-6">
                   <q-icon name="info" size="20px" class="q-mr-sm" />
-                  <span>当前命令没有可用变量</span>
+                  <span>当前命令没有可用变量或函数</span>
                 </div>
                 <div class="row items-center justify-center text-grey-7">
-                  <div class="text-grey-7">点击其他命令卡片右上角的</div>
+                  <div>点击其他命令右上角</div>
                   <q-icon name="output" size="16px" class="q-mx-xs" />
-                  <div>按钮添加输出变量</div>
+                  <div>按钮添加变量</div>
+                </div>
+                <div class="row items-center justify-center text-grey-7">
+                  <div>或点击主流程右边的</div>
+                  <q-icon name="add" size="16px" class="q-mx-xs" />
+                  <div>按钮添加函数</div>
                 </div>
               </div>
             </q-item-label>
@@ -73,18 +93,28 @@ export default defineComponent({
       );
     };
 
+    const getCurrentFunctions = inject("getCurrentFunctions");
+
+    const getAvailableVariablesAndFunctions = () => {
+      return {
+        variables: getAvailableVariables(),
+        functions: getCurrentFunctions(),
+      };
+    };
+
     return {
-      getAvailableVariables,
+      getAvailableVariablesAndFunctions,
     };
   },
   data() {
     return {
       variables: [],
+      functions: [],
     };
   },
   methods: {
-    insertVariable(variable) {
-      this.$emit("emitValue", "var", variable.name);
+    insertValue(value) {
+      this.$emit("emitValue", "var", value);
     },
   },
 });

From 0094cb6c2929207f2c4feeb6e81697678e14ddd8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 21 Jan 2025 23:27:53 +0800
Subject: [PATCH 092/332] =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8B=96=E5=8A=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue | 77 ++++++++++++++++------------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 18bc9d61..efaf1afd 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -23,38 +23,47 @@
           narrow-indicator
           outside-arrows
         >
-          <template v-for="flow in subFlows" :key="flow.id">
-            <q-tab :name="flow.id" class="flow-tab" no-caps>
-              <div class="flow-tab-content">
-                <template v-if="flow.isEditing">
-                  <q-input
-                    v-model="flow.label"
+          <draggable
+            v-model="subFlows"
+            :animation="150"
+            item-key="id"
+            tag="div"
+            class="row no-wrap"
+            handle=".flow-tab-content"
+          >
+            <template #item="{ element: flow }">
+              <q-tab :name="flow.id" class="flow-tab" no-caps>
+                <div class="flow-tab-content">
+                  <template v-if="flow.isEditing">
+                    <q-input
+                      v-model="flow.label"
+                      dense
+                      borderless
+                      class="flow-name-input"
+                      @keydown.space.prevent
+                      @blur="finishEdit(flow)"
+                      @keyup.enter="finishEdit(flow)"
+                      ref="inputRefs"
+                    />
+                  </template>
+                  <template v-else>
+                    <span class="flow-name-text" @dblclick="startEdit(flow)">{{
+                      flow.label
+                    }}</span>
+                  </template>
+                  <q-btn
+                    flat
                     dense
-                    borderless
-                    class="flow-name-input"
-                    @keydown.space.prevent
-                    @blur="finishEdit(flow)"
-                    @keyup.enter="finishEdit(flow)"
-                    ref="inputRefs"
+                    round
+                    icon="close"
+                    size="xs"
+                    @click.stop="removeFlow(flow)"
                   />
-                </template>
-                <template v-else>
-                  <span class="flow-name-text" @dblclick="startEdit(flow)">{{
-                    flow.label
-                  }}</span>
-                </template>
-                <q-btn
-                  flat
-                  dense
-                  round
-                  icon="close"
-                  size="xs"
-                  @click.stop="removeFlow(flow)"
-                />
-              </div>
-              <q-tooltip> 双击修改名称 </q-tooltip>
-            </q-tab>
-          </template>
+                </div>
+                <q-tooltip> 双击修改名称，拖动排序 </q-tooltip>
+              </q-tab>
+            </template>
+          </draggable>
         </q-tabs>
 
         <q-icon dense name="add" class="add-btn" @click="addFlow" />
@@ -84,18 +93,20 @@
 </template>
 
 <script>
-import { defineComponent, provide, reactive } from "vue";
+import { defineComponent, provide, ref } from "vue";
 import ComposerFlow from "./ComposerFlow.vue";
 import ComposerButtons from "./flow/ComposerButtons.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
+import draggable from "vuedraggable";
 
 export default defineComponent({
   name: "FlowTabs",
   components: {
     ComposerFlow,
     ComposerButtons,
+    draggable,
   },
   props: {
     showCloseButton: {
@@ -104,9 +115,9 @@ export default defineComponent({
     },
   },
   setup() {
-    const subFlows = reactive([]);
+    const subFlows = ref([]);
     const getCurrentFunctions = () => {
-      return subFlows.map((flow) => {
+      return subFlows.value.map((flow) => {
         return {
           label: flow.label,
           value: flow.name,

From d69c473fe790b66fb31537c724259bf2a750b9ae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 00:52:53 +0800
Subject: [PATCH 093/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E3=80=81=E5=AE=8C=E5=96=84=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?JS=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       |  7 ++
 .../composer/card/CommandButtons.vue          |  1 +
 .../composer/script/ReturnEditor.vue          | 92 +++++++++++++++++++
 src/js/composer/cardComponents.js             |  5 +
 src/js/composer/commands/scriptCommands.js    | 15 ++-
 5 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 src/components/composer/script/ReturnEditor.vue

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 79f77148..836a763e 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -102,6 +102,9 @@ export default defineComponent({
       this.updateModelValue(this.funcName, newArgvs);
     },
     generateCode(funcName, argvs) {
+      if (this.localCommand.isExpression) {
+        return argvs.join("");
+      }
       /**
        * 字符串模式stringfiy后，null会变成'"null"', ''变成'""'
        * 变量模式stringify后，null变成'null', ''保持''
@@ -140,6 +143,10 @@ export default defineComponent({
       let argvs = window.lodashM.cloneDeep(this.defaultArgvs);
       if (!code) return argvs;
 
+      if (this.localCommand.isExpression) {
+        return [code];
+      }
+
       const variableFormatPaths = [];
 
       const addVariableFormatPath = (prefix, config) => {
diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 7c894f7a..a1364b31 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -21,6 +21,7 @@
         <!-- 保存变量按钮 -->
         <q-icon
           :name="command.saveOutput ? 'data_object' : 'output'"
+          v-if="!command.neverHasOutput"
           class="output-btn"
           @click="$emit('toggle-output')"
         >
diff --git a/src/components/composer/script/ReturnEditor.vue b/src/components/composer/script/ReturnEditor.vue
new file mode 100644
index 00000000..03fa298f
--- /dev/null
+++ b/src/components/composer/script/ReturnEditor.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="row items-center">
+    <div class="col-2 return-label text-h6">return</div>
+    <div class="col-10">
+      <VariableInput
+        :model-value="argvs.returnValue"
+        @update:modelValue="updateArgvs('returnValue', $event)"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
+import VariableInput from "components/composer/common/VariableInput.vue";
+import { parseFunction, stringifyArgv } from "js/composer/formatString";
+
+export default defineComponent({
+  name: "ReturnEditor",
+  props: {
+    modelValue: Object,
+  },
+  components: {
+    VariableInput,
+  },
+  emits: ["update:modelValue"],
+  data() {
+    return {
+      defaultArgvs: {
+        returnValue: newVarInputVal("var"),
+      },
+    };
+  },
+  computed: {
+    argvs() {
+      return (
+        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+      );
+    },
+  },
+  methods: {
+    parseCodeToArgvs(code) {
+      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
+      if (!code) return argvs;
+      code = code.trim().replace(/^return\s(.*)/, "tempFunc($1)");
+      try {
+        const variableFormatPaths = ["arg0"];
+        const params = parseFunction(code, { variableFormatPaths });
+        return {
+          returnValue: params.argvs[0],
+        };
+      } catch (e) {
+        console.error("解析参数失败:", e);
+      }
+      return argvs;
+    },
+    generateCode(argvs = this.argvs) {
+      return `${this.modelValue.value} ${stringifyArgv(argvs.returnValue)}`;
+    },
+    getSummary(argvs) {
+      return "返回" + " " + argvs.returnValue.value;
+    },
+    updateArgvs(key, newValue) {
+      this.argvs[key] = newValue;
+      this.updateModelValue(this.argvs);
+    },
+    updateModelValue(argvs) {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        summary: this.getSummary(argvs),
+        argvs,
+        code: this.generateCode(argvs),
+      });
+    },
+  },
+  mounted() {
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
+    }
+  },
+});
+</script>
+
+<style scoped>
+.return-label {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index d9f8933c..c317c28f 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -50,3 +50,8 @@ export const SystemCommandEditor = defineAsyncComponent(() =>
 export const SelectListEditor = defineAsyncComponent(() =>
   import("components/composer/ui/SelectListEditor.vue")
 );
+
+// 编程组件
+export const ReturnEditor = defineAsyncComponent(() =>
+  import("components/composer/script/ReturnEditor.vue")
+);
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index f33a5f72..c468cf6f 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -17,9 +17,11 @@ export const scriptCommands = {
       ],
     },
     {
-      value: "(function(code){new Function(code)()})",
+      value: "injectJs",
       label: "注入JS脚本",
       icon: "script",
+      neverHasOutput: true,
+      isExpression: true,
       config: [
         {
           label: "JS脚本",
@@ -29,11 +31,10 @@ export const scriptCommands = {
       ],
     },
     {
-      value: "quickcommand.runAppleScript",
-      label: "执行 AppleScript",
+      value: "quickcommand.runCode",
+      label: "执行代码",
       icon: "script",
       outputVariable: "result",
-      saveOutput: true,
       config: [
         {
           label: "脚本",
@@ -42,5 +43,11 @@ export const scriptCommands = {
         },
       ],
     },
+    {
+      value: "return",
+      label: "函数返回",
+      neverHasOutput: true,
+      component: "ReturnEditor",
+    },
   ],
 };

From 31e9ca69569a212b6bb325a61ee13002a8360da8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 08:39:15 +0800
Subject: [PATCH 094/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=20DropArea=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E7=94=A8=E6=9D=A1=E4=BB=B6=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E6=9B=BF=E6=8D=A2=20EmptyFlow=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E6=8B=96=E6=94=BE=E8=A7=86=E8=A7=89=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=20EmptyFlow.vue=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerFlow.vue   |  6 +-
 src/components/composer/flow/DropArea.vue  | 97 +++++++++++++++++++---
 src/components/composer/flow/EmptyFlow.vue | 44 ----------
 3 files changed, 88 insertions(+), 59 deletions(-)
 delete mode 100644 src/components/composer/flow/EmptyFlow.vue

diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index d94171a3..4d6a9727 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -49,8 +49,8 @@
             </transition>
           </template>
         </draggable>
-        <EmptyFlow v-if="commands.length === 0" />
-        <DropArea v-else />
+        <DropArea v-if="commands.length === 0" type="empty" />
+        <DropArea v-else type="add" />
       </div>
     </q-scroll-area>
   </div>
@@ -61,7 +61,6 @@ import { defineComponent, inject } from "vue";
 import draggable from "vuedraggable";
 import ComposerCard from "./ComposerCard.vue";
 import ChainStyles from "./flow/ChainStyles.vue";
-import EmptyFlow from "./flow/EmptyFlow.vue";
 import DropArea from "./flow/DropArea.vue";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { processVariable } from "js/composer/variableManager";
@@ -75,7 +74,6 @@ export default defineComponent({
     draggable,
     ComposerCard,
     ChainStyles,
-    EmptyFlow,
     DropArea,
   },
   props: {
diff --git a/src/components/composer/flow/DropArea.vue b/src/components/composer/flow/DropArea.vue
index 2c6ff9ef..1c0ac87f 100644
--- a/src/components/composer/flow/DropArea.vue
+++ b/src/components/composer/flow/DropArea.vue
@@ -1,6 +1,24 @@
 <template>
-  <div class="drop-area">
-    <q-icon name="add" size="32px" />
+  <div
+    class="drop-area"
+    @dragenter="isDragging = true"
+    @dragleave="isDragging = false"
+    @drop="isDragging = false"
+    :class="{
+      'drop-area-dragging': isDragging,
+    }"
+  >
+    <template v-if="type === 'add'">
+      <div class="add-area">
+        <q-icon name="add" size="32px" />
+      </div>
+    </template>
+    <template v-else-if="type === 'empty'">
+      <div class="empty-area">
+        <q-icon name="drag_indicator" size="32px" />
+        <div class="text-body2">从左侧拖拽命令到这里开始编排</div>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -8,25 +26,82 @@
 import { defineComponent } from "vue";
 
 export default defineComponent({
-  name: "DropArea",
+  name: "EmptyFlow",
+  props: {
+    type: {
+      type: String,
+      default: "add",
+    },
+  },
+  data() {
+    return {
+      isDragging: false,
+    };
+  },
 });
 </script>
 
 <style scoped>
 .drop-area {
-  flex: 1;
-  min-height: 50px;
-  border-radius: 8px;
-  margin: 8px;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: #9994;
-  border: 2px dashed #9994;
+  border: 2px dashed #e0e0e0;
+  border-radius: 4px;
+  margin: 8px 0;
+  transition: all 0.3s ease;
+  flex: 1;
+  user-select: none;
+  transition: all 0.3s ease;
 }
 
 .body--dark .drop-area {
-  color: #6664;
-  border: 2px dashed #6664;
+  border-color: #676666;
+}
+
+.drop-area:hover,
+.drop-area-dragging {
+  border-color: #bdbdbd;
+  background-color: #f9f9f9;
+}
+
+.body--dark .drop-area:hover,
+.body--dark .drop-area-dragging {
+  border: 2px dashed #676666;
+  background-color: #303132;
+}
+
+.drop-area-dragging {
+  position: relative;
+  animation: shake 0.5s ease-in-out infinite;
+}
+
+@keyframes shake {
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+  25% {
+    transform: rotate(-0.1deg);
+  }
+  75% {
+    transform: rotate(0.1deg);
+  }
+}
+
+.add-area,
+.empty-area {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: grey
+}
+
+.add-area {
+  height: 30px;
+}
+
+.empty-area {
+  height: 200px;
 }
 </style>
diff --git a/src/components/composer/flow/EmptyFlow.vue b/src/components/composer/flow/EmptyFlow.vue
deleted file mode 100644
index e3fb923a..00000000
--- a/src/components/composer/flow/EmptyFlow.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="empty-flow">
-    <div class="text-center text-grey-6">
-      <q-icon name="drag_indicator" size="32px" />
-      <div class="text-body2 q-mt-sm">从左侧拖拽命令到这里开始编排</div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-
-export default defineComponent({
-  name: "EmptyFlow",
-});
-</script>
-
-<style scoped>
-.empty-flow {
-  min-height: 200px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 2px dashed #e0e0e0;
-  border-radius: 4px;
-  margin: 8px 0;
-  transition: all 0.3s ease;
-  flex: 1;
-}
-
-.body--dark .empty-flow {
-  border: 2px dashed #676666;
-}
-
-.empty-flow:hover {
-  border-color: #bdbdbd;
-  background-color: #fafafa;
-}
-
-.body--dark .empty-flow:hover {
-  border-color: #676666;
-  background-color: #303132;
-}
-</style>

From 26fd4f5e1975ffdb768ac8820da9f4aebdb0c6d6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 09:06:17 +0800
Subject: [PATCH 095/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BA=86CommandCompo?=
 =?UTF-8?q?ser=E5=92=8CFlowTabs=E7=BB=84=E4=BB=B6=EF=BC=9A=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=B9=B6=E7=AE=80=E5=8C=96=E4=BA=86=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=82=E6=9B=B4=E6=96=B0=E4=BA=86=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E7=A7=B0=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E6=B8=85=E6=99=B0=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/CommandComposer.vue | 44 +------------
 src/components/composer/FlowTabs.vue        | 68 ++++++++++++++-------
 src/js/composer/variableManager.js          | 12 ++--
 3 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 5b0dccf0..a13c8d84 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -4,7 +4,7 @@
     <div class="composer-body row no-wrap">
       <!-- 左侧命令列表 -->
       <div class="command-section" style="width: 180px">
-        <ComposerList :commands="availableCommands" @add-command="addCommand" />
+        <ComposerList :commands="availableCommands" />
       </div>
 
       <!-- 右侧命令流程 -->
@@ -22,11 +22,10 @@
 </template>
 
 <script>
-import { defineComponent, provide, ref } from "vue";
+import { defineComponent } from "vue";
 import ComposerList from "./ComposerList.vue";
 import FlowTabs from "./FlowTabs.vue";
 import { availableCommands } from "js/composer/composerConfig";
-import { parseVariables } from "js/composer/variableManager";
 
 export default defineComponent({
   name: "CommandComposer",
@@ -34,36 +33,6 @@ export default defineComponent({
     ComposerList,
     FlowTabs,
   },
-  setup() {
-    const commandFlow = ref([]);
-
-    // 提供获取当前变量的函数，直接返回解析后的变量列表
-    const getCurrentVariables = () => {
-      const variables = [];
-      for (const [index, cmd] of commandFlow.value.entries()) {
-        if (cmd.saveOutput && cmd.outputVariable) {
-          variables.push(
-            ...parseVariables(cmd.outputVariable).map((variable) => ({
-              name: variable,
-              // 提供来源命令的标志信息
-              sourceCommand: {
-                label: cmd.label,
-                id: cmd.id,
-                index,
-              },
-            }))
-          );
-        }
-      }
-      return variables;
-    };
-
-    provide("getCurrentVariables", getCurrentVariables);
-
-    return {
-      commandFlow,
-    };
-  },
   data() {
     return {
       availableCommands,
@@ -78,15 +47,6 @@ export default defineComponent({
   },
   emits: ["use-composer"],
   methods: {
-    addCommand(action) {
-      let newAction = window.lodashM.cloneDeep(action);
-      this.commandFlow.push({
-        ...newAction,
-        id: this.$root.getUniqueId(),
-        saveOutput: false,
-        outputVariable: null,
-      });
-    },
     handleComposer(type, code) {
       // 直接转发事件和代码
       this.$emit("use-composer", { type, code });
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index efaf1afd..29d3003e 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -93,14 +93,14 @@
 </template>
 
 <script>
-import { defineComponent, provide, ref } from "vue";
+import { defineComponent, provide, ref, computed } from "vue";
 import ComposerFlow from "./ComposerFlow.vue";
 import ComposerButtons from "./flow/ComposerButtons.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
 import draggable from "vuedraggable";
-
+import { parseVariables } from "js/composer/variableManager";
 export default defineComponent({
   name: "FlowTabs",
   components: {
@@ -115,7 +115,16 @@ export default defineComponent({
     },
   },
   setup() {
+    const mainFlow = ref({
+      id: "main",
+      name: "main",
+      label: "主流程",
+      commands: [],
+    });
+
     const subFlows = ref([]);
+
+    // 获取所有函数
     const getCurrentFunctions = () => {
       return subFlows.value.map((flow) => {
         return {
@@ -125,31 +134,42 @@ export default defineComponent({
       });
     };
     provide("getCurrentFunctions", getCurrentFunctions);
-    return { subFlows };
+
+    const flows = computed(() => [mainFlow.value, ...subFlows.value]);
+
+    const activeTab = ref("main");
+
+    // 获取当前函数所有变量
+    const getCurrentVariables = () => {
+      const variables = [];
+      const currentFlow = flows.value.find((flow) => flow.id === activeTab.value);
+      for (const [index, cmd] of currentFlow.commands.entries()) {
+        if (cmd.saveOutput && cmd.outputVariable) {
+          variables.push(
+            ...parseVariables(cmd.outputVariable).map((variable) => ({
+              name: variable,
+              // 提供来源命令的标志信息
+              sourceCommand: {
+                label: cmd.label,
+                id: cmd.id,
+                index,
+              },
+            }))
+          );
+        }
+      }
+      return variables;
+    };
+
+    provide("getCurrentVariables", getCurrentVariables);
+
+    return { flows, mainFlow, subFlows, activeTab };
   },
   data() {
     return {
-      activeTab: "main",
       isAllCollapsed: false,
-      mainFlow: {
-        id: "main",
-        name: "main",
-        label: "主流程",
-        commands: [],
-      },
     };
   },
-  computed: {
-    flows: {
-      get() {
-        return [this.mainFlow, ...this.subFlows];
-      },
-      set(value) {
-        this.mainFlow = value[0];
-        this.subFlows = value.slice(1);
-      },
-    },
-  },
   methods: {
     generateFlowName(baseName = "func_") {
       return (
@@ -240,7 +260,7 @@ export default defineComponent({
       if (!savedFlows) return;
 
       const flowsData = JSON.parse(savedFlows);
-      this.flows = flowsData.map((flow) => ({
+      const newFlows = flowsData.map((flow) => ({
         ...flow,
         commands: flow.commands.map((cmd) => {
           const command = findCommandByValue(cmd.value);
@@ -250,7 +270,9 @@ export default defineComponent({
           };
         }),
       }));
-      this.activeTab = this.flows[0].id;
+      this.mainFlow = newFlows[0];
+      this.subFlows = newFlows.slice(1);
+      this.activeTab = this.mainFlow.id;
     },
     runFlows(flow) {
       const code = flow
diff --git a/src/js/composer/variableManager.js b/src/js/composer/variableManager.js
index 53ad32e7..d54ec965 100644
--- a/src/js/composer/variableManager.js
+++ b/src/js/composer/variableManager.js
@@ -50,7 +50,7 @@ export function parseVariables(value) {
  * @param {string} [currentName] - 当前的变量名（如果有）
  * @returns {string} 有效的变量名
  */
-function generateValidVarName(baseName, existingVars, currentName = null) {
+function generateValidVarName(currentName, existingVars) {
   // 如果当前名称有效且不重复，直接返回
   if (
     currentName &&
@@ -60,13 +60,13 @@ function generateValidVarName(baseName, existingVars, currentName = null) {
     return currentName;
   }
 
-  // 如果变量名无效，生成一个随机变量名
-  if (!validateVariableName(baseName).isValid) {
-    baseName = "var" + generateRandomSuffix(existingVars.length);
+  // 如果变量名无效，改为var开头
+  if (!validateVariableName(currentName).isValid) {
+    currentName = "var";
   }
 
-  // 如果变量名重复，添加随机后缀直到不重复
-  let finalName = baseName + generateUniqSuffix(baseName, existingVars);
+  // 添加随机后缀直到不重复
+  let finalName = currentName + generateUniqSuffix(currentName, existingVars);
 
   return finalName;
 }

From 839ea699218e0b9916c67397ca75b033b42176e0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 12:01:16 +0800
Subject: [PATCH 096/332] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=20FlowTabs=20?=
 =?UTF-8?q?=E5=92=8C=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=EF=BC=9A=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5=E4=BA=86=20VariableManager=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A5=E6=9B=B4=E5=A5=BD=E5=9C=B0=E5=A4=84=E7=90=86=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BA=86=20ComposerFlow=20?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=B9=B6=E6=94=B9=E8=BF=9B=E4=BA=86=20Variab?=
 =?UTF-8?q?leList=20=E4=B8=AD=E7=9A=84=E5=8F=98=E9=87=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E3=80=82=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=B9=B6=E8=B0=83=E6=95=B4=E4=BA=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E4=BB=A5=E5=8C=85=E5=90=AB=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue          |  92 ++++-
 .../composer/common/varinput/VariableList.vue | 136 ++++---
 .../composer/flow/ComposerButtons.vue         |   9 +
 .../composer/flow/VariableManager.vue         | 363 ++++++++++++++++++
 src/js/composer/generateCode.js               |  13 +-
 5 files changed, 557 insertions(+), 56 deletions(-)
 create mode 100644 src/components/composer/flow/VariableManager.vue

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 29d3003e..7ede6b22 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -77,17 +77,28 @@
       />
     </div>
 
-    <div class="flow-container">
+    <div
+      class="flow-container"
+      v-for="flow in flows"
+      :key="flow.id"
+      v-show="activeTab === flow.id"
+    >
       <ComposerFlow
-        v-for="flow in flows"
-        v-show="activeTab === flow.id"
-        :key="flow.id"
+        class="flow-wrapper"
         v-model="flow.commands"
         :generate-code="() => generateFlowCode(flow)"
         :show-close-button="flows.length > 1"
         @action="http://github.com/(type,%20payload)%20=%3E%20handleAction(type,%20payload)"
         ref="flowRefs"
       />
+      <VariableManager
+        v-model="showVariableManager"
+        :variables="flow.customVariables"
+        @update:variables="flow.customVariables = $event"
+        :is-main-flow="flow.id === 'main'"
+        :output-variables="outputVariables"
+        class="variable-panel"
+      />
     </div>
   </div>
 </template>
@@ -96,6 +107,7 @@
 import { defineComponent, provide, ref, computed } from "vue";
 import ComposerFlow from "./ComposerFlow.vue";
 import ComposerButtons from "./flow/ComposerButtons.vue";
+import VariableManager from "./flow/VariableManager.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
@@ -107,6 +119,7 @@ export default defineComponent({
     ComposerFlow,
     ComposerButtons,
     draggable,
+    VariableManager,
   },
   props: {
     showCloseButton: {
@@ -120,6 +133,7 @@ export default defineComponent({
       name: "main",
       label: "主流程",
       commands: [],
+      customVariables: [],
     });
 
     const subFlows = ref([]);
@@ -130,6 +144,7 @@ export default defineComponent({
         return {
           label: flow.label,
           value: flow.name,
+          id: flow.id,
         };
       });
     };
@@ -139,11 +154,14 @@ export default defineComponent({
 
     const activeTab = ref("main");
 
-    // 获取当前函数所有变量
-    const getCurrentVariables = () => {
+    const getCurrentFlow = () => {
+      return flows.value.find((flow) => flow.id === activeTab.value);
+    };
+
+    // 获取当前函数所有输出变量
+    const getOutputVariables = (flow = getCurrentFlow()) => {
       const variables = [];
-      const currentFlow = flows.value.find((flow) => flow.id === activeTab.value);
-      for (const [index, cmd] of currentFlow.commands.entries()) {
+      for (const [index, cmd] of flow.commands.entries()) {
         if (cmd.saveOutput && cmd.outputVariable) {
           variables.push(
             ...parseVariables(cmd.outputVariable).map((variable) => ({
@@ -154,6 +172,7 @@ export default defineComponent({
                 id: cmd.id,
                 index,
               },
+              type: "output",
             }))
           );
         }
@@ -161,13 +180,48 @@ export default defineComponent({
       return variables;
     };
 
+    const getFunctionParams = (flowId) => {
+      const flow = flows.value.find((f) => f.id === flowId);
+      return flow.customVariables.filter((v) => v.type === "param");
+    };
+
+    provide("getFunctionParams", getFunctionParams);
+
+    /**
+     * 获取当前函数所有变量
+     * 返回格式：
+     * [
+     *   { name: "变量名", type: "变量类型", sourceCommand: { label: "变量来源" , index?: 来源命令索引, id?: 来源命令id} }
+     * ]
+     */
+    const getCurrentVariables = () => {
+      const currentFlow = getCurrentFlow();
+      const variables = getOutputVariables(currentFlow);
+      const customVariables = currentFlow.customVariables.map((v) => ({
+        name: v.name,
+        type: v.type,
+        sourceCommand: {
+          label: v.type === "param" ? "函数参数" : "局部变量",
+        },
+      }));
+      return [...customVariables, ...variables];
+    };
+
     provide("getCurrentVariables", getCurrentVariables);
 
-    return { flows, mainFlow, subFlows, activeTab };
+    return {
+      flows,
+      mainFlow,
+      subFlows,
+      activeTab,
+      getOutputVariables,
+    };
   },
   data() {
     return {
       isAllCollapsed: false,
+      showVariableManager: false,
+      outputVariables: [],
     };
   },
   methods: {
@@ -189,6 +243,7 @@ export default defineComponent({
         name,
         label: name.replace("func_", "函数"),
         commands: [],
+        customVariables: [],
       });
       this.activeTab = id;
     },
@@ -225,6 +280,10 @@ export default defineComponent({
         case "expandAll":
           this.expandAll();
           break;
+        case "toggleVariableManager":
+          this.showVariableManager = !this.showVariableManager;
+          this.outputVariables = this.getOutputVariables();
+          break;
         default:
           this.$emit("action", type, this.generateAllFlowCode());
       }
@@ -432,8 +491,19 @@ export default defineComponent({
   overflow: hidden;
 }
 
-.body--dark .tabs-header {
-  border-bottom-color: rgba(255, 255, 255, 0.05);
+.flow-wrapper {
+  flex: 1;
+  position: relative;
+  overflow: hidden;
+  height: 100%;
+}
+
+.variable-panel {
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 10;
 }
 
 .main-btn {
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index 148af199..bbed4695 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -8,46 +8,59 @@
     @click="({ variables, functions } = getAvailableVariablesAndFunctions())"
   >
     <q-list class="variable-list">
-      <q-item-label header class="variable-label">
-        <q-icon name="functions" />
-        <span>选择变量或函数</span>
-      </q-item-label>
-
-      <q-separator class="q-my-xs" />
-
       <template v-if="variables.length || functions.length">
-        <q-item
-          v-for="variable in variables"
-          :key="variable.name"
-          clickable
-          v-close-popup
-          @click="insertValue(variable.name)"
-          class="variable-item"
-        >
-          <q-item-section>
-            <q-item-label class="variable-name">
-              {{ variable.name }}
-            </q-item-label>
-            <q-item-label caption class="variable-source">
-              来自: {{ variable.sourceCommand.label }}
-            </q-item-label>
-          </q-item-section>
-        </q-item>
-        <q-separator v-if="variables.length" />
-        <q-item
-          v-for="func in functions"
-          :key="func.value"
-          clickable
-          v-close-popup
-          @click="insertValue(func.value + '()')"
-          class="variable-item"
-        >
-          <q-item-section>
-            <q-item-label class="variable-name">
-              {{ func.label }}
-            </q-item-label>
-          </q-item-section>
-        </q-item>
+        <div v-if="variables.length">
+          <q-item-label header class="variable-label">
+            <q-separator class="separator-left" />
+            <div class="label-content">
+              <span>变量</span>
+            </div>
+            <q-separator class="separator-right" />
+          </q-item-label>
+          <q-item
+            v-for="variable in variables"
+            :key="variable.name"
+            clickable
+            v-close-popup
+            @click="insertValue(variable.name)"
+            class="variable-item"
+          >
+            <q-item-section>
+              <q-item-label class="variable-name">
+                {{ variable.name }}
+              </q-item-label>
+              <q-item-label caption class="variable-source">
+                来自: {{ variable.sourceCommand.label }}
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+        </div>
+        <div v-if="functions.length">
+          <q-item-label header class="variable-label">
+            <q-separator class="separator-left" />
+            <div class="label-content">
+              <span>函数</span>
+            </div>
+            <q-separator class="separator-right" />
+          </q-item-label>
+          <q-item
+            v-for="func in functions"
+            :key="func.id"
+            clickable
+            v-close-popup
+            @click="insertValue(func.value + getInsertFunctionParams(func.id))"
+            class="variable-item"
+          >
+            <q-item-section>
+              <q-item-label class="variable-name">
+                {{ func.value }}
+              </q-item-label>
+              <q-item-label caption class="variable-source">
+                {{ func.label }}
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+        </div>
       </template>
       <template v-else>
         <q-item>
@@ -88,8 +101,13 @@ export default defineComponent({
     const commandIndex = inject("commandIndex", null);
 
     const getAvailableVariables = () => {
-      return getCurrentVariables().filter(
-        (variable) => variable.sourceCommand.index < commandIndex.value
+      const variables = getCurrentVariables();
+      return variables.filter((variable) =>
+        // 输出变量只显示在当前命令之前的
+        variable.type === "output"
+          ? variable.sourceCommand.index < commandIndex.value
+          : // 参数和局部变量显示所有
+            true
       );
     };
 
@@ -102,8 +120,11 @@ export default defineComponent({
       };
     };
 
+    const getFunctionParams = inject("getFunctionParams");
+
     return {
       getAvailableVariablesAndFunctions,
+      getFunctionParams,
     };
   },
   data() {
@@ -116,6 +137,15 @@ export default defineComponent({
     insertValue(value) {
       this.$emit("emitValue", "var", value);
     },
+    getInsertFunctionParams(funcId) {
+      return (
+        "(" +
+        this.getFunctionParams(funcId)
+          .map((p) => p.name)
+          .join(", ") +
+        ")"
+      );
+    },
   },
 });
 </script>
@@ -129,7 +159,6 @@ export default defineComponent({
 }
 /* 变量列表样式 */
 .variable-list {
-  min-width: 200px;
   padding: 4px;
 }
 
@@ -137,7 +166,8 @@ export default defineComponent({
   border-radius: 4px;
   padding: 0px 16px;
   transition: all 0.3s ease;
-  min-height: 40px;
+  min-height: 32px;
+  text-align: center;
 }
 
 .variable-item:hover {
@@ -150,6 +180,25 @@ export default defineComponent({
   align-items: center;
   gap: 4px;
   font-size: 13px;
+  position: relative;
+}
+
+.separator-left {
+  min-width: 16px;
+  flex: 1;
+}
+
+.separator-right {
+  min-width: 16px;
+  flex: 1;
+}
+
+.label-content {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 0 8px;
+  white-space: nowrap;
 }
 
 .variable-name {
@@ -160,6 +209,7 @@ export default defineComponent({
 .variable-source {
   font-size: 11px;
   opacity: 0.7;
+  margin-top: 0;
 }
 
 /* 暗色模式适配 */
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 8a95b0f8..ae6312ef 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -11,6 +11,15 @@
         <q-tooltip>{{ isAllCollapsed ? "展开所有" : "折叠所有" }}</q-tooltip>
       </q-btn>
       <q-separator vertical />
+      <q-btn
+        icon="data_object"
+        dense
+        flat
+        @click="$emit('action', 'toggleVariableManager')"
+      >
+        <q-tooltip>变量管理</q-tooltip>
+      </q-btn>
+      <q-separator vertical />
       <q-btn
         @click="$q.dark.toggle()"
         :icon="$q.dark.isActive ? 'dark_mode' : 'light_mode'"
diff --git a/src/components/composer/flow/VariableManager.vue b/src/components/composer/flow/VariableManager.vue
new file mode 100644
index 00000000..88e3c985
--- /dev/null
+++ b/src/components/composer/flow/VariableManager.vue
@@ -0,0 +1,363 @@
+<template>
+  <div class="variable-manager" :class="{ 'is-visible': modelValue }">
+    <div class="variable-content">
+      <div class="variable-header">
+        <div class="header-title">变量管理</div>
+        <q-btn
+          flat
+          dense
+          round
+          icon="close"
+          size="sm"
+          @click="$emit('update:modelValue', false)"
+        />
+      </div>
+      <!-- 参数管理部分 -->
+      <div class="section" v-if="!isMainFlow">
+        <div class="section-header">
+          <div class="section-title">
+            <q-icon name="functions" size="16px" />
+            <div>函数参数</div>
+          </div>
+          <q-btn
+            flat
+            dense
+            round
+            icon="add"
+            size="sm"
+            @click="addVariable('param')"
+          />
+        </div>
+        <div class="var-list">
+          <div
+            v-for="(variable, index) in paramVariables"
+            :key="index"
+            class="var-item"
+          >
+            <q-input
+              v-model="variable.name"
+              dense
+              borderless
+              class="var-input"
+              @blur="validateVariable(variable, 'param')"
+              @keydown.enter="validateVariable(variable, 'param')"
+            />
+            <q-btn
+              flat
+              dense
+              round
+              icon="close"
+              size="xs"
+              @click="removeVariable(index, 'param')"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- 手动变量管理部分 -->
+      <div class="section">
+        <div class="section-header">
+          <div class="section-title">
+            <q-icon name="data_object" size="16px" />
+            <div>局部变量</div>
+          </div>
+          <q-btn
+            flat
+            dense
+            round
+            icon="add"
+            size="sm"
+            @click="addVariable('var')"
+          />
+        </div>
+        <div class="var-list">
+          <div
+            v-for="(variable, index) in customVars"
+            :key="index"
+            class="var-item"
+          >
+            <div class="var-inputs">
+              <q-input
+                v-model="variable.name"
+                dense
+                borderless
+                class="var-input"
+                placeholder="变量名"
+                @blur="validateVariable(variable, 'var')"
+                @keydown.enter="validateVariable(variable, 'var')"
+              />
+              <q-separator vertical />
+              <q-input
+                v-model="variable.value"
+                dense
+                borderless
+                class="var-input"
+                placeholder="变量值"
+              />
+            </div>
+            <q-btn
+              flat
+              dense
+              round
+              icon="close"
+              size="xs"
+              @click="removeVariable(index, 'var')"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- 输出变量展示部分 -->
+      <div class="section">
+        <div class="section-header">
+          <div class="section-title">
+            <q-icon name="output" size="16px" />
+            <div>来自输出</div>
+          </div>
+        </div>
+        <div class="var-list">
+          <div
+            v-for="(variable, index) in outputVariables"
+            :key="index"
+            class="var-item output-var"
+          >
+            <div class="var-name">{{ variable.name }}</div>
+            <div class="var-source">{{ variable.sourceCommand.label }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "VariableManager",
+  props: {
+    modelValue: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
+    isMainFlow: {
+      type: Boolean,
+      default: false,
+    },
+    variables: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+    outputVariables: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+  },
+  emits: ["update:modelValue", "update:variables"],
+  computed: {
+    customVariables: {
+      get() {
+        return this.variables || [];
+      },
+      set(value) {
+        this.$emit("update:variables", value);
+      },
+    },
+    paramVariables() {
+      return this.customVariables.filter((v) => v.type === "param");
+    },
+    customVars() {
+      return this.customVariables.filter((v) => v.type === "var");
+    },
+  },
+  methods: {
+    addVariable(type) {
+      const prefix = type === "param" ? "param_" : "var_";
+      const count = this.customVariables.filter((v) => v.type === type).length;
+      this.customVariables = [
+        ...this.customVariables,
+        {
+          name: prefix + (count + 1),
+          type,
+          value: type === "var" ? "" : undefined,
+        },
+      ];
+    },
+    removeVariable(index, type) {
+      const typeVars = this.customVariables.filter((v) => v.type === type);
+      const globalIndex = this.customVariables.indexOf(typeVars[index]);
+      if (globalIndex > -1) {
+        const newVars = [...this.customVariables];
+        newVars.splice(globalIndex, 1);
+        this.customVariables = newVars;
+      }
+    },
+    validateVariable(variable, type) {
+      if (!variable.name) {
+        const prefix = type === "param" ? "param_" : "var_";
+        const count = this.customVariables.filter(
+          (v) => v.type === type
+        ).length;
+        variable.name = prefix + count;
+      }
+    },
+  },
+});
+</script>
+
+<style scoped>
+.variable-manager {
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 0;
+  background: rgba(255, 255, 255, 0.95);
+  border-left: 1px solid rgba(0, 0, 0, 0.05);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  z-index: 10;
+  overflow: hidden;
+  border-radius: 0 0 8px 0;
+  box-shadow: -2px 0 8px rgba(0, 0, 0, 0.1);
+}
+
+.variable-manager.is-visible {
+  width: 200px;
+}
+
+.body--dark .variable-manager {
+  background: rgba(35, 35, 35, 0.95);
+  box-shadow: -2px 0 8px rgba(0, 0, 0, 0.2);
+}
+
+.variable-content {
+  opacity: 0;
+  transition: opacity 0.2s ease;
+  min-width: 200px;
+  padding: 8px;
+  height: 100%;
+  overflow-y: auto;
+  visibility: hidden;
+}
+
+.variable-manager.is-visible .variable-content {
+  opacity: 1;
+  visibility: visible;
+}
+
+.variable-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  margin: -8px -8px 8px -8px;
+}
+
+.header-title {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  font-weight: 500;
+  color: var(--q-primary);
+}
+
+.section {
+  margin-top: 4px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.section-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  opacity: 0.8;
+}
+
+.var-list {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 0 4px;
+}
+
+.var-item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background: rgba(0, 0, 0, 0.02);
+  transition: background-color 0.2s ease;
+  min-height: 32px;
+}
+
+.var-item:hover {
+  background: rgba(0, 0, 0, 0.04);
+}
+
+.body--dark .var-item:hover {
+  background: rgba(255, 255, 255, 0.08);
+}
+
+.var-inputs {
+  display: flex;
+  flex: 1;
+  gap: 8px;
+  height: 20px;
+}
+
+.var-input {
+  width: 0;
+  flex: 1 1 50%;
+}
+
+.var-input :deep(.q-field__control) {
+  height: 20px;
+  min-height: 20px;
+}
+
+.var-input :deep(.q-field__native) {
+  padding: 0;
+  font-size: 12px;
+  line-height: 20px;
+}
+
+.var-input :deep(.q-field__native::placeholder) {
+  color: rgba(0, 0, 0, 0.3);
+}
+
+.body--dark .var-input :deep(.q-field__native::placeholder) {
+  color: rgba(255, 255, 255, 0.3);
+}
+
+.output-var {
+  padding: 6px 8px;
+  font-size: 12px;
+}
+
+.var-name {
+  font-weight: 500;
+}
+
+.var-source {
+  margin-left: auto;
+  font-size: 11px;
+  opacity: 0.7;
+}
+</style>
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 81bada81..d972e76c 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -1,5 +1,9 @@
 export function generateCode(flow) {
-  const { commands, name, label } = flow;
+  const { commands, name, label, customVariables = [] } = flow;
+
+  const params = customVariables.filter((v) => v.type === "param") || [];
+  const manualVars =
+    customVariables.filter((v) => v.type === "var") || [];
   // 检查是否包含异步函数
   const hasAsyncFunction = commands.some((cmd) => cmd.isAsync);
 
@@ -8,8 +12,13 @@ export function generateCode(flow) {
 
   code.push(`// ${label}`);
   // 生成函数声明
-  code.push(`${hasAsyncFunction ? "async " : ""}function ${funcName}() {`);
+  code.push(
+    `${hasAsyncFunction ? "async " : ""}function ${funcName}(${params
+      .map((p) => p.name)
+      .join(", ")}) {`
+  );
 
+  code.push(manualVars.map((v) => `  let ${v.name} = ${v.value};`).join("\n"));
   const indent = "  ";
 
   commands.forEach((cmd) => {

From 11225985df8dfd23e89d228740ec4eb83f01398f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 12:05:26 +0800
Subject: [PATCH 097/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20FlowTabs=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=AD=90=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E5=B0=86=20removeFlow=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=B8=AD=E7=9A=84=20flows=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=20subFlows=EF=BC=8C=E4=BB=A5=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=90=E6=B5=81=E7=A8=8B=E7=9A=84=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B9=B6=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=20saveFlows=20=E6=96=B9=E6=B3=95=E4=BB=A5=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=20flow=20=E5=AF=B9=E8=B1=A1=E3=80=82?=
 =?UTF-8?q?=E6=AD=A4=E6=9B=B4=E6=94=B9=E6=8F=90=E9=AB=98=E4=BA=86=E5=AD=90?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E7=AE=A1=E7=90=86=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E7=9A=84=E5=87=86=E7=A1=AE=E6=80=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 7ede6b22..422b14d2 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -248,7 +248,7 @@ export default defineComponent({
       this.activeTab = id;
     },
     removeFlow(flow) {
-      const index = this.flows.findIndex((f) => f.id === flow.id);
+      const index = this.subFlows.findIndex((f) => f.id === flow.id);
       if (index > -1) {
         this.subFlows.splice(index, 1);
         this.activeTab = this.flows[0].id;
@@ -290,8 +290,7 @@ export default defineComponent({
     },
     saveFlows() {
       const flowsData = this.flows.map((flow) => ({
-        id: flow.id,
-        name: flow.name,
+        ...flow,
         commands: flow.commands.map((cmd) => {
           const cmdCopy = { ...cmd };
           // 移除不必要的属性

From a9f756acb7f7eef83f18af802acb63219a0e7fb3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:17:20 +0800
Subject: [PATCH 098/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E5=9C=A8browser.js=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=20getSelector=20=E5=87=BD=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=94=A8=E6=88=B7=E7=9B=B4=E6=8E=A5=E5=9C=A8?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=E9=80=89=E6=8B=A9=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E5=B9=B6=E8=BF=94=E5=9B=9E=E5=85=B6=E6=9C=80=E4=BC=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 82 ++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index a632786a..7ca06c38 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -201,7 +201,7 @@ const initCDP = async (port) => {
     } catch (err) {
       console.log(err);
       throw new Error(
-        `请确保浏览器已启动，且开启了远程调试端口(--remote-debugging-port=${port})`
+        `请先通过浏览器控制中的“启动浏览器”打开浏览器`
       );
     }
   }
@@ -376,6 +376,85 @@ const waitForElement = async (selector, timeout = 5000) => {
   throw new Error(`等待元素 ${selector} 超时`);
 };
 
+const getSelector = async () => {
+  return await executeScript(`
+    return new Promise((resolve) => {
+      // 创建高亮元素
+      const highlight = document.createElement('div');
+      highlight.style.cssText = 'position: fixed; pointer-events: none; z-index: 10000; background: rgba(130, 180, 230, 0.4); border: 2px solid rgba(130, 180, 230, 0.8); transition: all 0.2s;';
+      document.body.appendChild(highlight);
+
+      // 获取最优选择器
+      function getOptimalSelector(element) {
+        if (!element || element === document.body) return null;
+
+        // 尝试使用id
+        if (element.id) {
+          return '#' + element.id;
+        }
+
+        // 尝试使用类名组合
+        if (element.className && typeof element.className === 'string') {
+          const classes = element.className.trim().split(/\\s+/);
+          if (classes.length) {
+            const selector = '.' + classes.join('.');
+            if (document.querySelectorAll(selector).length === 1) {
+              return selector;
+            }
+          }
+        }
+
+        // 获取元素在同级中的索引
+        const parent = element.parentElement;
+        if (!parent) return null;
+
+        const siblings = Array.from(parent.children);
+        const index = siblings.indexOf(element);
+
+        // 递归获取父元素选择器
+        const parentSelector = getOptimalSelector(parent);
+        if (!parentSelector) return null;
+
+        return \`\${parentSelector} > \${element.tagName.toLowerCase()}:nth-child(\${index + 1})\`;
+      }
+
+      // 处理鼠标移动
+      function handleMouseMove(e) {
+        const target = e.target;
+        if (!target || target === highlight) return;
+
+        const rect = target.getBoundingClientRect();
+        highlight.style.left = rect.left + 'px';
+        highlight.style.top = rect.top + 'px';
+        highlight.style.width = rect.width + 'px';
+        highlight.style.height = rect.height + 'px';
+      }
+
+      // 处理点击
+      function handleClick(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const target = e.target;
+        if (!target || target === highlight) return;
+
+        const selector = getOptimalSelector(target);
+
+        // 清理
+        document.removeEventListener('mousemove', handleMouseMove);
+        document.removeEventListener('click', handleClick, true);
+        highlight.remove();
+
+        resolve(selector);
+        return false;
+      }
+
+      document.addEventListener('mousemove', handleMouseMove);
+      document.addEventListener('click', handleClick, true);
+    });
+  `);
+};
+
 module.exports = {
   launchBrowser,
   getUrl,
@@ -397,4 +476,5 @@ module.exports = {
   getScrollPosition,
   getPageSize,
   waitForElement,
+  getSelector,
 };

From 5cce8b001be5ff2caf066cdb0937bb2bc2451324 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:19:16 +0800
Subject: [PATCH 099/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96=E5=88=86=E7=B1=BB=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=8E=E5=8D=95=E7=8B=AC=E7=9A=84=E5=85=A5=E5=8F=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E4=B8=BA=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96/?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A0=87=E7=AD=BE=E3=80=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E3=80=81=E8=AE=BE=E7=BD=AECookie=E3=80=81?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96Cookie=E3=80=81=E6=B3=A8=E5=85=A5CSS=EF=BC=8C?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E6=93=8D=E4=BD=9C=E7=AD=89=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/browserCommands.js | 302 +++++++++++---------
 1 file changed, 170 insertions(+), 132 deletions(-)

diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 9cbe762c..00e61aad 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -76,8 +76,8 @@ export const browserCommands = {
     },
     {
       value: "quickcomposer.browser.getUrl",
-      label: "浏览器操作",
-      icon: "web",
+      label: "获取/设置网址",
+      icon: "link",
       isAsync: true,
       subCommands: [
         {
@@ -99,6 +99,13 @@ export const browserCommands = {
             },
           ],
         },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.getTabs",
+      label: "获取/切换标签",
+      icon: "tab",
+      subCommands: [
         {
           value: "quickcomposer.browser.getTabs",
           label: "获取标签列表",
@@ -119,40 +126,159 @@ export const browserCommands = {
             },
           ],
         },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.executeScript",
+      label: "执行脚本",
+      icon: "code",
+      config: [
         {
-          value: "quickcomposer.browser.executeScript",
-          label: "执行脚本",
+          label: "脚本内容",
+          component: "CodeEditor",
           icon: "code",
+          width: 12,
+          placeholder: "输入JavaScript代码",
+        },
+        {
+          topLabel: "要传递的参数",
+          component: "DictEditor",
+          icon: "data_array",
+          width: 12,
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.setCookie",
+      label: "Cookie操作",
+      icon: "cookie",
+      subCommands: [
+        {
+          value: "quickcomposer.browser.setCookie",
+          label: "设置Cookie",
+          icon: "cookie",
           config: [
             {
-              label: "脚本内容",
-              component: "CodeEditor",
-              icon: "code",
+              label: "Cookie",
+              component: "ArrayEditor",
+              icon: "cookie",
               width: 12,
-              placeholder: "输入JavaScript代码",
+              columns: {
+                name: {
+                  label: "名称",
+                  defaultValue: newVarInputVal("str"),
+                },
+                value: {
+                  label: "值",
+                  defaultValue: newVarInputVal("str"),
+                },
+              },
             },
             {
-              topLabel: "要传递的参数",
-              component: "DictEditor",
-              icon: "data_array",
+              label: "选项",
+              component: "OptionEditor",
+              icon: "settings",
               width: 12,
+              options: {
+                expires: {
+                  label: "过期时间",
+                  component: "QSelect",
+                  icon: "timer",
+                  width: 6,
+                  options: [
+                    { label: "关闭浏览器失效", value: false },
+                    { label: "1小时", value: 1 },
+                    { label: "1天", value: 24 },
+                    { label: "1年", value: 24 * 365 },
+                  ],
+                },
+                path: {
+                  label: "路径",
+                  component: "VariableInput",
+                  icon: "folder",
+                  width: 6,
+                },
+                domain: {
+                  label: "域名",
+                  component: "VariableInput",
+                  icon: "domain",
+                  width: 6,
+                },
+                secure: {
+                  label: "安全",
+                  component: "CheckButton",
+                  icon: "lock",
+                  width: 6,
+                },
+              },
+              defaultValue: {
+                expires: false,
+                path: newVarInputVal("str", "/"),
+                domain: newVarInputVal("str", ""),
+                secure: false,
+              },
             },
           ],
         },
         {
-          value: "quickcomposer.browser.clickElement",
-          label: "点击元素",
-          icon: "mouse",
+          value: "quickcomposer.browser.getCookie",
+          label: "获取Cookie",
+          icon: "cookie",
           config: [
             {
-              label: "选择器",
+              label: "名称",
               component: "VariableInput",
-              icon: "code",
+              icon: "label",
               width: 12,
-              placeholder: "输入CSS选择器",
+              placeholder: "输入Cookie名称",
             },
           ],
         },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.injectCSS",
+      label: "注入CSS",
+      icon: "style",
+      config: [
+        {
+          label: "CSS内容",
+          component: "CodeEditor",
+          icon: "style",
+          width: 12,
+          placeholder: "输入CSS代码",
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.getSelector",
+      label: "手动选择元素",
+      icon: "mouse",
+      isAsync: true,
+    },
+    {
+      value: "quickcomposer.browser.clickElement",
+      label: "元素操作",
+      icon: "web",
+      isAsync: true,
+      config: [
+        {
+          label: "选择器",
+          component: "VariableInput",
+          icon: "code",
+          width: 12,
+          placeholder: "输入CSS选择器",
+          options: {
+            cssSelector: true,
+          },
+        },
+      ],
+      subCommands: [
+        {
+          value: "quickcomposer.browser.clickElement",
+          label: "点击元素",
+          icon: "mouse",
+        },
         {
           value: "quickcomposer.browser.inputText",
           label: "输入文本",
@@ -231,100 +357,49 @@ export const browserCommands = {
           ],
         },
         {
-          value: "quickcomposer.browser.injectCSS",
-          label: "注入CSS",
-          icon: "style",
+          value: "quickcomposer.browser.scrollToElement",
+          label: "滚动到元素",
+          icon: "open_in_full",
           config: [
             {
-              label: "CSS内容",
-              component: "CodeEditor",
-              icon: "style",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
               width: 12,
-              placeholder: "输入CSS代码",
+              placeholder: "输入CSS选择器",
             },
           ],
         },
         {
-          value: "quickcomposer.browser.setCookie",
-          label: "设置Cookie",
-          icon: "cookie",
+          value: "quickcomposer.browser.waitForElement",
+          label: "等待元素",
+          icon: "hourglass_empty",
           config: [
             {
-              label: "Cookie",
-              component: "ArrayEditor",
-              icon: "cookie",
-              width: 12,
-              columns: {
-                name: {
-                  label: "名称",
-                  defaultValue: newVarInputVal("str"),
-                },
-                value: {
-                  label: "值",
-                  defaultValue: newVarInputVal("str"),
-                },
-              },
-            },
-            {
-              label: "选项",
-              component: "OptionEditor",
-              icon: "settings",
+              label: "选择器",
+              component: "VariableInput",
+              icon: "code",
               width: 12,
-              options: {
-                expires: {
-                  label: "过期时间",
-                  component: "QSelect",
-                  icon: "timer",
-                  width: 6,
-                  options: [
-                    { label: "关闭浏览器失效", value: false },
-                    { label: "1小时", value: 1 },
-                    { label: "1天", value: 24 },
-                    { label: "1年", value: 24 * 365 },
-                  ],
-                },
-                path: {
-                  label: "路径",
-                  component: "VariableInput",
-                  icon: "folder",
-                  width: 6,
-                },
-                domain: {
-                  label: "域名",
-                  component: "VariableInput",
-                  icon: "domain",
-                  width: 6,
-                },
-                secure: {
-                  label: "安全",
-                  component: "CheckButton",
-                  icon: "lock",
-                  width: 6,
-                },
-              },
-              defaultValue: {
-                expires: false,
-                path: newVarInputVal("str", "/"),
-                domain: newVarInputVal("str", ""),
-                secure: false,
-              },
+              placeholder: "输入CSS选择器",
             },
-          ],
-        },
-        {
-          value: "quickcomposer.browser.getCookie",
-          label: "获取Cookie",
-          icon: "cookie",
-          config: [
             {
-              label: "名称",
-              component: "VariableInput",
-              icon: "label",
+              label: "超时时间",
+              component: "NumberInput",
+              icon: "timer",
               width: 12,
-              placeholder: "输入Cookie名称",
+              defaultValue: 5000,
+              min: 1000,
+              step: 1000,
             },
           ],
         },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.scrollTo",
+      label: "滚动及页面尺寸",
+      icon: "open_in_full",
+      subCommands: [
         {
           value: "quickcomposer.browser.scrollTo",
           label: "滚动到位置",
@@ -346,20 +421,6 @@ export const browserCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.browser.scrollToElement",
-          label: "滚动到元素",
-          icon: "open_in_full",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
-        },
         {
           value: "quickcomposer.browser.getScrollPosition",
           label: "获取滚动位置",
@@ -370,29 +431,6 @@ export const browserCommands = {
           label: "获取页面尺寸",
           icon: "open_in_full",
         },
-        {
-          value: "quickcomposer.browser.waitForElement",
-          label: "等待元素",
-          icon: "hourglass_empty",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-            {
-              label: "超时时间",
-              component: "NumberInput",
-              icon: "timer",
-              width: 12,
-              defaultValue: 5000,
-              min: 1000,
-              step: 1000,
-            },
-          ],
-        },
       ],
     },
   ],

From cc8cabf374faf2ca4977bd2a1c4dc2df0c9b4d86 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:19:26 +0800
Subject: [PATCH 100/332] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20macOS=20=E5=92=8C?=
 =?UTF-8?q?=20Windows=20=E5=91=BD=E4=BB=A4=E4=B8=AD=E7=9A=84=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=8E=A7=E5=88=B6=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/macosCommands.js   | 29 --------------
 src/js/composer/commands/windowsCommands.js | 43 ---------------------
 2 files changed, 72 deletions(-)

diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index ef08a913..88ed4742 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -307,34 +307,5 @@ export const macosCommands = {
         },
       ],
     },
-    {
-      value: "quickcomposer.macos.browser.getUrl",
-      label: "浏览器控制",
-      icon: "web",
-      isAsync: true,
-      config: [
-        {
-          component: "ButtonGroup",
-          defaultValue: "Microsoft Edge",
-          options: [
-            {
-              label: "Edge 浏览器",
-              value: "Microsoft Edge",
-            },
-            {
-              label: "Chrome 浏览器",
-              value: "Google Chrome",
-            },
-          ],
-          width: 12,
-        },
-      ],
-      subCommands: browserCommands.commands.find(
-        (command) => command.label === "浏览器操作"
-      ).subCommands.map((command) => ({
-        ...command,
-        value: command.value.replace("quickcomposer.browser.", "quickcomposer.macos.browser."),
-      })),
-    },
   ],
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index a8f30a24..299cbf48 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -804,49 +804,6 @@ export const windowsCommands = {
         },
       ],
     },
-    // 浏览器
-    {
-      value: "quickcomposer.windows.browser.getUrl",
-      label: "浏览器控制",
-      icon: "language",
-      isAsync: true,
-      config: [
-        {
-          component: "ButtonGroup",
-          width: 12,
-          options: [
-            { label: "Microsoft Edge", value: "msedge" },
-            { label: "Google Chrome", value: "chrome" },
-          ],
-          defaultValue: "msedge",
-        },
-      ],
-      subCommands: browserCommands.commands
-        .find((command) => command.label === "浏览器操作")
-        .subCommands.map((command) => ({
-          ...command,
-          value: command.value.replace(
-            "quickcomposer.browser.",
-            "quickcomposer.windows.browser."
-          ),
-        }))
-        // 无法获得输出，过滤相关命令
-        .filter(
-          (command) =>
-            ![
-              "getTabs",
-              "activateTab",
-              "getText",
-              "getHtml",
-              "getCookie",
-              "getScrollPosition",
-              "getPageSize",
-              "waitForElement",
-            ]
-              .map((func) => `quickcomposer.windows.browser.${func}`)
-              .includes(command.value)
-        ),
-    },
     // 监控
     {
       value: "quickcomposer.windows.monitor.watchClipboard",

From ab83bb3d5f0f20c1a33029dc61d7e8da1577fbbf Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:20:38 +0800
Subject: [PATCH 101/332] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20VariableInput=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20CSS=20=E9=80=89=E6=8B=A9=E5=99=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 VariableInput 组件中添加了 CssSelector 组件，允许用户选择元素并获取其 CSS 选择器。
- 更新了 VariableInput 组件的 props 文档，增加了对 cssSelector 选项的支持。
- 修改 WindowSelector 组件，增加了窗口选择按钮的标签显示。
---
 .../composer/common/VariableInput.vue         | 113 ++++++++++++++----
 .../composer/common/varinput/CssSelector.vue  |  22 ++++
 .../common/varinput/WindowSelector.vue        |  13 +-
 3 files changed, 121 insertions(+), 27 deletions(-)
 create mode 100644 src/components/composer/common/varinput/CssSelector.vue

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index da9071aa..18f72249 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -33,6 +33,12 @@
         @emit-value="updateValBySelect"
         class="prepend-btn"
       />
+      <!-- css选择按钮 -->
+      <CssSelector
+        v-if="options.cssSelector"
+        @emit-value="updateValBySelect"
+        class="prepend-btn"
+      />
       <!-- 窗口选择按钮 -->
       <WindowSelector
         v-if="options.window"
@@ -56,44 +62,100 @@ import ItemList from "./varinput/ItemList.vue";
 import FileSelector from "./varinput/FileSelector.vue";
 import VariableList from "./varinput/VariableList.vue";
 import WindowSelector from "./varinput/WindowSelector.vue";
-
+import CssSelector from "./varinput/CssSelector.vue";
 /**
-
  * 变量输入框组件
-
  * @description 支持变量选择和字符串输入的输入框组件
  *
  * @property {Object} modelValue - 输入框的值对象
  * @property {String} label - 输入框标签
  * @property {String} icon - 输入框图标
+ * @property {String} placeholder - 输入框占位文本
+ * @property {Boolean} noIcon - 是否隐藏图标
+ * @property {Boolean} disableToggleType - 是否禁用类型切换
  *
  * @property {Object} [options] - 可选的配置对象
- * @property {Array} [options.items] - 选项列表，默认单选，选中后，插入值且设置为字符模式
- * @property {Boolean} [options.multiSelect] - 选项列表支持多选，选中后，插入选择的数组且设置为变量模式
  *
- * @property {Boolean} [options.dialog] - 是否显示文件选择对话框
+ * @property {Object} [options.items] - 选项列表配置
+ * @property {Array<Object|String>} [options.items] - 选项数组，每项可以是字符串或对象
+ * @property {String} [options.items[].label] - 选项显示文本(当选项为对象时)
+ * @property {String} [options.items[].value] - 选项值(当选项为对象时)
+ * @property {Boolean} [options.multiSelect] - 是否支持多选
+ * @property {Boolean} [options.appendItem] - 是否将选中项追加到现有值后
+ *
  * @property {Object} [options.dialog] - 文件选择对话框配置
- * @property {String} [options.dialog.type] - 对话框类型，open 或 save
- * @property {Object} [options.dialog.options] - 对话框选项，对应 utools.showOpenDialog 和 utools.showSaveDialog 的 options
+ * @property {String} [options.dialog.type] - 对话框类型: 'open' 或 'save'
+ * @property {Object} [options.dialog.options] - utools 对话框选项
+ * @property {String} [options.dialog.options.title] - 对话框标题
+ * @property {String} [options.dialog.options.defaultPath] - 默认路径
+ * @property {Array<String>} [options.dialog.options.properties] - 对话框属性，如 ['openFile', 'multiSelections']
+ *
+ * @property {Object} [options.cssSelector] - CSS选择器配置
+ * @property {Boolean} [options.cssSelector] - 设置为 true 启用CSS选择器功能
+ *
+ * @property {Object} [options.window] - 窗口选择器配置
+ * @property {Object} [options.window.props] - 要获取的窗口属性
+ * @property {Array<Object>} [options.window.props] - 属性列表，每项包含label和value
+ * @property {String} [options.window.props[].label] - 属性显示名称
+ * @property {String} [options.window.props[].value] - 属性访问路径，如 'bounds.x'
+ *
+ * @example
+ * // 基础用法
+ * <VariableInput
+ *   v-model="value"
+ *   label="输入框"
+ *   icon="edit"
+ *   placeholder="请输入"
+ * />
+ *
+ * @example
+ * // 带选项列表的输入框
+ * <VariableInput
+ *   v-model="value"
+ *   :options="{
+ *     items: ['选项1', '选项2', {label: '选项3', value: 'value3'}],
+ *     multiSelect: true
+ *   }"
+ * />
+ *
+ * @example
+ * // 文件选择输入框
+ * <VariableInput
+ *   v-model="value"
+ *   :options="{
+ *     dialog: {
+ *       type: 'open',
+ *       options: {
+ *         title: '选择文件',
+ *         defaultPath: '/',
+ *         properties: ['openFile', 'multiSelections']
+ *       }
+ *     }
+ *   }"
+ * />
+ *
  * @example
- * // modelValue 对象格式
- * {
- *   value: "", // 输入框的值
- *   isString: true, // 是否是字符串
- *   __varInputVal__: true // 用于标识是变量输入框
- * }
+ * // CSS选择器输入框
+ * <VariableInput
+ *   v-model="value"
+ *   :options="{
+ *     cssSelector: true
+ *   }"
+ * />
+ *
  * @example
- * // options 对象格式
- * {
- *   items: ["item1", "item2", "item3"], // 选项列表
- *   dialog: {
- *     type: "open", // 对话框类型，open 或 save
- *     options: {
- *       title: "选择文件",
- *       defaultPath: "/",
- *     },
- *   },
- * }
+ * // 窗口选择器输入框
+ * <VariableInput
+ *   v-model="value"
+ *   :options="{
+ *     window: {
+ *       props: [
+ *         {label: '窗口标题', value: 'title'},
+ *         {label: 'X坐标', value: 'bounds.x'}
+ *       ]
+ *     }
+ *   }"
+ * />
  */
 export default defineComponent({
   name: "VariableInput",
@@ -103,6 +165,7 @@ export default defineComponent({
     FileSelector,
     VariableList,
     WindowSelector,
+    CssSelector,
   },
 
   props: {
diff --git a/src/components/composer/common/varinput/CssSelector.vue b/src/components/composer/common/varinput/CssSelector.vue
new file mode 100644
index 00000000..0b5db1b0
--- /dev/null
+++ b/src/components/composer/common/varinput/CssSelector.vue
@@ -0,0 +1,22 @@
+<template>
+  <q-btn @click="inspectElement" icon="my_location" flat dense size="sm">
+    <q-tooltip>选择元素获取选择器</q-tooltip>
+  </q-btn>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "CssSelector",
+  emits: ["emitValue"],
+  methods: {
+    async inspectElement() {
+      window.utools.hideMainWindow();
+      const selectElement = await quickcomposer.browser.getSelector();
+      window.utools.showMainWindow();
+      this.$emit("emitValue", "str", selectElement || "");
+    },
+  },
+});
+</script>
diff --git a/src/components/composer/common/varinput/WindowSelector.vue b/src/components/composer/common/varinput/WindowSelector.vue
index 89d3d469..6e3293a7 100644
--- a/src/components/composer/common/varinput/WindowSelector.vue
+++ b/src/components/composer/common/varinput/WindowSelector.vue
@@ -1,5 +1,14 @@
 <template>
-  <q-btn @click="inspectWindow" icon="my_location" flat dense size="sm" />
+  <q-btn
+    @click="inspectWindow"
+    icon="my_location"
+    flat
+    dense
+    size="sm"
+    :label="window.label"
+  >
+    <q-tooltip>选择窗口获取属性</q-tooltip>
+  </q-btn>
 </template>
 
 <script>
@@ -19,7 +28,7 @@ export default defineComponent({
       const { props } = this.window;
       window.utools.hideMainWindow();
       const selectWindow = await quickcomposer.windows.automation.inspect();
-      window.utools.showMainWindow()
+      window.utools.showMainWindow();
       let propKeys = [];
       if (typeof props === "object") {
         const result = await quickcommand.showButtonBox(

From d6ab5b2b9c0b83b99fbba364b74632f4d4920be8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:30:30 +0800
Subject: [PATCH 102/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtypeToggleTooltip=20?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/VariableInput.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 18f72249..9dad0d66 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -207,13 +207,14 @@ export default defineComponent({
           isString: value,
         });
       },
-      typeToggleTooltip() {
-        const currentType = this.isString
-          ? "字符串"
-          : "变量、数字、表达式、函数等";
-        const toggleText = this.disableToggleType ? "" : "，点击切换";
-        return `当前类型是：${currentType}${toggleText}`;
-      },
+    },
+
+    typeToggleTooltip() {
+      const currentType = this.isString
+        ? "字符串"
+        : "变量、数字、表达式、函数等";
+      const toggleText = this.disableToggleType ? "" : "，点击切换";
+      return `当前类型是：${currentType}${toggleText}`;
     },
 
     inputValue: {

From dd95f69e8b3c4a47f2a73221ce52ec0be361e47f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 15:54:25 +0800
Subject: [PATCH 103/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=20VariableList=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E7=A9=BA=E7=8A=B6=E6=80=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=BC=BA=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E3=80=82=E9=87=8D=E6=9E=84=E6=8F=90=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=9B=B4=E6=B8=85=E6=99=B0?=
 =?UTF-8?q?=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=8F=98=E9=87=8F=E5=92=8C=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=96=B9=E6=B3=95=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/varinput/VariableList.vue | 180 +++++++++++++-----
 1 file changed, 133 insertions(+), 47 deletions(-)

diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index bbed4695..d7f1c8da 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -63,26 +63,67 @@
         </div>
       </template>
       <template v-else>
-        <q-item>
+        <q-item dense>
           <q-item-section>
-            <q-item-label class="empty-variables-tip">
-              <div class="q-gutter-md">
-                <div class="row items-center justify-center text-grey-6">
-                  <q-icon name="info" size="20px" class="q-mr-sm" />
-                  <span>当前命令没有可用变量或函数</span>
-                </div>
-                <div class="row items-center justify-center text-grey-7">
-                  <div>点击其他命令右上角</div>
-                  <q-icon name="output" size="16px" class="q-mx-xs" />
-                  <div>按钮添加变量</div>
+            <div class="empty-tip">
+              <!-- 主要提示 -->
+              <div class="tip-header">
+                <q-icon name="info" size="16px" class="text-grey-6" />
+                <span>当前没有可用的变量或函数</span>
+              </div>
+
+              <q-separator spaced />
+
+              <!-- 添加方法提示 -->
+              <div class="tip-content">
+                <!-- 变量添加方法 -->
+                <div class="tip-section">
+                  <div class="section-title">
+                    <q-icon
+                      name="data_object"
+                      size="16px"
+                      class="text-primary"
+                    />
+                    <span>添加变量</span>
+                  </div>
+                  <div class="section-items">
+                    <div class="item">
+                      <span>命令右上角</span>
+                      <q-badge color="primary">
+                        <q-icon name="output" size="10px" />
+                      </q-badge>
+                      <span>按钮</span>
+                    </div>
+                    <div class="item">
+                      <span>标签栏右侧</span>
+                      <q-badge color="primary">
+                        <q-icon name="data_object" size="10px" />
+                      </q-badge>
+                      <span>按钮</span>
+                    </div>
+                  </div>
                 </div>
-                <div class="row items-center justify-center text-grey-7">
-                  <div>或点击主流程右边的</div>
-                  <q-icon name="add" size="16px" class="q-mx-xs" />
-                  <div>按钮添加函数</div>
+
+                <q-separator vertical spaced />
+
+                <!-- 函数添加方法 -->
+                <div class="tip-section">
+                  <div class="section-title">
+                    <q-icon name="functions" size="16px" class="text-primary" />
+                    <span>添加函数</span>
+                  </div>
+                  <div class="section-items">
+                    <div class="item">
+                      <span>主流程右侧</span>
+                      <q-badge color="primary">
+                        <q-icon name="add" size="10px" />
+                      </q-badge>
+                      <span>按钮</span>
+                    </div>
+                  </div>
                 </div>
               </div>
-            </q-item-label>
+            </div>
           </q-item-section>
         </q-item>
       </template>
@@ -151,56 +192,45 @@ export default defineComponent({
 </script>
 
 <style scoped>
-.variable-dropdown {
-  background-color: rgba(0, 0, 0, 0.02);
-}
-.body--dark .variable-dropdown {
-  background-color: rgba(255, 255, 255, 0.02);
-}
-/* 变量列表样式 */
+/* 基础样式 */
 .variable-list {
   padding: 4px;
 }
 
+/* 变量列表项 */
 .variable-item {
   border-radius: 4px;
-  padding: 0px 16px;
-  transition: all 0.3s ease;
+  padding: 0 16px;
   min-height: 32px;
   text-align: center;
+  transition: all 0.3s ease;
 }
 
 .variable-item:hover {
-  background-color: var(--q-primary-opacity-10);
+  background: var(--q-primary-opacity-10);
 }
 
+/* 变量标签 */
 .variable-label {
   padding: 4px 8px;
   display: flex;
   align-items: center;
   gap: 4px;
   font-size: 13px;
-  position: relative;
 }
 
-.separator-left {
-  min-width: 16px;
-  flex: 1;
+.label-content {
+  padding: 0 8px;
+  white-space: nowrap;
 }
 
+.separator-left,
 .separator-right {
-  min-width: 16px;
+  min-width: 32px;
   flex: 1;
 }
 
-.label-content {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  padding: 0 8px;
-  white-space: nowrap;
-}
-
+/* 变量名称和来源 */
 .variable-name {
   font-size: 12px;
   font-weight: 500;
@@ -212,19 +242,75 @@ export default defineComponent({
   margin-top: 0;
 }
 
-/* 暗色模式适配 */
+/* 空状态提示 */
+.empty-tip {
+  padding: 6px;
+  min-width: 260px;
+  font-size: 12px;
+}
+
+.tip-header {
+  padding: 2px 6px;
+  color: var(--q-grey-7);
+}
+
+.tip-content {
+  padding: 0 6px;
+  gap: 12px;
+}
+
+.tip-section {
+  flex: 1;
+}
+
+/* 通用布局 */
+.tip-header,
+.tip-content,
+.section-title,
+.item {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  justify-content: center;
+}
+
+.tip-content {
+  align-items: flex-start;
+}
+
+.section-title {
+  padding: 4px;
+  color: var(--q-primary);
+  font-weight: 500;
+}
+
+.section-items {
+  padding-left: 4px;
+}
+
+.item {
+  padding: 2px 0;
+  color: var(--q-grey-7);
+}
+
+/* 暗色模式 */
+.variable-dropdown {
+  background: rgba(0, 0, 0, 0.02);
+}
+
+.body--dark .variable-dropdown {
+  background: rgba(255, 255, 255, 0.02);
+}
+
 .body--dark .variable-item:hover {
   background: rgba(255, 255, 255, 0.1);
 }
 
-.empty-variables-tip {
-  text-align: center;
-  font-size: 13px;
-  opacity: 0.9;
-  transition: opacity 0.3s ease;
+.body--dark .item {
+  color: var(--q-grey-5);
 }
 
-.empty-variables-tip:hover {
-  opacity: 1;
+.empty-tip .q-separator {
+  opacity: 0.2;
 }
 </style>

From 957c6021b893d0ecd6c48e400e6b2d2ef107d7bc Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 16:01:07 +0800
Subject: [PATCH 104/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=20CommandButtons=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BA=86=E5=9B=BE=E6=A0=87=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=92=8C=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9A=84=E5=AF=86?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/card/CommandButtons.vue          | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index a1364b31..707e28a2 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -62,22 +62,25 @@
           v-if="!isControlFlow || isFirstCommandInChain"
         >
           <q-menu>
-            <q-list style="min-width: 150px">
-              <q-item clickable v-close-popup @click="$emit('copy')">
+            <q-list dense class="more-menu">
+              <q-item dense clickable v-close-popup @click="$emit('copy')">
                 <q-item-section avatar>
-                  <q-icon name="content_copy" />
+                  <q-icon size="xs" name="content_copy" />
                 </q-item-section>
                 <q-item-section>复制命令</q-item-section>
               </q-item>
 
               <q-item
+                dense
                 clickable
                 v-close-popup
                 @click="$emit('toggle-disable')"
-                x
               >
                 <q-item-section avatar>
-                  <q-icon :name="command.disabled ? 'check_circle' : 'block'" />
+                  <q-icon
+                    size="xs"
+                    :name="command.disabled ? 'check_circle' : 'block'"
+                  />
                 </q-item-section>
                 <q-item-section>{{
                   command.disabled ? "启用命令" : "禁用命令"
@@ -85,13 +88,14 @@
               </q-item>
 
               <q-item
+                dense
                 clickable
                 v-close-popup
                 @click="$emit('add-print')"
                 v-if="!isControlFlow"
               >
                 <q-item-section avatar>
-                  <q-icon name="chat" />
+                  <q-icon size="xs" name="chat" />
                 </q-item-section>
                 <q-item-section>打印输出</q-item-section>
               </q-item>
@@ -262,4 +266,19 @@ export default {
 .body--dark .output-btn:hover {
   background: rgba(255, 255, 255, 0.05);
 }
+
+.more-menu {
+  min-width: 120px;
+  font-size: 12px;
+  opacity: 0.8;
+}
+
+.more-menu :deep(.q-item) {
+  min-height: 32px;
+}
+
+.more-menu :deep(.q-item__section--avatar) {
+  min-width: 24px;
+  padding: 0 4px;
+}
 </style>

From b33ef1be7f7035e8df722e61350048017c0e305e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 18:28:07 +0800
Subject: [PATCH 105/332] =?UTF-8?q?=E9=87=8D=E6=9E=84Composer=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=8F=98=E9=87=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E6=94=B9=E4=B8=BAFlowManager=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=87=BD=E6=95=B0=E5=90=8D=E5=92=8C=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E6=97=B6=E8=87=AA=E5=8A=A8=E5=BC=B9=E5=87=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |   6 +-
 src/components/composer/ComposerFlow.vue      |   6 +-
 src/components/composer/FlowTabs.vue          |  82 +++++++-------
 .../composer/common/varinput/VariableList.vue |   6 +-
 .../composer/flow/ComposerButtons.vue         |   4 +-
 .../{VariableManager.vue => FlowManager.vue}  | 103 +++++++++++++-----
 src/js/composer/variableManager.js            |  10 +-
 7 files changed, 131 insertions(+), 86 deletions(-)
 rename src/components/composer/flow/{VariableManager.vue => FlowManager.vue} (75%)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 94b80661..7cfbd92d 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -148,18 +148,18 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const getCurrentVariables = inject("getCurrentVariables");
+    const getCurrentExistingVar = inject("getCurrentExistingVar");
     // 创建响应式的commandIndex
     const commandIndex = computed(() => props.commandIndex);
     // 主要用于VariableInput组件的变量选择下拉框，获取当前命令的索引
     provide("commandIndex", commandIndex);
-    return { getCurrentVariables };
+    return { getCurrentExistingVar };
   },
   methods: {
     handleOutputVariableUpdate(value) {
       const result = processVariable({
         value,
-        existingVars: this.getCurrentVariables().map((v) => v.name),
+        existingVars: this.getCurrentExistingVar().map((v) => v.name),
       });
 
       if (result.warning) {
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 4d6a9727..44a062b6 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -92,8 +92,8 @@ export default defineComponent({
     },
   },
   setup() {
-    const getCurrentVariables = inject("getCurrentVariables");
-    return { getCurrentVariables };
+    const getCurrentExistingVar = inject("getCurrentExistingVar");
+    return { getCurrentExistingVar };
   },
   emits: ["update:modelValue", "add-command", "action"],
   data() {
@@ -296,7 +296,7 @@ export default defineComponent({
       if (newCommand.saveOutput && newCommand.outputVariable) {
         newCommand.outputVariable = processVariable({
           value: newCommand.outputVariable,
-          existingVars: this.getCurrentVariables().map((v) => v.name),
+          existingVars: this.getCurrentExistingVar().map((v) => v.name),
         }).processedValue;
       }
       return newCommand;
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 422b14d2..995262da 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -8,9 +8,12 @@
           dense
           label="主流程"
           class="main-btn"
+          @dblclick="editFunction(mainFlow)"
           :class="{ 'main-btn-active': activeTab === 'main' }"
           @click="activeTab = 'main'"
-        />
+        >
+          <q-tooltip>双击管理</q-tooltip>
+        </q-btn>
 
         <!-- 其他流程标签可滚动 -->
         <q-tabs
@@ -34,23 +37,9 @@
             <template #item="{ element: flow }">
               <q-tab :name="flow.id" class="flow-tab" no-caps>
                 <div class="flow-tab-content">
-                  <template v-if="flow.isEditing">
-                    <q-input
-                      v-model="flow.label"
-                      dense
-                      borderless
-                      class="flow-name-input"
-                      @keydown.space.prevent
-                      @blur="finishEdit(flow)"
-                      @keyup.enter="finishEdit(flow)"
-                      ref="inputRefs"
-                    />
-                  </template>
-                  <template v-else>
-                    <span class="flow-name-text" @dblclick="startEdit(flow)">{{
-                      flow.label
-                    }}</span>
-                  </template>
+                  <span class="flow-name-text" @dblclick="editFunction(flow)">
+                    {{ flow.label }}
+                  </span>
                   <q-btn
                     flat
                     dense
@@ -60,7 +49,7 @@
                     @click.stop="removeFlow(flow)"
                   />
                 </div>
-                <q-tooltip> 双击修改名称，拖动排序 </q-tooltip>
+                <q-tooltip> 双击管理 </q-tooltip>
               </q-tab>
             </template>
           </draggable>
@@ -91,10 +80,11 @@
         @action="http://github.com/(type,%20payload)%20=%3E%20handleAction(type,%20payload)"
         ref="flowRefs"
       />
-      <VariableManager
+      <FlowManager
         v-model="showVariableManager"
+        :flow="flow"
         :variables="flow.customVariables"
-        @update:variables="flow.customVariables = $event"
+        @update-flow="updateFlow(flow)"
         :is-main-flow="flow.id === 'main'"
         :output-variables="outputVariables"
         class="variable-panel"
@@ -105,13 +95,13 @@
 
 <script>
 import { defineComponent, provide, ref, computed } from "vue";
-import ComposerFlow from "./ComposerFlow.vue";
-import ComposerButtons from "./flow/ComposerButtons.vue";
-import VariableManager from "./flow/VariableManager.vue";
+import draggable from "vuedraggable";
+import ComposerFlow from "components/composer/ComposerFlow.vue";
+import ComposerButtons from "components/composer/flow/ComposerButtons.vue";
+import FlowManager from "components/composer/flow/FlowManager.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
-import draggable from "vuedraggable";
 import { parseVariables } from "js/composer/variableManager";
 export default defineComponent({
   name: "FlowTabs",
@@ -119,7 +109,7 @@ export default defineComponent({
     ComposerFlow,
     ComposerButtons,
     draggable,
-    VariableManager,
+    FlowManager,
   },
   props: {
     showCloseButton: {
@@ -143,7 +133,7 @@ export default defineComponent({
       return subFlows.value.map((flow) => {
         return {
           label: flow.label,
-          value: flow.name,
+          name: flow.name,
           id: flow.id,
         };
       });
@@ -209,6 +199,12 @@ export default defineComponent({
 
     provide("getCurrentVariables", getCurrentVariables);
 
+    const getCurrentExistingVar = () => {
+      return [...getCurrentVariables(), ...getCurrentFunctions()];
+    };
+
+    provide("getCurrentExistingVar", getCurrentExistingVar);
+
     return {
       flows,
       mainFlow,
@@ -246,6 +242,9 @@ export default defineComponent({
         customVariables: [],
       });
       this.activeTab = id;
+      this.$nextTick(() => {
+        this.toggleVariableManager();
+      });
     },
     removeFlow(flow) {
       const index = this.subFlows.findIndex((f) => f.id === flow.id);
@@ -281,13 +280,16 @@ export default defineComponent({
           this.expandAll();
           break;
         case "toggleVariableManager":
-          this.showVariableManager = !this.showVariableManager;
-          this.outputVariables = this.getOutputVariables();
+          this.toggleVariableManager();
           break;
         default:
           this.$emit("action", type, this.generateAllFlowCode());
       }
     },
+    toggleVariableManager() {
+      this.showVariableManager = !this.showVariableManager;
+      this.outputVariables = this.getOutputVariables();
+    },
     saveFlows() {
       const flowsData = this.flows.map((flow) => ({
         ...flow,
@@ -328,8 +330,7 @@ export default defineComponent({
           };
         }),
       }));
-      this.mainFlow = newFlows[0];
-      this.subFlows = newFlows.slice(1);
+      this.updateFlow(newFlows);
       this.activeTab = this.mainFlow.id;
     },
     runFlows(flow) {
@@ -353,20 +354,13 @@ export default defineComponent({
       });
       this.isAllCollapsed = false;
     },
-    startEdit(flow) {
-      flow.isEditing = true;
-      this.$nextTick(() => {
-        const input = this.$refs.inputRefs?.[0];
-        if (input) {
-          input.focus();
-        }
-      });
+    editFunction(flow) {
+      this.activeTab = flow.id;
+      this.toggleVariableManager();
     },
-    finishEdit(flow) {
-      flow.isEditing = false;
-      if (!flow.label) {
-        flow.label = this.generateFlowName().replace("func_", "函数");
-      }
+    updateFlow(flow) {
+      this.mainFlow = flow[0];
+      this.subFlows = flow.slice(1);
     },
   },
 });
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index d7f1c8da..dccf78e7 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -48,12 +48,12 @@
             :key="func.id"
             clickable
             v-close-popup
-            @click="insertValue(func.value + getInsertFunctionParams(func.id))"
+            @click="insertValue(func.name + getInsertFunctionParams(func.id))"
             class="variable-item"
           >
             <q-item-section>
               <q-item-label class="variable-name">
-                {{ func.value }}
+                {{ func.name }}
               </q-item-label>
               <q-item-label caption class="variable-source">
                 {{ func.label }}
@@ -97,7 +97,7 @@
                     <div class="item">
                       <span>标签栏右侧</span>
                       <q-badge color="primary">
-                        <q-icon name="data_object" size="10px" />
+                        <q-icon name="settings" size="10px" />
                       </q-badge>
                       <span>按钮</span>
                     </div>
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index ae6312ef..5c872ad9 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -12,12 +12,12 @@
       </q-btn>
       <q-separator vertical />
       <q-btn
-        icon="data_object"
+        icon="settings"
         dense
         flat
         @click="$emit('action', 'toggleVariableManager')"
       >
-        <q-tooltip>变量管理</q-tooltip>
+        <q-tooltip>流程管理</q-tooltip>
       </q-btn>
       <q-separator vertical />
       <q-btn
diff --git a/src/components/composer/flow/VariableManager.vue b/src/components/composer/flow/FlowManager.vue
similarity index 75%
rename from src/components/composer/flow/VariableManager.vue
rename to src/components/composer/flow/FlowManager.vue
index 88e3c985..6ab47ec4 100644
--- a/src/components/composer/flow/VariableManager.vue
+++ b/src/components/composer/flow/FlowManager.vue
@@ -2,7 +2,7 @@
   <div class="variable-manager" :class="{ 'is-visible': modelValue }">
     <div class="variable-content">
       <div class="variable-header">
-        <div class="header-title">变量管理</div>
+        <div class="header-title">流程管理</div>
         <q-btn
           flat
           dense
@@ -12,6 +12,40 @@
           @click="$emit('update:modelValue', false)"
         />
       </div>
+
+      <!-- 函数信息编辑 (只在非主流程显示) -->
+      <template v-if="!isMainFlow">
+        <div class="section">
+          <div class="var-list">
+            <div class="var-item">
+              <q-input
+                v-model="localFlow.label"
+                dense
+                borderless
+                class="var-input"
+              >
+                <template #prepend>
+                  <div class="var-label">名称</div>
+                </template>
+              </q-input>
+            </div>
+            <div class="var-item">
+              <q-input
+                v-model="localFlow.name"
+                dense
+                borderless
+                class="var-input"
+              >
+                <template #prepend>
+                  <div class="var-label">标识</div>
+                </template>
+              </q-input>
+            </div>
+          </div>
+        </div>
+        <q-separator spaced />
+      </template>
+
       <!-- 参数管理部分 -->
       <div class="section" v-if="!isMainFlow">
         <div class="section-header">
@@ -112,12 +146,12 @@
         <div class="section-header">
           <div class="section-title">
             <q-icon name="output" size="16px" />
-            <div>来自输出</div>
+            <div>输出变量</div>
           </div>
         </div>
         <div class="var-list">
           <div
-            v-for="(variable, index) in outputVariables"
+            v-for="(variable, index) in localFlow.outputVariables"
             :key="index"
             class="var-item output-var"
           >
@@ -134,7 +168,7 @@
 import { defineComponent } from "vue";
 
 export default defineComponent({
-  name: "VariableManager",
+  name: "FlowManager",
   props: {
     modelValue: {
       type: Boolean,
@@ -150,35 +184,36 @@ export default defineComponent({
       required: true,
       default: () => [],
     },
-    outputVariables: {
-      type: Array,
+    flow: {
+      type: Object,
       required: true,
-      default: () => [],
     },
   },
-  emits: ["update:modelValue", "update:variables"],
+  emits: ["update:modelValue", "update:flow"],
   computed: {
-    customVariables: {
+    localFlow: {
       get() {
-        return this.variables || [];
+        return this.flow;
       },
       set(value) {
-        this.$emit("update:variables", value);
+        this.$emit("update:flow", value);
       },
     },
     paramVariables() {
-      return this.customVariables.filter((v) => v.type === "param");
+      return this.localFlow.customVariables.filter((v) => v.type === "param");
     },
     customVars() {
-      return this.customVariables.filter((v) => v.type === "var");
+      return this.localFlow.customVariables.filter((v) => v.type === "var");
     },
   },
   methods: {
     addVariable(type) {
       const prefix = type === "param" ? "param_" : "var_";
-      const count = this.customVariables.filter((v) => v.type === type).length;
-      this.customVariables = [
-        ...this.customVariables,
+      const count = this.localFlow.customVariables.filter(
+        (v) => v.type === type
+      ).length;
+      this.localFlow.customVariables = [
+        ...this.localFlow.customVariables,
         {
           name: prefix + (count + 1),
           type,
@@ -187,18 +222,22 @@ export default defineComponent({
       ];
     },
     removeVariable(index, type) {
-      const typeVars = this.customVariables.filter((v) => v.type === type);
-      const globalIndex = this.customVariables.indexOf(typeVars[index]);
+      const typeVars = this.localFlow.customVariables.filter(
+        (v) => v.type === type
+      );
+      const globalIndex = this.localFlow.customVariables.indexOf(
+        typeVars[index]
+      );
       if (globalIndex > -1) {
-        const newVars = [...this.customVariables];
+        const newVars = [...this.localFlow.customVariables];
         newVars.splice(globalIndex, 1);
-        this.customVariables = newVars;
+        this.localFlow.customVariables = newVars;
       }
     },
     validateVariable(variable, type) {
       if (!variable.name) {
         const prefix = type === "param" ? "param_" : "var_";
-        const count = this.customVariables.filter(
+        const count = this.localFlow.customVariables.filter(
           (v) => v.type === type
         ).length;
         variable.name = prefix + count;
@@ -227,7 +266,7 @@ export default defineComponent({
 }
 
 .variable-manager.is-visible {
-  width: 200px;
+  width: 300px;
 }
 
 .body--dark .variable-manager {
@@ -254,7 +293,7 @@ export default defineComponent({
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 8px;
+  padding: 4px 16px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   margin: -8px -8px 8px -8px;
 }
@@ -262,7 +301,7 @@ export default defineComponent({
 .header-title {
   display: flex;
   align-items: center;
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 500;
   color: var(--q-primary);
 }
@@ -281,7 +320,7 @@ export default defineComponent({
 }
 
 .section-title {
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 500;
   display: flex;
   align-items: center;
@@ -327,7 +366,8 @@ export default defineComponent({
   flex: 1 1 50%;
 }
 
-.var-input :deep(.q-field__control) {
+.var-input :deep(.q-field__control),
+.var-input :deep(.q-field__prepend) {
   height: 20px;
   min-height: 20px;
 }
@@ -360,4 +400,15 @@ export default defineComponent({
   font-size: 11px;
   opacity: 0.7;
 }
+
+.section-content {
+  padding: 8px;
+}
+
+.var-label {
+  font-size: 12px;
+  font-weight: 500;
+  align-items: center;
+  display: flex;
+}
 </style>
diff --git a/src/js/composer/variableManager.js b/src/js/composer/variableManager.js
index d54ec965..48dd674c 100644
--- a/src/js/composer/variableManager.js
+++ b/src/js/composer/variableManager.js
@@ -50,7 +50,7 @@ export function parseVariables(value) {
  * @param {string} [currentName] - 当前的变量名（如果有）
  * @returns {string} 有效的变量名
  */
-function generateValidVarName(currentName, existingVars) {
+function generateValidVarName(currentName, existingVars, baseName = "var") {
   // 如果当前名称有效且不重复，直接返回
   if (
     currentName &&
@@ -62,7 +62,7 @@ function generateValidVarName(currentName, existingVars) {
 
   // 如果变量名无效，改为var开头
   if (!validateVariableName(currentName).isValid) {
-    currentName = "var";
+    currentName = baseName;
   }
 
   // 添加随机后缀直到不重复
@@ -86,7 +86,7 @@ export function generateUniqSuffix(baseName, existingVars, withPrefix = true) {
  * @param {string[]} params.existingVars - 当前已存在的变量列表
  * @returns {Object} - 处理结果
  */
-export function processVariable({ value, existingVars }) {
+export function processVariable({ value, existingVars, baseName = "var" }) {
   if (!value) {
     return { isValid: true, processedValue: value };
   }
@@ -95,12 +95,12 @@ export function processVariable({ value, existingVars }) {
 
   if (!destructured) {
     // 处理单个变量
-    const processedVar = generateValidVarName(value, existingVars);
+    const processedVar = generateValidVarName(value, existingVars, baseName);
     return {
       isValid: true,
       processedValue: processedVar,
       warning:
-        processedVar !== value ? `变量名已被修改为: ${processedVar}` : null,
+        processedVar !== value ? `输入值非法，已被修改为: ${processedVar}` : null,
     };
   }
 

From c3ca34bd2a098b7629ded23b5c598b84de5a226e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 21:29:41 +0800
Subject: [PATCH 106/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E9=80=89=E6=8B=A9=E5=99=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9C=80=E4=BC=98=20CSS=20=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E7=AE=97=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js   |   80 -
 .../lib/quickcomposer/browser/getSelector.js  |  180 ++
 plugin/lib/quickcomposer/browser/index.js     |    6 +-
 .../quickcomposer/browser/optimalSelect.js    | 1767 +++++++++++++++++
 4 files changed, 1952 insertions(+), 81 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/browser/getSelector.js
 create mode 100644 plugin/lib/quickcomposer/browser/optimalSelect.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 7ca06c38..195c64e2 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -376,85 +376,6 @@ const waitForElement = async (selector, timeout = 5000) => {
   throw new Error(`等待元素 ${selector} 超时`);
 };
 
-const getSelector = async () => {
-  return await executeScript(`
-    return new Promise((resolve) => {
-      // 创建高亮元素
-      const highlight = document.createElement('div');
-      highlight.style.cssText = 'position: fixed; pointer-events: none; z-index: 10000; background: rgba(130, 180, 230, 0.4); border: 2px solid rgba(130, 180, 230, 0.8); transition: all 0.2s;';
-      document.body.appendChild(highlight);
-
-      // 获取最优选择器
-      function getOptimalSelector(element) {
-        if (!element || element === document.body) return null;
-
-        // 尝试使用id
-        if (element.id) {
-          return '#' + element.id;
-        }
-
-        // 尝试使用类名组合
-        if (element.className && typeof element.className === 'string') {
-          const classes = element.className.trim().split(/\\s+/);
-          if (classes.length) {
-            const selector = '.' + classes.join('.');
-            if (document.querySelectorAll(selector).length === 1) {
-              return selector;
-            }
-          }
-        }
-
-        // 获取元素在同级中的索引
-        const parent = element.parentElement;
-        if (!parent) return null;
-
-        const siblings = Array.from(parent.children);
-        const index = siblings.indexOf(element);
-
-        // 递归获取父元素选择器
-        const parentSelector = getOptimalSelector(parent);
-        if (!parentSelector) return null;
-
-        return \`\${parentSelector} > \${element.tagName.toLowerCase()}:nth-child(\${index + 1})\`;
-      }
-
-      // 处理鼠标移动
-      function handleMouseMove(e) {
-        const target = e.target;
-        if (!target || target === highlight) return;
-
-        const rect = target.getBoundingClientRect();
-        highlight.style.left = rect.left + 'px';
-        highlight.style.top = rect.top + 'px';
-        highlight.style.width = rect.width + 'px';
-        highlight.style.height = rect.height + 'px';
-      }
-
-      // 处理点击
-      function handleClick(e) {
-        e.preventDefault();
-        e.stopPropagation();
-
-        const target = e.target;
-        if (!target || target === highlight) return;
-
-        const selector = getOptimalSelector(target);
-
-        // 清理
-        document.removeEventListener('mousemove', handleMouseMove);
-        document.removeEventListener('click', handleClick, true);
-        highlight.remove();
-
-        resolve(selector);
-        return false;
-      }
-
-      document.addEventListener('mousemove', handleMouseMove);
-      document.addEventListener('click', handleClick, true);
-    });
-  `);
-};
-
 module.exports = {
   launchBrowser,
   getUrl,
@@ -476,5 +397,4 @@ module.exports = {
   getScrollPosition,
   getPageSize,
   waitForElement,
-  getSelector,
 };
diff --git a/plugin/lib/quickcomposer/browser/getSelector.js b/plugin/lib/quickcomposer/browser/getSelector.js
new file mode 100644
index 00000000..849fb5bc
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/getSelector.js
@@ -0,0 +1,180 @@
+const { executeScript } = require("./browser");
+const fs = require("fs");
+const path = require("path");
+
+const getOptimalSelector = () => {
+  return `
+  // 获取最优选择器
+  function getOptimalSelector_secondary(element) {
+    if (!element || element === document.body) return 'body';
+
+    // 尝试使用id
+    if (element.id) {
+      return '#' + element.id;
+    }
+
+    // 构建当前元素的选择器
+    let currentSelector = element.tagName.toLowerCase();
+    if (element.className && typeof element.className === 'string') {
+      const classes = element.className.trim().split(/\\s+/);
+      if (classes.length) {
+        currentSelector += '.' + classes.join('.');
+      }
+    }
+
+    // 1. 尝试仅使用类名组合
+    if (element.className && typeof element.className === 'string') {
+      const classes = element.className.trim().split(/\\s+/);
+      if (classes.length) {
+        const classSelector = '.' + classes.join('.');
+        if (document.querySelectorAll(classSelector).length === 1) {
+          return classSelector;
+        }
+      }
+    }
+
+    // 2. 尝试仅使用标签名和类名组合
+    if (document.querySelectorAll(currentSelector).length === 1) {
+      return currentSelector;
+    }
+
+    // 3. 如果需要使用 nth-child，先尝试简单组合
+    const siblings = Array.from(element.parentElement?.children || []);
+    const index = siblings.indexOf(element);
+    if (index !== -1) {
+      const nthSelector = currentSelector + ':nth-child(' + (index + 1) + ')';
+      if (document.querySelectorAll(nthSelector).length === 1) {
+        return nthSelector;
+      }
+    }
+
+    // 4. 向上查找最近的有id的祖先元素
+    let ancestor = element;
+    let foundSelectors = [];
+
+    while (ancestor && ancestor !== document.body) {
+      if (ancestor.id) {
+        foundSelectors.push({
+          selector: '#' + ancestor.id,
+          element: ancestor
+        });
+      }
+
+      // 收集所有可能有用的类名组合
+      if (ancestor.className && typeof ancestor.className === 'string') {
+        const classes = ancestor.className.trim().split(/\\s+/);
+        if (classes.length) {
+          const classSelector = ancestor.tagName.toLowerCase() + '.' + classes.join('.');
+          if (document.querySelectorAll(classSelector).length < 10) { // 只收集相对独特的选择器
+            foundSelectors.push({
+              selector: classSelector,
+              element: ancestor
+            });
+          }
+        }
+      }
+
+      ancestor = ancestor.parentElement;
+    }
+
+    // 5. 尝试各种组合，找到最短的唯一选择器
+    for (const {selector: anchorSelector} of foundSelectors) {
+      // 尝试直接组合
+      const simpleSelector = anchorSelector + ' ' + currentSelector;
+      if (document.querySelectorAll(simpleSelector).length === 1) {
+        return simpleSelector;
+      }
+
+      // 如果直接组合不唯一，尝试加上 nth-child
+      if (index !== -1) {
+        const nthSelector = anchorSelector + ' ' + currentSelector + ':nth-child(' + (index + 1) + ')';
+        if (document.querySelectorAll(nthSelector).length === 1) {
+          return nthSelector;
+        }
+      }
+    }
+
+    // 6. 如果还是找不到唯一选择器，使用两层有特征的选择器组合
+    for (let i = 0; i < foundSelectors.length - 1; i++) {
+      for (let j = i + 1; j < foundSelectors.length; j++) {
+        const combinedSelector = foundSelectors[i].selector + ' ' + foundSelectors[j].selector + ' ' + currentSelector;
+        if (document.querySelectorAll(combinedSelector).length === 1) {
+          return combinedSelector;
+        }
+      }
+    }
+
+    // 7. 最后的后备方案：使用完整的父子选择器
+    const parent = element.parentElement;
+    if (!parent) return null;
+
+    const parentSelector = getOptimalSelector(parent);
+    if (!parentSelector) return null;
+
+    return parentSelector + ' ' + currentSelector + (index !== -1 ? ':nth-child(' + (index + 1) + ')' : '');
+  }
+  `;
+};
+
+const getSelector = async () => {
+  return await executeScript(`
+    return new Promise((resolve) => {
+      // 创建高亮元素
+      const highlight = document.createElement('div');
+      highlight.style.cssText = 'position: fixed; pointer-events: none; z-index: 10000; background: rgba(130, 180, 230, 0.4); border: 2px solid rgba(130, 180, 230, 0.8); transition: all 0.2s;';
+      document.body.appendChild(highlight);
+
+      if (typeof OptimalSelect === 'undefined') {
+        ${fs.readFileSync(path.join(__dirname, "optimalSelect.js"), "utf-8")}
+      }
+
+      function getOptimalSelector(element) {
+        return OptimalSelect.select(element)
+      }
+
+      ${getOptimalSelector()}
+
+      // 处理鼠标移动
+      function handleMouseMove(e) {
+        const target = e.target;
+        if (!target || target === highlight) return;
+
+        const rect = target.getBoundingClientRect();
+        highlight.style.left = rect.left + 'px';
+        highlight.style.top = rect.top + 'px';
+        highlight.style.width = rect.width + 'px';
+        highlight.style.height = rect.height + 'px';
+      }
+
+      // 处理点击
+      function handleClick(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const target = e.target;
+        if (!target || target === highlight) return;
+        let selector = null;
+        try {
+          selector = getOptimalSelector(target);
+        } catch (e) {
+          selector = getOptimalSelector_secondary(target);
+        }
+
+        // 清理
+        document.removeEventListener('mousemove', handleMouseMove);
+        document.removeEventListener('click', handleClick, true);
+        highlight.remove();
+
+        resolve(selector);
+        return false;
+      }
+
+      document.addEventListener('mousemove', handleMouseMove);
+      document.addEventListener('click', handleClick, true);
+    });
+  `);
+};
+
+module.exports = {
+  getSelector,
+};
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index bc979db4..eb7a8dcf 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -1,3 +1,7 @@
 const browser = require("./browser");
+const getSelector = require("./getSelector");
 
-module.exports = browser;
+module.exports = {
+  ...browser,
+  ...getSelector,
+};
diff --git a/plugin/lib/quickcomposer/browser/optimalSelect.js b/plugin/lib/quickcomposer/browser/optimalSelect.js
new file mode 100644
index 00000000..8aed7025
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/optimalSelect.js
@@ -0,0 +1,1767 @@
+// https://cdn.jsdelivr.net/npm/optimal-select@4.0.1/dist/optimal-select.js
+(function webpackUniversalModuleDefinition(root, factory) {
+  if (typeof exports === "object" && typeof module === "object")
+    module.exports = factory();
+  else if (typeof define === "function" && define.amd) define([], factory);
+  else if (typeof exports === "object") exports["OptimalSelect"] = factory();
+  else root["OptimalSelect"] = factory();
+})(this, function () {
+  return /******/ (function (modules) {
+    // webpackBootstrap
+    /******/ // The module cache
+    /******/ var installedModules = {};
+    /******/
+    /******/ // The require function
+    /******/ function __webpack_require__(moduleId) {
+      /******/
+      /******/ // Check if module is in cache
+      /******/ if (installedModules[moduleId])
+        /******/ return installedModules[moduleId].exports;
+      /******/
+      /******/ // Create a new module (and put it into the cache)
+      /******/ var module = (installedModules[moduleId] = {
+        /******/ i: moduleId,
+        /******/ l: false,
+        /******/ exports: {},
+        /******/
+      });
+      /******/
+      /******/ // Execute the module function
+      /******/ modules[moduleId].call(
+        module.exports,
+        module,
+        module.exports,
+        __webpack_require__
+      );
+      /******/
+      /******/ // Flag the module as loaded
+      /******/ module.l = true;
+      /******/
+      /******/ // Return the exports of the module
+      /******/ return module.exports;
+      /******/
+    }
+    /******/
+    /******/
+    /******/ // expose the modules object (__webpack_modules__)
+    /******/ __webpack_require__.m = modules;
+    /******/
+    /******/ // expose the module cache
+    /******/ __webpack_require__.c = installedModules;
+    /******/
+    /******/ // identity function for calling harmony imports with the correct context
+    /******/ __webpack_require__.i = function (value) {
+      return value;
+    };
+    /******/
+    /******/ // define getter function for harmony exports
+    /******/ __webpack_require__.d = function (exports, name, getter) {
+      /******/ if (!__webpack_require__.o(exports, name)) {
+        /******/ Object.defineProperty(exports, name, {
+          /******/ configurable: false,
+          /******/ enumerable: true,
+          /******/ get: getter,
+          /******/
+        });
+        /******/
+      }
+      /******/
+    };
+    /******/
+    /******/ // getDefaultExport function for compatibility with non-harmony modules
+    /******/ __webpack_require__.n = function (module) {
+      /******/ var getter =
+        module && module.__esModule
+          ? /******/ function getDefault() {
+              return module["default"];
+            }
+          : /******/ function getModuleExports() {
+              return module;
+            };
+      /******/ __webpack_require__.d(getter, "a", getter);
+      /******/ return getter;
+      /******/
+    };
+    /******/
+    /******/ // Object.prototype.hasOwnProperty.call
+    /******/ __webpack_require__.o = function (object, property) {
+      return Object.prototype.hasOwnProperty.call(object, property);
+    };
+    /******/
+    /******/ // __webpack_public_path__
+    /******/ __webpack_require__.p = "";
+    /******/
+    /******/ // Load entry module and return exports
+    /******/ return __webpack_require__((__webpack_require__.s = 6));
+    /******/
+  })(
+    /************************************************************************/
+    /******/ [
+      /* 0 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+        exports.convertNodeList = convertNodeList;
+        exports.escapeValue = escapeValue;
+        /**
+         * # Utilities
+         *
+         * Convenience helpers.
+         */
+
+        /**
+         * Create an array with the DOM nodes of the list
+         *
+         * @param  {NodeList}             nodes - [description]
+         * @return {Array.<HTMLElement>}        - [description]
+         */
+        function convertNodeList(nodes) {
+          var length = nodes.length;
+
+          var arr = new Array(length);
+          for (var i = 0; i < length; i++) {
+            arr[i] = nodes[i];
+          }
+          return arr;
+        }
+
+        /**
+         * Escape special characters and line breaks as a simplified version of 'CSS.escape()'
+         *
+         * Description of valid characters: https://mathiasbynens.be/notes/css-escapes
+         *
+         * @param  {String?} value - [description]
+         * @return {String}        - [description]
+         */
+        function escapeValue(value) {
+          return (
+            value &&
+            value
+              .replace(/['"`\\/:\?&!#$%^()[\]{|}*+;,.<=>@~]/g, "\\$&")
+              .replace(/\n/g, "A")
+          );
+        }
+
+        /***/
+      },
+      /* 1 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+        exports.getCommonAncestor = getCommonAncestor;
+        exports.getCommonProperties = getCommonProperties;
+        /**
+         * # Common
+         *
+         * Process collections for similarities.
+         */
+
+        /**
+         * Find the last common ancestor of elements
+         *
+         * @param  {Array.<HTMLElements>} elements - [description]
+         * @return {HTMLElement}                   - [description]
+         */
+        function getCommonAncestor(elements) {
+          var options =
+            arguments.length > 1 && arguments[1] !== undefined
+              ? arguments[1]
+              : {};
+          var _options$root = options.root,
+            root = _options$root === undefined ? document : _options$root;
+
+          var ancestors = [];
+
+          elements.forEach(function (element, index) {
+            var parents = [];
+            while (element !== root) {
+              element = element.parentNode;
+              parents.unshift(element);
+            }
+            ancestors[index] = parents;
+          });
+
+          ancestors.sort(function (curr, next) {
+            return curr.length - next.length;
+          });
+
+          var shallowAncestor = ancestors.shift();
+
+          var ancestor = null;
+
+          var _loop = function _loop() {
+            var parent = shallowAncestor[i];
+            var missing = ancestors.some(function (otherParents) {
+              return !otherParents.some(function (otherParent) {
+                return otherParent === parent;
+              });
+            });
+
+            if (missing) {
+              // TODO: find similar sub-parents, not the top root, e.g. sharing a class selector
+              return "break";
+            }
+
+            ancestor = parent;
+          };
+
+          for (var i = 0, l = shallowAncestor.length; i < l; i++) {
+            var _ret = _loop();
+
+            if (_ret === "break") break;
+          }
+
+          return ancestor;
+        }
+
+        /**
+         * Get a set of common properties of elements
+         *
+         * @param  {Array.<HTMLElement>} elements - [description]
+         * @return {Object}                       - [description]
+         */
+        function getCommonProperties(elements) {
+          var commonProperties = {
+            classes: [],
+            attributes: {},
+            tag: null,
+          };
+
+          elements.forEach(function (element) {
+            var commonClasses = commonProperties.classes,
+              commonAttributes = commonProperties.attributes,
+              commonTag = commonProperties.tag;
+
+            // ~ classes
+
+            if (commonClasses !== undefined) {
+              var classes = element.getAttribute("class");
+              if (classes) {
+                classes = classes.trim().split(" ");
+                if (!commonClasses.length) {
+                  commonProperties.classes = classes;
+                } else {
+                  commonClasses = commonClasses.filter(function (entry) {
+                    return classes.some(function (name) {
+                      return name === entry;
+                    });
+                  });
+                  if (commonClasses.length) {
+                    commonProperties.classes = commonClasses;
+                  } else {
+                    delete commonProperties.classes;
+                  }
+                }
+              } else {
+                // TODO: restructure removal as 2x set / 2x delete, instead of modify always replacing with new collection
+                delete commonProperties.classes;
+              }
+            }
+
+            // ~ attributes
+            if (commonAttributes !== undefined) {
+              (function () {
+                var elementAttributes = element.attributes;
+                var attributes = Object.keys(elementAttributes).reduce(
+                  function (attributes, key) {
+                    var attribute = elementAttributes[key];
+                    var attributeName = attribute.name;
+                    // NOTE: workaround detection for non-standard phantomjs NamedNodeMap behaviour
+                    // (issue: https://github.com/ariya/phantomjs/issues/14634)
+                    if (attribute && attributeName !== "class") {
+                      attributes[attributeName] = attribute.value;
+                    }
+                    return attributes;
+                  },
+                  {}
+                );
+
+                var attributesNames = Object.keys(attributes);
+                var commonAttributesNames = Object.keys(commonAttributes);
+
+                if (attributesNames.length) {
+                  if (!commonAttributesNames.length) {
+                    commonProperties.attributes = attributes;
+                  } else {
+                    commonAttributes = commonAttributesNames.reduce(function (
+                      nextCommonAttributes,
+                      name
+                    ) {
+                      var value = commonAttributes[name];
+                      if (value === attributes[name]) {
+                        nextCommonAttributes[name] = value;
+                      }
+                      return nextCommonAttributes;
+                    },
+                    {});
+                    if (Object.keys(commonAttributes).length) {
+                      commonProperties.attributes = commonAttributes;
+                    } else {
+                      delete commonProperties.attributes;
+                    }
+                  }
+                } else {
+                  delete commonProperties.attributes;
+                }
+              })();
+            }
+
+            // ~ tag
+            if (commonTag !== undefined) {
+              var tag = element.tagName.toLowerCase();
+              if (!commonTag) {
+                commonProperties.tag = tag;
+              } else if (tag !== commonTag) {
+                delete commonProperties.tag;
+              }
+            }
+          });
+
+          return commonProperties;
+        }
+
+        /***/
+      },
+      /* 2 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+        exports.default = optimize;
+
+        var _adapt = __webpack_require__(3);
+
+        var _adapt2 = _interopRequireDefault(_adapt);
+
+        var _utilities = __webpack_require__(0);
+
+        function _interopRequireDefault(obj) {
+          return obj && obj.__esModule ? obj : { default: obj };
+        }
+
+        /**
+         * Apply different optimization techniques
+         *
+         * @param  {string}                          selector - [description]
+         * @param  {HTMLElement|Array.<HTMLElement>} element  - [description]
+         * @param  {Object}                          options  - [description]
+         * @return {string}                                   - [description]
+         */
+        /**
+         * # Optimize
+         *
+         * 1.) Improve efficiency through shorter selectors by removing redundancy
+         * 2.) Improve robustness through selector transformation
+         */
+
+        function optimize(selector, elements) {
+          var options =
+            arguments.length > 2 && arguments[2] !== undefined
+              ? arguments[2]
+              : {};
+
+          // convert single entry and NodeList
+          if (!Array.isArray(elements)) {
+            elements = !elements.length
+              ? [elements]
+              : (0, _utilities.convertNodeList)(elements);
+          }
+
+          if (
+            !elements.length ||
+            elements.some(function (element) {
+              return element.nodeType !== 1;
+            })
+          ) {
+            throw new Error(
+              'Invalid input - to compare HTMLElements its necessary to provide a reference of the selected node(s)! (missing "elements")'
+            );
+          }
+
+          var globalModified = (0, _adapt2.default)(elements[0], options);
+
+          // chunk parts outside of quotes (http://stackoverflow.com/a/25663729)
+          var path = selector
+            .replace(/> /g, ">")
+            .split(/\s+(?=(?:(?:[^"]*"){2})*[^"]*$)/);
+
+          if (path.length < 2) {
+            return optimizePart("", selector, "", elements);
+          }
+
+          var shortened = [path.pop()];
+          while (path.length > 1) {
+            var current = path.pop();
+            var prePart = path.join(" ");
+            var postPart = shortened.join(" ");
+
+            var pattern = prePart + " " + postPart;
+            var matches = document.querySelectorAll(pattern);
+            if (matches.length !== elements.length) {
+              shortened.unshift(
+                optimizePart(prePart, current, postPart, elements)
+              );
+            }
+          }
+          shortened.unshift(path[0]);
+          path = shortened;
+
+          // optimize start + end
+          path[0] = optimizePart(
+            "",
+            path[0],
+            path.slice(1).join(" "),
+            elements
+          );
+          path[path.length - 1] = optimizePart(
+            path.slice(0, -1).join(" "),
+            path[path.length - 1],
+            "",
+            elements
+          );
+
+          if (globalModified) {
+            delete true;
+          }
+
+          return path.join(" ").replace(/>/g, "> ").trim();
+        }
+
+        /**
+         * Improve a chunk of the selector
+         *
+         * @param  {string}              prePart  - [description]
+         * @param  {string}              current  - [description]
+         * @param  {string}              postPart - [description]
+         * @param  {Array.<HTMLElement>} elements - [description]
+         * @return {string}                       - [description]
+         */
+        function optimizePart(prePart, current, postPart, elements) {
+          if (prePart.length) prePart = prePart + " ";
+          if (postPart.length) postPart = " " + postPart;
+
+          // robustness: attribute without value (generalization)
+          if (/\[*\]/.test(current)) {
+            var key = current.replace(/=.*$/, "]");
+            var pattern = "" + prePart + key + postPart;
+            var matches = document.querySelectorAll(pattern);
+            if (compareResults(matches, elements)) {
+              current = key;
+            } else {
+              // robustness: replace specific key-value with base tag (heuristic)
+              var references = document.querySelectorAll("" + prePart + key);
+
+              var _loop = function _loop() {
+                var reference = references[i];
+                if (
+                  elements.some(function (element) {
+                    return reference.contains(element);
+                  })
+                ) {
+                  var description = reference.tagName.toLowerCase();
+                  pattern = "" + prePart + description + postPart;
+                  matches = document.querySelectorAll(pattern);
+
+                  if (compareResults(matches, elements)) {
+                    current = description;
+                  }
+                  return "break";
+                }
+              };
+
+              for (var i = 0, l = references.length; i < l; i++) {
+                var pattern;
+                var matches;
+
+                var _ret = _loop();
+
+                if (_ret === "break") break;
+              }
+            }
+          }
+
+          // robustness: descendant instead child (heuristic)
+          if (/>/.test(current)) {
+            var descendant = current.replace(/>/, "");
+            var pattern = "" + prePart + descendant + postPart;
+            var matches = document.querySelectorAll(pattern);
+            if (compareResults(matches, elements)) {
+              current = descendant;
+            }
+          }
+
+          // robustness: 'nth-of-type' instead 'nth-child' (heuristic)
+          if (/:nth-child/.test(current)) {
+            // TODO: consider complete coverage of 'nth-of-type' replacement
+            var type = current.replace(/nth-child/g, "nth-of-type");
+            var pattern = "" + prePart + type + postPart;
+            var matches = document.querySelectorAll(pattern);
+            if (compareResults(matches, elements)) {
+              current = type;
+            }
+          }
+
+          // efficiency: combinations of classname (partial permutations)
+          if (/\.\S+\.\S+/.test(current)) {
+            var names = current
+              .trim()
+              .split(".")
+              .slice(1)
+              .map(function (name) {
+                return "." + name;
+              })
+              .sort(function (curr, next) {
+                return curr.length - next.length;
+              });
+            while (names.length) {
+              var partial = current.replace(names.shift(), "").trim();
+              var pattern = ("" + prePart + partial + postPart).trim();
+              if (
+                !pattern.length ||
+                pattern.charAt(0) === ">" ||
+                pattern.charAt(pattern.length - 1) === ">"
+              ) {
+                break;
+              }
+              var matches = document.querySelectorAll(pattern);
+              if (compareResults(matches, elements)) {
+                current = partial;
+              }
+            }
+
+            // robustness: degrade complex classname (heuristic)
+            names = current && current.match(/\./g);
+            if (names && names.length > 2) {
+              var _references = document.querySelectorAll(
+                "" + prePart + current
+              );
+
+              var _loop2 = function _loop2() {
+                var reference = _references[i];
+                if (
+                  elements.some(function (element) {
+                    return reference.contains(element);
+                  })
+                ) {
+                  // TODO:
+                  // - check using attributes + regard excludes
+                  var description = reference.tagName.toLowerCase();
+                  pattern = "" + prePart + description + postPart;
+                  matches = document.querySelectorAll(pattern);
+
+                  if (compareResults(matches, elements)) {
+                    current = description;
+                  }
+                  return "break";
+                }
+              };
+
+              for (var i = 0, l = _references.length; i < l; i++) {
+                var pattern;
+                var matches;
+
+                var _ret2 = _loop2();
+
+                if (_ret2 === "break") break;
+              }
+            }
+          }
+
+          return current;
+        }
+
+        /**
+         * Evaluate matches with expected elements
+         *
+         * @param  {Array.<HTMLElement>} matches  - [description]
+         * @param  {Array.<HTMLElement>} elements - [description]
+         * @return {Boolean}                      - [description]
+         */
+        function compareResults(matches, elements) {
+          var length = matches.length;
+
+          return (
+            length === elements.length &&
+            elements.every(function (element) {
+              for (var i = 0; i < length; i++) {
+                if (matches[i] === element) {
+                  return true;
+                }
+              }
+              return false;
+            })
+          );
+        }
+        module.exports = exports["default"];
+
+        /***/
+      },
+      /* 3 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+
+        var _typeof =
+          typeof Symbol === "function" && typeof Symbol.iterator === "symbol"
+            ? function (obj) {
+                return typeof obj;
+              }
+            : function (obj) {
+                return obj &&
+                  typeof Symbol === "function" &&
+                  obj.constructor === Symbol &&
+                  obj !== Symbol.prototype
+                  ? "symbol"
+                  : typeof obj;
+              };
+
+        var _slicedToArray = (function () {
+          function sliceIterator(arr, i) {
+            var _arr = [];
+            var _n = true;
+            var _d = false;
+            var _e = undefined;
+            try {
+              for (
+                var _i = arr[Symbol.iterator](), _s;
+                !(_n = (_s = _i.next()).done);
+                _n = true
+              ) {
+                _arr.push(_s.value);
+                if (i && _arr.length === i) break;
+              }
+            } catch (err) {
+              _d = true;
+              _e = err;
+            } finally {
+              try {
+                if (!_n && _i["return"]) _i["return"]();
+              } finally {
+                if (_d) throw _e;
+              }
+            }
+            return _arr;
+          }
+          return function (arr, i) {
+            if (Array.isArray(arr)) {
+              return arr;
+            } else if (Symbol.iterator in Object(arr)) {
+              return sliceIterator(arr, i);
+            } else {
+              throw new TypeError(
+                "Invalid attempt to destructure non-iterable instance"
+              );
+            }
+          };
+        })();
+
+        exports.default = adapt;
+        /**
+         * # Adapt
+         *
+         * Check and extend the environment for universal usage.
+         */
+
+        /**
+         * Modify the context based on the environment
+         *
+         * @param  {HTMLELement} element - [description]
+         * @param  {Object}      options - [description]
+         * @return {boolean}             - [description]
+         */
+        function adapt(element, options) {
+          // detect environment setup
+          if (true) {
+            return false;
+          } else {
+            global.document =
+              options.context ||
+              (function () {
+                var root = element;
+                while (root.parent) {
+                  root = root.parent;
+                }
+                return root;
+              })();
+          }
+
+          // https://github.com/fb55/domhandler/blob/master/index.js#L75
+          var ElementPrototype = Object.getPrototypeOf(true);
+
+          // alternative descriptor to access elements with filtering invalid elements (e.g. textnodes)
+          if (!Object.getOwnPropertyDescriptor(ElementPrototype, "childTags")) {
+            Object.defineProperty(ElementPrototype, "childTags", {
+              enumerable: true,
+              get: function get() {
+                return this.children.filter(function (node) {
+                  // https://github.com/fb55/domelementtype/blob/master/index.js#L12
+                  return (
+                    node.type === "tag" ||
+                    node.type === "script" ||
+                    node.type === "style"
+                  );
+                });
+              },
+            });
+          }
+
+          if (
+            !Object.getOwnPropertyDescriptor(ElementPrototype, "attributes")
+          ) {
+            // https://developer.mozilla.org/en-US/docs/Web/API/Element/attributes
+            // https://developer.mozilla.org/en-US/docs/Web/API/NamedNodeMap
+            Object.defineProperty(ElementPrototype, "attributes", {
+              enumerable: true,
+              get: function get() {
+                var attribs = this.attribs;
+
+                var attributesNames = Object.keys(attribs);
+                var NamedNodeMap = attributesNames.reduce(function (
+                  attributes,
+                  attributeName,
+                  index
+                ) {
+                  attributes[index] = {
+                    name: attributeName,
+                    value: attribs[attributeName],
+                  };
+                  return attributes;
+                },
+                {});
+                Object.defineProperty(NamedNodeMap, "length", {
+                  enumerable: false,
+                  configurable: false,
+                  value: attributesNames.length,
+                });
+                return NamedNodeMap;
+              },
+            });
+          }
+
+          if (!ElementPrototype.getAttribute) {
+            // https://docs.webplatform.org/wiki/dom/Element/getAttribute
+            // https://developer.mozilla.org/en-US/docs/Web/API/Element/getAttribute
+            ElementPrototype.getAttribute = function (name) {
+              return this.attribs[name] || null;
+            };
+          }
+
+          if (!ElementPrototype.getElementsByTagName) {
+            // https://docs.webplatform.org/wiki/dom/Document/getElementsByTagName
+            // https://developer.mozilla.org/en-US/docs/Web/API/Element/getElementsByTagName
+            ElementPrototype.getElementsByTagName = function (tagName) {
+              var HTMLCollection = [];
+              traverseDescendants(this.childTags, function (descendant) {
+                if (descendant.name === tagName || tagName === "*") {
+                  HTMLCollection.push(descendant);
+                }
+              });
+              return HTMLCollection;
+            };
+          }
+
+          if (!ElementPrototype.getElementsByClassName) {
+            // https://docs.webplatform.org/wiki/dom/Document/getElementsByClassName
+            // https://developer.mozilla.org/en-US/docs/Web/API/Element/getElementsByClassName
+            ElementPrototype.getElementsByClassName = function (className) {
+              var names = className.trim().replace(/\s+/g, " ").split(" ");
+              var HTMLCollection = [];
+              traverseDescendants([this], function (descendant) {
+                var descendantClassName = descendant.attribs.class;
+                if (
+                  descendantClassName &&
+                  names.every(function (name) {
+                    return descendantClassName.indexOf(name) > -1;
+                  })
+                ) {
+                  HTMLCollection.push(descendant);
+                }
+              });
+              return HTMLCollection;
+            };
+          }
+
+          if (!ElementPrototype.querySelectorAll) {
+            // https://docs.webplatform.org/wiki/css/selectors_api/querySelectorAll
+            // https://developer.mozilla.org/en-US/docs/Web/API/Element/querySelectorAll
+            ElementPrototype.querySelectorAll = function (selectors) {
+              var _this = this;
+
+              selectors = selectors.replace(/(>)(\S)/g, "$1 $2").trim(); // add space for '>' selector
+
+              // using right to left execution => https://github.com/fb55/css-select#how-does-it-work
+              var instructions = getInstructions(selectors);
+              var discover = instructions.shift();
+
+              var total = instructions.length;
+              return discover(this).filter(function (node) {
+                var step = 0;
+                while (step < total) {
+                  node = instructions[step](node, _this);
+                  if (!node) {
+                    // hierarchy doesn't match
+                    return false;
+                  }
+                  step += 1;
+                }
+                return true;
+              });
+            };
+          }
+
+          if (!ElementPrototype.contains) {
+            // https://developer.mozilla.org/en-US/docs/Web/API/Node/contains
+            ElementPrototype.contains = function (element) {
+              var inclusive = false;
+              traverseDescendants([this], function (descendant, done) {
+                if (descendant === element) {
+                  inclusive = true;
+                  done();
+                }
+              });
+              return inclusive;
+            };
+          }
+
+          return true;
+        }
+
+        /**
+         * Retrieve transformation steps
+         *
+         * @param  {Array.<string>}   selectors - [description]
+         * @return {Array.<Function>}           - [description]
+         */
+        function getInstructions(selectors) {
+          return selectors
+            .split(" ")
+            .reverse()
+            .map(function (selector, step) {
+              var discover = step === 0;
+
+              var _selector$split = selector.split(":"),
+                _selector$split2 = _slicedToArray(_selector$split, 2),
+                type = _selector$split2[0],
+                pseudo = _selector$split2[1];
+
+              var validate = null;
+              var instruction = null;
+
+              (function () {
+                switch (true) {
+                  // child: '>'
+                  case />/.test(type):
+                    instruction = function checkParent(node) {
+                      return function (validate) {
+                        return validate(node.parent) && node.parent;
+                      };
+                    };
+                    break;
+
+                  // class: '.'
+                  case /^\./.test(type):
+                    var names = type.substr(1).split(".");
+                    validate = function validate(node) {
+                      var nodeClassName = node.attribs.class;
+                      return (
+                        nodeClassName &&
+                        names.every(function (name) {
+                          return nodeClassName.indexOf(name) > -1;
+                        })
+                      );
+                    };
+                    instruction = function checkClass(node, root) {
+                      if (discover) {
+                        return node.getElementsByClassName(names.join(" "));
+                      }
+                      return typeof node === "function"
+                        ? node(validate)
+                        : getAncestor(node, root, validate);
+                    };
+                    break;
+
+                  // attribute: '[key="value"]'
+                  case /^\[/.test(type):
+                    var _type$replace$split = type
+                        .replace(/\[|\]|"/g, "")
+                        .split("="),
+                      _type$replace$split2 = _slicedToArray(
+                        _type$replace$split,
+                        2
+                      ),
+                      attributeKey = _type$replace$split2[0],
+                      attributeValue = _type$replace$split2[1];
+
+                    validate = function validate(node) {
+                      var hasAttribute =
+                        Object.keys(node.attribs).indexOf(attributeKey) > -1;
+                      if (hasAttribute) {
+                        // regard optional attributeValue
+                        if (
+                          !attributeValue ||
+                          node.attribs[attributeKey] === attributeValue
+                        ) {
+                          return true;
+                        }
+                      }
+                      return false;
+                    };
+                    instruction = function checkAttribute(node, root) {
+                      if (discover) {
+                        var _ret2 = (function () {
+                          var NodeList = [];
+                          traverseDescendants([node], function (descendant) {
+                            if (validate(descendant)) {
+                              NodeList.push(descendant);
+                            }
+                          });
+                          return {
+                            v: NodeList,
+                          };
+                        })();
+
+                        if (
+                          (typeof _ret2 === "undefined"
+                            ? "undefined"
+                            : _typeof(_ret2)) === "object"
+                        )
+                          return _ret2.v;
+                      }
+                      return typeof node === "function"
+                        ? node(validate)
+                        : getAncestor(node, root, validate);
+                    };
+                    break;
+
+                  // id: '#'
+                  case /^#/.test(type):
+                    var id = type.substr(1);
+                    validate = function validate(node) {
+                      return node.attribs.id === id;
+                    };
+                    instruction = function checkId(node, root) {
+                      if (discover) {
+                        var _ret3 = (function () {
+                          var NodeList = [];
+                          traverseDescendants(
+                            [node],
+                            function (descendant, done) {
+                              if (validate(descendant)) {
+                                NodeList.push(descendant);
+                                done();
+                              }
+                            }
+                          );
+                          return {
+                            v: NodeList,
+                          };
+                        })();
+
+                        if (
+                          (typeof _ret3 === "undefined"
+                            ? "undefined"
+                            : _typeof(_ret3)) === "object"
+                        )
+                          return _ret3.v;
+                      }
+                      return typeof node === "function"
+                        ? node(validate)
+                        : getAncestor(node, root, validate);
+                    };
+                    break;
+
+                  // universal: '*'
+                  case /\*/.test(type):
+                    validate = function validate(node) {
+                      return true;
+                    };
+                    instruction = function checkUniversal(node, root) {
+                      if (discover) {
+                        var _ret4 = (function () {
+                          var NodeList = [];
+                          traverseDescendants([node], function (descendant) {
+                            return NodeList.push(descendant);
+                          });
+                          return {
+                            v: NodeList,
+                          };
+                        })();
+
+                        if (
+                          (typeof _ret4 === "undefined"
+                            ? "undefined"
+                            : _typeof(_ret4)) === "object"
+                        )
+                          return _ret4.v;
+                      }
+                      return typeof node === "function"
+                        ? node(validate)
+                        : getAncestor(node, root, validate);
+                    };
+                    break;
+
+                  // tag: '...'
+                  default:
+                    validate = function validate(node) {
+                      return node.name === type;
+                    };
+                    instruction = function checkTag(node, root) {
+                      if (discover) {
+                        var _ret5 = (function () {
+                          var NodeList = [];
+                          traverseDescendants([node], function (descendant) {
+                            if (validate(descendant)) {
+                              NodeList.push(descendant);
+                            }
+                          });
+                          return {
+                            v: NodeList,
+                          };
+                        })();
+
+                        if (
+                          (typeof _ret5 === "undefined"
+                            ? "undefined"
+                            : _typeof(_ret5)) === "object"
+                        )
+                          return _ret5.v;
+                      }
+                      return typeof node === "function"
+                        ? node(validate)
+                        : getAncestor(node, root, validate);
+                    };
+                }
+              })();
+
+              if (!pseudo) {
+                return instruction;
+              }
+
+              var rule = pseudo.match(/-(child|type)\((\d+)\)$/);
+              var kind = rule[1];
+              var index = parseInt(rule[2], 10) - 1;
+
+              var validatePseudo = function validatePseudo(node) {
+                if (node) {
+                  var compareSet = node.parent.childTags;
+                  if (kind === "type") {
+                    compareSet = compareSet.filter(validate);
+                  }
+                  var nodeIndex = compareSet.findIndex(function (child) {
+                    return child === node;
+                  });
+                  if (nodeIndex === index) {
+                    return true;
+                  }
+                }
+                return false;
+              };
+
+              return function enhanceInstruction(node) {
+                var match = instruction(node);
+                if (discover) {
+                  return match.reduce(function (NodeList, matchedNode) {
+                    if (validatePseudo(matchedNode)) {
+                      NodeList.push(matchedNode);
+                    }
+                    return NodeList;
+                  }, []);
+                }
+                return validatePseudo(match) && match;
+              };
+            });
+        }
+
+        /**
+         * Walking recursive to invoke callbacks
+         *
+         * @param {Array.<HTMLElement>} nodes   - [description]
+         * @param {Function}            handler - [description]
+         */
+        function traverseDescendants(nodes, handler) {
+          nodes.forEach(function (node) {
+            var progress = true;
+            handler(node, function () {
+              return (progress = false);
+            });
+            if (node.childTags && progress) {
+              traverseDescendants(node.childTags, handler);
+            }
+          });
+        }
+
+        /**
+         * Bubble up from bottom to top
+         *
+         * @param  {HTMLELement} node     - [description]
+         * @param  {HTMLELement} root     - [description]
+         * @param  {Function}    validate - [description]
+         * @return {HTMLELement}          - [description]
+         */
+        function getAncestor(node, root, validate) {
+          while (node.parent) {
+            node = node.parent;
+            if (validate(node)) {
+              return node;
+            }
+            if (node === root) {
+              break;
+            }
+          }
+          return null;
+        }
+        module.exports = exports["default"];
+
+        /***/
+      },
+      /* 4 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+
+        var _typeof =
+          typeof Symbol === "function" && typeof Symbol.iterator === "symbol"
+            ? function (obj) {
+                return typeof obj;
+              }
+            : function (obj) {
+                return obj &&
+                  typeof Symbol === "function" &&
+                  obj.constructor === Symbol &&
+                  obj !== Symbol.prototype
+                  ? "symbol"
+                  : typeof obj;
+              };
+        /**
+         * # Select
+         *
+         * Construct a unique CSS query selector to access the selected DOM element(s).
+         * For longevity it applies different matching and optimization strategies.
+         */
+
+        exports.getSingleSelector = getSingleSelector;
+        exports.getMultiSelector = getMultiSelector;
+        exports.default = getQuerySelector;
+
+        var _adapt = __webpack_require__(3);
+
+        var _adapt2 = _interopRequireDefault(_adapt);
+
+        var _match = __webpack_require__(5);
+
+        var _match2 = _interopRequireDefault(_match);
+
+        var _optimize = __webpack_require__(2);
+
+        var _optimize2 = _interopRequireDefault(_optimize);
+
+        var _utilities = __webpack_require__(0);
+
+        var _common = __webpack_require__(1);
+
+        function _interopRequireDefault(obj) {
+          return obj && obj.__esModule ? obj : { default: obj };
+        }
+
+        /**
+         * Get a selector for the provided element
+         *
+         * @param  {HTMLElement} element - [description]
+         * @param  {Object}      options - [description]
+         * @return {string}              - [description]
+         */
+        function getSingleSelector(element) {
+          var options =
+            arguments.length > 1 && arguments[1] !== undefined
+              ? arguments[1]
+              : {};
+
+          if (element.nodeType === 3) {
+            element = element.parentNode;
+          }
+
+          if (element.nodeType !== 1) {
+            throw new Error(
+              'Invalid input - only HTMLElements or representations of them are supported! (not "' +
+                (typeof element === "undefined"
+                  ? "undefined"
+                  : _typeof(element)) +
+                '")'
+            );
+          }
+
+          var globalModified = (0, _adapt2.default)(element, options);
+
+          var selector = (0, _match2.default)(element, options);
+          var optimized = (0, _optimize2.default)(selector, element, options);
+
+          // debug
+          // console.log(`
+          //   selector:  ${selector}
+          //   optimized: ${optimized}
+          // `)
+
+          if (globalModified) {
+            delete true;
+          }
+
+          return optimized;
+        }
+
+        /**
+         * Get a selector to match multiple descendants from an ancestor
+         *
+         * @param  {Array.<HTMLElement>|NodeList} elements - [description]
+         * @param  {Object}                       options  - [description]
+         * @return {string}                                - [description]
+         */
+        function getMultiSelector(elements) {
+          var options =
+            arguments.length > 1 && arguments[1] !== undefined
+              ? arguments[1]
+              : {};
+
+          if (!Array.isArray(elements)) {
+            elements = (0, _utilities.convertNodeList)(elements);
+          }
+
+          if (
+            elements.some(function (element) {
+              return element.nodeType !== 1;
+            })
+          ) {
+            throw new Error(
+              "Invalid input - only an Array of HTMLElements or representations of them is supported!"
+            );
+          }
+
+          var globalModified = (0, _adapt2.default)(elements[0], options);
+
+          var ancestor = (0, _common.getCommonAncestor)(elements, options);
+          var ancestorSelector = getSingleSelector(ancestor, options);
+
+          // TODO: consider usage of multiple selectors + parent-child relation + check for part redundancy
+          var commonSelectors = getCommonSelectors(elements);
+          var descendantSelector = commonSelectors[0];
+
+          var selector = (0, _optimize2.default)(
+            ancestorSelector + " " + descendantSelector,
+            elements,
+            options
+          );
+          var selectorMatches = (0, _utilities.convertNodeList)(
+            document.querySelectorAll(selector)
+          );
+
+          if (
+            !elements.every(function (element) {
+              return selectorMatches.some(function (entry) {
+                return entry === element;
+              });
+            })
+          ) {
+            // TODO: cluster matches to split into similar groups for sub selections
+            return console.warn(
+              "\n      The selected elements can't be efficiently mapped.\n      Its probably best to use multiple single selectors instead!\n    ",
+              elements
+            );
+          }
+
+          if (globalModified) {
+            delete true;
+          }
+
+          return selector;
+        }
+
+        /**
+         * Get selectors to describe a set of elements
+         *
+         * @param  {Array.<HTMLElements>} elements - [description]
+         * @return {string}                        - [description]
+         */
+        function getCommonSelectors(elements) {
+          var _getCommonProperties = (0, _common.getCommonProperties)(elements),
+            classes = _getCommonProperties.classes,
+            attributes = _getCommonProperties.attributes,
+            tag = _getCommonProperties.tag;
+
+          var selectorPath = [];
+
+          if (tag) {
+            selectorPath.push(tag);
+          }
+
+          if (classes) {
+            var classSelector = classes
+              .map(function (name) {
+                return "." + name;
+              })
+              .join("");
+            selectorPath.push(classSelector);
+          }
+
+          if (attributes) {
+            var attributeSelector = Object.keys(attributes)
+              .reduce(function (parts, name) {
+                parts.push("[" + name + '="' + attributes[name] + '"]');
+                return parts;
+              }, [])
+              .join("");
+            selectorPath.push(attributeSelector);
+          }
+
+          if (selectorPath.length) {
+            // TODO: check for parent-child relation
+          }
+
+          return [selectorPath.join("")];
+        }
+
+        /**
+         * Choose action depending on the input (multiple/single)
+         *
+         * NOTE: extended detection is used for special cases like the <select> element with <options>
+         *
+         * @param  {HTMLElement|NodeList|Array.<HTMLElement>} input   - [description]
+         * @param  {Object}                                   options - [description]
+         * @return {string}                                           - [description]
+         */
+        function getQuerySelector(input) {
+          var options =
+            arguments.length > 1 && arguments[1] !== undefined
+              ? arguments[1]
+              : {};
+
+          if (input.length && !input.name) {
+            return getMultiSelector(input, options);
+          }
+          return getSingleSelector(input, options);
+        }
+
+        /***/
+      },
+      /* 5 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+        exports.default = match;
+
+        var _utilities = __webpack_require__(0);
+
+        var defaultIgnore = {
+          attribute: function attribute(attributeName) {
+            return (
+              ["style", "data-reactid", "data-react-checksum"].indexOf(
+                attributeName
+              ) > -1
+            );
+          },
+        };
+
+        /**
+         * Get the path of the element
+         *
+         * @param  {HTMLElement} node    - [description]
+         * @param  {Object}      options - [description]
+         * @return {string}              - [description]
+         */
+        /**
+         * # Match
+         *
+         * Retrieve selector for a node.
+         */
+
+        function match(node, options) {
+          var _options$root = options.root,
+            root = _options$root === undefined ? document : _options$root,
+            _options$skip = options.skip,
+            skip = _options$skip === undefined ? null : _options$skip,
+            _options$priority = options.priority,
+            priority =
+              _options$priority === undefined
+                ? ["id", "class", "href", "src"]
+                : _options$priority,
+            _options$ignore = options.ignore,
+            ignore = _options$ignore === undefined ? {} : _options$ignore;
+
+          var path = [];
+          var element = node;
+          var length = path.length;
+          var ignoreClass = false;
+
+          var skipCompare =
+            skip &&
+            (Array.isArray(skip) ? skip : [skip]).map(function (entry) {
+              if (typeof entry !== "function") {
+                return function (element) {
+                  return element === entry;
+                };
+              }
+              return entry;
+            });
+
+          var skipChecks = function skipChecks(element) {
+            return (
+              skip &&
+              skipCompare.some(function (compare) {
+                return compare(element);
+              })
+            );
+          };
+
+          Object.keys(ignore).forEach(function (type) {
+            if (type === "class") {
+              ignoreClass = true;
+            }
+            var predicate = ignore[type];
+            if (typeof predicate === "function") return;
+            if (typeof predicate === "number") {
+              predicate = predicate.toString();
+            }
+            if (typeof predicate === "string") {
+              predicate = new RegExp(
+                (0, _utilities.escapeValue)(predicate).replace(/\\/g, "\\\\")
+              );
+            }
+            if (typeof predicate === "boolean") {
+              predicate = predicate ? /(?:)/ : /.^/;
+            }
+            // check class-/attributename for regex
+            ignore[type] = function (name, value) {
+              return predicate.test(value);
+            };
+          });
+
+          if (ignoreClass) {
+            (function () {
+              var ignoreAttribute = ignore.attribute;
+              ignore.attribute = function (name, value, defaultPredicate) {
+                return (
+                  ignore.class(value) ||
+                  (ignoreAttribute &&
+                    ignoreAttribute(name, value, defaultPredicate))
+                );
+              };
+            })();
+          }
+
+          while (element !== root) {
+            if (skipChecks(element) !== true) {
+              // ~ global
+              if (checkAttributes(priority, element, ignore, path, root)) break;
+              if (checkTag(element, ignore, path, root)) break;
+
+              // ~ local
+              checkAttributes(priority, element, ignore, path);
+              if (path.length === length) {
+                checkTag(element, ignore, path);
+              }
+
+              // define only one part each iteration
+              if (path.length === length) {
+                checkChilds(priority, element, ignore, path);
+              }
+            }
+
+            element = element.parentNode;
+            length = path.length;
+          }
+
+          if (element === root) {
+            var pattern = findPattern(priority, element, ignore);
+            path.unshift(pattern);
+          }
+
+          return path.join(" ");
+        }
+
+        /**
+         * Extend path with attribute identifier
+         *
+         * @param  {Array.<string>} priority - [description]
+         * @param  {HTMLElement}    element  - [description]
+         * @param  {Object}         ignore   - [description]
+         * @param  {Array.<string>} path     - [description]
+         * @param  {HTMLElement}    parent   - [description]
+         * @return {boolean}                 - [description]
+         */
+        function checkAttributes(priority, element, ignore, path) {
+          var parent =
+            arguments.length > 4 && arguments[4] !== undefined
+              ? arguments[4]
+              : element.parentNode;
+
+          var pattern = findAttributesPattern(priority, element, ignore);
+          if (pattern) {
+            var matches = parent.querySelectorAll(pattern);
+            if (matches.length === 1) {
+              path.unshift(pattern);
+              return true;
+            }
+          }
+          return false;
+        }
+
+        /**
+         * Lookup attribute identifier
+         *
+         * @param  {Array.<string>} priority - [description]
+         * @param  {HTMLElement}    element  - [description]
+         * @param  {Object}         ignore   - [description]
+         * @return {string?}                 - [description]
+         */
+        function findAttributesPattern(priority, element, ignore) {
+          var attributes = element.attributes;
+          var sortedKeys = Object.keys(attributes).sort(function (curr, next) {
+            var currPos = priority.indexOf(attributes[curr].name);
+            var nextPos = priority.indexOf(attributes[next].name);
+            if (nextPos === -1) {
+              if (currPos === -1) {
+                return 0;
+              }
+              return -1;
+            }
+            return currPos - nextPos;
+          });
+
+          for (var i = 0, l = sortedKeys.length; i < l; i++) {
+            var key = sortedKeys[i];
+            var attribute = attributes[key];
+            var attributeName = attribute.name;
+            var attributeValue = (0, _utilities.escapeValue)(attribute.value);
+
+            var currentIgnore = ignore[attributeName] || ignore.attribute;
+            var currentDefaultIgnore =
+              defaultIgnore[attributeName] || defaultIgnore.attribute;
+            if (
+              checkIgnore(
+                currentIgnore,
+                attributeName,
+                attributeValue,
+                currentDefaultIgnore
+              )
+            ) {
+              continue;
+            }
+
+            var pattern = "[" + attributeName + '="' + attributeValue + '"]';
+
+            if (/\b\d/.test(attributeValue) === false) {
+              if (attributeName === "id") {
+                pattern = "#" + attributeValue;
+              }
+
+              if (attributeName === "class") {
+                var className = attributeValue.trim().replace(/\s+/g, ".");
+                pattern = "." + className;
+              }
+            }
+
+            return pattern;
+          }
+          return null;
+        }
+
+        /**
+         * Extend path with tag identifier
+         *
+         * @param  {HTMLElement}    element - [description]
+         * @param  {Object}         ignore  - [description]
+         * @param  {Array.<string>} path    - [description]
+         * @param  {HTMLElement}    parent  - [description]
+         * @return {boolean}                - [description]
+         */
+        function checkTag(element, ignore, path) {
+          var parent =
+            arguments.length > 3 && arguments[3] !== undefined
+              ? arguments[3]
+              : element.parentNode;
+
+          var pattern = findTagPattern(element, ignore);
+          if (pattern) {
+            var matches = parent.getElementsByTagName(pattern);
+            if (matches.length === 1) {
+              path.unshift(pattern);
+              return true;
+            }
+          }
+          return false;
+        }
+
+        /**
+         * Lookup tag identifier
+         *
+         * @param  {HTMLElement} element - [description]
+         * @param  {Object}      ignore  - [description]
+         * @return {boolean}             - [description]
+         */
+        function findTagPattern(element, ignore) {
+          var tagName = element.tagName.toLowerCase();
+          if (checkIgnore(ignore.tag, null, tagName)) {
+            return null;
+          }
+          return tagName;
+        }
+
+        /**
+         * Extend path with specific child identifier
+         *
+         * NOTE: 'childTags' is a custom property to use as a view filter for tags using 'adapter.js'
+         *
+         * @param  {Array.<string>} priority - [description]
+         * @param  {HTMLElement}    element  - [description]
+         * @param  {Object}         ignore   - [description]
+         * @param  {Array.<string>} path     - [description]
+         * @return {boolean}                 - [description]
+         */
+        function checkChilds(priority, element, ignore, path) {
+          var parent = element.parentNode;
+          var children = parent.childTags || parent.children;
+          for (var i = 0, l = children.length; i < l; i++) {
+            var child = children[i];
+            if (child === element) {
+              var childPattern = findPattern(priority, child, ignore);
+              if (!childPattern) {
+                return console.warn(
+                  "\n          Element couldn't be matched through strict ignore pattern!\n        ",
+                  child,
+                  ignore,
+                  childPattern
+                );
+              }
+              var pattern = "> " + childPattern + ":nth-child(" + (i + 1) + ")";
+              path.unshift(pattern);
+              return true;
+            }
+          }
+          return false;
+        }
+
+        /**
+         * Lookup identifier
+         *
+         * @param  {Array.<string>} priority - [description]
+         * @param  {HTMLElement}    element  - [description]
+         * @param  {Object}         ignore   - [description]
+         * @return {string}                  - [description]
+         */
+        function findPattern(priority, element, ignore) {
+          var pattern = findAttributesPattern(priority, element, ignore);
+          if (!pattern) {
+            pattern = findTagPattern(element, ignore);
+          }
+          return pattern;
+        }
+
+        /**
+         * Validate with custom and default functions
+         *
+         * @param  {Function} predicate        - [description]
+         * @param  {string?}  name             - [description]
+         * @param  {string}   value            - [description]
+         * @param  {Function} defaultPredicate - [description]
+         * @return {boolean}                   - [description]
+         */
+        function checkIgnore(predicate, name, value, defaultPredicate) {
+          if (!value) {
+            return true;
+          }
+          var check = predicate || defaultPredicate;
+          if (!check) {
+            return false;
+          }
+          return check(name, value, defaultPredicate);
+        }
+        module.exports = exports["default"];
+
+        /***/
+      },
+      /* 6 */
+      /***/ function (module, exports, __webpack_require__) {
+        "use strict";
+
+        Object.defineProperty(exports, "__esModule", {
+          value: true,
+        });
+        exports.default =
+          exports.common =
+          exports.optimize =
+          exports.getMultiSelector =
+          exports.getSingleSelector =
+          exports.select =
+            undefined;
+
+        var _select2 = __webpack_require__(4);
+
+        Object.defineProperty(exports, "getSingleSelector", {
+          enumerable: true,
+          get: function get() {
+            return _select2.getSingleSelector;
+          },
+        });
+        Object.defineProperty(exports, "getMultiSelector", {
+          enumerable: true,
+          get: function get() {
+            return _select2.getMultiSelector;
+          },
+        });
+
+        var _select3 = _interopRequireDefault(_select2);
+
+        var _optimize2 = __webpack_require__(2);
+
+        var _optimize3 = _interopRequireDefault(_optimize2);
+
+        var _common2 = __webpack_require__(1);
+
+        var _common = _interopRequireWildcard(_common2);
+
+        function _interopRequireWildcard(obj) {
+          if (obj && obj.__esModule) {
+            return obj;
+          } else {
+            var newObj = {};
+            if (obj != null) {
+              for (var key in obj) {
+                if (Object.prototype.hasOwnProperty.call(obj, key))
+                  newObj[key] = obj[key];
+              }
+            }
+            newObj.default = obj;
+            return newObj;
+          }
+        }
+
+        function _interopRequireDefault(obj) {
+          return obj && obj.__esModule ? obj : { default: obj };
+        }
+
+        exports.select = _select3.default;
+        exports.optimize = _optimize3.default;
+        exports.common = _common;
+        exports.default = _select3.default;
+
+        /***/
+      },
+      /******/
+    ]
+  );
+});

From c1e255dd56050e6700fe4b636312e6e3152f97b7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 21:30:16 +0800
Subject: [PATCH 107/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=91=BD=E4=BB=A4=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=80=9A=E8=BF=87URL=E3=80=81=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=92=8CID=E8=8E=B7=E5=8F=96=E6=A0=87=E7=AD=BE=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E9=87=8D=E6=9E=84=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D=E3=80=82=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=91=BD=E4=BB=A4=E4=B8=BA=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 15 ++--
 src/js/composer/commands/browserCommands.js | 85 +++++----------------
 2 files changed, 28 insertions(+), 72 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 195c64e2..93aff009 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -200,9 +200,7 @@ const initCDP = async (port) => {
       await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
     } catch (err) {
       console.log(err);
-      throw new Error(
-        `请先通过浏览器控制中的“启动浏览器”打开浏览器`
-      );
+      throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
     }
   }
   return { Page, Runtime, DOM };
@@ -246,16 +244,17 @@ const getTabs = async () => {
     .map((target) => ({
       url: target.url,
       title: target.title,
+      id: target.id,
     }));
 };
 
-const activateTab = async (index) => {
+const activateTab = async (type, value) => {
   const targets = await CDP.List();
-  const pages = targets.filter((target) => target.type === "page");
-  if (index > 0 && index <= pages.length) {
-    const targetId = pages[index - 1].id;
-    await CDP.Activate({ id: targetId });
+  const target = targets.find((target) => target[type].includes(value));
+  if (!target) {
+    throw new Error(`未找到目标: ${type} = ${value}`);
   }
+  await CDP.Activate({ id: target.id });
 };
 
 const clickElement = async (selector) => {
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 00e61aad..5cafb767 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -105,6 +105,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.getTabs",
       label: "获取/切换标签",
       icon: "tab",
+      isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.browser.getTabs",
@@ -117,12 +118,22 @@ export const browserCommands = {
           icon: "tab_unselected",
           config: [
             {
-              label: "标签索引",
-              component: "NumberInput",
+              component: "QSelect",
               icon: "tab",
-              min: 1,
-              defaultValue: 1,
-              width: 12,
+              width: 3,
+              options: [
+                { label: "通过URL", value: "url" },
+                { label: "通过标题", value: "title" },
+                { label: "通过ID", value: "id" },
+              ],
+              defaultValue: "url",
+            },
+            {
+              label: "URL/标题/ID",
+              component: "VariableInput",
+              icon: "tab",
+              width: 9,
+              placeholder: "支持模糊匹配",
             },
           ],
         },
@@ -132,6 +143,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.executeScript",
       label: "执行脚本",
       icon: "code",
+      isAsync: true,
       config: [
         {
           label: "脚本内容",
@@ -152,6 +164,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.setCookie",
       label: "Cookie操作",
       icon: "cookie",
+      isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.browser.setCookie",
@@ -240,6 +253,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.injectCSS",
       label: "注入CSS",
       icon: "style",
+      isAsync: true,
       config: [
         {
           label: "CSS内容",
@@ -255,6 +269,7 @@ export const browserCommands = {
       label: "手动选择元素",
       icon: "mouse",
       isAsync: true,
+      config: [],
     },
     {
       value: "quickcomposer.browser.clickElement",
@@ -284,13 +299,6 @@ export const browserCommands = {
           label: "输入文本",
           icon: "edit",
           config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
             {
               label: "文本内容",
               component: "VariableInput",
@@ -304,84 +312,32 @@ export const browserCommands = {
           value: "quickcomposer.browser.getText",
           label: "获取文本",
           icon: "text_fields",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
         },
         {
           value: "quickcomposer.browser.getHtml",
           label: "获取HTML",
           icon: "code",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
         },
         {
           value: "quickcomposer.browser.hideElement",
           label: "隐藏元素",
           icon: "visibility_off",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
         },
         {
           value: "quickcomposer.browser.showElement",
           label: "显示元素",
           icon: "visibility",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
         },
         {
           value: "quickcomposer.browser.scrollToElement",
           label: "滚动到元素",
           icon: "open_in_full",
-          config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
-          ],
         },
         {
           value: "quickcomposer.browser.waitForElement",
           label: "等待元素",
           icon: "hourglass_empty",
           config: [
-            {
-              label: "选择器",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "输入CSS选择器",
-            },
             {
               label: "超时时间",
               component: "NumberInput",
@@ -399,6 +355,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.scrollTo",
       label: "滚动及页面尺寸",
       icon: "open_in_full",
+      isAsync: true,
       subCommands: [
         {
           value: "quickcomposer.browser.scrollTo",

From df709d9c726dd5b4f9cffd596f13960a1fd581b2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 21:41:43 +0800
Subject: [PATCH 108/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96=E5=90=8E=E7=AB=AF=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E5=B0=86=E5=85=83=E7=B4=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=87=BD=E6=95=B0=E7=A7=BB=E8=87=B3=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6script.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 130 --------------------
 plugin/lib/quickcomposer/browser/index.js   |   4 +
 plugin/lib/quickcomposer/browser/script.js  | 112 +++++++++++++++++
 3 files changed, 116 insertions(+), 130 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/browser/script.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 93aff009..73308e1b 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -237,76 +237,6 @@ const executeScript = async (script, args = {}) => {
   return result.value;
 };
 
-const getTabs = async () => {
-  const targets = await CDP.List();
-  return targets
-    .filter((target) => target.type === "page")
-    .map((target) => ({
-      url: target.url,
-      title: target.title,
-      id: target.id,
-    }));
-};
-
-const activateTab = async (type, value) => {
-  const targets = await CDP.List();
-  const target = targets.find((target) => target[type].includes(value));
-  if (!target) {
-    throw new Error(`未找到目标: ${type} = ${value}`);
-  }
-  await CDP.Activate({ id: target.id });
-};
-
-const clickElement = async (selector) => {
-  return await executeScript(`document.querySelector('${selector}').click()`);
-};
-
-const inputText = async (selector, text) => {
-  return await executeScript(
-    `
-      const el = document.querySelector('${selector}');
-      el.value = '${text}';
-      el.dispatchEvent(new Event('input'));
-      el.dispatchEvent(new Event('change'));
-    `
-  );
-};
-
-const getText = async (selector) => {
-  return await executeScript(
-    `document.querySelector('${selector}')?.textContent || ''`
-  );
-};
-
-const getHtml = async (selector) => {
-  return await executeScript(
-    `const element = document.querySelector('${selector}');
-      return element ? element.innerHTML : '';`
-  );
-};
-
-const hideElement = async (selector) => {
-  return await executeScript(
-    `document.querySelector('${selector}').style.display = 'none'`
-  );
-};
-
-const showElement = async (selector) => {
-  return await executeScript(
-    `document.querySelector('${selector}').style.display = ''`
-  );
-};
-
-const injectCSS = async (css) => {
-  return await executeScript(
-    `
-      const style = document.createElement('style');
-      style.textContent = \`${css}\`;
-      document.head.appendChild(style);
-    `
-  );
-};
-
 const setCookie = async (cookies, options = {}) => {
   const { Network } = await initCDP();
   for (const cookie of cookies) {
@@ -329,71 +259,11 @@ const getCookie = async (name) => {
   return cookies.find((cookie) => cookie.name === name);
 };
 
-const scrollTo = async (x, y) => {
-  return await executeScript(`window.scrollTo(${x}, ${y})`);
-};
-
-const scrollToElement = async (selector) => {
-  return await executeScript(
-    `document.querySelector('${selector}').scrollIntoView()`
-  );
-};
-
-const getScrollPosition = async () => {
-  return await executeScript(`
-      return JSON.stringify({
-        x: window.pageXOffset || document.documentElement.scrollLeft,
-        y: window.pageYOffset || document.documentElement.scrollTop
-      });
-    `);
-};
-
-const getPageSize = async () => {
-  return await executeScript(`
-      return JSON.stringify({
-        width: Math.max(
-          document.documentElement.scrollWidth,
-          document.documentElement.clientWidth
-        ),
-        height: Math.max(
-          document.documentElement.scrollHeight,
-          document.documentElement.clientHeight
-        )
-      });
-    `);
-};
-
-const waitForElement = async (selector, timeout = 5000) => {
-  const startTime = Date.now();
-  while (Date.now() - startTime < timeout) {
-    const result = await executeScript(
-      `!!document.querySelector('${selector}')`
-    );
-    if (result) return;
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-  throw new Error(`等待元素 ${selector} 超时`);
-};
-
 module.exports = {
   launchBrowser,
   getUrl,
   setUrl,
   executeScript,
-  getTabs,
-  activateTab,
-  clickElement,
-  inputText,
-  getText,
-  getHtml,
-  hideElement,
-  showElement,
-  injectCSS,
   setCookie,
   getCookie,
-  scrollTo,
-  scrollToElement,
-  getScrollPosition,
-  getPageSize,
-  waitForElement,
 };
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index eb7a8dcf..ac69262e 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -1,7 +1,11 @@
 const browser = require("./browser");
+const tabs = require("./tabs");
 const getSelector = require("./getSelector");
+const script = require("./script");
 
 module.exports = {
   ...browser,
   ...getSelector,
+  ...tabs,
+  ...script,
 };
diff --git a/plugin/lib/quickcomposer/browser/script.js b/plugin/lib/quickcomposer/browser/script.js
new file mode 100644
index 00000000..b3883652
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/script.js
@@ -0,0 +1,112 @@
+const { executeScript } = require("./browser");
+
+const clickElement = async (selector) => {
+  return await executeScript(`document.querySelector('${selector}').click()`);
+};
+
+const inputText = async (selector, text) => {
+  return await executeScript(
+    `
+      const el = document.querySelector('${selector}');
+      el.value = '${text}';
+      el.dispatchEvent(new Event('input'));
+      el.dispatchEvent(new Event('change'));
+    `
+  );
+};
+
+const getText = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}')?.textContent || ''`
+  );
+};
+
+const getHtml = async (selector) => {
+  return await executeScript(
+    `const element = document.querySelector('${selector}');
+      return element ? element.innerHTML : '';`
+  );
+};
+
+const hideElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').style.display = 'none'`
+  );
+};
+
+const showElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').style.display = ''`
+  );
+};
+
+const scrollTo = async (x, y) => {
+  return await executeScript(`window.scrollTo(${x}, ${y})`);
+};
+
+const scrollToElement = async (selector) => {
+  return await executeScript(
+    `document.querySelector('${selector}').scrollIntoView()`
+  );
+};
+
+const getScrollPosition = async () => {
+  return await executeScript(`
+      return JSON.stringify({
+        x: window.pageXOffset || document.documentElement.scrollLeft,
+        y: window.pageYOffset || document.documentElement.scrollTop
+      });
+    `);
+};
+
+const getPageSize = async () => {
+  return await executeScript(`
+      return JSON.stringify({
+        width: Math.max(
+          document.documentElement.scrollWidth,
+          document.documentElement.clientWidth
+        ),
+        height: Math.max(
+          document.documentElement.scrollHeight,
+          document.documentElement.clientHeight
+        )
+      });
+    `);
+};
+
+const waitForElement = async (selector, timeout = 5000) => {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    const result = await executeScript(
+      `!!document.querySelector('${selector}')`
+    );
+    if (result) return;
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+  throw new Error(`等待元素 ${selector} 超时`);
+};
+
+const injectCSS = async (css) => {
+  return await executeScript(
+    `
+      const style = document.createElement('style');
+      style.textContent = \`${css}\`;
+      document.head.appendChild(style);
+    `
+  );
+};
+
+module.exports = {
+  clickElement,
+  inputText,
+  getText,
+  getHtml,
+  hideElement,
+  showElement,
+  scrollTo,
+  scrollToElement,
+  getScrollPosition,
+  getPageSize,
+  waitForElement,
+  injectCSS,
+};

From 26360e9643c49c498643a6804cd21c4457fa09f3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 22 Jan 2025 22:14:55 +0800
Subject: [PATCH 109/332] =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E6=A0=87=E7=AD=BE=E9=A1=B5=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=88=9B=E5=BB=BA=E6=96=B0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=92=8C=E5=85=B3=E9=97=AD=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E7=9A=84=E5=91=BD=E4=BB=A4=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87URL=E3=80=81=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=92=8CID=E8=BF=9B=E8=A1=8C=E6=A0=87=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js |  2 +-
 plugin/lib/quickcomposer/browser/tabs.js    | 76 +++++++++++++++++++++
 src/js/composer/commands/browserCommands.js | 39 +++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 plugin/lib/quickcomposer/browser/tabs.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 73308e1b..22ff72e9 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -225,7 +225,7 @@ const executeScript = async (script, args = {}) => {
   const argValues = Object.values(args).map((v) => JSON.stringify(v));
 
   const wrappedScript = `
-        (function(${argNames.join(", ")}) {
+        (async function(${argNames.join(", ")}) {
           ${script}
         })(${argValues.join(", ")})
       `;
diff --git a/plugin/lib/quickcomposer/browser/tabs.js b/plugin/lib/quickcomposer/browser/tabs.js
new file mode 100644
index 00000000..de341cfc
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/tabs.js
@@ -0,0 +1,76 @@
+const CDP = require("chrome-remote-interface");
+const { executeScript } = require("./browser");
+
+let client = null;
+let Page = null;
+let Runtime = null;
+let Target = null;
+
+const initCDP = async (port) => {
+  if (!client) {
+    try {
+      client = await CDP({ port });
+      ({ Page, Runtime, Target } = client);
+      await Promise.all([Page.enable(), Runtime.enable()]);
+    } catch (err) {
+      console.log(err);
+      throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
+    }
+  }
+  return { Page, Runtime, Target };
+};
+
+// 获取所有标签页
+const getTabs = async () => {
+  const targets = await CDP.List();
+  return targets
+    .filter((target) => target.type === "page")
+    .map((target) => ({
+      url: target.url,
+      title: target.title,
+      id: target.id,
+    }));
+};
+
+const searchTarget = async (searchProperty, searchValue) => {
+  const targets = await CDP.List();
+  const target = targets.find((target) =>
+    target[searchProperty].includes(searchValue)
+  );
+  if (!target) {
+    throw new Error(`未找到目标: ${searchProperty} = ${searchValue}`);
+  }
+  return target;
+};
+
+// 激活指定标签页
+const activateTab = async (searchProperty, searchValue) => {
+  const target = await searchTarget(searchProperty, searchValue);
+  await CDP.Activate({ id: target.id });
+};
+
+// 创建新标签页
+const createNewTab = async (url = "about:blank") => {
+  const { Target } = await initCDP();
+  const { targetId } = await Target.createTarget({ url });
+  const { targetInfo } = await Target.getTargetInfo({ targetId });
+  return {
+    url: targetInfo.url,
+    title: targetInfo.title,
+    id: targetId,
+  };
+};
+
+// 关闭标签页
+const closeTab = async (searchProperty, searchValue) => {
+  const target = await searchTarget(searchProperty, searchValue);
+  await CDP.Close({ id: target.id });
+};
+
+
+module.exports = {
+  getTabs,
+  activateTab,
+  createNewTab,
+  closeTab,
+};
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 5cafb767..0a7c6b67 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -137,6 +137,45 @@ export const browserCommands = {
             },
           ],
         },
+        {
+          value: "quickcomposer.browser.createNewTab",
+          label: "创建新标签页",
+          icon: "tab",
+          config: [
+            {
+              label: "网址",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "留空则打开about:blank",
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.closeTab",
+          label: "关闭标签页",
+          icon: "tab",
+          config: [
+            {
+              component: "QSelect",
+              icon: "tab",
+              width: 3,
+              options: [
+                { label: "通过URL", value: "url" },
+                { label: "通过标题", value: "title" },
+                { label: "通过ID", value: "id" },
+              ],
+              defaultValue: "url",
+            },
+            {
+              label: "搜索条件",
+              component: "VariableInput",
+              icon: "tab",
+              width: 9,
+              placeholder: "支持模糊匹配",
+            },
+          ],
+        },
       ],
     },
     {

From e942259c2e70e9f7f182ebcbf2a2c4c164f3ed12 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 00:30:09 +0800
Subject: [PATCH 110/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=84=9A=E6=9C=AC=EF=BC=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=AD=89=E6=93=8D=E4=BD=9C=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=A0=87=E7=AD=BE=E9=A1=B5=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=88=AA=E5=9B=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js   | 272 ++++++++++++++----
 .../browser/{script.js => execScript.js}      |  53 ++--
 .../lib/quickcomposer/browser/getSelector.js  |   9 +-
 plugin/lib/quickcomposer/browser/index.js     |   6 +-
 plugin/lib/quickcomposer/browser/tabs.js      |  76 -----
 src/js/composer/commands/browserCommands.js   | 141 ++++++---
 6 files changed, 356 insertions(+), 201 deletions(-)
 rename plugin/lib/quickcomposer/browser/{script.js => execScript.js} (69%)
 delete mode 100644 plugin/lib/quickcomposer/browser/tabs.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 22ff72e9..7c688ae7 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -6,10 +6,7 @@ const http = require("http");
 const axios = require("axios");
 const fs = require("fs");
 
-let client = null;
-let Page = null;
-let Runtime = null;
-let DOM = null;
+let clients = new Map(); // 存储每个标签页的CDP客户端
 
 const getBrowserPath = (browser = "msedge") => {
   const platform = os.platform();
@@ -120,7 +117,6 @@ const launchBrowser = async (options) => {
     throw new Error("未找到浏览器，或未指定浏览器路径");
   }
 
-  // 查找可用端口
   const port = await findAvailablePort(9222);
 
   const args = [
@@ -140,7 +136,6 @@ const launchBrowser = async (options) => {
   ].filter(Boolean);
 
   return new Promise(async (resolve, reject) => {
-    // 如果使用独立用户数据目录，则需要先杀死已有的浏览器进程
     if (!useSingleUserDataDir) {
       try {
         await killRunningBrowser(browserType);
@@ -151,9 +146,7 @@ const launchBrowser = async (options) => {
     }
     const child = exec(
       `"${browserPath}" ${args.join(" ")}`,
-      {
-        windowsHide: true,
-      },
+      { windowsHide: true },
       async (error) => {
         if (error) {
           reject(error);
@@ -162,13 +155,9 @@ const launchBrowser = async (options) => {
       }
     );
 
-    // 等待端口可用
     waitForPort(port).then((success) => {
       if (success) {
-        resolve({
-          pid: child.pid,
-          port,
-        }); // 返回使用的端口号
+        resolve({ pid: child.pid, port });
       } else {
         reject(new Error("浏览器启动超时，请检查是否有权限问题或防火墙限制"));
       }
@@ -192,78 +181,247 @@ const killRunningBrowser = (browserType = "msedge") => {
   });
 };
 
-const initCDP = async (port) => {
-  if (!client) {
+const initCDP = async (targetId) => {
+  if (!clients.has(targetId)) {
     try {
-      client = await CDP({ port });
-      ({ Page, Runtime, DOM } = client);
-      await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
+      const client = await CDP({ target: targetId });
+      const { Page, Runtime, Target, Network, Emulation } = client;
+      await Promise.all([Page.enable(), Runtime.enable()]);
+      clients.set(targetId, {
+        client,
+        Page,
+        Runtime,
+        Target,
+        Network,
+        Emulation,
+      });
     } catch (err) {
       console.log(err);
       throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
     }
   }
-  return { Page, Runtime, DOM };
+  return clients.get(targetId);
+};
+
+const cleanupCDP = async (targetId) => {
+  const client = clients.get(targetId);
+  if (client) {
+    await client.client.close();
+    clients.delete(targetId);
+  }
+};
+
+// 获取所有标签页
+const getTabs = async () => {
+  const targets = await CDP.List();
+  return targets
+    .filter((target) => target.type === "page")
+    .map((target) => ({
+      url: target.url,
+      title: target.title,
+      id: target.id,
+    }));
+};
+
+// 获取当前活动标签页
+const getCurrentTab = async () => {
+  const targets = await CDP.List();
+  // 一般排第一个的就是活动标签页
+  const currentTarget = targets.find((target) => target.type === "page");
+
+  if (!currentTarget) {
+    throw new Error("未找到当前活动标签页");
+  }
+
+  return {
+    url: currentTarget.url,
+    title: currentTarget.title,
+    id: currentTarget.id,
+  };
 };
 
-const getUrl = async () => {
-  const { Page } = await initCDP();
+// 搜索标签页
+const searchTarget = async (tab) => {
+  if (!tab || !tab.by || !tab.searchValue || tab.by === "active") {
+    const currentTab = await getCurrentTab();
+    return currentTab;
+  }
+
+  const targets = await CDP.List();
+  const target = targets.find((target) =>
+    target[tab.by].includes(tab.searchValue)
+  );
+  if (!target) {
+    throw new Error(`未找到目标标签页: ${tab.by} = ${tab.searchValue}`);
+  }
+  return target;
+};
+
+// 激活指定标签页
+const activateTab = async (tab) => {
+  const target = await searchTarget(tab);
+  await CDP.Activate({ id: target.id });
+};
+
+// 创建新标签页
+const createNewTab = async (url = "about:blank") => {
+  const currentTab = await getCurrentTab();
+  const { Target } = await initCDP(currentTab.id);
+  const { targetId } = await Target.createTarget({ url });
+  const { targetInfo } = await Target.getTargetInfo({ targetId });
+  await cleanupCDP(currentTab.id);
+  return {
+    url: targetInfo.url,
+    title: targetInfo.title,
+    id: targetId,
+  };
+};
+
+// 关闭标签页
+const closeTab = async (tab) => {
+  const target = await searchTarget(tab);
+  await cleanupCDP(target.id);
+  await CDP.Close({ id: target.id });
+};
+
+const getUrl = async (tab) => {
+  const target = await searchTarget(tab);
+  const { Page } = await initCDP(target.id);
   const { frameTree } = await Page.getFrameTree();
+  await cleanupCDP(target.id);
   return frameTree.frame.url;
 };
 
-const setUrl = async (url) => {
-  const { Page } = await initCDP();
+const setUrl = async (tab, url) => {
+  const target = await searchTarget(tab);
+  const { Page } = await initCDP(target.id);
   await Page.navigate({ url });
   await Page.loadEventFired();
+  await cleanupCDP(target.id);
 };
 
-const executeScript = async (script, args = {}) => {
-  const { Runtime } = await initCDP();
-  // 构建参数列表
-  const argNames = Object.keys(args);
-  const argValues = Object.values(args).map((v) => JSON.stringify(v));
-
-  const wrappedScript = `
-        (async function(${argNames.join(", ")}) {
-          ${script}
-        })(${argValues.join(", ")})
-      `;
-  const { result } = await Runtime.evaluate({
-    expression: wrappedScript,
-    returnByValue: true,
-    awaitPromise: true,
-  });
-  return result.value;
-};
+const executeScript = async (tab, script, args = {}) => {
+  const target = await searchTarget(tab);
+  try {
+    const { Runtime } = await initCDP(target.id);
+    const argNames = Object.keys(args);
+    const argValues = Object.values(args).map((v) => JSON.stringify(v));
+
+    const wrappedScript = `
+      (function(${argNames.join(", ")}) {
+        ${script}
+      })(${argValues.join(", ")})
+    `;
 
-const setCookie = async (cookies, options = {}) => {
-  const { Network } = await initCDP();
-  for (const cookie of cookies) {
-    await Network.setCookie({
-      name: cookie.name,
-      value: cookie.value,
-      domain: options.domain || undefined,
-      path: options.path || "/",
-      secure: options.secure || false,
-      expires: options.expires
-        ? Math.floor(Date.now() / 1000) + options.expires * 3600
-        : undefined,
+    const { result } = await Runtime.evaluate({
+      expression: wrappedScript,
+      returnByValue: true,
+      awaitPromise: true,
     });
+
+    await cleanupCDP(target.id);
+    return result.value;
+  } catch (e) {
+    console.log(e);
+    throw new Error("执行脚本失败");
+  }
+};
+
+const setCookie = async (tab, cookies, options = {}) => {
+  const target = await searchTarget(tab);
+  const { Network, Page } = await initCDP(target.id);
+  try {
+    // 直接从Page获取URL，避免创建新连接
+    const { frameTree } = await Page.getFrameTree();
+    const url = frameTree.frame.url;
+
+    for (const cookie of cookies) {
+      await Network.setCookie({
+        name: cookie.name,
+        value: cookie.value,
+        domain: options.domain || url.split("/")[2],
+        path: options.path || "/",
+        secure: options.secure || false,
+        expires: options.expires
+          ? Math.floor(Date.now() / 1000) + options.expires * 3600
+          : undefined,
+      });
+    }
+  } finally {
+    await cleanupCDP(target.id);
   }
 };
 
-const getCookie = async (name) => {
-  const { Network } = await initCDP();
-  const cookies = await Network.getCookies();
+const getCookie = async (tab, name) => {
+  const target = await searchTarget(tab);
+  const { Network } = await initCDP(target.id);
+  const { cookies } = await Network.getCookies();
+  await cleanupCDP(target.id);
+  if (!name) return cookies;
   return cookies.find((cookie) => cookie.name === name);
 };
 
+// 捕获标签页截图
+const captureScreenshot = async (tab, options = {}) => {
+  const target = await searchTarget(tab);
+  const { format = "png", quality = 100, fullPage = false, savePath } = options;
+
+  try {
+    const { Page, Emulation } = await initCDP(target.id);
+
+    if (fullPage) {
+      const metrics = await Page.getLayoutMetrics();
+      const width = Math.max(
+        metrics.contentSize.width,
+        metrics.layoutViewport.clientWidth,
+        metrics.visualViewport.clientWidth
+      );
+      const height = Math.max(
+        metrics.contentSize.height,
+        metrics.layoutViewport.clientHeight,
+        metrics.visualViewport.clientHeight
+      );
+      await Emulation.setDeviceMetricsOverride({
+        width,
+        height,
+        deviceScaleFactor: 1,
+        mobile: false,
+      });
+    }
+
+    const { data } = await Page.captureScreenshot({
+      format,
+      quality: format === "jpeg" ? quality : undefined,
+      fromSurface: true,
+      captureBeyondViewport: fullPage,
+    });
+
+    if (fullPage) {
+      await Emulation.clearDeviceMetricsOverride();
+    }
+
+    if (savePath) {
+      fs.writeFileSync(savePath, data, "base64");
+    }
+
+    return data;
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
 module.exports = {
   launchBrowser,
+  killRunningBrowser,
+  getTabs,
+  getCurrentTab,
+  activateTab,
+  createNewTab,
+  closeTab,
   getUrl,
   setUrl,
   executeScript,
   setCookie,
   getCookie,
+  captureScreenshot,
 };
diff --git a/plugin/lib/quickcomposer/browser/script.js b/plugin/lib/quickcomposer/browser/execScript.js
similarity index 69%
rename from plugin/lib/quickcomposer/browser/script.js
rename to plugin/lib/quickcomposer/browser/execScript.js
index b3883652..4075b186 100644
--- a/plugin/lib/quickcomposer/browser/script.js
+++ b/plugin/lib/quickcomposer/browser/execScript.js
@@ -1,11 +1,15 @@
 const { executeScript } = require("./browser");
 
-const clickElement = async (selector) => {
-  return await executeScript(`document.querySelector('${selector}').click()`);
+const clickElement = async (tab, selector) => {
+  return await executeScript(
+    tab,
+    `document.querySelector('${selector}').click()`
+  );
 };
 
-const inputText = async (selector, text) => {
+const inputText = async (tab, selector, text) => {
   return await executeScript(
+    tab,
     `
       const el = document.querySelector('${selector}');
       el.value = '${text}';
@@ -15,52 +19,62 @@ const inputText = async (selector, text) => {
   );
 };
 
-const getText = async (selector) => {
+const getText = async (tab, selector) => {
   return await executeScript(
+    tab,
     `document.querySelector('${selector}')?.textContent || ''`
   );
 };
 
-const getHtml = async (selector) => {
+const getHtml = async (tab, selector) => {
   return await executeScript(
+    tab,
     `const element = document.querySelector('${selector}');
       return element ? element.innerHTML : '';`
   );
 };
 
-const hideElement = async (selector) => {
+const hideElement = async (tab, selector) => {
   return await executeScript(
+    tab,
     `document.querySelector('${selector}').style.display = 'none'`
   );
 };
 
-const showElement = async (selector) => {
+const showElement = async (tab, selector) => {
   return await executeScript(
+    tab,
     `document.querySelector('${selector}').style.display = ''`
   );
 };
 
-const scrollTo = async (x, y) => {
-  return await executeScript(`window.scrollTo(${x}, ${y})`);
+const scrollTo = async (tab, x, y) => {
+  return await executeScript(tab, `window.scrollTo(${x}, ${y})`);
 };
 
-const scrollToElement = async (selector) => {
+const scrollToElement = async (tab, selector) => {
   return await executeScript(
+    tab,
     `document.querySelector('${selector}').scrollIntoView()`
   );
 };
 
-const getScrollPosition = async () => {
-  return await executeScript(`
+const getScrollPosition = async (tab) => {
+  return await executeScript(
+    tab,
+    `
       return JSON.stringify({
         x: window.pageXOffset || document.documentElement.scrollLeft,
         y: window.pageYOffset || document.documentElement.scrollTop
       });
-    `);
+    `
+  );
 };
 
-const getPageSize = async () => {
-  return await executeScript(`
+const getPageSize = async (tab) => {
+  return await executeScript(
+    tab,
+    `
       return JSON.stringify({
         width: Math.max(
           document.documentElement.scrollWidth,
@@ -71,13 +85,15 @@ const getPageSize = async () => {
           document.documentElement.clientHeight
         )
       });
-    `);
+    `
+  );
 };
 
-const waitForElement = async (selector, timeout = 5000) => {
+const waitForElement = async (tab, selector, timeout = 5000) => {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
     const result = await executeScript(
+      tab,
       `!!document.querySelector('${selector}')`
     );
     if (result) return;
@@ -86,8 +102,9 @@ const waitForElement = async (selector, timeout = 5000) => {
   throw new Error(`等待元素 ${selector} 超时`);
 };
 
-const injectCSS = async (css) => {
+const injectCSS = async (tab, css) => {
   return await executeScript(
+    tab,
     `
       const style = document.createElement('style');
       style.textContent = \`${css}\`;
diff --git a/plugin/lib/quickcomposer/browser/getSelector.js b/plugin/lib/quickcomposer/browser/getSelector.js
index 849fb5bc..6a16eb54 100644
--- a/plugin/lib/quickcomposer/browser/getSelector.js
+++ b/plugin/lib/quickcomposer/browser/getSelector.js
@@ -116,8 +116,10 @@ const getOptimalSelector = () => {
   `;
 };
 
-const getSelector = async () => {
-  return await executeScript(`
+const getSelector = async (tab) => {
+  return await executeScript(
+    tab,
+    `
     return new Promise((resolve) => {
       // 创建高亮元素
       const highlight = document.createElement('div');
@@ -172,7 +174,8 @@ const getSelector = async () => {
       document.addEventListener('mousemove', handleMouseMove);
       document.addEventListener('click', handleClick, true);
     });
-  `);
+  `
+  );
 };
 
 module.exports = {
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index ac69262e..60b55076 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -1,11 +1,9 @@
 const browser = require("./browser");
-const tabs = require("./tabs");
 const getSelector = require("./getSelector");
-const script = require("./script");
+const execScript = require("./execScript");
 
 module.exports = {
   ...browser,
   ...getSelector,
-  ...tabs,
-  ...script,
+  ...execScript,
 };
diff --git a/plugin/lib/quickcomposer/browser/tabs.js b/plugin/lib/quickcomposer/browser/tabs.js
deleted file mode 100644
index de341cfc..00000000
--- a/plugin/lib/quickcomposer/browser/tabs.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const CDP = require("chrome-remote-interface");
-const { executeScript } = require("./browser");
-
-let client = null;
-let Page = null;
-let Runtime = null;
-let Target = null;
-
-const initCDP = async (port) => {
-  if (!client) {
-    try {
-      client = await CDP({ port });
-      ({ Page, Runtime, Target } = client);
-      await Promise.all([Page.enable(), Runtime.enable()]);
-    } catch (err) {
-      console.log(err);
-      throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
-    }
-  }
-  return { Page, Runtime, Target };
-};
-
-// 获取所有标签页
-const getTabs = async () => {
-  const targets = await CDP.List();
-  return targets
-    .filter((target) => target.type === "page")
-    .map((target) => ({
-      url: target.url,
-      title: target.title,
-      id: target.id,
-    }));
-};
-
-const searchTarget = async (searchProperty, searchValue) => {
-  const targets = await CDP.List();
-  const target = targets.find((target) =>
-    target[searchProperty].includes(searchValue)
-  );
-  if (!target) {
-    throw new Error(`未找到目标: ${searchProperty} = ${searchValue}`);
-  }
-  return target;
-};
-
-// 激活指定标签页
-const activateTab = async (searchProperty, searchValue) => {
-  const target = await searchTarget(searchProperty, searchValue);
-  await CDP.Activate({ id: target.id });
-};
-
-// 创建新标签页
-const createNewTab = async (url = "about:blank") => {
-  const { Target } = await initCDP();
-  const { targetId } = await Target.createTarget({ url });
-  const { targetInfo } = await Target.getTargetInfo({ targetId });
-  return {
-    url: targetInfo.url,
-    title: targetInfo.title,
-    id: targetId,
-  };
-};
-
-// 关闭标签页
-const closeTab = async (searchProperty, searchValue) => {
-  const target = await searchTarget(searchProperty, searchValue);
-  await CDP.Close({ id: target.id });
-};
-
-
-module.exports = {
-  getTabs,
-  activateTab,
-  createNewTab,
-  closeTab,
-};
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 0a7c6b67..e3e122bd 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -1,5 +1,32 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
 
+const tabConfig = {
+  component: "OptionEditor",
+  width: 12,
+  options: {
+    by: {
+      component: "QSelect",
+      label: "标签",
+      width: 3,
+      options: [
+        { label: "当前标签页", value: "active" },
+        { label: "通过URL", value: "url" },
+        { label: "通过标题", value: "title" },
+        { label: "通过ID", value: "id" },
+      ],
+    },
+    searchValue: {
+      component: "VariableInput",
+      icon: "tab",
+      width: 9,
+      placeholder: "当前标签页留空，其他支持模糊匹配",
+    },
+  },
+  defaultValue: {
+    by: "active",
+  },
+};
+
 export const browserCommands = {
   label: "浏览器控制",
   icon: "web",
@@ -79,6 +106,7 @@ export const browserCommands = {
       label: "获取/设置网址",
       icon: "link",
       isAsync: true,
+      config: [tabConfig],
       subCommands: [
         {
           value: "quickcomposer.browser.getUrl",
@@ -103,7 +131,7 @@ export const browserCommands = {
     },
     {
       value: "quickcomposer.browser.getTabs",
-      label: "获取/切换标签",
+      label: "标签操作",
       icon: "tab",
       isAsync: true,
       subCommands: [
@@ -116,26 +144,12 @@ export const browserCommands = {
           value: "quickcomposer.browser.activateTab",
           label: "切换标签",
           icon: "tab_unselected",
-          config: [
-            {
-              component: "QSelect",
-              icon: "tab",
-              width: 3,
-              options: [
-                { label: "通过URL", value: "url" },
-                { label: "通过标题", value: "title" },
-                { label: "通过ID", value: "id" },
-              ],
-              defaultValue: "url",
-            },
-            {
-              label: "URL/标题/ID",
-              component: "VariableInput",
-              icon: "tab",
-              width: 9,
-              placeholder: "支持模糊匹配",
-            },
-          ],
+          config: [tabConfig],
+        },
+        {
+          value: "quickcomposer.browser.getCurrentTab",
+          label: "获取当前标签页",
+          icon: "tab",
         },
         {
           value: "quickcomposer.browser.createNewTab",
@@ -155,26 +169,69 @@ export const browserCommands = {
           value: "quickcomposer.browser.closeTab",
           label: "关闭标签页",
           icon: "tab",
-          config: [
-            {
+          config: [tabConfig],
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.browser.captureScreenshot",
+      label: "捕获截图",
+      icon: "screenshot",
+      config: [
+        tabConfig,
+        {
+          label: "选项",
+          component: "OptionEditor",
+          icon: "settings",
+          width: 12,
+          options: {
+            format: {
+              label: "格式",
               component: "QSelect",
-              icon: "tab",
-              width: 3,
+              icon: "format",
+              width: 4,
               options: [
-                { label: "通过URL", value: "url" },
-                { label: "通过标题", value: "title" },
-                { label: "通过ID", value: "id" },
+                { label: "PNG", value: "png" },
+                { label: "JPEG", value: "jpeg" },
+                { label: "WebP", value: "webp" },
               ],
-              defaultValue: "url",
             },
-            {
-              label: "搜索条件",
+            quality: {
+              label: "质量",
+              component: "NumberInput",
+              icon: "quality",
+              width: 4,
+              min: 0,
+              max: 100,
+            },
+            fullPage: {
+              label: "全屏截图",
+              component: "CheckButton",
+              icon: "fullscreen",
+              width: 4,
+            },
+            savePath: {
+              label: "保存路径",
               component: "VariableInput",
-              icon: "tab",
-              width: 9,
-              placeholder: "支持模糊匹配",
+              icon: "folder",
+              placeholder: "留空则不保存",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "save",
+                  options: {
+                    title: "保存截图",
+                    properties: ["saveFile"],
+                  },
+                },
+              },
             },
-          ],
+          },
+          defaultValue: {
+            format: "png",
+            quality: 100,
+            fullPage: false,
+          },
         },
       ],
     },
@@ -184,6 +241,7 @@ export const browserCommands = {
       icon: "code",
       isAsync: true,
       config: [
+        tabConfig,
         {
           label: "脚本内容",
           component: "CodeEditor",
@@ -204,6 +262,7 @@ export const browserCommands = {
       label: "Cookie操作",
       icon: "cookie",
       isAsync: true,
+      config: [tabConfig],
       subCommands: [
         {
           value: "quickcomposer.browser.setCookie",
@@ -282,7 +341,7 @@ export const browserCommands = {
               component: "VariableInput",
               icon: "label",
               width: 12,
-              placeholder: "输入Cookie名称",
+              placeholder: "输入Cookie名称，留空则获取所有",
             },
           ],
         },
@@ -294,6 +353,7 @@ export const browserCommands = {
       icon: "style",
       isAsync: true,
       config: [
+        tabConfig,
         {
           label: "CSS内容",
           component: "CodeEditor",
@@ -303,19 +363,13 @@ export const browserCommands = {
         },
       ],
     },
-    {
-      value: "quickcomposer.browser.getSelector",
-      label: "手动选择元素",
-      icon: "mouse",
-      isAsync: true,
-      config: [],
-    },
     {
       value: "quickcomposer.browser.clickElement",
       label: "元素操作",
       icon: "web",
       isAsync: true,
       config: [
+        tabConfig,
         {
           label: "选择器",
           component: "VariableInput",
@@ -395,6 +449,7 @@ export const browserCommands = {
       label: "滚动及页面尺寸",
       icon: "open_in_full",
       isAsync: true,
+      config: [tabConfig],
       subCommands: [
         {
           value: "quickcomposer.browser.scrollTo",

From 60db7be8730b041973f160e99b69b79b5f4fcab5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 08:51:34 +0800
Subject: [PATCH 111/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=A3=80=E6=9F=A5=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=9C=A8?=
 =?UTF-8?q?=20DictEditor=20=E7=BB=84=E4=BB=B6=E7=9A=84=20addItem=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=AF=B9=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=EF=BC=8C=E8=8B=A5=E5=90=8D=E7=A7=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=88=99=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B9=B6=E9=98=BB=E6=AD=A2=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/DictEditor.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index bbbb98b1..362d99fa 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -238,6 +238,10 @@ export default defineComponent({
     addItem() {
       if (this.options?.disableAdd) return;
       const dict = { ...this.modelValue };
+      if (dict[""]) {
+        quickcommand.showMessageBox("名称不能为空");
+        return;
+      }
       dict[""] = newVarInputVal("str");
       this.$emit("update:modelValue", dict);
     },

From 4805cf67168ca442da26a0559108bd1c6577c6fa Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 09:32:37 +0800
Subject: [PATCH 112/332] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E9=80=89=E9=A1=B9=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9A=90=E8=BA=AB=E6=A8=A1=E5=BC=8F=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A0=E5=A4=B4=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E7=AA=97=E5=8F=A3=E5=B0=BA=E5=AF=B8=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=AE=BD=E5=BA=A6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 27 +++++++++++++++++----
 src/js/composer/commands/browserCommands.js | 12 ++++++---
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 7c688ae7..7ef97848 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -107,10 +107,11 @@ const launchBrowser = async (options) => {
   const {
     browserType = "msedge",
     useSingleUserDataDir = true,
-    headless = false,
     proxy = null,
     browserPath = getBrowserPath(browserType),
     windowSize = null,
+    incognito = false,
+    headless = false,
   } = options;
 
   if (!browserPath) {
@@ -119,14 +120,28 @@ const launchBrowser = async (options) => {
 
   const port = await findAvailablePort(9222);
 
-  const args = [
+  const automationArgs = [
     `--remote-debugging-port=${port}`,
+    "--disable-infobars",
+    "--disable-notifications",
+    "--disable-popup-blocking",
+    "--disable-save-password-bubble",
+    "--disable-translate",
     "--no-first-run",
     "--no-default-browser-check",
-    "--start-maximized",
-    headless ? "--headless" : "",
-    windowSize ? `--window-size=${windowSize}` : "",
+    "--user-data-start-with-quickcomposer",
+  ];
+
+  const incognitoArg = {
+    chrome: "--incognito",
+    msedge: "--inprivate",
+  };
+
+  const optionArgs = [
+    windowSize ? `--window-size=${windowSize}` : "--start-maximized",
     proxy ? `--proxy-server=${proxy}` : "",
+    incognito ? incognitoArg[browserType] : "",
+    headless ? "--headless" : "",
     useSingleUserDataDir
       ? `--user-data-dir=${path.join(
           os.tmpdir(),
@@ -135,6 +150,8 @@ const launchBrowser = async (options) => {
       : "",
   ].filter(Boolean);
 
+  const args = [...automationArgs, ...optionArgs];
+
   return new Promise(async (resolve, reject) => {
     if (!useSingleUserDataDir) {
       try {
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index e3e122bd..a97b4ba0 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -55,12 +55,17 @@ export const browserCommands = {
             useSingleUserDataDir: {
               label: "使用独立用户数据目录",
               component: "CheckButton",
-              width: 6,
+              width: 4,
             },
             headless: {
-              label: "启用无头模式",
+              label: "无头模式",
               component: "CheckButton",
-              width: 6,
+              width: 4,
+            },
+            incognito: {
+              label: "隐身模式",
+              component: "CheckButton",
+              width: 4,
             },
             windowSize: {
               label: "窗口尺寸",
@@ -97,6 +102,7 @@ export const browserCommands = {
             browserType: "msedge",
             useSingleUserDataDir: true,
             headless: false,
+            incognito: false,
           },
         },
       ],

From f4245a5744286297b50bb9da7511b24337bcfa41 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 10:03:50 +0800
Subject: [PATCH 113/332] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=96=B0=E5=A2=9EDOM=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E9=80=89=E6=8B=A9=E5=99=A8=E6=94=AF=E6=8C=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=AA=E5=9B=BE=E5=8F=82=E6=95=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 88 ++++++++++++++-------
 src/js/composer/commands/browserCommands.js | 37 +++++----
 2 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 7ef97848..ac52c18b 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -202,8 +202,8 @@ const initCDP = async (targetId) => {
   if (!clients.has(targetId)) {
     try {
       const client = await CDP({ target: targetId });
-      const { Page, Runtime, Target, Network, Emulation } = client;
-      await Promise.all([Page.enable(), Runtime.enable()]);
+      const { Page, Runtime, Target, Network, Emulation, DOM } = client;
+      await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
       clients.set(targetId, {
         client,
         Page,
@@ -211,6 +211,7 @@ const initCDP = async (targetId) => {
         Target,
         Network,
         Emulation,
+        DOM,
       });
     } catch (err) {
       console.log(err);
@@ -381,42 +382,75 @@ const getCookie = async (tab, name) => {
 // 捕获标签页截图
 const captureScreenshot = async (tab, options = {}) => {
   const target = await searchTarget(tab);
-  const { format = "png", quality = 100, fullPage = false, savePath } = options;
+  const {
+    format = "png",
+    quality = 100,
+    savePath,
+    selector = null,
+  } = options;
 
   try {
-    const { Page, Emulation } = await initCDP(target.id);
-
-    if (fullPage) {
-      const metrics = await Page.getLayoutMetrics();
-      const width = Math.max(
-        metrics.contentSize.width,
-        metrics.layoutViewport.clientWidth,
-        metrics.visualViewport.clientWidth
-      );
-      const height = Math.max(
-        metrics.contentSize.height,
-        metrics.layoutViewport.clientHeight,
-        metrics.visualViewport.clientHeight
-      );
-      await Emulation.setDeviceMetricsOverride({
-        width,
-        height,
-        deviceScaleFactor: 1,
-        mobile: false,
+    const { Page, Emulation, DOM } = await initCDP(target.id);
+    await DOM.enable();
+
+    let clip = null;
+    if (selector) {
+      // 获取DOM节点
+      const { root } = await DOM.getDocument();
+      const { nodeId } = await DOM.querySelector({
+        nodeId: root.nodeId,
+        selector: selector,
       });
+
+      if (!nodeId) {
+        throw new Error(`未找到元素: ${selector}`);
+      }
+
+      // 获取元素的精确四边形坐标
+      const { quads } = await DOM.getContentQuads({ nodeId });
+      if (!quads || quads.length === 0) {
+        throw new Error("无法获取元素位置信息");
+      }
+
+      // 获取布局指标
+      const { visualViewport } = await Page.getLayoutMetrics();
+      const { pageX, pageY } = visualViewport;
+
+      // 计算边界框
+      const quad = quads[0];
+      const x = Math.min(quad[0], quad[2], quad[4], quad[6]);
+      const y = Math.min(quad[1], quad[3], quad[5], quad[7]);
+      const width = Math.max(quad[0], quad[2], quad[4], quad[6]) - x;
+      const height = Math.max(quad[1], quad[3], quad[5], quad[7]) - y;
+
+      clip = {
+        x: Math.round(x - pageX),
+        y: Math.round(y - pageY),
+        width: Math.round(width),
+        height: Math.round(height),
+        scale: 1,
+      };
+
+      // 确保尺寸不为0
+      if (clip.width === 0) clip.width = 1;
+      if (clip.height === 0) clip.height = 1;
     }
 
-    const { data } = await Page.captureScreenshot({
+    const screenshotParams = {
       format,
       quality: format === "jpeg" ? quality : undefined,
       fromSurface: true,
-      captureBeyondViewport: fullPage,
-    });
+      captureBeyondViewport: !!selector,
+    };
 
-    if (fullPage) {
-      await Emulation.clearDeviceMetricsOverride();
+    if (clip) {
+      screenshotParams.clip = clip;
     }
 
+    const { data } = await Page.captureScreenshot(screenshotParams);
+
+    await DOM.disable();
+
     if (savePath) {
       fs.writeFileSync(savePath, data, "base64");
     }
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index a97b4ba0..cc5f7b12 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -183,6 +183,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.captureScreenshot",
       label: "捕获截图",
       icon: "screenshot",
+      isAsync: true,
       config: [
         tabConfig,
         {
@@ -191,37 +192,39 @@ export const browserCommands = {
           icon: "settings",
           width: 12,
           options: {
+            quality: {
+              label: "质量",
+              component: "NumberInput",
+              width: 2,
+              min: 0,
+              max: 100,
+            },
+            selector: {
+              label: "指定元素（CSS选择器）",
+              component: "VariableInput",
+              icon: "code",
+              width: 10,
+              placeholder: "留空截取可视区域，截取整个页面可填body",
+              options: {
+                cssSelector: true,
+              },
+            },
             format: {
               label: "格式",
               component: "QSelect",
-              icon: "format",
-              width: 4,
+              width: 2,
               options: [
                 { label: "PNG", value: "png" },
                 { label: "JPEG", value: "jpeg" },
                 { label: "WebP", value: "webp" },
               ],
             },
-            quality: {
-              label: "质量",
-              component: "NumberInput",
-              icon: "quality",
-              width: 4,
-              min: 0,
-              max: 100,
-            },
-            fullPage: {
-              label: "全屏截图",
-              component: "CheckButton",
-              icon: "fullscreen",
-              width: 4,
-            },
             savePath: {
               label: "保存路径",
               component: "VariableInput",
               icon: "folder",
               placeholder: "留空则不保存",
-              width: 12,
+              width: 10,
               options: {
                 dialog: {
                   type: "save",

From 603cadb2ef44e739c450375783dc357b0f35c771 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 10:46:52 +0800
Subject: [PATCH 114/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=9C=A8=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E5=91=BD=E4=BB=A4=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20submitForm=20=E6=96=B9=E6=B3=95=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=80=89=E6=8B=A9=E5=99=A8=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=B9=B6=E6=8F=90=E4=BA=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js   |  2 +-
 .../lib/quickcomposer/browser/execScript.js   | 22 +++++++++++++++++
 src/js/composer/commands/browserCommands.js   | 24 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index ac52c18b..73a71e84 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -326,7 +326,7 @@ const executeScript = async (tab, script, args = {}) => {
     const argValues = Object.values(args).map((v) => JSON.stringify(v));
 
     const wrappedScript = `
-      (function(${argNames.join(", ")}) {
+      (async function(${argNames.join(", ")}) {
         ${script}
       })(${argValues.join(", ")})
     `;
diff --git a/plugin/lib/quickcomposer/browser/execScript.js b/plugin/lib/quickcomposer/browser/execScript.js
index 4075b186..21aec07f 100644
--- a/plugin/lib/quickcomposer/browser/execScript.js
+++ b/plugin/lib/quickcomposer/browser/execScript.js
@@ -19,6 +19,27 @@ const inputText = async (tab, selector, text) => {
   );
 };
 
+const submitForm = async (tab, buttonSelector, inputSelectors) => {
+  return await executeScript(
+    tab,
+    `
+    const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    let el = null;
+    ${inputSelectors
+      .map(
+        (i) =>
+          `el = document.querySelector('${i.selector}');
+          el.value = '${i.value}';
+          el.dispatchEvent(new Event('input'));
+          el.dispatchEvent(new Event('change'));`
+      )
+      .join("await sleep(200);")}
+      await sleep(200);
+      document.querySelector('${buttonSelector}').click();
+    `
+  );
+};
+
 const getText = async (tab, selector) => {
   return await executeScript(
     tab,
@@ -116,6 +137,7 @@ const injectCSS = async (tab, css) => {
 module.exports = {
   clickElement,
   inputText,
+  submitForm,
   getText,
   getHtml,
   hideElement,
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index cc5f7b12..e8e69986 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -410,6 +410,30 @@ export const browserCommands = {
             },
           ],
         },
+        {
+          value: "quickcomposer.browser.submitForm",
+          label: "提交表单",
+          icon: "send",
+          config: [
+            {
+              topLabel: "上方填要点击的提交按钮，下方添加要操作的输入框",
+              component: "ArrayEditor",
+              width: 12,
+              columns: {
+                selector: {
+                  label: "输入框选择器",
+                  options: {
+                    cssSelector: true,
+                  },
+                },
+                value: {
+                  label: "要填入的值",
+                },
+              },
+              isCollapse: false,
+            },
+          ],
+        },
         {
           value: "quickcomposer.browser.getText",
           label: "获取文本",

From 7b346616d1befae6d2b19426a121b88729c2846d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 10:46:59 +0800
Subject: [PATCH 115/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=20BorderLabel=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=86=85=E8=BE=B9=E8=B7=9D=E4=BB=A5?=
 =?UTF-8?q?=E6=94=B9=E5=96=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/BorderLabel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/composer/common/BorderLabel.vue b/src/components/composer/common/BorderLabel.vue
index 3bbc9b84..8983495e 100644
--- a/src/components/composer/common/BorderLabel.vue
+++ b/src/components/composer/common/BorderLabel.vue
@@ -115,7 +115,7 @@ export default {
 
 .content {
   position: relative;
-  padding: 8px;
+  padding: 16px 8px 8px 8px;
   opacity: 1;
   overflow: hidden;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);

From 06bd651c5389d49618e130aedc67e26cb8d4990a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 12:18:46 +0800
Subject: [PATCH 116/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E8=BF=9C=E7=A8=8B=E5=92=8C=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?JavaScript=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BC=98=E5=8C=96CSS?=
 =?UTF-8?q?=E6=B3=A8=E5=85=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/quickcomposer/browser/execScript.js   | 47 ++++++++++-
 src/js/composer/commands/browserCommands.js   | 83 +++++++++++++++----
 2 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/execScript.js b/plugin/lib/quickcomposer/browser/execScript.js
index 21aec07f..4153fa09 100644
--- a/plugin/lib/quickcomposer/browser/execScript.js
+++ b/plugin/lib/quickcomposer/browser/execScript.js
@@ -1,4 +1,5 @@
 const { executeScript } = require("./browser");
+const fs = require("fs");
 
 const clickElement = async (tab, selector) => {
   return await executeScript(
@@ -128,12 +129,54 @@ const injectCSS = async (tab, css) => {
     tab,
     `
       const style = document.createElement('style');
-      style.textContent = \`${css}\`;
+      style.textContent = css;
       document.head.appendChild(style);
+    `,
+    { css }
+  );
+};
+
+const injectRemoteScript = async (tab, url) => {
+  return await executeScript(
+    tab,
     `
+      return await new Promise((resolve, reject) => {
+        const script = document.createElement('script');
+        script.src = url;
+        script.type = 'text/javascript';
+        script.onload = () => resolve(true);
+        script.onerror = () => reject(new Error('Failed to load script: ' + url));
+        document.head.appendChild(script);
+      });
+    `,
+    { url }
   );
 };
 
+const injectLocalScript = async (tab, filePath) => {
+  try {
+    if (!fs.existsSync(filePath)) {
+      throw new Error(`文件不存在: ${filePath}`);
+    }
+
+    const content = fs.readFileSync(filePath, "utf8");
+
+    return await executeScript(
+      tab,
+      `
+        const script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.textContent = content;
+        document.head.appendChild(script);
+        return true;
+      `,
+      { content }
+    );
+  } catch (error) {
+    throw new Error(`注入本地脚本失败: ${error.message}`);
+  }
+};
+
 module.exports = {
   clickElement,
   inputText,
@@ -148,4 +191,6 @@ module.exports = {
   getPageSize,
   waitForElement,
   injectCSS,
+  injectRemoteScript,
+  injectLocalScript,
 };
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index e8e69986..bcc62a22 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -266,6 +266,73 @@ export const browserCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.browser.injectRemoteScript",
+      label: "注入脚本/样式",
+      icon: "style",
+      isAsync: true,
+      config: [tabConfig],
+      subCommands: [
+        {
+          label: "注入CDN脚本",
+          value: "quickcomposer.browser.injectRemoteScript",
+          icon: "javascript",
+          config: [
+            {
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "输入远程脚本URL",
+            },
+          ],
+        },
+        {
+          label: "注入本地脚本",
+          icon: "javascript",
+          value: "quickcomposer.browser.injectLocalScript",
+          config: [
+            {
+              component: "VariableInput",
+              icon: "folder",
+              width: 12,
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择脚本",
+                    filters: [
+                      {
+                        name: "JavaScript",
+                        extensions: ["js"],
+                      },
+                      {
+                        name: "all",
+                        extensions: ["*"],
+                      },
+                    ],
+                    properties: ["openFile"],
+                  },
+                },
+              },
+              placeholder: "输入本地脚本绝对路径",
+            },
+          ],
+        },
+        {
+          label: "注入CSS",
+          value: "quickcomposer.browser.injectCSS",
+          icon: "style",
+          config: [
+            {
+              component: "CodeEditor",
+              icon: "style",
+              width: 12,
+              placeholder: "输入CSS代码",
+            },
+          ],
+        },
+      ],
+    },
     {
       value: "quickcomposer.browser.setCookie",
       label: "Cookie操作",
@@ -356,22 +423,6 @@ export const browserCommands = {
         },
       ],
     },
-    {
-      value: "quickcomposer.browser.injectCSS",
-      label: "注入CSS",
-      icon: "style",
-      isAsync: true,
-      config: [
-        tabConfig,
-        {
-          label: "CSS内容",
-          component: "CodeEditor",
-          icon: "style",
-          width: 12,
-          placeholder: "输入CSS代码",
-        },
-      ],
-    },
     {
       value: "quickcomposer.browser.clickElement",
       label: "元素操作",

From feaf1ccf64f4a1b2fa45286cc6e72a9fa3305a15 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 15:39:06 +0800
Subject: [PATCH 117/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=20OptionEditor=20?=
 =?UTF-8?q?=E5=92=8C=20ParamInput=20=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=E5=88=97=E5=AE=BD=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/card/CommandButtons.vue          |  2 +-
 .../composer/common/OptionEditor.vue          | 24 ++++++++++---------
 src/components/composer/param/ParamInput.vue  | 23 ++++++++++++++----
 src/js/composer/commands/macosCommands.js     |  3 ---
 src/js/composer/commands/windowsCommands.js   |  2 +-
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 707e28a2..cc741176 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="command-buttons q-px-sm">
+  <div class="command-buttons q-pl-sm">
     <div class="row items-center no-wrap">
       <!-- 输出变量设置和按钮 -->
       <div
diff --git a/src/components/composer/common/OptionEditor.vue b/src/components/composer/common/OptionEditor.vue
index 642408fe..30ebb8d6 100644
--- a/src/components/composer/common/OptionEditor.vue
+++ b/src/components/composer/common/OptionEditor.vue
@@ -5,11 +5,11 @@
     :icon="icon"
     :model-value="isCollapse"
   >
-    <div class="param-grid">
+    <div class="option-grid">
       <div
         v-for="([key, config], index) in Object.entries(options)"
         :key="`${key}-${index}`"
-        class="grid-item"
+        class="option-item"
         :style="getColumnStyle(config.width)"
       >
         <ParamImporter
@@ -72,8 +72,9 @@ export default defineComponent({
         };
       }
       const columnWidth = (width / 12) * 100;
+      const gapWidth = 8;
       return {
-        width: `calc(${columnWidth}% - var(--grid-gap))`,
+        width: `calc(${columnWidth}% - ${gapWidth * (1 - width / 12)}px)`,
         flex: "0 0 auto",
       };
     },
@@ -85,7 +86,7 @@ export default defineComponent({
 </script>
 
 <style scoped>
-.param-grid {
+.option-grid {
   display: flex;
   flex-wrap: wrap;
   gap: var(--grid-gap);
@@ -93,28 +94,29 @@ export default defineComponent({
   --grid-gap: 8px;
 }
 
-.grid-item {
+.option-item {
   min-width: 50px;
-  margin-bottom: 0;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
-.grid-item > * {
+.option-item > * {
   flex: 1;
   min-width: 0;
+  width: 100%;
 }
 
 /* 让开关、复选框和按钮组居中显示 */
-.grid-item > .q-toggle,
-.grid-item > .q-checkbox,
-.grid-item > .q-btn-group {
+.option-item > .q-toggle,
+.option-item > .q-checkbox,
+.option-item > .q-btn-group {
   flex: 0 1 auto;
+  width: auto;
 }
 
 @media (max-width: 600px) {
-  .grid-item {
+  .option-item {
     width: 100% !important;
     flex: 1 1 100% !important;
   }
diff --git a/src/components/composer/param/ParamInput.vue b/src/components/composer/param/ParamInput.vue
index daa2a048..2239115b 100644
--- a/src/components/composer/param/ParamInput.vue
+++ b/src/components/composer/param/ParamInput.vue
@@ -3,7 +3,10 @@
     <div
       v-for="(config, index) in configs"
       :key="index"
-      class="grid-item"
+      :class="{
+        'grid-item': config.component !== 'OptionEditor',
+        'option-container': config.component === 'OptionEditor',
+      }"
       :style="getColumnStyle(config.width)"
     >
       <OptionEditor
@@ -64,8 +67,9 @@ export default defineComponent({
         };
       }
       const columnWidth = (width / 12) * 100;
+      const gapWidth = 8; // 与 CSS 中的 --grid-gap 保持一致
       return {
-        width: `calc(${columnWidth}% - var(--grid-gap))`,
+        width: `calc(${columnWidth}% - ${gapWidth * (1 - width / 12)}px)`,
         flex: "0 0 auto",
       };
     },
@@ -80,14 +84,13 @@ export default defineComponent({
 .param-grid {
   display: flex;
   flex-wrap: wrap;
-  gap: var(--grid-gap);
+  gap: 8px;
   width: 100%;
   --grid-gap: 8px;
 }
 
 .grid-item {
   min-width: 50px;
-  margin-bottom: 0;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -103,6 +106,7 @@ export default defineComponent({
 .grid-item > .q-checkbox,
 .grid-item > .q-btn-group {
   flex: 0 1 auto;
+  width: auto;
 }
 
 @media (max-width: 600px) {
@@ -111,4 +115,15 @@ export default defineComponent({
     flex: 1 1 100% !important;
   }
 }
+
+.option-container {
+  min-width: 50px;
+  width: 100%;
+  display: flex;
+}
+
+.option-container > * {
+  flex: 1;
+  min-width: 0;
+}
 </style>
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 88ed4742..ecffa320 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,6 +1,3 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
-import { browserCommands } from "js/composer/commands/browserCommands";
-
 export const macosCommands = {
   label: "Mac自动化",
   icon: "laptop_mac",
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 299cbf48..139b5ff3 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -1,5 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager.js";
-import { browserCommands } from "js/composer/commands/browserCommands.js";
+
 const sendKeys = [
   // 特殊按键
   { value: "{ENTER}", label: "回车键 (Enter)" },

From df8c6c48f866f3a442b5c97ac4fbec2be825eaae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 17:44:29 +0800
Subject: [PATCH 118/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AB=AF=E5=8F=A3=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=92=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=AE=9E=E4=BE=8B=E7=9A=84=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=EF=BC=8C=E5=A2=9E=E5=BC=BA=E5=90=AF=E5=8A=A8=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E6=94=AF=E6=8C=81=E7=A6=81=E7=94=A8=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=92=8C=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=E7=AB=AF=E5=8F=A3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js | 189 ++++++++++++++------
 src/js/composer/commands/browserCommands.js | 177 +++++++++++-------
 2 files changed, 254 insertions(+), 112 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
index 73a71e84..8dc54d18 100644
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ b/plugin/lib/quickcomposer/browser/browser.js
@@ -2,11 +2,10 @@ const CDP = require("chrome-remote-interface");
 const { exec } = require("child_process");
 const path = require("path");
 const os = require("os");
-const http = require("http");
-const axios = require("axios");
 const fs = require("fs");
+const net = require("net");
 
-let clients = new Map(); // 存储每个标签页的CDP客户端
+let currentClientPort = null;
 
 const getBrowserPath = (browser = "msedge") => {
   const platform = os.platform();
@@ -70,11 +69,21 @@ const getBrowserPath = (browser = "msedge") => {
 
 const isPortAvailable = (port) => {
   return new Promise((resolve) => {
-    const server = http.createServer();
-    server.listen(port, () => {
-      server.close(() => resolve(true));
+    const socket = new net.Socket();
+
+    const onError = () => {
+      socket.destroy();
+      resolve(true);
+    };
+
+    socket.setTimeout(100);
+    socket.once("error", onError);
+    socket.once("timeout", onError);
+
+    socket.connect(port, "127.0.0.1", () => {
+      socket.destroy();
+      resolve(false);
     });
-    server.on("error", () => resolve(false));
   });
 };
 
@@ -82,8 +91,8 @@ const waitForPort = async (port, timeout = 30000) => {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
     try {
-      const response = await axios.get(`http://localhost:${port}/json/version`);
-      if (response.status === 200) return true;
+      await CDP.Version({ port });
+      return true;
     } catch (e) {
       await new Promise((resolve) => setTimeout(resolve, 100));
     }
@@ -112,6 +121,7 @@ const launchBrowser = async (options) => {
     windowSize = null,
     incognito = false,
     headless = false,
+    disableExtensions = false,
   } = options;
 
   if (!browserPath) {
@@ -119,6 +129,7 @@ const launchBrowser = async (options) => {
   }
 
   const port = await findAvailablePort(9222);
+  currentClientPort = port;
 
   const automationArgs = [
     `--remote-debugging-port=${port}`,
@@ -142,6 +153,7 @@ const launchBrowser = async (options) => {
     proxy ? `--proxy-server=${proxy}` : "",
     incognito ? incognitoArg[browserType] : "",
     headless ? "--headless" : "",
+    disableExtensions ? "--disable-extensions" : "",
     useSingleUserDataDir
       ? `--user-data-dir=${path.join(
           os.tmpdir(),
@@ -198,40 +210,93 @@ const killRunningBrowser = (browserType = "msedge") => {
   });
 };
 
-const initCDP = async (targetId) => {
-  if (!clients.has(targetId)) {
-    try {
-      const client = await CDP({ target: targetId });
-      const { Page, Runtime, Target, Network, Emulation, DOM } = client;
-      await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
-      clients.set(targetId, {
-        client,
-        Page,
-        Runtime,
-        Target,
-        Network,
-        Emulation,
-        DOM,
-      });
-    } catch (err) {
-      console.log(err);
-      throw new Error(`请先通过浏览器控制中的"启动浏览器"打开浏览器`);
+const getClientPorts = async (returnFirstPort = false) => {
+  try {
+    // 创建所有端口检查的 Promise 数组
+    const portChecks = [];
+    for (let port = 9222; port < 9322; port++) {
+      portChecks.push(
+        CDP.List({ port })
+          .then(() => port)
+          .catch(() => null)
+      );
+    }
+
+    if (returnFirstPort) {
+      // 如果需要返回第一个可用端口，使用 Promise.race
+      const firstPort = await Promise.race(portChecks);
+      if (firstPort) {
+        return firstPort;
+      } else {
+        return null;
+      }
     }
+
+    // 如果不需要返回第一个端口或没有找到可用端口，并行执行所有检查
+    const results = await Promise.all(portChecks);
+
+    // 过滤出可用的端口
+    return results.filter((port) => port !== null);
+  } catch (error) {
+    throw new Error(`获取客户端列表失败: ${error.message}`);
+  }
+};
+
+const getCurrentClientPort = async () => {
+  if (currentClientPort === null) {
+    const port = await getClientPorts(true);
+    if (port === null) {
+      throw new Error("未找到可用的浏览器实例，请先从实例管理里面启动新的实例");
+    }
+    currentClientPort = port;
+  }
+  return currentClientPort;
+};
+
+const getTargets = async () => {
+  const port = await getCurrentClientPort();
+  return await CDP.List({ port });
+};
+
+const initCDP = async (targetId) => {
+  try {
+    const port = await getCurrentClientPort();
+    const client = await CDP({
+      target: targetId,
+      port,
+    });
+
+    const { Page, Runtime, Target, Network, Emulation, DOM } = client;
+    await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
+
+    return {
+      client,
+      Page,
+      Runtime,
+      Target,
+      Network,
+      Emulation,
+      DOM,
+    };
+  } catch (err) {
+    console.log(err);
+    throw new Error(`连接到浏览器失败: ${err.message}`);
   }
-  return clients.get(targetId);
 };
 
 const cleanupCDP = async (targetId) => {
-  const client = clients.get(targetId);
-  if (client) {
-    await client.client.close();
-    clients.delete(targetId);
+  try {
+    // 直接关闭传入的 client
+    if (targetId?.client) {
+      await targetId.client.close();
+    }
+  } catch (error) {
+    console.log("关闭CDP连接失败:", error);
   }
 };
 
-// 获取所有标签页
 const getTabs = async () => {
-  const targets = await CDP.List();
+  const targets = await getTargets();
   return targets
     .filter((target) => target.type === "page")
     .map((target) => ({
@@ -241,10 +306,8 @@ const getTabs = async () => {
     }));
 };
 
-// 获取当前活动标签页
 const getCurrentTab = async () => {
-  const targets = await CDP.List();
-  // 一般排第一个的就是活动标签页
+  const targets = await getTargets();
   const currentTarget = targets.find((target) => target.type === "page");
 
   if (!currentTarget) {
@@ -258,14 +321,13 @@ const getCurrentTab = async () => {
   };
 };
 
-// 搜索标签页
 const searchTarget = async (tab) => {
   if (!tab || !tab.by || !tab.searchValue || tab.by === "active") {
     const currentTab = await getCurrentTab();
     return currentTab;
   }
 
-  const targets = await CDP.List();
+  const targets = await getTargets();
   const target = targets.find((target) =>
     target[tab.by].includes(tab.searchValue)
   );
@@ -275,13 +337,12 @@ const searchTarget = async (tab) => {
   return target;
 };
 
-// 激活指定标签页
 const activateTab = async (tab) => {
   const target = await searchTarget(tab);
-  await CDP.Activate({ id: target.id });
+  const port = await getCurrentClientPort();
+  await CDP.Activate({ id: target.id, port });
 };
 
-// 创建新标签页
 const createNewTab = async (url = "about:blank") => {
   const currentTab = await getCurrentTab();
   const { Target } = await initCDP(currentTab.id);
@@ -295,11 +356,11 @@ const createNewTab = async (url = "about:blank") => {
   };
 };
 
-// 关闭标签页
 const closeTab = async (tab) => {
   const target = await searchTarget(tab);
+  const port = await getCurrentClientPort();
   await cleanupCDP(target.id);
-  await CDP.Close({ id: target.id });
+  await CDP.Close({ id: target.id, port });
 };
 
 const getUrl = async (tab) => {
@@ -349,7 +410,6 @@ const setCookie = async (tab, cookies, options = {}) => {
   const target = await searchTarget(tab);
   const { Network, Page } = await initCDP(target.id);
   try {
-    // 直接从Page获取URL，避免创建新连接
     const { frameTree } = await Page.getFrameTree();
     const url = frameTree.frame.url;
 
@@ -382,15 +442,10 @@ const getCookie = async (tab, name) => {
 // 捕获标签页截图
 const captureScreenshot = async (tab, options = {}) => {
   const target = await searchTarget(tab);
-  const {
-    format = "png",
-    quality = 100,
-    savePath,
-    selector = null,
-  } = options;
+  const { format = "png", quality = 100, savePath, selector = null } = options;
 
   try {
-    const { Page, Emulation, DOM } = await initCDP(target.id);
+    const { Page, DOM } = await initCDP(target.id);
     await DOM.enable();
 
     let clip = null;
@@ -461,6 +516,31 @@ const captureScreenshot = async (tab, options = {}) => {
   }
 };
 
+const destroyClientByPort = async (port) => {
+  try {
+    const client = await CDP({ port });
+    await client.Browser.close();
+
+    if (port === currentClientPort) {
+      currentClientPort = null;
+    }
+  } catch (error) {
+    throw new Error(`销毁客户端失败，请手动关闭`);
+  }
+};
+
+const switchClientByPort = async (port) => {
+  try {
+    const versionInfo = await CDP.Version({ port });
+    if (!versionInfo) {
+      throw new Error(`端口 ${port} 未找到活动的浏览器实例`);
+    }
+    currentClientPort = port;
+  } catch (error) {
+    throw new Error(`切换客户端失败: ${error.message}`);
+  }
+};
+
 module.exports = {
   launchBrowser,
   killRunningBrowser,
@@ -475,4 +555,9 @@ module.exports = {
   setCookie,
   getCookie,
   captureScreenshot,
+  getClientPorts,
+  destroyClientByPort,
+  switchClientByPort,
+  getCurrentClientPort,
+  getTargets,
 };
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index bcc62a22..458f9c54 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -34,76 +34,133 @@ export const browserCommands = {
   commands: [
     {
       value: "quickcomposer.browser.launchBrowser",
-      label: "启动浏览器",
+      label: "浏览器实例管理",
       icon: "launch",
       isAsync: true,
-      config: [
+      config: [],
+      subCommands: [
         {
-          component: "OptionEditor",
-          icon: "settings",
-          width: 12,
-          options: {
-            browserType: {
-              component: "ButtonGroup",
-              defaultValue: "msedge",
-              options: [
-                { label: "Edge", value: "msedge" },
-                { label: "Chrome", value: "chrome" },
-              ],
-              width: 12,
-            },
-            useSingleUserDataDir: {
-              label: "使用独立用户数据目录",
-              component: "CheckButton",
-              width: 4,
-            },
-            headless: {
-              label: "无头模式",
-              component: "CheckButton",
-              width: 4,
-            },
-            incognito: {
-              label: "隐身模式",
-              component: "CheckButton",
-              width: 4,
-            },
-            windowSize: {
-              label: "窗口尺寸",
-              component: "VariableInput",
-              icon: "window",
-              width: 6,
-              placeholder: "如1920x1080，不设置则最大化",
-            },
-            proxy: {
-              label: "代理",
-              component: "VariableInput",
-              icon: "vpn_lock",
-              width: 6,
-              placeholder: "如 socks5://127.0.0.1:7890",
-            },
-            browserPath: {
-              label: "浏览器路径",
-              component: "VariableInput",
-              icon: "folder",
+          value: "quickcomposer.browser.launchBrowser",
+          label: "启动浏览器实例",
+          icon: "launch",
+          config: [
+            {
+              component: "OptionEditor",
+              icon: "settings",
               width: 12,
               options: {
-                dialog: {
-                  type: "open",
+                browserType: {
+                  component: "ButtonGroup",
+                  defaultValue: "msedge",
+                  options: [
+                    { label: "Edge", value: "msedge" },
+                    { label: "Chrome", value: "chrome" },
+                  ],
+                  width: 12,
+                },
+                useSingleUserDataDir: {
+                  label: "使用独立用户数据目录",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                headless: {
+                  label: "无头模式",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                incognito: {
+                  label: "隐身模式",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                disableExtensions: {
+                  label: "禁用扩展",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                windowSize: {
+                  label: "窗口尺寸",
+                  component: "VariableInput",
+                  icon: "window",
+                  width: 6,
+                  placeholder: "如1920x1080，不设置则最大化",
+                },
+                proxy: {
+                  label: "代理",
+                  component: "VariableInput",
+                  icon: "vpn_lock",
+                  width: 6,
+                  placeholder: "如 socks5://127.0.0.1:7890",
+                },
+                browserPath: {
+                  label: "浏览器路径",
+                  component: "VariableInput",
+                  icon: "folder",
+                  width: 12,
                   options: {
-                    title: "选择浏览器",
-                    properties: ["openFile"],
+                    dialog: {
+                      type: "open",
+                      options: {
+                        title: "选择浏览器",
+                        properties: ["openFile"],
+                      },
+                    },
                   },
+                  placeholder: "二进制绝对路径，留空则自动查找",
                 },
               },
-              placeholder: "二进制绝对路径，留空则自动查找",
+              defaultValue: {
+                browserType: "msedge",
+                useSingleUserDataDir: true,
+                headless: false,
+                incognito: false,
+              },
             },
-          },
-          defaultValue: {
-            browserType: "msedge",
-            useSingleUserDataDir: true,
-            headless: false,
-            incognito: false,
-          },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getClientPorts",
+          label: "获取所有浏览器实例端口",
+          icon: "list",
+        },
+        {
+          value: "quickcomposer.browser.destroyClientByPort",
+          label: "关闭浏览器实例",
+          icon: "close",
+          config: [
+            {
+              label: "浏览器实例端口",
+              component: "NumberInput",
+              icon: "label",
+              width: 12,
+              defaultValue: 9222,
+              min: 9222,
+              max: 9322,
+              step: 1,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.getCurrentClientPort",
+          label: "获取当前操控的实例端口",
+          icon: "label",
+        },
+        {
+          value: "quickcomposer.browser.switchClientByPort",
+          label: "切换要操控的实例",
+          icon: "switch_account",
+          config: [
+            {
+              label: "浏览器实例端口",
+              component: "NumberInput",
+              icon: "label",
+              width: 12,
+              defaultValue: 9222,
+              min: 9222,
+              max: 9322,
+              step: 1,
+            },
+          ],
         },
       ],
     },

From 179c0c567ff2de7b620c2520beea3cd1fa3a0857 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 18:43:44 +0800
Subject: [PATCH 119/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E5=8C=96=E5=90=8E=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/browser.js   | 563 ------------------
 plugin/lib/quickcomposer/browser/cdp.js       |  44 ++
 plugin/lib/quickcomposer/browser/client.js    | 286 +++++++++
 plugin/lib/quickcomposer/browser/cookie.js    |  40 ++
 .../lib/quickcomposer/browser/execScript.js   |  31 +-
 .../lib/quickcomposer/browser/getSelector.js  |   2 +-
 plugin/lib/quickcomposer/browser/index.js     |  12 +-
 .../lib/quickcomposer/browser/screenshot.js   |  84 +++
 plugin/lib/quickcomposer/browser/tabs.js      |  86 +++
 plugin/lib/quickcomposer/browser/url.js       |  23 +
 src/js/composer/commands/browserCommands.js   |  16 +-
 11 files changed, 612 insertions(+), 575 deletions(-)
 delete mode 100644 plugin/lib/quickcomposer/browser/browser.js
 create mode 100644 plugin/lib/quickcomposer/browser/cdp.js
 create mode 100644 plugin/lib/quickcomposer/browser/client.js
 create mode 100644 plugin/lib/quickcomposer/browser/cookie.js
 create mode 100644 plugin/lib/quickcomposer/browser/screenshot.js
 create mode 100644 plugin/lib/quickcomposer/browser/tabs.js
 create mode 100644 plugin/lib/quickcomposer/browser/url.js

diff --git a/plugin/lib/quickcomposer/browser/browser.js b/plugin/lib/quickcomposer/browser/browser.js
deleted file mode 100644
index 8dc54d18..00000000
--- a/plugin/lib/quickcomposer/browser/browser.js
+++ /dev/null
@@ -1,563 +0,0 @@
-const CDP = require("chrome-remote-interface");
-const { exec } = require("child_process");
-const path = require("path");
-const os = require("os");
-const fs = require("fs");
-const net = require("net");
-
-let currentClientPort = null;
-
-const getBrowserPath = (browser = "msedge") => {
-  const platform = os.platform();
-  let paths = null;
-  if (platform === "win32") {
-    paths = {
-      chrome: [
-        path.join(
-          process.env["ProgramFiles"],
-          "Google/Chrome/Application/chrome.exe"
-        ),
-        path.join(
-          process.env["ProgramFiles(x86)"],
-          "Google/Chrome/Application/chrome.exe"
-        ),
-        path.join(
-          process.env["LocalAppData"],
-          "Google/Chrome/Application/chrome.exe"
-        ),
-      ],
-      msedge: [
-        path.join(
-          process.env["ProgramFiles"],
-          "Microsoft/Edge/Application/msedge.exe"
-        ),
-        path.join(
-          process.env["ProgramFiles(x86)"],
-          "Microsoft/Edge/Application/msedge.exe"
-        ),
-        path.join(
-          process.env["LocalAppData"],
-          "Microsoft/Edge/Application/msedge.exe"
-        ),
-      ],
-    };
-  } else if (platform === "darwin") {
-    paths = {
-      chrome: ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"],
-      msedge: [
-        "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
-      ],
-    };
-  } else if (platform === "linux") {
-    paths = {
-      chrome: [
-        "/opt/google/chrome/chrome",
-        "/usr/bin/google-chrome",
-        "/usr/bin/google-chrome-stable",
-      ],
-      msedge: [
-        "/opt/microsoft/msedge/msedge",
-        "/usr/bin/microsoft-edge",
-        "/usr/bin/microsoft-edge-stable",
-      ],
-    };
-  } else {
-    throw new Error("不支持的操作系统");
-  }
-  return paths[browser].find((p) => fs.existsSync(p));
-};
-
-const isPortAvailable = (port) => {
-  return new Promise((resolve) => {
-    const socket = new net.Socket();
-
-    const onError = () => {
-      socket.destroy();
-      resolve(true);
-    };
-
-    socket.setTimeout(100);
-    socket.once("error", onError);
-    socket.once("timeout", onError);
-
-    socket.connect(port, "127.0.0.1", () => {
-      socket.destroy();
-      resolve(false);
-    });
-  });
-};
-
-const waitForPort = async (port, timeout = 30000) => {
-  const startTime = Date.now();
-  while (Date.now() - startTime < timeout) {
-    try {
-      await CDP.Version({ port });
-      return true;
-    } catch (e) {
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    }
-  }
-  return false;
-};
-
-const findAvailablePort = async (startPort) => {
-  let port = startPort;
-  while (port < startPort + 100) {
-    const available = await isPortAvailable(port);
-    if (available) {
-      return port;
-    }
-    port++;
-  }
-  throw new Error("无法找到可用的调试端口");
-};
-
-const launchBrowser = async (options) => {
-  const {
-    browserType = "msedge",
-    useSingleUserDataDir = true,
-    proxy = null,
-    browserPath = getBrowserPath(browserType),
-    windowSize = null,
-    incognito = false,
-    headless = false,
-    disableExtensions = false,
-  } = options;
-
-  if (!browserPath) {
-    throw new Error("未找到浏览器，或未指定浏览器路径");
-  }
-
-  const port = await findAvailablePort(9222);
-  currentClientPort = port;
-
-  const automationArgs = [
-    `--remote-debugging-port=${port}`,
-    "--disable-infobars",
-    "--disable-notifications",
-    "--disable-popup-blocking",
-    "--disable-save-password-bubble",
-    "--disable-translate",
-    "--no-first-run",
-    "--no-default-browser-check",
-    "--user-data-start-with-quickcomposer",
-  ];
-
-  const incognitoArg = {
-    chrome: "--incognito",
-    msedge: "--inprivate",
-  };
-
-  const optionArgs = [
-    windowSize ? `--window-size=${windowSize}` : "--start-maximized",
-    proxy ? `--proxy-server=${proxy}` : "",
-    incognito ? incognitoArg[browserType] : "",
-    headless ? "--headless" : "",
-    disableExtensions ? "--disable-extensions" : "",
-    useSingleUserDataDir
-      ? `--user-data-dir=${path.join(
-          os.tmpdir(),
-          `${browserType}-debug-${port}`
-        )}`
-      : "",
-  ].filter(Boolean);
-
-  const args = [...automationArgs, ...optionArgs];
-
-  return new Promise(async (resolve, reject) => {
-    if (!useSingleUserDataDir) {
-      try {
-        await killRunningBrowser(browserType);
-      } catch (e) {
-        reject(e);
-        return;
-      }
-    }
-    const child = exec(
-      `"${browserPath}" ${args.join(" ")}`,
-      { windowsHide: true },
-      async (error) => {
-        if (error) {
-          reject(error);
-          return;
-        }
-      }
-    );
-
-    waitForPort(port).then((success) => {
-      if (success) {
-        resolve({ pid: child.pid, port });
-      } else {
-        reject(new Error("浏览器启动超时，请检查是否有权限问题或防火墙限制"));
-      }
-    });
-  });
-};
-
-const killRunningBrowser = (browserType = "msedge") => {
-  return new Promise((resolve, reject) => {
-    if (os.platform() === "win32") {
-      exec(`taskkill /F /IM ${browserType}.exe`, (error) => {
-        if (error) reject(error);
-        else resolve();
-      });
-    } else {
-      exec(`kill -9 $(pgrep ${browserType})`, (error) => {
-        if (error) reject(error);
-        else resolve();
-      });
-    }
-  });
-};
-
-const getClientPorts = async (returnFirstPort = false) => {
-  try {
-    // 创建所有端口检查的 Promise 数组
-    const portChecks = [];
-    for (let port = 9222; port < 9322; port++) {
-      portChecks.push(
-        CDP.List({ port })
-          .then(() => port)
-          .catch(() => null)
-      );
-    }
-
-    if (returnFirstPort) {
-      // 如果需要返回第一个可用端口，使用 Promise.race
-      const firstPort = await Promise.race(portChecks);
-      if (firstPort) {
-        return firstPort;
-      } else {
-        return null;
-      }
-    }
-
-    // 如果不需要返回第一个端口或没有找到可用端口，并行执行所有检查
-    const results = await Promise.all(portChecks);
-
-    // 过滤出可用的端口
-    return results.filter((port) => port !== null);
-  } catch (error) {
-    throw new Error(`获取客户端列表失败: ${error.message}`);
-  }
-};
-
-const getCurrentClientPort = async () => {
-  if (currentClientPort === null) {
-    const port = await getClientPorts(true);
-    if (port === null) {
-      throw new Error("未找到可用的浏览器实例，请先从实例管理里面启动新的实例");
-    }
-    currentClientPort = port;
-  }
-  return currentClientPort;
-};
-
-const getTargets = async () => {
-  const port = await getCurrentClientPort();
-  return await CDP.List({ port });
-};
-
-const initCDP = async (targetId) => {
-  try {
-    const port = await getCurrentClientPort();
-    const client = await CDP({
-      target: targetId,
-      port,
-    });
-
-    const { Page, Runtime, Target, Network, Emulation, DOM } = client;
-    await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
-
-    return {
-      client,
-      Page,
-      Runtime,
-      Target,
-      Network,
-      Emulation,
-      DOM,
-    };
-  } catch (err) {
-    console.log(err);
-    throw new Error(`连接到浏览器失败: ${err.message}`);
-  }
-};
-
-const cleanupCDP = async (targetId) => {
-  try {
-    // 直接关闭传入的 client
-    if (targetId?.client) {
-      await targetId.client.close();
-    }
-  } catch (error) {
-    console.log("关闭CDP连接失败:", error);
-  }
-};
-
-const getTabs = async () => {
-  const targets = await getTargets();
-  return targets
-    .filter((target) => target.type === "page")
-    .map((target) => ({
-      url: target.url,
-      title: target.title,
-      id: target.id,
-    }));
-};
-
-const getCurrentTab = async () => {
-  const targets = await getTargets();
-  const currentTarget = targets.find((target) => target.type === "page");
-
-  if (!currentTarget) {
-    throw new Error("未找到当前活动标签页");
-  }
-
-  return {
-    url: currentTarget.url,
-    title: currentTarget.title,
-    id: currentTarget.id,
-  };
-};
-
-const searchTarget = async (tab) => {
-  if (!tab || !tab.by || !tab.searchValue || tab.by === "active") {
-    const currentTab = await getCurrentTab();
-    return currentTab;
-  }
-
-  const targets = await getTargets();
-  const target = targets.find((target) =>
-    target[tab.by].includes(tab.searchValue)
-  );
-  if (!target) {
-    throw new Error(`未找到目标标签页: ${tab.by} = ${tab.searchValue}`);
-  }
-  return target;
-};
-
-const activateTab = async (tab) => {
-  const target = await searchTarget(tab);
-  const port = await getCurrentClientPort();
-  await CDP.Activate({ id: target.id, port });
-};
-
-const createNewTab = async (url = "about:blank") => {
-  const currentTab = await getCurrentTab();
-  const { Target } = await initCDP(currentTab.id);
-  const { targetId } = await Target.createTarget({ url });
-  const { targetInfo } = await Target.getTargetInfo({ targetId });
-  await cleanupCDP(currentTab.id);
-  return {
-    url: targetInfo.url,
-    title: targetInfo.title,
-    id: targetId,
-  };
-};
-
-const closeTab = async (tab) => {
-  const target = await searchTarget(tab);
-  const port = await getCurrentClientPort();
-  await cleanupCDP(target.id);
-  await CDP.Close({ id: target.id, port });
-};
-
-const getUrl = async (tab) => {
-  const target = await searchTarget(tab);
-  const { Page } = await initCDP(target.id);
-  const { frameTree } = await Page.getFrameTree();
-  await cleanupCDP(target.id);
-  return frameTree.frame.url;
-};
-
-const setUrl = async (tab, url) => {
-  const target = await searchTarget(tab);
-  const { Page } = await initCDP(target.id);
-  await Page.navigate({ url });
-  await Page.loadEventFired();
-  await cleanupCDP(target.id);
-};
-
-const executeScript = async (tab, script, args = {}) => {
-  const target = await searchTarget(tab);
-  try {
-    const { Runtime } = await initCDP(target.id);
-    const argNames = Object.keys(args);
-    const argValues = Object.values(args).map((v) => JSON.stringify(v));
-
-    const wrappedScript = `
-      (async function(${argNames.join(", ")}) {
-        ${script}
-      })(${argValues.join(", ")})
-    `;
-
-    const { result } = await Runtime.evaluate({
-      expression: wrappedScript,
-      returnByValue: true,
-      awaitPromise: true,
-    });
-
-    await cleanupCDP(target.id);
-    return result.value;
-  } catch (e) {
-    console.log(e);
-    throw new Error("执行脚本失败");
-  }
-};
-
-const setCookie = async (tab, cookies, options = {}) => {
-  const target = await searchTarget(tab);
-  const { Network, Page } = await initCDP(target.id);
-  try {
-    const { frameTree } = await Page.getFrameTree();
-    const url = frameTree.frame.url;
-
-    for (const cookie of cookies) {
-      await Network.setCookie({
-        name: cookie.name,
-        value: cookie.value,
-        domain: options.domain || url.split("/")[2],
-        path: options.path || "/",
-        secure: options.secure || false,
-        expires: options.expires
-          ? Math.floor(Date.now() / 1000) + options.expires * 3600
-          : undefined,
-      });
-    }
-  } finally {
-    await cleanupCDP(target.id);
-  }
-};
-
-const getCookie = async (tab, name) => {
-  const target = await searchTarget(tab);
-  const { Network } = await initCDP(target.id);
-  const { cookies } = await Network.getCookies();
-  await cleanupCDP(target.id);
-  if (!name) return cookies;
-  return cookies.find((cookie) => cookie.name === name);
-};
-
-// 捕获标签页截图
-const captureScreenshot = async (tab, options = {}) => {
-  const target = await searchTarget(tab);
-  const { format = "png", quality = 100, savePath, selector = null } = options;
-
-  try {
-    const { Page, DOM } = await initCDP(target.id);
-    await DOM.enable();
-
-    let clip = null;
-    if (selector) {
-      // 获取DOM节点
-      const { root } = await DOM.getDocument();
-      const { nodeId } = await DOM.querySelector({
-        nodeId: root.nodeId,
-        selector: selector,
-      });
-
-      if (!nodeId) {
-        throw new Error(`未找到元素: ${selector}`);
-      }
-
-      // 获取元素的精确四边形坐标
-      const { quads } = await DOM.getContentQuads({ nodeId });
-      if (!quads || quads.length === 0) {
-        throw new Error("无法获取元素位置信息");
-      }
-
-      // 获取布局指标
-      const { visualViewport } = await Page.getLayoutMetrics();
-      const { pageX, pageY } = visualViewport;
-
-      // 计算边界框
-      const quad = quads[0];
-      const x = Math.min(quad[0], quad[2], quad[4], quad[6]);
-      const y = Math.min(quad[1], quad[3], quad[5], quad[7]);
-      const width = Math.max(quad[0], quad[2], quad[4], quad[6]) - x;
-      const height = Math.max(quad[1], quad[3], quad[5], quad[7]) - y;
-
-      clip = {
-        x: Math.round(x - pageX),
-        y: Math.round(y - pageY),
-        width: Math.round(width),
-        height: Math.round(height),
-        scale: 1,
-      };
-
-      // 确保尺寸不为0
-      if (clip.width === 0) clip.width = 1;
-      if (clip.height === 0) clip.height = 1;
-    }
-
-    const screenshotParams = {
-      format,
-      quality: format === "jpeg" ? quality : undefined,
-      fromSurface: true,
-      captureBeyondViewport: !!selector,
-    };
-
-    if (clip) {
-      screenshotParams.clip = clip;
-    }
-
-    const { data } = await Page.captureScreenshot(screenshotParams);
-
-    await DOM.disable();
-
-    if (savePath) {
-      fs.writeFileSync(savePath, data, "base64");
-    }
-
-    return data;
-  } finally {
-    await cleanupCDP(target.id);
-  }
-};
-
-const destroyClientByPort = async (port) => {
-  try {
-    const client = await CDP({ port });
-    await client.Browser.close();
-
-    if (port === currentClientPort) {
-      currentClientPort = null;
-    }
-  } catch (error) {
-    throw new Error(`销毁客户端失败，请手动关闭`);
-  }
-};
-
-const switchClientByPort = async (port) => {
-  try {
-    const versionInfo = await CDP.Version({ port });
-    if (!versionInfo) {
-      throw new Error(`端口 ${port} 未找到活动的浏览器实例`);
-    }
-    currentClientPort = port;
-  } catch (error) {
-    throw new Error(`切换客户端失败: ${error.message}`);
-  }
-};
-
-module.exports = {
-  launchBrowser,
-  killRunningBrowser,
-  getTabs,
-  getCurrentTab,
-  activateTab,
-  createNewTab,
-  closeTab,
-  getUrl,
-  setUrl,
-  executeScript,
-  setCookie,
-  getCookie,
-  captureScreenshot,
-  getClientPorts,
-  destroyClientByPort,
-  switchClientByPort,
-  getCurrentClientPort,
-  getTargets,
-};
diff --git a/plugin/lib/quickcomposer/browser/cdp.js b/plugin/lib/quickcomposer/browser/cdp.js
new file mode 100644
index 00000000..9565da9e
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/cdp.js
@@ -0,0 +1,44 @@
+const CDP = require("chrome-remote-interface");
+const { getCurrentClientPort } = require("./client");
+
+const initCDP = async (targetId) => {
+  try {
+    const port = await getCurrentClientPort();
+    const client = await CDP({
+      target: targetId,
+      port,
+    });
+
+    const { Page, Runtime, Target, Network, Emulation, DOM } = client;
+    await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
+
+    return {
+      client,
+      Page,
+      Runtime,
+      Target,
+      Network,
+      Emulation,
+      DOM,
+    };
+  } catch (err) {
+    console.log(err);
+    throw new Error(`连接到浏览器失败: ${err.message}`);
+  }
+};
+
+const cleanupCDP = async (targetId) => {
+  try {
+    // 直接关闭传入的 client
+    if (targetId?.client) {
+      await targetId.client.close();
+    }
+  } catch (error) {
+    console.log("关闭CDP连接失败:", error);
+  }
+};
+
+module.exports = {
+  initCDP,
+  cleanupCDP,
+};
diff --git a/plugin/lib/quickcomposer/browser/client.js b/plugin/lib/quickcomposer/browser/client.js
new file mode 100644
index 00000000..38a402c7
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/client.js
@@ -0,0 +1,286 @@
+const { exec } = require("child_process");
+const path = require("path");
+const os = require("os");
+const fs = require("fs");
+const net = require("net");
+const CDP = require("chrome-remote-interface");
+
+let currentClientPort = null;
+
+const getBrowserPath = (browser = "msedge") => {
+  const platform = os.platform();
+  let paths = null;
+  if (platform === "win32") {
+    paths = {
+      chrome: [
+        path.join(
+          process.env["ProgramFiles"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+        path.join(
+          process.env["ProgramFiles(x86)"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+        path.join(
+          process.env["LocalAppData"],
+          "Google/Chrome/Application/chrome.exe"
+        ),
+      ],
+      msedge: [
+        path.join(
+          process.env["ProgramFiles"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+        path.join(
+          process.env["ProgramFiles(x86)"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+        path.join(
+          process.env["LocalAppData"],
+          "Microsoft/Edge/Application/msedge.exe"
+        ),
+      ],
+    };
+  } else if (platform === "darwin") {
+    paths = {
+      chrome: ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"],
+      msedge: [
+        "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+      ],
+    };
+  } else if (platform === "linux") {
+    paths = {
+      chrome: [
+        "/opt/google/chrome/chrome",
+        "/usr/bin/google-chrome",
+        "/usr/bin/google-chrome-stable",
+      ],
+      msedge: [
+        "/opt/microsoft/msedge/msedge",
+        "/usr/bin/microsoft-edge",
+        "/usr/bin/microsoft-edge-stable",
+      ],
+    };
+  } else {
+    throw new Error("不支持的操作系统");
+  }
+  return paths[browser].find((p) => fs.existsSync(p));
+};
+
+const isPortAvailable = (port) => {
+  return new Promise((resolve) => {
+    const socket = new net.Socket();
+
+    const onError = () => {
+      socket.destroy();
+      resolve(true);
+    };
+
+    socket.setTimeout(100);
+    socket.once("error", onError);
+    socket.once("timeout", onError);
+
+    socket.connect(port, "127.0.0.1", () => {
+      socket.destroy();
+      resolve(false);
+    });
+  });
+};
+
+const waitForPort = async (port, timeout = 30000) => {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    try {
+      await CDP.Version({ port });
+      return true;
+    } catch (e) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+  return false;
+};
+
+const findAvailablePort = async (startPort) => {
+  let port = startPort;
+  while (port < startPort + 100) {
+    const available = await isPortAvailable(port);
+    if (available) {
+      return port;
+    }
+    port++;
+  }
+  throw new Error("无法找到可用的调试端口");
+};
+
+const startClient = async (options) => {
+  const {
+    browserType = "msedge",
+    useSingleUserDataDir = true,
+    proxy = null,
+    browserPath = getBrowserPath(browserType),
+    windowSize = null,
+    incognito = false,
+    headless = false,
+    disableExtensions = false,
+  } = options;
+
+  if (!browserPath) {
+    throw new Error("未找到浏览器，或未指定浏览器路径");
+  }
+
+  const port = await findAvailablePort(9222);
+  setCurrentClientPort(port);
+
+  const automationArgs = [
+    `--remote-debugging-port=${port}`,
+    "--disable-infobars",
+    "--disable-notifications",
+    "--disable-popup-blocking",
+    "--disable-save-password-bubble",
+    "--disable-translate",
+    "--no-first-run",
+    "--no-default-browser-check",
+    "--user-data-start-with-quickcomposer",
+  ];
+
+  const incognitoArg = {
+    chrome: "--incognito",
+    msedge: "--inprivate",
+  };
+
+  const optionArgs = [
+    windowSize ? `--window-size=${windowSize}` : "--start-maximized",
+    proxy ? `--proxy-server=${proxy}` : "",
+    incognito ? incognitoArg[browserType] : "",
+    headless ? "--headless" : "",
+    disableExtensions ? "--disable-extensions" : "",
+    useSingleUserDataDir
+      ? `--user-data-dir=${path.join(
+          os.tmpdir(),
+          `${browserType}-debug-${port}`
+        )}`
+      : "",
+  ].filter(Boolean);
+
+  const args = [...automationArgs, ...optionArgs];
+
+  return new Promise(async (resolve, reject) => {
+    if (!useSingleUserDataDir) {
+      try {
+        await killRunningBrowser(browserType);
+      } catch (e) {
+        reject(e);
+        return;
+      }
+    }
+    const child = exec(
+      `"${browserPath}" ${args.join(" ")}`,
+      { windowsHide: true },
+      async (error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+      }
+    );
+
+    waitForPort(port).then((success) => {
+      if (success) {
+        resolve({ pid: child.pid, port });
+      } else {
+        reject(new Error("浏览器启动超时，请检查是否有权限问题或防火墙限制"));
+      }
+    });
+  });
+};
+
+const killRunningBrowser = (browserType = "msedge") => {
+  return new Promise((resolve, reject) => {
+    if (os.platform() === "win32") {
+      exec(`taskkill /F /IM ${browserType}.exe`, (error) => {
+        if (error) reject(error);
+        else resolve();
+      });
+    } else {
+      exec(`kill -9 $(pgrep ${browserType})`, (error) => {
+        if (error) reject(error);
+        else resolve();
+      });
+    }
+  });
+};
+
+const destroyClientByPort = async (port) => {
+  const currentPort = await getCurrentClientPort();
+  if (!port) {
+    port = currentPort;
+  }
+  try {
+    const client = await CDP({ port });
+    await client.Browser.close();
+
+    if (port === currentPort) {
+      setCurrentClientPort(null);
+    }
+  } catch (error) {
+    throw new Error(`销毁客户端失败，请手动关闭`);
+  }
+};
+
+const switchClientByPort = async (port) => {
+  try {
+    const versionInfo = await CDP.Version({ port });
+    if (!versionInfo) {
+      throw new Error(`端口 ${port} 未找到活动的浏览器实例`);
+    }
+    setCurrentClientPort(port);
+  } catch (error) {
+    throw new Error(`切换客户端失败: ${error.message}`);
+  }
+};
+
+const getClientPorts = async () => {
+  try {
+    // 创建所有端口检查的 Promise 数组
+    const portChecks = [];
+    for (let port = 9222; port < 9322; port++) {
+      portChecks.push(
+        CDP.List({ port })
+          .then(() => port)
+          .catch(() => null)
+      );
+    }
+
+    // 如果不需要返回第一个端口或没有找到可用端口，并行执行所有检查
+    const results = await Promise.all(portChecks);
+
+    // 过滤出可用的端口
+    return results.filter((port) => port !== null);
+  } catch (error) {
+    throw new Error(`获取客户端列表失败: ${error.message}`);
+  }
+};
+
+const getCurrentClientPort = async () => {
+  if (currentClientPort === null) {
+    const ports = await getClientPorts();
+    if (!ports || ports.length === 0) {
+      throw new Error("未找到可用的浏览器实例，请先从实例管理里面启动新的实例");
+    }
+    currentClientPort = ports[0];
+  }
+  return currentClientPort;
+};
+
+const setCurrentClientPort = (port) => {
+  currentClientPort = port;
+};
+
+
+module.exports = {
+  startClient,
+  destroyClientByPort,
+  switchClientByPort,
+  getClientPorts,
+  getCurrentClientPort,
+};
diff --git a/plugin/lib/quickcomposer/browser/cookie.js b/plugin/lib/quickcomposer/browser/cookie.js
new file mode 100644
index 00000000..254e5890
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/cookie.js
@@ -0,0 +1,40 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+
+const setCookie = async (tab, cookies, options = {}) => {
+  const target = await searchTarget(tab);
+  const { Network, Page } = await initCDP(target.id);
+  try {
+    const { frameTree } = await Page.getFrameTree();
+    const url = frameTree.frame.url;
+
+    for (const cookie of cookies) {
+      await Network.setCookie({
+        name: cookie.name,
+        value: cookie.value,
+        domain: options.domain || url.split("/")[2],
+        path: options.path || "/",
+        secure: options.secure || false,
+        expires: options.expires
+          ? Math.floor(Date.now() / 1000) + options.expires * 3600
+          : undefined,
+      });
+    }
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
+const getCookie = async (tab, name) => {
+  const target = await searchTarget(tab);
+  const { Network } = await initCDP(target.id);
+  const { cookies } = await Network.getCookies();
+  await cleanupCDP(target.id);
+  if (!name) return cookies;
+  return cookies.find((cookie) => cookie.name === name);
+};
+
+module.exports = {
+  setCookie,
+  getCookie,
+};
diff --git a/plugin/lib/quickcomposer/browser/execScript.js b/plugin/lib/quickcomposer/browser/execScript.js
index 4153fa09..b183ba3a 100644
--- a/plugin/lib/quickcomposer/browser/execScript.js
+++ b/plugin/lib/quickcomposer/browser/execScript.js
@@ -1,5 +1,33 @@
-const { executeScript } = require("./browser");
 const fs = require("fs");
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+
+const executeScript = async (tab, script, args = {}) => {
+  const target = await searchTarget(tab);
+  try {
+    const { Runtime } = await initCDP(target.id);
+    const argNames = Object.keys(args);
+    const argValues = Object.values(args).map((v) => JSON.stringify(v));
+
+    const wrappedScript = `
+      (async function(${argNames.join(", ")}) {
+        ${script}
+      })(${argValues.join(", ")})
+    `;
+
+    const { result } = await Runtime.evaluate({
+      expression: wrappedScript,
+      returnByValue: true,
+      awaitPromise: true,
+    });
+
+    await cleanupCDP(target.id);
+    return result.value;
+  } catch (e) {
+    console.log(e);
+    throw new Error("执行脚本失败");
+  }
+};
 
 const clickElement = async (tab, selector) => {
   return await executeScript(
@@ -178,6 +206,7 @@ const injectLocalScript = async (tab, filePath) => {
 };
 
 module.exports = {
+  executeScript,
   clickElement,
   inputText,
   submitForm,
diff --git a/plugin/lib/quickcomposer/browser/getSelector.js b/plugin/lib/quickcomposer/browser/getSelector.js
index 6a16eb54..6aafddcc 100644
--- a/plugin/lib/quickcomposer/browser/getSelector.js
+++ b/plugin/lib/quickcomposer/browser/getSelector.js
@@ -1,4 +1,4 @@
-const { executeScript } = require("./browser");
+const { executeScript } = require("./execScript");
 const fs = require("fs");
 const path = require("path");
 
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index 60b55076..a2c74f03 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -1,9 +1,17 @@
-const browser = require("./browser");
 const getSelector = require("./getSelector");
 const execScript = require("./execScript");
+const browserManager = require("./client");
+const tabs = require("./tabs");
+const url = require("./url");
+const cookie = require("./cookie");
+const screenshot = require("./screenshot");
 
 module.exports = {
-  ...browser,
+  ...url,
+  ...tabs,
   ...getSelector,
   ...execScript,
+  ...browserManager,
+  ...cookie,
+  ...screenshot,
 };
diff --git a/plugin/lib/quickcomposer/browser/screenshot.js b/plugin/lib/quickcomposer/browser/screenshot.js
new file mode 100644
index 00000000..56af39f8
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/screenshot.js
@@ -0,0 +1,84 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+const fs = require("fs");
+
+// 捕获标签页截图
+const captureScreenshot = async (tab, options = {}) => {
+  const target = await searchTarget(tab);
+  const { format = "png", quality = 100, savePath, selector = null } = options;
+
+  try {
+    const { Page, DOM } = await initCDP(target.id);
+    await DOM.enable();
+
+    let clip = null;
+    if (selector) {
+      // 获取DOM节点
+      const { root } = await DOM.getDocument();
+      const { nodeId } = await DOM.querySelector({
+        nodeId: root.nodeId,
+        selector: selector,
+      });
+
+      if (!nodeId) {
+        throw new Error(`未找到元素: ${selector}`);
+      }
+
+      // 获取元素的精确四边形坐标
+      const { quads } = await DOM.getContentQuads({ nodeId });
+      if (!quads || quads.length === 0) {
+        throw new Error("无法获取元素位置信息");
+      }
+
+      // 获取布局指标
+      const { visualViewport } = await Page.getLayoutMetrics();
+      const { pageX, pageY } = visualViewport;
+
+      // 计算边界框
+      const quad = quads[0];
+      const x = Math.min(quad[0], quad[2], quad[4], quad[6]);
+      const y = Math.min(quad[1], quad[3], quad[5], quad[7]);
+      const width = Math.max(quad[0], quad[2], quad[4], quad[6]) - x;
+      const height = Math.max(quad[1], quad[3], quad[5], quad[7]) - y;
+
+      clip = {
+        x: Math.round(x - pageX),
+        y: Math.round(y - pageY),
+        width: Math.round(width),
+        height: Math.round(height),
+        scale: 1,
+      };
+
+      // 确保尺寸不为0
+      if (clip.width === 0) clip.width = 1;
+      if (clip.height === 0) clip.height = 1;
+    }
+
+    const screenshotParams = {
+      format,
+      quality: format === "jpeg" ? quality : undefined,
+      fromSurface: true,
+      captureBeyondViewport: !!selector,
+    };
+
+    if (clip) {
+      screenshotParams.clip = clip;
+    }
+
+    const { data } = await Page.captureScreenshot(screenshotParams);
+
+    await DOM.disable();
+
+    if (savePath) {
+      fs.writeFileSync(savePath, data, "base64");
+    }
+
+    return data;
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
+module.exports = {
+  captureScreenshot,
+};
diff --git a/plugin/lib/quickcomposer/browser/tabs.js b/plugin/lib/quickcomposer/browser/tabs.js
new file mode 100644
index 00000000..ce3e9bd6
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/tabs.js
@@ -0,0 +1,86 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { getCurrentClientPort } = require("./client");
+const CDP = require("chrome-remote-interface");
+
+const getTargets = async () => {
+  const port = await getCurrentClientPort();
+  return await CDP.List({ port });
+};
+
+const searchTarget = async (tab) => {
+  if (!tab || !tab.by || !tab.searchValue || tab.by === "active") {
+    const currentTab = await getCurrentTab();
+    return currentTab;
+  }
+
+  const targets = await getTargets();
+  const target = targets.find((target) =>
+    target[tab.by].includes(tab.searchValue)
+  );
+  if (!target) {
+    throw new Error(`未找到目标标签页: ${tab.by} = ${tab.searchValue}`);
+  }
+  return target;
+};
+
+const getTabs = async () => {
+  const targets = await getTargets();
+  return targets
+    .filter((target) => target.type === "page")
+    .map((target) => ({
+      url: target.url,
+      title: target.title,
+      id: target.id,
+    }));
+};
+
+const getCurrentTab = async () => {
+  const targets = await getTargets();
+  const currentTarget = targets.find((target) => target.type === "page");
+
+  if (!currentTarget) {
+    throw new Error("未找到当前活动标签页");
+  }
+
+  return {
+    url: currentTarget.url,
+    title: currentTarget.title,
+    id: currentTarget.id,
+  };
+};
+
+const activateTab = async (tab) => {
+  const target = await searchTarget(tab);
+  const port = await getCurrentClientPort();
+  await CDP.Activate({ id: target.id, port });
+};
+
+const createNewTab = async (url = "about:blank") => {
+  const currentTab = await getCurrentTab();
+  const { Target } = await initCDP(currentTab.id);
+  const { targetId } = await Target.createTarget({ url });
+  const { targetInfo } = await Target.getTargetInfo({ targetId });
+  await cleanupCDP(currentTab.id);
+  return {
+    url: targetInfo.url,
+    title: targetInfo.title,
+    id: targetId,
+  };
+};
+
+const closeTab = async (tab) => {
+  const target = await searchTarget(tab);
+  const port = await getCurrentClientPort();
+  await cleanupCDP(target.id);
+  await CDP.Close({ id: target.id, port });
+};
+
+module.exports = {
+  getTabs,
+  getCurrentTab,
+  activateTab,
+  createNewTab,
+  closeTab,
+  getTargets,
+  searchTarget,
+};
diff --git a/plugin/lib/quickcomposer/browser/url.js b/plugin/lib/quickcomposer/browser/url.js
new file mode 100644
index 00000000..596db30d
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/url.js
@@ -0,0 +1,23 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+
+const getUrl = async (tab) => {
+  const target = await searchTarget(tab);
+  const { Page } = await initCDP(target.id);
+  const { frameTree } = await Page.getFrameTree();
+  await cleanupCDP(target.id);
+  return frameTree.frame.url;
+};
+
+const setUrl = async (tab, url) => {
+  const target = await searchTarget(tab);
+  const { Page } = await initCDP(target.id);
+  await Page.navigate({ url });
+  await Page.loadEventFired();
+  await cleanupCDP(target.id);
+};
+
+module.exports = {
+  getUrl,
+  setUrl,
+};
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 458f9c54..b0d8bdf1 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -33,14 +33,14 @@ export const browserCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "quickcomposer.browser.launchBrowser",
+      value: "quickcomposer.browser.startClient",
       label: "浏览器实例管理",
       icon: "launch",
       isAsync: true,
       config: [],
       subCommands: [
         {
-          value: "quickcomposer.browser.launchBrowser",
+          value: "quickcomposer.browser.startClient",
           label: "启动浏览器实例",
           icon: "launch",
           config: [
@@ -118,11 +118,6 @@ export const browserCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.browser.getClientPorts",
-          label: "获取所有浏览器实例端口",
-          icon: "list",
-        },
         {
           value: "quickcomposer.browser.destroyClientByPort",
           label: "关闭浏览器实例",
@@ -133,13 +128,18 @@ export const browserCommands = {
               component: "NumberInput",
               icon: "label",
               width: 12,
-              defaultValue: 9222,
               min: 9222,
               max: 9322,
               step: 1,
+              placeholder: "留空关闭当前操控的实例",
             },
           ],
         },
+        {
+          value: "quickcomposer.browser.getClientPorts",
+          label: "获取所有浏览器实例端口",
+          icon: "list",
+        },
         {
           value: "quickcomposer.browser.getCurrentClientPort",
           label: "获取当前操控的实例端口",

From f28e53ea53152f1448bc4964f9594908bb1e812a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 23 Jan 2025 20:06:32 +0800
Subject: [PATCH 120/332] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E6=8B=9F=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=9C=A8=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=91=BD=E4=BB=A4=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=A8=A1=E6=8B=9F=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/device.js  | 301 ++++++++++++++++++++
 plugin/lib/quickcomposer/browser/index.js   |   2 +
 src/js/composer/commands/browserCommands.js | 100 ++++++-
 src/js/options/httpOptions.js               |  23 +-
 4 files changed, 416 insertions(+), 10 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/browser/device.js

diff --git a/plugin/lib/quickcomposer/browser/device.js b/plugin/lib/quickcomposer/browser/device.js
new file mode 100644
index 00000000..fa8a650f
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/device.js
@@ -0,0 +1,301 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+
+// 预定义的设备列表
+const devices = {
+  // iOS 设备
+  "iPhone X": {
+    userAgent:
+      "Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
+    viewport: {
+      width: 375,
+      height: 812,
+      deviceScaleFactor: 3,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "iPhone 12 Pro": {
+    userAgent:
+      "Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
+    viewport: {
+      width: 390,
+      height: 844,
+      deviceScaleFactor: 3,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "iPhone 14 Pro Max": {
+    userAgent:
+      "Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
+    viewport: {
+      width: 430,
+      height: 932,
+      deviceScaleFactor: 3,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "iPad Pro": {
+    userAgent:
+      "Mozilla/5.0 (iPad; CPU OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
+    viewport: {
+      width: 1024,
+      height: 1366,
+      deviceScaleFactor: 2,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "iPad Mini": {
+    userAgent:
+      "Mozilla/5.0 (iPad; CPU OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1",
+    viewport: {
+      width: 768,
+      height: 1024,
+      deviceScaleFactor: 2,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+
+  // Android 设备
+  "Pixel 5": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36",
+    viewport: {
+      width: 393,
+      height: 851,
+      deviceScaleFactor: 2.75,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "Pixel 7": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36",
+    viewport: {
+      width: 412,
+      height: 915,
+      deviceScaleFactor: 2.625,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "Samsung Galaxy S20 Ultra": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36",
+    viewport: {
+      width: 412,
+      height: 915,
+      deviceScaleFactor: 3.5,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "Samsung Galaxy Tab S7": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; SM-X710) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    viewport: {
+      width: 1600,
+      height: 2560,
+      deviceScaleFactor: 2,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "Xiaomi 12 Pro": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36",
+    viewport: {
+      width: 390,
+      height: 844,
+      deviceScaleFactor: 3,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+  "HUAWEI Mate30 Pro": {
+    userAgent:
+      "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Mobile Safari/537.36",
+    viewport: {
+      width: 392,
+      height: 835,
+      deviceScaleFactor: 3,
+      mobile: true,
+      hasTouch: true,
+      isLandscape: false,
+    },
+  },
+
+  // 桌面设备
+  Desktop: {
+    userAgent:
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    viewport: {
+      width: 1920,
+      height: 1080,
+      deviceScaleFactor: 1,
+      mobile: false,
+      hasTouch: false,
+      isLandscape: false,
+    },
+  },
+  "MacBook Pro 16": {
+    userAgent:
+      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    viewport: {
+      width: 1728,
+      height: 1117,
+      deviceScaleFactor: 2,
+      mobile: false,
+      hasTouch: false,
+      isLandscape: false,
+    },
+  },
+  "4K Display": {
+    userAgent:
+      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    viewport: {
+      width: 3840,
+      height: 2160,
+      deviceScaleFactor: 2,
+      mobile: false,
+      hasTouch: false,
+      isLandscape: false,
+    },
+  },
+};
+
+// 设置设备模拟
+const setDevice = async (tab, deviceName) => {
+  const target = await searchTarget(tab);
+  const { Network, Emulation } = await initCDP(target.id);
+
+  try {
+    const device = devices[deviceName];
+    if (!device) {
+      throw new Error(`未找到设备配置: ${deviceName}`);
+    }
+
+    // 设置 User Agent
+    await Network.setUserAgentOverride({
+      userAgent: device.userAgent,
+    });
+
+    // 设置视口
+    await Emulation.setDeviceMetricsOverride({
+      ...device.viewport,
+      screenWidth: device.viewport.width,
+      screenHeight: device.viewport.height,
+    });
+
+    // 设置触摸事件模拟
+    if (device.viewport.hasTouch) {
+      await Emulation.setTouchEmulationEnabled({
+        enabled: true,
+        maxTouchPoints: 5,
+      });
+    }
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
+// 自定义设备模拟
+const setCustomDevice = async (tab, options) => {
+  const target = await searchTarget(tab);
+  const { Network, Emulation } = await initCDP(target.id);
+
+  try {
+    const {
+      userAgent,
+      width = 1920,
+      height = 1080,
+      deviceScaleFactor = 1,
+      mobile = false,
+      hasTouch = false,
+      isLandscape = false,
+    } = options;
+
+    // 设置 User Agent
+    if (userAgent) {
+      await Network.setUserAgentOverride({
+        userAgent,
+      });
+    }
+
+    // 设置视口
+    await Emulation.setDeviceMetricsOverride({
+      width,
+      height,
+      deviceScaleFactor,
+      mobile,
+      isLandscape,
+      screenWidth: width,
+      screenHeight: height,
+    });
+
+    // 设置触摸事件模拟
+    if (hasTouch) {
+      await Emulation.setTouchEmulationEnabled({
+        enabled: true,
+        maxTouchPoints: 5,
+      });
+    }
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
+// 清除设备模拟
+const clearDeviceEmulation = async (tab) => {
+  const target = await searchTarget(tab);
+  const { Network, Emulation } = await initCDP(target.id);
+
+  try {
+    // 先禁用触摸事件模拟
+    await Emulation.setTouchEmulationEnabled({
+      enabled: false,
+    });
+
+    // 清除 User Agent 覆盖
+    await Network.setUserAgentOverride({
+      userAgent: "",
+    });
+
+    // 重置设备指标
+    await Emulation.setDeviceMetricsOverride({
+      width: 0,
+      height: 0,
+      deviceScaleFactor: 0,
+      mobile: false,
+      screenWidth: 0,
+      screenHeight: 0,
+    });
+
+    // 清除设备指标覆盖
+    await Emulation.clearDeviceMetricsOverride();
+  } catch (error) {
+    console.error("清除设备模拟失败:", error);
+  } finally {
+    await cleanupCDP(target.id);
+  }
+};
+
+module.exports = {
+  setDevice,
+  setCustomDevice,
+  clearDeviceEmulation,
+};
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index a2c74f03..2cf721db 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -5,6 +5,7 @@ const tabs = require("./tabs");
 const url = require("./url");
 const cookie = require("./cookie");
 const screenshot = require("./screenshot");
+const device = require("./device");
 
 module.exports = {
   ...url,
@@ -14,4 +15,5 @@ module.exports = {
   ...browserManager,
   ...cookie,
   ...screenshot,
+  ...device,
 };
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index b0d8bdf1..6c049c80 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -1,4 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
+import { deviceName, userAgent } from "js/options/httpOptions";
 
 const tabConfig = {
   component: "OptionEditor",
@@ -6,7 +7,6 @@ const tabConfig = {
   options: {
     by: {
       component: "QSelect",
-      label: "标签",
       width: 3,
       options: [
         { label: "当前标签页", value: "active" },
@@ -19,7 +19,7 @@ const tabConfig = {
       component: "VariableInput",
       icon: "tab",
       width: 9,
-      placeholder: "当前标签页留空，其他支持模糊匹配",
+      placeholder: "选择当前标签页留空，URL/标题/ID支持模糊匹配",
     },
   },
   defaultValue: {
@@ -625,5 +625,101 @@ export const browserCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.browser.setDevice",
+      label: "设备模拟",
+      icon: "devices",
+      isAsync: true,
+      config: [tabConfig],
+      subCommands: [
+        {
+          value: "quickcomposer.browser.setDevice",
+          label: "使用预设设备",
+          icon: "smartphone",
+          config: [
+            {
+              label: "设备",
+              component: "QSelect",
+              icon: "devices",
+              width: 12,
+              options: [
+                ...deviceName,
+                // 桌面设备
+                { label: "Desktop", value: "Desktop" },
+                { label: "MacBook Pro 16", value: "MacBook Pro 16" },
+                { label: "4K Display", value: "4K Display" },
+              ],
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.setCustomDevice",
+          label: "自定义设备",
+          icon: "build",
+          config: [
+            {
+              label: "设备配置",
+              component: "OptionEditor",
+              icon: "settings",
+              width: 12,
+              options: {
+                width: {
+                  label: "宽度",
+                  component: "NumberInput",
+                  width: 3,
+                  defaultValue: 1920,
+                  min: 0,
+                },
+                height: {
+                  label: "高度",
+                  component: "NumberInput",
+                  width: 3,
+                  defaultValue: 1080,
+                  min: 0,
+                },
+                deviceScaleFactor: {
+                  label: "设备像素比",
+                  component: "NumberInput",
+                  width: 3,
+                  defaultValue: 1,
+                  min: 1,
+                  step: 0.1,
+                },
+                mobile: {
+                  label: "移动设备",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                hasTouch: {
+                  label: "触摸屏",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                isLandscape: {
+                  label: "横屏",
+                  component: "CheckButton",
+                  width: 3,
+                },
+                userAgent: {
+                  label: "User Agent",
+                  component: "VariableInput",
+                  icon: "code",
+                  width: 6,
+                  placeholder: "留空使用默认",
+                  options: {
+                    items: userAgent,
+                  },
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.clearDeviceEmulation",
+          label: "清除设备模拟",
+          icon: "clear",
+        },
+      ],
+    },
   ],
 };
diff --git a/src/js/options/httpOptions.js b/src/js/options/httpOptions.js
index 6705be63..d9cf1a7f 100644
--- a/src/js/options/httpOptions.js
+++ b/src/js/options/httpOptions.js
@@ -67,15 +67,22 @@ export const commonHeaders = [
 ];
 
 export const deviceName = [
-  { label: "iPhone 11", value: "iPhone 11" },
   { label: "iPhone X", value: "iPhone X" },
-  { label: "iPad", value: "iPad" },
-  { label: "iPhone 6/7/8 Plus", value: "iPhone 6/7/8 Plus" },
-  { label: "iPhone 6/7/8", value: "iPhone 6/7/8" },
-  { label: "iPhone 5/SE", value: "iPhone 5/SE" },
-  { label: "HUAWEI Mate10", value: "HUAWEI Mate10" },
-  { label: "HUAWEI Mate20", value: "HUAWEI Mate20" },
-  { label: "HUAWEI Mate30", value: "HUAWEI Mate30" },
+  { label: "iPhone 12 Pro", value: "iPhone 12 Pro" },
+  { label: "iPhone 14 Pro Max", value: "iPhone 14 Pro Max" },
+  { label: "iPad Pro", value: "iPad Pro" },
+  { label: "iPad Mini", value: "iPad Mini" },
+  { label: "Pixel 5", value: "Pixel 5" },
+  { label: "Pixel 7", value: "Pixel 7" },
+  {
+    label: "Samsung Galaxy S20 Ultra",
+    value: "Samsung Galaxy S20 Ultra",
+  },
+  {
+    label: "Samsung Galaxy Tab S7",
+    value: "Samsung Galaxy Tab S7",
+  },
+  { label: "Xiaomi 12 Pro", value: "Xiaomi 12 Pro" },
   { label: "HUAWEI Mate30 Pro", value: "HUAWEI Mate30 Pro" },
 ];
 

From acf924dc8b12b91d11147d6e2ab2a66b97b285c7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 07:26:15 +0800
Subject: [PATCH 121/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20OptionEditor=20?=
 =?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=20modelValue=20?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/OptionEditor.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/common/OptionEditor.vue b/src/components/composer/common/OptionEditor.vue
index 30ebb8d6..4e5b58c9 100644
--- a/src/components/composer/common/OptionEditor.vue
+++ b/src/components/composer/common/OptionEditor.vue
@@ -57,12 +57,13 @@ export default defineComponent({
   },
   computed: {
     localObject() {
-      return this.modelValue;
+      return this.modelValue || {};
     },
   },
   methods: {
     updateOption(key, value) {
-      this.$emit("update:modelValue", { ...this.localObject, [key]: value });
+      const newValue = { ...this.localObject, [key]: value };
+      this.$emit("update:modelValue", newValue);
     },
     getColumnStyle(width = 12) {
       if (width === "auto") {
@@ -82,6 +83,12 @@ export default defineComponent({
       return ["q-input", "q-select"].includes(config.component) && config.icon;
     },
   },
+  created() {
+    // Initialize with empty object if modelValue is null/undefined
+    if (!this.modelValue) {
+      this.$emit("update:modelValue", {});
+    }
+  },
 });
 </script>
 

From 9257faf132c221f3ed4a65f6a9412f709b092f1b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 17:31:25 +0800
Subject: [PATCH 122/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=20ArrayEditor=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=85=E6=A0=8F=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=9B=E8=B0=83=E6=95=B4=20SelectListEdito?=
 =?UTF-8?q?r=20=E5=88=97=E5=AE=BD=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/ArrayEditor.vue           | 159 ++++++++++--------
 .../composer/ui/SelectListEditor.vue          |   3 +-
 2 files changed, 87 insertions(+), 75 deletions(-)

diff --git a/src/components/composer/common/ArrayEditor.vue b/src/components/composer/common/ArrayEditor.vue
index 1af12070..cbf179d6 100644
--- a/src/components/composer/common/ArrayEditor.vue
+++ b/src/components/composer/common/ArrayEditor.vue
@@ -6,76 +6,73 @@
     :model-value="isCollapse"
   >
     <div class="array-editor">
-      <div
-        v-for="(row, index) in rows"
-        :key="index"
-        class="row items-center q-gutter-sm"
-      >
-        <template v-if="!!columns">
-          <div
-            v-for="column in processedColumns"
-            :key="column.key"
-            :class="[column.width ? `col-${column.width}` : 'col']"
-          >
-            <VariableInput
-              :model-value="row[column.key]"
-              v-bind="column"
-              @update:model-value="
-                (val) => updateColumn(index, column.key, val)
-              "
-            />
-          </div>
-        </template>
-        <template v-else>
-          <div class="col">
-            <VariableInput
-              :model-value="row"
-              v-bind="$attrs"
-              @update:model-value="(val) => updateValue(index, val)"
-            />
-          </div>
-        </template>
-        <div class="col-auto">
-          <div class="btn-container">
-            <template v-if="rows.length === 1">
-              <q-btn
-                flat
-                dense
-                size="sm"
-                icon="add"
-                class="center-btn"
-                @click="addRow"
-              />
-            </template>
-            <template v-else-if="index === rows.length - 1">
-              <q-btn
-                flat
-                dense
-                size="sm"
-                icon="remove"
-                class="top-btn"
-                @click="removeRow(index)"
+      <div v-for="(row, index) in rows" :key="index" class="array-row">
+        <div class="row-content row q-col-gutter-sm">
+          <template v-if="!!columns">
+            <div
+              v-for="column in processedColumns"
+              :key="column.key"
+              :class="[column.width ? `col-${column.width}` : 'col']"
+            >
+              <VariableInput
+                :model-value="row[column.key]"
+                v-bind="column"
+                @update:model-value="
+                  (val) => updateColumn(index, column.key, val)
+                "
               />
-              <q-btn
-                flat
-                dense
-                size="sm"
-                icon="add"
-                class="bottom-btn"
-                @click="addRow"
+            </div>
+          </template>
+          <template v-else>
+            <div class="col">
+              <VariableInput
+                :model-value="row"
+                v-bind="$attrs"
+                @update:model-value="(val) => updateValue(index, val)"
               />
-            </template>
-            <template v-else>
-              <q-btn
-                flat
-                dense
-                size="sm"
-                icon="remove"
-                class="center-btn"
-                @click="removeRow(index)"
-              />
-            </template>
-          </div>
+            </div>
+          </template>
+        </div>
+
+        <div class="btn-container">
+          <template v-if="rows.length === 1">
+            <q-btn
+              flat
+              dense
+              size="sm"
+              icon="add"
+              class="center-btn"
+              @click="addRow"
+            />
+          </template>
+          <template v-else-if="index === rows.length - 1">
+            <q-btn
+              flat
+              dense
+              size="sm"
+              icon="remove"
+              class="top-btn"
+              @click="removeRow(index)"
+            />
+            <q-btn
+              flat
+              dense
+              size="sm"
+              icon="add"
+              class="bottom-btn"
+              @click="addRow"
+            />
+          </template>
+          <template v-else>
+            <q-btn
+              flat
+              dense
+              size="sm"
+              icon="remove"
+              class="center-btn"
+              @click="removeRow(index)"
+            />
+          </template>
         </div>
       </div>
     </div>
@@ -271,7 +268,18 @@ export default defineComponent({
   width: 100%;
   display: flex;
   flex-direction: column;
-  gap: 8px;
+  /*消除q-gutter-sm为第一行带来的额外padding*/
+  margin-top: -8px;
+  margin-left: -8px;
+}
+
+.array-row {
+  display: flex;
+}
+
+.row-content {
+  flex: 1;
+  margin: 0; /* 覆盖 Quasar 的默认 margin */
 }
 
 /* 防止输入框换行 */
@@ -283,11 +291,12 @@ export default defineComponent({
 
 .btn-container {
   position: relative;
-  width: 32px;
-  height: 32px;
+  width: 16px;
+  padding-top: 8px;
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-shrink: 0;
 }
 
 .btn-container .q-btn {
@@ -296,18 +305,20 @@ export default defineComponent({
   height: 16px;
   min-height: 16px;
   padding: 0;
+  /*抵消array-editor的margin-left，顺便和左边保持距离*/
+  margin-right: -8px;
 }
 
 .btn-container .center-btn {
-  position: relative;
+  top: 18px;
 }
 
 .btn-container .top-btn {
-  top: 0;
+  top: 8px;
 }
 
 .btn-container .bottom-btn {
-  bottom: 0;
+  top: 28px;
 }
 
 .array-editor :deep(.q-btn .q-icon) {
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 90044468..b0979ef2 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -199,11 +199,12 @@ export default defineComponent({
         title: {
           label: "标题",
           noIcon: true,
+          width: 4,
         },
         description: {
           label: "描述",
           noIcon: true,
-          width: 5,
+          width: 6,
         },
       },
       subCommands: [

From e097678c933f99e73bad2021ec911fc0c305e54f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 18:19:18 +0800
Subject: [PATCH 123/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8B=A6=E6=88=AA=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E5=9C=A8=E6=B5=8F=E8=A7=88=E5=99=A8=E5=91=BD=E4=BB=A4=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=92=8C=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E9=80=89=E9=A1=B9=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8B=A6=E6=88=AA=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=92=8C=E5=86=85=E5=AE=B9=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/cdp.js     |  10 +-
 plugin/lib/quickcomposer/browser/index.js   |   2 +
 plugin/lib/quickcomposer/browser/network.js | 240 ++++++++++++++++++++
 src/js/composer/commands/browserCommands.js | 124 +++++++++-
 4 files changed, 373 insertions(+), 3 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/browser/network.js

diff --git a/plugin/lib/quickcomposer/browser/cdp.js b/plugin/lib/quickcomposer/browser/cdp.js
index 9565da9e..02cf5669 100644
--- a/plugin/lib/quickcomposer/browser/cdp.js
+++ b/plugin/lib/quickcomposer/browser/cdp.js
@@ -9,8 +9,13 @@ const initCDP = async (targetId) => {
       port,
     });
 
-    const { Page, Runtime, Target, Network, Emulation, DOM } = client;
-    await Promise.all([Page.enable(), Runtime.enable(), DOM.enable()]);
+    const { Page, Runtime, Target, Network, Emulation, DOM, Fetch } = client;
+    await Promise.all([
+      Page.enable(),
+      Runtime.enable(),
+      DOM.enable(),
+      Fetch.enable(),
+    ]);
 
     return {
       client,
@@ -20,6 +25,7 @@ const initCDP = async (targetId) => {
       Network,
       Emulation,
       DOM,
+      Fetch,
     };
   } catch (err) {
     console.log(err);
diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index 2cf721db..c0096034 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -6,6 +6,7 @@ const url = require("./url");
 const cookie = require("./cookie");
 const screenshot = require("./screenshot");
 const device = require("./device");
+const network = require("./network");
 
 module.exports = {
   ...url,
@@ -16,4 +17,5 @@ module.exports = {
   ...cookie,
   ...screenshot,
   ...device,
+  ...network,
 };
diff --git a/plugin/lib/quickcomposer/browser/network.js b/plugin/lib/quickcomposer/browser/network.js
new file mode 100644
index 00000000..0b37a9e5
--- /dev/null
+++ b/plugin/lib/quickcomposer/browser/network.js
@@ -0,0 +1,240 @@
+const { initCDP, cleanupCDP } = require("./cdp");
+const { searchTarget } = require("./tabs");
+
+// 使用正则替换内容
+const replaceWithRegex = (content, pattern, replacement) => {
+  try {
+    const regex = new RegExp(pattern, "g");
+    return content.replace(regex, replacement);
+  } catch (error) {
+    return content;
+  }
+};
+
+// 存储活动的拦截连接
+let activeInterceptions = new Map();
+
+// 将对象格式的 headers 转换为数组格式
+const convertHeaders = (headers) => {
+  return Object.entries(headers).map(([name, value]) => ({
+    name,
+    value: String(value),
+  }));
+};
+
+// 检查 URL 是否匹配规则
+const isUrlMatch = (url, pattern) => {
+  try {
+    const regex = new RegExp(pattern);
+    return regex.test(url);
+  } catch (error) {
+    return url.includes(pattern);
+  }
+};
+
+// 修改请求
+const setRequestInterception = async (tab, rules) => {
+  // 先清除所有拦截规则
+  await clearInterception();
+
+  const target = await searchTarget(tab);
+  const client = await initCDP(target.id);
+
+  try {
+    await client.Fetch.enable({
+      patterns: [{ url: "*", requestStage: "Request" }],
+    });
+
+    client.Fetch.requestPaused(async ({ requestId, request }) => {
+      try {
+        let modified = null;
+
+        for (const rule of rules) {
+          if (isUrlMatch(request.url, rule.url)) {
+            modified = {
+              url: rule.redirectUrl || request.url,
+              method: request.method,
+              headers: { ...request.headers },
+              postData: request.postData,
+            };
+
+            if (rule.headerKey && rule.headerValue) {
+              modified.headers[rule.headerKey] = rule.headerValue;
+            }
+
+            if (rule.pattern && rule.replacement) {
+              const url = new URL(modified.url);
+              for (const [key, value] of url.searchParams.entries()) {
+                const decodedValue = decodeURIComponent(value);
+                const newValue = replaceWithRegex(
+                  decodedValue,
+                  rule.pattern,
+                  rule.replacement
+                );
+                if (decodedValue !== newValue) {
+                  url.searchParams.set(key, newValue);
+                }
+              }
+              modified.url = url.toString();
+
+              if (modified.postData) {
+                modified.postData = replaceWithRegex(
+                  modified.postData,
+                  rule.pattern,
+                  rule.replacement
+                );
+              }
+            }
+            break;
+          }
+        }
+
+        if (modified) {
+          await client.Fetch.continueRequest({
+            requestId,
+            url: modified.url,
+            method: modified.method,
+            headers: convertHeaders(modified.headers),
+            postData: modified.postData,
+          });
+        } else {
+          await client.Fetch.continueRequest({ requestId });
+        }
+      } catch (error) {
+        await client.Fetch.continueRequest({ requestId });
+      }
+    });
+
+    activeInterceptions.set("request", client);
+    return {
+      success: true,
+      message: `设置请求拦截规则成功`,
+      rules,
+    };
+  } catch (error) {
+    await cleanupCDP(client);
+    return {
+      success: false,
+      message: error.message,
+    };
+  }
+};
+
+// 修改响应
+const setResponseInterception = async (tab, rules) => {
+  // 先清除所有拦截规则
+  await clearInterception();
+
+  const target = await searchTarget(tab);
+  const client = await initCDP(target.id);
+
+  try {
+    await client.Fetch.enable({
+      patterns: [{ url: "*", requestStage: "Response" }],
+    });
+
+    client.Fetch.requestPaused(
+      async ({ requestId, request, responseHeaders, responseStatusCode }) => {
+        try {
+          const contentType = responseHeaders.find(
+            (h) => h.name.toLowerCase() === "content-type"
+          )?.value;
+          const isTextContent = contentType && contentType.includes("text");
+
+          if (!isTextContent) {
+            await client.Fetch.continueRequest({ requestId });
+            return;
+          }
+
+          let shouldIntercept = false;
+          let modifiedBody = null;
+          let modifiedStatus = responseStatusCode;
+
+          for (const rule of rules) {
+            if (isUrlMatch(request.url, rule.url)) {
+              shouldIntercept = true;
+
+              if (rule.statusCode) {
+                modifiedStatus = rule.statusCode;
+              }
+
+              if (rule.pattern) {
+                try {
+                  const response = await client.Fetch.getResponseBody({
+                    requestId,
+                  });
+                  const originalBody = response.base64Encoded
+                    ? Buffer.from(response.body, "base64").toString()
+                    : response.body;
+
+                  if (originalBody) {
+                    modifiedBody = replaceWithRegex(
+                      originalBody,
+                      rule.pattern,
+                      rule.replacement || ""
+                    );
+                  }
+                } catch (error) {
+                  shouldIntercept = false;
+                }
+              }
+            }
+          }
+
+          if (shouldIntercept && modifiedBody !== null) {
+            await client.Fetch.fulfillRequest({
+              requestId,
+              responseCode: modifiedStatus,
+              responseHeaders,
+              body: Buffer.from(modifiedBody).toString("base64"),
+            });
+          } else {
+            await client.Fetch.continueRequest({ requestId });
+          }
+        } catch (error) {
+          await client.Fetch.continueRequest({ requestId });
+        }
+      }
+    );
+
+    activeInterceptions.set("response", client);
+    return {
+      success: true,
+      message: `设置响应拦截规则成功`,
+      rules,
+    };
+  } catch (error) {
+    await cleanupCDP(client);
+    return {
+      success: false,
+      message: error.message,
+    };
+  }
+};
+
+// 清除所有拦截规则
+const clearInterception = async () => {
+  if (activeInterceptions.size === 0) {
+    return {
+      success: true,
+      message: `还没有设置拦截规则`,
+    };
+  }
+  for (const [type, client] of activeInterceptions.entries()) {
+    try {
+      await client.Fetch.disable();
+      await cleanupCDP(client);
+    } catch (error) {}
+  }
+  activeInterceptions.clear();
+  return {
+    success: true,
+    message: `清除拦截规则成功`,
+  };
+};
+
+module.exports = {
+  setRequestInterception,
+  setResponseInterception,
+  clearInterception,
+};
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 6c049c80..3675425a 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -1,5 +1,5 @@
 import { newVarInputVal } from "js/composer/varInputValManager";
-import { deviceName, userAgent } from "js/options/httpOptions";
+import { deviceName, userAgent, commonHeaders } from "js/options/httpOptions";
 
 const tabConfig = {
   component: "OptionEditor",
@@ -625,6 +625,128 @@ export const browserCommands = {
         },
       ],
     },
+    {
+      value: "quickcomposer.browser.setRequestInterception",
+      label: "修改请求/响应",
+      icon: "network",
+      isAsync: true,
+      isAsync: true,
+      subCommands: [
+        {
+          value: "quickcomposer.browser.setRequestInterception",
+          label: "修改请求",
+          icon: "upload",
+          config: [
+            tabConfig,
+            {
+              topLabel: "拦截规则",
+              isCollapse: false,
+              component: "ArrayEditor",
+              icon: "rule",
+              columns: {
+                url: {
+                  label: "要拦截的URL",
+                  defaultValue: newVarInputVal("str"),
+                  placeholder: "支持正则，如.*\\.baidu\\.com",
+                  width: 12,
+                },
+                headerKey: {
+                  label: "要修改的请求头",
+                  component: "VariableInput",
+                  options: {
+                    items: commonHeaders,
+                  },
+                  width: 6,
+                },
+                headerValue: {
+                  label: "要修改的请求头值",
+                  component: "VariableInput",
+                  defaultValue: newVarInputVal("str"),
+                  width: 6,
+                },
+                pattern: {
+                  label: "要修改的请求内容（body及url参数）",
+                  defaultValue: newVarInputVal("str"),
+                  width: 6,
+                  placeholder: "支持正则，如(role: )[guest|user]",
+                },
+                replacement: {
+                  label: "替换内容",
+                  defaultValue: newVarInputVal("str"),
+                  width: 6,
+                  placeholder: "支持替换符，如$1admin",
+                },
+                redirectUrl: {
+                  label: "重定向到指定URL",
+                  defaultValue: newVarInputVal("str"),
+                  width: 12,
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.setResponseInterception",
+          label: "修改响应",
+          icon: "download",
+          config: [
+            tabConfig,
+            {
+              topLabel: "拦截规则",
+              isCollapse: false,
+              component: "ArrayEditor",
+              icon: "rule",
+              width: 12,
+              columns: {
+                url: {
+                  label: "要拦截的URL",
+                  defaultValue: newVarInputVal("str"),
+                  placeholder: "支持正则，如.*\\.baidu\\.com",
+                  width: 9,
+                },
+                statusCode: {
+                  label: "状态码",
+                  component: "VariableInput",
+                  defaultValue: 200,
+                  options: {
+                    items: [
+                      { label: "200", value: 200 },
+                      { label: "302", value: 302 },
+                      { label: "401", value: 401 },
+                      { label: "403", value: 403 },
+                      { label: "404", value: 404 },
+                      { label: "500", value: 500 },
+                      { label: "502", value: 502 },
+                      { label: "503", value: 503 },
+                      { label: "504", value: 504 },
+                    ],
+                  },
+                  defaultValue: newVarInputVal("var", ""),
+                  width: 3,
+                },
+                pattern: {
+                  label: "要修改的响应内容",
+                  defaultValue: newVarInputVal("str"),
+                  placeholder: "支持正则，如(role: )[guest|user]",
+                  width: 6,
+                },
+                replacement: {
+                  label: "替换内容",
+                  defaultValue: newVarInputVal("str"),
+                  placeholder: "支持替换符，如$1admin",
+                  width: 6,
+                },
+              },
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.browser.clearInterception",
+          label: "清除所有拦截规则",
+          icon: "clear",
+        },
+      ],
+    },
     {
       value: "quickcomposer.browser.setDevice",
       label: "设备模拟",

From 9ade7095a90298e0756ef0d877a63d2e97d7dead Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 18:25:54 +0800
Subject: [PATCH 124/332] =?UTF-8?q?=E8=B0=83=E6=95=B4device=E3=80=81networ?=
 =?UTF-8?q?k=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/index.js   |  4 ++--
 src/js/composer/commands/browserCommands.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/index.js b/plugin/lib/quickcomposer/browser/index.js
index c0096034..64779964 100644
--- a/plugin/lib/quickcomposer/browser/index.js
+++ b/plugin/lib/quickcomposer/browser/index.js
@@ -16,6 +16,6 @@ module.exports = {
   ...browserManager,
   ...cookie,
   ...screenshot,
-  ...device,
-  ...network,
+  device,
+  network,
 };
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 3675425a..c0d96454 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -626,14 +626,14 @@ export const browserCommands = {
       ],
     },
     {
-      value: "quickcomposer.browser.setRequestInterception",
+      value: "quickcomposer.browser.network.setRequestInterception",
       label: "修改请求/响应",
       icon: "network",
       isAsync: true,
       isAsync: true,
       subCommands: [
         {
-          value: "quickcomposer.browser.setRequestInterception",
+          value: "quickcomposer.browser.network.setRequestInterception",
           label: "修改请求",
           icon: "upload",
           config: [
@@ -686,7 +686,7 @@ export const browserCommands = {
           ],
         },
         {
-          value: "quickcomposer.browser.setResponseInterception",
+          value: "quickcomposer.browser.network.setResponseInterception",
           label: "修改响应",
           icon: "download",
           config: [
@@ -741,21 +741,21 @@ export const browserCommands = {
           ],
         },
         {
-          value: "quickcomposer.browser.clearInterception",
+          value: "quickcomposer.browser.network.clearInterception",
           label: "清除所有拦截规则",
           icon: "clear",
         },
       ],
     },
     {
-      value: "quickcomposer.browser.setDevice",
+      value: "quickcomposer.browser.device.setDevice",
       label: "设备模拟",
       icon: "devices",
       isAsync: true,
       config: [tabConfig],
       subCommands: [
         {
-          value: "quickcomposer.browser.setDevice",
+          value: "quickcomposer.browser.device.setDevice",
           label: "使用预设设备",
           icon: "smartphone",
           config: [
@@ -775,7 +775,7 @@ export const browserCommands = {
           ],
         },
         {
-          value: "quickcomposer.browser.setCustomDevice",
+          value: "quickcomposer.browser.device.setCustomDevice",
           label: "自定义设备",
           icon: "build",
           config: [
@@ -837,7 +837,7 @@ export const browserCommands = {
           ],
         },
         {
-          value: "quickcomposer.browser.clearDeviceEmulation",
+          value: "quickcomposer.browser.device.clearDeviceEmulation",
           label: "清除设备模拟",
           icon: "clear",
         },

From e5744716890495ba9ac34d867e1d3f7471fc69c0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 22:16:01 +0800
Subject: [PATCH 125/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=20DictEditor=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B8=83=E5=B1=80=EF=BC=9A=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E7=B1=BB=E7=BB=93=E6=9E=84=EF=BC=8C=E8=B0=83=E6=95=B4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AE=B9=E5=99=A8=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/DictEditor.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index 362d99fa..a0a19094 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -9,9 +9,9 @@
       <div
         v-for="(item, index) in allItems"
         :key="`${item.type}-${index}`"
-        class="row q-col-gutter-sm items-center"
+        class="row items-center"
       >
-        <div class="col-4">
+        <div class="col-4 q-pr-sm">
           <template v-if="item.type === 'fixed'">
             <q-input
               :model-value="item.key"
@@ -81,10 +81,7 @@
             @update:model-value="(val) => updateItemValue(val, index)"
           />
         </div>
-        <div
-          v-if="item.type !== 'fixed' && !options?.disableAdd"
-          class="col-auto"
-        >
+        <div v-if="item.type !== 'fixed' && !options?.disableAdd">
           <div class="btn-container">
             <template v-if="localItems.length === 1">
               <q-btn
@@ -304,8 +301,9 @@ export default defineComponent({
 
 .btn-container {
   position: relative;
-  width: 32px;
+  width: 16px;
   height: 32px;
+  padding-left: 4px;
   display: flex;
   align-items: center;
   justify-content: center;

From dcd392ba476668ecc54920087f398f11f6be7514 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 24 Jan 2025 23:53:57 +0800
Subject: [PATCH 126/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=20runCode=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E5=B0=86=E5=8F=82=E6=95=B0=E7=94=B1?=
 =?UTF-8?q?=20program=20=E6=94=B9=E4=B8=BA=20options=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9B=B4=E5=A4=9A=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=BC=96=E7=A8=8B=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E3=80=81=E8=84=9A=E6=9C=AC=E5=8F=82=E6=95=B0=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=90=8C=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20API=20=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quickcommandUI/QuickCommand.vue           | 49 ++++++++++++-
 .../monaco/types/quickcommand.api.d.ts        | 71 +++++++++++++------
 2 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 731c5665..c5ec06db 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -266,12 +266,55 @@ export default {
     // 获取用户数据
     window.quickcommand.userData = this.$root.utools.userData;
 
-    // 添加runCode方法，不在preload中加是因为programs写在了src中-_-
-    quickcommand.runCode = (code, program, runInTerminal = false) => {
+    /**
+     * 执行代码
+     * 添加runCode方法，不在preload中加是因为programs写在了src中-_-
+     * @param code 代码文本
+     * @param options 选项
+     * @param options.language 编程语言
+     * @param options.args 脚本参数
+     * @param options.charset 编码
+     * @param options.charset.scriptCode 脚本编码
+     * @param options.charset.outputCode 输出编码
+     * @param options.runInTerminal 终端运行参数，不传则不在终端运行
+     * @param options.runInTerminal.dir 运行目录
+     * @param options.runInTerminal.windows windows使用的终端，默认wt
+     * @param options.runInTerminal.macos macos使用的终端，默认warp
+     */
+    quickcommand.runCode = (code, options) => {
       return new Promise((reslove, reject) => {
+        const isWin = window.utools.isWindows();
+        const {
+          language = isWin ? "cmd" : "shell",
+          charset = {},
+          args = [],
+          runInTerminal,
+        } = options;
+
+        const unescapeAndQuote = (str) => `"${str.replace(/\\"/g, '"')}"`;
+
+        if (!programs[language]) {
+          return reject(new Error(`不支持的语言: ${language}`));
+        }
+
+        if (!Array.isArray(args)) {
+          return reject(new TypeError(`args 应为 Array, 而非 ${typeof args}`));
+        }
+        const argsStr = args.map(unescapeAndQuote).join(" ");
+
+        const defaultCharset =
+          isWin && ["cmd", "powershell"].includes(language) ? "gbk" : "utf-8";
+          
+        const { scriptCode = defaultCharset, outputCode = defaultCharset } =
+          charset;
+
         window.runCodeFile(
           code,
-          { ...programs[program], charset: {}, scptarg: "" },
+          {
+            ...programs[language],
+            charset: { scriptCode, outputCode },
+            scptarg: argsStr,
+          },
           runInTerminal,
           (result, err) => (err ? reject(err) : reslove(result))
         );
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 2b57b675..44df73b3 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -652,38 +652,63 @@ interface quickcommandApi {
   /**
    * 运行代码
    * @param code 代码
-   * @param program 编程语言
-   * @param runInTerminal 终端运行参数，不传则不在终端运行
-   * @param runInTerminal.dir 运行目录
-   * @param runInTerminal.windows windows使用的终端，默认wt
-   * @param runInTerminal.macos macos使用的终端，默认warp
+   * @param options 选项
+   * @param options.language 编程语言，不传时则根据操作系统选择cmd或是shell
+   * @param options.args 脚本参数
+   * @param options.charset 编码，不传时则根据操作系统及语言选择utf-8或是gbk
+   * @param options.charset.scriptCode 脚本编码
+   * @param options.charset.outputCode 输出编码
+   * @param options.runInTerminal 终端运行参数，不传则不在终端运行
+   * @param options.runInTerminal.dir 运行目录
+   * @param options.runInTerminal.windows windows使用的终端，默认wt
+   * @param options.runInTerminal.macos macos使用的终端，默认warp
    *
    * 支持的编程语言：
    * shell, applescript, cmd, python, powershell, javascript, ruby, php, lua, perl, csharp, c
    *
    * ```js
-   * quickcommand.runCode("print('Hello, World!');", "python");
+   * const script = `
+   * import sys
+   * print(sys.argv[1])
+   * `
+   * const options = {
+   *   language: "python",
+   *   args: ["hello world"]
+   * }
+
+   * quickcommand.runCode(script, options).then(result => {
+   *   console.log(result)
+   * }).catch(e => {
+   *   console.log(e)
+   * })
    * ```
    */
   runCode(
     code: string,
-    program:
-      | "shell"
-      | "applescript"
-      | "cmd"
-      | "python"
-      | "powershell"
-      | "javascript"
-      | "ruby"
-      | "php"
-      | "lua"
-      | "perl"
-      | "csharp"
-      | "c",
-    runInTerminal?: {
-      dir?: string;
-      windows?: "wt" | "cmd";
-      macos?: "warp" | "iterm" | "terminal";
+    options: {
+      language:
+        | "shell"
+        | "applescript"
+        | "cmd"
+        | "python"
+        | "powershell"
+        | "javascript"
+        | "ruby"
+        | "php"
+        | "lua"
+        | "perl"
+        | "csharp"
+        | "c";
+      args?: string[];
+      charset?: {
+        scriptCode?: string;
+        outputCode?: string;
+      };
+      runInTerminal?: {
+        dir?: string;
+        windows?: "wt" | "cmd";
+        macos?: "warp" | "iterm" | "terminal";
+      };
     }
   ): Promise<string>;
 }

From 4595ea8ef0bee0415df8b7d5ca304ab8de718bd9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 00:30:32 +0800
Subject: [PATCH 127/332] =?UTF-8?q?=E5=9C=A8CodeEditor=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=A0=E4=BD=8D=E7=AC=A6=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CodeEditor.vue | 45 ++++++++++++++++++-
 .../quickcommandUI/QuickCommand.vue           |  8 +++-
 src/js/composer/commands/browserCommands.js   |  2 +-
 src/js/composer/commands/scriptCommands.js    | 41 +++++++++++++++++
 4 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
index ef9dd5c1..2d23305a 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/composer/common/CodeEditor.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="code-editor" :style="{ height: height }">
-    <div ref="editorContainer" class="editor-container"></div>
+    <div ref="editorContainer" class="editor-container" />
+    <div class="placeholder-wrapper" v-show="!value && placeholder">
+      <div class="placeholder">
+        {{ placeholder }}
+      </div>
+    </div>
   </div>
 </template>
 
@@ -36,6 +41,11 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    // placeholder提示文本
+    placeholder: {
+      type: String,
+      default: "请输入...",
+    },
   },
   emits: ["update:modelValue", "change"],
   data() {
@@ -202,6 +212,11 @@ export default {
       }
     },
   },
+  computed: {
+    showPlaceholder() {
+      return this.placeholder && (!this.value || this.value.trim() === "");
+    },
+  },
 };
 </script>
 
@@ -211,10 +226,38 @@ export default {
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 4px;
   overflow: hidden;
+  position: relative;
 }
 
 .editor-container {
   width: 100%;
   height: 100%;
 }
+
+.placeholder-wrapper {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  padding-left: 45px;
+  pointer-events: none;
+}
+
+.placeholder {
+  font-size: 14px;
+  font-family: sans-serif;
+  color: #535353;
+  user-select: none;
+  font-style: italic;
+  opacity: 0;
+  transition: opacity 0.1s ease-in-out;
+}
+
+.code-editor:focus-within .placeholder {
+  opacity: 1;
+}
+
+.body--dark .placeholder {
+  color: #666;
+}
 </style>
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index c5ec06db..02701465 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -291,6 +291,10 @@ export default {
           runInTerminal,
         } = options;
 
+        // 兼容编排，传入true时，使用默认终端
+        const runInTerminalOptions =
+          runInTerminal === true ? {} : runInTerminal;
+
         const unescapeAndQuote = (str) => `"${str.replace(/\\"/g, '"')}"`;
 
         if (!programs[language]) {
@@ -304,7 +308,7 @@ export default {
 
         const defaultCharset =
           isWin && ["cmd", "powershell"].includes(language) ? "gbk" : "utf-8";
-          
+
         const { scriptCode = defaultCharset, outputCode = defaultCharset } =
           charset;
 
@@ -315,7 +319,7 @@ export default {
             charset: { scriptCode, outputCode },
             scptarg: argsStr,
           },
-          runInTerminal,
+          runInTerminalOptions,
           (result, err) => (err ? reject(err) : reslove(result))
         );
         false;
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index c0d96454..718195e7 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -313,7 +313,7 @@ export const browserCommands = {
           component: "CodeEditor",
           icon: "code",
           width: 12,
-          placeholder: "输入JavaScript代码",
+          placeholder: "输入JavaScript代码，使用return返回结果",
         },
         {
           topLabel: "要传递的参数",
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index c468cf6f..ae02bac5 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -1,3 +1,5 @@
+import programs from "js/options/programs";
+
 export const scriptCommands = {
   label: "编程相关",
   icon: "integration_instructions",
@@ -26,6 +28,8 @@ export const scriptCommands = {
         {
           label: "JS脚本",
           component: "CodeEditor",
+          placeholder:
+            "共享当前上下文，支持utools，quickcommand，quickcomposer等接口",
           width: 12,
         },
       ],
@@ -34,12 +38,49 @@ export const scriptCommands = {
       value: "quickcommand.runCode",
       label: "执行代码",
       icon: "script",
+      isAsync: true,
       outputVariable: "result",
+      saveOutput: true,
       config: [
         {
           label: "脚本",
           component: "CodeEditor",
+          placeholder: "需要本机安装了对应的解释器/编译器",
+          width: 12,
+        },
+        {
+          component: "OptionEditor",
           width: 12,
+          options: {
+            language: {
+              label: "语言",
+              component: "QSelect",
+              icon: "language",
+              options: Object.keys(programs).slice(2, -1),
+              width: 8,
+            },
+            runInTerminal: {
+              label: "终端运行",
+              icon: "terminal",
+              component: "CheckButton",
+              width: 4,
+            },
+            args: {
+              topLabel: "参数",
+              icon: "data_array",
+              component: "ArrayEditor",
+              width: 12,
+            },
+            charset: {
+              label: "编码",
+              icon: "abc",
+              component: "DictEditor",
+              options: {
+                optionKeys: ["scriptCode", "outputCode"],
+              },
+              width: 12,
+            },
+          },
         },
       ],
     },

From 680360ef2cf8d8c4f212bf1aa45d134e143fa61a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 08:19:23 +0800
Subject: [PATCH 128/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Windows=20?=
 =?UTF-8?q?=E4=B8=8B=20Bash=20=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/preload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/preload.js b/plugin/preload.js
index 775ddc10..f8b63c59 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -230,7 +230,7 @@ const buildCommandLine = (bin, argv, script, scptarg) => {
 
   if (utools.isWindows() && bin === "bash") {
     const wslPath = script.replace(/\\/g, "/").replace(/C:/i, "/mnt/c");
-    return `${bin} ${argv} "${wslPath}" ${scptarg}`;
+    return `wsl -e ${bin} ${argv} "${wslPath}" ${scptarg}`;
   }
 
   return `${bin} ${argv} "${script}" ${scptarg}`;

From 1d9a67580367bac6a140eb4650c928f4120771a4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 13:57:14 +0800
Subject: [PATCH 129/332] =?UTF-8?q?=E7=AE=80=E5=8C=96RunCode=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=8F=82=E6=95=B0=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9EScriptEditor=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96CodeEditor=E4=BB=A3=E7=A0=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CodeEditor.vue | 179 +++++++++++-
 .../composer/param/ParamImporter.vue          |   8 +-
 .../composer/script/ScriptEditor.vue          | 266 ++++++++++++++++++
 .../quickcommandUI/QuickCommand.vue           |  31 +-
 src/js/composer/cardComponents.js             |   4 +
 src/js/composer/commands/browserCommands.js   |   2 +
 src/js/composer/commands/scriptCommands.js    |  68 +----
 .../monaco/types/quickcommand.api.d.ts        |  11 +-
 8 files changed, 472 insertions(+), 97 deletions(-)
 create mode 100644 src/components/composer/script/ScriptEditor.vue

diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
index 2d23305a..a46078ac 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/composer/common/CodeEditor.vue
@@ -12,8 +12,36 @@
 <script>
 import * as monaco from "monaco-editor";
 import { toRaw } from "vue";
+import importAll from "js/common/importAll.js";
+import { defineComponent } from "vue";
 
-export default {
+// 批量导入声明文件
+let apis = importAll(
+  require.context("!raw-loader!plugins/monaco/types/", false, /\.ts$/)
+);
+
+// 批量导入关键字补全
+let languageCompletions = importAll(
+  require.context("plugins/monaco/completions/", false, /\.js$/)
+);
+
+let monacoCompletionProviders = {};
+
+// 声明文件映射
+const typeDefinitions = {
+  javascript: ["lib.es5.d.ts", "common.d.ts", "node.api.d.ts", "electron.d.ts"],
+  quickcommand: [
+    "lib.es5.d.ts",
+    "common.d.ts",
+    "node.api.d.ts",
+    "electron.d.ts",
+    "quickcommand.api.d.ts",
+    "utools.api.d.ts",
+    "shortcode.api.d.ts",
+  ],
+};
+
+export default defineComponent({
   name: "CodeEditor",
   props: {
     // v-model 绑定值
@@ -24,12 +52,12 @@ export default {
     // 编程语言
     language: {
       type: String,
-      default: "plaintext",
+      default: "javascript",
     },
     // 编辑器高度
     height: {
       type: String,
-      default: "200px",
+      default: "300px",
     },
     // 编辑器主题
     theme: {
@@ -128,6 +156,18 @@ export default {
         monaco.editor.setTheme(newValue ? "vs-dark" : "vs");
       },
     },
+    language: {
+      immediate: true,
+      handler(newValue) {
+        if (this.editor) {
+          const language = ["webjavascript", "quickcommand"].includes(newValue)
+            ? "javascript"
+            : newValue;
+          monaco.editor.setModelLanguage(this.rawEditor().getModel(), language);
+          this.loadTypes();
+        }
+      },
+    },
   },
   mounted() {
     this.initEditor();
@@ -141,16 +181,22 @@ export default {
   methods: {
     // 初始化编辑器
     initEditor() {
+      const language = ["webjavascript", "quickcommand"].includes(this.language)
+        ? "javascript"
+        : this.language;
+
       const options = {
         ...this.defaultOptions,
         ...this.options,
         value: this.value || "",
-        language: this.language,
+        language,
         theme: this.theme,
       };
 
       this.editor = monaco.editor.create(this.$refs.editorContainer, options);
       this.listenEditorValue();
+      this.loadTypes();
+      this.registerLanguage();
 
       // 初始化完成后立即触发一次布局更新
       this.$nextTick(() => {
@@ -211,13 +257,129 @@ export default {
         this.editor.focus();
       }
     },
+    registerLanguage() {
+      let that = this;
+      const identifierPattern = "([a-zA-Z_]\\w*)";
+      let getTokens = (code) => {
+        let identifier = new RegExp(identifierPattern, "g");
+        let tokens = [];
+        let array1;
+        while ((array1 = identifier.exec(code)) !== null) {
+          tokens.push(array1[0]);
+        }
+        return Array.from(new Set(tokens));
+      };
+      let createDependencyProposals = (range, keyWords, editor, curWord) => {
+        let keys = [];
+        // fix getValue of undefined
+        let tokens = getTokens(toRaw(editor).getModel()?.getValue());
+        // 自定义变量、字符串
+        for (const item of tokens) {
+          if (item != curWord.word) {
+            keys.push({
+              label: item,
+              kind: monaco.languages.CompletionItemKind.Text,
+              documentation: "",
+              insertText: item,
+              range: range,
+            });
+          }
+        }
+        // 关键字、函数
+        Object.keys(keyWords).forEach((ItemKind) => {
+          keyWords[ItemKind].forEach((item) => {
+            keys.push({
+              label: item,
+              kind: monaco.languages.CompletionItemKind[ItemKind],
+              documentation: "",
+              insertText: item,
+              range: range,
+            });
+          });
+        });
+        return keys;
+      };
+      // 注册 applescript
+      monaco.languages.register({
+        id: "applescript",
+      });
+      // 注册自动补全
+      Object.keys(languageCompletions).forEach((language) => {
+        // 防止自动补全被多次注册
+        if (monacoCompletionProviders[language]) return;
+        monaco.languages.registerCompletionItemProvider(language, {
+          provideCompletionItems: function (model, position) {
+            var word = model.getWordUntilPosition(position);
+            var range = {
+              startLineNumber: position.lineNumber,
+              endLineNumber: position.lineNumber,
+              startColumn: word.startColumn,
+              endColumn: word.endColumn,
+            };
+            return {
+              suggestions: createDependencyProposals(
+                range,
+                languageCompletions[language].default,
+                toRaw(that.editor),
+                word
+              ),
+            };
+          },
+        });
+        monacoCompletionProviders[language] = true;
+      });
+    },
+    loadTypes() {
+      monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+        noSemanticValidation: true,
+        noSyntaxValidation: false,
+      });
+
+      const options = {
+        target: monaco.languages.typescript.ScriptTarget.ES6,
+        allowNonTsExtensions: true,
+        allowJs: true,
+      };
+
+      // webjavascript 使用默认配置
+      if (this.language === "webjavascript") {
+        monaco.languages.typescript.javascriptDefaults.setCompilerOptions(
+          options
+        );
+        return;
+      }
+
+      // 其他语言根据语言加载对应的声明文件
+      monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+        ...options,
+        lib: [],
+      });
+
+      const files = typeDefinitions[this.language] || [];
+      const declarations = files.map((file) => {
+        try {
+          return require(`!raw-loader!plugins/monaco/types/${file}`).default;
+        } catch (e) {
+          console.warn(`Failed to load type definition: ${file}`, e);
+          return "";
+        }
+      });
+
+      if (declarations.length > 0) {
+        // 添加声明文件
+        monaco.languages.typescript.javascriptDefaults.addExtraLib(
+          declarations.join("\n"),
+          "api.d.ts"
+        );
+      }
+    },
   },
   computed: {
     showPlaceholder() {
       return this.placeholder && (!this.value || this.value.trim() === "");
     },
   },
-};
+});
 </script>
 
 <style scoped>
@@ -246,7 +408,6 @@ export default {
 .placeholder {
   font-size: 14px;
   font-family: sans-serif;
-  color: #535353;
   user-select: none;
   font-style: italic;
   opacity: 0;
@@ -254,10 +415,6 @@ export default {
 }
 
 .code-editor:focus-within .placeholder {
-  opacity: 1;
-}
-
-.body--dark .placeholder {
-  color: #666;
+  opacity: 0.3;
 }
 </style>
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 5ef69781..9723a101 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { defineComponent } from "vue";
+import { defineComponent, defineAsyncComponent } from "vue";
 // 导入OptionEditor之外的通用组件，因为他还要被OptionEditor使用，防止循环引用
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
@@ -22,8 +22,10 @@ import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import ControlInput from "components/composer/common/ControlInput.vue";
 import CheckGroup from "components/composer/common/CheckGroup.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
-import CodeEditor from "components/composer/common/CodeEditor.vue";
 import { QInput, QSelect, QToggle, QCheckbox } from "quasar";
+const CodeEditor = defineAsyncComponent(() =>
+  import("components/composer/common/CodeEditor.vue")
+);
 
 export default defineComponent({
   name: "ParamInput",
@@ -36,11 +38,11 @@ export default defineComponent({
     ControlInput,
     CheckGroup,
     CheckButton,
-    CodeEditor,
     QToggle,
     QInput,
     QSelect,
     QCheckbox,
+    CodeEditor,
   },
   props: {
     config: {
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
new file mode 100644
index 00000000..0b5640c9
--- /dev/null
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -0,0 +1,266 @@
+<template>
+  <div class="script-editor">
+    <!-- 代码编辑器 -->
+    <CodeEditor
+      :model-value="argvs.code"
+      @update:modelValue="updateArgvs('code', $event)"
+      :language="argvs.language"
+    />
+    <div class="row q-col-gutter-sm">
+      <!-- 语言选择 -->
+      <q-select
+        :model-value="argvs.language"
+        @update:modelValue="updateArgvs('language', $event)"
+        :options="Object.keys(programs).slice(2, -1)"
+        label="编程语言"
+        filled
+        dense
+        class="col-6"
+      >
+        <template v-slot:append>
+          <q-avatar size="sm" square>
+            <img :src="http://github.com/programs[argvs.language].icon" />
+          </q-avatar>
+        </template>
+        <template v-slot:option="scope">
+          <q-item v-bind="scope.itemProps">
+            <q-item-section avatar>
+              <img width="24" :src="http://github.com/programs[scope.opt].icon" />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label v-html="scope.opt" />
+            </q-item-section>
+          </q-item>
+        </template>
+      </q-select>
+
+      <!-- 编码设置 -->
+      <q-select
+        class="col-3"
+        filled
+        dense
+        :model-value="argvs.scriptCode"
+        @update:modelValue="updateArgvs('scriptCode', $event)"
+        label="脚本文件编码"
+        :options="charsetOptions"
+        emit-value
+        map-options
+      />
+      <q-select
+        class="col-3"
+        filled
+        dense
+        :model-value="argvs.outputCode"
+        @update:modelValue="updateArgvs('outputCode', $event)"
+        label="命令行输出编码"
+        :options="charsetOptions"
+        emit-value
+        map-options
+      />
+    </div>
+
+    <div class="row q-col-gutter-sm">
+      <div class="col-6">
+        <ArrayEditor
+          topLabel="脚本参数"
+          :model-value="argvs.args"
+          @update:modelValue="updateArgvs('args', $event)"
+        />
+      </div>
+      <!-- 终端运行设置 -->
+      <div class="col-6">
+        <BorderLabel label="终端运行设置">
+          <div class="row q-col-gutter-sm">
+            <CheckButton
+              :model-value="!!argvs.runInTerminal"
+              @update:modelValue="toggleTerminal"
+              label="在终端中运行"
+            />
+
+            <template v-if="argvs.runInTerminal">
+              <VariableInput
+                :model-value="argvs.runInTerminal.dir"
+                @update:modelValue="updateTerminal('dir', $event)"
+                :options="{
+                  dialog: {
+                    type: 'open',
+                    properties: ['openDirectory'],
+                  },
+                }"
+                label="运行目录"
+              />
+              <div class="col">
+                <div class="row q-col-gutter-sm">
+                  <q-select
+                    :model-value="argvs.runInTerminal.windows"
+                    @update:modelValue="updateTerminal('windows', $event)"
+                    :options="windowsTerminalOptions"
+                    label="Windows终端"
+                    filled
+                    dense
+                    emit-value
+                    map-options
+                    class="col-6"
+                  />
+
+                  <q-select
+                    :model-value="argvs.runInTerminal.macos"
+                    @update:modelValue="updateTerminal('macos', $event)"
+                    :options="macosTerminalOptions"
+                    label="macOS终端"
+                    filled
+                    dense
+                    emit-value
+                    map-options
+                    class="col-6"
+                  />
+                </div>
+              </div>
+            </template>
+          </div>
+        </BorderLabel>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
+import CodeEditor from "components/composer/common/CodeEditor.vue";
+import VariableInput from "components/composer/common/VariableInput.vue";
+import ArrayEditor from "components/composer/common/ArrayEditor.vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
+import CheckButton from "components/composer/common/CheckButton.vue";
+import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import programs from "js/options/programs";
+
+export default defineComponent({
+  name: "ScriptEditor",
+  components: {
+    CodeEditor,
+    VariableInput,
+    ArrayEditor,
+    BorderLabel,
+    CheckButton,
+  },
+  props: {
+    modelValue: Object,
+  },
+  emits: ["update:modelValue"],
+  data() {
+    return {
+      defaultArgvs: {
+        code: "",
+        language: "python",
+        args: [],
+        scriptCode: null,
+        outputCode: null,
+        runInTerminal: null,
+      },
+      programs: programs,
+      windowsTerminalOptions: ["wt", "cmd"],
+      macosTerminalOptions: ["warp", "iterm", "terminal"],
+      charsetOptions: [
+        { label: "自动", value: null },
+        { label: "UTF-8", value: "utf-8" },
+        { label: "GBK", value: "gbk" },
+      ],
+    };
+  },
+  computed: {
+    argvs() {
+      return (
+        this.modelValue.argvs ||
+        this.parseCodeToArgvs(this.modelValue.code) ||
+        this.defaultArgvs
+      );
+    },
+  },
+  methods: {
+    parseCodeToArgvs(code) {
+      if (!code) return this.defaultArgvs;
+      try {
+        const variableFormatPaths = ["arg1.args[*]"];
+        const result = parseFunction(code, { variableFormatPaths });
+        if (!result) return this.defaultArgvs;
+
+        const [scriptCode, options] = result.argvs;
+        return {
+          code: scriptCode,
+          ...options,
+        };
+      } catch (e) {
+        console.error("解析参数失败:", e);
+        return this.defaultArgvs;
+      }
+    },
+    generateCode(argvs = this.argvs) {
+      const options = {
+        language: argvs.language,
+      };
+
+      if (argvs.scriptCode) {
+        options.scriptCode = argvs.scriptCode;
+      }
+
+      if (argvs.outputCode) {
+        options.outputCode = argvs.outputCode;
+      }
+
+      if (argvs.args?.length) {
+        options.args = argvs.args;
+      }
+
+      if (argvs.runInTerminal) {
+        options.runInTerminal = { ...argvs.runInTerminal };
+      }
+
+      return `${this.modelValue.value}(${stringifyArgv(
+        argvs.code
+      )}, ${stringifyArgv(options)})`;
+    },
+    getSummary(argvs) {
+      return `运行${argvs.language}代码`;
+    },
+    updateArgvs(key, value) {
+      const newArgvs = { ...this.argvs, [key]: value };
+      this.updateModelValue(newArgvs);
+    },
+    toggleTerminal(value) {
+      const newArgvs = { ...this.argvs };
+      newArgvs.runInTerminal = value
+        ? { dir: newVarInputVal("str", "") }
+        : null;
+      this.updateModelValue(newArgvs);
+    },
+    updateTerminal(key, value) {
+      const newTerminal = { ...this.argvs.runInTerminal, [key]: value };
+      const newArgvs = { ...this.argvs, runInTerminal: newTerminal };
+      this.updateModelValue(newArgvs);
+    },
+    updateModelValue(argvs) {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        summary: this.getSummary(argvs),
+        code: this.generateCode(argvs),
+        argvs,
+      });
+    },
+  },
+  mounted() {
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
+    }
+  },
+});
+</script>
+
+<style scoped>
+.script-editor {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+</style>
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 02701465..f4b7846e 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -273,9 +273,8 @@ export default {
      * @param options 选项
      * @param options.language 编程语言
      * @param options.args 脚本参数
-     * @param options.charset 编码
-     * @param options.charset.scriptCode 脚本编码
-     * @param options.charset.outputCode 输出编码
+     * @param options.scriptCode 脚本文件编码
+     * @param options.outputCode 命令行输出编码
      * @param options.runInTerminal 终端运行参数，不传则不在终端运行
      * @param options.runInTerminal.dir 运行目录
      * @param options.runInTerminal.windows windows使用的终端，默认wt
@@ -286,11 +285,20 @@ export default {
         const isWin = window.utools.isWindows();
         const {
           language = isWin ? "cmd" : "shell",
-          charset = {},
           args = [],
           runInTerminal,
         } = options;
 
+        if (!options.scriptCode) {
+          options.scriptCode = ["cmd", "powershell"].includes(language)
+            ? "gbk"
+            : "utf-8";
+        }
+
+        if (!options.outputCode) {
+          options.outputCode = isWin ? "gbk" : "utf-8";
+        }
+
         // 兼容编排，传入true时，使用默认终端
         const runInTerminalOptions =
           runInTerminal === true ? {} : runInTerminal;
@@ -306,23 +314,20 @@ export default {
         }
         const argsStr = args.map(unescapeAndQuote).join(" ");
 
-        const defaultCharset =
-          isWin && ["cmd", "powershell"].includes(language) ? "gbk" : "utf-8";
-
-        const { scriptCode = defaultCharset, outputCode = defaultCharset } =
-          charset;
-
         window.runCodeFile(
           code,
           {
             ...programs[language],
-            charset: { scriptCode, outputCode },
+            charset: {
+              scriptCode: options.scriptCode,
+              outputCode: options.outputCode,
+            },
             scptarg: argsStr,
           },
           runInTerminalOptions,
-          (result, err) => (err ? reject(err) : reslove(result))
+          (result, err) => (err ? reject(err) : reslove(result)),
+          false
         );
-        false;
       });
     };
 
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index c317c28f..6d6fd87e 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -55,3 +55,7 @@ export const SelectListEditor = defineAsyncComponent(() =>
 export const ReturnEditor = defineAsyncComponent(() =>
   import("components/composer/script/ReturnEditor.vue")
 );
+
+export const ScriptEditor = defineAsyncComponent(() =>
+  import("components/composer/script/ScriptEditor.vue")
+);
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 718195e7..0c390f09 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -311,6 +311,7 @@ export const browserCommands = {
         {
           label: "脚本内容",
           component: "CodeEditor",
+          language: "webjavascript",
           icon: "code",
           width: 12,
           placeholder: "输入JavaScript代码，使用return返回结果",
@@ -382,6 +383,7 @@ export const browserCommands = {
           config: [
             {
               component: "CodeEditor",
+              language: "css",
               icon: "style",
               width: 12,
               placeholder: "输入CSS代码",
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index ae02bac5..5c2ad5a9 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -1,26 +1,10 @@
-import programs from "js/options/programs";
-
 export const scriptCommands = {
   label: "编程相关",
   icon: "integration_instructions",
   commands: [
-    {
-      value: "",
-      label: "赋值",
-      icon: "script",
-      outputVariable: "value",
-      saveOutput: true,
-      config: [
-        {
-          label: "值或表达式",
-          component: "VariableInput",
-          width: 12,
-        },
-      ],
-    },
     {
       value: "injectJs",
-      label: "注入JS脚本",
+      label: "注入JS代码",
       icon: "script",
       neverHasOutput: true,
       isExpression: true,
@@ -28,6 +12,7 @@ export const scriptCommands = {
         {
           label: "JS脚本",
           component: "CodeEditor",
+          language: "quickcommand",
           placeholder:
             "共享当前上下文，支持utools，quickcommand，quickcomposer等接口",
           width: 12,
@@ -36,53 +21,10 @@ export const scriptCommands = {
     },
     {
       value: "quickcommand.runCode",
-      label: "执行代码",
-      icon: "script",
+      label: "运行脚本",
+      component: "ScriptEditor",
+      desc: "运行各种编程语言的代码",
       isAsync: true,
-      outputVariable: "result",
-      saveOutput: true,
-      config: [
-        {
-          label: "脚本",
-          component: "CodeEditor",
-          placeholder: "需要本机安装了对应的解释器/编译器",
-          width: 12,
-        },
-        {
-          component: "OptionEditor",
-          width: 12,
-          options: {
-            language: {
-              label: "语言",
-              component: "QSelect",
-              icon: "language",
-              options: Object.keys(programs).slice(2, -1),
-              width: 8,
-            },
-            runInTerminal: {
-              label: "终端运行",
-              icon: "terminal",
-              component: "CheckButton",
-              width: 4,
-            },
-            args: {
-              topLabel: "参数",
-              icon: "data_array",
-              component: "ArrayEditor",
-              width: 12,
-            },
-            charset: {
-              label: "编码",
-              icon: "abc",
-              component: "DictEditor",
-              options: {
-                optionKeys: ["scriptCode", "outputCode"],
-              },
-              width: 12,
-            },
-          },
-        },
-      ],
     },
     {
       value: "return",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 44df73b3..95eb35b9 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -655,9 +655,8 @@ interface quickcommandApi {
    * @param options 选项
    * @param options.language 编程语言，不传时则根据操作系统选择cmd或是shell
    * @param options.args 脚本参数
-   * @param options.charset 编码，不传时则根据操作系统及语言选择utf-8或是gbk
-   * @param options.charset.scriptCode 脚本编码
-   * @param options.charset.outputCode 输出编码
+   * @param options.scriptCode 脚本文件编码
+   * @param options.outputCode 命令行输出编码
    * @param options.runInTerminal 终端运行参数，不传则不在终端运行
    * @param options.runInTerminal.dir 运行目录
    * @param options.runInTerminal.windows windows使用的终端，默认wt
@@ -700,10 +699,8 @@ interface quickcommandApi {
         | "csharp"
         | "c";
       args?: string[];
-      charset?: {
-        scriptCode?: string;
-        outputCode?: string;
-      };
+      scriptCode?: string;
+      outputCode?: string;
       runInTerminal?: {
         dir?: string;
         windows?: "wt" | "cmd";

From 2dce35924433097c095ddfa3cb1a90abad4215a7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 14:47:21 +0800
Subject: [PATCH 130/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0quickcomposer?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/data/string.js       |    2 +-
 plugin/lib/quickcomposer/file/operation.js    |    6 +-
 src/components/composer/common/CodeEditor.vue |    1 +
 src/js/composer/commands/dataCommands.js      |    2 +-
 src/plugins/monaco/types/quickcomposer.d.ts   | 2479 +++++++++++++++++
 5 files changed, 2485 insertions(+), 5 deletions(-)
 create mode 100644 src/plugins/monaco/types/quickcomposer.d.ts

diff --git a/plugin/lib/quickcomposer/data/string.js b/plugin/lib/quickcomposer/data/string.js
index f9050b9e..d285314a 100644
--- a/plugin/lib/quickcomposer/data/string.js
+++ b/plugin/lib/quickcomposer/data/string.js
@@ -27,7 +27,7 @@ const string = {
   },
 
   // 大小写转换
-  case: function (text, mode = "upper") {
+  changeCase: function (text, mode = "upper") {
     switch (mode) {
       case "upper":
         return text.toUpperCase();
diff --git a/plugin/lib/quickcomposer/file/operation.js b/plugin/lib/quickcomposer/file/operation.js
index 0b849880..c09b8790 100644
--- a/plugin/lib/quickcomposer/file/operation.js
+++ b/plugin/lib/quickcomposer/file/operation.js
@@ -84,7 +84,7 @@ async function write(config) {
 /**
  * 文件删除操作
  */
-async function delete_(config) {
+async function remove(config) {
   const { filePath, recursive, force, targetType } = config;
 
   // 检查文件是否存在
@@ -338,7 +338,7 @@ async function operation(config) {
     case "stat":
       return await stat(config);
     case "delete":
-      return await delete_(config);
+      return await remove(config);
     case "manage":
       return await manage(config);
     default:
@@ -351,7 +351,7 @@ module.exports = {
   write,
   list,
   stat,
-  delete: delete_,
+  remove,
   manage,
   operation,
 };
diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
index a46078ac..a84358fe 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/composer/common/CodeEditor.vue
@@ -38,6 +38,7 @@ const typeDefinitions = {
     "quickcommand.api.d.ts",
     "utools.api.d.ts",
     "shortcode.api.d.ts",
+    "quickcomposer.d.ts",
   ],
 };
 
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index b3ba694c..156d3346 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -103,7 +103,7 @@ export const dataCommands = {
           ],
         },
         {
-          value: "quickcomposer.data.string.case",
+          value: "quickcomposer.data.string.changeCase",
           label: "大小写转换",
           icon: "text_fields",
           config: [
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
new file mode 100644
index 00000000..7b96303b
--- /dev/null
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -0,0 +1,2479 @@
+declare var quickcomposer: quickcomposerApi;
+
+interface quickcomposerApi {
+  data: {
+    string: {
+      /**
+       * 反转字符串
+       * @param text 要反转的文本
+       */
+      reverse(text: string): string;
+
+      /**
+       * 字符串替换
+       * @param text 原始文本
+       * @param searchValue 要替换的文本
+       * @param replaceValue 替换为的文本
+       */
+      replace(text: string, searchValue: string, replaceValue: string): string;
+
+      /**
+       * 字符串截取
+       * @param text 原始文本
+       * @param start 起始位置
+       * @param end 结束位置
+       */
+      substring(text: string, start: number, end?: number): string;
+
+      /**
+       * 去除空白
+       * @param text 原始文本
+       * @param mode 去除模式：both-两端，start-左侧，end-右侧
+       */
+      trim(text: string, mode?: "both" | "start" | "end"): string;
+
+      /**
+       * 大小写转换
+       * @param text 原始文本
+       * @param type 转换类型：upper-大写，lower-小写，capitalize-首字母大写，camel-驼峰，snake-蛇形，kebab-短横线，constant-常量
+       */
+      changeCase(
+        text: string,
+        type:
+          | "upper"
+          | "lower"
+          | "capitalize"
+          | "camel"
+          | "snake"
+          | "kebab"
+          | "constant"
+      ): string;
+
+      /**
+       * 字符串填充
+       * @param text 原始文本
+       * @param length 目标长度
+       * @param padString 填充字符
+       * @param position 填充位置：start-左侧，end-右侧，both-两端
+       */
+      pad(
+        text: string,
+        length: number,
+        padString?: string,
+        position?: "start" | "end" | "both"
+      ): string;
+
+      /**
+       * 字符串分割
+       * @param text 原始文本
+       * @param separator 分隔符
+       */
+      split(text: string, separator?: string): string[];
+
+      /**
+       * 数组合并
+       * @param array 字符串数组
+       * @param separator 连接符
+       */
+      join(array: string[], separator?: string): string;
+
+      /**
+       * 字符串重复
+       * @param text 要重复的文本
+       * @param count 重复次数
+       */
+      repeat(text: string, count: number): string;
+
+      /**
+       * 提取字符
+       * @param text 原始文本
+       * @param type 提取类型：number-数字，letter-字母，chinese-中文，punctuation-标点符号，whitespace-空白字符
+       */
+      extract(
+        text: string,
+        type: "number" | "letter" | "chinese" | "punctuation" | "whitespace"
+      ): string;
+
+      /**
+       * 字符统计
+       * @param text 原始文本
+       * @param type 统计类型：char-字符数，word-单词数，line-行数，number-数字数，letter-字母数，chinese-中文字数，whitespace-空白字符数
+       */
+      count(
+        text: string,
+        type:
+          | "char"
+          | "word"
+          | "line"
+          | "number"
+          | "letter"
+          | "chinese"
+          | "whitespace"
+      ): number;
+
+      /**
+       * 文本换行
+       * @param text 原始文本
+       * @param width 每行字符数
+       */
+      wrap(text: string, width: number): string;
+
+      /**
+       * 文本对齐
+       * @param text 原始文本
+       * @param align 对齐方式：left-左对齐，center-居中，right-右对齐，justify-两端对齐
+       * @param width 总宽度
+       */
+      align(
+        text: string,
+        align: "left" | "center" | "right" | "justify",
+        width: number
+      ): string;
+    };
+    array: {
+      /**
+       * 数组过滤
+       * @param array 原始数组
+       * @param condition 过滤条件
+       */
+      filter<T>(array: T[], condition: string): T[];
+
+      /**
+       * 数组映射
+       * @param array 原始数组
+       * @param transform 转换函数
+       */
+      map<T, U>(array: T[], transform: string): U[];
+
+      /**
+       * 数组排序
+       * @param array 原始数组
+       * @param field 排序字段
+       * @param order 排序方式：asc-升序，desc-降序
+       */
+      sort<T>(array: T[], field: keyof T, order?: "asc" | "desc"): T[];
+
+      /**
+       * 数组分组
+       * @param array 原始数组
+       * @param field 分组字段
+       */
+      group<T>(array: T[], field: keyof T): Record<string, T[]>;
+
+      /**
+       * 数组去重
+       * @param array 原始数组
+       * @param field 去重字段
+       */
+      unique<T>(array: T[], field?: keyof T): T[];
+
+      /**
+       * 查找元素
+       * @param array 原始数组
+       * @param condition 查找条件
+       */
+      find<T>(array: T[], condition: string): T | undefined;
+
+      /**
+       * 数组聚合
+       * @param array 原始数组
+       * @param operation 聚合操作：sum-求和，avg-平均值，max-最大值，min-最小值，count-计数
+       * @param field 聚合字段
+       */
+      aggregate<T>(
+        array: T[],
+        operation: "sum" | "avg" | "max" | "min" | "count",
+        field: keyof T
+      ): number;
+
+      /**
+       * 数组切片
+       * @param array 原始数组
+       * @param start 起始位置
+       * @param end 结束位置
+       */
+      slice<T>(array: T[], start?: number, end?: number): T[];
+
+      /**
+       * 数组扁平化
+       * @param array 原始数组
+       * @param depth 扁平化深度
+       */
+      flatten<T>(array: T[], depth?: number): T[];
+
+      /**
+       * 数组差集
+       * @param array1 数组1
+       * @param array2 数组2
+       * @param field 比较字段
+       */
+      diff<T>(array1: T[], array2: T[], field?: keyof T): T[];
+
+      /**
+       * 数组交集
+       * @param array1 数组1
+       * @param array2 数组2
+       * @param field 比较字段
+       */
+      intersect<T>(array1: T[], array2: T[], field?: keyof T): T[];
+
+      /**
+       * 数组并集
+       * @param array1 数组1
+       * @param array2 数组2
+       * @param field 比较字段
+       */
+      union<T>(array1: T[], array2: T[], field?: keyof T): T[];
+
+      /**
+       * 数组分块
+       * @param array 原始数组
+       * @param size 块大小
+       */
+      chunk<T>(array: T[], size: number): T[][];
+
+      /**
+       * 数组随机排序
+       * @param array 原始数组
+       */
+      shuffle<T>(array: T[]): T[];
+    };
+    buffer: {
+      /**
+       * 创建Buffer
+       * @param data 数据
+       * @param encoding 编码
+       */
+      from(data: string | number[] | Buffer, encoding?: BufferEncoding): Buffer;
+
+      /**
+       * 写入数据
+       * @param buffer Buffer对象
+       * @param string 要写入的字符串
+       * @param offset 偏移量
+       * @param length 长度
+       * @param encoding 编码
+       */
+      write(
+        buffer: Buffer,
+        string: string,
+        offset?: number,
+        length?: number,
+        encoding?: BufferEncoding
+      ): number;
+
+      /**
+       * 填充数据
+       * @param buffer Buffer对象
+       * @param value 填充值
+       * @param start 起始位置
+       * @param end 结束位置
+       * @param encoding 编码
+       */
+      fill(
+        buffer: Buffer,
+        value: string | number | Buffer,
+        start?: number,
+        end?: number,
+        encoding?: BufferEncoding
+      ): Buffer;
+
+      /**
+       * 复制数据
+       * @param source 源Buffer
+       * @param target 目标Buffer
+       * @param targetStart 目标起始位置
+       * @param sourceStart 源起始位置
+       * @param sourceEnd 源结束位置
+       */
+      copy(
+        source: Buffer,
+        target: Buffer,
+        targetStart?: number,
+        sourceStart?: number,
+        sourceEnd?: number
+      ): number;
+
+      /**
+       * 比较数据
+       * @param buffer1 Buffer1
+       * @param buffer2 Buffer2
+       */
+      compare(buffer1: Buffer, buffer2: Buffer): number;
+
+      /**
+       * 连接Buffer
+       * @param buffers Buffer数组
+       * @param totalLength 总长度
+       */
+      concat(buffers: Buffer[], totalLength?: number): Buffer;
+
+      /**
+       * 切片数据
+       * @param buffer Buffer对象
+       * @param start 起始位置
+       * @param end 结束位置
+       */
+      slice(buffer: Buffer, start?: number, end?: number): Buffer;
+
+      /**
+       * 交换字节序
+       * @param buffer Buffer对象
+       * @param size 字节大小：16位、32位、64位
+       */
+      swap(buffer: Buffer, size: 16 | 32 | 64): Buffer;
+    };
+    time: {
+      /**
+       * 时间格式化
+       * @param time 时间
+       * @param format 格式
+       */
+      format(time: string | number | Date, format: string): string;
+
+      /**
+       * 工作日计算
+       * @param startDate 开始时间
+       * @param days 工作日天数
+       * @param includeWeekend 包含周末
+       * @param holidays 节假日
+       */
+      workday(
+        startDate: string | Date,
+        days: number,
+        includeWeekend?: boolean,
+        holidays?: string[]
+      ): string;
+
+      /**
+       * 时间范围判断
+       * @param time 判断时间
+       * @param start 开始时间
+       * @param end 结束时间
+       * @param inclusive 包含边界
+       */
+      between(
+        time: string | Date,
+        start: string | Date,
+        end: string | Date,
+        inclusive?: boolean
+      ): boolean;
+    };
+    /**
+     * HTML解析
+     * @param html 要解析的HTML
+     * @param selector CSS选择器
+     * @param attribute 属性
+     */
+    htmlParser(
+      html: string,
+      selector: string,
+      attribute?: string
+    ): string | string[];
+    zlib: {
+      /**
+       * 压缩数据
+       * @param data 要压缩的数据
+       */
+      compressData(data: string | Buffer): Promise<Buffer>;
+
+      /**
+       * 解压数据
+       * @param data 要解压的数据
+       */
+      decompressData(data: Buffer): Promise<Buffer>;
+
+      /**
+       * 同步压缩数据
+       * @param data 要压缩的数据
+       */
+      compressDataSync(data: string | Buffer): Buffer;
+
+      /**
+       * 同步解压数据
+       * @param data 要解压的数据
+       */
+      decompressDataSync(data: Buffer): Buffer;
+
+      /**
+       * zlib常量
+       */
+      constants: typeof import("zlib").constants;
+    };
+  };
+  simulate: {
+    /**
+     * 模拟按键
+     * @param keys 按键数组，第一个元素为主按键，其余为修饰键(control/alt/shift/command)
+     * @param options 选项
+     * @param options.repeatCount 重复次数
+     * @param options.repeatInterval 重复间隔(毫秒)
+     * @param options.keyDelay 按键后延迟(毫秒)
+     */
+    keyboardTap(
+      keys: string[],
+      options?: {
+        repeatCount?: number;
+        repeatInterval?: number;
+        keyDelay?: number;
+      }
+    ): void;
+
+    /**
+     * 按键序列
+     * @param sequence 按键序列数组，每个元素为一个按键数组
+     * @param options 选项
+     * @param options.interval 按键间隔(毫秒)
+     */
+    keySequence(
+      sequence: string[][],
+      options?: {
+        interval?: number;
+      }
+    ): void;
+
+    /**
+     * 鼠标点击
+     * @param mouseAction 点击类型：Click-单击，RightClick-右击，DoubleClick-双击
+     * @param options 选项
+     * @param options.x X坐标
+     * @param options.y Y坐标
+     * @param options.count 点击次数
+     * @param options.interval 点击间隔(毫秒)
+     */
+    mouseClick(
+      mouseAction?: "Click" | "RightClick" | "DoubleClick",
+      options?: {
+        x?: number;
+        y?: number;
+        count?: number;
+        interval?: number;
+      }
+    ): void;
+
+    /**
+     * 屏幕找图
+     * @param options 找图选项
+     * @param options.image 图片路径或base64
+     * @param options.region 查找区域 [x, y, width, height]
+     * @param options.confidence 相似度 0-1
+     * @param options.timeout 超时时间(毫秒)
+     */
+    findImage(options: {
+      image: string;
+      region?: [number, number, number, number];
+      confidence?: number;
+      timeout?: number;
+    }): Promise<{ x: number; y: number } | null>;
+
+    /**
+     * 屏幕取色
+     * @returns 返回颜色值，包含hex和rgb格式
+     */
+    screenColorPick(): Promise<{
+      hex: string;
+      rgb: { r: number; g: number; b: number };
+    }>;
+
+    /**
+     * 屏幕截图
+     * @param options 截图选项
+     * @param options.type 截图类型：fullscreen-全屏，area-区域
+     */
+    captureScreen(options?: { type?: "fullscreen" | "area" }): Promise<string>;
+
+    /**
+     * 屏幕截图并保存到文件
+     * @param filePath 保存路径
+     * @param options 截图选项
+     * @param options.type 截图类型：fullscreen-全屏，area-区域
+     */
+    captureScreenToFile(
+      filePath: string,
+      options?: {
+        type?: "fullscreen" | "area";
+      }
+    ): Promise<void>;
+
+    /**
+     * 屏幕截图并复制到剪贴板
+     * @param options 截图选项
+     * @param options.type 截图类型：fullscreen-全屏，area-区域
+     */
+    captureScreenToClipboard(options?: {
+      type?: "fullscreen" | "area";
+    }): Promise<void>;
+  };
+  file: {
+    /**
+     * 文件操作
+     */
+    operation: {
+      /**
+       * 统一的文件操作入口
+       * @param config 操作配置
+       */
+      operation(config: {
+        /** 操作类型：read-读取，write-写入，list-列表，stat-状态，delete-删除，manage-管理 */
+        operation: "read" | "write" | "list" | "stat" | "delete" | "manage";
+        /** 文件路径 */
+        filePath: string;
+        /** 读取操作配置 */
+        readOptions?: {
+          /** 编码方式 */
+          encoding?: BufferEncoding;
+          /** 起始位置 */
+          start?: number;
+          /** 结束位置 */
+          end?: number;
+        };
+        /** 写入操作配置 */
+        writeOptions?: {
+          /** 写入内容 */
+          content: string;
+          /** 编码方式 */
+          encoding?: BufferEncoding;
+          /** 写入模式：overwrite-覆盖，append-追加 */
+          writeMode?: "overwrite" | "append";
+          /** 文件权限 */
+          writeFlag?: string;
+        };
+        /** 列表操作配置 */
+        listOptions?: {
+          /** 是否递归 */
+          recursive?: boolean;
+          /** 是否包含隐藏文件 */
+          includeHidden?: boolean;
+        };
+        /** 管理操作配置 */
+        manageOptions?: {
+          /** 目标类型：file-文件，directory-目录 */
+          targetType?: "file" | "directory";
+          /** 管理操作类型：rename-重命名，chmod-修改权限，chown-修改所有者 */
+          manageOperation?: "rename" | "chmod" | "chown";
+          /** 新路径(重命名时使用) */
+          newPath?: string;
+          /** 权限模式(chmod时使用) */
+          mode?: string | number;
+          /** 用户ID(chown时使用) */
+          uid?: number;
+          /** 组ID(chown时使用) */
+          gid?: number;
+          /** 是否递归操作 */
+          recursive?: boolean;
+        };
+      }): Promise<any>;
+    };
+
+    /**
+     * 文件归档
+     */
+    archive: {
+      /**
+       * 文件归档操作
+       * @param config 归档配置
+       */
+      archive(config: {
+        /** 操作类型：compress-压缩，extract-解压 */
+        operation: "compress" | "extract";
+        /** 归档格式：zip, tar, gzip */
+        format: "zip" | "tar" | "gzip";
+        /** 源文件/文件夹路径 */
+        sourcePath: string | string[];
+        /** 目标路径 */
+        targetPath: string;
+        /** 压缩级别(1-9) */
+        level?: number;
+        /** 是否保持目录结构 */
+        preserveStructure?: boolean;
+        /** 密码保护(仅zip格式支持) */
+        password?: string;
+      }): Promise<void>;
+    };
+  };
+  system: {
+    /**
+     * 执行系统命令
+     * @param command 要执行的命令
+     * @param options 执行选项
+     * @param options.autoEncoding 是否自动处理编码(Windows下使用GBK,其他使用UTF-8)
+     * @param options.encoding 指定编码
+     * @param options.windowsHide 是否隐藏命令窗口(仅Windows)
+     * @param options.cwd 工作目录
+     */
+    exec(
+      command: string,
+      options?: {
+        autoEncoding?: boolean;
+        encoding?: BufferEncoding | "buffer";
+        windowsHide?: boolean;
+        cwd?: string;
+      }
+    ): Promise<string | Buffer>;
+
+    /**
+     * 操作系统相关功能
+     */
+    os: {
+      /**
+       * 获取系统架构
+       */
+      arch(): string;
+
+      /**
+       * 获取CPU信息
+       * @param format 信息格式：full-完整信息，simple-仅型号和速度
+       */
+      cpus(format?: "full" | "simple"): {
+        model: string;
+        speed: number;
+        times?: {
+          user: number;
+          nice: number;
+          sys: number;
+          idle: number;
+          irq: number;
+        };
+      }[];
+
+      /**
+       * 获取内存信息
+       * @param type 内存类型：totalmem-总内存，freemem-空闲内存
+       */
+      memory(type: "totalmem" | "freemem"): number;
+
+      /**
+       * 获取网络信息
+       * @param type 网络信息类型：hostname-主机名，networkInterfaces-网络接口
+       * @param includeInternal 是否包含内部接口
+       */
+      network(
+        type: "hostname" | "networkInterfaces",
+        includeInternal?: boolean
+      ): string | Record<string, any>;
+
+      /**
+       * 获取平台信息
+       * @param type 平台信息类型
+       */
+      platform(
+        type:
+          | "platform" // 操作系统名称
+          | "type" // 操作系统类型
+          | "release" // 操作系统版本
+          | "arch" // 操作系统架构
+          | "endianness" // CPU字节序
+          | "tmpdir" // 系统临时目录
+          | "homedir" // 主目录
+          | "uptime" // 系统正常运行时间
+          | "userInfo" // 用户信息
+      ): string | number | Record<string, any>;
+    };
+
+    /**
+     * 路径操作相关功能
+     */
+    path: {
+      /**
+       * 规范化路径
+       * @param path 路径
+       */
+      normalize(path: string): string;
+
+      /**
+       * 解析路径
+       * @param path 路径
+       */
+      parse(path: string): {
+        root: string;
+        dir: string;
+        base: string;
+        ext: string;
+        name: string;
+      };
+
+      /**
+       * 获取目录名
+       * @param path 路径
+       */
+      dirname(path: string): string;
+
+      /**
+       * 获取文件名
+       * @param path 路径
+       * @param ext 要移除的扩展名
+       */
+      basename(path: string, ext?: string): string;
+
+      /**
+       * 获取扩展名
+       * @param path 路径
+       */
+      extname(path: string): string;
+
+      /**
+       * 判断是否为绝对路径
+       * @param path 路径
+       */
+      isAbsolute(path: string): boolean;
+
+      /**
+       * 连接路径
+       * @param paths 路径片段
+       */
+      join(...paths: string[]): string;
+
+      /**
+       * 解析绝对路径
+       * @param paths 路径片段
+       */
+      resolve(...paths: string[]): string;
+
+      /**
+       * 计算相对路径
+       * @param from 起始路径
+       * @param to 目标路径
+       */
+      relative(from: string, to: string): string;
+
+      /**
+       * 格式化路径
+       * @param pathObject 路径对象
+       */
+      format(pathObject: {
+        root?: string;
+        dir?: string;
+        base?: string;
+        ext?: string;
+        name?: string;
+      }): string;
+    };
+  };
+  network: {
+    /**
+     * URL操作相关功能
+     */
+    url: {
+      /**
+       * 解析URL
+       * @param url 要解析的URL
+       */
+      parse(url: string): {
+        protocol: string;
+        auth: string;
+        hostname: string;
+        port: string;
+        pathname: string;
+        search: string;
+        hash: string;
+      };
+
+      /**
+       * 格式化URL
+       * @param urlObject URL对象
+       */
+      format(urlObject: {
+        protocol?: string;
+        auth?: string;
+        hostname?: string;
+        port?: string;
+        pathname?: string;
+        search?: string;
+        hash?: string;
+      }): string;
+
+      /**
+       * 解析查询字符串
+       * @param queryString 查询字符串
+       */
+      parseQuery(queryString: string): Record<string, string>;
+
+      /**
+       * 格式化查询字符串
+       * @param params 参数对象
+       */
+      formatQuery(params: Record<string, string>): string;
+
+      /**
+       * 解析路径
+       * @param path URL路径
+       */
+      parsePath(path: string): {
+        pathname: string;
+        search: string;
+        hash: string;
+      };
+
+      /**
+       * 解析主机名
+       * @param host 主机名(可能包含端口)
+       */
+      parseHost(host: string): {
+        hostname: string;
+        port: string;
+      };
+
+      /**
+       * 获取URL参数
+       * @param url URL
+       * @param param 参数名
+       */
+      getQueryParam(url: string, param: string): string | null;
+
+      /**
+       * 添加URL参数
+       * @param url URL
+       * @param param 参数名
+       * @param value 参数值
+       */
+      addQueryParam(url: string, param: string, value: string): string;
+
+      /**
+       * 移除URL参数
+       * @param url URL
+       * @param param 参数名
+       */
+      removeQueryParam(url: string, param: string): string;
+
+      /**
+       * 检查是否为绝对URL
+       * @param url URL
+       */
+      isAbsolute(url: string): boolean;
+
+      /**
+       * 解析URL组成部分
+       * @param url URL
+       */
+      parseComponents(url: string): {
+        protocol: string;
+        username: string;
+        password: string;
+        hostname: string;
+        port: string;
+        pathname: string;
+        search: string;
+        hash: string;
+      };
+    };
+
+    /**
+     * DNS操作相关功能
+     */
+    dns: {
+      /**
+       * DNS查询
+       * @param hostname 域名
+       * @param options 查询选项
+       * @param options.family IP版本：0-自动，4-IPv4，6-IPv6
+       * @param options.all 是否返回所有地址
+       */
+      lookupHost(
+        hostname: string,
+        options?: {
+          family?: 0 | 4 | 6;
+          all?: boolean;
+        }
+      ): Promise<string | { address: string; family: number }[]>;
+
+      /**
+       * 解析所有记录
+       * @param hostname 域名
+       */
+      resolveAll(hostname: string): Promise<{
+        A?: string[];
+        AAAA?: string[];
+        MX?: { priority: number; exchange: string }[];
+        TXT?: string[];
+        SRV?: {
+          priority: number;
+          weight: number;
+          port: number;
+          target: string;
+        }[];
+        NS?: string[];
+        CNAME?: string[];
+      }>;
+
+      /**
+       * 解析IPv4地址
+       * @param hostname 域名
+       */
+      resolveIpv4(hostname: string): Promise<string[]>;
+
+      /**
+       * 解析IPv6地址
+       * @param hostname 域名
+       */
+      resolveIpv6(hostname: string): Promise<string[]>;
+
+      /**
+       * 解析MX记录
+       * @param hostname 域名
+       */
+      resolveMxRecords(
+        hostname: string
+      ): Promise<{ priority: number; exchange: string }[]>;
+
+      /**
+       * 解析TXT记录
+       * @param hostname 域名
+       */
+      resolveTxtRecords(hostname: string): Promise<string[]>;
+
+      /**
+       * 解析NS记录
+       * @param hostname 域名
+       */
+      resolveNsRecords(hostname: string): Promise<string[]>;
+
+      /**
+       * 解析CNAME记录
+       * @param hostname 域名
+       */
+      resolveCnameRecords(hostname: string): Promise<string[]>;
+
+      /**
+       * 反向解析
+       * @param ip IP地址
+       */
+      reverseResolve(ip: string): Promise<string[]>;
+    };
+  };
+  coding: {
+    /**
+     * Base64编码
+     * @param text 要编码的文本
+     */
+    base64Encode(text: string): string;
+
+    /**
+     * Base64解码
+     * @param text 要解码的文本
+     */
+    base64Decode(text: string): string;
+
+    /**
+     * 十六进制编码
+     * @param text 要编码的文本
+     */
+    hexEncode(text: string): string;
+
+    /**
+     * 十六进制解码
+     * @param text 要解码的文本
+     */
+    hexDecode(text: string): string;
+
+    /**
+     * URL编码
+     * @param text 要编码的文本
+     */
+    urlEncode(text: string): string;
+
+    /**
+     * URL解码
+     * @param text 要解码的文本
+     */
+    urlDecode(text: string): string;
+
+    /**
+     * HTML编码
+     * @param text 要编码的文本
+     */
+    htmlEncode(text: string): string;
+
+    /**
+     * HTML解码
+     * @param text 要解码的文本
+     */
+    htmlDecode(text: string): string;
+
+    /**
+     * 对称加密
+     * @param config 加密配置
+     * @param config.text 要加密的文本
+     * @param config.key 密钥
+     * @param config.algorithm 加密算法：aes-128-cbc, aes-192-cbc, aes-256-cbc, des-cbc, des3-cbc
+     * @param config.mode 操作模式：encrypt-加密，decrypt-解密
+     * @param config.encoding 输出编码：base64, hex
+     */
+    symmetricCrypto(config: {
+      text: string;
+      key: string;
+      algorithm:
+        | "aes-128-cbc"
+        | "aes-192-cbc"
+        | "aes-256-cbc"
+        | "des-cbc"
+        | "des3-cbc";
+      mode: "encrypt" | "decrypt";
+      encoding?: "base64" | "hex";
+    }): string;
+
+    /**
+     * 非对称加密
+     * @param config 加密配置
+     * @param config.text 要加密的文本
+     * @param config.key 密钥(公钥或私钥)
+     * @param config.algorithm 加密算法：rsa, sm2
+     * @param config.mode 操作模式：encrypt-加密，decrypt-解密，sign-签名，verify-验签
+     * @param config.encoding 输出编码：base64, hex
+     * @param config.padding 填充方式：pkcs1, pkcs1_oaep
+     */
+    asymmetricCrypto(config: {
+      text: string;
+      key: string;
+      algorithm: "rsa" | "sm2";
+      mode: "encrypt" | "decrypt" | "sign" | "verify";
+      encoding?: "base64" | "hex";
+      padding?: "pkcs1" | "pkcs1_oaep";
+    }): string;
+
+    /**
+     * MD5哈希
+     * @param text 要计算哈希的文本
+     */
+    md5Hash(text: string): string;
+
+    /**
+     * SHA1哈希
+     * @param text 要计算哈希的文本
+     */
+    sha1Hash(text: string): string;
+
+    /**
+     * SHA256哈希
+     * @param text 要计算哈希的文本
+     */
+    sha256Hash(text: string): string;
+
+    /**
+     * SHA512哈希
+     * @param text 要计算哈希的文本
+     */
+    sha512Hash(text: string): string;
+
+    /**
+     * SM3哈希
+     * @param text 要计算哈希的文本
+     */
+    sm3Hash(text: string): string;
+  };
+  math: {
+    /**
+     * 基础运算功能
+     */
+    basic: {
+      /**
+       * 计算表达式
+       * @param expression 算术表达式
+       */
+      evaluate(expression: string): number;
+
+      /**
+       * 计算阶乘
+       * @param n 非负整数
+       */
+      factorial(n: number): number;
+
+      /**
+       * 计算绝对值
+       * @param x 数字
+       */
+      abs(x: number): number;
+
+      /**
+       * 向上取整
+       * @param x 数字
+       */
+      ceil(x: number): number;
+
+      /**
+       * 向下取整
+       * @param x 数字
+       */
+      floor(x: number): number;
+
+      /**
+       * 四舍五入
+       * @param x 数字
+       * @param decimals 保留小数位数
+       */
+      round(x: number, decimals?: number): number;
+
+      /**
+       * 计算平方根
+       * @param x 非负数
+       */
+      sqrt(x: number): number;
+
+      /**
+       * 计算幂
+       * @param base 底数
+       * @param exponent 指数
+       */
+      pow(base: number, exponent: number): number;
+
+      /**
+       * 计算对数
+       * @param x 正数
+       * @param base 底数，默认为自然对数e
+       */
+      log(x: number, base?: number): number;
+    };
+
+    /**
+     * 统计计算功能
+     */
+    statistics: {
+      /**
+       * 计算平均值
+       * @param data 数据集合
+       */
+      mean(data: number[]): number;
+
+      /**
+       * 计算中位数
+       * @param data 数据集合
+       */
+      median(data: number[]): number;
+
+      /**
+       * 计算众数
+       * @param data 数据集合
+       */
+      mode(data: number[]): number[];
+
+      /**
+       * 计算方差
+       * @param data 数据集合
+       */
+      variance(data: number[]): number;
+
+      /**
+       * 计算标准差
+       * @param data 数据集合
+       */
+      standardDeviation(data: number[]): number;
+
+      /**
+       * 计算极差
+       * @param data 数据集合
+       */
+      range(data: number[]): number;
+
+      /**
+       * 计算四分位数
+       * @param data 数据集合
+       */
+      quartiles(data: number[]): {
+        Q1: number;
+        Q2: number;
+        Q3: number;
+        IQR: number;
+      };
+    };
+
+    /**
+     * 几何计算功能
+     */
+    geometry: {
+      /**
+       * 圆形计算
+       * @param radius 半径
+       */
+      circle(radius: number): {
+        area: number; // 面积
+        perimeter: number; // 周长
+        diameter: number; // 直径
+      };
+
+      /**
+       * 矩形计算
+       * @param width 宽度
+       * @param height 高度
+       */
+      rectangle(
+        width: number,
+        height: number
+      ): {
+        area: number; // 面积
+        perimeter: number; // 周长
+        diagonal: number; // 对角线长度
+      };
+
+      /**
+       * 三角形计算
+       * @param a 边长a
+       * @param b 边长b
+       * @param c 边长c
+       */
+      triangle(
+        a: number,
+        b: number,
+        c: number
+      ): {
+        area: number; // 面积
+        perimeter: number; // 周长
+        angles: {
+          // 三个角的度数
+          A: number;
+          B: number;
+          C: number;
+        };
+        type: string; // 三角形类型
+        inradius: number; // 内切圆半径
+        circumradius: number; // 外接圆半径
+      };
+    };
+
+    /**
+     * 三角函数功能
+     */
+    trigonometry: {
+      /**
+       * 角度转弧度
+       * @param degrees 角度
+       */
+      degreesToRadians(degrees: number): number;
+
+      /**
+       * 弧度转角度
+       * @param radians 弧度
+       */
+      radiansToDegrees(radians: number): number;
+
+      /**
+       * 正弦函数
+       * @param angle 角度
+       * @param useRadians 是否使用弧度
+       */
+      sin(angle: number, useRadians?: boolean): number;
+
+      /**
+       * 余弦函数
+       * @param angle 角度
+       * @param useRadians 是否使用弧度
+       */
+      cos(angle: number, useRadians?: boolean): number;
+
+      /**
+       * 正切函数
+       * @param angle 角度
+       * @param useRadians 是否使用弧度
+       */
+      tan(angle: number, useRadians?: boolean): number;
+
+      /**
+       * 反正弦函数
+       * @param value 正弦值
+       * @param returnRadians 是否返回弧度
+       */
+      asin(value: number, returnRadians?: boolean): number;
+
+      /**
+       * 反余弦函数
+       * @param value 余弦值
+       * @param returnRadians 是否返回弧度
+       */
+      acos(value: number, returnRadians?: boolean): number;
+
+      /**
+       * 反正切函数
+       * @param value 正切值
+       * @param returnRadians 是否返回弧度
+       */
+      atan(value: number, returnRadians?: boolean): number;
+
+      /**
+       * 双参数反正切函数
+       * @param y y坐标
+       * @param x x坐标
+       * @param returnRadians 是否返回弧度
+       */
+      atan2(y: number, x: number, returnRadians?: boolean): number;
+
+      /**
+       * 双曲正弦函数
+       * @param x 输入值
+       */
+      sinh(x: number): number;
+
+      /**
+       * 双曲余弦函数
+       * @param x 输入值
+       */
+      cosh(x: number): number;
+
+      /**
+       * 双曲正切函数
+       * @param x 输入值
+       */
+      tanh(x: number): number;
+    };
+
+    /**
+     * 随机数功能
+     */
+    random: {
+      /**
+       * 生成随机数
+       * @param min 最小值
+       * @param max 最大值
+       * @param count 生成数量
+       * @param decimals 小数位数
+       */
+      number(
+        min: number,
+        max: number,
+        count?: number,
+        decimals?: number
+      ): number | number[];
+
+      /**
+       * 生成随机整数
+       * @param min 最小值
+       * @param max 最大值
+       * @param count 生成数量
+       */
+      integer(min: number, max: number, count?: number): number | number[];
+    };
+
+    /**
+     * 进制转换功能
+     */
+    conversion: {
+      /**
+       * 进制转换
+       * @param value 要转换的值
+       * @param fromBase 源进制：binary-二进制，octal-八进制，decimal-十进制，hex-十六进制
+       * @param toBase 目标进制：binary-二进制，octal-八进制，decimal-十进制，hex-十六进制
+       */
+      base(
+        value: string | number,
+        fromBase: "binary" | "octal" | "decimal" | "hex",
+        toBase: "binary" | "octal" | "decimal" | "hex"
+      ): string;
+    };
+  };
+  audio: {
+    /**
+     * 语音朗读功能
+     */
+    speech: {
+      /**
+       * 朗读文本
+       * @param text 要朗读的文本
+       * @param options 朗读选项
+       * @param options.voice 语音
+       * @param options.rate 语速(0.1-10)
+       * @param options.pitch 音调(0-2)
+       * @param options.volume 音量(0-1)
+       */
+      speak(
+        text: string,
+        options?: {
+          voice?: string;
+          rate?: number;
+          pitch?: number;
+          volume?: number;
+        }
+      ): Promise<void>;
+
+      /**
+       * 停止朗读
+       */
+      stop(): void;
+    };
+
+    /**
+     * 音频媒体功能
+     */
+    media: {
+      /**
+       * 播放音频文件
+       * @param file 音频文件路径
+       * @param volume 音量(0-1)
+       * @param loop 是否循环播放
+       * @param autoplay 是否自动播放
+       */
+      play(
+        file: string,
+        volume?: number,
+        loop?: boolean,
+        autoplay?: boolean
+      ): Promise<void>;
+
+      /**
+       * 停止音频播放
+       */
+      stop(): void;
+
+      /**
+       * 播放系统音效
+       * @param type 音效类型：beep-提示音，error-错误音，warning-警告音，notification-通知音，complete-完成音，click-点击音
+       * @param volume 音量(0-1)
+       */
+      beep(
+        type?:
+          | "beep"
+          | "error"
+          | "warning"
+          | "notification"
+          | "complete"
+          | "click",
+        volume?: number
+      ): Promise<void>;
+
+      /**
+       * 分析音频文件
+       * @param file 音频文件路径
+       */
+      analyze(file: string): Promise<{
+        duration: number; // 时长(秒)
+        sampleRate: number; // 采样率
+        channels: number; // 声道数
+        format: string; // 格式
+      }>;
+    };
+
+    /**
+     * 录音功能
+     * @param options 录音选项
+     * @param options.duration 录制时长(毫秒)
+     * @param options.savePath 保存路径
+     */
+    record(options?: { duration?: number; savePath?: string }): Promise<string>;
+  };
+  image: {
+    /**
+     * 分析图片信息
+     * @param file 图片文件路径
+     */
+    analyze(file: string): Promise<{
+      width: number; // 宽度(像素)
+      height: number; // 高度(像素)
+      format: string; // 图片格式
+      size: number; // 文件大小(字节)
+      exif?: {
+        // EXIF信息(仅JPEG格式)
+        image?: any; // 图像信息
+        thumbnail?: any; // 缩略图信息
+        exif?: any; // EXIF信息
+        gps?: any; // GPS信息
+      };
+    }>;
+
+    /**
+     * 调整图片大小
+     * @param inputFile 输入文件路径
+     * @param outputFile 输出文件路径
+     * @param width 目标宽度(像素)
+     * @param height 目标高度(像素)
+     * @param keepAspectRatio 是否保持宽高比
+     * @param quality 图片质量(0-1)
+     */
+    resize(
+      inputFile: string,
+      outputFile: string,
+      width?: number,
+      height?: number,
+      keepAspectRatio?: boolean,
+      quality?: number
+    ): Promise<void>;
+
+    /**
+     * 旋转图片
+     * @param inputFile 输入文件路径
+     * @param outputFile 输出文件路径
+     * @param angle 旋转角度
+     * @param quality 图片质量(0-1)
+     */
+    rotate(
+      inputFile: string,
+      outputFile: string,
+      angle?: number,
+      quality?: number
+    ): Promise<void>;
+
+    /**
+     * 裁剪图片
+     * @param inputFile 输入文件路径
+     * @param outputFile 输出文件路径
+     * @param x 起始X坐标
+     * @param y 起始Y坐标
+     * @param width 裁剪宽度
+     * @param height 裁剪高度
+     * @param quality 图片质量(0-1)
+     */
+    crop(
+      inputFile: string,
+      outputFile: string,
+      x?: number,
+      y?: number,
+      width?: number,
+      height?: number,
+      quality?: number
+    ): Promise<void>;
+
+    /**
+     * 添加水印
+     * @param inputFile 输入文件路径
+     * @param outputFile 输出文件路径
+     * @param text 水印文字
+     * @param font 字体设置
+     * @param color 文字颜色
+     * @param position 位置(topLeft-左上角，topRight-右上角，bottomLeft-左下角，bottomRight-右下角，center-居中)
+     * @param margin 边距
+     * @param opacity 不透明度(0-1)
+     * @param quality 图片质量(0-1)
+     */
+    watermark(
+      inputFile: string,
+      outputFile: string,
+      text?: string,
+      font?: string,
+      color?: string,
+      position?:
+        | "topLeft"
+        | "topRight"
+        | "bottomLeft"
+        | "bottomRight"
+        | "center",
+      margin?: number,
+      opacity?: number,
+      quality?: number
+    ): Promise<void>;
+
+    /**
+     * 格式转换
+     * @param inputFile 输入文件路径
+     * @param outputFile 输出文件路径
+     * @param format 输出格式(jpeg/png/webp)
+     * @param quality 图片质量(0-1)
+     */
+    convert(
+      inputFile: string,
+      outputFile: string,
+      format?: "jpeg" | "png" | "webp",
+      quality?: number
+    ): Promise<void>;
+
+    /**
+     * PNG转图标
+     * @param input PNG文件路径或Base64字符串
+     * @param outputDir 输出目录
+     * @param type 输出类型(ico/icns)
+     */
+    pngToIcon(
+      input: string | string[],
+      outputDir: string,
+      type?: "ico" | "icns"
+    ): void;
+  };
+  windows: {
+    /**
+     * 窗口操作功能
+     */
+    window: {
+      /**
+       * 获取窗口信息
+       * @param method 查找方式：title-标题，handle-句柄，process-进程名，class-类名，active-活动窗口
+       * @param window 窗口标题、句柄、进程名或类名
+       */
+      getWindowInfo(
+        method: "title" | "handle" | "process" | "class" | "active",
+        window?: string
+      ): Promise<
+        {
+          handle: string; // 窗口句柄
+          title: string; // 窗口标题
+          className: string; // 窗口类名
+          processId: number; // 进程ID
+          processName: string; // 进程名称
+          x: number; // 窗口X坐标
+          y: number; // 窗口Y坐标
+          width: number; // 窗口宽度
+          height: number; // 窗口高度
+          isVisible: boolean; // 是否可见
+          isMinimized: boolean; // 是否最小化
+          isMaximized: boolean; // 是否最大化
+        }[]
+      >;
+
+      /**
+       * 设置窗口置顶
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param isTopMost 是否置顶
+       */
+      setTopMost(
+        windowHandle?: string,
+        isTopMost?: boolean
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置窗口透明度
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param opacity 透明度(0-100)
+       */
+      setOpacity(
+        windowHandle?: string,
+        opacity?: number
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置窗口位置和大小
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param x X坐标
+       * @param y Y坐标
+       * @param width 宽度
+       * @param height 高度
+       */
+      setWindowRect(
+        windowHandle?: string,
+        x?: number,
+        y?: number,
+        width?: number,
+        height?: number
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置窗口状态
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param state 窗口状态：maximize-最大化，minimize-最小化，normal-还原
+       */
+      setWindowState(
+        windowHandle?: string,
+        state?: "maximize" | "minimize" | "normal"
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 关闭窗口
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       */
+      closeWindow(
+        windowHandle?: string
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置窗口焦点
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       */
+      setFocus(
+        windowHandle?: string
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置窗口边框
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param hasBorder 是否显示边框
+       */
+      setBorder(
+        windowHandle?: string,
+        hasBorder?: boolean
+      ): Promise<{ success: boolean; error?: string }>;
+
+      /**
+       * 设置点击穿透
+       * @param windowHandle 窗口句柄，为空时操作当前活动窗口
+       * @param isTransparent 是否启用点击穿透
+       */
+      setClickThrough(
+        windowHandle?: string,
+        isTransparent?: boolean
+      ): Promise<{ success: boolean; error?: string }>;
+    };
+
+    /**
+     * 进程管理功能
+     */
+    process: {
+      /**
+       * 获取进程列表
+       */
+      listProcesses(): Promise<
+        {
+          pid: number; // 进程ID
+          name: string; // 进程名称
+          title: string; // 进程标题
+          path: string; // 进程路径
+          memory: number; // 内存使用(字节)
+          cpu: number; // CPU使用率
+          threads: number; // 线程数
+          handles: number; // 句柄数
+        }[]
+      >;
+
+      /**
+       * 结束进程
+       * @param pid 进程ID
+       */
+      killProcess(pid: number): Promise<boolean>;
+
+      /**
+       * 启动进程
+       * @param path 程序路径
+       * @param args 启动参数
+       */
+      startProcess(path: string, args?: string[]): Promise<number>;
+    };
+
+    /**
+     * 注册表操作功能
+     */
+    registry: {
+      /**
+       * 列出注册表项
+       * @param path 注册表路径
+       */
+      listKeys(path: string): Promise<string[]>;
+
+      /**
+       * 获取注册表值
+       * @param path 注册表路径
+       * @param name 值名称
+       */
+      getValue(path: string, name?: string): Promise<any>;
+
+      /**
+       * 设置注册表值
+       * @param path 注册表路径
+       * @param name 值名称
+       * @param value 值内容
+       * @param type 值类型：string-字符串，expandstring-可扩展字符串，binary-二进制，dword-DWORD，qword-QWORD，multistring-多字符串
+       */
+      setValue(
+        path: string,
+        name: string,
+        value: any,
+        type?:
+          | "string"
+          | "expandstring"
+          | "binary"
+          | "dword"
+          | "qword"
+          | "multistring"
+      ): Promise<boolean>;
+    };
+
+    /**
+     * 系统服务管理功能
+     */
+    service: {
+      /**
+       * 获取服务列表
+       */
+      listServices(): Promise<
+        {
+          name: string; // 服务名称
+          displayName: string; // 显示名称
+          description: string; // 服务描述
+          status: string; // 服务状态
+          startType: string; // 启动类型
+          account: string; // 登录账户
+          canStop: boolean; // 是否可停止
+          canPause: boolean; // 是否可暂停
+        }[]
+      >;
+
+      /**
+       * 启动服务
+       * @param name 服务名称
+       */
+      startService(name: string): Promise<boolean>;
+
+      /**
+       * 停止服务
+       * @param name 服务名称
+       */
+      stopService(name: string): Promise<boolean>;
+
+      /**
+       * 重启服务
+       * @param name 服务名称
+       */
+      restartService(name: string): Promise<boolean>;
+    };
+
+    /**
+     * 软件管理功能
+     */
+    software: {
+      /**
+       * 获取已安装软件列表
+       */
+      listSoftware(): Promise<
+        {
+          name: string; // 软件名称
+          version: string; // 软件版本
+          publisher: string; // 发布者
+          installDate: string; // 安装日期
+          installLocation: string; // 安装位置
+          uninstallString: string; // 卸载命令
+        }[]
+      >;
+
+      /**
+       * 卸载软件
+       * @param id 软件ID
+       */
+      uninstallSoftware(id: string): Promise<boolean>;
+    };
+
+    /**
+     * 系统工具功能
+     */
+    utils: {
+      /**
+       * 设置壁纸
+       * @param path 图片路径
+       */
+      setWallpaper(path: string): Promise<boolean>;
+
+      /**
+       * 控制显示器
+       * @param action 操作类型：on-开启，off-关闭
+       */
+      controlMonitor(action: "on" | "off"): Promise<boolean>;
+
+      /**
+       * 电源控制
+       * @param action 操作类型：sleep-睡眠，hibernate-休眠，awake-保持唤醒，normal-正常
+       */
+      powerControl(
+        action: "sleep" | "hibernate" | "awake" | "normal"
+      ): Promise<boolean>;
+
+      /**
+       * 配置网络
+       * @param adapter 网卡名称
+       * @param config 网络配置
+       */
+      configureNetwork(
+        adapter: string,
+        config: {
+          ip: string; // IP地址
+          subnet: string; // 子网掩码
+          gateway?: string; // 默认网关
+          dns?: string | string[]; // DNS服务器
+        }
+      ): Promise<boolean>;
+
+      /**
+       * 管理开机启动项
+       * @param path 程序路径
+       * @param name 启动项名称
+       * @param remove 是否移除
+       */
+      manageStartup(
+        path: string,
+        name: string,
+        remove?: boolean
+      ): Promise<boolean>;
+
+      /**
+       * 创建快捷方式
+       * @param target 目标路径
+       * @param link 快捷方式路径
+       * @param args 启动参数
+       */
+      createShortcut(
+        target: string,
+        link: string,
+        args?: string
+      ): Promise<boolean>;
+    };
+  };
+  macos: {
+    /**
+     * 应用程序控制功能
+     */
+    app: {
+      /**
+       * 获取前台应用信息
+       */
+      getFrontmost(): Promise<{
+        name: string; // 应用名称
+        displayedName: string; // 显示名称
+        path: string; // 应用路径
+        version: string; // 应用版本
+        pid: number; // 进程ID
+        backgroundOnly: boolean; // 是否后台运行
+        visible: boolean; // 是否可见
+        frontmost: boolean; // 是否前台
+        window?: {
+          // 窗口信息
+          name: string; // 窗口名称
+          title: string; // 窗口标题
+          index: number; // 窗口索引
+          position: [number, number]; // 窗口位置
+          size: [number, number]; // 窗口大小
+          minimized: boolean; // 是否最小化
+          fullscreen: boolean; // 是否全屏
+        };
+      }>;
+
+      /**
+       * 获取运行中的应用列表
+       */
+      getRunningApps(): Promise<
+        {
+          name: string; // 应用名称
+          displayedName: string; // 显示名称
+          path: string; // // 应用路径
+          version: string; // 应用版本
+          pid: number; // 进程ID
+          backgroundOnly: boolean; // 是否后台运行
+          visible: boolean; // 是否可见
+          frontmost: boolean; // 是否前台
+        }[]
+      >;
+
+      /**
+       * 启动应用
+       * @param appName 应用名称
+       */
+      launch(appName: string): Promise<void>;
+
+      /**
+       * 退出应用
+       * @param appName 应用名称
+       */
+      quit(appName: string): Promise<void>;
+
+      /**
+       * 隐藏应用
+       * @param appName 应用名称
+       */
+      hide(appName: string): Promise<void>;
+
+      /**
+       * 显示应用
+       * @param appName 应用名称
+       */
+      show(appName: string): Promise<void>;
+
+      /**
+       * 最小化窗口
+       * @param appName 应用名称
+       */
+      minimize(appName: string): Promise<void>;
+
+      /**
+       * 最大化窗口
+       * @param appName 应用名称
+       */
+      maximize(appName: string): Promise<void>;
+
+      /**
+       * 获取窗口信息
+       * @param appName 应用名称
+       */
+      getWindows(appName: string): Promise<
+        {
+          name: string; // 窗口名称
+          title: string; // 窗口标题
+          index: number; // 窗口索引
+          position: [number, number]; // 窗口位置
+          size: [number, number]; // 窗口大小
+          minimized: boolean; // 是否最小化
+          fullscreen: boolean; // 是否全屏
+        }[]
+      >;
+
+      /**
+       * 获取应用脚本字典
+       * @param appName 应用名称
+       */
+      getScriptDictionary(appName: string): Promise<{
+        commands: {
+          name: string; // 命令名称
+          description: string; // 命令描述
+          parameters: {
+            // 参数列表
+            name: string; // 参数名称
+            description: string; // 参数描述
+            type: string; // 参数类型
+            optional: boolean; // 是否可选
+          }[];
+          result?: {
+            // 返回值
+            type: string; // 返回类型
+            description: string; // 返回值描述
+          };
+          usage: string; // 使用示例
+        }[];
+        properties: {
+          name: string; // 属性名称
+          description: string; // 属性描述
+          access: string; // 访问权限
+          type: string; // 属性类型
+          usage: string; // 使用示例
+        }[];
+        summary: {
+          totalCommands: number; // 命令总数
+          totalProperties: number; // 属性总数
+          hasScriptingSupport: boolean; // 是否支持脚本
+        };
+        error?: string; // 错误信息
+      }>;
+    };
+
+    /**
+     * 系统控制功能
+     */
+    system: {
+      /**
+       * 设置系统音量
+       * @param volume 音量大小(0-100)
+       */
+      setVolume(volume: number): Promise<void>;
+
+      /**
+       * 锁定屏幕
+       */
+      lockScreen(): Promise<void>;
+
+      /**
+       * 进入睡眠
+       */
+      sleep(): Promise<void>;
+
+      /**
+       * 设置Dock位置
+       * @param position 位置：bottom-底部，left-左侧，right-右侧
+       */
+      setDockPosition(position: "bottom" | "left" | "right"): Promise<void>;
+
+      /**
+       * 设置Dock大小
+       * @param size 大小(16-128)
+       */
+      setDockSize(size: number): Promise<void>;
+
+      /**
+       * 设置Dock自动隐藏
+       * @param enabled 是否启用
+       */
+      toggleDockAutohide(enabled: boolean): Promise<void>;
+
+      /**
+       * 设置菜单栏自动隐藏
+       * @param enabled 是否启用
+       */
+      toggleMenuBarAutohide(enabled: boolean): Promise<void>;
+
+      /**
+       * 切换深色模式
+       * @param enabled 是否启用
+       */
+      toggleDarkMode(enabled: boolean): Promise<void>;
+    };
+
+    /**
+     * 访达操作功能
+     */
+    finder: {
+      /**
+       * 获取选中项
+       */
+      getSelection(): Promise<
+        {
+          name: string; // 文件名
+          path: string; // 文件路径
+          kind: string; // 文件类型
+          size: number; // 文件大小
+          created: string; // 创建时间
+          modified: string; // 修改时间
+        }[]
+      >;
+
+      /**
+       * 获取当前文件夹
+       */
+      getCurrentFolder(): Promise<{
+        name: string; // 文件夹名
+        path: string; // 文件夹路径
+        kind: string; // 类型
+        created: string; // 创建时间
+        modified: string; // 修改时间
+      }>;
+
+      /**
+       * 设置显示隐藏文件
+       * @param show 是否显示
+       */
+      setShowHiddenFiles(show: boolean): Promise<void>;
+
+      /**
+       * 获取窗口列表
+       */
+      getWindows(): Promise<
+        {
+          name: string; // 窗口名称
+          index: number; // 窗口索引
+          bounds: string; // 窗口边界
+          target: string; // 目标路径
+        }[]
+      >;
+
+      /**
+       * 激活指定窗口
+       * @param index 窗口索引
+       */
+      activateWindow(index: number): Promise<void>;
+    };
+  };
+  status: {
+    /**
+     * 获取选中的文本
+     */
+    getSelectedText(): Promise<string>;
+
+    /**
+     * 获取选中的图片
+     */
+    getSelectedImage(): Promise<{
+      path: string; // 图片路径
+      base64: string; // Base64编码
+      width: number; // 宽度
+      height: number; // 高度
+      size: number; // 文件大小
+      format: string; // 图片格式
+    }>;
+
+    /**
+     * 获取选中的文件
+     */
+    getSelectedFiles(): Promise<
+      {
+        name: string; // 文件名
+        path: string; // 文件路径
+        type: string; // 文件类型
+        size: number; // 文件大小
+        created: string; // 创建时间
+        modified: string; // 修改时间
+        isDirectory: boolean; // 是否是目录
+      }[]
+    >;
+  };
+  browser: {
+    /**
+     * 浏览器实例管理
+     */
+    startClient(options: {
+      browserType?: "msedge" | "chrome"; // 浏览器类型
+      useSingleUserDataDir?: boolean; // 是否使用单独的用户数据目录
+      headless?: boolean; // 是否使用无头模式
+      incognito?: boolean; // 是否使用隐身模式
+    }): Promise<void>;
+
+    /**
+     * 关闭浏览器实例
+     * @param port 浏览器实例端口
+     */
+    destroyClientByPort(port?: number): Promise<void>;
+
+    /**
+     * 获取所有浏览器实例端口
+     */
+    getClientPorts(): Promise<number[]>;
+
+    /**
+     * 获取当前操控的实例端口
+     */
+    getCurrentClientPort(): Promise<number>;
+
+    /**
+     * 切换要操控的实例
+     * @param port 浏览器实例端口
+     */
+    switchClientByPort(port: number): Promise<void>;
+
+    /**
+     * 标签页管理
+     */
+    getTabs(): Promise<
+      {
+        url: string; // 标签页URL
+        title: string; // 标签页标题
+        id: string; // 标签页ID
+      }[]
+    >;
+
+    /**
+     * 激活标签页
+     * @param tab 标签页配置
+     */
+    activateTab(tab: {
+      by?: "active" | "url" | "title" | "id"; // 查找方式
+      searchValue?: string; // 查找值
+    }): Promise<void>;
+
+    /**
+     * 获取当前标签页
+     */
+    getCurrentTab(): Promise<{
+      url: string; // 标签页URL
+      title: string; // 标签页标题
+      id: string; // 标签页ID
+    }>;
+
+    /**
+     * 创建新标签页
+     * @param url 要打开的URL
+     */
+    createNewTab(url?: string): Promise<{
+      url: string; // 标签页URL
+      title: string; // 标签页标题
+      id: string; // 标签页ID
+    }>;
+
+    /**
+     * 关闭标签页
+     * @param tab 标签页配置
+     */
+    closeTab(tab: {
+      by?: "active" | "url" | "title" | "id"; // 查找方式
+      searchValue?: string; // 查找值
+    }): Promise<void>;
+
+    /**
+     * 设备模拟
+     */
+    device: {
+      /**
+       * 使用预设设备
+       * @param tab 标签页配置
+       * @param deviceName 设备名称
+       */
+      setDevice(
+        tab: {
+          by?: "active" | "url" | "title" | "id";
+          searchValue?: string;
+        },
+        deviceName: string
+      ): Promise<void>;
+
+      /**
+       * 自定义设备
+       * @param tab 标签页配置
+       * @param config 设备配置
+       */
+      setCustomDevice(
+        tab: {
+          by?: "active" | "url" | "title" | "id";
+          searchValue?: string;
+        },
+        config: {
+          width: number; // 设备宽度
+          height: number; // 设备高度
+          deviceScaleFactor: number; // 设备缩放比例
+          mobile: boolean; // 是否为移动设备
+          userAgent?: string; // User-Agent
+        }
+      ): Promise<void>;
+
+      /**
+       * 清除设备模拟
+       * @param tab 标签页配置
+       */
+      clearDeviceEmulation(tab: {
+        by?: "active" | "url" | "title" | "id";
+        searchValue?: string;
+      }): Promise<void>;
+    };
+
+    /**
+     * 网络请求拦截
+     */
+    network: {
+      /**
+       * 修改请求
+       * @param tab 标签页配置
+       * @param rules 拦截规则
+       */
+      setRequestInterception(
+        tab: {
+          by?: "active" | "url" | "title" | "id";
+          searchValue?: string;
+        },
+        rules: {
+          url: string; // 要拦截的URL
+          headers?: Record<string, string>; // 要修改的请求头
+          method?: string; // 要修改的请求方法
+          postData?: string; // 要修改的请求体
+        }[]
+      ): Promise<void>;
+
+      /**
+       * 修改响应
+       * @param tab 标签页配置
+       * @param rules 拦截规则
+       */
+      setResponseInterception(
+        tab: {
+          by?: "active" | "url" | "title" | "id";
+          searchValue?: string;
+        },
+        rules: {
+          url: string; // 要拦截的URL
+          statusCode?: number; // 要修改的状态码
+          pattern?: string; // 要修改的响应内容
+          replacement?: string; // 替换内容
+        }[]
+      ): Promise<void>;
+
+      /**
+       * 清除所有拦截规则
+       * @param tab 标签页配置
+       */
+      clearInterception(tab: {
+        by?: "active" | "url" | "title" | "id";
+        searchValue?: string;
+      }): Promise<void>;
+    };
+
+    /**
+     * 截图功能
+     * @param tab 标签页配置
+     * @param options 截图选项
+     */
+    captureScreenshot(
+      tab: {
+        by?: "active" | "url" | "title" | "id";
+        searchValue?: string;
+      },
+      options?: {
+        type?: "png" | "jpeg"; // 图片类型
+        quality?: number; // 图片质量(仅jpeg)
+        fullPage?: boolean; // 是否截取完整页面
+        clip?: {
+          // 裁剪区域
+          x: number;
+          y: number;
+          width: number;
+          height: number;
+        };
+        encoding?: "base64" | "binary"; // 编码方式
+        path?: string; // 保存路径
+      }
+    ): Promise<string>;
+
+    /**
+     * 获取当前URL
+     */
+    getUrl(): Promise<string>;
+
+    /**
+     * 设置URL
+     * @param url 要设置的URL
+     */
+    setUrl(url: string): Promise<void>;
+
+    /**
+     * 执行JavaScript代码
+     * @param script 要执行的JavaScript代码
+     */
+    executeScript(script: string): Promise<any>;
+
+    /**
+     * 点击元素
+     * @param selector CSS选择器
+     */
+    clickElement(selector: string): Promise<void>;
+
+    /**
+     * 输入文本
+     * @param selector CSS选择器
+     * @param text 要输入的文本
+     */
+    inputText(selector: string, text: string): Promise<void>;
+
+    /**
+     * 获取文本内容
+     * @param selector CSS选择器
+     */
+    getText(selector: string): Promise<string>;
+
+    /**
+     * 获取HTML内容
+     * @param selector CSS选择器
+     */
+    getHtml(selector: string): Promise<string>;
+
+    /**
+     * 隐藏元素
+     * @param selector CSS选择器
+     */
+    hideElement(selector: string): Promise<void>;
+
+    /**
+     * 显示元素
+     * @param selector CSS选择器
+     */
+    showElement(selector: string): Promise<void>;
+
+    /**
+     * 注入CSS样式
+     * @param css CSS样式代码
+     */
+    injectCSS(css: string): Promise<void>;
+
+    /**
+     * 设置Cookie
+     * @param name Cookie名称
+     * @param value Cookie值
+     */
+    setCookie(name: string, value: string): Promise<void>;
+
+    /**
+     * 获取Cookie
+     * @param name Cookie名称
+     */
+    getCookie(name: string): Promise<string>;
+
+    /**
+     * 删除Cookie
+     * @param name Cookie名称
+     */
+    deleteCookie(name: string): Promise<void>;
+
+    /**
+     * 滚动到指定位置
+     * @param x X坐标
+     * @param y Y坐标
+     */
+    scrollTo(x: number, y: number): Promise<void>;
+
+    /**
+     * 滚动到指定元素
+     * @param selector CSS选择器
+     */
+    scrollToElement(selector: string): Promise<void>;
+
+    /**
+     * 获取滚动位置
+     */
+    getScrollPosition(): Promise<{
+      x: number; // X坐标
+      y: number; // Y坐标
+    }>;
+
+    /**
+     * 获取页面尺寸
+     */
+    getPageSize(): Promise<{
+      width: number; // 页面宽度
+      height: number; // 页面高度
+    }>;
+
+    /**
+     * 等待元素出现
+     * @param selector CSS选择器
+     * @param timeout 超时时间(毫秒)
+     */
+    waitForElement(selector: string, timeout?: number): Promise<void>;
+  };
+}

From 932b828de0a01ab139f1d989eb6335992a050a5d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 17:36:11 +0800
Subject: [PATCH 131/332] =?UTF-8?q?=E4=BC=98=E5=8C=96CodeEditor=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E9=AB=98=E4=BA=AE=E5=A4=84=E7=90=86=EF=BC=9A=E6=8A=BD?=
 =?UTF-8?q?=E5=8F=96=E8=AF=AD=E8=A8=80=E6=98=A0=E5=B0=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=B0=E7=8B=AC=E7=AB=8B=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CodeEditor.vue | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/composer/common/CodeEditor.vue
index a84358fe..0bf47308 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/composer/common/CodeEditor.vue
@@ -15,11 +15,6 @@ import { toRaw } from "vue";
 import importAll from "js/common/importAll.js";
 import { defineComponent } from "vue";
 
-// 批量导入声明文件
-let apis = importAll(
-  require.context("!raw-loader!plugins/monaco/types/", false, /\.ts$/)
-);
-
 // 批量导入关键字补全
 let languageCompletions = importAll(
   require.context("plugins/monaco/completions/", false, /\.js$/)
@@ -161,9 +156,7 @@ export default defineComponent({
       immediate: true,
       handler(newValue) {
         if (this.editor) {
-          const language = ["webjavascript", "quickcommand"].includes(newValue)
-            ? "javascript"
-            : newValue;
+          const language = this.getHighlighter(newValue);
           monaco.editor.setModelLanguage(this.rawEditor().getModel(), language);
           this.loadTypes();
         }
@@ -182,9 +175,7 @@ export default defineComponent({
   methods: {
     // 初始化编辑器
     initEditor() {
-      const language = ["webjavascript", "quickcommand"].includes(this.language)
-        ? "javascript"
-        : this.language;
+      const language = this.getHighlighter(this.language);
 
       const options = {
         ...this.defaultOptions,
@@ -374,6 +365,19 @@ export default defineComponent({
         );
       }
     },
+    getHighlighter(language) {
+      if (
+        ["quickcommand", "javascript", "webjavascript"].includes(
+          language
+        )
+      ) {
+        return "javascript";
+      }
+      if (language === "cmd") {
+        return "bat";
+      }
+      return language;
+    },
   },
   computed: {
     showPlaceholder() {

From 0f020d394a09546b88ddf1d55c9cca1a7e124bc8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 25 Jan 2025 22:00:35 +0800
Subject: [PATCH 132/332] =?UTF-8?q?=E4=B8=BA=E5=87=BD=E6=95=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/flow/FlowManager.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/composer/flow/FlowManager.vue b/src/components/composer/flow/FlowManager.vue
index 6ab47ec4..b137e113 100644
--- a/src/components/composer/flow/FlowManager.vue
+++ b/src/components/composer/flow/FlowManager.vue
@@ -52,6 +52,9 @@
           <div class="section-title">
             <q-icon name="functions" size="16px" />
             <div>函数参数</div>
+            <q-icon name="info" size="12px" class="q-ml-sm">
+              <q-tooltip> 函数的参数，注意不要与局部变量重名 </q-tooltip>
+            </q-icon>
           </div>
           <q-btn
             flat
@@ -94,6 +97,11 @@
           <div class="section-title">
             <q-icon name="data_object" size="16px" />
             <div>局部变量</div>
+            <q-icon name="info" size="12px" class="q-ml-sm">
+              <q-tooltip>
+                会在函数的顶部进行定义，注意赋值时字符串需用引号包裹
+              </q-tooltip>
+            </q-icon>
           </div>
           <q-btn
             flat
@@ -411,4 +419,8 @@ export default defineComponent({
   align-items: center;
   display: flex;
 }
+
+.q-separator {
+  opacity: 0.3;
+}
 </style>

From 208a6a08d91936e437f5d42197c17351691c23a8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 01:36:20 +0800
Subject: [PATCH 133/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8F=98=E9=87=8F=E7=B3=BB=E7=BB=9F=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EOutputEditor=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=B4=E7=81=B5=E6=B4=BB=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E9=85=8D=E7=BD=AE=E5=92=8C=E5=9B=9E=E8=B0=83=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |  57 ++--
 src/components/composer/ComposerFlow.vue      |  51 +--
 src/components/composer/FlowTabs.vue          |  74 +++-
 .../composer/card/CommandButtons.vue          | 101 ++----
 src/components/composer/card/CommandHead.vue  |   9 +-
 src/components/composer/card/OutputEditor.vue | 318 ++++++++++++++++++
 .../composer/common/ButtonGroup.vue           |   8 +-
 .../composer/flow/ComposerButtons.vue         | 107 ++----
 src/js/composer/commands/codingCommand.js     |   8 -
 src/js/composer/commands/dataCommands.js      |   2 -
 src/js/composer/commands/macosCommands.js     |  27 ++
 src/js/composer/commands/networkCommands.js   |   2 -
 src/js/composer/commands/screenCommands.js    |   6 -
 src/js/composer/commands/simulateCommands.js  |   4 -
 src/js/composer/commands/statusCommands.js    |  10 -
 src/js/composer/commands/systemCommands.js    |   4 -
 src/js/composer/commands/uiCommands.js        |  13 +-
 src/js/composer/commands/userdataCommands.js  |   4 -
 src/js/composer/commands/utoolsCommand.js     |  10 -
 src/js/composer/commands/windowsCommands.js   |  17 -
 src/js/composer/generateCode.js               |  39 ++-
 21 files changed, 551 insertions(+), 320 deletions(-)
 create mode 100644 src/components/composer/card/OutputEditor.vue

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 7cfbd92d..eb950310 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -36,7 +36,6 @@
         <CommandHead
           :command="localCommand"
           @update:outputVariable="handleOutputVariableUpdate"
-          @toggle-output="handleToggleOutput"
           @toggle-collapse="handleToggleCollapse"
           @run="runCommand"
           @remove="$emit('remove')"
@@ -96,7 +95,6 @@ import VariableInput from "components/composer/common/VariableInput.vue";
 import MultiParams from "components/composer/MultiParams.vue";
 import CommandHead from "components/composer/card/CommandHead.vue";
 import * as CardComponents from "js/composer/cardComponents";
-import { processVariable } from "js/composer/variableManager";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import ControlCommand from "components/composer/control/ControlCommand.vue";
 
@@ -156,24 +154,28 @@ export default defineComponent({
     return { getCurrentExistingVar };
   },
   methods: {
-    handleOutputVariableUpdate(value) {
-      const result = processVariable({
-        value,
-        existingVars: this.getCurrentExistingVar().map((v) => v.name),
-      });
-
-      if (result.warning) {
-        quickcommand.showMessageBox(result.warning, "info");
-      }
+    handleOutputVariableUpdate(result) {
+      const { outputVariable, mode, functionInfo } = result;
 
-      this.localCommand.outputVariable = result.processedValue;
-    },
-    handleToggleOutput() {
-      this.localCommand.saveOutput = !this.localCommand.saveOutput;
+      if (outputVariable.name || outputVariable.details) {
+        this.localCommand.outputVariable = { ...outputVariable };
+        // 如果是回调模式，添加 callbackFunc 属性
+        if (mode === "callback") {
+          this.localCommand.callbackFunc = functionInfo.name;
+        } else {
+          delete this.localCommand.callbackFunc;
+        }
 
-      // 如果关闭输出，清空变量名
-      if (!this.localCommand.saveOutput) {
-        this.localCommand.outputVariable = null;
+        // 如果是回调函数模式，创建新函数
+        if (mode === "callback" && functionInfo) {
+          this.$emit("add-command", {
+            command: functionInfo,
+            type: "function",
+          });
+        }
+      } else {
+        delete this.localCommand.outputVariable;
+        delete this.localCommand.callbackFunc;
       }
     },
     runCommand() {
@@ -182,9 +184,10 @@ export default defineComponent({
       // 创建一个带临时变量的命令副本
       const tempCommand = {
         ...this.localCommand,
-        outputVariable:
-          this.localCommand.outputVariable || `temp_${Date.now()}`,
-        saveOutput: true,
+        outputVariable: {
+          name: `temp_${Date.now()}`,
+          ...this.localCommand.outputVariable,
+        },
       };
       this.$emit("run", tempCommand);
     },
@@ -234,12 +237,10 @@ export default defineComponent({
     },
     handleAddPrint() {
       // 创建一个打印命令
-      if (!this.localCommand.outputVariable) {
-        this.localCommand.outputVariable = `temp_${parseInt(
-          new Date().getTime() / 1000
-        )}`;
-        this.localCommand.saveOutput = true;
-      }
+      this.localCommand.outputVariable = {
+        name: `temp_${Date.now()}`,
+        ...this.localCommand.outputVariable,
+      };
       const printCommand = {
         value: "console.log",
         label: "显示消息",
@@ -250,7 +251,7 @@ export default defineComponent({
             icon: "info",
           },
         ],
-        argvs: [newVarInputVal("var", this.localCommand.outputVariable)],
+        argvs: [newVarInputVal("var", this.localCommand.outputVariable.name)],
       };
       this.$emit("add-command", {
         command: printCommand,
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 44a062b6..aeff041e 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -293,12 +293,6 @@ export default defineComponent({
         ...parsedAction,
         id: this.getUniqueId(),
       };
-      if (newCommand.saveOutput && newCommand.outputVariable) {
-        newCommand.outputVariable = processVariable({
-          value: newCommand.outputVariable,
-          existingVars: this.getCurrentExistingVar().map((v) => v.name),
-        }).processedValue;
-      }
       return newCommand;
     },
     getUniqueId() {
@@ -351,7 +345,9 @@ export default defineComponent({
           command,
           {
             //没有输出，则不打印
-            code: `if(${command.outputVariable}!==undefined){console.log(${command.outputVariable})}`,
+            code: `if(${command.outputVariable.name}!==undefined){
+              console.log(${command.outputVariable.name})
+            }`,
           },
         ],
       };
@@ -446,24 +442,31 @@ export default defineComponent({
       });
       return newCommands;
     },
-    handleAddCommand({ command, type }, index) {
-      if (type === "chain") {
-        // 如果是复制链式命令
-        const { startIndex, endIndex } = this.getChainIndex(command.chainId);
-        const chainCommands = this.commands.slice(startIndex, endIndex + 1);
-        const newChainCommands = this.copyCommands(chainCommands);
-        const newCommands = [...this.commands];
-        newCommands.splice(endIndex + 1, 0, ...newChainCommands);
-        this.$emit("update:modelValue", newCommands);
+    handleAddCommand(event, index) {
+      const { command, type } = event;
+      if (type === "function") {
+        // 如果是创建新函数的事件，传递给FlowTabs处理
+        this.$emit("action", "addFlow", command);
       } else {
-        // 单个命令的复制逻辑
-        const newCommand = {
-          ...command,
-          id: this.getUniqueId(),
-        };
-        const newCommands = [...this.commands];
-        newCommands.splice(index + 1, 0, newCommand);
-        this.$emit("update:modelValue", newCommands);
+        // 原有的复制命令逻辑保持不变
+        if (type === "chain") {
+          // 如果是复制链式命令
+          const { startIndex, endIndex } = this.getChainIndex(command.chainId);
+          const chainCommands = this.commands.slice(startIndex, endIndex + 1);
+          const newChainCommands = this.copyCommands(chainCommands);
+          const newCommands = [...this.commands];
+          newCommands.splice(endIndex + 1, 0, ...newChainCommands);
+          this.$emit("update:modelValue", newCommands);
+        } else {
+          // 单个命令的复制逻辑
+          const newCommand = {
+            ...command,
+            id: this.getUniqueId(),
+          };
+          const newCommands = [...this.commands];
+          newCommands.splice(index + 1, 0, newCommand);
+          this.$emit("update:modelValue", newCommands);
+        }
       }
     },
     handleToggleChainDisable({ chainId, disabled }) {
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 995262da..e68fa237 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -84,7 +84,7 @@
         v-model="showVariableManager"
         :flow="flow"
         :variables="flow.customVariables"
-        @update-flow="updateFlow(flow)"
+        @update-flow="Sub(flow)"
         :is-main-flow="flow.id === 'main'"
         :output-variables="outputVariables"
         class="variable-panel"
@@ -102,7 +102,6 @@ import FlowManager from "components/composer/flow/FlowManager.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
-import { parseVariables } from "js/composer/variableManager";
 export default defineComponent({
   name: "FlowTabs",
   components: {
@@ -152,9 +151,10 @@ export default defineComponent({
     const getOutputVariables = (flow = getCurrentFlow()) => {
       const variables = [];
       for (const [index, cmd] of flow.commands.entries()) {
-        if (cmd.saveOutput && cmd.outputVariable) {
+        if (cmd.outputVariable) {
+          const { name, details = {} } = cmd.outputVariable;
           variables.push(
-            ...parseVariables(cmd.outputVariable).map((variable) => ({
+            ...[name, ...Object.values(details)].map((variable) => ({
               name: variable,
               // 提供来源命令的标志信息
               sourceCommand: {
@@ -231,16 +231,43 @@ export default defineComponent({
         )
       );
     },
-    addFlow() {
+    addFlow(options = {}) {
       const id = this.$root.getUniqueId();
-      const name = this.generateFlowName();
-      this.subFlows.push({
+      const name = options.name || this.generateFlowName();
+      const newFlow = {
         id,
         name,
         label: name.replace("func_", "函数"),
         commands: [],
         customVariables: [],
-      });
+      };
+
+      // 添加函数参数
+      if (options.params) {
+        options.params.forEach((param) => {
+          newFlow.customVariables.push({
+            name: param,
+            type: "param",
+          });
+        });
+      }
+
+      // 添加局部变量
+      if (options.localVars && options.localVars.length > 0) {
+        options.localVars.forEach((varInfo) => {
+          newFlow.customVariables.push({
+            name: varInfo.name,
+            type: "var",
+            value: varInfo.value,
+          });
+        });
+      }
+
+      this.subFlows.push(newFlow);
+      if (options.params || options.localVars) {
+        return;
+      }
+
       this.activeTab = id;
       this.$nextTick(() => {
         this.toggleVariableManager();
@@ -253,6 +280,16 @@ export default defineComponent({
         this.activeTab = this.flows[0].id;
       }
     },
+    updateSubFlow(index, payload) {
+      const { params, localVars } = payload;
+      this.subFlows[index].customVariables = [
+        ...params.map((param) => ({
+          name: param,
+          type: "param",
+        })),
+        ...localVars,
+      ];
+    },
     generateFlowCode(flow) {
       return generateCode(flow);
     },
@@ -282,6 +319,16 @@ export default defineComponent({
         case "toggleVariableManager":
           this.toggleVariableManager();
           break;
+        case "addFlow":
+          // 处理新函数创建
+          const index = this.subFlows.findIndex((f) => f.name === payload.name);
+          if (index > -1) {
+            // 如果函数已存在，则更新
+            this.updateSubFlow(index, payload);
+          } else {
+            this.addFlow(payload);
+          }
+          break;
         default:
           this.$emit("action", type, this.generateAllFlowCode());
       }
@@ -295,18 +342,22 @@ export default defineComponent({
         ...flow,
         commands: flow.commands.map((cmd) => {
           const cmdCopy = { ...cmd };
-          // 移除不必要的属性
+          // 移除不必要保存的属性
           const uselessProps = [
             "config",
             "code",
             "label",
             "component",
             "subCommands",
+            "outputs",
             "options",
             "defaultValue",
             "icon",
             "width",
             "placeholder",
+            "isAsync",
+            "summary",
+            "type",
           ];
           uselessProps.forEach((prop) => delete cmdCopy[prop]);
           return cmdCopy;
@@ -323,6 +374,7 @@ export default defineComponent({
       const newFlows = flowsData.map((flow) => ({
         ...flow,
         commands: flow.commands.map((cmd) => {
+          // 恢复所有属性
           const command = findCommandByValue(cmd.value);
           return {
             ...command,
@@ -330,7 +382,7 @@ export default defineComponent({
           };
         }),
       }));
-      this.updateFlow(newFlows);
+      this.Sub(newFlows);
       this.activeTab = this.mainFlow.id;
     },
     runFlows(flow) {
@@ -358,7 +410,7 @@ export default defineComponent({
       this.activeTab = flow.id;
       this.toggleVariableManager();
     },
-    updateFlow(flow) {
+    Sub(flow) {
       this.mainFlow = flow[0];
       this.subFlows = flow.slice(1);
     },
diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index cc741176..2ee70362 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -6,39 +6,18 @@
         class="output-section row items-center no-wrap"
         v-if="!isControlFlow"
       >
-        <!-- 变量输入框 -->
-        <q-input
-          v-if="command.saveOutput"
-          v-model="inputValue"
-          @focus="sourceValue = inputValue"
-          @blur="handleBlur"
-          outlined
-          placeholder="变量名"
-          class="variable-input"
-          align="center"
-        >
-        </q-input>
-        <!-- 保存变量按钮 -->
+        <!-- 输出变量按钮 -->
         <q-icon
-          :name="command.saveOutput ? 'data_object' : 'output'"
+          name="output"
           v-if="!command.neverHasOutput"
           class="output-btn"
-          @click="$emit('toggle-output')"
+          :color="command.outputVariable ? 'primary' : ''"
+          @click="showOutputEditor = true"
         >
           <q-tooltip>
-            <div class="text-body2">
-              {{
-                command.saveOutput
-                  ? "当前命令的输出将保存到变量中"
-                  : "点击将此命令的输出保存为变量以供后续使用"
-              }}
-            </div>
+            <div class="text-body2">配置命令输出变量</div>
             <div class="text-caption text-grey-5">
-              {{
-                command.saveOutput
-                  ? "点击取消输出到变量"
-                  : "保存后可在其他命令中使用此变量"
-              }}
+              将命令的输出保存为变量以供后续使用
             </div>
           </q-tooltip>
         </q-icon>
@@ -113,12 +92,24 @@
         </q-icon>
       </div>
     </div>
+
+    <!-- 输出编辑器 -->
+    <OutputEditor
+      v-model="showOutputEditor"
+      :command="command"
+      @confirm="$emit('update:outputVariable', $event)"
+    />
   </div>
 </template>
 
 <script>
+import OutputEditor from "./OutputEditor.vue";
+
 export default {
   name: "CommandButtons",
+  components: {
+    OutputEditor,
+  },
   props: {
     command: {
       type: Object,
@@ -143,18 +134,11 @@ export default {
   },
   data() {
     return {
-      inputValue: this.command.outputVariable || "",
-      sourceValue: "",
+      showOutputEditor: false,
     };
   },
-  watch: {
-    "command.outputVariable"(newVal) {
-      this.inputValue = newVal || "";
-    },
-  },
   emits: [
     "update:outputVariable",
-    "toggle-output",
     "run",
     "remove",
     "toggle-collapse",
@@ -162,17 +146,6 @@ export default {
     "toggle-disable",
     "add-print",
   ],
-  methods: {
-    handleBlur() {
-      // 如果输入框的值和源值相同，则不更新
-      if (
-        this.inputValue.replace(/[ ]/g, "") ===
-        this.sourceValue.replace(/[ ]/g, "")
-      )
-        return;
-      this.$emit("update:outputVariable", this.inputValue);
-    },
-  },
 };
 </script>
 
@@ -185,37 +158,9 @@ export default {
 
 /* 输出部分样式 */
 .output-section {
-  /* margin-right: 8px; */
   gap: 8px;
 }
 
-.variable-input {
-  width: 120px;
-}
-
-.output-section :deep(.q-field) {
-  border-radius: 4px;
-}
-
-.output-section :deep(.q-field__control) {
-  height: 20px;
-  min-height: 20px;
-  padding: 0 4px;
-}
-
-.output-section :deep(.q-field__marginal) {
-  height: 20px;
-  width: 24px;
-  min-width: 24px;
-}
-
-.output-section :deep(.q-field__native) {
-  padding: 0;
-  font-size: 12px;
-  min-height: 20px;
-  text-align: center;
-}
-
 /* 按钮样式 */
 .output-btn,
 .run-btn,
@@ -251,14 +196,6 @@ export default {
 }
 
 /* 暗色模式适配 */
-.body--dark .output-section :deep(.q-field) {
-  background: rgba(255, 255, 255, 0.03);
-}
-
-.body--dark .output-section :deep(.q-field--focused) {
-  background: #1d1d1d;
-}
-
 .body--dark .output-btn {
   border-color: rgba(255, 255, 255, 0.1);
 }
diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 5c2fe108..0bb22bcf 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -46,7 +46,6 @@
       :isFirstCommandInChain="isFirstCommandInChain"
       :isLastCommandInChain="isLastCommandInChain"
       @update:outputVariable="$emit('update:outputVariable', $event)"
-      @toggle-output="$emit('toggle-output')"
       @run="$emit('run')"
       @remove="$emit('remove')"
     />
@@ -67,13 +66,7 @@ export default {
       required: true,
     },
   },
-  emits: [
-    "update:outputVariable",
-    "toggle-output",
-    "run",
-    "remove",
-    "toggle-collapse",
-  ],
+  emits: ["update:outputVariable", "run", "remove", "toggle-collapse"],
   computed: {
     contentClass() {
       return {
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
new file mode 100644
index 00000000..7703a74b
--- /dev/null
+++ b/src/components/composer/card/OutputEditor.vue
@@ -0,0 +1,318 @@
+<template>
+  <q-dialog v-model="isOpen" persistent>
+    <q-card class="output-editor q-px-sm">
+      <div class="row justify-center q-px-sm q-pt-md">
+        {{ commandName }}
+      </div>
+      <div class="simple-output q-px-sm">
+        <q-badge color="primary" class="q-mb-sm q-pa-xs">完整结果</q-badge>
+        <q-input v-model="simpleOutputVar" filled dense autofocus>
+          <template v-slot:prepend>
+            <div class="variable-label">
+              {{ currentOutputs?.label || "输出变量名" }}
+            </div>
+          </template>
+        </q-input>
+      </div>
+      <div v-if="hasNestedFields(currentOutputs)">
+        <q-badge color="primary" class="q-ma-sm q-pa-xs">详细输出</q-badge>
+        <q-scroll-area
+          style="height: 200px"
+          :thumb-style="{
+            width: '2px',
+          }"
+        >
+          <div class="detail-output column q-col-gutter-sm q-px-sm">
+            <div v-for="(output, key) in detailOutputs" :key="key">
+              <!-- 如果是嵌套对象 -->
+              <div v-if="hasNestedFields(output)">
+                <BorderLabel :label="output.label || key" :model-value="false">
+                  <div class="column q-col-gutter-sm">
+                    <div
+                      v-for="(subOutput, subKey) in getNestedFields(output)"
+                      :key="subKey"
+                    >
+                      <div class="output-item">
+                        <q-input
+                          v-model="outputVars[`${key}.${subKey}`]"
+                          filled
+                          dense
+                          autofocus
+                          class="col"
+                          :placeholder="subOutput.placeholder"
+                        >
+                          <template v-slot:prepend>
+                            <div class="variable-label">
+                              {{ subOutput.label }}
+                            </div>
+                          </template>
+                        </q-input>
+                      </div>
+                    </div>
+                  </div>
+                </BorderLabel>
+              </div>
+              <!-- 如果是普通字段 -->
+              <div v-else class="output-item">
+                <q-input
+                  v-model="outputVars[key]"
+                  filled
+                  dense
+                  class="col"
+                  :placeholder="output.placeholder"
+                  autofocus
+                >
+                  <template v-slot:prepend>
+                    <div class="variable-label">{{ output.label }}</div>
+                  </template>
+                </q-input>
+              </div>
+            </div>
+          </div>
+        </q-scroll-area>
+      </div>
+
+      <div v-if="isAsyncCommand">
+        <q-badge color="primary" class="q-ma-sm q-pa-xs">输出模式</q-badge>
+        <div class="row q-col-gutter-sm q-px-sm">
+          <q-select
+            v-model="outputMode"
+            :options="outputModeOptions"
+            filled
+            dense
+            autofocus
+            emit-value
+            map-options
+            class="col"
+          >
+          </q-select>
+          <q-input
+            v-model="callbackFunc"
+            filled
+            dense
+            autofocus
+            class="col-8"
+            v-if="outputMode === 'callback'"
+          >
+            <template v-slot:prepend>
+              <div class="variable-label">回调函数名</div>
+            </template>
+          </q-input>
+        </div>
+      </div>
+
+      <div class="row justify-end q-px-sm q-py-sm">
+        <q-btn flat label="取消" color="primary" v-close-popup />
+        <q-btn flat label="确定" color="primary" @click="handleConfirm" />
+      </div>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
+
+export default defineComponent({
+  name: "OutputEditor",
+  components: {
+    BorderLabel,
+  },
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    command: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue", "confirm"],
+  computed: {
+    isOpen: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit("update:modelValue", value);
+      },
+    },
+    currentSubCommand() {
+      if (!this.command.subCommands) return {};
+      return this.command.subCommands.find(
+        (cmd) => cmd.value === this.command.value
+      );
+    },
+    commandName() {
+      return this.currentSubCommand.label || this.command.label;
+    },
+    isAsyncCommand() {
+      return this.currentSubCommand.isAsync || this.command.isAsync;
+    },
+    currentOutputs() {
+      return this.currentSubCommand.outputs || this.command.outputs;
+    },
+    detailOutputs() {
+      let outputs = { ...this.currentOutputs };
+      delete outputs.label;
+      delete outputs.placeholder;
+      return outputs;
+    },
+  },
+  data() {
+    return {
+      simpleOutputVar: "",
+      outputVars: {},
+      outputMode: "wait",
+      outputModeOptions: [
+        {
+          label: "等待运行完毕",
+          value: "wait",
+        },
+        {
+          label: "输出到回调函数",
+          value: "callback",
+        },
+      ],
+      callbackFunc: "",
+    };
+  },
+  watch: {
+    "command.outputVariable": {
+      immediate: true,
+      deep: true,
+      handler(outputVariable) {
+        this.initOutputVars(outputVariable);
+      },
+    },
+    "command.callbackFunc": {
+      immediate: true,
+      handler(callbackFunc) {
+        if (callbackFunc) {
+          this.outputMode = "callback";
+          this.callbackFunc = callbackFunc;
+        } else {
+          this.outputMode = "wait";
+        }
+      },
+    },
+  },
+  methods: {
+    hasNestedFields(output) {
+      console.log(output);
+      return Object.keys(output).some(
+        (key) => key !== "label" && key !== "placeholder"
+      );
+    },
+    getNestedFields(output) {
+      const fields = {};
+      Object.entries(output).forEach(([key, value]) => {
+        if (key !== "label" && key !== "placeholder") {
+          fields[key] = value;
+        }
+      });
+      return fields;
+    },
+    initOutputVars(outputVariable) {
+      // 初始化完整输出变量名
+      if (!outputVariable) return;
+      this.simpleOutputVar = outputVariable.name || "";
+
+      if (this.currentOutputs) {
+        // 初始化详细输出变量，直接使用扁平化的结构
+        this.outputVars = outputVariable?.details || {};
+      }
+    },
+    handleConfirm() {
+      const outputVariable = {
+        name: this.simpleOutputVar,
+      };
+
+      if (this.currentOutputs) {
+        const flatVars = {};
+        Object.entries(this.outputVars).forEach(([path, value]) => {
+          if (!value) return; // 跳过空值
+          flatVars[path] = value;
+        });
+
+        // 如果有非空的变量，才添加到结果中
+        if (Object.keys(flatVars).length > 0) {
+          outputVariable.details = flatVars;
+        }
+      }
+
+      // 根据输出模式处理
+      const result = {
+        outputVariable,
+        mode: this.outputMode,
+      };
+
+      // 如果是回调函数模式，添加回调函数名和参数信息
+      if (this.outputMode === "callback" && this.callbackFunc) {
+        // 添加函数参数和本地变量信息
+        result.functionInfo = {
+          name: this.callbackFunc,
+          params: [outputVariable.name],
+          localVars: outputVariable.details
+            ? Object.entries(outputVariable.details).map(([path, varName]) => ({
+                name: varName,
+                type: "var",
+                value: `${outputVariable.name}.${path}`,
+              }))
+            : [],
+        };
+      }
+
+      this.$emit("confirm", result);
+      this.isOpen = false;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.output-editor {
+  width: 450px;
+}
+
+.output-item {
+  border-radius: 8px;
+  transition: all 0.3s ease;
+}
+
+.output-item:hover {
+  background: rgba(0, 0, 0, 0.02);
+}
+
+.variable-label {
+  font-size: 12px;
+  border-radius: 4px;
+  padding-right: 10px;
+  text-align: center;
+}
+
+.body--dark .output-item:hover {
+  background: rgba(255, 255, 255, 0.02);
+}
+
+.output-editor :deep(.q-field--filled .q-field__control),
+.output-editor :deep(.q-field--filled .q-field__control > *),
+.output-editor :deep(.q-field--filled .q-field__native) {
+  max-height: 36px;
+  min-height: 36px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+
+/* 去除filled输入框边框 */
+.output-editor :deep(.q-field__control:before) {
+  border: none;
+}
+
+/* 去除filled输入框下划线 */
+.output-editor :deep(.q-field__control:after) {
+  height: 0;
+  border-bottom: none;
+}
+</style>
diff --git a/src/components/composer/common/ButtonGroup.vue b/src/components/composer/common/ButtonGroup.vue
index b5f5e714..afe80e00 100644
--- a/src/components/composer/common/ButtonGroup.vue
+++ b/src/components/composer/common/ButtonGroup.vue
@@ -9,6 +9,9 @@
       <div
         v-for="opt in options"
         :key="opt.value"
+        :style="{
+          height: height,
+        }"
         :class="['button-item', { active: modelValue === opt.value }]"
         @click="$emit('update:modelValue', opt.value)"
       >
@@ -31,6 +34,10 @@ export default defineComponent({
     modelValue: {
       required: true,
     },
+    height: {
+      type: String,
+      default: "26px",
+    },
     options: {
       type: Array,
       required: true,
@@ -67,7 +74,6 @@ export default defineComponent({
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  height: 26px;
   padding: 0 12px;
   font-size: 12px;
   border-radius: 4px;
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 5c872ad9..bf9de0e7 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -60,28 +60,33 @@
         <q-tooltip>载入</q-tooltip>
       </q-btn>
       <q-separator vertical />
-      <q-btn
-        flat
-        dense
-        icon="preview"
-        @mouseenter="handleMouseEnter"
-        @mouseleave="handleMouseLeave"
-      >
+      <q-btn flat dense icon="preview" @click="isVisible = true">
+        <q-tooltip>预览代码</q-tooltip>
       </q-btn>
       <q-btn dense flat icon="play_circle" @click="$emit('action', 'run')">
         <q-tooltip>运行</q-tooltip>
       </q-btn>
     </div>
 
-    <transition name="preview-fade">
-      <div v-if="isVisible" class="preview-popup">
-        <div class="preview-header">
-          <q-icon name="code" size="16px" class="q-mr-xs" />
-          <span>预览代码</span>
-        </div>
-        <pre class="preview-code"><code>{{ code }}</code></pre>
-      </div>
-    </transition>
+    <q-dialog v-model="isVisible">
+      <q-card style="width: 550px">
+        <q-card-section class="row items-center q-py-xs q-px-md">
+          <div>
+            <q-icon name="code" size="16px" class="q-mr-sm" />
+            预览代码
+          </div>
+          <q-space />
+          <q-btn icon="close" flat round dense v-close-popup />
+        </q-card-section>
+
+        <q-card-section class="q-pa-none">
+          <q-separator />
+          <q-scroll-area style="height: 400px">
+            <pre class="preview-code"><code>{{ code }}</code></pre>
+          </q-scroll-area>
+        </q-card-section>
+      </q-card>
+    </q-dialog>
   </div>
 </template>
 
@@ -112,27 +117,16 @@ export default defineComponent({
     return {
       isVisible: false,
       code: "",
-      previewTimer: null,
       isDev: window.utools.isDev(),
     };
   },
 
-  methods: {
-    handleMouseEnter() {
-      this.previewTimer = setTimeout(() => {
+  watch: {
+    isVisible(val) {
+      if (val) {
         this.code = this.generateCode();
-        this.isVisible = true;
-      }, 200);
+      }
     },
-
-    handleMouseLeave() {
-      clearTimeout(this.previewTimer);
-      this.isVisible = false;
-    },
-  },
-
-  beforeUnmount() {
-    clearTimeout(this.previewTimer);
   },
 });
 </script>
@@ -165,31 +159,6 @@ export default defineComponent({
   color: var(--q-primary);
 }
 
-.preview-popup {
-  position: absolute;
-  top: 40px;
-  right: 30px;
-  min-width: 300px;
-  max-width: 600px;
-  background: #fff;
-  border-radius: 8px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-  z-index: 1000;
-  transform-origin: center right;
-}
-
-.preview-header {
-  padding: 10px 14px;
-  background: rgba(var(--q-primary-rgb), 0.03);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-  border-radius: 8px 8px 0 0;
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--q-primary);
-  display: flex;
-  align-items: center;
-}
-
 .preview-code {
   margin: 0;
   padding: 14px;
@@ -215,30 +184,4 @@ export default defineComponent({
 .preview-code::-webkit-scrollbar-thumb:hover {
   background: var(--q-primary-opacity-30);
 }
-
-/* 过渡动画 */
-.preview-fade-enter-active,
-.preview-fade-leave-active {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-.preview-fade-enter-from,
-.preview-fade-leave-to {
-  opacity: 0;
-  transform: translateX(20px) scale(0.95);
-}
-
-/* 暗色模式适配 */
-.body--dark .preview-popup {
-  background: #1d1d1d;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
-}
-
-.body--dark .preview-header {
-  background: rgba(255, 255, 255, 0.03);
-}
-
-.body--dark .preview-code {
-  color: #e0e0e0;
-}
 </style>
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
index caabe85f..6173d25b 100644
--- a/src/js/composer/commands/codingCommand.js
+++ b/src/js/composer/commands/codingCommand.js
@@ -7,8 +7,6 @@ export const codingCommands = {
       value: "quickcomposer.coding.base64Encode",
       label: "编解码",
       icon: "code",
-      outputVariable: "processedText",
-      saveOutput: true,
       config: [
         {
           label: "要编解码的文本",
@@ -63,22 +61,16 @@ export const codingCommands = {
       value: "quickcomposer.coding.symmetricCrypto",
       label: "对称加解密",
       component: "SymmetricCryptoEditor",
-      outputVariable: "processedText",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.coding.asymmetricCrypto",
       label: "非对称加解密",
       component: "AsymmetricCryptoEditor",
-      outputVariable: "processedText",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.coding.md5Hash",
       label: "哈希计算",
       icon: "enhanced_encryption",
-      outputVariable: "hashValue",
-      saveOutput: true,
       config: [
         {
           label: "要计算哈希的文本",
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 156d3346..ef7a9c79 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -355,8 +355,6 @@ export const dataCommands = {
       componentProps: {
         inputLabel: "要处理的文本",
       },
-      outputVariable: "processedText",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.data.buffer.from",
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index ecffa320..1673266c 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -13,6 +13,33 @@ export const macosCommands = {
           value: "quickcomposer.macos.app.getFrontmost",
           label: "获取前台应用",
           icon: "front_hand",
+          outputs: {
+            label: "前台应用信息",
+            name: { label: "应用名称" },
+            displayedName: { label: "应用显示名称" },
+            path: { label: "应用路径" },
+            version: { label: "应用版本" },
+            pid: { label: "应用进程ID" },
+            backgroundOnly: { label: "是否后台运行" },
+            visible: { label: "是否可见" },
+            frontmost: { label: "是否前台运行" },
+            window: {
+              label: "窗口信息",
+              name: { label: "窗口名称" },
+              title: { label: "窗口标题" },
+              index: { label: "窗口索引" },
+              position: {
+                label: "窗口位置",
+                placeholder: "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
+              },
+              size: {
+                label: "窗口大小",
+                placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
+              },
+              minimized: { label: "是否最小化" },
+              fullscreen: { label: "是否全屏" },
+            },
+          },
         },
         {
           value: "quickcomposer.macos.app.getRunningApps",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index dd6cde28..ef004cf7 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -43,8 +43,6 @@ export const networkCommands = {
       component: "AxiosConfigEditor",
       isAsync: true,
       icon: "http",
-      outputVariable: "{data}",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.network.url.parse",
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
index 92f66378..96cb34a3 100644
--- a/src/js/composer/commands/screenCommands.js
+++ b/src/js/composer/commands/screenCommands.js
@@ -73,8 +73,6 @@ export const screenCommands = {
       value: "utools.getPrimaryDisplay",
       label: "获取显示器信息",
       icon: "monitor",
-      outputVariable: "display",
-      saveOutput: true,
       subCommands: [
         {
           value: "utools.getPrimaryDisplay",
@@ -104,8 +102,6 @@ export const screenCommands = {
       value: "utools.screenToDipPoint",
       label: "物理/DIP坐标转换",
       icon: "transform",
-      outputVariable: "{x,y}",
-      saveOutput: true,
       config: [XY_DICT_EDITOR],
       subCommands: [
         {
@@ -124,8 +120,6 @@ export const screenCommands = {
       value: "utools.screenToDipRect",
       label: "物理/DIP区域转换",
       icon: "transform",
-      outputVariable: "{x,y,width,height}",
-      saveOutput: true,
       config: [RECT_DICT_EDITOR],
       subCommands: [
         {
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 8d6e86d2..f3e32f91 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -223,16 +223,12 @@ export const simulateCommands = {
       label: "屏幕取色",
       icon: "colorize",
       isAsync: true,
-      outputVariable: "{hex,rgb}",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.simulate.captureScreen",
       label: "屏幕截图",
       icon: "screenshot_monitor",
       isAsync: true,
-      outputVariable: "base64Data",
-      saveOutput: true,
       config: [
         {
           label: "截图范围",
diff --git a/src/js/composer/commands/statusCommands.js b/src/js/composer/commands/statusCommands.js
index ce2bf110..21fde820 100644
--- a/src/js/composer/commands/statusCommands.js
+++ b/src/js/composer/commands/statusCommands.js
@@ -7,40 +7,30 @@ export const statusCommands = {
       label: "获取当前文件管理器路径",
       icon: "folder",
       isAsync: true,
-      outputVariable: "currentFolderPath",
-      saveOutput: true,
     },
     {
       value: "utools.readCurrentBrowserUrl",
       label: "获取当前浏览器地址",
       icon: "language",
       isAsync: true,
-      outputVariable: "currentBrowserUrl",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.status.getSelectedText",
       label: "获取选中文本",
       icon: "text_fields",
       isAsync: true,
-      outputVariable: "selectedText",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.status.getSelectedImage",
       label: "获取选中的图片",
       icon: "image",
       isAsync: true,
-      outputVariable: "selectedImage",
-      saveOutput: true,
     },
     {
       value: "quickcomposer.status.getSelectedFiles",
       label: "获取选中的文件",
       icon: "file_present",
       isAsync: true,
-      outputVariable: "selectedFiles",
-      saveOutput: true,
     },
   ],
 };
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index f1161d75..dd5a71fa 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -72,8 +72,6 @@ export const systemCommands = {
     {
       value: "electron.clipboard.readText",
       label: "读取剪贴板",
-      outputVariable: "clipboardContent",
-      saveOutput: true,
       subCommands: [
         {
           value: "electron.clipboard.readText",
@@ -112,8 +110,6 @@ export const systemCommands = {
     {
       value: "utools.getPath",
       label: "获取系统路径",
-      outputVariable: "systemPath",
-      saveOutput: true,
       defaultValue: "home",
       config: [
         {
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index e2d227b5..168c5fbf 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -169,8 +169,9 @@ export const uiCommands = {
       value: "quickcommand.showConfirmBox",
       label: "确认框",
       isAsync: true,
-      outputVariable: "confirmed",
-      saveOutput: true,
+      outputs: {
+        label: "是否确认",
+      },
       config: [
         {
           label: "提示内容",
@@ -219,8 +220,6 @@ export const uiCommands = {
       value: "quickcommand.showButtonBox",
       label: "按钮组",
       isAsync: true,
-      outputVariable: "{id,text}",
-      saveOutput: true,
       width: 12,
       config: [
         {
@@ -256,8 +255,6 @@ export const uiCommands = {
       value: "quickcommand.showInputBox",
       label: "输入框",
       isAsync: true,
-      outputVariable: "[inputValue1]",
-      saveOutput: true,
       config: [
         {
           label: "输入框",
@@ -302,8 +299,6 @@ export const uiCommands = {
       value: "quickcommand.showTextArea",
       label: "文本框",
       isAsync: true,
-      outputVariable: "textareaValue",
-      saveOutput: true,
       config: [
         {
           label: "文本框占位符",
@@ -372,8 +367,6 @@ export const uiCommands = {
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
-      outputVariable: "filePaths",
-      saveOutput: true,
       subCommands: [
         {
           value: "utools.showOpenDialog",
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
index 16f8d9ba..e873b3cf 100644
--- a/src/js/composer/commands/userdataCommands.js
+++ b/src/js/composer/commands/userdataCommands.js
@@ -14,15 +14,11 @@ export const userdataCommands = {
           icon: "title",
         },
       ],
-      outputVariable: "userData",
-      saveOutput: true,
     },
     {
       value: "quickcommand.userData.all",
       label: "获取所有用户数据",
       icon: "database",
-      outputVariable: "userDatas",
-      saveOutput: true,
     },
     {
       value: "quickcommand.userData.put",
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 2d6f4699..9a690381 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -47,15 +47,11 @@ export const utoolsCommands = {
       value: "utools.isDarkColors",
       label: "是否深色模式",
       icon: "dark_mode",
-      outputVariable: "isDark",
-      saveOutput: true,
     },
     {
       value: "utools.getUser",
       label: "获取用户信息",
       icon: "person",
-      outputVariable: "{avatar,nickname,type}",
-      saveOutput: true,
     },
     {
       value: "utools.redirect",
@@ -163,20 +159,14 @@ export const utoolsCommands = {
       value: "utools.getWindowType",
       label: "获取当前窗口类型",
       icon: "window",
-      outputVariable: "windowType",
-      saveOutput: true,
     },
     {
       value: "utools.getNativeId",
       label: "获取本地ID",
-      outputVariable: "nativeId",
-      saveOutput: true,
     },
     {
       value: "utools.getAppVersion",
       label: "获取uTools版本",
-      outputVariable: "appVersion",
-      saveOutput: true,
     },
   ],
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 139b5ff3..5b23e1a3 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -207,8 +207,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.window.getWindowInfo",
           label: "搜索窗口",
           icon: "search",
-          outputVariable: "windowInfo",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.automation.inspect",
@@ -451,7 +449,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.automation.getvalue",
           label: "获取值",
           icon: "content_paste",
-          outputVariable: "elementValue",
         },
         {
           value: "quickcomposer.windows.automation.select",
@@ -621,8 +618,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.sendmessage.listControls",
           label: "获取控件树",
           icon: "account_tree",
-          outputVariable: "controlsTree",
-          saveOutput: true,
           config: [
             {
               component: "OptionEditor",
@@ -810,8 +805,6 @@ export const windowsCommands = {
       label: "剪贴板/文件监控",
       icon: "monitor_heart",
       isAsync: true,
-      outputVariable: "monitorEvent",
-      saveOutput: true,
       showLoading: true,
       subCommands: [
         {
@@ -879,8 +872,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.process.listProcesses",
           label: "进程列表",
           icon: "list",
-          outputVariable: "processList",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.process.killProcess",
@@ -956,8 +947,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.registry.listKeys",
           label: "列出项",
           icon: "list",
-          outputVariable: "registryKeys",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.registry.getValue",
@@ -983,8 +972,6 @@ export const windowsCommands = {
               placeholder: "要获取的值名称",
             },
           ],
-          outputVariable: "registryValue",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.registry.setValue",
@@ -1072,8 +1059,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.service.listServices",
           label: "服务列表",
           icon: "list",
-          outputVariable: "serviceList",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.service.controlService",
@@ -1116,8 +1101,6 @@ export const windowsCommands = {
           value: "quickcomposer.windows.software.listSoftware",
           label: "软件列表",
           icon: "list",
-          outputVariable: "softwareList",
-          saveOutput: true,
         },
         {
           value: "quickcomposer.windows.software.uninstallSoftware",
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index d972e76c..599cd2e6 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -2,8 +2,7 @@ export function generateCode(flow) {
   const { commands, name, label, customVariables = [] } = flow;
 
   const params = customVariables.filter((v) => v.type === "param") || [];
-  const manualVars =
-    customVariables.filter((v) => v.type === "var") || [];
+  const manualVars = customVariables.filter((v) => v.type === "var") || [];
   // 检查是否包含异步函数
   const hasAsyncFunction = commands.some((cmd) => cmd.isAsync);
 
@@ -25,15 +24,41 @@ export function generateCode(flow) {
     // 跳过禁用的命令
     if (cmd.disabled) return;
     if (!cmd.code) return;
-    let line = indent;
 
+    let cmdCode = cmd.code;
+    // 处理输出变量
     if (cmd.outputVariable) {
-      line += `let ${cmd.outputVariable} = `;
+      const { name, details } = cmd.outputVariable;
+      if (cmd.isAsync) {
+        if (cmd.callbackFunc) {
+          // 使用回调函数模式
+          cmdCode = `${cmdCode}.then(${cmd.callbackFunc})`;
+        } else {
+          // 使用 await 模式
+          cmdCode = `const ${name} = await ${cmdCode}`;
+          code.push(indent + cmdCode);
+          // 处理详细变量
+          if (details) {
+            Object.entries(details).forEach(([path, varName]) => {
+              code.push(`${indent}let ${varName} = ${name}.${path};`);
+            });
+          }
+          return;
+        }
+      } else {
+        cmdCode = `const ${name} = ${cmdCode}`;
+        code.push(indent + cmdCode);
+        // 处理详细变量
+        if (details) {
+          Object.entries(details).forEach(([path, varName]) => {
+            code.push(`${indent}let ${varName} = ${name}.${path};`);
+          });
+        }
+        return;
+      }
     }
 
-    let awaitCmd = cmd.isAsync ? "await " : "";
-    line += `${awaitCmd} ${cmd.code}`;
-    code.push(line);
+    code.push(indent + cmdCode);
   });
 
   code.push("}"); // Close the function

From 365964fc029cfc2df654b965c3736b260192825e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 12:05:56 +0800
Subject: [PATCH 134/332] =?UTF-8?q?=E6=94=B9=E5=96=84=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=8C=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E5=90=84=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?asyncMode=E5=AD=98=E5=82=A8promise=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |  36 ++-
 src/components/composer/ComposerFlow.vue      |   1 -
 src/components/composer/FlowTabs.vue          |  30 +--
 .../composer/card/CommandButtons.vue          |   4 +-
 src/components/composer/card/OutputEditor.vue | 254 +++++++++++-------
 src/js/composer/commands/audioCommands.js     |   8 +-
 src/js/composer/commands/browserCommands.js   |  24 +-
 src/js/composer/commands/dataCommands.js      |   2 +-
 src/js/composer/commands/fileCommands.js      |   4 +-
 src/js/composer/commands/imageCommands.js     |  12 +-
 src/js/composer/commands/macosCommands.js     |  53 ++--
 src/js/composer/commands/networkCommands.js   |  12 +-
 src/js/composer/commands/scriptCommands.js    |   2 +-
 src/js/composer/commands/simulateCommands.js  |   6 +-
 src/js/composer/commands/statusCommands.js    |  10 +-
 src/js/composer/commands/systemCommands.js    |   2 +-
 src/js/composer/commands/uiCommands.js        |  14 +-
 src/js/composer/commands/windowsCommands.js   |  36 ++-
 src/js/composer/commonComponentGuide.js       |   2 +-
 src/js/composer/customComponentGuide.js       |   2 +-
 src/js/composer/generateCode.js               |  95 +++++--
 src/js/composer/variableManager.js            |  11 +-
 22 files changed, 385 insertions(+), 235 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index eb950310..baa6a31d 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -155,27 +155,37 @@ export default defineComponent({
   },
   methods: {
     handleOutputVariableUpdate(result) {
-      const { outputVariable, mode, functionInfo } = result;
+      const { outputVariable, asyncMode, callbackFunc } = result;
 
       if (outputVariable.name || outputVariable.details) {
         this.localCommand.outputVariable = { ...outputVariable };
-        // 如果是回调模式，添加 callbackFunc 属性
-        if (mode === "callback") {
-          this.localCommand.callbackFunc = functionInfo.name;
-        } else {
-          delete this.localCommand.callbackFunc;
-        }
+      } else {
+        delete this.localCommand.outputVariable;
+      }
 
-        // 如果是回调函数模式，创建新函数
-        if (mode === "callback" && functionInfo) {
+      if (asyncMode) {
+        this.localCommand.asyncMode = asyncMode;
+        // 如果是回调模式，添加 callbackFunc 属性
+        if (callbackFunc) {
+          this.localCommand.callbackFunc = callbackFunc;
+          let params = [];
+          if (outputVariable?.name) {
+            params.push(outputVariable.name);
+          }
+          if (outputVariable?.details) {
+            params.push(...Object.values(outputVariable.details));
+          }
           this.$emit("add-command", {
-            command: functionInfo,
+            command: {
+              name: callbackFunc,
+              params,
+              silent: true,
+            },
             type: "function",
           });
+        } else {
+          delete this.localCommand.callbackFunc;
         }
-      } else {
-        delete this.localCommand.outputVariable;
-        delete this.localCommand.callbackFunc;
       }
     },
     runCommand() {
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index aeff041e..ee01eca6 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -63,7 +63,6 @@ import ComposerCard from "./ComposerCard.vue";
 import ChainStyles from "./flow/ChainStyles.vue";
 import DropArea from "./flow/DropArea.vue";
 import { findCommandByValue } from "js/composer/composerConfig";
-import { processVariable } from "js/composer/variableManager";
 
 // 拖拽前的命令列表，非响应式
 let commandsBeforeDrag = [];
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index e68fa237..e301be45 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -252,19 +252,9 @@ export default defineComponent({
         });
       }
 
-      // 添加局部变量
-      if (options.localVars && options.localVars.length > 0) {
-        options.localVars.forEach((varInfo) => {
-          newFlow.customVariables.push({
-            name: varInfo.name,
-            type: "var",
-            value: varInfo.value,
-          });
-        });
-      }
-
       this.subFlows.push(newFlow);
-      if (options.params || options.localVars) {
+
+      if (options.silent) {
         return;
       }
 
@@ -281,12 +271,17 @@ export default defineComponent({
       }
     },
     updateSubFlow(index, payload) {
-      const { params, localVars } = payload;
+      const { params } = payload;
+      const newParams = params.map((param) => ({
+        name: param,
+        type: "param",
+      }));
+      const localVars = this.subFlows[index].customVariables.filter(
+        (v) => v.type === "var"
+      );
+      // 完全更新参数
       this.subFlows[index].customVariables = [
-        ...params.map((param) => ({
-          name: param,
-          type: "param",
-        })),
+        ...newParams,
         ...localVars,
       ];
     },
@@ -355,7 +350,6 @@ export default defineComponent({
             "icon",
             "width",
             "placeholder",
-            "isAsync",
             "summary",
             "type",
           ];
diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 2ee70362..cd163ccd 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -15,9 +15,9 @@
           @click="showOutputEditor = true"
         >
           <q-tooltip>
-            <div class="text-body2">配置命令输出变量</div>
+            <div class="text-body2">输出配置</div>
             <div class="text-caption text-grey-5">
-              将命令的输出保存为变量以供后续使用
+              配置输出变量、是否等待执行完毕等
             </div>
           </q-tooltip>
         </q-icon>
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 7703a74b..e94b8799 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -14,8 +14,16 @@
           </template>
         </q-input>
       </div>
-      <div v-if="hasNestedFields(currentOutputs)">
-        <q-badge color="primary" class="q-ma-sm q-pa-xs">详细输出</q-badge>
+      <div v-if="currentOutputs?.structure">
+        <div class="row items-center">
+          <q-badge color="primary" class="q-ma-sm q-pa-xs">详细输出</q-badge>
+          <div
+            v-if="Array.isArray(currentOutputs.structure)"
+            class="text-caption text-grey-5"
+          >
+            数组中第一个元素
+          </div>
+        </div>
         <q-scroll-area
           style="height: 200px"
           :thumb-style="{
@@ -23,61 +31,124 @@
           }"
         >
           <div class="detail-output column q-col-gutter-sm q-px-sm">
-            <div v-for="(output, key) in detailOutputs" :key="key">
-              <!-- 如果是嵌套对象 -->
-              <div v-if="hasNestedFields(output)">
-                <BorderLabel :label="output.label || key" :model-value="false">
-                  <div class="column q-col-gutter-sm">
-                    <div
-                      v-for="(subOutput, subKey) in getNestedFields(output)"
-                      :key="subKey"
-                    >
-                      <div class="output-item">
-                        <q-input
-                          v-model="outputVars[`${key}.${subKey}`]"
-                          filled
-                          dense
-                          autofocus
-                          class="col"
-                          :placeholder="subOutput.placeholder"
-                        >
-                          <template v-slot:prepend>
-                            <div class="variable-label">
-                              {{ subOutput.label }}
-                            </div>
-                          </template>
-                        </q-input>
+            <!-- 处理数组类型的structure -->
+            <template v-if="Array.isArray(currentOutputs.structure)">
+              <div
+                v-for="(output, key) in currentOutputs.structure[0]"
+                :key="key"
+              >
+                <!-- 如果是嵌套对象 -->
+                <div v-if="hasNestedFields(output)">
+                  <BorderLabel
+                    :label="output.label || key"
+                    :model-value="false"
+                  >
+                    <div class="column q-col-gutter-sm">
+                      <div
+                        v-for="(subOutput, subKey) in getNestedFields(output)"
+                        :key="subKey"
+                      >
+                        <div class="output-item">
+                          <q-input
+                            v-model="outputVars[`[0].${key}.${subKey}`]"
+                            filled
+                            dense
+                            autofocus
+                            class="col"
+                            :placeholder="subOutput.placeholder"
+                          >
+                            <template v-slot:prepend>
+                              <div class="variable-label">
+                                {{ subOutput.label }}
+                              </div>
+                            </template>
+                          </q-input>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                </BorderLabel>
+                  </BorderLabel>
+                </div>
+                <!-- 如果是普通字段 -->
+                <div v-else class="output-item">
+                  <q-input
+                    v-model="outputVars[`[0].${key}`]"
+                    filled
+                    dense
+                    class="col"
+                    :placeholder="output.placeholder"
+                    autofocus
+                  >
+                    <template v-slot:prepend>
+                      <div class="variable-label">{{ output.label }}</div>
+                    </template>
+                  </q-input>
+                </div>
               </div>
-              <!-- 如果是普通字段 -->
-              <div v-else class="output-item">
-                <q-input
-                  v-model="outputVars[key]"
-                  filled
-                  dense
-                  class="col"
-                  :placeholder="output.placeholder"
-                  autofocus
-                >
-                  <template v-slot:prepend>
-                    <div class="variable-label">{{ output.label }}</div>
-                  </template>
-                </q-input>
+            </template>
+            <!-- 处理对象类型的structure -->
+            <template v-else>
+              <div
+                v-for="(output, key) in currentOutputs?.structure"
+                :key="key"
+              >
+                <!-- 如果是嵌套对象 -->
+                <div v-if="hasNestedFields(output)">
+                  <BorderLabel
+                    :label="output.label || key"
+                    :model-value="false"
+                  >
+                    <div class="column q-col-gutter-sm">
+                      <div
+                        v-for="(subOutput, subKey) in getNestedFields(output)"
+                        :key="subKey"
+                      >
+                        <div class="output-item">
+                          <q-input
+                            v-model="outputVars[`${key}.${subKey}`]"
+                            filled
+                            dense
+                            autofocus
+                            class="col"
+                            :placeholder="subOutput.placeholder"
+                          >
+                            <template v-slot:prepend>
+                              <div class="variable-label">
+                                {{ subOutput.label }}
+                              </div>
+                            </template>
+                          </q-input>
+                        </div>
+                      </div>
+                    </div>
+                  </BorderLabel>
+                </div>
+                <!-- 如果是普通字段 -->
+                <div v-else class="output-item">
+                  <q-input
+                    v-model="outputVars[key]"
+                    filled
+                    dense
+                    class="col"
+                    :placeholder="output.placeholder"
+                    autofocus
+                  >
+                    <template v-slot:prepend>
+                      <div class="variable-label">{{ output.label }}</div>
+                    </template>
+                  </q-input>
+                </div>
               </div>
-            </div>
+            </template>
           </div>
         </q-scroll-area>
       </div>
 
-      <div v-if="isAsyncCommand">
-        <q-badge color="primary" class="q-ma-sm q-pa-xs">输出模式</q-badge>
+      <div v-if="!!asyncMode">
+        <q-badge color="primary" class="q-ma-sm q-pa-xs">运行模式</q-badge>
         <div class="row q-col-gutter-sm q-px-sm">
           <q-select
-            v-model="outputMode"
-            :options="outputModeOptions"
+            v-model="asyncMode"
+            :options="asyncModeOptions"
             filled
             dense
             autofocus
@@ -92,10 +163,11 @@
             dense
             autofocus
             class="col-8"
-            v-if="outputMode === 'callback'"
+            v-if="asyncMode === 'then'"
+            placeholder="新函数名则自动创建"
           >
             <template v-slot:prepend>
-              <div class="variable-label">回调函数名</div>
+              <div class="variable-label">回调函数</div>
             </template>
           </q-input>
         </div>
@@ -147,64 +219,74 @@ export default defineComponent({
     commandName() {
       return this.currentSubCommand.label || this.command.label;
     },
-    isAsyncCommand() {
-      return this.currentSubCommand.isAsync || this.command.isAsync;
-    },
     currentOutputs() {
       return this.currentSubCommand.outputs || this.command.outputs;
     },
-    detailOutputs() {
-      let outputs = { ...this.currentOutputs };
-      delete outputs.label;
-      delete outputs.placeholder;
-      return outputs;
-    },
   },
   data() {
     return {
       simpleOutputVar: "",
       outputVars: {},
-      outputMode: "wait",
-      outputModeOptions: [
+      asyncMode: "await",
+      callbackFunc: "",
+      asyncModeOptions: [
         {
           label: "等待运行完毕",
-          value: "wait",
+          value: "await",
         },
         {
-          label: "输出到回调函数",
-          value: "callback",
+          label: "不等待运行完毕",
+          value: "then",
         },
       ],
-      callbackFunc: "",
     };
   },
   watch: {
     "command.outputVariable": {
       immediate: true,
       deep: true,
-      handler(outputVariable) {
-        this.initOutputVars(outputVariable);
+      handler(newValue) {
+        this.initOutputVars(newValue);
+      },
+    },
+    "command.asyncMode": {
+      immediate: true,
+      handler(newValue) {
+        this.asyncMode = newValue;
       },
     },
     "command.callbackFunc": {
       immediate: true,
-      handler(callbackFunc) {
-        if (callbackFunc) {
-          this.outputMode = "callback";
-          this.callbackFunc = callbackFunc;
-        } else {
-          this.outputMode = "wait";
-        }
+      handler(newValue) {
+        this.callbackFunc = newValue;
       },
     },
   },
   methods: {
     hasNestedFields(output) {
-      console.log(output);
+      if (!output) return false;
       return Object.keys(output).some(
         (key) => key !== "label" && key !== "placeholder"
       );
     },
+    /**
+     * 只处理一层嵌套，手动在配置文件中控制outputs结构不要太复杂
+     * 第二层嵌套只嵌套对象，不嵌套数组
+     * 最复杂的情况：
+     * outputs: {
+     *   label: "测试",
+     *   structure: [
+     *     {
+     *       position: { label: "位置", {
+     *         x: { label: "X坐标" },
+     *         y: { label: "Y坐标" }
+     *       }
+     *     }
+     *   ]
+     * }
+     *
+     *
+     */
     getNestedFields(output) {
       const fields = {};
       Object.entries(output).forEach(([key, value]) => {
@@ -243,25 +325,17 @@ export default defineComponent({
       }
 
       // 根据输出模式处理
-      const result = {
+      let result = {
         outputVariable,
-        mode: this.outputMode,
       };
 
-      // 如果是回调函数模式，添加回调函数名和参数信息
-      if (this.outputMode === "callback" && this.callbackFunc) {
-        // 添加函数参数和本地变量信息
-        result.functionInfo = {
-          name: this.callbackFunc,
-          params: [outputVariable.name],
-          localVars: outputVariable.details
-            ? Object.entries(outputVariable.details).map(([path, varName]) => ({
-                name: varName,
-                type: "var",
-                value: `${outputVariable.name}.${path}`,
-              }))
-            : [],
-        };
+      // async模式
+      if (this.asyncMode) {
+        result.asyncMode = this.asyncMode;
+        // 如果是回调函数模式，添加回调函数名和参数信息
+        if (this.asyncMode === "then" && this.callbackFunc) {
+          result.callbackFunc = this.callbackFunc;
+        }
       }
 
       this.$emit("confirm", result);
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index c5d1502e..4309475a 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -133,7 +133,7 @@ export const audioCommands = {
       value: "quickcomposer.audio.media.play",
       label: "音频播放",
       icon: "music_note",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.audio.media.play",
@@ -175,7 +175,7 @@ export const audioCommands = {
       value: "quickcomposer.audio.record",
       label: "音频录制",
       icon: "mic",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "录制时长(ms)",
@@ -211,7 +211,7 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.media.beep",
       label: "系统音效",
-      isAsync: true,
+      asyncMode: "await",
       icon: "notifications_active",
       config: [
         {
@@ -238,7 +238,7 @@ export const audioCommands = {
       value: "quickcomposer.audio.media.analyze",
       label: "音频信息",
       icon: "analytics",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "音频文件",
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 0c390f09..53ac94fd 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -36,7 +36,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.startClient",
       label: "浏览器实例管理",
       icon: "launch",
-      isAsync: true,
+      asyncMode: "await",
       config: [],
       subCommands: [
         {
@@ -168,7 +168,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.getUrl",
       label: "获取/设置网址",
       icon: "link",
-      isAsync: true,
+      asyncMode: "await",
       config: [tabConfig],
       subCommands: [
         {
@@ -196,7 +196,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.getTabs",
       label: "标签操作",
       icon: "tab",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.browser.getTabs",
@@ -240,7 +240,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.captureScreenshot",
       label: "捕获截图",
       icon: "screenshot",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         tabConfig,
         {
@@ -305,7 +305,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.executeScript",
       label: "执行脚本",
       icon: "code",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         tabConfig,
         {
@@ -328,7 +328,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.injectRemoteScript",
       label: "注入脚本/样式",
       icon: "style",
-      isAsync: true,
+      asyncMode: "await",
       config: [tabConfig],
       subCommands: [
         {
@@ -396,7 +396,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.setCookie",
       label: "Cookie操作",
       icon: "cookie",
-      isAsync: true,
+      asyncMode: "await",
       config: [tabConfig],
       subCommands: [
         {
@@ -486,7 +486,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.clickElement",
       label: "元素操作",
       icon: "web",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         tabConfig,
         {
@@ -591,7 +591,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.scrollTo",
       label: "滚动及页面尺寸",
       icon: "open_in_full",
-      isAsync: true,
+      asyncMode: "await",
       config: [tabConfig],
       subCommands: [
         {
@@ -631,8 +631,8 @@ export const browserCommands = {
       value: "quickcomposer.browser.network.setRequestInterception",
       label: "修改请求/响应",
       icon: "network",
-      isAsync: true,
-      isAsync: true,
+      asyncMode: "await",
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.browser.network.setRequestInterception",
@@ -753,7 +753,7 @@ export const browserCommands = {
       value: "quickcomposer.browser.device.setDevice",
       label: "设备模拟",
       icon: "devices",
-      isAsync: true,
+      asyncMode: "await",
       config: [tabConfig],
       subCommands: [
         {
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index ef7a9c79..5dc51ad2 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -709,7 +709,7 @@ export const dataCommands = {
       label: "数据压缩解压",
       component: "ZlibEditor",
       icon: "compress",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.data.htmlParser",
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index 40555ef4..78869e6f 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -7,7 +7,7 @@ export const fileCommands = {
       value: "quickcomposer.file.operation",
       label: "文件/文件夹操作",
       component: "FileOperationEditor",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "utools.shellOpenItem",
@@ -67,7 +67,7 @@ export const fileCommands = {
       value: "quickcomposer.file.archive",
       label: "文件归档",
       icon: "archive",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "操作类型",
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index 300508b9..f71fcaf7 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -25,7 +25,7 @@ export const imageCommands = {
       value: "quickcomposer.image.analyze",
       label: "图片信息",
       icon: "analytics",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "图片文件",
@@ -54,7 +54,7 @@ export const imageCommands = {
       value: "quickcomposer.image.resize",
       label: "调整大小",
       icon: "aspect_ratio",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入文件",
@@ -140,7 +140,7 @@ export const imageCommands = {
       value: "quickcomposer.image.rotate",
       label: "旋转图片",
       icon: "rotate_right",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入文件",
@@ -207,7 +207,7 @@ export const imageCommands = {
       value: "quickcomposer.image.crop",
       label: "裁剪图片",
       icon: "crop",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入文件",
@@ -302,7 +302,7 @@ export const imageCommands = {
       value: "quickcomposer.image.watermark",
       label: "添加水印",
       icon: "format_color_text",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入文件",
@@ -409,7 +409,7 @@ export const imageCommands = {
       value: "quickcomposer.image.convert",
       label: "格式转换",
       icon: "transform",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入文件",
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 1673266c..c66e66e2 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -7,7 +7,7 @@ export const macosCommands = {
       value: "quickcomposer.macos.app.getFrontmost",
       label: "应用及窗口控制",
       icon: "apps",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.macos.app.getFrontmost",
@@ -15,29 +15,32 @@ export const macosCommands = {
           icon: "front_hand",
           outputs: {
             label: "前台应用信息",
-            name: { label: "应用名称" },
-            displayedName: { label: "应用显示名称" },
-            path: { label: "应用路径" },
-            version: { label: "应用版本" },
-            pid: { label: "应用进程ID" },
-            backgroundOnly: { label: "是否后台运行" },
-            visible: { label: "是否可见" },
-            frontmost: { label: "是否前台运行" },
-            window: {
-              label: "窗口信息",
-              name: { label: "窗口名称" },
-              title: { label: "窗口标题" },
-              index: { label: "窗口索引" },
-              position: {
-                label: "窗口位置",
-                placeholder: "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
-              },
-              size: {
-                label: "窗口大小",
-                placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
+            structure: {
+              name: { label: "应用名称" },
+              displayedName: { label: "应用显示名称" },
+              path: { label: "应用路径" },
+              version: { label: "应用版本" },
+              pid: { label: "应用进程ID" },
+              backgroundOnly: { label: "是否后台运行" },
+              visible: { label: "是否可见" },
+              frontmost: { label: "是否前台运行" },
+              window: {
+                label: "窗口信息",
+                name: { label: "窗口名称" },
+                title: { label: "窗口标题" },
+                index: { label: "窗口索引" },
+                position: {
+                  label: "窗口位置",
+                  placeholder:
+                    "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
+                },
+                size: {
+                  label: "窗口大小",
+                  placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
+                },
+                minimized: { label: "是否最小化" },
+                fullscreen: { label: "是否全屏" },
               },
-              minimized: { label: "是否最小化" },
-              fullscreen: { label: "是否全屏" },
             },
           },
         },
@@ -164,7 +167,7 @@ export const macosCommands = {
       value: "quickcomposer.macos.system.setVolume",
       label: "系统管理",
       icon: "settings",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.macos.system.setVolume",
@@ -284,7 +287,7 @@ export const macosCommands = {
       value: "quickcomposer.macos.finder.getSelection",
       label: "访达管理",
       icon: "folder",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.macos.finder.getSelection",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index ef004cf7..b8aa5a55 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -26,14 +26,14 @@ export const networkCommands = {
           icon: "public",
         },
       ],
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "ubrowser",
       label: "ubrowser浏览器操作",
       config: [],
       component: "UBrowserEditor",
-      isAsync: true,
+      asyncMode: "await",
       icon: "public",
     },
     {
@@ -41,7 +41,7 @@ export const networkCommands = {
       label: "HTTP请求(Axios)",
       config: [],
       component: "AxiosConfigEditor",
-      isAsync: true,
+      asyncMode: "await",
       icon: "http",
     },
     {
@@ -246,7 +246,7 @@ export const networkCommands = {
       value: "quickcomposer.network.dns.lookupHost",
       label: "DNS操作",
       icon: "dns",
-      isAsync: true,
+      asyncMode: "await",
       config: [],
       subCommands: [
         {
@@ -389,7 +389,7 @@ export const networkCommands = {
       value: "quickcommand.downloadFile",
       label: "下载文件",
       icon: "file_download",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "文件URL",
@@ -411,7 +411,7 @@ export const networkCommands = {
       value: "quickcommand.uploadFile",
       label: "上传文件",
       icon: "file_upload",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "上传接口地址",
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index 5c2ad5a9..3429eb8f 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -24,7 +24,7 @@ export const scriptCommands = {
       label: "运行脚本",
       component: "ScriptEditor",
       desc: "运行各种编程语言的代码",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "return",
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index f3e32f91..9199b481 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -216,19 +216,19 @@ export const simulateCommands = {
       label: "屏幕找图",
       component: "ImageSearchEditor",
       config: [],
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.simulate.screenColorPick",
       label: "屏幕取色",
       icon: "colorize",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.simulate.captureScreen",
       label: "屏幕截图",
       icon: "screenshot_monitor",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "截图范围",
diff --git a/src/js/composer/commands/statusCommands.js b/src/js/composer/commands/statusCommands.js
index 21fde820..ebaa8239 100644
--- a/src/js/composer/commands/statusCommands.js
+++ b/src/js/composer/commands/statusCommands.js
@@ -6,31 +6,31 @@ export const statusCommands = {
       value: "utools.readCurrentFolderPath",
       label: "获取当前文件管理器路径",
       icon: "folder",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "utools.readCurrentBrowserUrl",
       label: "获取当前浏览器地址",
       icon: "language",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.status.getSelectedText",
       label: "获取选中文本",
       icon: "text_fields",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.status.getSelectedImage",
       label: "获取选中的图片",
       icon: "image",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcomposer.status.getSelectedFiles",
       label: "获取选中的文件",
       icon: "file_present",
-      isAsync: true,
+      asyncMode: "await",
     },
   ],
 };
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index dd5a71fa..e7c8eb6c 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -105,7 +105,7 @@ export const systemCommands = {
       label: "执行系统命令",
       component: "SystemCommandEditor",
       icon: "terminal",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "utools.getPath",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 168c5fbf..93074d2e 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -111,7 +111,7 @@ export const uiCommands = {
     {
       value: "quickcommand.showMessageBox",
       label: "消息提示",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "提示内容",
@@ -168,7 +168,7 @@ export const uiCommands = {
     {
       value: "quickcommand.showConfirmBox",
       label: "确认框",
-      isAsync: true,
+      asyncMode: "await",
       outputs: {
         label: "是否确认",
       },
@@ -219,7 +219,7 @@ export const uiCommands = {
     {
       value: "quickcommand.showButtonBox",
       label: "按钮组",
-      isAsync: true,
+      asyncMode: "await",
       width: 12,
       config: [
         {
@@ -254,7 +254,7 @@ export const uiCommands = {
     {
       value: "quickcommand.showInputBox",
       label: "输入框",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "输入框",
@@ -293,12 +293,12 @@ export const uiCommands = {
       value: "quickcommand.showSelectList",
       label: "选择列表",
       component: "SelectListEditor",
-      isAsync: true,
+      asyncMode: "await",
     },
     {
       value: "quickcommand.showTextArea",
       label: "文本框",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "文本框占位符",
@@ -329,7 +329,7 @@ export const uiCommands = {
     {
       value: "quickcommand.showSystemWaitButton",
       label: "等待操作按钮",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           component: "OptionEditor",
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 5b23e1a3..5bdcb408 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -199,7 +199,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.window.getWindowInfo",
       label: "搜索/选择窗口",
       icon: "window",
-      isAsync: true,
+      asyncMode: "await",
       config: [],
       subCommands: [
         {
@@ -207,6 +207,22 @@ export const windowsCommands = {
           value: "quickcomposer.windows.window.getWindowInfo",
           label: "搜索窗口",
           icon: "search",
+          outputs: {
+            label: "窗口信息（数组）",
+            structure: [
+              {
+                handle: { label: "窗口句柄" },
+                title: { label: "窗口标题" },
+                class: { label: "窗口类名" },
+                x: { label: "窗口X坐标" },
+                y: { label: "窗口Y坐标" },
+                width: { label: "窗口宽度" },
+                height: { label: "窗口高度" },
+                processName: { label: "窗口进程名" },
+                processPath: { label: "窗口进程路径" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.automation.inspect",
@@ -381,14 +397,14 @@ export const windowsCommands = {
           ],
         },
       ],
-      isAsync: true,
+      asyncMode: "await",
     },
     // automation
     {
       value: "quickcomposer.windows.automation.click",
       label: "界面自动化",
       icon: "smart_button",
-      isAsync: true,
+      asyncMode: "await",
       config: searchElementConfig,
       subCommands: [
         {
@@ -611,7 +627,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.sendmessage.listControls",
       label: "发送控制消息",
       icon: "smart_button",
-      isAsync: true,
+      asyncMode: "await",
       config: windowHandleConfig,
       subCommands: [
         {
@@ -804,7 +820,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.monitor.watchClipboard",
       label: "剪贴板/文件监控",
       icon: "monitor_heart",
-      isAsync: true,
+      asyncMode: "await",
       showLoading: true,
       subCommands: [
         {
@@ -866,7 +882,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.process.listProcesses",
       label: "进程管理",
       icon: "memory",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.windows.process.listProcesses",
@@ -928,7 +944,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.registry.listKeys",
       label: "注册表管理",
       icon: "settings",
-      isAsync: true,
+      asyncMode: "await",
       config: [
         {
           label: "注册表路径",
@@ -1053,7 +1069,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.service.listServices",
       label: "服务管理",
       icon: "miscellaneous_services",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.windows.service.listServices",
@@ -1095,7 +1111,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.software.listSoftware",
       label: "软件管理",
       icon: "apps",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.windows.software.listSoftware",
@@ -1124,7 +1140,7 @@ export const windowsCommands = {
       value: "quickcomposer.windows.utils.setWallpaper",
       label: "系统工具",
       icon: "build",
-      isAsync: true,
+      asyncMode: "await",
       subCommands: [
         {
           value: "quickcomposer.windows.utils.setWallpaper",
diff --git a/src/js/composer/commonComponentGuide.js b/src/js/composer/commonComponentGuide.js
index 12fbc412..915c6ae7 100644
--- a/src/js/composer/commonComponentGuide.js
+++ b/src/js/composer/commonComponentGuide.js
@@ -103,7 +103,7 @@ const commonComponentGuide = {
       },
       optionalFields: {
         desc: "命令描述",
-        isAsync: "是否异步命令",
+        asyncMode: "async模式，可选值为await/then",
         icon: "命令图标",
       },
     },
diff --git a/src/js/composer/customComponentGuide.js b/src/js/composer/customComponentGuide.js
index ce8ad4c8..676783c8 100644
--- a/src/js/composer/customComponentGuide.js
+++ b/src/js/composer/customComponentGuide.js
@@ -270,7 +270,7 @@ const customComponentGuide = {
       },
       optionalFields: {
         desc: "命令描述",
-        isAsync: "是否异步命令",
+        asyncMode: "async模式，可选值为await/then",
         isControlFlow: "是否控制流命令",
       },
     },
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 599cd2e6..b4f375aa 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -1,10 +1,28 @@
 export function generateCode(flow) {
+  let usedVarNames = {};
+
+  // 获取变量赋值代码，如果变量已经存在，则直接赋值，否则声明并赋值
+  const getVarAssignCode = (varName, varValue, funcName) => {
+    if (!usedVarNames[funcName]) {
+      usedVarNames[funcName] = [];
+    }
+    if (usedVarNames[funcName].includes(varName)) {
+      return `${varName} = ${varValue};`;
+    }
+    usedVarNames[funcName].push(varName);
+    return `let ${varName} = ${varValue};`;
+  };
+
+  const getVarByPath = (name, path) => {
+    return `${name}${path.startsWith("[") ? "" : "."}${path}`;
+  };
+
   const { commands, name, label, customVariables = [] } = flow;
 
   const params = customVariables.filter((v) => v.type === "param") || [];
   const manualVars = customVariables.filter((v) => v.type === "var") || [];
   // 检查是否包含异步函数
-  const hasAsyncFunction = commands.some((cmd) => cmd.isAsync);
+  const hasAsyncFunction = commands.some((cmd) => cmd.asyncMode);
 
   let code = [];
   const funcName = name || "func_" + new Date().getTime();
@@ -17,9 +35,13 @@ export function generateCode(flow) {
       .join(", ")}) {`
   );
 
-  code.push(manualVars.map((v) => `  let ${v.name} = ${v.value};`).join("\n"));
   const indent = "  ";
 
+  // 局部变量赋值
+  manualVars.forEach((v) => {
+    code.push(indent + getVarAssignCode(v.name, v.value, flow.name));
+  });
+
   commands.forEach((cmd) => {
     // 跳过禁用的命令
     if (cmd.disabled) return;
@@ -29,36 +51,71 @@ export function generateCode(flow) {
     // 处理输出变量
     if (cmd.outputVariable) {
       const { name, details } = cmd.outputVariable;
-      if (cmd.isAsync) {
+      if (cmd.asyncMode === "then") {
+        // 使用回调函数模式
         if (cmd.callbackFunc) {
-          // 使用回调函数模式
-          cmdCode = `${cmdCode}.then(${cmd.callbackFunc})`;
-        } else {
-          // 使用 await 模式
-          cmdCode = `const ${name} = await ${cmdCode}`;
-          code.push(indent + cmdCode);
-          // 处理详细变量
-          if (details) {
-            Object.entries(details).forEach(([path, varName]) => {
-              code.push(`${indent}let ${varName} = ${name}.${path};`);
-            });
+          // 如果回调函数存在，则使用回调函数模式，否则保持原样
+          if (!details) {
+            cmdCode = `${cmdCode}.then(${cmd.callbackFunc})`;
+          } else {
+            // 如果输出变量有详细变量，则需要为每个变量赋值
+            const promiseName = name || "result";
+
+            const extractVarCode = Object.entries(details)
+              .map(
+                ([path, varName]) =>
+                  `let ${varName} = ${getVarByPath(promiseName, path)}`
+              )
+              .join("\n");
+
+            const funcName = cmd.callbackFunc;
+
+            const funcParams =
+              (name ? `${name},` : "") + Object.values(details).join(",");
+
+            cmdCode = `${cmdCode}.then((${promiseName})=>{
+              ${extractVarCode}
+              ${funcName}(${funcParams})
+              })`;
           }
-          return;
+        }
+        code.push(indent + cmdCode);
+      } else if (cmd.asyncMode === "await") {
+        // 使用 await 模式
+        const promiseName = name || "result";
+        cmdCode = getVarAssignCode(promiseName, `await ${cmdCode}`);
+        code.push(indent + cmdCode);
+        // 处理详细变量
+        if (details) {
+          Object.entries(details).forEach(([path, varName]) => {
+            code.push(
+              `${indent}${getVarAssignCode(
+                varName,
+                getVarByPath(promiseName, path)
+              )}`
+            );
+          });
         }
       } else {
-        cmdCode = `const ${name} = ${cmdCode}`;
+        // 非Async命令
+        cmdCode = getVarAssignCode(name, `${cmdCode}`);
         code.push(indent + cmdCode);
         // 处理详细变量
         if (details) {
           Object.entries(details).forEach(([path, varName]) => {
-            code.push(`${indent}let ${varName} = ${name}.${path};`);
+            code.push(
+              `${indent}${getVarAssignCode(varName, getVarByPath(name, path))}`
+            );
           });
         }
         return;
       }
+    } else {
+      if (cmd.asyncMode === "await") {
+        cmdCode = `await ${cmdCode}`;
+      }
+      code.push(indent + cmdCode);
     }
-
-    code.push(indent + cmdCode);
   });
 
   code.push("}"); // Close the function
diff --git a/src/js/composer/variableManager.js b/src/js/composer/variableManager.js
index 48dd674c..90f6646a 100644
--- a/src/js/composer/variableManager.js
+++ b/src/js/composer/variableManager.js
@@ -7,12 +7,7 @@ import { validateVariableName } from "js/common/variableValidator";
  */
 function generateRandomSuffix(varCount, withPrefix = true) {
   // 根据变量数量决定后缀长度
-  let length = 1; // 默认1位
-  if (varCount >= 100) {
-    length = 3;
-  } else if (varCount >= 10) {
-    length = 2;
-  }
+  let length = varCount > 100 ? 3 : 2;
 
   return (
     (withPrefix ? "_" : "") +
@@ -100,7 +95,9 @@ export function processVariable({ value, existingVars, baseName = "var" }) {
       isValid: true,
       processedValue: processedVar,
       warning:
-        processedVar !== value ? `输入值非法，已被修改为: ${processedVar}` : null,
+        processedVar !== value
+          ? `输入值非法，已被修改为: ${processedVar}`
+          : null,
     };
   }
 

From 40f1e1d7f782eabc777f8eebcb2c32a9a851959f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 13:24:04 +0800
Subject: [PATCH 135/332] =?UTF-8?q?=E9=87=8D=E6=9E=84=20OutputEditor?=
 =?UTF-8?q?=EF=BC=9A=E6=8F=90=E5=8F=96=E5=8F=AF=E9=87=8D=E7=94=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E6=94=B9=E8=BF=9B=E5=8F=98=E9=87=8F=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/OutputEditor.vue | 339 +++++-------------
 .../composer/card/output/OutputField.vue      |  86 +++++
 .../composer/card/output/OutputStructure.vue  | 127 +++++++
 .../composer/card/output/SectionBlock.vue     |  29 ++
 src/components/composer/flow/FlowManager.vue  |  24 +-
 src/js/composer/generateCode.js               |   3 +
 6 files changed, 357 insertions(+), 251 deletions(-)
 create mode 100644 src/components/composer/card/output/OutputField.vue
 create mode 100644 src/components/composer/card/output/OutputStructure.vue
 create mode 100644 src/components/composer/card/output/SectionBlock.vue

diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index e94b8799..4906733e 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -4,174 +4,82 @@
       <div class="row justify-center q-px-sm q-pt-md">
         {{ commandName }}
       </div>
-      <div class="simple-output q-px-sm">
-        <q-badge color="primary" class="q-mb-sm q-pa-xs">完整结果</q-badge>
-        <q-input v-model="simpleOutputVar" filled dense autofocus>
-          <template v-slot:prepend>
-            <div class="variable-label">
-              {{ currentOutputs?.label || "输出变量名" }}
-            </div>
-          </template>
-        </q-input>
-      </div>
-      <div v-if="currentOutputs?.structure">
-        <div class="row items-center">
-          <q-badge color="primary" class="q-ma-sm q-pa-xs">详细输出</q-badge>
-          <div
-            v-if="Array.isArray(currentOutputs.structure)"
-            class="text-caption text-grey-5"
-          >
-            数组中第一个元素
-          </div>
-        </div>
-        <q-scroll-area
-          style="height: 200px"
-          :thumb-style="{
-            width: '2px',
-          }"
-        >
-          <div class="detail-output column q-col-gutter-sm q-px-sm">
-            <!-- 处理数组类型的structure -->
-            <template v-if="Array.isArray(currentOutputs.structure)">
-              <div
-                v-for="(output, key) in currentOutputs.structure[0]"
-                :key="key"
-              >
-                <!-- 如果是嵌套对象 -->
-                <div v-if="hasNestedFields(output)">
-                  <BorderLabel
-                    :label="output.label || key"
-                    :model-value="false"
-                  >
-                    <div class="column q-col-gutter-sm">
-                      <div
-                        v-for="(subOutput, subKey) in getNestedFields(output)"
-                        :key="subKey"
-                      >
-                        <div class="output-item">
-                          <q-input
-                            v-model="outputVars[`[0].${key}.${subKey}`]"
-                            filled
-                            dense
-                            autofocus
-                            class="col"
-                            :placeholder="subOutput.placeholder"
-                          >
-                            <template v-slot:prepend>
-                              <div class="variable-label">
-                                {{ subOutput.label }}
-                              </div>
-                            </template>
-                          </q-input>
-                        </div>
-                      </div>
-                    </div>
-                  </BorderLabel>
-                </div>
-                <!-- 如果是普通字段 -->
-                <div v-else class="output-item">
-                  <q-input
-                    v-model="outputVars[`[0].${key}`]"
-                    filled
-                    dense
-                    class="col"
-                    :placeholder="output.placeholder"
-                    autofocus
-                  >
-                    <template v-slot:prepend>
-                      <div class="variable-label">{{ output.label }}</div>
-                    </template>
-                  </q-input>
-                </div>
-              </div>
-            </template>
-            <!-- 处理对象类型的structure -->
-            <template v-else>
-              <div
-                v-for="(output, key) in currentOutputs?.structure"
-                :key="key"
-              >
-                <!-- 如果是嵌套对象 -->
-                <div v-if="hasNestedFields(output)">
-                  <BorderLabel
-                    :label="output.label || key"
-                    :model-value="false"
-                  >
-                    <div class="column q-col-gutter-sm">
-                      <div
-                        v-for="(subOutput, subKey) in getNestedFields(output)"
-                        :key="subKey"
-                      >
-                        <div class="output-item">
-                          <q-input
-                            v-model="outputVars[`${key}.${subKey}`]"
-                            filled
-                            dense
-                            autofocus
-                            class="col"
-                            :placeholder="subOutput.placeholder"
-                          >
-                            <template v-slot:prepend>
-                              <div class="variable-label">
-                                {{ subOutput.label }}
-                              </div>
-                            </template>
-                          </q-input>
-                        </div>
-                      </div>
-                    </div>
-                  </BorderLabel>
-                </div>
-                <!-- 如果是普通字段 -->
-                <div v-else class="output-item">
-                  <q-input
-                    v-model="outputVars[key]"
-                    filled
-                    dense
-                    class="col"
-                    :placeholder="output.placeholder"
-                    autofocus
-                  >
-                    <template v-slot:prepend>
-                      <div class="variable-label">{{ output.label }}</div>
-                    </template>
-                  </q-input>
-                </div>
-              </div>
-            </template>
-          </div>
-        </q-scroll-area>
-      </div>
 
-      <div v-if="!!asyncMode">
-        <q-badge color="primary" class="q-ma-sm q-pa-xs">运行模式</q-badge>
-        <div class="row q-col-gutter-sm q-px-sm">
-          <q-select
-            v-model="asyncMode"
-            :options="asyncModeOptions"
-            filled
-            dense
-            autofocus
-            emit-value
-            map-options
-            class="col"
-          >
-          </q-select>
-          <q-input
-            v-model="callbackFunc"
-            filled
-            dense
-            autofocus
-            class="col-8"
-            v-if="asyncMode === 'then'"
-            placeholder="新函数名则自动创建"
+      <!-- 完整结果部分 -->
+      <SectionBlock title="完整结果">
+        <OutputField
+          v-model="simpleOutputVar"
+          :label="currentOutputs?.label || '输出变量名'"
+          autofocus
+          class="q-px-sm"
+        />
+      </SectionBlock>
+
+      <!-- 详细输出部分 -->
+      <template v-if="currentOutputs?.structure">
+        <SectionBlock
+          title="详细输出"
+          :subtitle="
+            Array.isArray(currentOutputs.structure) ? '数组中第一个元素' : ''
+          "
+        >
+          <q-scroll-area
+            style="height: 200px"
+            :thumb-style="{
+              width: '2px',
+            }"
           >
-            <template v-slot:prepend>
-              <div class="variable-label">回调函数</div>
+            <div class="detail-output column q-col-gutter-sm q-px-sm">
+              <template v-if="Array.isArray(currentOutputs.structure)">
+                <template
+                  v-for="(output, key) in currentOutputs.structure[0]"
+                  :key="key"
+                >
+                  <OutputStructure
+                    :output="output"
+                    :output-key="key"
+                    :is-array="true"
+                    v-model="outputVars"
+                  />
+                </template>
+              </template>
+              <template v-else>
+                <template
+                  v-for="(output, key) in currentOutputs?.structure"
+                  :key="key"
+                >
+                  <OutputStructure
+                    :output="output"
+                    :output-key="key"
+                    v-model="outputVars"
+                  />
+                </template>
+              </template>
+            </div>
+          </q-scroll-area>
+        </SectionBlock>
+      </template>
+
+      <!-- 运行模式部分 -->
+      <template v-if="!!asyncMode">
+        <SectionBlock title="运行模式">
+          <div class="row q-col-gutter-sm q-px-sm">
+            <OutputField
+              v-model="asyncMode"
+              class="col"
+              :options="asyncModeOptions"
+            />
+            <template v-if="asyncMode === 'then'">
+              <OutputField
+                v-model="callbackFunc"
+                label="回调函数"
+                placeholder="新函数名则自动创建"
+                class="col-8"
+              />
             </template>
-          </q-input>
-        </div>
-      </div>
+          </div>
+        </SectionBlock>
+      </template>
 
       <div class="row justify-end q-px-sm q-py-sm">
         <q-btn flat label="取消" color="primary" v-close-popup />
@@ -183,12 +91,17 @@
 
 <script>
 import { defineComponent } from "vue";
-import BorderLabel from "components/composer/common/BorderLabel.vue";
+import { validateVariableName } from "js/common/variableValidator";
+import OutputField from "./output/OutputField.vue";
+import SectionBlock from "./output/SectionBlock.vue";
+import OutputStructure from "./output/OutputStructure.vue";
 
 export default defineComponent({
   name: "OutputEditor",
   components: {
-    BorderLabel,
+    OutputField,
+    SectionBlock,
+    OutputStructure,
   },
   props: {
     modelValue: {
@@ -263,39 +176,6 @@ export default defineComponent({
     },
   },
   methods: {
-    hasNestedFields(output) {
-      if (!output) return false;
-      return Object.keys(output).some(
-        (key) => key !== "label" && key !== "placeholder"
-      );
-    },
-    /**
-     * 只处理一层嵌套，手动在配置文件中控制outputs结构不要太复杂
-     * 第二层嵌套只嵌套对象，不嵌套数组
-     * 最复杂的情况：
-     * outputs: {
-     *   label: "测试",
-     *   structure: [
-     *     {
-     *       position: { label: "位置", {
-     *         x: { label: "X坐标" },
-     *         y: { label: "Y坐标" }
-     *       }
-     *     }
-     *   ]
-     * }
-     *
-     *
-     */
-    getNestedFields(output) {
-      const fields = {};
-      Object.entries(output).forEach(([key, value]) => {
-        if (key !== "label" && key !== "placeholder") {
-          fields[key] = value;
-        }
-      });
-      return fields;
-    },
     initOutputVars(outputVariable) {
       // 初始化完整输出变量名
       if (!outputVariable) return;
@@ -338,6 +218,25 @@ export default defineComponent({
         }
       }
 
+      // 检查变量名是否合法
+      const varNames = [
+        outputVariable.name,
+        ...Object.keys(outputVariable.details || {}),
+        result.callbackFunc,
+      ].filter(Boolean);
+
+      const invalidVars = varNames.filter((name) => {
+        return !validateVariableName(name).isValid;
+      });
+
+      if (invalidVars.length > 0) {
+        quickcommand.showMessageBox(
+          `变量名/函数名 ${invalidVars.join(", ")} 包含无效字符，请修改`,
+          "error"
+        );
+        return;
+      }
+
       this.$emit("confirm", result);
       this.isOpen = false;
     },
@@ -349,44 +248,4 @@ export default defineComponent({
 .output-editor {
   width: 450px;
 }
-
-.output-item {
-  border-radius: 8px;
-  transition: all 0.3s ease;
-}
-
-.output-item:hover {
-  background: rgba(0, 0, 0, 0.02);
-}
-
-.variable-label {
-  font-size: 12px;
-  border-radius: 4px;
-  padding-right: 10px;
-  text-align: center;
-}
-
-.body--dark .output-item:hover {
-  background: rgba(255, 255, 255, 0.02);
-}
-
-.output-editor :deep(.q-field--filled .q-field__control),
-.output-editor :deep(.q-field--filled .q-field__control > *),
-.output-editor :deep(.q-field--filled .q-field__native) {
-  max-height: 36px;
-  min-height: 36px;
-  border-radius: 5px;
-  font-size: 12px;
-}
-
-/* 去除filled输入框边框 */
-.output-editor :deep(.q-field__control:before) {
-  border: none;
-}
-
-/* 去除filled输入框下划线 */
-.output-editor :deep(.q-field__control:after) {
-  height: 0;
-  border-bottom: none;
-}
 </style>
diff --git a/src/components/composer/card/output/OutputField.vue b/src/components/composer/card/output/OutputField.vue
new file mode 100644
index 00000000..0c5cd203
--- /dev/null
+++ b/src/components/composer/card/output/OutputField.vue
@@ -0,0 +1,86 @@
+<template>
+  <q-input
+    v-if="!options"
+    :model-value="modelValue"
+    @update:model-value="$emit('update:modelValue', $event)"
+    filled
+    dense
+    class="output-field"
+    :placeholder="placeholder"
+    :autofocus="autofocus"
+  >
+    <template v-slot:prepend>
+      <div class="variable-label">{{ label }}</div>
+    </template>
+  </q-input>
+  <q-select
+    v-else
+    :model-value="modelValue"
+    :options="options"
+    filled
+    dense
+    emit-value
+    map-options
+    class="output-field"
+    @update:model-value="$emit('update:modelValue', $event)"
+  />
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "OutputField",
+  props: {
+    modelValue: {
+      type: String,
+      default: "",
+    },
+    label: {
+      type: String,
+    },
+    placeholder: {
+      type: String,
+      default: "",
+    },
+    autofocus: {
+      type: Boolean,
+      default: false,
+    },
+    options: {
+      type: null,
+      default: null,
+    },
+  },
+  emits: ["update:modelValue"],
+});
+</script>
+
+<style scoped>
+.variable-label {
+  font-size: 12px;
+  border-radius: 4px;
+  padding-right: 10px;
+  text-align: center;
+}
+
+.output-field :deep(.q-field__control),
+.output-field :deep(.q-field__control > *),
+.output-field :deep(.q-field__native) {
+  max-height: 36px;
+  min-height: 36px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+
+/* 去除filled输入框边框 */
+.output-field :deep(.q-field__control:before) {
+  border: none;
+}
+
+/* 去除filled输入框下划线 */
+.output-field :deep(.q-field__control:after) {
+  height: 0;
+  border-bottom: none;
+}
+</style>
diff --git a/src/components/composer/card/output/OutputStructure.vue b/src/components/composer/card/output/OutputStructure.vue
new file mode 100644
index 00000000..917f5f4b
--- /dev/null
+++ b/src/components/composer/card/output/OutputStructure.vue
@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <!-- 如果是嵌套对象 -->
+    <div v-if="hasNestedFields">
+      <BorderLabel :label="output.label || outputKey" :model-value="false">
+        <div class="column q-col-gutter-sm">
+          <div v-for="(subOutput, subKey) in getNestedFields" :key="subKey">
+            <div class="output-item">
+              <OutputField
+                :model-value="modelValue[getFieldPath(subKey)]"
+                @update:model-value="updateField(subKey, $event)"
+                :label="subOutput.label"
+                :placeholder="subOutput.placeholder"
+                autofocus
+              />
+            </div>
+          </div>
+        </div>
+      </BorderLabel>
+    </div>
+    <!-- 如果是普通字段 -->
+    <div v-else class="output-item">
+      <OutputField
+        :model-value="modelValue[getFieldPath()]"
+        @update:model-value="updateField('', $event)"
+        :label="output.label"
+        :placeholder="output.placeholder"
+        autofocus
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+/**
+ * 只处理一层嵌套，手动在配置文件中控制outputs结构不要太复杂
+ * 第二层嵌套只嵌套对象，不嵌套数组
+ * 最复杂的情况：
+ * outputs: {
+ *   label: "测试",
+ *   structure: [
+ *     {
+ *       position: { label: "位置", {
+ *         x: { label: "X坐标" },
+ *         y: { label: "Y坐标" }
+ *       }
+ *     }
+ *   ]
+ * }
+ *
+ *
+ */
+import { defineComponent } from "vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
+import OutputField from "./OutputField.vue";
+
+export default defineComponent({
+  name: "OutputStructure",
+  components: {
+    BorderLabel,
+    OutputField,
+  },
+  props: {
+    output: {
+      type: Object,
+      required: true,
+    },
+    outputKey: {
+      type: String,
+      required: true,
+    },
+    isArray: {
+      type: Boolean,
+      default: false,
+    },
+    modelValue: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  emits: ["update:modelValue"],
+  computed: {
+    hasNestedFields() {
+      if (!this.output) return false;
+      return Object.keys(this.output).some(
+        (key) => key !== "label" && key !== "placeholder"
+      );
+    },
+    getNestedFields() {
+      const fields = {};
+      Object.entries(this.output).forEach(([key, value]) => {
+        if (key !== "label" && key !== "placeholder") {
+          fields[key] = value;
+        }
+      });
+      return fields;
+    },
+  },
+  methods: {
+    getFieldPath(subKey = "") {
+      const base = this.isArray ? `[0].${this.outputKey}` : this.outputKey;
+      return subKey ? `${base}.${subKey}` : base;
+    },
+    updateField(subKey, value) {
+      const path = this.getFieldPath(subKey);
+      const newValue = { ...this.modelValue };
+      newValue[path] = value;
+      this.$emit("update:modelValue", newValue);
+    },
+  },
+});
+</script>
+
+<style scoped>
+.output-item {
+  border-radius: 8px;
+  transition: all 0.3s ease;
+}
+
+.output-item:hover {
+  background: rgba(0, 0, 0, 0.02);
+}
+
+.body--dark .output-item:hover {
+  background: rgba(255, 255, 255, 0.02);
+}
+</style>
diff --git a/src/components/composer/card/output/SectionBlock.vue b/src/components/composer/card/output/SectionBlock.vue
new file mode 100644
index 00000000..9178e37b
--- /dev/null
+++ b/src/components/composer/card/output/SectionBlock.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <div class="row items-center">
+      <q-badge color="primary" class="q-ma-sm q-pa-xs">{{ title }}</q-badge>
+      <div v-if="subtitle" class="text-caption text-grey-5">
+        {{ subtitle }}
+      </div>
+    </div>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "SectionBlock",
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    subtitle: {
+      type: String,
+      default: "",
+    },
+  },
+});
+</script>
diff --git a/src/components/composer/flow/FlowManager.vue b/src/components/composer/flow/FlowManager.vue
index b137e113..c01aef13 100644
--- a/src/components/composer/flow/FlowManager.vue
+++ b/src/components/composer/flow/FlowManager.vue
@@ -35,6 +35,7 @@
                 dense
                 borderless
                 class="var-input"
+                @blur="validateVariable(localFlow)"
               >
                 <template #prepend>
                   <div class="var-label">标识</div>
@@ -76,8 +77,8 @@
               dense
               borderless
               class="var-input"
-              @blur="validateVariable(variable, 'param')"
-              @keydown.enter="validateVariable(variable, 'param')"
+              @blur="validateVariable(variable)"
+              @keydown.enter="validateVariable(variable)"
             />
             <q-btn
               flat
@@ -125,8 +126,8 @@
                 borderless
                 class="var-input"
                 placeholder="变量名"
-                @blur="validateVariable(variable, 'var')"
-                @keydown.enter="validateVariable(variable, 'var')"
+                @blur="validateVariable(variable)"
+                @keydown.enter="validateVariable(variable)"
               />
               <q-separator vertical />
               <q-input
@@ -174,6 +175,7 @@
 
 <script>
 import { defineComponent } from "vue";
+import { validateVariableName } from "js/common/variableValidator";
 
 export default defineComponent({
   name: "FlowManager",
@@ -242,14 +244,14 @@ export default defineComponent({
         this.localFlow.customVariables = newVars;
       }
     },
-    validateVariable(variable, type) {
-      if (!variable.name) {
-        const prefix = type === "param" ? "param_" : "var_";
-        const count = this.localFlow.customVariables.filter(
-          (v) => v.type === type
-        ).length;
-        variable.name = prefix + count;
+    validateVariable(variable) {
+      if (validateVariableName(variable.name).isValid) {
+        return;
       }
+      quickcommand.showMessageBox(
+        `变量/函数名 ${variable.name} 包含无效字符，请修改`,
+        "error"
+      );
     },
   },
 });
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index b4f375aa..f0c12acd 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -10,6 +10,9 @@ export function generateCode(flow) {
       return `${varName} = ${varValue};`;
     }
     usedVarNames[funcName].push(varName);
+    if (!varValue) {
+      return `let ${varName};`;
+    }
     return `let ${varName} = ${varValue};`;
   };
 

From f1dd98624eb98feba9f63ed14d805fd0fd3f511f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 14:41:22 +0800
Subject: [PATCH 136/332] =?UTF-8?q?OutPutEditor=E6=94=AF=E6=8C=81=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E5=8F=98=E9=87=8F=E5=92=8C=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/card/CommandButtons.vue          | 11 ++++-
 src/components/composer/card/OutputEditor.vue |  2 +
 .../composer/card/output/OutputField.vue      | 47 +++++++++++++++++++
 .../composer/common/VariableInput.vue         | 16 ++++++-
 .../composer/common/varinput/VariableList.vue | 34 +++++++++-----
 src/components/composer/flow/FlowManager.vue  |  7 ++-
 src/js/composer/generateCode.js               | 22 +++++----
 7 files changed, 112 insertions(+), 27 deletions(-)

diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index cd163ccd..eadb4a13 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -10,8 +10,10 @@
         <q-icon
           name="output"
           v-if="!command.neverHasOutput"
-          class="output-btn"
-          :color="command.outputVariable ? 'primary' : ''"
+          :class="[
+            'output-btn',
+            command.outputVariable ? 'output-btn-active' : '',
+          ]"
           @click="showOutputEditor = true"
         >
           <q-tooltip>
@@ -195,6 +197,11 @@ export default {
   color: var(--q-primary);
 }
 
+.output-btn-active {
+  color: var(--q-primary);
+  opacity: 1;
+}
+
 /* 暗色模式适配 */
 .body--dark .output-btn {
   border-color: rgba(255, 255, 255, 0.1);
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 4906733e..9ea3ecb3 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -11,6 +11,7 @@
           v-model="simpleOutputVar"
           :label="currentOutputs?.label || '输出变量名'"
           autofocus
+          :show-variable-list="true"
           class="q-px-sm"
         />
       </SectionBlock>
@@ -75,6 +76,7 @@
                 label="回调函数"
                 placeholder="新函数名则自动创建"
                 class="col-8"
+                :show-function-list="true"
               />
             </template>
           </div>
diff --git a/src/components/composer/card/output/OutputField.vue b/src/components/composer/card/output/OutputField.vue
index 0c5cd203..3ec7bccf 100644
--- a/src/components/composer/card/output/OutputField.vue
+++ b/src/components/composer/card/output/OutputField.vue
@@ -12,6 +12,14 @@
     <template v-slot:prepend>
       <div class="variable-label">{{ label }}</div>
     </template>
+    <template v-slot:append>
+      <VariableList
+        :show-variable-list="showVariableList"
+        :show-function-list="showFunctionList"
+        @emit-value="updateValBySelect"
+        class="variable-list-btn"
+      />
+    </template>
   </q-input>
   <q-select
     v-else
@@ -28,8 +36,12 @@
 
 <script>
 import { defineComponent } from "vue";
+import VariableList from "components/composer/common/varinput/VariableList.vue";
 
 export default defineComponent({
+  components: {
+    VariableList,
+  },
   name: "OutputField",
   props: {
     modelValue: {
@@ -51,8 +63,21 @@ export default defineComponent({
       type: null,
       default: null,
     },
+    showVariableList: {
+      type: Boolean,
+      default: false,
+    },
+    showFunctionList: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ["update:modelValue"],
+  methods: {
+    updateValBySelect(_type, val) {
+      this.$emit("update:modelValue", val);
+    },
+  },
 });
 </script>
 
@@ -73,6 +98,14 @@ export default defineComponent({
   font-size: 12px;
 }
 
+.output-field:not(.q-select) :deep(.q-field__control) {
+  padding-right: 0;
+}
+
+.output-field.q-select :deep(.q-field__append) {
+  font-size: 16px;
+}
+
 /* 去除filled输入框边框 */
 .output-field :deep(.q-field__control:before) {
   border: none;
@@ -83,4 +116,18 @@ export default defineComponent({
   height: 0;
   border-bottom: none;
 }
+
+.variable-list-btn {
+  padding: 0 12px;
+}
+
+/* 去掉下拉按钮的焦点效果 */
+.variable-list-btn :deep(.q-focus-helper) {
+  display: none !important;
+}
+
+/* 移除波纹效果 */
+.variable-list-btn :deep(.q-ripple) {
+  display: none;
+}
 </style>
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 9dad0d66..1c2e89b2 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -47,7 +47,12 @@
         class="prepend-btn"
       />
       <!-- 变量选择下拉 -->
-      <VariableList @emit-value="updateValBySelect" class="prepend-btn" />
+      <VariableList
+        @emit-value="updateValBySelect"
+        :show-variable-list="true"
+        :show-function-list="true"
+        class="prepend-btn variable-list-btn"
+      />
     </template>
     <template v-slot:prepend>
       <q-icon v-if="!noIcon" :name="icon || 'code'" />
@@ -294,4 +299,13 @@ export default defineComponent({
   margin-left: 5px;
   transition: all 0.6s ease;
 }
+
+/* 暗色模式 */
+.variable-list-btn {
+  background: rgba(0, 0, 0, 0.02);
+}
+
+.body--dark .variable-list-btn {
+  background: rgba(255, 255, 255, 0.02);
+}
 </style>
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index dccf78e7..3a27ce8f 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -4,12 +4,13 @@
     dense
     stretch
     size="sm"
-    class="variable-dropdown"
+    :dropdown-icon="icon"
+    :no-icon-animation="icon !== 'arrow_drop_down'"
     @click="({ variables, functions } = getAvailableVariablesAndFunctions())"
   >
     <q-list class="variable-list">
       <template v-if="variables.length || functions.length">
-        <div v-if="variables.length">
+        <div v-if="variables.length && showVariableList">
           <q-item-label header class="variable-label">
             <q-separator class="separator-left" />
             <div class="label-content">
@@ -35,7 +36,7 @@
             </q-item-section>
           </q-item>
         </div>
-        <div v-if="functions.length">
+        <div v-if="functions.length && showFunctionList">
           <q-item-label header class="variable-label">
             <q-separator class="separator-left" />
             <div class="label-content">
@@ -143,13 +144,15 @@ export default defineComponent({
 
     const getAvailableVariables = () => {
       const variables = getCurrentVariables();
-      return variables.filter((variable) =>
+      const usableVariables = variables.filter((variable) =>
         // 输出变量只显示在当前命令之前的
         variable.type === "output"
           ? variable.sourceCommand.index < commandIndex.value
           : // 参数和局部变量显示所有
             true
       );
+      // 去除名称重复的变量，只保留最新的
+      return [...new Map(usableVariables.map((v) => [v.name, v])).values()];
     };
 
     const getCurrentFunctions = inject("getCurrentFunctions");
@@ -188,6 +191,20 @@ export default defineComponent({
       );
     },
   },
+  props: {
+    showVariableList: {
+      type: Boolean,
+      default: true,
+    },
+    showFunctionList: {
+      type: Boolean,
+      default: true,
+    },
+    icon: {
+      type: String,
+      default: "arrow_drop_down",
+    },
+  },
 });
 </script>
 
@@ -293,15 +310,6 @@ export default defineComponent({
   color: var(--q-grey-7);
 }
 
-/* 暗色模式 */
-.variable-dropdown {
-  background: rgba(0, 0, 0, 0.02);
-}
-
-.body--dark .variable-dropdown {
-  background: rgba(255, 255, 255, 0.02);
-}
-
 .body--dark .variable-item:hover {
   background: rgba(255, 255, 255, 0.1);
 }
diff --git a/src/components/composer/flow/FlowManager.vue b/src/components/composer/flow/FlowManager.vue
index c01aef13..091212e4 100644
--- a/src/components/composer/flow/FlowManager.vue
+++ b/src/components/composer/flow/FlowManager.vue
@@ -160,7 +160,7 @@
         </div>
         <div class="var-list">
           <div
-            v-for="(variable, index) in localFlow.outputVariables"
+            v-for="(variable, index) in outputVariables"
             :key="index"
             class="var-item output-var"
           >
@@ -198,6 +198,11 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    outputVariables: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
   },
   emits: ["update:modelValue", "update:flow"],
   computed: {
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index f0c12acd..0e63322d 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -1,15 +1,12 @@
 export function generateCode(flow) {
-  let usedVarNames = {};
+  let usedVarNames = [];
 
   // 获取变量赋值代码，如果变量已经存在，则直接赋值，否则声明并赋值
-  const getVarAssignCode = (varName, varValue, funcName) => {
-    if (!usedVarNames[funcName]) {
-      usedVarNames[funcName] = [];
-    }
-    if (usedVarNames[funcName].includes(varName)) {
+  const getVarAssignCode = (varName, varValue) => {
+    if (usedVarNames.includes(varName)) {
       return `${varName} = ${varValue};`;
     }
-    usedVarNames[funcName].push(varName);
+    usedVarNames.push(varName);
     if (!varValue) {
       return `let ${varName};`;
     }
@@ -42,7 +39,7 @@ export function generateCode(flow) {
 
   // 局部变量赋值
   manualVars.forEach((v) => {
-    code.push(indent + getVarAssignCode(v.name, v.value, flow.name));
+    code.push(indent + getVarAssignCode(v.name, v.value));
   });
 
   commands.forEach((cmd) => {
@@ -94,7 +91,8 @@ export function generateCode(flow) {
             code.push(
               `${indent}${getVarAssignCode(
                 varName,
-                getVarByPath(promiseName, path)
+                getVarByPath(promiseName, path),
+                flow.name
               )}`
             );
           });
@@ -107,7 +105,11 @@ export function generateCode(flow) {
         if (details) {
           Object.entries(details).forEach(([path, varName]) => {
             code.push(
-              `${indent}${getVarAssignCode(varName, getVarByPath(name, path))}`
+              `${indent}${getVarAssignCode(
+                varName,
+                getVarByPath(name, path),
+                flow.name
+              )}`
             );
           });
         }

From baf521713231e9efd297ff0372c8e56c4c6eb46c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 15:26:27 +0800
Subject: [PATCH 137/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=91=BD=E4=BB=A4=E6=97=B6=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      | 56 +++++++++++++++----
 src/components/composer/ComposerFlow.vue      | 23 +-------
 src/components/composer/card/OutputEditor.vue |  8 ++-
 3 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index baa6a31d..fd9ce7f0 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -192,14 +192,26 @@ export default defineComponent({
       if (!this.localCommand.code)
         return quickcommand.showMessageBox("请检查参数是否正确", "info");
       // 创建一个带临时变量的命令副本
+      const outputVariable = this.getAvailableOutputVariable();
       const tempCommand = {
         ...this.localCommand,
-        outputVariable: {
-          name: `temp_${Date.now()}`,
-          ...this.localCommand.outputVariable,
-        },
+        outputVariable,
       };
-      this.$emit("run", tempCommand);
+      const consoleLogVars =
+        this.getAvailableOutputVariableName(outputVariable);
+      const tempFlow = {
+        name: "main",
+        commands: [
+          tempCommand,
+          {
+            //没有输出，则不打印
+            code: `if(${consoleLogVars}!==undefined){
+              console.log(${consoleLogVars})
+            }`,
+          },
+        ],
+      };
+      this.$emit("run", tempFlow);
     },
     handleToggleCollapse() {
       if (this.localCommand.isControlFlow) {
@@ -245,13 +257,33 @@ export default defineComponent({
         this.localCommand.disabled = !this.localCommand.disabled;
       }
     },
+    getAvailableOutputVariable() {
+      let outputVariable = this.localCommand.outputVariable || {};
+      if (!outputVariable.name && !outputVariable.details) {
+        outputVariable.name = `temp_${Date.now()}`;
+      }
+      return outputVariable;
+    },
+    getAvailableOutputVariableName(outputVariable) {
+      const availableVars = [
+        outputVariable.name,
+        ...Object.values(outputVariable.details || {}),
+      ].filter((v) => v);
+
+      const finalVars =
+        availableVars.length > 1
+          ? `{ ${availableVars.join(", ")} }`
+          : availableVars[0];
+      return finalVars;
+    },
     handleAddPrint() {
       // 创建一个打印命令
-      this.localCommand.outputVariable = {
-        name: `temp_${Date.now()}`,
-        ...this.localCommand.outputVariable,
-      };
-      const printCommand = {
+      const outputVariable = this.getAvailableOutputVariable();
+      this.localCommand.outputVariable = outputVariable;
+      const consoleLogVars =
+        this.getAvailableOutputVariableName(outputVariable);
+
+      const consoleLogCommand = {
         value: "console.log",
         label: "显示消息",
         config: [
@@ -261,10 +293,10 @@ export default defineComponent({
             icon: "info",
           },
         ],
-        argvs: [newVarInputVal("var", this.localCommand.outputVariable.name)],
+        argvs: [newVarInputVal("var", consoleLogVars)],
       };
       this.$emit("add-command", {
-        command: printCommand,
+        command: consoleLogCommand,
         type: "single",
       });
     },
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index ee01eca6..46d6537b 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -39,10 +39,10 @@
                   v-model="commands[index]"
                   :command-index="index"
                   @remove="removeCommand(index)"
-                  @run="handleRunCommand"
+                  @run="$emit('action', 'run', $event)"
                   @add-branch="addBranch"
-                  @toggle-collapse="(event) => handleChainCollapse(event)"
-                  @add-command="(event) => handleAddCommand(event, index)"
+                  @toggle-collapse="handleChainCollapse"
+                  @add-command="handleAddCommand($event, index)"
                   @toggle-chain-disable="handleToggleChainDisable"
                 />
               </div>
@@ -336,23 +336,6 @@ export default defineComponent({
         this.removeRangeCommand(index);
       }
     },
-    handleRunCommand(command) {
-      // 创建一个临时的命令流程
-      const tempFlow = {
-        name: "main",
-        commands: [
-          command,
-          {
-            //没有输出，则不打印
-            code: `if(${command.outputVariable.name}!==undefined){
-              console.log(${command.outputVariable.name})
-            }`,
-          },
-        ],
-      };
-      // 触发运行事件
-      this.$emit("action", "run", tempFlow);
-    },
     // 查找不可重复出现的分支
     findUniqueBranch(chainId, commandType) {
       const uniqueBranch = ["default", "catch", "finally"];
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 9ea3ecb3..20fab7d3 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -189,9 +189,11 @@ export default defineComponent({
       }
     },
     handleConfirm() {
-      const outputVariable = {
-        name: this.simpleOutputVar,
-      };
+      const outputVariable = {};
+
+      if (this.simpleOutputVar) {
+        outputVariable.name = this.simpleOutputVar;
+      }
 
       if (this.currentOutputs) {
         const flatVars = {};

From 73684865aee5ec4f3b630a1aa113fcc24d14b88f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 17:25:58 +0800
Subject: [PATCH 138/332] =?UTF-8?q?OutPutEditor=E6=B7=BB=E5=8A=A0=E9=94=AE?=
 =?UTF-8?q?=E5=85=A5=E5=BB=BA=E8=AE=AE=E5=8F=98=E9=87=8F=E5=90=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=B9=B6=E5=8A=A0=E5=85=A5=E9=87=8D=E5=90=8D?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue      |  2 -
 src/components/composer/ComposerFlow.vue      |  4 --
 src/components/composer/FlowTabs.vue          |  9 +---
 src/components/composer/MultiParams.vue       | 11 ++++-
 src/components/composer/card/OutputEditor.vue | 42 +++++++++-------
 .../composer/card/output/OutputField.vue      | 48 ++++++++++++++++++-
 .../composer/card/output/OutputStructure.vue  | 11 ++++-
 src/js/composer/commands/macosCommands.js     | 45 ++++++++++++-----
 8 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index fd9ce7f0..5e9212a6 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -146,12 +146,10 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const getCurrentExistingVar = inject("getCurrentExistingVar");
     // 创建响应式的commandIndex
     const commandIndex = computed(() => props.commandIndex);
     // 主要用于VariableInput组件的变量选择下拉框，获取当前命令的索引
     provide("commandIndex", commandIndex);
-    return { getCurrentExistingVar };
   },
   methods: {
     handleOutputVariableUpdate(result) {
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 46d6537b..cddeea0e 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -90,10 +90,6 @@ export default defineComponent({
       default: true,
     },
   },
-  setup() {
-    const getCurrentExistingVar = inject("getCurrentExistingVar");
-    return { getCurrentExistingVar };
-  },
   emits: ["update:modelValue", "add-command", "action"],
   data() {
     return {
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index e301be45..f7e18e0b 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -151,7 +151,7 @@ export default defineComponent({
     const getOutputVariables = (flow = getCurrentFlow()) => {
       const variables = [];
       for (const [index, cmd] of flow.commands.entries()) {
-        if (cmd.outputVariable) {
+        if (cmd.outputVariable && cmd.asyncMode !== "then") {
           const { name, details = {} } = cmd.outputVariable;
           variables.push(
             ...[name, ...Object.values(details)].map((variable) => ({
@@ -199,12 +199,6 @@ export default defineComponent({
 
     provide("getCurrentVariables", getCurrentVariables);
 
-    const getCurrentExistingVar = () => {
-      return [...getCurrentVariables(), ...getCurrentFunctions()];
-    };
-
-    provide("getCurrentExistingVar", getCurrentExistingVar);
-
     return {
       flows,
       mainFlow,
@@ -352,6 +346,7 @@ export default defineComponent({
             "placeholder",
             "summary",
             "type",
+            "defaultOutputVariable",
           ];
           uselessProps.forEach((prop) => delete cmdCopy[prop]);
           return cmdCopy;
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 836a763e..0b15beda 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -3,7 +3,7 @@
     <OperationCard
       v-if="hasSubCommands"
       :model-value="funcName"
-      @update:model-value="funcName = $event"
+      @update:model-value="updateFuncName"
       :options="localCommand.subCommands"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
@@ -204,6 +204,15 @@ export default defineComponent({
         width: `calc(${columnWidth}% - var(--grid-gap))`,
       };
     },
+    updateFuncName(value) {
+      this.funcName = value;
+      // 如果切换了子命令，更新输出变量
+      const selectSubCommand = this.getSelectSubCommand(value);
+      if (!selectSubCommand) return;
+      const newModelValue = { ...this.modelValue, value: value };
+      delete newModelValue.outputVariable;
+      this.$emit("update:modelValue", newModelValue);
+    },
   },
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 20fab7d3..8eb6c977 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -10,6 +10,7 @@
         <OutputField
           v-model="simpleOutputVar"
           :label="currentOutputs?.label || '输出变量名'"
+          :suggest-name="currentOutputs?.suggestName"
           autofocus
           :show-variable-list="true"
           class="q-px-sm"
@@ -131,6 +132,12 @@ export default defineComponent({
         (cmd) => cmd.value === this.command.value
       );
     },
+    defaultOutputVariable() {
+      return (
+        this.currentSubCommand?.defaultOutputVariable ||
+        this.command.defaultOutputVariable
+      );
+    },
     commandName() {
       return this.currentSubCommand.label || this.command.label;
     },
@@ -158,35 +165,36 @@ export default defineComponent({
   },
   watch: {
     "command.outputVariable": {
-      immediate: true,
-      deep: true,
-      handler(newValue) {
-        this.initOutputVars(newValue);
+      handler(value) {
+        this.initOutputVars(value);
       },
+      immediate: true,
     },
     "command.asyncMode": {
-      immediate: true,
-      handler(newValue) {
-        this.asyncMode = newValue;
+      handler(value) {
+        this.asyncMode = value;
       },
+      immediate: true,
     },
     "command.callbackFunc": {
-      immediate: true,
-      handler(newValue) {
-        this.callbackFunc = newValue;
+      handler(value) {
+        this.callbackFunc = value;
       },
+      immediate: true,
     },
   },
   methods: {
-    initOutputVars(outputVariable) {
+    initOutputVars(value) {
+      const outputVariable = value || this.defaultOutputVariable;
       // 初始化完整输出变量名
-      if (!outputVariable) return;
-      this.simpleOutputVar = outputVariable.name || "";
-
-      if (this.currentOutputs) {
-        // 初始化详细输出变量，直接使用扁平化的结构
-        this.outputVars = outputVariable?.details || {};
+      if (!outputVariable) {
+        this.simpleOutputVar = "";
+        this.outputVars = {};
+        return;
       }
+
+      this.simpleOutputVar = outputVariable.name;
+      this.outputVars = outputVariable.details;
     },
     handleConfirm() {
       const outputVariable = {};
diff --git a/src/components/composer/card/output/OutputField.vue b/src/components/composer/card/output/OutputField.vue
index 3ec7bccf..2f307040 100644
--- a/src/components/composer/card/output/OutputField.vue
+++ b/src/components/composer/card/output/OutputField.vue
@@ -13,6 +13,21 @@
       <div class="variable-label">{{ label }}</div>
     </template>
     <template v-slot:append>
+      <q-btn
+        v-if="suggestName"
+        flat
+        dense
+        @click="updateSuggestName(suggestName)"
+      >
+        <q-icon
+          name="emoji_objects"
+          size="14px"
+          :style="{
+            opacity: 0.8,
+          }"
+        />
+        <q-tooltip> 取名困难症？点我！ </q-tooltip>
+      </q-btn>
       <VariableList
         :show-variable-list="showVariableList"
         :show-function-list="showFunctionList"
@@ -35,7 +50,7 @@
 </template>
 
 <script>
-import { defineComponent } from "vue";
+import { defineComponent, inject } from "vue";
 import VariableList from "components/composer/common/varinput/VariableList.vue";
 
 export default defineComponent({
@@ -55,6 +70,10 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    suggestName: {
+      type: String,
+      default: "",
+    },
     autofocus: {
       type: Boolean,
       default: false,
@@ -77,6 +96,31 @@ export default defineComponent({
     updateValBySelect(_type, val) {
       this.$emit("update:modelValue", val);
     },
+    updateSuggestName(val) {
+      const existingNames = this.getExistingFuncAndParams();
+      // 重名检测，主要检测函数名和参数名
+      if (existingNames.includes(val)) {
+        quickcommand.showMessageBox(
+          "和已有函数名和参数名重复，已自动添加下划线前缀",
+          "warning"
+        );
+        val = "_" + val;
+      }
+      this.$emit("update:modelValue", val);
+    },
+  },
+  setup() {
+    const getCurrentFunctions = inject("getCurrentFunctions");
+    const getCurrentVariables = inject("getCurrentVariables");
+    const getExistingFuncAndParams = () => {
+      return [
+        ...getCurrentFunctions(),
+        ...getCurrentVariables().filter((v) => v.type === "param"),
+      ].map((v) => v.name);
+    };
+    return {
+      getExistingFuncAndParams,
+    };
   },
 });
 </script>
@@ -118,7 +162,7 @@ export default defineComponent({
 }
 
 .variable-list-btn {
-  padding: 0 12px;
+  padding: 0 12px 0 3px;
 }
 
 /* 去掉下拉按钮的焦点效果 */
diff --git a/src/components/composer/card/output/OutputStructure.vue b/src/components/composer/card/output/OutputStructure.vue
index 917f5f4b..0440ff10 100644
--- a/src/components/composer/card/output/OutputStructure.vue
+++ b/src/components/composer/card/output/OutputStructure.vue
@@ -11,6 +11,7 @@
                 @update:model-value="updateField(subKey, $event)"
                 :label="subOutput.label"
                 :placeholder="subOutput.placeholder"
+                :suggest-name="subOutput.suggestName"
                 autofocus
               />
             </div>
@@ -25,6 +26,7 @@
         @update:model-value="updateField('', $event)"
         :label="output.label"
         :placeholder="output.placeholder"
+        :suggest-name="output.suggestName"
         autofocus
       />
     </div>
@@ -78,18 +80,23 @@ export default defineComponent({
       default: () => ({}),
     },
   },
+  data() {
+    return {
+      fixedFields: ["label", "placeholder", "suggestName"],
+    };
+  },
   emits: ["update:modelValue"],
   computed: {
     hasNestedFields() {
       if (!this.output) return false;
       return Object.keys(this.output).some(
-        (key) => key !== "label" && key !== "placeholder"
+        (key) => !this.fixedFields.includes(key)
       );
     },
     getNestedFields() {
       const fields = {};
       Object.entries(this.output).forEach(([key, value]) => {
-        if (key !== "label" && key !== "placeholder") {
+        if (!this.fixedFields.includes(key)) {
           fields[key] = value;
         }
       });
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index c66e66e2..492adfce 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -15,31 +15,46 @@ export const macosCommands = {
           icon: "front_hand",
           outputs: {
             label: "前台应用信息",
+            suggestName: "frontmostApp",
             structure: {
-              name: { label: "应用名称" },
-              displayedName: { label: "应用显示名称" },
-              path: { label: "应用路径" },
-              version: { label: "应用版本" },
-              pid: { label: "应用进程ID" },
-              backgroundOnly: { label: "是否后台运行" },
-              visible: { label: "是否可见" },
-              frontmost: { label: "是否前台运行" },
+              name: { label: "应用名称", suggestName: "appName" },
+              displayedName: {
+                label: "应用显示名称",
+                suggestName: "appDisplayName",
+              },
+              path: { label: "应用路径", suggestName: "appPath" },
+              version: { label: "应用版本", suggestName: "appVersion" },
+              pid: { label: "应用进程ID", suggestName: "appPid" },
+              backgroundOnly: {
+                label: "是否后台运行",
+                suggestName: "appBackgroundOnly",
+              },
+              visible: { label: "是否可见", suggestName: "appVisible" },
+              frontmost: { label: "是否前台运行", suggestName: "appFrontmost" },
               window: {
                 label: "窗口信息",
-                name: { label: "窗口名称" },
-                title: { label: "窗口标题" },
-                index: { label: "窗口索引" },
+                name: { label: "窗口名称", suggestName: "windowName" },
+                title: { label: "窗口标题", suggestName: "windowTitle" },
+                index: { label: "窗口索引", suggestName: "windowIndex" },
                 position: {
                   label: "窗口位置",
                   placeholder:
                     "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
+                  suggestName: "windowPosition",
                 },
                 size: {
                   label: "窗口大小",
                   placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
+                  suggestName: "windowSize",
+                },
+                minimized: {
+                  label: "是否最小化",
+                  suggestName: "windowMinimized",
+                },
+                fullscreen: {
+                  label: "是否全屏",
+                  suggestName: "windowFullscreen",
                 },
-                minimized: { label: "是否最小化" },
-                fullscreen: { label: "是否全屏" },
               },
             },
           },
@@ -48,6 +63,10 @@ export const macosCommands = {
           value: "quickcomposer.macos.app.getRunningApps",
           label: "获取活动应用",
           icon: "list",
+          outputs: {
+            label: "活动应用列表（数组）",
+            suggestName: "runningApps",
+          },
         },
         {
           value: "quickcomposer.macos.app.launch",

From deade3e1deaba1288a1d06ec3a3abff7d2210f75 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 22:55:47 +0800
Subject: [PATCH 139/332] =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=B7=BB=E5=8A=A0=E8=BE=93=E5=87=BA=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E7=BB=93=E6=9E=84=E5=8C=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                    |   8 +-
 .../lib/quickcomposer/browser/execScript.js   |  11 +-
 plugin/lib/quickcomposer/data/index.js        |   2 +
 .../lib/quickcomposer/data/regexTransform.js  |   9 +
 plugin/lib/quickcomposer/data/time.js         | 221 +++++++++++++++---
 plugin/lib/quickcomposer/macos/app.js         |  20 +-
 plugin/lib/quickcomposer/macos/finder.js      |   2 +-
 plugin/lib/quickcomposer/network/url.js       |  30 ---
 src/components/composer/MultiParams.vue       |  23 +-
 src/components/composer/card/OutputEditor.vue | 106 +++++++--
 .../composer/card/output/OutputStructure.vue  |  17 +-
 src/js/composer/commands/audioCommands.js     |  10 +
 src/js/composer/commands/browserCommands.js   | 159 ++++++++++++-
 src/js/composer/commands/codingCommand.js     |  75 ++++++
 src/js/composer/commands/dataCommands.js      | 151 +++++++++---
 src/js/composer/commands/fileCommands.js      |  11 +
 src/js/composer/commands/imageCommands.js     |  42 ++++
 src/js/composer/commands/macosCommands.js     | 191 +++++++++++----
 src/js/composer/commands/mathCommands.js      |  15 ++
 src/js/composer/commands/networkCommands.js   | 155 +++++++++---
 src/js/composer/commands/notifyCommands.js    |   2 +
 src/js/composer/commands/otherCommands.js     |   3 +-
 src/js/composer/commands/screenCommands.js    | 135 +++++++++++
 src/js/composer/commands/scriptCommands.js    |   5 +
 src/js/composer/commands/simulateCommands.js  |  73 ++++++
 src/js/composer/commands/statusCommands.js    |  32 +++
 src/js/composer/commands/systemCommands.js    |  88 ++++++-
 src/js/composer/commands/uiCommands.js        |  76 ++++++
 src/js/composer/commands/userdataCommands.js  |  26 +++
 src/js/composer/commands/utoolsCommand.js     |  40 ++++
 src/js/composer/commands/windowsCommands.js   |   2 +-
 src/js/composer/generateCode.js               |  15 +-
 .../monaco/types/quickcommand.api.d.ts        |  12 +
 33 files changed, 1519 insertions(+), 248 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/data/regexTransform.js

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index c24ce33c..f0e1cae0 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -58,13 +58,19 @@ const quickcommand = {
       {
         timeout: ms,
       },
-      (err, stdout, stderr) => {
+      () => {
         var end = new Date().getTime();
         callback(end - start);
       }
     );
   },
 
+  asyncSleep: async function (ms) {
+    return new Promise((resolve) => {
+      this.setTimeout(resolve, ms);
+    });
+  },
+
   // 关闭进程
   kill: function (pid, signal = "SIGTERM", cb) {
     kill(pid, signal, cb);
diff --git a/plugin/lib/quickcomposer/browser/execScript.js b/plugin/lib/quickcomposer/browser/execScript.js
index b183ba3a..b6106818 100644
--- a/plugin/lib/quickcomposer/browser/execScript.js
+++ b/plugin/lib/quickcomposer/browser/execScript.js
@@ -72,7 +72,8 @@ const submitForm = async (tab, buttonSelector, inputSelectors) => {
 const getText = async (tab, selector) => {
   return await executeScript(
     tab,
-    `document.querySelector('${selector}')?.textContent || ''`
+    `const element = document.querySelector('${selector}');
+      return element?.textContent || element?.innerText || '';`
   );
 };
 
@@ -80,7 +81,7 @@ const getHtml = async (tab, selector) => {
   return await executeScript(
     tab,
     `const element = document.querySelector('${selector}');
-      return element ? element.innerHTML : '';`
+      return element?.outerHTML || '';`
   );
 };
 
@@ -110,7 +111,7 @@ const scrollToElement = async (tab, selector) => {
 };
 
 const getScrollPosition = async (tab) => {
-  return await executeScript(
+  const result = await executeScript(
     tab,
     `
       return JSON.stringify({
@@ -119,10 +120,11 @@ const getScrollPosition = async (tab) => {
       });
     `
   );
+  return JSON.parse(result);
 };
 
 const getPageSize = async (tab) => {
-  return await executeScript(
+  const result = await executeScript(
     tab,
     `
       return JSON.stringify({
@@ -137,6 +139,7 @@ const getPageSize = async (tab) => {
       });
     `
   );
+  return JSON.parse(result);
 };
 
 const waitForElement = async (tab, selector, timeout = 5000) => {
diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index 469db082..f99859c2 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -4,6 +4,7 @@ const zlib = require("./zlib");
 const { htmlParser } = require("./htmlParser");
 const array = require("./array");
 const time = require("./time");
+const { regexTransform } = require("./regexTransform");
 
 module.exports = {
   htmlParser,
@@ -12,4 +13,5 @@ module.exports = {
   zlib,
   array,
   time,
+  regexTransform,
 };
diff --git a/plugin/lib/quickcomposer/data/regexTransform.js b/plugin/lib/quickcomposer/data/regexTransform.js
new file mode 100644
index 00000000..9a960d7c
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/regexTransform.js
@@ -0,0 +1,9 @@
+const regexTransform = (text, regex, replacement) => {
+  if (replacement) {
+    return text.replace(regex, replacement);
+  } else {
+    return text.match(regex);
+  }
+};
+
+module.exports = { regexTransform };
diff --git a/plugin/lib/quickcomposer/data/time.js b/plugin/lib/quickcomposer/data/time.js
index 7db96aa7..658c102b 100644
--- a/plugin/lib/quickcomposer/data/time.js
+++ b/plugin/lib/quickcomposer/data/time.js
@@ -76,44 +76,207 @@ const time = {
   parse: function (time, format) {
     if (!time) return null;
 
+    const now = new Date();
+    let year = now.getFullYear();
+    let month = now.getMonth() + 1; // 转换为正常月份
+    let day = now.getDate();
+    let hours = 0;
+    let minutes = 0;
+    let seconds = 0;
+
     // 处理时间戳
     if (format === "timestamp") {
-      return new Date(Number(time) * 1000);
+      const date = new Date(Number(time) * 1000);
+      return this._formatTimeObject(date);
     }
     if (format === "timestamp_ms") {
-      return new Date(Number(time));
+      const date = new Date(Number(time));
+      return this._formatTimeObject(date);
     }
 
-    // 处理标准格式
-    const now = new Date();
-    const year = now.getFullYear();
-    let result;
+    // 如果没有指定格式，尝试自动识别
+    if (!format) {
+      // 尝试直接解析
+      const date = new Date(time);
+      if (date.getTime()) {
+        return this._formatTimeObject(date);
+      }
 
-    switch (format) {
-      case "YYYY-MM-DD":
-      case "YYYY-MM-DD HH:mm:ss":
-      case "YYYY-MM-DD HH:mm":
-        result = new Date(time);
-        break;
-      case "YYYY年MM月DD日":
-        time = time.replace(/[年月日]/g, (match) => {
-          return { 年: "-", 月: "-", 日: "" }[match];
-        });
-        result = new Date(time);
-        break;
-      case "MM/DD/YYYY":
-        const [month, day, yyyy] = time.split("/");
-        result = new Date(yyyy, month - 1, day);
-        break;
-      case "DD/MM/YYYY":
-        const [dd, mm, yy] = time.split("/");
-        result = new Date(yy, mm - 1, dd);
-        break;
-      default:
-        result = new Date(time);
+      // 尝试解析常见格式
+      const patterns = {
+        // 标准格式
+        "YYYY-MM-DD HH:mm:ss":
+          /^(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+        "YYYY-MM-DD HH:mm": /^(\d{4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{1,2})$/,
+        "YYYY-MM-DD": /^(\d{4})-(\d{1,2})-(\d{1,2})$/,
+        // 中文格式
+        "YYYY年MM月DD日 HH时mm分ss秒":
+          /^(\d{4})年(\d{1,2})月(\d{1,2})日 (\d{1,2})时(\d{1,2})分(\d{1,2})秒$/,
+        "YYYY年MM月DD日 HH:mm:ss":
+          /^(\d{4})年(\d{1,2})月(\d{1,2})日 (\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+        YYYY年MM月DD日: /^(\d{4})年(\d{1,2})月(\d{1,2})日$/,
+        // 斜杠格式
+        "MM/DD/YYYY HH:mm:ss":
+          /^(\d{1,2})\/(\d{1,2})\/(\d{4}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+        "DD/MM/YYYY HH:mm:ss":
+          /^(\d{1,2})\/(\d{1,2})\/(\d{4}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+        "MM/DD/YYYY": /^(\d{1,2})\/(\d{1,2})\/(\d{4})$/,
+        "DD/MM/YYYY": /^(\d{1,2})\/(\d{1,2})\/(\d{4})$/,
+        // 点号格式
+        "DD.MM.YYYY": /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/,
+        // 时间格式
+        "HH:mm:ss": /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+        "HH:mm": /^(\d{1,2}):(\d{1,2})$/,
+      };
+
+      for (const [patternFormat, regex] of Object.entries(patterns)) {
+        const matches = time.match(regex);
+        if (matches) {
+          format = patternFormat;
+          break;
+        }
+      }
     }
 
-    return result.getTime() ? result : null;
+    // 解析时间字符串
+    const parseTimeString = (timeStr) => {
+      const parts = timeStr.split(/[: ]/);
+      return {
+        hours: parseInt(parts[0]) || 0,
+        minutes: parseInt(parts[1]) || 0,
+        seconds: parseInt(parts[2]) || 0,
+      };
+    };
+
+    // 根据格式解析
+    if (format) {
+      // 移除所有非数字和分隔符
+      const cleanTime = time.replace(/[^0-9/\-.: ]/g, "");
+      const parts = cleanTime.split(/[/\-.: ]/);
+
+      switch (format) {
+        case "YYYY-MM-DD":
+        case "YYYY-MM-DD HH:mm:ss":
+        case "YYYY-MM-DD HH:mm":
+        case "YYYY年MM月DD日":
+        case "YYYY年MM月DD日 HH:mm:ss":
+        case "YYYY年MM月DD日 HH时mm分ss秒":
+          year = parseInt(parts[0]);
+          month = parseInt(parts[1]);
+          day = parseInt(parts[2]);
+          if (parts.length > 3) {
+            const timeStr = parts.slice(3).join(":");
+            const timeObj = parseTimeString(timeStr);
+            hours = timeObj.hours;
+            minutes = timeObj.minutes;
+            seconds = timeObj.seconds;
+          }
+          break;
+        case "MM/DD/YYYY":
+        case "MM/DD/YYYY HH:mm:ss":
+          year = parseInt(parts[2]);
+          month = parseInt(parts[0]);
+          day = parseInt(parts[1]);
+          if (parts.length > 3) {
+            const timeStr = parts.slice(3).join(":");
+            const timeObj = parseTimeString(timeStr);
+            hours = timeObj.hours;
+            minutes = timeObj.minutes;
+            seconds = timeObj.seconds;
+          }
+          break;
+        case "DD/MM/YYYY":
+        case "DD/MM/YYYY HH:mm:ss":
+        case "DD.MM.YYYY":
+          year = parseInt(parts[2]);
+          month = parseInt(parts[1]);
+          day = parseInt(parts[0]);
+          if (parts.length > 3) {
+            const timeStr = parts.slice(3).join(":");
+            const timeObj = parseTimeString(timeStr);
+            hours = timeObj.hours;
+            minutes = timeObj.minutes;
+            seconds = timeObj.seconds;
+          }
+          break;
+        case "HH:mm:ss":
+        case "HH:mm":
+          const timeObj = parseTimeString(cleanTime);
+          hours = timeObj.hours;
+          minutes = timeObj.minutes;
+          seconds = timeObj.seconds;
+          break;
+        default:
+          // 尝试使用原生解析
+          const date = new Date(time);
+          if (date.getTime()) {
+            year = date.getFullYear();
+            month = date.getMonth() + 1;
+            day = date.getDate();
+            hours = date.getHours();
+            minutes = date.getMinutes();
+            seconds = date.getSeconds();
+          }
+      }
+    }
+
+    // 验证日期是否有效
+    const testDate = new Date(year, month - 1, day, hours, minutes, seconds);
+    if (!testDate.getTime()) return null;
+
+    return this._formatTimeObject(testDate);
+  },
+
+  // 格式化时间对象
+  _formatTimeObject: function (date) {
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    const hours = date.getHours();
+    const minutes = date.getMinutes();
+    const seconds = date.getSeconds();
+
+    return {
+      date: {
+        year,
+        month,
+        day,
+      },
+      time: {
+        hours,
+        minutes,
+        seconds,
+      },
+      formats: {
+        // 标准格式
+        iso: date.toISOString(),
+        locale: date.toLocaleString(),
+        localeDate: date.toLocaleDateString(),
+        localeTime: date.toLocaleTimeString(),
+        // 常用格式
+        "YYYY-MM-DD": `${year}-${this._pad(month)}-${this._pad(day)}`,
+        "YYYY-MM-DD HH:mm:ss": `${year}-${this._pad(month)}-${this._pad(
+          day
+        )} ${this._pad(hours)}:${this._pad(minutes)}:${this._pad(seconds)}`,
+        dateCN: `${year}年${this._pad(month)}月${this._pad(day)}日`,
+        "MM/DD/YYYY": `${this._pad(month)}/${this._pad(day)}/${year}`,
+        "DD/MM/YYYY": `${this._pad(day)}/${this._pad(month)}/${year}`,
+        "HH:mm:ss": `${this._pad(hours)}:${this._pad(minutes)}:${this._pad(
+          seconds
+        )}`,
+      },
+      timestamp: Math.floor(date.getTime() / 1000),
+      timestamp_ms: date.getTime(),
+      // 日历信息
+      calendar: {
+        week: date.getDay(),
+        weekText: ["日", "一", "二", "三", "四", "五", "六"][date.getDay()],
+        isWeekend: date.getDay() === 0 || date.getDay() === 6,
+        isLeapYear: (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0,
+        daysInMonth: new Date(year, month, 0).getDate(),
+        constellation: this._getConstellation(month, day),
+      },
+    };
   },
 
   // 时间加减
diff --git a/plugin/lib/quickcomposer/macos/app.js b/plugin/lib/quickcomposer/macos/app.js
index aa1de794..49e2c7d3 100644
--- a/plugin/lib/quickcomposer/macos/app.js
+++ b/plugin/lib/quickcomposer/macos/app.js
@@ -192,7 +192,8 @@ module.exports = {
 
   // 启动应用
   launch: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "${appName}"
         activate
       end tell
@@ -201,7 +202,8 @@ module.exports = {
 
   // 退出应用
   quit: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "${appName}"
         quit
       end tell
@@ -210,7 +212,8 @@ module.exports = {
 
   // 隐藏应用
   hide: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "System Events"
         set visible of process "${appName}" to false
       end tell
@@ -219,7 +222,8 @@ module.exports = {
 
   // 显示应用
   show: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "System Events"
         set visible of process "${appName}" to true
       end tell
@@ -231,7 +235,8 @@ module.exports = {
 
   // 最小化窗口
   minimize: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "System Events"
         tell process "${appName}"
           try
@@ -244,7 +249,8 @@ module.exports = {
 
   // 最大化窗口
   maximize: async function (appName) {
-    return await quickcommand.runAppleScript(`
+    if (!appName) return;
+    await quickcommand.runAppleScript(`
       tell application "System Events"
         tell process "${appName}"
           try
@@ -258,6 +264,7 @@ module.exports = {
 
   // 获取窗口信息
   getWindows: async function (appName) {
+    if (!appName) return;
     const result = await quickcommand.runAppleScript(`
       tell application "System Events"
         tell process "${appName}"
@@ -341,6 +348,7 @@ module.exports = {
 
   // 获取应用脚本字典
   getScriptDictionary: async function (appName) {
+    if (!appName) return;
     try {
       const { execSync } = require("child_process");
 
diff --git a/plugin/lib/quickcomposer/macos/finder.js b/plugin/lib/quickcomposer/macos/finder.js
index d7c6b57b..4c2ebe4c 100644
--- a/plugin/lib/quickcomposer/macos/finder.js
+++ b/plugin/lib/quickcomposer/macos/finder.js
@@ -23,7 +23,7 @@ module.exports = {
         return json
       end tell
     `);
-    return JSON.parse(result);
+    return JSON.parse(result.replace(/missing value/g, "null"));
   },
 
   // 获取当前文件夹
diff --git a/plugin/lib/quickcomposer/network/url.js b/plugin/lib/quickcomposer/network/url.js
index bef341d3..50eac274 100644
--- a/plugin/lib/quickcomposer/network/url.js
+++ b/plugin/lib/quickcomposer/network/url.js
@@ -54,17 +54,6 @@ function formatQuery(queryParams) {
   }
 }
 
-// 解析路径名
-function parsePath(path) {
-  return url.parse(path);
-}
-
-// 解析主机名
-function parseHost(host) {
-  const { hostname, port } = url.parse(`http://${host}`);
-  return { hostname, port };
-}
-
 // 解析 URL 参数
 function getQueryParam(urlString, param) {
   const { query } = url.parse(urlString, true);
@@ -92,32 +81,13 @@ function isAbsolute(urlString) {
   return url.parse(urlString).protocol !== null;
 }
 
-// 解析 URL 的各个部分
-function parseComponents(urlString) {
-  const { protocol, auth, hostname, port, pathname, search, hash } =
-    url.parse(urlString);
-
-  return {
-    protocol: protocol?.replace(":", ""),
-    auth,
-    hostname,
-    port,
-    pathname,
-    search: search?.replace("?", ""),
-    hash: hash?.replace("#", ""),
-  };
-}
-
 module.exports = {
   parse,
   format,
   parseQuery,
   formatQuery,
-  parsePath,
-  parseHost,
   getQueryParam,
   addQueryParam,
   removeQueryParam,
   isAbsolute,
-  parseComponents,
 };
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 0b15beda..3e6d6c24 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -3,7 +3,7 @@
     <OperationCard
       v-if="hasSubCommands"
       :model-value="funcName"
-      @update:model-value="updateFuncName"
+      @update:model-value="funcName = $event"
       :options="localCommand.subCommands"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
@@ -77,7 +77,7 @@ export default defineComponent({
           newArgvs[this.commonConfig.length + index] = config.defaultValue;
         });
 
-        this.updateModelValue(value, newArgvs);
+        this.updateModelValue(value, newArgvs, true);
       },
     },
     argvs() {
@@ -189,14 +189,18 @@ export default defineComponent({
         );
       return `${subFeature}${allArgvs.join(",")}`;
     },
-    updateModelValue(funcName, argvs) {
-      this.$emit("update:modelValue", {
+    updateModelValue(funcName, argvs, resetOutputVariable = false) {
+      const newModelValue = {
         ...this.modelValue,
         value: funcName,
         argvs,
         summary: this.getSummary(argvs),
         code: this.generateCode(funcName, argvs),
-      });
+      };
+      if (resetOutputVariable) {
+        delete newModelValue.outputVariable;
+      }
+      this.$emit("update:modelValue", newModelValue);
     },
     getColumnStyle(width = 12) {
       const columnWidth = (width / 12) * 100;
@@ -204,15 +208,6 @@ export default defineComponent({
         width: `calc(${columnWidth}% - var(--grid-gap))`,
       };
     },
-    updateFuncName(value) {
-      this.funcName = value;
-      // 如果切换了子命令，更新输出变量
-      const selectSubCommand = this.getSelectSubCommand(value);
-      if (!selectSubCommand) return;
-      const newModelValue = { ...this.modelValue, value: value };
-      delete newModelValue.outputVariable;
-      this.$emit("update:modelValue", newModelValue);
-    },
   },
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 8eb6c977..07ab4941 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -6,7 +6,7 @@
       </div>
 
       <!-- 完整结果部分 -->
-      <SectionBlock title="完整结果">
+      <SectionBlock title="完整结果" :subtitle="outputTypeName || ''">
         <OutputField
           v-model="simpleOutputVar"
           :label="currentOutputs?.label || '输出变量名'"
@@ -22,27 +22,61 @@
         <SectionBlock
           title="详细输出"
           :subtitle="
-            Array.isArray(currentOutputs.structure) ? '数组中第一个元素' : ''
+            isOutputTypeArray && currentOutputs.structure.length === 1
+              ? '第一个元素'
+              : ''
           "
         >
           <q-scroll-area
-            style="height: 200px"
+            :style="{
+              height: `${Math.min(220, 44 * inputNumbers)}px`,
+            }"
             :thumb-style="{
               width: '2px',
             }"
           >
             <div class="detail-output column q-col-gutter-sm q-px-sm">
-              <template v-if="Array.isArray(currentOutputs.structure)">
-                <template
-                  v-for="(output, key) in currentOutputs.structure[0]"
-                  :key="key"
-                >
-                  <OutputStructure
-                    :output="output"
-                    :output-key="key"
-                    :is-array="true"
-                    v-model="outputVars"
-                  />
+              <template v-if="isOutputTypeArray">
+                <!-- 处理数组结构但内部是简单对象的情况 -->
+                <template v-if="isSimpleArrayStructure">
+                  <template
+                    v-for="(output, index) in currentOutputs.structure"
+                    :key="index"
+                  >
+                    <OutputField
+                      v-model="outputVars['[' + index + ']']"
+                      :label="output.label"
+                      :placeholder="output.placeholder"
+                      :suggest-name="output.suggestName"
+                      :show-variable-list="true"
+                    />
+                  </template>
+                </template>
+                <!-- 处理数组结构且内部是复杂对象的情况 -->
+                <template v-else>
+                  <template
+                    v-for="(item, index) in currentOutputs.structure"
+                    :key="index"
+                  >
+                    <div
+                      class="text-caption q-px-sm"
+                      v-if="currentOutputs.structure.length > 1"
+                    >
+                      第{{ index + 1 }}个元素
+                    </div>
+                    <div class="q-col-gutter-sm column">
+                      <OutputStructure
+                        v-for="(output, key) in item"
+                        :key="key"
+                        :output="output"
+                        :output-key="key"
+                        :is-array="true"
+                        :array-index="index"
+                        :fixed-fields="fixedFields"
+                        v-model="outputVars"
+                      />
+                    </div>
+                  </template>
                 </template>
               </template>
               <template v-else>
@@ -53,6 +87,7 @@
                   <OutputStructure
                     :output="output"
                     :output-key="key"
+                    :fixed-fields="fixedFields"
                     v-model="outputVars"
                   />
                 </template>
@@ -85,6 +120,7 @@
       </template>
 
       <div class="row justify-end q-px-sm q-py-sm">
+        <q-btn flat label="清空" color="primary" @click="handleClear" />
         <q-btn flat label="取消" color="primary" v-close-popup />
         <q-btn flat label="确定" color="primary" @click="handleConfirm" />
       </div>
@@ -126,6 +162,41 @@ export default defineComponent({
         this.$emit("update:modelValue", value);
       },
     },
+    inputNumbers() {
+      const structure = this.currentOutputs?.structure;
+      if (!structure) return 0;
+      if (Array.isArray(structure)) {
+        if (this.isSimpleArrayStructure) {
+          return structure.length;
+        }
+        return Object.keys(structure[0]).length;
+      }
+      return Object.keys(structure).length;
+    },
+    outputTypeName() {
+      const structure = this.currentOutputs?.structure;
+      if (Array.isArray(structure)) {
+        return "数组";
+      }
+      if (typeof structure === "object") {
+        return "对象";
+      }
+      return this.currentOutputs?.typeName;
+    },
+    isOutputTypeArray() {
+      return this.outputTypeName === "数组";
+    },
+    isSimpleArrayStructure() {
+      if (!this.isOutputTypeArray || !this.currentOutputs?.structure?.length) {
+        return false;
+      }
+      const firstItem = this.currentOutputs.structure[0];
+      // 如果数组第一项只包含 label 和 placeholder，则认为是简单结构
+      return (
+        Object.keys(firstItem).every((key) => this.fixedFields.includes(key)) &&
+        firstItem.label
+      );
+    },
     currentSubCommand() {
       if (!this.command.subCommands) return {};
       return this.command.subCommands.find(
@@ -161,6 +232,7 @@ export default defineComponent({
           value: "then",
         },
       ],
+      fixedFields: ["label", "placeholder", "suggestName"],
     };
   },
   watch: {
@@ -233,7 +305,7 @@ export default defineComponent({
       // 检查变量名是否合法
       const varNames = [
         outputVariable.name,
-        ...Object.keys(outputVariable.details || {}),
+        ...Object.values(outputVariable.details || {}),
         result.callbackFunc,
       ].filter(Boolean);
 
@@ -252,6 +324,10 @@ export default defineComponent({
       this.$emit("confirm", result);
       this.isOpen = false;
     },
+    handleClear() {
+      this.simpleOutputVar = "";
+      this.outputVars = {};
+    },
   },
 });
 </script>
diff --git a/src/components/composer/card/output/OutputStructure.vue b/src/components/composer/card/output/OutputStructure.vue
index 0440ff10..312c5b77 100644
--- a/src/components/composer/card/output/OutputStructure.vue
+++ b/src/components/composer/card/output/OutputStructure.vue
@@ -75,15 +75,18 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    arrayIndex: {
+      type: Number,
+      default: 0,
+    },
     modelValue: {
       type: Object,
       default: () => ({}),
     },
-  },
-  data() {
-    return {
-      fixedFields: ["label", "placeholder", "suggestName"],
-    };
+    fixedFields: {
+      type: Array,
+      default: () => [],
+    },
   },
   emits: ["update:modelValue"],
   computed: {
@@ -105,7 +108,9 @@ export default defineComponent({
   },
   methods: {
     getFieldPath(subKey = "") {
-      const base = this.isArray ? `[0].${this.outputKey}` : this.outputKey;
+      const base = this.isArray
+        ? `[${this.arrayIndex}]?.${this.outputKey}`
+        : this.outputKey;
       return subKey ? `${base}.${subKey}` : base;
     },
     updateField(subKey, value) {
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index 4309475a..5fe8702c 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -106,6 +106,7 @@ export const audioCommands = {
     {
       value: "quickcomposer.audio.speech.speak",
       label: "文本朗读",
+      asyncMode: "await",
       icon: "record_voice_over",
       subCommands: [
         {
@@ -262,6 +263,15 @@ export const audioCommands = {
           },
         },
       ],
+      outputs: {
+        label: "音频信息",
+        suggestName: "audioInfo",
+        structure: {
+          duration: { label: "时长", suggestName: "audioDuration" },
+          channels: { label: "声道", suggestName: "audioChannels" },
+          sampleRate: { label: "采样率", suggestName: "audioSampleRate" },
+        },
+      },
     },
   ],
 };
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 53ac94fd..54327589 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -117,6 +117,14 @@ export const browserCommands = {
               },
             },
           ],
+          outputs: {
+            label: "实例信息",
+            suggestName: "browserInstance",
+            structure: {
+              pid: { label: "进程ID", suggestName: "instancePid" },
+              port: { label: "端口", suggestName: "instancePort" },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.destroyClientByPort",
@@ -139,11 +147,25 @@ export const browserCommands = {
           value: "quickcomposer.browser.getClientPorts",
           label: "获取所有浏览器实例端口",
           icon: "list",
+          outputs: {
+            label: "实例端口列表",
+            suggestName: "instancePorts",
+            structure: [
+              { label: "实例一端口", suggestName: "instancePort1" },
+              { label: "实例二端口", suggestName: "instancePort2" },
+              { label: "实例三端口", suggestName: "instancePort3" },
+            ],
+          },
         },
         {
           value: "quickcomposer.browser.getCurrentClientPort",
           label: "获取当前操控的实例端口",
           icon: "label",
+          outputs: {
+            label: "实例端口",
+            suggestName: "currentInstancePort",
+            typeName: "数字",
+          },
         },
         {
           value: "quickcomposer.browser.switchClientByPort",
@@ -175,6 +197,11 @@ export const browserCommands = {
           value: "quickcomposer.browser.getUrl",
           label: "获取当前地址",
           icon: "link",
+          outputs: {
+            label: "当前地址",
+            suggestName: "currentUrl",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.browser.setUrl",
@@ -202,6 +229,17 @@ export const browserCommands = {
           value: "quickcomposer.browser.getTabs",
           label: "获取标签列表",
           icon: "tab",
+          outputs: {
+            label: "标签列表",
+            suggestName: "tabList",
+            structure: [
+              {
+                url: { label: "标签一网址", suggestName: "firstTabUrl" },
+                title: { label: "标签一标题", suggestName: "firstTabTitle" },
+                id: { label: "标签一ID", suggestName: "firstTabId" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.browser.activateTab",
@@ -213,6 +251,15 @@ export const browserCommands = {
           value: "quickcomposer.browser.getCurrentTab",
           label: "获取当前标签页",
           icon: "tab",
+          outputs: {
+            label: "当前标签页",
+            suggestName: "currentTab",
+            structure: {
+              url: { label: "标签网址", suggestName: "currentTabUrl" },
+              title: { label: "标签标题", suggestName: "currentTabTitle" },
+              id: { label: "标签ID", suggestName: "currentTabId" },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.createNewTab",
@@ -227,6 +274,15 @@ export const browserCommands = {
               placeholder: "留空则打开about:blank",
             },
           ],
+          outputs: {
+            label: "新标签页",
+            suggestName: "newTab",
+            structure: {
+              url: { label: "新标签网址", suggestName: "newTabUrl" },
+              title: { label: "新标签标题", suggestName: "newTabTitle" },
+              id: { label: "新标签ID", suggestName: "newTabId" },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.closeTab",
@@ -323,6 +379,11 @@ export const browserCommands = {
           width: 12,
         },
       ],
+      outputs: {
+        label: "执行结果",
+        suggestName: "executeResult",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.browser.injectRemoteScript",
@@ -479,6 +540,32 @@ export const browserCommands = {
               placeholder: "输入Cookie名称，留空则获取所有",
             },
           ],
+          outputs: {
+            label: "Cookie",
+            suggestName: "cookie",
+            structure: {
+              name: { label: "名称", suggestName: "cookieName" },
+              value: { label: "值", suggestName: "cookieValue" },
+              domain: { label: "域名", suggestName: "cookieDomain" },
+              path: { label: "路径", suggestName: "cookiePath" },
+              expires: { label: "过期时间", suggestName: "cookieExpires" },
+              size: { label: "大小", suggestName: "cookieSize" },
+              httpOnly: { label: "HTTPOnly", suggestName: "isCookieHttpOnly" },
+              secure: { label: "安全", suggestName: "isCookieSecure" },
+              session: { label: "会话", suggestName: "isCookieSession" },
+              sameSite: { label: "同站", suggestName: "isCookieSameSite" },
+              priority: { label: "优先级", suggestName: "cookiePriority" },
+              sameParty: { label: "同域", suggestName: "isCookieSameParty" },
+              sourceScheme: {
+                label: "来源协议",
+                suggestName: "cookieSourceScheme",
+              },
+              sourcePort: {
+                label: "来源端口",
+                suggestName: "cookieSourcePort",
+              },
+            },
+          },
         },
       ],
     },
@@ -546,13 +633,23 @@ export const browserCommands = {
         },
         {
           value: "quickcomposer.browser.getText",
-          label: "获取文本",
+          label: "获取元素文本",
           icon: "text_fields",
+          outputs: {
+            label: "元素文本",
+            suggestName: "elementInnerText",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.browser.getHtml",
-          label: "获取HTML",
+          label: "获取元素HTML",
           icon: "code",
+          outputs: {
+            label: "元素outerHTML",
+            suggestName: "elementOuterHTML",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.browser.hideElement",
@@ -619,11 +716,27 @@ export const browserCommands = {
           value: "quickcomposer.browser.getScrollPosition",
           label: "获取滚动位置",
           icon: "open_in_full",
+          outputs: {
+            label: "滚动位置",
+            suggestName: "scrollPosition",
+            structure: {
+              x: { label: "X坐标", suggestName: "scrollPositionX" },
+              y: { label: "Y坐标", suggestName: "scrollPositionY" },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.getPageSize",
           label: "获取页面尺寸",
           icon: "open_in_full",
+          outputs: {
+            label: "页面尺寸",
+            suggestName: "pageSize",
+            structure: {
+              width: { label: "宽度", suggestName: "pageWidth" },
+              height: { label: "高度", suggestName: "pageHeight" },
+            },
+          },
         },
       ],
     },
@@ -686,6 +799,20 @@ export const browserCommands = {
               },
             },
           ],
+          outputs: {
+            label: "设置结果",
+            suggestName: "interceptRequestResult",
+            structure: {
+              success: {
+                label: "是否成功",
+                suggestName: "isInterceptRequestSuccess",
+              },
+              message: {
+                label: "消息",
+                suggestName: "interceptRequestMessage",
+              },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.network.setResponseInterception",
@@ -741,11 +868,39 @@ export const browserCommands = {
               },
             },
           ],
+          outputs: {
+            label: "设置结果",
+            suggestName: "interceptResponseResult",
+            structure: {
+              success: {
+                label: "是否成功",
+                suggestName: "isInterceptResponseSuccess",
+              },
+              message: {
+                label: "消息",
+                suggestName: "interceptResponseMessage",
+              },
+            },
+          },
         },
         {
           value: "quickcomposer.browser.network.clearInterception",
           label: "清除所有拦截规则",
           icon: "clear",
+          outputs: {
+            label: "清除结果",
+            suggestName: "clearInterceptionResult",
+            structure: {
+              success: {
+                label: "是否成功",
+                suggestName: "isClearInterceptionSuccess",
+              },
+              message: {
+                label: "消息",
+                suggestName: "clearInterceptionMessage",
+              },
+            },
+          },
         },
       ],
     },
diff --git a/src/js/composer/commands/codingCommand.js b/src/js/composer/commands/codingCommand.js
index 6173d25b..3ab0f317 100644
--- a/src/js/composer/commands/codingCommand.js
+++ b/src/js/composer/commands/codingCommand.js
@@ -19,41 +19,81 @@ export const codingCommands = {
           label: "Base64编码",
           value: "quickcomposer.coding.base64Encode",
           icon: "title",
+          outputs: {
+            label: "base64编码结果",
+            suggestName: "base64Encoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "Base64解码",
           value: "quickcomposer.coding.base64Decode",
           icon: "title",
+          outputs: {
+            label: "base64解码结果",
+            suggestName: "base64Decoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "十六进制编码",
           value: "quickcomposer.coding.hexEncode",
           icon: "code",
+          outputs: {
+            label: "十六进制编码结果",
+            suggestName: "hexEncoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "十六进制解码",
           value: "quickcomposer.coding.hexDecode",
           icon: "code",
+          outputs: {
+            label: "十六进制解码结果",
+            suggestName: "hexDecoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "URL编码",
           value: "quickcomposer.coding.urlEncode",
           icon: "link",
+          outputs: {
+            label: "URL编码结果",
+            suggestName: "urlEncoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "URL解码",
           value: "quickcomposer.coding.urlDecode",
           icon: "link",
+          outputs: {
+            label: "URL解码结果",
+            suggestName: "urlDecoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "HTML编码",
           value: "quickcomposer.coding.htmlEncode",
           icon: "html",
+          outputs: {
+            label: "HTML编码结果",
+            suggestName: "htmlEncoded",
+            typeName: "字符串",
+          },
         },
         {
           label: "HTML解码",
           value: "quickcomposer.coding.htmlDecode",
           icon: "html",
+          outputs: {
+            label: "HTML解码结果",
+            suggestName: "htmlDecoded",
+            typeName: "字符串",
+          },
         },
       ],
     },
@@ -61,11 +101,21 @@ export const codingCommands = {
       value: "quickcomposer.coding.symmetricCrypto",
       label: "对称加解密",
       component: "SymmetricCryptoEditor",
+      outputs: {
+        label: "加解密结果",
+        suggestName: "symmetricCryptoResult",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.coding.asymmetricCrypto",
       label: "非对称加解密",
       component: "AsymmetricCryptoEditor",
+      outputs: {
+        label: "加解密结果",
+        suggestName: "asymmetricCryptoResult",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.coding.md5Hash",
@@ -83,26 +133,51 @@ export const codingCommands = {
           label: "MD5",
           value: "quickcomposer.coding.md5Hash",
           icon: "functions",
+          outputs: {
+            label: "MD5哈希结果",
+            suggestName: "md5HashResult",
+            typeName: "字符串",
+          },
         },
         {
           label: "SHA1",
           value: "quickcomposer.coding.sha1Hash",
           icon: "functions",
+          outputs: {
+            label: "SHA1哈希结果",
+            suggestName: "sha1HashResult",
+            typeName: "字符串",
+          },
         },
         {
           label: "SHA256",
           value: "quickcomposer.coding.sha256Hash",
           icon: "functions",
+          outputs: {
+            label: "SHA256哈希结果",
+            suggestName: "sha256HashResult",
+            typeName: "字符串",
+          },
         },
         {
           label: "SHA512",
           value: "quickcomposer.coding.sha512Hash",
           icon: "functions",
+          outputs: {
+            label: "SHA512哈希结果",
+            suggestName: "sha512HashResult",
+            typeName: "字符串",
+          },
         },
         {
           label: "SM3",
           value: "quickcomposer.coding.sm3Hash",
           icon: "functions",
+          outputs: {
+            label: "SM3哈希结果",
+            suggestName: "sm3HashResult",
+            typeName: "字符串",
+          },
         },
       ],
     },
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 5dc51ad2..8675ec89 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -22,6 +22,11 @@ export const dataCommands = {
               width: 12,
             },
           ],
+          outputs: {
+            label: "反转结果",
+            suggestName: "reversedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.replace",
@@ -47,6 +52,11 @@ export const dataCommands = {
               width: 6,
             },
           ],
+          outputs: {
+            label: "替换结果",
+            suggestName: "replacedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.substring",
@@ -76,6 +86,11 @@ export const dataCommands = {
               width: 6,
             },
           ],
+          outputs: {
+            label: "截取结果",
+            suggestName: "substringedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.trim",
@@ -101,6 +116,11 @@ export const dataCommands = {
               width: 4,
             },
           ],
+          outputs: {
+            label: "去除空白结果",
+            suggestName: "trimmedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.changeCase",
@@ -130,6 +150,11 @@ export const dataCommands = {
               width: 4,
             },
           ],
+          outputs: {
+            label: "转换结果",
+            suggestName: "changedCaseString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.pad",
@@ -170,6 +195,11 @@ export const dataCommands = {
               width: 4,
             },
           ],
+          outputs: {
+            label: "填充结果",
+            suggestName: "paddedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.split",
@@ -190,6 +220,11 @@ export const dataCommands = {
               defaultValue: newVarInputVal("str", ","),
             },
           ],
+          outputs: {
+            label: "分割结果",
+            suggestName: "splitedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.join",
@@ -210,6 +245,11 @@ export const dataCommands = {
               defaultValue: newVarInputVal("str", ","),
             },
           ],
+          outputs: {
+            label: "合并结果",
+            suggestName: "joinedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.repeat",
@@ -232,6 +272,11 @@ export const dataCommands = {
               defaultValue: 1,
             },
           ],
+          outputs: {
+            label: "重复结果",
+            suggestName: "repeatedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.extract",
@@ -259,6 +304,11 @@ export const dataCommands = {
               width: 4,
             },
           ],
+          outputs: {
+            label: "提取结果",
+            suggestName: "extractedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.count",
@@ -288,6 +338,11 @@ export const dataCommands = {
               width: 4,
             },
           ],
+          outputs: {
+            label: "统计结果",
+            suggestName: "countedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.wrap",
@@ -310,6 +365,11 @@ export const dataCommands = {
               defaultValue: 80,
             },
           ],
+          outputs: {
+            label: "换行结果",
+            suggestName: "wrappedString",
+            typeName: "字符串",
+          },
         },
         {
           value: "quickcomposer.data.string.align",
@@ -345,6 +405,11 @@ export const dataCommands = {
               defaultValue: 80,
             },
           ],
+          outputs: {
+            label: "对齐结果",
+            suggestName: "alignedString",
+            typeName: "字符串",
+          },
         },
       ],
     },
@@ -1208,26 +1273,62 @@ export const dataCommands = {
               label: "时间字符串",
               component: "VariableInput",
               icon: "schedule",
-              width: 8,
-              placeholder: "2024-01-01 12:00:00",
-            },
-            {
-              label: "原格式",
-              component: "QSelect",
-              icon: "format_shapes",
-              width: 4,
-              options: [
-                { label: "YYYY-MM-DD", value: "YYYY-MM-DD" },
-                { label: "YYYY-MM-DD HH:mm:ss", value: "YYYY-MM-DD HH:mm:ss" },
-                { label: "YYYY年MM月DD日", value: "YYYY年MM月DD日" },
-                { label: "MM/DD/YYYY", value: "MM/DD/YYYY" },
-                { label: "DD/MM/YYYY", value: "DD/MM/YYYY" },
-                { label: "时间戳(秒)", value: "timestamp" },
-                { label: "时间戳(毫秒)", value: "timestamp_ms" },
-              ],
-              defaultValue: "YYYY-MM-DD HH:mm:ss",
+              width: 12,
+              placeholder: "2024-01-01 或 now 或 timestamp",
             },
           ],
+          outputs: {
+            label: "时间解析结果",
+            suggestName: "timeParseResult",
+            structure: {
+              date: {
+                label: "日期",
+                year: { label: "年", suggestName: "dateYear" },
+                month: { label: "月", suggestName: "dateMonth" },
+                day: { label: "日", suggestName: "dateDay" },
+              },
+              time: {
+                label: "时间",
+                hours: { label: "时", suggestName: "timeHours" },
+                minutes: { label: "分", suggestName: "timeMinutes" },
+                seconds: { label: "秒", suggestName: "timeSeconds" },
+              },
+              formats: {
+                label: "格式化结果",
+                iso: { label: "ISO 8601 格式", suggestName: "formatIso" },
+                locale: { label: "本地格式", suggestName: "formatLocale" },
+                localeDate: {
+                  label: "本地日期",
+                  suggestName: "formatLocaleDate",
+                },
+                localeTime: {
+                  label: "本地时间",
+                  suggestName: "formatLocaleTime",
+                },
+                dateCN: {
+                  label: "YYYY年MM月DD日",
+                  suggestName: "formatDateCN",
+                },
+              },
+              timestamp: {
+                label: "时间戳(秒)",
+                suggestName: "formatTimestamp",
+              },
+              timestamp_ms: {
+                label: "时间戳(毫秒)",
+                suggestName: "formatTimestampMs",
+              },
+              calendar: {
+                label: "日历信息",
+                week: { label: "周", suggestName: "calendarWeek" },
+                weekText: { label: "周文本", suggestName: "canlendarweekText" },
+                isWeekend: { label: "是否周末", suggestName: "isWeekend" },
+                isLeapYear: { label: "是否闰年", suggestName: "isLeapYear" },
+                daysInMonth: { label: "月份天数", suggestName: "daysInMonth" },
+                constellation: { label: "星座", suggestName: "constellation" },
+              },
+            },
+          },
         },
         {
           value: "quickcomposer.data.time.add",
@@ -1379,20 +1480,6 @@ export const dataCommands = {
             },
           ],
         },
-        {
-          value: "quickcomposer.data.time.calendar",
-          label: "日历信息",
-          icon: "calendar_month",
-          config: [
-            {
-              label: "时间",
-              component: "VariableInput",
-              icon: "schedule",
-              width: 12,
-              placeholder: "2024-01-01 或 now",
-            },
-          ],
-        },
         {
           value: "quickcomposer.data.time.workday",
           label: "工作日计算",
diff --git a/src/js/composer/commands/fileCommands.js b/src/js/composer/commands/fileCommands.js
index 78869e6f..a263ade5 100644
--- a/src/js/composer/commands/fileCommands.js
+++ b/src/js/composer/commands/fileCommands.js
@@ -8,10 +8,15 @@ export const fileCommands = {
       label: "文件/文件夹操作",
       component: "FileOperationEditor",
       asyncMode: "await",
+      outputs: {
+        label: "文件/文件夹操作结果",
+        suggestName: "fileOperationResult",
+      },
     },
     {
       value: "utools.shellOpenItem",
       label: "默认程序打开",
+      neverHasOutput: true,
       config: [
         {
           label: "文件、文件夹或软件的绝对路径",
@@ -29,6 +34,7 @@ export const fileCommands = {
     {
       value: "utools.shellShowItemInFolder",
       label: "文件管理器中显示",
+      neverHasOutput: true,
       config: [
         {
           label: "文件、文件夹或软件的绝对路径",
@@ -62,6 +68,10 @@ export const fileCommands = {
           },
         },
       ],
+      outputs: {
+        label: "文件图标",
+        suggestName: "fileIcon",
+      },
     },
     {
       value: "quickcomposer.file.archive",
@@ -124,6 +134,7 @@ export const fileCommands = {
       value: "utools.shellTrashItem",
       label: "删除文件到回收站",
       icon: "delete",
+      neverHasOutput: true,
       config: [
         {
           label: "文件或文件夹的绝对路径",
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index f71fcaf7..ce4e35a8 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -49,6 +49,47 @@ export const imageCommands = {
           },
         },
       ],
+      outputs: {
+        label: "图片信息",
+        suggestName: "imageInfo",
+        structure: {
+          width: { label: "宽度", suggestName: "imageWidth" },
+          height: { label: "高度", suggestName: "imageHeight" },
+          aspectRatio: { label: "宽高比", suggestName: "imageAspectRatio" },
+          resolution: { label: "分辨率", suggestName: "imageResolution" },
+          type: { label: "类型", suggestName: "imageType" },
+          format: { label: "格式", suggestName: "imageFormat" },
+          size: { label: "大小", suggestName: "imageSize" },
+          bytes: { label: "字节", suggestName: "imageBytes" },
+          createTime: { label: "创建时间", suggestName: "imageCreateTime" },
+          modifyTime: { label: "修改时间", suggestName: "imageModifyTime" },
+          accessTime: { label: "访问时间", suggestName: "imageAccessTime" },
+          path: { label: "路径", suggestName: "imagePath" },
+          filename: { label: "文件名", suggestName: "imageFilename" },
+          colorInfo: {
+            label: "颜色信息",
+            averageColor: {
+              label: "平均RGBA",
+              suggestName: "imageAverageRgba",
+            },
+            isTransparent: {
+              label: "是否透明",
+              suggestName: "imageIsTransparent",
+            },
+            hasAlphaChannel: {
+              label: "是否包含Alpha通道",
+              suggestName: "imageHasAlphaChannel",
+            },
+          },
+          exif: { label: "EXIF", suggestName: "imageExif" },
+          rawExif: { label: "原始EXIF", suggestName: "imageRawExif" },
+          naturalWidth: { label: "自然宽度", suggestName: "imageNaturalWidth" },
+          naturalHeight: {
+            label: "自然高度",
+            suggestName: "imageNaturalHeight",
+          },
+        },
+      },
     },
     {
       value: "quickcomposer.image.resize",
@@ -475,6 +516,7 @@ export const imageCommands = {
     {
       value: "quickcomposer.image.pngToIcon",
       label: "PNG转图标",
+      neverHasOutput: true,
       icon: "transform",
       config: [
         {
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index 492adfce..bd63f257 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,3 +1,44 @@
+const windowOutputStructure = {
+  name: { label: "应用名称", suggestName: "appName" },
+  displayedName: {
+    label: "应用显示名称",
+    suggestName: "appDisplayName",
+  },
+  path: { label: "应用路径", suggestName: "appPath" },
+  version: { label: "应用版本", suggestName: "appVersion" },
+  pid: { label: "应用进程ID", suggestName: "appPid" },
+  backgroundOnly: {
+    label: "是否后台运行",
+    suggestName: "appBackgroundOnly",
+  },
+  visible: { label: "是否可见", suggestName: "appVisible" },
+  frontmost: { label: "是否前台运行", suggestName: "appFrontmost" },
+  window: {
+    label: "窗口信息",
+    name: { label: "窗口名称", suggestName: "windowName" },
+    title: { label: "窗口标题", suggestName: "windowTitle" },
+    index: { label: "窗口索引", suggestName: "windowIndex" },
+    position: {
+      label: "窗口位置",
+      placeholder: "数组，分别为 x 坐标，y 坐标",
+      suggestName: "windowPosition",
+    },
+    size: {
+      label: "窗口大小",
+      placeholder: "数组，分别为 宽度，高度",
+      suggestName: "windowSize",
+    },
+    minimized: {
+      label: "是否最小化",
+      suggestName: "windowMinimized",
+    },
+    fullscreen: {
+      label: "是否全屏",
+      suggestName: "windowFullscreen",
+    },
+  },
+};
+
 export const macosCommands = {
   label: "Mac自动化",
   icon: "laptop_mac",
@@ -16,47 +57,7 @@ export const macosCommands = {
           outputs: {
             label: "前台应用信息",
             suggestName: "frontmostApp",
-            structure: {
-              name: { label: "应用名称", suggestName: "appName" },
-              displayedName: {
-                label: "应用显示名称",
-                suggestName: "appDisplayName",
-              },
-              path: { label: "应用路径", suggestName: "appPath" },
-              version: { label: "应用版本", suggestName: "appVersion" },
-              pid: { label: "应用进程ID", suggestName: "appPid" },
-              backgroundOnly: {
-                label: "是否后台运行",
-                suggestName: "appBackgroundOnly",
-              },
-              visible: { label: "是否可见", suggestName: "appVisible" },
-              frontmost: { label: "是否前台运行", suggestName: "appFrontmost" },
-              window: {
-                label: "窗口信息",
-                name: { label: "窗口名称", suggestName: "windowName" },
-                title: { label: "窗口标题", suggestName: "windowTitle" },
-                index: { label: "窗口索引", suggestName: "windowIndex" },
-                position: {
-                  label: "窗口位置",
-                  placeholder:
-                    "数组， 第一个元素是 x 坐标，第二个元素是 y 坐标",
-                  suggestName: "windowPosition",
-                },
-                size: {
-                  label: "窗口大小",
-                  placeholder: "数组， 第一个元素是宽度，第二个元素是高度",
-                  suggestName: "windowSize",
-                },
-                minimized: {
-                  label: "是否最小化",
-                  suggestName: "windowMinimized",
-                },
-                fullscreen: {
-                  label: "是否全屏",
-                  suggestName: "windowFullscreen",
-                },
-              },
-            },
+            structure: windowOutputStructure,
           },
         },
         {
@@ -64,7 +65,7 @@ export const macosCommands = {
           label: "获取活动应用",
           icon: "list",
           outputs: {
-            label: "活动应用列表（数组）",
+            label: "活动应用列表",
             suggestName: "runningApps",
           },
         },
@@ -78,7 +79,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -92,7 +93,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -106,7 +107,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -120,7 +121,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -134,7 +135,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -148,7 +149,7 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
         },
@@ -162,9 +163,14 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
+          outputs: {
+            label: "窗口信息",
+            suggestName: "windows",
+            structure: [windowOutputStructure],
+          },
         },
         {
           value: "quickcomposer.macos.app.getScriptDictionary",
@@ -176,9 +182,40 @@ export const macosCommands = {
               component: "VariableInput",
               icon: "apps",
               width: 12,
-              placeholder: "输入应用名称",
+              placeholder: "输入应用名称，如 Finder",
             },
           ],
+          outputs: {
+            label: "应用脚本字典",
+            suggestName: "appScriptDictionary",
+            structure: {
+              commands: {
+                label: "命令列表",
+                suggestName: "appCommands",
+                placeholder: "数组",
+              },
+              properties: {
+                label: "属性列表",
+                suggestName: "appProperties",
+                placeholder: "数组",
+              },
+              summary: {
+                label: "概要信息",
+                totalCommands: {
+                  label: "命令总数",
+                  suggestName: "appTotalCommands",
+                },
+                totalProperties: {
+                  label: "属性总数",
+                  suggestName: "appTotalProperties",
+                },
+                hasScriptingSupport: {
+                  label: "是否支持脚本",
+                  suggestName: "appHasScriptingSupport",
+                },
+              },
+            },
+          },
         },
       ],
     },
@@ -312,11 +349,48 @@ export const macosCommands = {
           value: "quickcomposer.macos.finder.getSelection",
           label: "获取选中项",
           icon: "select_all",
+          outputs: {
+            label: "选中项",
+            suggestName: "selectedItems",
+            structure: [
+              {
+                name: { label: "名称", suggestName: "firstItemName" },
+                path: { label: "路径", suggestName: "firstItemPath" },
+                kind: { label: "类型", suggestName: "firstItemKind" },
+                size: { label: "大小", suggestName: "firstItemSize" },
+                created: {
+                  label: "创建时间",
+                  suggestName: "firstItemCreatedTime",
+                },
+                modified: {
+                  label: "修改时间",
+                  suggestName: "firstItemModifiedTime",
+                },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.macos.finder.getCurrentFolder",
-          label: "获取打开的路径",
+          label: "获取打开的文件夹信息",
           icon: "folder_open",
+          outputs: {
+            label: "打开的文件夹信息",
+            suggestName: "currentFolder",
+            structure: {
+              name: { label: "名称", suggestName: "currentFolderName" },
+              path: { label: "路径", suggestName: "currentFolderPath" },
+              kind: { label: "类型", suggestName: "currentFolderKind" },
+              created: {
+                label: "创建时间",
+                suggestName: "currentFolderCreatedTime",
+              },
+              modified: {
+                label: "修改时间",
+                suggestName: "currentFolderModifiedTime",
+              },
+            },
+          },
         },
         {
           value: "quickcomposer.macos.finder.setShowHiddenFiles",
@@ -335,6 +409,21 @@ export const macosCommands = {
           value: "quickcomposer.macos.finder.getWindows",
           label: "获取窗口列表",
           icon: "window",
+          outputs: {
+            label: "窗口列表",
+            suggestName: "finderWindows",
+            structure: [
+              {
+                name: { label: "名称", suggestName: "firstFinderWindowName" },
+                index: { label: "索引", suggestName: "firstFinderWindowIndex" },
+                bounds: {
+                  label: "边界",
+                  suggestName: "firstFinderWindowBounds",
+                },
+                target: { label: "路径", suggestName: "firstFinderWindowPath" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.macos.finder.activateWindow",
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 4c456304..00a29ee9 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -103,11 +103,21 @@ export const mathCommands = {
           value: "quickcomposer.math.random.number",
           label: "随机数",
           icon: "casino",
+          outputs: {
+            label: "随机数",
+            suggestName: "randomNumber",
+            typeName: "数字",
+          },
         },
         {
           value: "quickcomposer.math.random.integer",
           label: "随机整数",
           icon: "casino",
+          outputs: {
+            label: "随机整数",
+            suggestName: "randomInteger",
+            typeName: "数字",
+          },
         },
       ],
     },
@@ -298,6 +308,11 @@ export const mathCommands = {
       value: "quickcomposer.math.conversion.base",
       label: "进制转换",
       icon: "swap_horiz",
+      outputs: {
+        label: "转换结果",
+        suggestName: "convertedResult",
+        typeName: "字符串",
+      },
       config: [
         {
           label: "数值",
diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index b8aa5a55..9ff758e0 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -8,6 +8,7 @@ export const networkCommands = {
     {
       value: "utools.shellOpenExternal",
       label: "默认浏览器打开网址",
+      neverHasOutput: true,
       config: [
         {
           label: "要访问的网址链接",
@@ -19,6 +20,7 @@ export const networkCommands = {
     {
       value: "utools.ubrowser.goto",
       label: "ubrowser打开网址",
+      neverHasOutput: true,
       config: [
         {
           label: "要访问的网址链接",
@@ -43,6 +45,21 @@ export const networkCommands = {
       component: "AxiosConfigEditor",
       asyncMode: "await",
       icon: "http",
+      outputs: {
+        label: "HTTP请求结果",
+        suggestName: "responseResult",
+        structure: {
+          status: { label: "HTTP状态码", suggestName: "responseStatus" },
+          statusText: {
+            label: "HTTP状态信息",
+            suggestName: "responseStatusText",
+          },
+          headers: { label: "服务器响应头", suggestName: "responseHeaders" },
+          config: { label: "请求配置信息", suggestName: "requestConfig" },
+          request: { label: "发送的请求", suggestName: "request" },
+          data: { label: "响应数据", suggestName: "responseData" },
+        },
+      },
     },
     {
       value: "quickcomposer.network.url.parse",
@@ -54,12 +71,44 @@ export const networkCommands = {
           value: "quickcomposer.network.url.parse",
           label: "解析URL",
           icon: "link_off",
+          config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "URL解析结果",
+            suggestName: "urlParseResult",
+            structure: {
+              protocol: { label: "协议", suggestName: "protocol" },
+              slashes: { label: "是否包含斜杠", suggestName: "slashes" },
+              auth: { label: "认证信息", suggestName: "auth" },
+              host: { label: "主机", suggestName: "host" },
+              port: { label: "端口", suggestName: "port" },
+              hostname: { label: "主机名", suggestName: "hostname" },
+              hash: { label: "锚点", suggestName: "hash" },
+              search: { label: "查询字符串", suggestName: "search" },
+              query: { label: "查询参数", suggestName: "query" },
+              pathname: { label: "路径", suggestName: "pathname" },
+              path: { label: "路径", suggestName: "path" },
+              href: { label: "完整URL", suggestName: "href" },
+            },
+          },
         },
         {
           value: "quickcomposer.network.url.format",
           label: "格式化URL",
           icon: "link",
           config: [
+            {
+              label: "URL",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+            },
             {
               label: "协议",
               component: "VariableInput",
@@ -102,6 +151,10 @@ export const networkCommands = {
               width: 6,
             },
           ],
+          outputs: {
+            label: "URL格式化结果",
+            suggestName: "urlFormatResult",
+          },
         },
         {
           value: "quickcomposer.network.url.parseQuery",
@@ -114,6 +167,10 @@ export const networkCommands = {
               icon: "search",
             },
           ],
+          outputs: {
+            label: "解析结果",
+            suggestName: "queryParseResult",
+          },
         },
         {
           value: "quickcomposer.network.url.formatQuery",
@@ -126,30 +183,10 @@ export const networkCommands = {
               icon: "edit",
             },
           ],
-        },
-        {
-          value: "quickcomposer.network.url.parsePath",
-          label: "解析路径",
-          icon: "folder_open",
-          config: [
-            {
-              label: "路径",
-              component: "VariableInput",
-              icon: "folder",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.network.url.parseHost",
-          label: "解析主机名",
-          icon: "dns",
-          config: [
-            {
-              label: "主机名",
-              component: "VariableInput",
-              icon: "dns",
-            },
-          ],
+          outputs: {
+            label: "格式化结果",
+            suggestName: "queryFormatResult",
+          },
         },
         {
           value: "quickcomposer.network.url.getQueryParam",
@@ -169,6 +206,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "参数值",
+            suggestName: "paramValue",
+          },
         },
         {
           value: "quickcomposer.network.url.addQueryParam",
@@ -194,6 +235,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "处理后URL",
+            suggestName: "urlAfterAddParam",
+          },
         },
         {
           value: "quickcomposer.network.url.removeQueryParam",
@@ -213,6 +258,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "处理后URL",
+            suggestName: "urlAfterRemoveParam",
+          },
         },
         {
           value: "quickcomposer.network.url.isAbsolute",
@@ -226,19 +275,11 @@ export const networkCommands = {
               width: "auto",
             },
           ],
-        },
-        {
-          value: "quickcomposer.network.url.parseComponents",
-          label: "解析组成部分",
-          icon: "category",
-          config: [
-            {
-              label: "URL",
-              component: "VariableInput",
-              icon: "link",
-              width: "auto",
-            },
-          ],
+          outputs: {
+            label: "是否是绝对URL",
+            typeName: "布尔值",
+            suggestName: "isAbsoluteUrl",
+          },
         },
       ],
     },
@@ -279,6 +320,14 @@ export const networkCommands = {
               width: 2.5,
             },
           ],
+          outputs: {
+            label: "解析结果",
+            suggestName: "dnsLookupResult",
+            structure: {
+              address: { label: "IP地址", suggestName: "address" },
+              family: { label: "IP版本", suggestName: "family" },
+            },
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveAll",
@@ -292,6 +341,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "解析地址列表",
+            suggestName: "dnsResolveIpList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveIpv4",
@@ -305,6 +358,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "IPv4地址列表",
+            suggestName: "ipv4AddressList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveIpv6",
@@ -318,6 +375,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "IPv6地址列表",
+            suggestName: "ipv6AddressList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveMxRecords",
@@ -331,6 +392,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "MX记录列表",
+            suggestName: "mxRecordList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveTxtRecords",
@@ -344,6 +409,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "TXT记录列表",
+            suggestName: "txtRecordList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveNsRecords",
@@ -357,6 +426,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "NS记录列表",
+            suggestName: "nsRecordList",
+          },
         },
         {
           value: "quickcomposer.network.dns.resolveCnameRecords",
@@ -370,6 +443,10 @@ export const networkCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "CNAME记录列表",
+            suggestName: "cnameRecordList",
+          },
         },
         {
           value: "quickcomposer.network.dns.reverseResolve",
@@ -382,6 +459,10 @@ export const networkCommands = {
               component: "VariableInput",
             },
           ],
+          outputs: {
+            label: "解析域名列表",
+            suggestName: "reverseResolveDomainList",
+          },
         },
       ],
     },
diff --git a/src/js/composer/commands/notifyCommands.js b/src/js/composer/commands/notifyCommands.js
index 718542f8..ce58cb0a 100644
--- a/src/js/composer/commands/notifyCommands.js
+++ b/src/js/composer/commands/notifyCommands.js
@@ -6,6 +6,7 @@ export const notifyCommands = {
     {
       value: "console.log",
       label: "显示消息",
+      neverHasOutput: true,
       config: [
         {
           label: "要打印的消息文本",
@@ -17,6 +18,7 @@ export const notifyCommands = {
     {
       value: "utools.showNotification",
       label: "发送系统消息",
+      neverHasOutput: true,
       config: [
         {
           label: "要发送的系统消息文本",
diff --git a/src/js/composer/commands/otherCommands.js b/src/js/composer/commands/otherCommands.js
index 4268ac36..a94a0c64 100644
--- a/src/js/composer/commands/otherCommands.js
+++ b/src/js/composer/commands/otherCommands.js
@@ -4,8 +4,9 @@ export const otherCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "quickcommand.sleep",
+      value: "quickcommand.asyncSleep",
       label: "添加延时",
+      asyncMode: "await",
       config: [
         {
           label: "延迟的毫秒数",
diff --git a/src/js/composer/commands/screenCommands.js b/src/js/composer/commands/screenCommands.js
index 96cb34a3..5eb223aa 100644
--- a/src/js/composer/commands/screenCommands.js
+++ b/src/js/composer/commands/screenCommands.js
@@ -65,6 +65,111 @@ const RECT_DICT_EDITOR = {
   },
 };
 
+const DISPLAY_INFO_STRUCTURE = {
+  id: { label: "显示器ID", suggestName: "primaryDisplayId" },
+  label: { label: "显示器标签", suggestName: "primaryDisplayLabel" },
+  bounds: {
+    label: "边界",
+    x: { label: "X坐标", suggestName: "primaryDisplayBoundsX" },
+    y: { label: "Y坐标", suggestName: "primaryDisplayBoundsY" },
+    width: {
+      label: "宽度",
+      suggestName: "primaryDisplayBoundsWidth",
+    },
+    height: {
+      label: "高度",
+      suggestName: "primaryDisplayBoundsHeight",
+    },
+  },
+  workArea: {
+    label: "工作区",
+    x: { label: "X坐标", suggestName: "primaryDisplayWorkAreaX" },
+    y: { label: "Y坐标", suggestName: "primaryDisplayWorkAreaY" },
+    width: {
+      label: "宽度",
+      suggestName: "primaryDisplayWorkAreaWidth",
+    },
+    height: {
+      label: "高度",
+      suggestName: "primaryDisplayWorkAreaHeight",
+    },
+  },
+  accelerometerSupport: {
+    label: "是否支持加速度计",
+    suggestName: "primaryDisplayAccelerometerSupport",
+  },
+  monochrome: {
+    label: "是否是黑白显示器",
+    suggestName: "primaryDisplayMonochrome",
+  },
+  colorDepth: {
+    label: "颜色深度",
+    suggestName: "primaryDisplayColorDepth",
+  },
+  colorSpace: {
+    label: "颜色空间",
+    suggestName: "primaryDisplayColorSpace",
+  },
+  depthPerComponent: {
+    label: "每组件深度",
+    suggestName: "primaryDisplayDepthPerComponent",
+  },
+  size: {
+    label: "尺寸",
+    width: {
+      label: "宽度",
+      suggestName: "primaryDisplaySizeWidth",
+    },
+    height: {
+      label: "高度",
+      suggestName: "primaryDisplaySizeHeight",
+    },
+  },
+  displayFrequency: {
+    label: "显示频率",
+    suggestName: "primaryDisplayDisplayFrequency",
+  },
+  workAreaSize: {
+    label: "工作区尺寸",
+    width: {
+      label: "宽度",
+      suggestName: "primaryDisplayWorkAreaSizeWidth",
+    },
+    height: {
+      label: "高度",
+      suggestName: "primaryDisplayWorkAreaSizeHeight",
+    },
+  },
+  scaleFactor: {
+    label: "缩放比例",
+    suggestName: "primaryDisplayScaleFactor",
+  },
+  rotation: {
+    label: "旋转角度",
+    suggestName: "primaryDisplayRotation",
+  },
+  internal: {
+    label: "是否是内置显示器",
+    suggestName: "primaryDisplayInternal",
+  },
+  touchSupport: {
+    label: "是否支持触摸",
+    suggestName: "primaryDisplayTouchSupport",
+  },
+};
+
+const XY_STRUCTURE = {
+  x: { label: "X坐标", suggestName: "pointX" },
+  y: { label: "Y坐标", suggestName: "pointY" },
+};
+
+const RECT_STRUCTURE = {
+  x: { label: "X坐标", suggestName: "rectX" },
+  y: { label: "Y坐标", suggestName: "rectY" },
+  width: { label: "宽度", suggestName: "rectWidth" },
+  height: { label: "高度", suggestName: "rectHeight" },
+};
+
 export const screenCommands = {
   label: "显示器",
   icon: "display_settings",
@@ -78,23 +183,43 @@ export const screenCommands = {
           value: "utools.getPrimaryDisplay",
           label: "获取主显示器",
           icon: "monitor",
+          outputs: {
+            label: "主显示器信息",
+            suggestName: "primaryDisplayInfo",
+            structure: DISPLAY_INFO_STRUCTURE,
+          },
         },
         {
           value: "utools.getAllDisplays",
           label: "获取所有显示器",
           icon: "desktop_windows",
+          outputs: {
+            label: "所有显示器信息",
+            suggestName: "allDisplaysInfo",
+            structure: [DISPLAY_INFO_STRUCTURE],
+          },
         },
         {
           value: "utools.getDisplayNearestPoint",
           label: "获取位置所在显示器",
           icon: "gps_fixed",
           config: [XY_DICT_EDITOR],
+          outputs: {
+            label: "显示器信息",
+            suggestName: "nearestDisplayInfo",
+            structure: DISPLAY_INFO_STRUCTURE,
+          },
         },
         {
           value: "utools.getDisplayMatching",
           label: "获取矩形所在显示器",
           icon: "crop_square",
           config: [RECT_DICT_EDITOR],
+          outputs: {
+            label: "显示器信息",
+            suggestName: "matchingDisplayInfo",
+            structure: DISPLAY_INFO_STRUCTURE,
+          },
         },
       ],
     },
@@ -103,6 +228,11 @@ export const screenCommands = {
       label: "物理/DIP坐标转换",
       icon: "transform",
       config: [XY_DICT_EDITOR],
+      outputs: {
+        label: "转换结果",
+        suggestName: "convertedResult",
+        structure: XY_STRUCTURE,
+      },
       subCommands: [
         {
           value: "utools.screenToDipPoint",
@@ -121,6 +251,11 @@ export const screenCommands = {
       label: "物理/DIP区域转换",
       icon: "transform",
       config: [RECT_DICT_EDITOR],
+      outputs: {
+        label: "转换结果",
+        suggestName: "convertedResult",
+        structure: RECT_STRUCTURE,
+      },
       subCommands: [
         {
           value: "utools.screenToDipRect",
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index 3429eb8f..80cb2e31 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -25,6 +25,11 @@ export const scriptCommands = {
       component: "ScriptEditor",
       desc: "运行各种编程语言的代码",
       asyncMode: "await",
+      outputs: {
+        label: "运行结果",
+        suggestName: "runScriptResult",
+        typeName: "字符串",
+      },
     },
     {
       value: "return",
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 9199b481..53c57c3d 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -10,15 +10,18 @@ export const simulateCommands = {
       label: "模拟按键",
       config: [],
       component: "KeyEditor",
+      neverHasOutput: true,
     },
     {
       value: "quickcomposer.simulate.keySequence",
       label: "按键序列",
       component: "KeySequenceEditor",
+      neverHasOutput: true,
     },
     {
       value: "quickcommand.simulateCopy",
       label: "模拟复制粘贴",
+      neverHasOutput: true,
       config: [],
       subCommands: [
         {
@@ -36,6 +39,11 @@ export const simulateCommands = {
     {
       value: "utools.hideMainWindowTypeString",
       label: "发送文本",
+      outputs: {
+        label: "是否发送成功",
+        suggestName: "isSendSuccess",
+        typeName: "布尔值",
+      },
       config: [
         {
           label: "要发送的文本内容",
@@ -60,6 +68,11 @@ export const simulateCommands = {
     {
       value: "utools.hideMainWindowPasteFile",
       label: "模拟粘贴文件/图片",
+      outputs: {
+        label: "是否粘贴成功",
+        suggestName: "isPasteSuccess",
+        typeName: "布尔值",
+      },
       icon: "file_copy",
       subCommands: [
         {
@@ -112,6 +125,7 @@ export const simulateCommands = {
     {
       value: "quickcomposer.simulate.mouseClick",
       label: "鼠标点击",
+      neverHasOutput: true,
       config: [
         {
           component: "ButtonGroup",
@@ -208,6 +222,20 @@ export const simulateCommands = {
           label: "获取坐标",
           value: "utools.getCursorScreenPoint",
           icon: "mouse",
+          outputs: {
+            label: "鼠标坐标",
+            suggestName: "mousePoint",
+            structure: {
+              x: {
+                label: "X坐标",
+                suggestName: "mouseX",
+              },
+              y: {
+                label: "Y坐标",
+                suggestName: "mouseY",
+              },
+            },
+          },
         },
       ],
     },
@@ -217,12 +245,52 @@ export const simulateCommands = {
       component: "ImageSearchEditor",
       config: [],
       asyncMode: "await",
+      outputs: {
+        label: "图片坐标",
+        suggestName: "foundImagePosition",
+        structure: {
+          x: {
+            label: "X坐标",
+            suggestName: "imageX",
+          },
+          y: {
+            label: "Y坐标",
+            suggestName: "imageY",
+          },
+          width: {
+            label: "宽度",
+            suggestName: "imageWidth",
+          },
+          height: {
+            label: "高度",
+            suggestName: "imageHeight",
+          },
+          confidence: {
+            label: "置信度",
+            suggestName: "imageConfidence",
+          },
+        },
+      },
     },
     {
       value: "quickcomposer.simulate.screenColorPick",
       label: "屏幕取色",
       icon: "colorize",
       asyncMode: "await",
+      outputs: {
+        label: "颜色值",
+        suggestName: "colorValue",
+        structure: {
+          hex: {
+            label: "十六进制颜色值",
+            suggestName: "colorHex",
+          },
+          rgb: {
+            label: "RGB颜色值",
+            suggestName: "colorRgb",
+          },
+        },
+      },
     },
     {
       value: "quickcomposer.simulate.captureScreen",
@@ -252,6 +320,11 @@ export const simulateCommands = {
           label: "保存到dataUrl",
           value: "quickcomposer.simulate.captureScreen",
           icon: "link",
+          outputs: {
+            label: "图片dataUrl",
+            suggestName: "imageDataUrl",
+            typeName: "字符串",
+          },
         },
         {
           label: "保存到文件",
diff --git a/src/js/composer/commands/statusCommands.js b/src/js/composer/commands/statusCommands.js
index ebaa8239..03b2553c 100644
--- a/src/js/composer/commands/statusCommands.js
+++ b/src/js/composer/commands/statusCommands.js
@@ -7,30 +7,62 @@ export const statusCommands = {
       label: "获取当前文件管理器路径",
       icon: "folder",
       asyncMode: "await",
+      outputs: {
+        label: "当前文件管理器路径",
+        suggestName: "currentFolderPath",
+        typeName: "字符串",
+      },
     },
     {
       value: "utools.readCurrentBrowserUrl",
       label: "获取当前浏览器地址",
       icon: "language",
       asyncMode: "await",
+      outputs: {
+        label: "当前浏览器地址",
+        suggestName: "currentBrowserUrl",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.status.getSelectedText",
       label: "获取选中文本",
       icon: "text_fields",
       asyncMode: "await",
+      outputs: {
+        label: "选中文本",
+        suggestName: "selectedText",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.status.getSelectedImage",
       label: "获取选中的图片",
       icon: "image",
       asyncMode: "await",
+      outputs: {
+        label: "选中图片DataUrl",
+        suggestName: "selectedImageDataUrl",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcomposer.status.getSelectedFiles",
       label: "获取选中的文件",
       icon: "file_present",
       asyncMode: "await",
+      outputs: {
+        label: "选中的文件列表",
+        suggestName: "selectedFiles",
+        structure: [
+          {
+            isFile: { label: "是否是文件", suggestName: "isSelectedFile" },
+            isDirectory: { label: "是否是目录", suggestName: "isSelectedDirectory" },
+            name: { label: "文件名", suggestName: "selectedFileName" },
+            path: { label: "文件路径", suggestName: "selectedFilePath" },
+          },
+        ],
+      },
     },
   ],
 };
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index e7c8eb6c..16296d14 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -77,16 +77,39 @@ export const systemCommands = {
           value: "electron.clipboard.readText",
           label: "剪贴板文本",
           icon: "content_copy",
+          outputs: {
+            label: "剪贴板文本",
+            suggestName: "clipboardText",
+          },
         },
         {
           value: "quickcommand.readClipboardImage",
           label: "剪贴板图片",
           icon: "image",
+          outputs: {
+            label: "图片DataURL",
+            suggestName: "clipboardImageDataURL",
+          },
         },
         {
           value: "utools.getCopyedFiles",
           label: "剪贴板文件",
           icon: "file_copy",
+          outputs: {
+            label: "剪贴板文件列表",
+            suggestName: "clipboardFileList",
+            structure: [
+              {
+                isFile: { label: "是否是文件", suggestName: "isFile" },
+                isDirectory: {
+                  label: "是否是目录",
+                  suggestName: "isDirectory",
+                },
+                name: { label: "文件名", suggestName: "name" },
+                path: { label: "文件路径", suggestName: "path" },
+              },
+            ],
+          },
         },
         {
           value: "electron.clipboard.readRTF",
@@ -106,6 +129,10 @@ export const systemCommands = {
       component: "SystemCommandEditor",
       icon: "terminal",
       asyncMode: "await",
+      outputs: {
+        label: "执行结果",
+        suggestName: "execResult",
+      },
     },
     {
       value: "utools.getPath",
@@ -175,6 +202,10 @@ export const systemCommands = {
           ],
         },
       ],
+      outputs: {
+        label: "系统路径",
+        suggestName: "systemPath",
+      },
     },
     {
       value: "utools.isMacOS",
@@ -184,16 +215,31 @@ export const systemCommands = {
           value: "utools.isMacOS",
           label: "是否Mac",
           icon: "computer",
+          outputs: {
+            label: "是否是Mac",
+            typeName: "布尔值",
+            suggestName: "isMacOS",
+          },
         },
         {
           value: "utools.isWindows",
           label: "是否Windows",
           icon: "computer",
+          outputs: {
+            label: "是否是Windows",
+            typeName: "布尔值",
+            suggestName: "isWindows",
+          },
         },
         {
           value: "utools.isLinux",
           label: "是否Linux",
           icon: "computer",
+          outputs: {
+            label: "是否是Linux",
+            typeName: "布尔值",
+            suggestName: "isLinux",
+          },
         },
       ],
     },
@@ -212,18 +258,24 @@ export const systemCommands = {
           value: "quickcomposer.system.os.cpus",
           label: "CPU信息",
           icon: "developer_board",
-          config: [
-            {
-              label: "信息格式",
-              component: "ButtonGroup",
-              options: [
-                { label: "完整信息", value: "full" },
-                { label: "仅型号和速度", value: "simple" },
-              ],
-              defaultValue: "full",
-              width: 12,
-            },
-          ],
+          outputs: {
+            label: "CPU信息",
+            suggestName: "cpuInfo",
+            structure: [
+              {
+                model: { label: "型号", suggestName: "model" },
+                speed: { label: "速度", suggestName: "speed" },
+                times: {
+                  label: "时间",
+                  user: { label: "user", suggestName: "user" },
+                  nice: { label: "nice", suggestName: "nice" },
+                  sys: { label: "sys", suggestName: "sys" },
+                  idle: { label: "idle", suggestName: "idle" },
+                  irq: { label: "irq", suggestName: "irq" },
+                },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.system.os.memory",
@@ -323,6 +375,17 @@ export const systemCommands = {
               width: "auto",
             },
           ],
+          outputs: {
+            label: "路径解析结果",
+            suggestName: "pathParseResult",
+            structure: {
+              root: { label: "根路径", suggestName: "parseRoot" },
+              dir: { label: "目录", suggestName: "parseDir" },
+              base: { label: "基本名称", suggestName: "parseBaseName" },
+              ext: { label: "扩展名", suggestName: "parseExtName" },
+              name: { label: "文件名", suggestName: "parseFileName" },
+            },
+          },
         },
         {
           value: "quickcomposer.system.path.dirname",
@@ -482,6 +545,7 @@ export const systemCommands = {
       value: "quickcommand.kill",
       label: "关闭进程",
       icon: "dangerous",
+      neverHasOutput: true,
       config: [
         {
           label: "进程ID",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 93074d2e..6ddd0f8d 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -171,6 +171,8 @@ export const uiCommands = {
       asyncMode: "await",
       outputs: {
         label: "是否确认",
+        suggestName: "isConfirmed",
+        typeName: "布尔值",
       },
       config: [
         {
@@ -221,6 +223,21 @@ export const uiCommands = {
       label: "按钮组",
       asyncMode: "await",
       width: 12,
+      outputs: {
+        label: "选择的按钮",
+        suggestName: "selectedButton",
+        structure: {
+          id: {
+            label: "按钮序号",
+            suggestName: "buttonId",
+            placeholder: "按钮的序号，从0开始",
+          },
+          text: {
+            label: "按钮文本",
+            suggestName: "buttonText",
+          },
+        },
+      },
       config: [
         {
           label: "按钮",
@@ -255,6 +272,15 @@ export const uiCommands = {
       value: "quickcommand.showInputBox",
       label: "输入框",
       asyncMode: "await",
+      outputs: {
+        label: "输入框值",
+        suggestName: "inputValues",
+        structure: [
+          { label: "第一个输入框的值", suggestName: "inputValue1" },
+          { label: "第二个输入框的值", suggestName: "inputValue2" },
+          { label: "第三个输入框的值", suggestName: "inputValue3" },
+        ],
+      },
       config: [
         {
           label: "输入框",
@@ -294,11 +320,42 @@ export const uiCommands = {
       label: "选择列表",
       component: "SelectListEditor",
       asyncMode: "await",
+      outputs: {
+        label: "选择结果",
+        suggestName: "selectedItem",
+        structure: {
+          id: {
+            label: "选项序号",
+            suggestName: "itemId",
+            placeholder: "选项的序号，从0开始",
+          },
+          text: {
+            label: "选项文本",
+            suggestName: "itemText",
+            placeholder: "纯文本模式时选项的文本",
+          },
+          title: {
+            label: "选项标题",
+            suggestName: "itemTitle",
+            placeholder: "JSON模式时选项的标题",
+          },
+          description: {
+            label: "选项描述",
+            suggestName: "itemDescription",
+            placeholder: "JSON模式时选项的描述",
+          },
+        },
+      },
     },
     {
       value: "quickcommand.showTextArea",
       label: "文本框",
       asyncMode: "await",
+      outputs: {
+        label: "文本框内容",
+        suggestName: "textAreaContent",
+        typeName: "字符串",
+      },
       config: [
         {
           label: "文本框占位符",
@@ -330,6 +387,11 @@ export const uiCommands = {
       value: "quickcommand.showSystemWaitButton",
       label: "等待操作按钮",
       asyncMode: "await",
+      outputs: {
+        label: "是否点击按钮",
+        suggestName: "isWaitButtonClicked",
+        typeName: "布尔值",
+      },
       config: [
         {
           component: "OptionEditor",
@@ -383,6 +445,15 @@ export const uiCommands = {
               },
             },
           ],
+          outputs: {
+            label: "选择的文件列表",
+            suggestName: "selectedFiles",
+            structure: [
+              { label: "第一个文件路径", suggestName: "firstFilePath" },
+              { label: "第二个文件路径", suggestName: "secondFilePath" },
+              { label: "第三个文件路径", suggestName: "thirdFilePath" },
+            ],
+          },
         },
         {
           value: "utools.showSaveDialog",
@@ -399,6 +470,11 @@ export const uiCommands = {
               },
             },
           ],
+          outputs: {
+            label: "保存文件路径",
+            suggestName: "selectedSavePath",
+            typeName: "字符串",
+          },
         },
       ],
     },
diff --git a/src/js/composer/commands/userdataCommands.js b/src/js/composer/commands/userdataCommands.js
index e873b3cf..fcf7bdd8 100644
--- a/src/js/composer/commands/userdataCommands.js
+++ b/src/js/composer/commands/userdataCommands.js
@@ -14,11 +14,27 @@ export const userdataCommands = {
           icon: "title",
         },
       ],
+      outputs: {
+        label: "数据值",
+        suggestName: "userDataValue",
+        typeName: "字符串",
+      },
     },
     {
       value: "quickcommand.userData.all",
       label: "获取所有用户数据",
       icon: "database",
+      outputs: {
+        label: "所有用户数据",
+        suggestName: "allUserData",
+        structure: [
+          {
+            id: { label: "数据标识", suggestName: "userDataId" },
+            isNative: { label: "是否是本地数据", suggestName: "isNativeData" },
+            value: { label: "数据值", suggestName: "userDataValue" },
+          },
+        ],
+      },
     },
     {
       value: "quickcommand.userData.put",
@@ -44,6 +60,11 @@ export const userdataCommands = {
           width: 2,
         },
       ],
+      outputs: {
+        label: "是否成功",
+        suggestName: "isSetUserDataSuccess",
+        typeName: "布尔值",
+      },
     },
     {
       value: "quickcommand.userData.del",
@@ -56,6 +77,11 @@ export const userdataCommands = {
           icon: "title",
         },
       ],
+      outputs: {
+        label: "是否成功",
+        suggestName: "isDelUserDataSuccess",
+        typeName: "布尔值",
+      },
     },
   ],
 };
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 9a690381..072de681 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -6,15 +6,22 @@ export const utoolsCommands = {
       value: "utools.hideMainWindow",
       label: "隐藏主窗口",
       icon: "visibility_off",
+      outputs: {
+        label: "是否隐藏成功",
+        typeName: "布尔值",
+        suggestName: "isHideMainWindowSuccess",
+      },
     },
     {
       value: "quickcommand.wakeUtools",
       label: "唤醒uTools",
+      neverHasOutput: true,
       icon: "visibility",
     },
     {
       value: "utools.setExpendHeight",
       label: "设置uTools高度",
+      neverHasOutput: true,
       icon: "height",
       config: [
         {
@@ -30,6 +37,7 @@ export const utoolsCommands = {
     {
       value: "utools.outPlugin",
       label: "退出插件",
+      neverHasOutput: true,
       icon: "exit_to_app",
       config: [
         {
@@ -47,15 +55,30 @@ export const utoolsCommands = {
       value: "utools.isDarkColors",
       label: "是否深色模式",
       icon: "dark_mode",
+      outputs: {
+        label: "是否深色模式",
+        suggestName: "isDarkColors",
+        typeName: "布尔值",
+      },
     },
     {
       value: "utools.getUser",
       label: "获取用户信息",
       icon: "person",
+      outputs: {
+        label: "用户信息",
+        suggestName: "userInfo",
+        structure: {
+          avatar: { label: "头像", suggestName: "userAvatar" },
+          nickname: { label: "昵称", suggestName: "userNickname" },
+          type: { label: "类型", suggestName: "userType" },
+        },
+      },
     },
     {
       value: "utools.redirect",
       label: "转至指定插件",
+      neverHasOutput: true,
       config: [
         {
           label: "要跳转至的插件名称",
@@ -74,6 +97,7 @@ export const utoolsCommands = {
     {
       value: "utools.findInPage",
       label: "插件内查找",
+      neverHasOutput: true,
       icon: "search",
       subCommands: [
         {
@@ -137,6 +161,7 @@ export const utoolsCommands = {
         {
           value: "utools.stopFindInPage",
           label: "停止查找",
+          neverHasOutput: true,
           icon: "stop",
           config: [
             {
@@ -159,14 +184,29 @@ export const utoolsCommands = {
       value: "utools.getWindowType",
       label: "获取当前窗口类型",
       icon: "window",
+      outputs: {
+        label: "窗口类型",
+        suggestName: "windowType",
+        typeName: "字符串",
+      },
     },
     {
       value: "utools.getNativeId",
       label: "获取本地ID",
+      outputs: {
+        label: "本地ID",
+        suggestName: "nativeId",
+        typeName: "字符串",
+      },
     },
     {
       value: "utools.getAppVersion",
       label: "获取uTools版本",
+      outputs: {
+        label: "uTools版本",
+        suggestName: "appVersion",
+        typeName: "字符串",
+      },
     },
   ],
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 5bdcb408..ea0bf83a 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -208,7 +208,7 @@ export const windowsCommands = {
           label: "搜索窗口",
           icon: "search",
           outputs: {
-            label: "窗口信息（数组）",
+            label: "窗口信息",
             structure: [
               {
                 handle: { label: "窗口句柄" },
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 0e63322d..0102ff96 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -91,15 +91,15 @@ export function generateCode(flow) {
             code.push(
               `${indent}${getVarAssignCode(
                 varName,
-                getVarByPath(promiseName, path),
-                flow.name
+                getVarByPath(promiseName, path)
               )}`
             );
           });
         }
       } else {
         // 非Async命令
-        cmdCode = getVarAssignCode(name, `${cmdCode}`);
+        const resultVarName = name || "result";
+        cmdCode = getVarAssignCode(resultVarName, `${cmdCode}`);
         code.push(indent + cmdCode);
         // 处理详细变量
         if (details) {
@@ -107,8 +107,7 @@ export function generateCode(flow) {
             code.push(
               `${indent}${getVarAssignCode(
                 varName,
-                getVarByPath(name, path),
-                flow.name
+                getVarByPath(resultVarName, path)
               )}`
             );
           });
@@ -130,5 +129,9 @@ export function generateCode(flow) {
     code.push("\nmain();"); // Call the main function
   }
 
-  return code.join("\n");
+  const finalCode = code.join("\n");
+
+  console.log(finalCode);
+
+  return finalCode;
 }
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 95eb35b9..c1204766 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -235,6 +235,18 @@ interface quickcommandApi {
    */
   setTimeout(callback: () => void, ms);
 
+  /**
+   * async 等待
+   *
+   * @param ms 等待的毫秒数
+   * ```js
+   * quickcommand.asyncSleep(2000).then(() => {
+   *   console.log('2000毫秒后执行')
+   * })
+   * ```
+   */
+  asyncSleep(ms: number): Promise<number>;
+
   /**
    * 将给定的html字符串解析为 DOM 对象，用于快速编写爬虫脚本
    *

From b964cdc839ebf3b0d479694c84e7adecad7db058 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 23:25:18 +0800
Subject: [PATCH 140/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=8C=89=E9=92=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue          | 27 +++++++-------
 .../composer/card/CommandButtons.vue          | 36 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index f7e18e0b..e0a7692a 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -154,16 +154,18 @@ export default defineComponent({
         if (cmd.outputVariable && cmd.asyncMode !== "then") {
           const { name, details = {} } = cmd.outputVariable;
           variables.push(
-            ...[name, ...Object.values(details)].map((variable) => ({
-              name: variable,
-              // 提供来源命令的标志信息
-              sourceCommand: {
-                label: cmd.label,
-                id: cmd.id,
-                index,
-              },
-              type: "output",
-            }))
+            ...[name, ...Object.values(details)]
+              .filter((v) => v)
+              .map((variable) => ({
+                name: variable,
+                // 提供来源命令的标志信息
+                sourceCommand: {
+                  label: cmd.label,
+                  id: cmd.id,
+                  index,
+                },
+                type: "output",
+              }))
           );
         }
       }
@@ -274,10 +276,7 @@ export default defineComponent({
         (v) => v.type === "var"
       );
       // 完全更新参数
-      this.subFlows[index].customVariables = [
-        ...newParams,
-        ...localVars,
-      ];
+      this.subFlows[index].customVariables = [...newParams, ...localVars];
     },
     generateFlowCode(flow) {
       return generateCode(flow);
diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index eadb4a13..467b6f83 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -19,7 +19,20 @@
           <q-tooltip>
             <div class="text-body2">输出配置</div>
             <div class="text-caption text-grey-5">
-              配置输出变量、是否等待执行完毕等
+              <div class="row items-center">
+                本命令配置输出变量数
+                <q-badge color="primary" class="output-badge">
+                  {{ outputLength }}
+                </q-badge>
+              </div>
+              <div class="row items-center">
+                {{ isThenCommand ? "不用" : "需要" }}等待命令运行完毕
+                <q-badge color="primary" class="output-badge">
+                  <q-icon
+                    :name="isThenCommand ? 'update_disabled' : 'schedule'"
+                  />
+                </q-badge>
+              </div>
             </div>
           </q-tooltip>
         </q-icon>
@@ -139,6 +152,17 @@ export default {
       showOutputEditor: false,
     };
   },
+  computed: {
+    isThenCommand() {
+      return this.command.asyncMode === "then";
+    },
+    outputLength() {
+      return (
+        Object.keys(this.command.outputVariable?.details || {}).length +
+        (this.command.outputVariable?.name ? 1 : 0)
+      );
+    },
+  },
   emits: [
     "update:outputVariable",
     "run",
@@ -225,4 +249,14 @@ export default {
   min-width: 24px;
   padding: 0 4px;
 }
+
+.output-badge {
+  font-size: 10px;
+  width: 13px;
+  height: 13px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-left: 3px;
+}
 </style>

From 9d3a5cbdf78f50b747ff6d24a63ce4cbe7862f84 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 26 Jan 2025 23:35:22 +0800
Subject: [PATCH 141/332] =?UTF-8?q?=E4=B8=BACheckButton=E5=92=8C=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E5=91=BD=E4=BB=A4=E6=B7=BB=E5=8A=A0=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D=E7=AC=A6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CheckButton.vue | 4 ++--
 src/js/composer/commands/browserCommands.js    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/common/CheckButton.vue b/src/components/composer/common/CheckButton.vue
index da6cadae..6e6b8f2e 100644
--- a/src/components/composer/common/CheckButton.vue
+++ b/src/components/composer/common/CheckButton.vue
@@ -19,7 +19,7 @@
             class="q-ml-xs check-btn-icon"
           />
         </div>
-        <q-tooltip v-if="tooltip">{{ tooltip }}</q-tooltip>
+        <q-tooltip v-if="placeholder">{{ placeholder }}</q-tooltip>
       </template>
     </q-btn>
   </div>
@@ -43,7 +43,7 @@ export default defineComponent({
       type: String,
       default: "",
     },
-    tooltip: {
+    placeholder: {
       type: String,
       default: "",
     },
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 54327589..ba709afb 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -60,6 +60,8 @@ export const browserCommands = {
                 },
                 useSingleUserDataDir: {
                   label: "使用独立用户数据目录",
+                  placeholder:
+                    "⚠️注意：不勾选时，会自动关闭所有已打开的浏览器；如需运行多实例必须勾选",
                   component: "CheckButton",
                   width: 3,
                 },

From f35582b09f97ea7953cfcd5c3d4b59084d2a7470 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 00:10:12 +0800
Subject: [PATCH 142/332] =?UTF-8?q?=E4=B8=BAWindows=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E7=BB=86=E7=9A=84=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=92=8C=E5=BB=BA=E8=AE=AE=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/index.js           |   2 +-
 src/js/composer/commands/windowsCommands.js | 237 +++++++++++++++++++-
 2 files changed, 227 insertions(+), 12 deletions(-)

diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 961f9d22..dc0aba00 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -22,7 +22,7 @@ import { browserCommands } from "./browserCommands";
 
 const platformCommands = {
   win32: [windowsCommands],
-  darwin: [macosCommands],
+  darwin: [macosCommands, windowsCommands],
   linux: [],
 };
 
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index ea0bf83a..cb10a0be 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -189,6 +189,48 @@ const searchElementConfig = [
   },
 ];
 
+const windowInfoStructure = {
+  title: { label: "窗口标题", suggestName: "windowTitle" },
+  class: { label: "窗口类名", suggestName: "windowClass" },
+  handle: { label: "窗口句柄", suggestName: "windowHandle" },
+  x: { label: "窗口X坐标", suggestName: "windowX" },
+  y: { label: "窗口Y坐标", suggestName: "windowY" },
+  width: { label: "窗口宽度", suggestName: "windowWidth" },
+  height: { label: "窗口高度", suggestName: "windowHeight" },
+  processName: { label: "窗口进程名", suggestName: "windowProcessName" },
+  processPath: { label: "窗口进程路径", suggestName: "windowProcessPath" },
+  element: {
+    label: "元素信息",
+    name: { label: "元素名称", suggestName: "elementName" },
+    class: { label: "元素类名", suggestName: "elementClass" },
+    type: { label: "元素类型", suggestName: "elementType" },
+    automationId: {
+      label: "元素AutomationId",
+      suggestName: "elementAutomationId",
+    },
+    xpath: { label: "元素XPath", suggestName: "elementXPath" },
+    handle: { label: "元素句柄", suggestName: "elementHandle" },
+    x: { label: "元素X坐标", suggestName: "elementX" },
+    y: { label: "元素Y坐标", suggestName: "elementY" },
+    width: { label: "元素宽度", suggestName: "elementWidth" },
+    height: { label: "元素高度", suggestName: "elementHeight" },
+  },
+  position: {
+    label: "鼠标位置",
+    x: { label: "鼠标X坐标", suggestName: "mouseX" },
+    y: { label: "鼠标Y坐标", suggestName: "mouseY" },
+  },
+};
+
+const controlResultStructure = {
+  success: { label: "是否成功", suggestName: "isSuccess" },
+  error: {
+    label: "错误信息",
+    suggestName: "errorMessage",
+    placeholder: "操作失败时的错误信息",
+  },
+};
+
 export const windowsCommands = {
   label: "Win自动化",
   icon: "window",
@@ -209,17 +251,24 @@ export const windowsCommands = {
           icon: "search",
           outputs: {
             label: "窗口信息",
+            suggestName: "windowInfo",
             structure: [
               {
-                handle: { label: "窗口句柄" },
-                title: { label: "窗口标题" },
-                class: { label: "窗口类名" },
-                x: { label: "窗口X坐标" },
-                y: { label: "窗口Y坐标" },
-                width: { label: "窗口宽度" },
-                height: { label: "窗口高度" },
-                processName: { label: "窗口进程名" },
-                processPath: { label: "窗口进程路径" },
+                handle: { label: "窗口句柄", suggestName: "windowHandle" },
+                title: { label: "窗口标题", suggestName: "windowTitle" },
+                class: { label: "窗口类名", suggestName: "windowClass" },
+                x: { label: "窗口X坐标", suggestName: "windowX" },
+                y: { label: "窗口Y坐标", suggestName: "windowY" },
+                width: { label: "窗口宽度", suggestName: "windowWidth" },
+                height: { label: "窗口高度", suggestName: "windowHeight" },
+                processName: {
+                  label: "窗口进程名",
+                  suggestName: "windowProcessName",
+                },
+                processPath: {
+                  label: "窗口进程路径",
+                  suggestName: "windowProcessPath",
+                },
               },
             ],
           },
@@ -228,6 +277,11 @@ export const windowsCommands = {
           value: "quickcomposer.windows.automation.inspect",
           label: "手动选择窗口",
           icon: "my_location",
+          outputs: {
+            label: "窗口信息",
+            suggestName: "windowInfo",
+            structure: windowInfoStructure,
+          },
         },
         {
           value: "quickcomposer.windows.automation.inspectPosition",
@@ -254,6 +308,11 @@ export const windowsCommands = {
               },
             },
           ],
+          outputs: {
+            label: "窗口信息",
+            suggestName: "windowInfo",
+            structure: windowInfoStructure,
+          },
         },
       ],
     },
@@ -263,6 +322,11 @@ export const windowsCommands = {
       label: "窗口控制",
       icon: "window",
       config: windowHandleConfig,
+      outputs: {
+        label: "操作结果",
+        suggestName: "windowControlResult",
+        structure: controlResultStructure,
+      },
       subCommands: [
         {
           value: "quickcomposer.windows.window.setTopMost",
@@ -406,6 +470,11 @@ export const windowsCommands = {
       icon: "smart_button",
       asyncMode: "await",
       config: searchElementConfig,
+      outputs: {
+        label: "操作结果",
+        suggestName: "automationResult",
+        structure: controlResultStructure,
+      },
       subCommands: [
         {
           value: "quickcomposer.windows.automation.click",
@@ -465,6 +534,14 @@ export const windowsCommands = {
           value: "quickcomposer.windows.automation.getvalue",
           label: "获取值",
           icon: "content_paste",
+          outputs: {
+            label: "操作结果",
+            suggestName: "getValueResult",
+            structure: {
+              ...controlResultStructure,
+              data: { label: "元素值", suggestName: "elementValue" },
+            },
+          },
         },
         {
           value: "quickcomposer.windows.automation.select",
@@ -629,6 +706,11 @@ export const windowsCommands = {
       icon: "smart_button",
       asyncMode: "await",
       config: windowHandleConfig,
+      outputs: {
+        label: "操作结果",
+        suggestName: "sendMessageResult",
+        structure: controlResultStructure,
+      },
       subCommands: [
         {
           value: "quickcomposer.windows.sendmessage.listControls",
@@ -663,6 +745,29 @@ export const windowsCommands = {
               },
             },
           ],
+          outputs: {
+            label: "控件树信息",
+            suggestName: "controlsTree",
+            structure: [
+              {
+                handle: { label: "句柄", suggestName: "handle" },
+                class: { label: "类名", suggestName: "class" },
+                text: { label: "文本", suggestName: "text" },
+                visible: { label: "是否可见", suggestName: "visible" },
+                location: {
+                  label: "位置",
+                  suggestName: "location",
+                  placeholder: "对象，x,y,width,height",
+                },
+                matched: { label: "是否匹配", suggestName: "matched" },
+                children: {
+                  label: "子控件",
+                  suggestName: "childrenControls",
+                  placeholder: "数组，所有子控件信息",
+                },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.sendmessage.click",
@@ -827,6 +932,21 @@ export const windowsCommands = {
           value: "quickcomposer.windows.monitor.watchClipboard",
           label: "等待剪贴板变化",
           icon: "content_paste",
+          outputs: {
+            label: "剪贴板变化事件",
+            suggestName: "clipboardChangeEvent",
+            structure: {
+              format: {
+                label: "变化内容类型",
+                suggestName: "clipboardContentFormat",
+                placeholder: "如: text, files",
+              },
+              content: {
+                label: "剪切板内容",
+                suggestName: "clipboardContent",
+              },
+            },
+          },
         },
         {
           value: "quickcomposer.windows.monitor.watchFileSystem",
@@ -874,6 +994,21 @@ export const windowsCommands = {
               },
             },
           ],
+          outputs: {
+            label: "文件夹变化事件",
+            suggestName: "fileChangeEvent",
+            structure: {
+              event: {
+                label: "事件类型",
+                suggestName: "fileChangeEventType",
+                placeholder: "如: created, modified, deleted",
+              },
+              path: {
+                label: "变化文件路径",
+                suggestName: "changedFilePath",
+              },
+            },
+          },
         },
       ],
     },
@@ -888,6 +1023,32 @@ export const windowsCommands = {
           value: "quickcomposer.windows.process.listProcesses",
           label: "进程列表",
           icon: "list",
+          outputs: {
+            label: "进程列表",
+            suggestName: "processList",
+            structure: [
+              {
+                id: { label: "进程ID", suggestName: "processId" },
+                name: { label: "进程名称", suggestName: "processName" },
+                title: { label: "进程标题", suggestName: "processTitle" },
+                path: { label: "进程路径", suggestName: "processPath" },
+                startTime: {
+                  label: "启动时间",
+                  suggestName: "processStartTime",
+                },
+                cpuTime: { label: "CPU时间", suggestName: "processCpuTime" },
+                memory: { label: "内存使用", suggestName: "processMemory" },
+                threads: { label: "线程数", suggestName: "processThreads" },
+                priority: { label: "优先级", suggestName: "processPriority" },
+                description: {
+                  label: "描述",
+                  suggestName: "processDescription",
+                },
+                company: { label: "公司", suggestName: "processCompany" },
+                version: { label: "版本", suggestName: "processVersion" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.process.killProcess",
@@ -903,6 +1064,11 @@ export const windowsCommands = {
               required: true,
             },
           ],
+          outputs: {
+            label: "是否成功",
+            suggestName: "isProcessTerminateSuccess",
+            typeName: "布尔值",
+          },
         },
         {
           value: "quickcomposer.windows.process.startProcess",
@@ -926,7 +1092,6 @@ export const windowsCommands = {
                   },
                 },
               },
-              required: true,
             },
             {
               label: "启动参数",
@@ -936,6 +1101,11 @@ export const windowsCommands = {
               placeholder: "可选的启动参数",
             },
           ],
+          outputs: {
+            label: "是否成功",
+            suggestName: "isProcessStartSuccess",
+            typeName: "布尔值",
+          },
         },
       ],
     },
@@ -955,7 +1125,6 @@ export const windowsCommands = {
           options: {
             items: registryPaths,
           },
-          required: true,
         },
       ],
       subCommands: [
@@ -963,6 +1132,22 @@ export const windowsCommands = {
           value: "quickcomposer.windows.registry.listKeys",
           label: "列出项",
           icon: "list",
+          outputs: {
+            label: "注册表项列表",
+            suggestName: "registryKeys",
+            structure: [
+              {
+                path: {
+                  label: "注册表路径",
+                  suggestName: "registryPath",
+                },
+                name: {
+                  label: "项名称",
+                  suggestName: "registryName",
+                },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.registry.getValue",
@@ -1075,6 +1260,20 @@ export const windowsCommands = {
           value: "quickcomposer.windows.service.listServices",
           label: "服务列表",
           icon: "list",
+          outputs: {
+            label: "服务列表",
+            suggestName: "serviceList",
+            structure: [
+              {
+                name: { label: "服务名称", suggestName: "serviceName" },
+                displayName: {
+                  label: "显示名称",
+                  suggestName: "serviceDisplayName",
+                },
+                status: { label: "状态", suggestName: "serviceStatus" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.service.controlService",
@@ -1117,6 +1316,22 @@ export const windowsCommands = {
           value: "quickcomposer.windows.software.listSoftware",
           label: "软件列表",
           icon: "list",
+          outputs: {
+            label: "软件列表",
+            suggestName: "softwareList",
+            structure: [
+              {
+                name: { label: "软件名称", suggestName: "softwareName" },
+                publisher: {
+                  label: "发布者",
+                  suggestName: "softwarePublisher",
+                },
+                version: { label: "版本", suggestName: "softwareVersion" },
+                source: { label: "来源", suggestName: "softwareSource" },
+                id: { label: "ID", suggestName: "softwareId" },
+              },
+            ],
+          },
         },
         {
           value: "quickcomposer.windows.software.uninstallSoftware",

From 4461619a39ad8f88d6c4734c9b0b21c651b254cc Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 00:58:38 +0800
Subject: [PATCH 143/332] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index dc0aba00..961f9d22 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -22,7 +22,7 @@ import { browserCommands } from "./browserCommands";
 
 const platformCommands = {
   win32: [windowsCommands],
-  darwin: [macosCommands, windowsCommands],
+  darwin: [macosCommands],
   linux: [],
 };
 

From 17cec93767caed8f73afea62c8d66ff134d4635b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 13:05:11 +0800
Subject: [PATCH 144/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E7=9A=84=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue | 81 +++++++++++++++----------
 src/js/composer/varInputValManager.js   |  2 +-
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 3e6d6c24..0d13dcc6 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -3,7 +3,7 @@
     <OperationCard
       v-if="hasSubCommands"
       :model-value="funcName"
-      @update:model-value="funcName = $event"
+      @update:model-value="updateFuncName($event)"
       :options="localCommand.subCommands"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
@@ -15,7 +15,11 @@ import { defineComponent } from "vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
 import ParamInput from "components/composer/param/ParamInput.vue";
 import { stringifyArgv, parseFunction } from "js/composer/formatString";
-import { newVarInputVal } from "js/composer/varInputValManager";
+import {
+  newVarInputVal,
+  isVarInputVal,
+  stringifyVarInputVal,
+} from "js/composer/varInputValManager";
 
 export default defineComponent({
   name: "MultiParams",
@@ -59,26 +63,8 @@ export default defineComponent({
     defaultArgvs() {
       return this.localConfig.map((item) => item.value);
     },
-    funcName: {
-      get() {
-        return this.modelValue.value;
-      },
-      set(value) {
-        // 构建新的参数数组
-        const newArgvs = [];
-
-        // 保留通用配置的参数值
-        this.commonConfig.forEach((_, index) => {
-          newArgvs[index] = this.argvs[index];
-        });
-
-        // 使用新选择的函数独有配置的默认值
-        this.getSelectSubCommand(value)?.config?.forEach((config, index) => {
-          newArgvs[this.commonConfig.length + index] = config.defaultValue;
-        });
-
-        this.updateModelValue(value, newArgvs, true);
-      },
+    funcName() {
+      return this.modelValue.value;
     },
     argvs() {
       return (
@@ -101,6 +87,22 @@ export default defineComponent({
 
       this.updateModelValue(this.funcName, newArgvs);
     },
+    updateFuncName(value) {
+      // 构建新的参数数组
+      const newArgvs = [];
+
+      // 保留通用配置的参数值
+      this.commonConfig.forEach((_, index) => {
+        newArgvs[index] = this.argvs[index];
+      });
+
+      // 使用新选择的函数独有配置的默认值
+      this.getSelectSubCommand(value)?.config?.forEach((config, index) => {
+        newArgvs[this.commonConfig.length + index] = config.defaultValue;
+      });
+
+      this.updateModelValue(value, newArgvs, true);
+    },
     generateCode(funcName, argvs) {
       if (this.localCommand.isExpression) {
         return argvs.join("");
@@ -175,18 +177,31 @@ export default defineComponent({
       }
       return argvs;
     },
-    getSummary(argvs) {
+    getAllInputValues(argvs) {
+      const flatArgvs = [];
+      argvs.forEach((item) => {
+        if (isVarInputVal(item) && item.value) {
+          flatArgvs.push(stringifyVarInputVal(item));
+        } else if (typeof item === "number") {
+          flatArgvs.push(item.toString());
+        } else if (Array.isArray(item)) {
+          flatArgvs.push(...this.getAllInputValues(item));
+        } else if (typeof item === "object") {
+          flatArgvs.push(...this.getAllInputValues(Object.values(item)));
+        }
+      });
+      return flatArgvs;
+    },
+    getSummary(funcName, argvs) {
       // 虽然header里对溢出做了处理，但是这里截断主要是为了节省存储空间
-      const funcNameLabel = this.getSelectSubCommand()?.label;
+      const funcNameLabel = this.getSelectSubCommand(funcName)?.label;
       const subFeature = funcNameLabel ? `${funcNameLabel} ` : "";
-      const allArgvs = argvs
-        .filter((item) => item != null && item != "")
-        .map((item) =>
-          window.lodashM.truncate(stringifyArgv(item).toString(), {
-            length: 30,
-            omission: "...",
-          })
-        );
+      const allArgvs = this.getAllInputValues(argvs).map((item) =>
+        window.lodashM.truncate(item, {
+          length: 30,
+          omission: "...",
+        })
+      );
       return `${subFeature}${allArgvs.join(",")}`;
     },
     updateModelValue(funcName, argvs, resetOutputVariable = false) {
@@ -194,7 +209,7 @@ export default defineComponent({
         ...this.modelValue,
         value: funcName,
         argvs,
-        summary: this.getSummary(argvs),
+        summary: this.getSummary(funcName, argvs),
         code: this.generateCode(funcName, argvs),
       };
       if (resetOutputVariable) {
diff --git a/src/js/composer/varInputValManager.js b/src/js/composer/varInputValManager.js
index 698589aa..9085cbf7 100644
--- a/src/js/composer/varInputValManager.js
+++ b/src/js/composer/varInputValManager.js
@@ -37,7 +37,7 @@ export const newEmptyVarInputVal = (type = "str") => {
  * @returns {string} 处理后的字符串
  */
 export const stringifyVarInputVal = (argv) => {
-  if (!argv.isString) return argv.value;
+  if (!argv.isString) return argv.value.toString();
   try {
     return JSON.stringify(argv.value);
   } catch (e) {

From f09be6533e4bca0f7b0d79fdae6a8e52e41ca4b9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 16:21:46 +0800
Subject: [PATCH 145/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Equickcommand.showProc?=
 =?UTF-8?q?essBar=E5=92=8Cquickcommand.updateProcessBar=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E5=B8=A6=E6=9C=89?=
 =?UTF-8?q?=E6=9A=82=E5=81=9C=E3=80=81=E6=81=A2=E5=A4=8D=E3=80=81=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=9B=9E=E8=B0=83=E5=8A=9F=E8=83=BD=E7=9A=84=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=EF=BC=8C=E4=B8=94=E5=8F=AF=E4=BB=A5=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               |  40 +++
 plugin/lib/dialog/service.js                  | 245 +++++++++++++++---
 plugin/lib/dialog/style.css                   | 142 ++++++++++
 plugin/lib/dialog/view.html                   |  12 +
 .../monaco/types/quickcommand.api.d.ts        | 119 +++++++++
 5 files changed, 522 insertions(+), 36 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index fb7bd155..00676915 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -357,10 +357,50 @@ document.addEventListener("DOMContentLoaded", () => {
 
         waitButtonContainer.appendChild(buttonGroup);
         break;
+
+      case "process":
+        document.getElementById("process").style.display = "block";
+        document.body.classList.add("dialog-process");
+
+        // 设置初始文本和进度
+        document.getElementById("process-text").textContent = config.text;
+        document.getElementById(
+          "process-bar-inner"
+        ).style.width = `${config.value}%`;
+
+        // 如果需要显示暂停按钮
+        if (config.showPause) {
+          document.body.classList.add("show-pause");
+          const pauseBtn = document.getElementById("process-pause-btn");
+          let isPaused = false;
+
+          pauseBtn.onclick = () => {
+            isPaused = !isPaused;
+            pauseBtn.classList.toggle("paused", isPaused);
+            ipcRenderer.sendTo(parentId, "process-pause", isPaused);
+          };
+        }
+
+        // 添加关闭按钮点击事件
+        document.getElementById("process-close-btn").onclick = () => {
+          ipcRenderer.sendTo(parentId, "dialog-result", "close");
+        };
+        break;
     }
     ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
   });
 
+  // 监听进度条更新事件
+  ipcRenderer.on("update-process", (event, data) => {
+    const { value, text } = data;
+    if (typeof value === "number") {
+      document.getElementById("process-bar-inner").style.width = `${value}%`;
+    }
+    if (text) {
+      document.getElementById("process-text").textContent = text;
+    }
+  });
+
   const calculateHeight = () => {
     const titleBar = document.querySelector(".title-bar");
     const buttonBar = document.querySelector(".button-bar");
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 7f29567c..746f467f 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -200,6 +200,47 @@ const showSystemSelectList = async (items, options = {}) => {
   });
 };
 
+/**
+ * 计算窗口位置
+ * @param {object} options - 配置选项
+ * @param {string} [options.position="bottom-right"] - 窗口位置，可选值：top-left, top-right, bottom-left, bottom-right
+ * @param {number} options.width - 窗口宽度
+ * @param {number} options.height - 窗口高度
+ * @param {number} [options.padding=20] - 边距
+ * @returns {{x: number, y: number}} 窗口位置坐标
+ */
+const calculateWindowPosition = (options) => {
+  const { position = "bottom-right", width, height, padding = 20 } = options;
+
+  // 获取主屏幕尺寸
+  const primaryDisplay = utools.getPrimaryDisplay();
+  const { width: screenWidth, height: screenHeight } =
+    primaryDisplay.workAreaSize;
+
+  let x, y;
+  switch (position) {
+    case "top-left":
+      x = padding;
+      y = padding;
+      break;
+    case "top-right":
+      x = screenWidth - width - padding;
+      y = padding;
+      break;
+    case "bottom-left":
+      x = padding;
+      y = screenHeight - height - padding;
+      break;
+    case "bottom-right":
+    default:
+      x = screenWidth - width - padding;
+      y = screenHeight - height - padding;
+      break;
+  }
+
+  return { x, y };
+};
+
 /**
  * 显示一个系统级等待按钮
  * @param {object} options - 配置选项
@@ -228,42 +269,11 @@ const showSystemWaitButton = async (options = {}) => {
   const textWidth = span.offsetWidth;
   document.body.removeChild(span);
 
-  const dialogOptions = {
-    width: Math.max(textWidth + 32 + (showCancel ? 25 : 0), 80), // 文本宽度 + padding + 取消按钮宽度(如果有)
-    height: 36,
-    opacity: 1,
-  };
-
-  // 获取主屏幕尺寸
-  const primaryDisplay = utools.getPrimaryDisplay();
-  const { width, height } = primaryDisplay.workAreaSize;
-
-  // 根据position计算窗口位置
-  const padding = 20;
-  let x, y;
-
-  switch (position) {
-    case "top-left":
-      x = padding;
-      y = padding;
-      break;
-    case "top-right":
-      x = width - dialogOptions.width - padding;
-      y = padding;
-      break;
-    case "bottom-left":
-      x = padding;
-      y = height - dialogOptions.height - padding;
-      break;
-    case "bottom-right":
-    default:
-      x = width - dialogOptions.width - padding;
-      y = height - dialogOptions.height - padding;
-      break;
-  }
+  const width = Math.max(textWidth + 32 + (showCancel ? 25 : 0), 80);
+  const height = 36;
 
-  dialogOptions.x = x;
-  dialogOptions.y = y;
+  // 计算窗口位置
+  const { x, y } = calculateWindowPosition({ position, width, height });
 
   return await createDialog(
     {
@@ -271,10 +281,171 @@ const showSystemWaitButton = async (options = {}) => {
       text,
       showCancel,
     },
-    dialogOptions
+    {
+      width,
+      height,
+      x,
+      y,
+      opacity: 1,
+    }
   );
 };
 
+let lastProcessBar = null;
+
+/**
+ * 显示一个进度条对话框
+ * @param {object} options - 配置选项
+ * @param {string} [options.title="进度"] - 对话框标题
+ * @param {string} [options.text="处理中..."] - 进度条上方的文本
+ * @param {number} [options.value=0] - 初始进度值(0-100)
+ * @param {string} [options.position="bottom-right"] - 进度条位置，可选值：top-left, top-right, bottom-left, bottom-right
+ * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
+ * @param {Function} [options.onPause] - 暂停按钮点击时的回调函数
+ * @param {Function} [options.onResume] - 恢复按钮点击时的回调函数
+ * @returns {Promise<{id: number, close: Function}>} 返回进度条窗口ID和关闭函数
+ * @throws {Error} 如果只配置了onPause或onResume中的一个会抛出错误
+ */
+const showProcessBar = async (options = {}) => {
+  const {
+    title = "进度",
+    text = "处理中...",
+    value = 0,
+    position = "bottom-right",
+    onClose,
+    onPause,
+    onResume,
+  } = options;
+
+  // 校验暂停/恢复回调必须同时配置
+  if ((onPause && !onResume) || (!onPause && onResume)) {
+    throw new Error("onPause 和 onResume 必须同时配置");
+  }
+
+  const windowWidth = 300;
+  const windowHeight = 60;
+
+  // 计算窗口位置
+  const { x, y } = calculateWindowPosition({
+    position,
+    width: windowWidth,
+    height: windowHeight,
+  });
+
+  return new Promise((resolve) => {
+    const UBrowser = createBrowserWindow(
+      "lib/dialog/view.html",
+      {
+        title,
+        width: windowWidth,
+        height: windowHeight,
+        x,
+        y,
+        resizable: false,
+        minimizable: false,
+        maximizable: false,
+        fullscreenable: false,
+        skipTaskbar: true,
+        alwaysOnTop: true,
+        frame: false,
+        opacity: 0,
+        movable: true,
+        webPreferences: {
+          preload: "lib/dialog/controller.js",
+          devTools: utools.isDev(),
+        },
+      },
+      () => {
+        const windowId = UBrowser.webContents.id;
+
+        // 发送配置到子窗口
+        ipcRenderer.sendTo(windowId, "dialog-config", {
+          type: "process",
+          title,
+          text,
+          value,
+          isDark: utools.isDarkColors(),
+          platform: process.platform,
+          showPause: Boolean(onPause && onResume),
+        });
+
+        // 监听窗口准备就绪
+        ipcRenderer.once("dialog-ready", () => {
+          UBrowser.setOpacity(1);
+        });
+
+        // 监听对话框结果
+        ipcRenderer.once("dialog-result", (event, result) => {
+          if (result === "close" && typeof onClose === "function") {
+            onClose();
+          }
+          UBrowser.destroy();
+        });
+
+        // 监听暂停/恢复事件
+        if (onPause && onResume) {
+          ipcRenderer.on("process-pause", (event, isPaused) => {
+            if (isPaused) {
+              onPause();
+            } else {
+              onResume();
+            }
+          });
+        }
+
+        const processBar = {
+          id: windowId,
+          close: () => {
+            if (typeof onClose === "function") {
+              onClose();
+            }
+            lastProcessBar = null;
+            UBrowser.destroy();
+          },
+        };
+
+        lastProcessBar = processBar;
+
+        // 返回窗口ID和关闭函数
+        resolve(processBar);
+      }
+    );
+  });
+};
+
+/**
+ * 更新进度条的进度
+ * @param {object} options - 配置选项
+ * @param {number} options.value - 新的进度值(0-100)
+ * @param {string} [options.text] - 新的进度文本
+ * @param {boolean} [options.complete] - 是否完成并关闭进度条
+ * @param {{id: number, close: Function}|undefined} processBar - 进度条对象, 如果不传入则使用上一次创建的进度条
+ * @throws {Error} 如果传入的processBar对象不是有效的进度条对象
+ */
+const updateProcessBar = (options = {}, processBar = null) => {
+  if (!processBar) {
+    if (!lastProcessBar) {
+      throw new Error("没有找到已创建的进度条");
+    }
+    processBar = lastProcessBar;
+  }
+  // 校验processBar对象
+  if (
+    typeof processBar !== "object" ||
+    typeof processBar.id !== "number" ||
+    typeof processBar.close !== "function"
+  ) {
+    throw new Error("processBar对象格式错误");
+  }
+
+  const { value, text, complete } = options;
+  ipcRenderer.sendTo(processBar.id, "update-process", { value, text });
+
+  if (complete) {
+    processBar.close();
+  }
+};
+
 module.exports = {
   showSystemMessageBox,
   showSystemInputBox,
@@ -283,4 +454,6 @@ module.exports = {
   showSystemTextArea,
   showSystemSelectList,
   showSystemWaitButton,
+  showProcessBar,
+  updateProcessBar,
 };
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 30d7bc99..f92567c7 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -583,3 +583,145 @@ textarea:focus {
 #wait-cancel-btn:hover {
   background-color: var(--wait-btn-hover);
 }
+
+/* 进度条对话框样式 */
+.dialog-process .title-bar,
+.dialog-process .button-bar {
+  display: none;
+}
+
+.dialog-process .content-wrapper {
+  padding: 0;
+  background: var(--button-bg);
+  color: white;
+}
+
+#process {
+  display: none;
+  padding: 8px 12px;
+  position: relative;
+  -webkit-app-region: drag;
+}
+
+.process-text {
+  font-size: 13px;
+  margin-bottom: 8px;
+  padding-right: 20px;
+}
+
+.process-bar {
+  width: 100%;
+  height: 4px;
+  background: rgba(255, 255, 255, 0.3);
+  border-radius: 2px;
+  overflow: hidden;
+}
+
+.process-bar-inner {
+  width: 0;
+  height: 100%;
+  background: white;
+  border-radius: 2px;
+  transition: width 0.3s ease;
+}
+
+/* 进度条按钮容器 */
+.process-buttons {
+  position: absolute;
+  right: 8px;
+  top: 6px;
+  display: flex;
+  gap: 8px;
+  -webkit-app-region: no-drag;
+}
+
+/* 进度条关闭按钮 */
+.process-close-btn {
+  width: 16px;
+  height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  opacity: 0.7;
+  transition: opacity 0.2s;
+}
+
+.process-close-btn:hover {
+  opacity: 1;
+}
+
+.process-close-btn::before,
+.process-close-btn::after {
+  content: "";
+  position: absolute;
+  width: 12px;
+  height: 1px;
+  background-color: white;
+  transform-origin: center;
+}
+
+.process-close-btn::before {
+  transform: rotate(45deg);
+}
+
+.process-close-btn::after {
+  transform: rotate(-45deg);
+}
+
+/* 进度条暂停按钮 */
+.process-pause-btn {
+  width: 16px;
+  height: 16px;
+  display: none;
+  /* 默认隐藏 */
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  opacity: 0.7;
+  transition: opacity 0.2s;
+  position: relative;
+}
+
+.process-pause-btn:hover {
+  opacity: 1;
+}
+
+/* 暂停状态（显示两条竖线） */
+.process-pause-btn::before,
+.process-pause-btn::after {
+  content: "";
+  position: absolute;
+  width: 2px;
+  height: 10px;
+  background-color: white;
+  transition: all 0.2s ease;
+}
+
+.process-pause-btn::before {
+  transform: translateX(-3px);
+}
+
+.process-pause-btn::after {
+  transform: translateX(3px);
+}
+
+/* 播放状态（显示三角形） */
+.process-pause-btn.paused::before {
+  width: 0;
+  height: 0;
+  background: none;
+  border-style: solid;
+  border-width: 6px 0 6px 10px;
+  border-color: transparent transparent transparent white;
+  transform: translateX(1px);
+}
+
+.process-pause-btn.paused::after {
+  display: none;
+}
+
+/* 显示暂停按钮 */
+.show-pause .process-pause-btn {
+  display: flex;
+}
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
index 2f28cd95..3bd9c3e1 100644
--- a/plugin/lib/dialog/view.html
+++ b/plugin/lib/dialog/view.html
@@ -51,6 +51,18 @@ <h1 class="title-text" id="title-text">对话框</h1>
 
         <!-- 等待按钮对话框 -->
         <div id="wait-button"></div>
+
+        <!-- 进度条对话框 -->
+        <div id="process">
+          <div class="process-buttons">
+            <div class="process-pause-btn" id="process-pause-btn"></div>
+            <div class="process-close-btn" id="process-close-btn"></div>
+          </div>
+          <div class="process-text" id="process-text"></div>
+          <div class="process-bar">
+            <div class="process-bar-inner" id="process-bar-inner"></div>
+          </div>
+        </div>
       </div>
       <div class="button-bar">
         <button id="cancel-btn">取消</button>
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index c1204766..428fdfe9 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -720,6 +720,125 @@ interface quickcommandApi {
       };
     }
   ): Promise<string>;
+
+  /**
+   * 显示一个带有暂停、恢复、关闭回调功能的进度条，支持动态更新进度
+   * @param {object} options - 配置选项
+   * @param {string} [options.title="进度"] - 对话框标题
+   * @param {string} [options.text="处理中..."] - 进度条上方的文本
+   * @param {number} [options.value=0] - 初始进度值(0-100)
+   * @param {string} [options.position="bottom-right"] - 进度条位置，可选值：top-left, top-right, bottom-left, bottom-right
+   * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
+   * @param {Function} [options.onPause] - 暂停按钮点击时的回调函数，必须和onResume一起配置
+   * @param {Function} [options.onResume] - 恢复按钮点击时的回调函数，必须和onPause一起配置
+   * @returns {Promise<{id: number, close: Function}>} 返回进度条对象
+   *
+   * ```js
+   * // 基本使用
+   * const processBar = await quickcommand.showProcessBar({
+   *   title: "下载进度",
+   *   text: "正在下载文件...",
+   *   value: 0,
+   *   position: "bottom-right"
+   * });
+   *
+   * // 带暂停/恢复，关闭回调功能
+   * let isPaused = false;
+   * const processBar = await quickcommand.showProcessBar({
+   *   title: "下载进度",
+   *   text: "正在下载文件...",
+   *   value: 0,
+   *   onPause: () => {
+   *     isPaused = true;
+   *     console.log("暂停下载");
+   *   },
+   *   onResume: () => {
+   *     isPaused = false;
+   *     console.log("继续下载");
+   *   },
+   *   onClose: () => {
+   *     console.log("用户关闭了进度条");
+   *   }
+   * });
+   *
+   * // 动态更新进度
+   * const items = Array(100).fill(0);
+   * for (let i = 0; i < items.length; i++) {
+   *   // 检查是否暂停
+   *   while (isPaused) {
+   *     await quickcommand.asyncSleep(100);
+   *   }
+   *
+   *   // 更新进度
+   *   quickcommand.updateProcessBar({
+   *     value: Math.round((i + 1) / items.length * 100),
+   *     text: `正在处理第 ${i + 1}/${items.length} 项`
+   *   });
+   *
+   *   await someAsyncOperation();
+   * }
+   *
+   * // 完成时更新并关闭
+   * quickcommand.updateProcessBar({
+   *   value: 100,
+   *   text: "处理完成！",
+   *   complete: true
+   * });
+   * ```
+   */
+  showProcessBar(options?: {
+    title?: string;
+    text?: string;
+    value?: number;
+    position?: "top-left" | "top-right" | "bottom-left" | "bottom-right";
+    onClose?: () => void;
+    onPause?: () => void;
+    onResume?: () => void;
+  }): Promise<{
+    id: number;
+    close: () => void;
+  }>;
+
+  /**
+   * 更新进度条的进度
+   * @param {object} options - 配置选项
+   * @param {number} options.value - 新的进度值(0-100)
+   * @param {string} [options.text] - 新的进度文本
+   * @param {boolean} [options.complete] - 是否完成并关闭进度条
+   * @param {{id: number, close: Function}|undefined} processBar - 进度条对象，如果不传入则使用上一次创建的进度条
+   *
+   * ```js
+   * // 使用最近创建的进度条
+   * quickcommand.updateProcessBar({
+   *   value: 50,
+   *   text: "已完成50%"
+   * });
+   *
+   * // 使用指定的进度条
+   * quickcommand.updateProcessBar({
+   *   value: 50,
+   *   text: "已完成50%"
+   * }, processBar);
+   *
+   * // 完成并关闭
+   * quickcommand.updateProcessBar({
+   *   value: 100,
+   *   text: "完成！",
+   *   complete: true
+   * });
+   * ```
+   */
+  updateProcessBar(
+    options: {
+      value: number;
+      text?: string;
+      complete?: boolean;
+    },
+    processBar?: {
+      id: number;
+      close: () => void;
+    }
+  ): void;
 }
 
 declare var quickcommand: quickcommandApi;

From 15476a9358f31204da72e8f9cee4424a434d8cb0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 17:11:45 +0800
Subject: [PATCH 146/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=92=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/uiCommands.js | 123 +++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 6ddd0f8d..69a3310d 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -426,6 +426,129 @@ export const uiCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.showProcessBar",
+      label: "显示进度条",
+      description:
+        "显示一个带有暂停、恢复、关闭回调功能的进度条，支持动态更新进度，注意，即使设置等待运行完毕，显示进度条的过程中也不会阻塞后续运行，请通过关闭回调来处理关闭事件。",
+      asyncMode: "await",
+      outputs: {
+        label: "进度条对象",
+        suggestName: "processBar",
+      },
+      config: [
+        {
+          component: "OptionEditor",
+          options: {
+            title: {
+              label: "标题",
+              component: "VariableInput",
+              width: 6,
+              defaultValue: newVarInputVal("str", "进度"),
+            },
+            text: {
+              label: "文本",
+              component: "VariableInput",
+              width: 6,
+              defaultValue: newVarInputVal("str", "处理中..."),
+            },
+            value: {
+              label: "初始进度值",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+              max: 100,
+              defaultValue: 0,
+            },
+            position: {
+              label: "位置",
+              component: "QSelect",
+              width: 3,
+              options: [
+                { label: "屏幕左上角", value: "top-left" },
+                { label: "屏幕右上角", value: "top-right" },
+                { label: "屏幕左下角", value: "bottom-left" },
+                { label: "屏幕右下角", value: "bottom-right" },
+              ],
+              defaultValue: "bottom-right",
+            },
+            onClose: {
+              label: "关闭按钮回调函数",
+              component: "VariableInput",
+              disableToggleType: true,
+              width: 6,
+            },
+            onPause: {
+              label: "暂停按钮回调函数",
+              component: "VariableInput",
+              disableToggleType: true,
+              width: 6,
+              placeholder: "必须和恢复回调一起配置",
+            },
+            onResume: {
+              label: "恢复按钮回调函数",
+              component: "VariableInput",
+              disableToggleType: true,
+              width: 6,
+              placeholder: "必须和暂停回调一起配置",
+            },
+          },
+          defaultValue: {
+            title: newVarInputVal("str", "进度"),
+            text: newVarInputVal("str", "处理中..."),
+            value: 0,
+            position: "bottom-right",
+            onClose: newVarInputVal("var"),
+            onPause: newVarInputVal("var"),
+            onResume: newVarInputVal("var"),
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcommand.updateProcessBar",
+      label: "更新进度条",
+      neverHasOutput: true,
+      config: [
+        {
+          component: "OptionEditor",
+          options: {
+            value: {
+              label: "进度值",
+              component: "NumberInput",
+              width: 4,
+              min: 0,
+              max: 100,
+              defaultValue: 0,
+            },
+            text: {
+              label: "文本",
+              component: "VariableInput",
+              width: 4,
+            },
+            complete: {
+              label: "完成并关闭",
+              component: "CheckButton",
+              width: 4,
+              defaultValue: false,
+            },
+          },
+          defaultValue: {
+            value: 0,
+            text: newVarInputVal("str"),
+            complete: false,
+          },
+        },
+        {
+          label: "进度条对象",
+          component: "VariableInput",
+          width: 12,
+          placeholder: "不传则更新最近的进度条",
+          defaultValue: newVarInputVal("var"),
+          disableToggleType: true,
+        },
+      ],
+    },
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",

From 31a543d0c506788b47d756b4439747ef49d9fa2d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 27 Jan 2025 17:11:59 +0800
Subject: [PATCH 147/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandButtons.vue |  7 ++++++-
 src/components/composer/card/CommandHead.vue    | 15 +++++++++++++++
 src/components/composer/common/CheckButton.vue  |  4 +++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 467b6f83..14cb9387 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -18,7 +18,7 @@
         >
           <q-tooltip>
             <div class="text-body2">输出配置</div>
-            <div class="text-caption text-grey-5">
+            <div class="text-caption output-info">
               <div class="row items-center">
                 本命令配置输出变量数
                 <q-badge color="primary" class="output-badge">
@@ -250,6 +250,11 @@ export default {
   padding: 0 4px;
 }
 
+.output-info {
+  opacity: 0.8;
+  filter: grayscale(0.1);
+}
+
 .output-badge {
   font-size: 10px;
   width: 13px;
diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 0bb22bcf..4defdd1f 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -32,6 +32,16 @@
       </div>
     </div>
 
+    <q-icon
+      name="info"
+      class="info-icon"
+      v-if="command.description && !isCollapsed"
+    >
+      <q-tooltip max-width="300px">
+        {{ command.description }}
+      </q-tooltip>
+    </q-icon>
+
     <!-- 主要内容区域 -->
     <div :class="contentClass">
       <slot></slot>
@@ -137,4 +147,9 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+.info-icon {
+  opacity: 0.6;
+  font-size: 12px;
+}
 </style>
diff --git a/src/components/composer/common/CheckButton.vue b/src/components/composer/common/CheckButton.vue
index 6e6b8f2e..ebec2c07 100644
--- a/src/components/composer/common/CheckButton.vue
+++ b/src/components/composer/common/CheckButton.vue
@@ -19,7 +19,9 @@
             class="q-ml-xs check-btn-icon"
           />
         </div>
-        <q-tooltip v-if="placeholder">{{ placeholder }}</q-tooltip>
+        <q-tooltip v-if="placeholder" max-width="300px">{{
+          placeholder
+        }}</q-tooltip>
       </template>
     </q-btn>
   </div>

From 70e01a53d8266b93a7057e06e7e779fca0cb2334 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 28 Jan 2025 01:13:46 +0800
Subject: [PATCH 148/332] =?UTF-8?q?-=20=E5=9C=A8=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=BD=E4=BB=A4=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=8E=8B=E7=BC=A9=E3=80=81=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E8=BD=ACGIF=E3=80=81=E9=9F=B3=E9=A2=91=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E3=80=81=E8=A7=86=E9=A2=91=E5=89=AA=E5=88=87=E3=80=81=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=97=8B=E8=BD=AC/=E7=BF=BB=E8=BD=AC=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=E3=80=81=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E3=80=81=E8=A7=86=E9=A2=91=E8=B0=83=E9=80=9F?=
 =?UTF-8?q?=E3=80=81=E8=A7=86=E9=A2=91=E5=88=86=E8=BE=A8=E7=8E=87=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=81=E8=A7=86=E9=A2=91=E6=A0=BC=E5=BC=8F=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E3=80=81=E8=A7=86=E9=A2=91=E8=A3=81=E5=89=AA=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87=E5=BA=8F=E5=88=97=E3=80=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BC=A9=E7=95=A5=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/service.js                  |    2 +-
 plugin/lib/dialog/style.css                   |   26 +-
 plugin/lib/quickcomposer.js                   |    1 +
 plugin/lib/quickcomposer/video/ffmpeg.js      |  969 ++++++++++++
 plugin/lib/quickcomposer/video/index.js       |    5 +
 src/components/composer/MultiParams.vue       |   13 +-
 src/components/composer/common/TimeInput.vue  |  181 +++
 .../composer/param/ParamImporter.vue          |    2 +
 src/js/composer/commands/index.js             |    2 +
 src/js/composer/commands/videoCommands.js     | 1394 +++++++++++++++++
 src/js/composer/generateCode.js               |    2 -
 11 files changed, 2590 insertions(+), 7 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/video/ffmpeg.js
 create mode 100644 plugin/lib/quickcomposer/video/index.js
 create mode 100644 src/components/composer/common/TimeInput.vue
 create mode 100644 src/js/composer/commands/videoCommands.js

diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 746f467f..3753801f 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -322,7 +322,7 @@ const showProcessBar = async (options = {}) => {
     throw new Error("onPause 和 onResume 必须同时配置");
   }
 
-  const windowWidth = 300;
+  const windowWidth = 350;
   const windowHeight = 60;
 
   // 计算窗口位置
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index f92567c7..09f1e724 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -606,7 +606,16 @@ textarea:focus {
 .process-text {
   font-size: 13px;
   margin-bottom: 8px;
-  padding-right: 20px;
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+  width: calc(100% - 30px);
+  box-sizing: border-box;
+}
+
+.process-text::-webkit-scrollbar {
+  display: none;
 }
 
 .process-bar {
@@ -633,6 +642,21 @@ textarea:focus {
   display: flex;
   gap: 8px;
   -webkit-app-region: no-drag;
+  z-index: 1;
+}
+
+/* 添加按钮区域的渐变遮罩 */
+.process-buttons::before {
+  content: "";
+  position: absolute;
+  right: -8px;
+  /* 对应#process的padding-right */
+  top: -6px;
+  /* 对应#process的padding-top */
+  width: 80px;
+  height: 30px;
+  background: linear-gradient(to right, transparent, var(--button-bg) 60%);
+  pointer-events: none;
 }
 
 /* 进度条关闭按钮 */
diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index 2052497f..8c05e619 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -12,6 +12,7 @@ const quickcomposer = {
   macos: require("./quickcomposer/macos"),
   status: require("./quickcomposer/status"),
   browser: require("./quickcomposer/browser"),
+  video: require("./quickcomposer/video"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/video/ffmpeg.js b/plugin/lib/quickcomposer/video/ffmpeg.js
new file mode 100644
index 00000000..6f048d48
--- /dev/null
+++ b/plugin/lib/quickcomposer/video/ffmpeg.js
@@ -0,0 +1,969 @@
+/**
+ * 运行FFmpeg命令并显示进度条
+ * @param {string[]} args FFmpeg命令参数
+ * @param {object} options 选项
+ * @param {string} options.title 进度条标题
+ * @param {string} options.text 进度条文本
+ * @param {string} options.position 进度条位置
+ * @param {function} options.onPause 暂停回调
+ * @param {function} options.onResume 恢复回调
+ * @param {boolean} options.isShowProcessBar 是否显示进度条
+ * @returns {Promise} 返回Promise
+ */
+async function runFFmpeg(args, options = {}) {
+  const {
+    title = "FFmpeg处理",
+    text = "处理中...",
+    position = "bottom-right",
+    onPause,
+    onResume,
+    isShowProcessBar = true,
+  } = options;
+
+  let ffmpegRun;
+
+  // 显示进度条
+  const processBar = isShowProcessBar
+    ? await quickcommand.showProcessBar({
+        title,
+        text,
+        value: 0,
+        position,
+        onPause,
+        onResume,
+        onClose: () => {
+          // 关闭时终止FFmpeg
+          if (ffmpegRun) {
+            try {
+              ffmpegRun.quit();
+            } catch (error) {
+              console.log(error);
+            }
+          }
+          ffmpegRun = null;
+        },
+      })
+    : null;
+
+  // 运行FFmpeg
+  ffmpegRun = utools.runFFmpeg(args, (progress) => {
+    // 更新进度条
+    if (progress.percent !== undefined) {
+      const intProgress = Math.round(progress.percent);
+      if (processBar) {
+        quickcommand.updateProcessBar(
+          {
+            value: intProgress,
+            text: `${text} (${intProgress}%) - 速度: ${progress.speed}`,
+          },
+          processBar
+        );
+      }
+    } else {
+      // 如果没有进度百分比，显示已处理时间
+      if (processBar) {
+        quickcommand.updateProcessBar(
+          {
+            text: `${text} - 已处理: ${progress.time} - 速度: ${progress.speed}`,
+          },
+          processBar
+        );
+      }
+    }
+  });
+
+  return new Promise((resolve, reject) => {
+    ffmpegRun
+      .then(() => {
+        if (processBar) {
+          quickcommand.updateProcessBar(
+            {
+              value: 100,
+              text: "处理完成, 即将关闭进度条",
+            },
+            processBar
+          );
+          quickcommand.asyncSleep(500).then(() => {
+            processBar.close();
+          });
+        }
+        resolve();
+      })
+      .catch((error) => {
+        if (processBar) {
+          quickcommand.updateProcessBar(
+            {
+              text: `处理出错: ${error.message}`,
+            },
+            processBar
+          );
+        }
+        reject(error);
+      });
+  });
+}
+
+/**
+ * 压缩视频
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 压缩选项
+ * @param {string} options.encoder 视频编码器
+ * @param {string} options.preset 压缩预设
+ * @param {number} options.crf 视频质量(0-51)
+ * @param {string} options.resolution 分辨率(keep/3840:2160/2560:1440/1920:1080/1280:720/854:480)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function compressVideo(input, output, options = {}) {
+  const {
+    encoder = "libx264",
+    preset = "medium",
+    crf = 23,
+    resolution = "keep",
+    overwrite = false,
+  } = options;
+
+  const args = [];
+
+  // 覆盖参数必须在最前面
+  if (overwrite) {
+    args.push("-y");
+  }
+
+  args.push("-i", input);
+
+  // 如果需要调整分辨率
+  if (resolution !== "keep") {
+    const [width, height] = resolution.split(":");
+    args.push(
+      "-vf",
+      `scale=${width}:${height}:force_original_aspect_ratio=decrease,pad=${width}:${height}:(ow-iw)/2:(oh-ih)/2`
+    );
+  }
+
+  args.push(
+    "-c:v",
+    encoder,
+    "-preset",
+    preset,
+    "-crf",
+    crf.toString(),
+    "-c:a",
+    "copy",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "视频压缩",
+    text: "正在压缩视频...",
+  });
+}
+
+/**
+ * 视频转GIF
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 转换选项
+ * @param {number} options.fps 帧率
+ * @param {number} options.width 宽度
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function convertToGif(input, output, options = {}) {
+  const { fps = 15, width = 480, overwrite = false } = options;
+
+  const args = [];
+
+  // 覆盖参数必须在最前面
+  if (overwrite) {
+    args.push("-y");
+  }
+
+  args.push(
+    "-i",
+    input,
+    "-vf",
+    `fps=${fps},scale=${width}:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse`,
+    "-loop",
+    "0",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "GIF转换",
+    text: "正在转换为GIF...",
+  });
+}
+
+/**
+ * 提取音频
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 提取选项
+ * @param {number} options.quality 音频质量(0-9)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function extractAudio(input, output, options = {}) {
+  const { quality = 0, overwrite = false } = options;
+
+  const args = [];
+
+  // 覆盖参数必须在最前面
+  if (overwrite) {
+    args.push("-y");
+  }
+
+  args.push("-i", input, "-q:a", quality.toString(), "-map", "a", output);
+
+  await runFFmpeg(args, {
+    title: "音频提取",
+    text: "正在提取音频...",
+  });
+}
+
+/**
+ * 录制屏幕
+ * @param {string} output 输出文件路径
+ * @param {object} options 录制选项
+ * @param {number} options.fps 帧率
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ *
+ * utools接口目前好像有问题，无法结束录制
+ */
+async function recordScreen(output, options = {}) {
+  const { fps = 30, overwrite = false } = options;
+
+  const args = [];
+
+  // 覆盖参数必须在最前面
+  if (overwrite) {
+    args.push("-y");
+  }
+
+  // 根据操作系统选择录屏命令
+  if (process.platform === "win32") {
+    args.push("-f", "gdigrab", "-framerate", fps.toString(), "-i", "desktop");
+  } else if (process.platform === "darwin") {
+    args.push(
+      "-f",
+      "avfoundation",
+      "-framerate",
+      fps.toString(),
+      "-i",
+      "default"
+    );
+  } else {
+    args.push("-f", "x11grab", "-framerate", fps.toString(), "-i", ":0.0");
+  }
+
+  // 添加输出文件
+  args.push(output);
+
+  const ffmpegRun = utools.runFFmpeg(args);
+
+  return new Promise((resolve, reject) => {
+    ffmpegRun.catch((e) => {
+      quickcommand.showSystemMessageBox("录制失败: " + e.message);
+      reject(e);
+    });
+
+    quickcommand
+      .showSystemWaitButton({
+        text: "结束录制",
+      })
+      .then((confirm) => {
+        console.log("结束录制", confirm, ffmpegRun.quit);
+        if (confirm) {
+          ffmpegRun.quit();
+          resolve();
+        } else {
+          ffmpegRun.kill();
+          reject(new Error("录制取消"));
+        }
+      });
+  });
+}
+
+/**
+ * 将时间字符串转换为秒数
+ * @param {string} timeStr 时间字符串 (格式: HH:mm:ss)
+ * @returns {number} 秒数
+ */
+function timeToSeconds(timeStr) {
+  if (typeof timeStr === "number") return timeStr;
+
+  const parts = timeStr.split(":").map(Number);
+  if (parts.length === 3) {
+    // HH:mm:ss
+    return parts[0] * 3600 + parts[1] * 60 + parts[2];
+  } else if (parts.length === 2) {
+    // mm:ss
+    return parts[0] * 60 + parts[1];
+  } else if (parts.length === 1) {
+    // ss
+    return parts[0];
+  }
+  return 0;
+}
+
+/**
+ * 截取视频片段
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 截取选项
+ * @param {string|number} options.start 开始时间(HH:mm:ss 或秒数)
+ * @param {string|number} options.duration 持续时长(HH:mm:ss 或秒数)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function cutVideo(input, output, options = {}) {
+  const {
+    start = "00:00:00",
+    duration = "00:00:10",
+    overwrite = false,
+  } = options;
+
+  const args = [];
+
+  // 覆盖参数必须在最前面
+  if (overwrite) {
+    args.push("-y");
+  }
+
+  // 转换时间格式为秒数
+  const startSeconds = timeToSeconds(start);
+  const durationSeconds = timeToSeconds(duration);
+
+  args.push(
+    "-i",
+    input,
+    "-ss",
+    startSeconds.toString(),
+    "-t",
+    durationSeconds.toString(),
+    "-c",
+    "copy",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "视频剪切",
+    text: "正在截取片段...",
+  });
+}
+
+/**
+ * 旋转/翻转视频
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {number} options.rotate 旋转角度(90/180/270)
+ * @param {boolean} options.flipH 水平翻转
+ * @param {boolean} options.flipV 垂直翻转
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function rotateVideo(input, output, options = {}) {
+  const {
+    rotate = 0,
+    flipH = false,
+    flipV = false,
+    overwrite = false,
+  } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  // 构建滤镜
+  let filter = "";
+  if (rotate) filter += `rotate=${(rotate * Math.PI) / 180}`;
+  if (flipH) filter += (filter ? "," : "") + "hflip";
+  if (flipV) filter += (filter ? "," : "") + "vflip";
+
+  args.push("-i", input, "-vf", filter, "-c:a", "copy", output);
+
+  await runFFmpeg(args, {
+    title: "视频旋转/翻转",
+    text: "正在处理视频...",
+  });
+}
+
+/**
+ * 添加水印
+ * @param {string} input 输入文件路径
+ * @param {string} watermark 水印图片路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {string} options.position 位置(topleft/topright/bottomleft/bottomright/center)
+ * @param {number} options.padding 边距
+ * @param {number} options.scale 缩放比例(0-1)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function addWatermark(input, watermark, output, options = {}) {
+  const {
+    position = "bottomright",
+    padding = 10,
+    scale = 0.1,
+    overwrite = false,
+  } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  // 计算水印位置
+  let overlay;
+  switch (position) {
+    case "topleft":
+      overlay = `${padding}:${padding}`;
+      break;
+    case "topright":
+      overlay = `main_w-overlay_w-${padding}:${padding}`;
+      break;
+    case "bottomleft":
+      overlay = `${padding}:main_h-overlay_h-${padding}`;
+      break;
+    case "center":
+      overlay = "(main_w-overlay_w)/2:(main_h-overlay_h)/2";
+      break;
+    default: // bottomright
+      overlay = `main_w-overlay_w-${padding}:main_h-overlay_h-${padding}`;
+  }
+
+  args.push(
+    "-i",
+    input,
+    "-i",
+    watermark,
+    "-filter_complex",
+    `[1:v]scale=iw*${scale}:-1[watermark];[0:v][watermark]overlay=${overlay}`,
+    "-c:a",
+    "copy",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "添加水印",
+    text: "正在添加水印...",
+  });
+}
+
+/**
+ * 合并视频
+ * @param {string[]} inputs 输入文件路径数组
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function mergeVideos(inputs, output, options = {}) {
+  const { overwrite = false } = options;
+
+  // 先获取第一个视频的分辨率
+  let width, height;
+  try {
+    await new Promise((resolve, reject) => {
+      utools.runFFmpeg(["-i", inputs[0]]).catch((error) => {
+        // FFmpeg 在获取视频信息时会返回错误，但错误信息中包含视频信息
+        const match = error.message.match(/(\d{2,5})x(\d{2,5})/);
+        if (match) {
+          width = match[1];
+          height = match[2];
+          resolve();
+        } else {
+          reject(new Error("无法获取视频分辨率"));
+        }
+      });
+    });
+  } catch (error) {
+    throw new Error("获取视频分辨率失败: " + error.message);
+  }
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  // 构建复杂的filter_complex命令
+  let filterComplex = "";
+
+  // 添加所有输入文件
+  inputs.forEach((_, index) => {
+    args.push("-i", inputs[index]);
+    if (index === 0) {
+      // 第一个视频不做处理
+      filterComplex += `[0:v]setsar=1[v0];`;
+      filterComplex += `[0:a]aformat=sample_fmts=fltp:sample_rates=44100:channel_layouts=stereo[a0];`;
+    } else {
+      // 其他视频缩放到第一个视频的分辨率
+      filterComplex += `[${index}:v]scale=${width}:${height}:force_original_aspect_ratio=decrease,pad=${width}:${height}:(ow-iw)/2:(oh-ih)/2,setsar=1[v${index}];`;
+      filterComplex += `[${index}:a]aformat=sample_fmts=fltp:sample_rates=44100:channel_layouts=stereo[a${index}];`;
+    }
+  });
+
+  // 添加concat
+  filterComplex += `${inputs
+    .map((_, i) => `[v${i}][a${i}]`)
+    .join("")}concat=n=${inputs.length}:v=1:a=1[outv][outa]`;
+
+  args.push(
+    "-filter_complex",
+    filterComplex,
+    "-map",
+    "[outv]",
+    "-map",
+    "[outa]",
+    "-c:v",
+    "libx264",
+    "-c:a",
+    "aac",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "合并视频",
+    text: "正在合并视频...",
+  });
+}
+
+/**
+ * 视频调速
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {number} options.speed 速度倍数(0.25-4)
+ * @param {boolean} options.keepPitch 是否保持音调
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function changeSpeed(input, output, options = {}) {
+  const { speed = 1, keepPitch = true, overwrite = false } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  // 构建滤镜
+  const tempo = 1 / speed;
+
+  // 构建音频滤镜串
+  let audioFilter;
+  if (keepPitch) {
+    if (speed <= 0.5) {
+      // 0.25-0.5倍速
+      audioFilter = `asetrate=44100*${speed},aresample=44100,atempo=2,atempo=${
+        speed * 2
+      }`;
+    } else if (speed > 2) {
+      // 2-4倍速
+      audioFilter = `asetrate=44100*${speed},aresample=44100,atempo=0.5,atempo=${
+        speed * 0.5
+      }`;
+    } else {
+      // 0.5-2倍速
+      audioFilter = `asetrate=44100*${speed},aresample=44100,atempo=${speed}`;
+    }
+  } else {
+    // 不保持音调时直接调整速度
+    if (speed <= 0.5) {
+      audioFilter = `atempo=2,atempo=${speed * 2}`;
+    } else if (speed > 2) {
+      audioFilter = `atempo=0.5,atempo=${speed * 0.5}`;
+    } else {
+      audioFilter = `atempo=${speed}`;
+    }
+  }
+
+  args.push(
+    "-i",
+    input,
+    "-filter_complex",
+    `[0:v]setpts=${tempo}*PTS[v];[0:a]${audioFilter}[a]`,
+    "-map",
+    "[v]",
+    "-map",
+    "[a]",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "视频调速",
+    text: "正在调整速度...",
+  });
+}
+
+/**
+ * 调整视频分辨率
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {number} options.width 宽度
+ * @param {number} options.height 高度
+ * @param {boolean} options.keepAspectRatio 保持宽高比
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function resizeVideo(input, output, options = {}) {
+  const {
+    width = -1,
+    height = -1,
+    keepAspectRatio = true,
+    overwrite = false,
+  } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  // 构建缩放滤镜
+  const scale = keepAspectRatio
+    ? `scale=${width}:${height}:force_original_aspect_ratio=decrease`
+    : `scale=${width}:${height}`;
+
+  args.push("-i", input, "-vf", scale, "-c:a", "copy", output);
+
+  await runFFmpeg(args, {
+    title: "调整分辨率",
+    text: "正在调整视频分辨率...",
+  });
+}
+
+/**
+ * 视频格式转换
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {string} options.format 目标格式(mp4/webm/mkv/avi)
+ * @param {string} options.devicePreset 设备优化(general/mobile/tablet/tv)
+ * @param {string} options.resolution 分辨率(keep/3840:2160/2560:1440/1920:1080/1280:720/854:480)
+ * @param {number} options.fps 帧率
+ * @param {string} options.quality 视频质量(keep/high/medium/low)
+ * @param {string} options.preset 编码速度(keep/ultrafast/veryfast/fast/medium/slow/veryslow)
+ * @param {number} options.crf CRF值(0-51)
+ * @param {string} options.bitrateMode 码率控制模式(auto/cbr/vbr)
+ * @param {number} options.videoBitrate 视频码率(Kbps)
+ * @param {string} options.videoCodec 视频编码器
+ * @param {string} options.audioChannels 声道设置(keep/mono/stereo/5.1)
+ * @param {string} options.sampleRate 采样率(keep/44100/48000)
+ * @param {number} options.audioBitrate 音频码率(Kbps)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function convertFormat(input, output, options = {}) {
+  const {
+    format = "mp4",
+    devicePreset = "general",
+    resolution = "keep",
+    fps = null,
+    quality = "keep",
+    preset = "keep",
+    crf = null,
+    bitrateMode = "auto",
+    videoBitrate = null,
+    videoCodec = "copy",
+    audioChannels = "keep",
+    sampleRate = "keep",
+    audioBitrate = null,
+    overwrite = false,
+  } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  args.push("-i", input);
+
+  // 根据设备预设设置参数
+  let targetWidth, targetHeight, targetVideoBitrate, targetAudioBitrate;
+  switch (devicePreset) {
+    case "mobile":
+      targetWidth = 1280;
+      targetHeight = 720;
+      targetVideoBitrate = 2000;
+      targetAudioBitrate = 128;
+      break;
+    case "tablet":
+      targetWidth = 1920;
+      targetHeight = 1080;
+      targetVideoBitrate = 4000;
+      targetAudioBitrate = 192;
+      break;
+    case "tv":
+      targetWidth = 3840;
+      targetHeight = 2160;
+      targetVideoBitrate = 8000;
+      targetAudioBitrate = 320;
+      break;
+    default: // general
+      targetWidth = null;
+      targetHeight = null;
+      targetVideoBitrate = null;
+      targetAudioBitrate = null;
+  }
+
+  // 分辨率设置
+  if (resolution !== "keep") {
+    const [width, height] = resolution.split(":");
+    targetWidth = parseInt(width);
+    targetHeight = parseInt(height);
+  }
+
+  if (targetWidth && targetHeight) {
+    args.push(
+      "-vf",
+      `scale=${targetWidth}:${targetHeight}:force_original_aspect_ratio=decrease,pad=${targetWidth}:${targetHeight}:(ow-iw)/2:(oh-ih)/2`
+    );
+  }
+
+  // 帧率设置
+  if (fps) {
+    args.push("-r", fps.toString());
+  }
+
+  // 视频编码设置
+  let vcodec = videoCodec;
+  if (
+    videoCodec === "copy" &&
+    (devicePreset !== "general" || quality !== "keep")
+  ) {
+    // 如果选择了设备优化或质量设置，但编码器为copy，则根据格式选择合适的编码器
+    switch (format) {
+      case "webm":
+        vcodec = "libvpx-vp9";
+        break;
+      case "mp4":
+      case "mkv":
+        vcodec = "libx264";
+        break;
+      case "avi":
+        vcodec = "libx264";
+        break;
+    }
+  }
+  args.push("-c:v", vcodec);
+
+  // 如果不是直接复制视频流，添加编码参数
+  if (vcodec !== "copy") {
+    // 质量设置
+    if (quality !== "keep") {
+      let targetCRF;
+      switch (quality) {
+        case "high":
+          targetCRF = 18;
+          break;
+        case "medium":
+          targetCRF = 23;
+          break;
+        case "low":
+          targetCRF = 28;
+          break;
+      }
+      args.push("-crf", targetCRF.toString());
+    } else if (crf !== null) {
+      args.push("-crf", crf.toString());
+    }
+
+    // 编码速度设置
+    if (preset !== "keep") {
+      args.push("-preset", preset);
+    }
+
+    // 码率控制
+    if (bitrateMode !== "auto") {
+      const vbitrate = videoBitrate || targetVideoBitrate || 4000;
+      if (bitrateMode === "cbr") {
+        args.push(
+          "-b:v",
+          `${vbitrate}k`,
+          "-maxrate",
+          `${vbitrate}k`,
+          "-minrate",
+          `${vbitrate}k`,
+          "-bufsize",
+          `${vbitrate * 2}k`
+        );
+      } else if (bitrateMode === "vbr") {
+        args.push(
+          "-b:v",
+          `${vbitrate}k`,
+          "-maxrate",
+          `${vbitrate * 2}k`,
+          "-bufsize",
+          `${vbitrate * 4}k`
+        );
+      }
+    }
+  }
+
+  // 音频设置
+  if (audioChannels !== "keep") {
+    let ac;
+    switch (audioChannels) {
+      case "mono":
+        ac = 1;
+        break;
+      case "stereo":
+        ac = 2;
+        break;
+      case "5.1":
+        ac = 6;
+        break;
+    }
+    args.push("-ac", ac.toString());
+  }
+
+  if (sampleRate !== "keep") {
+    args.push("-ar", sampleRate.toString());
+  }
+
+  // 音频码率
+  const abitrate = audioBitrate || targetAudioBitrate;
+  if (abitrate) {
+    args.push("-b:a", `${abitrate}k`);
+  }
+
+  // 为特定格式添加额外参数
+  switch (format) {
+    case "webm":
+      if (vcodec !== "copy") {
+        args.push("-deadline", "good", "-cpu-used", "2");
+      }
+      break;
+    case "mp4":
+      args.push("-movflags", "+faststart");
+      break;
+  }
+
+  args.push(output);
+
+  await runFFmpeg(args, {
+    title: "格式转换",
+    text: "正在转换格式...",
+  });
+}
+
+/**
+ * 视频裁剪(画面)
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {number} options.x 起始X坐标
+ * @param {number} options.y 起始Y坐标
+ * @param {number} options.width 裁剪宽度
+ * @param {number} options.height 裁剪高度
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function cropVideo(input, output, options = {}) {
+  const { x = 0, y = 0, width = 0, height = 0, overwrite = false } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  args.push(
+    "-i",
+    input,
+    "-vf",
+    `crop=${width}:${height}:${x}:${y}`,
+    "-c:a",
+    "copy",
+    output
+  );
+
+  await runFFmpeg(args, {
+    title: "视频裁剪",
+    text: "正在裁剪视频...",
+  });
+}
+
+/**
+ * 导出图片序列
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径模式(例如: frame_%d.jpg)
+ * @param {object} options 选项
+ * @param {number} options.fps 每秒提取帧数
+ * @param {string} options.format 图片格式(jpg/png)
+ * @param {number} options.quality 图片质量(1-100)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function extractFrames(input, output, options = {}) {
+  const { fps = 1, format = "jpg", quality = 100, overwrite = false } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  args.push("-i", input, "-vf", `fps=${fps}`, "-frame_pts", "1");
+
+  // 根据格式设置参数
+  if (format === "jpg") {
+    args.push("-q:v", Math.round(((100 - quality) / 100) * 31).toString());
+  } else if (format === "png") {
+    args.push(
+      "-compression_level",
+      Math.round(((100 - quality) / 100) * 9).toString()
+    );
+  }
+
+  args.push(output);
+
+  await runFFmpeg(args, {
+    title: "导出帧",
+    text: "正在导出图片序列...",
+  });
+}
+
+/**
+ * 生成缩略图
+ * @param {string} input 输入文件路径
+ * @param {string} output 输出文件路径
+ * @param {object} options 选项
+ * @param {number} options.time 截取时间点(秒)
+ * @param {number} options.width 缩略图宽度
+ * @param {string} options.format 图片格式(jpg/png)
+ * @param {number} options.quality 图片质量(1-100)
+ * @param {boolean} options.overwrite 是否覆盖已存在的文件
+ */
+async function generateThumbnail(input, output, options = {}) {
+  const {
+    time = 0,
+    width = 320,
+    format = "jpg",
+    quality = 90,
+    overwrite = false,
+  } = options;
+
+  const args = [];
+  if (overwrite) args.push("-y");
+
+  args.push(
+    "-ss",
+    time.toString(),
+    "-i",
+    input,
+    "-vframes",
+    "1",
+    "-vf",
+    `scale=${width}:-1`
+  );
+
+  // 根据格式设置参数
+  if (format === "jpg") {
+    args.push("-q:v", Math.round(((100 - quality) / 100) * 31).toString());
+  } else if (format === "png") {
+    args.push(
+      "-compression_level",
+      Math.round(((100 - quality) / 100) * 9).toString()
+    );
+  }
+
+  args.push(output);
+
+  await runFFmpeg(args, {
+    title: "生成缩略图",
+    text: "正在生成缩略图...",
+  });
+}
+
+module.exports = {
+  runFFmpeg,
+  compressVideo,
+  convertToGif,
+  extractAudio,
+  recordScreen,
+  cutVideo,
+  rotateVideo,
+  addWatermark,
+  mergeVideos,
+  changeSpeed,
+  resizeVideo,
+  convertFormat,
+  cropVideo,
+  extractFrames,
+  generateThumbnail,
+};
diff --git a/plugin/lib/quickcomposer/video/index.js b/plugin/lib/quickcomposer/video/index.js
new file mode 100644
index 00000000..9f52dd2c
--- /dev/null
+++ b/plugin/lib/quickcomposer/video/index.js
@@ -0,0 +1,5 @@
+const ffmpeg = require("./ffmpeg");
+
+module.exports = {
+  ...ffmpeg,
+};
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 0d13dcc6..2730a41d 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -179,15 +179,22 @@ export default defineComponent({
     },
     getAllInputValues(argvs) {
       const flatArgvs = [];
+      if (!argvs) return flatArgvs;
+
       argvs.forEach((item) => {
+        if (!item) return;
+
         if (isVarInputVal(item) && item.value) {
           flatArgvs.push(stringifyVarInputVal(item));
         } else if (typeof item === "number") {
           flatArgvs.push(item.toString());
         } else if (Array.isArray(item)) {
           flatArgvs.push(...this.getAllInputValues(item));
-        } else if (typeof item === "object") {
-          flatArgvs.push(...this.getAllInputValues(Object.values(item)));
+        } else if (typeof item === "object" && item !== null) {
+          const values = Object.values(item);
+          if (values.length > 0) {
+            flatArgvs.push(...this.getAllInputValues(values));
+          }
         }
       });
       return flatArgvs;
@@ -226,7 +233,7 @@ export default defineComponent({
   },
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
+    if (!this.modelValue.code && Array.isArray(argvs)) {
       this.updateModelValue(this.funcName, argvs);
     }
   },
diff --git a/src/components/composer/common/TimeInput.vue b/src/components/composer/common/TimeInput.vue
new file mode 100644
index 00000000..594f161f
--- /dev/null
+++ b/src/components/composer/common/TimeInput.vue
@@ -0,0 +1,181 @@
+<template>
+  <BorderLabel
+    :label="label"
+    :icon="icon"
+    :model-value="false"
+    class="time-input"
+  >
+    <div class="row q-col-gutter-sm items-center">
+      <!-- 时 -->
+      <div class="col-4">
+        <q-input
+          v-model="hours"
+          dense
+          borderless
+          :placeholder="'00'"
+          @update:model-value="updateTime"
+          @blur="formatInput('hours')"
+          maxlength="2"
+          class="time-field"
+        >
+          <template v-slot:append>
+            <div class="text-caption">时</div>
+          </template>
+        </q-input>
+      </div>
+      <!-- 分 -->
+      <div class="col-4">
+        <q-input
+          v-model="minutes"
+          dense
+          borderless
+          :placeholder="'00'"
+          @update:model-value="updateTime"
+          @blur="formatInput('minutes')"
+          maxlength="2"
+          class="time-field"
+        >
+          <template v-slot:append>
+            <div class="text-caption">分</div>
+          </template>
+        </q-input>
+      </div>
+      <!-- 秒 -->
+      <div class="col-4">
+        <q-input
+          v-model="seconds"
+          dense
+          borderless
+          :placeholder="'00'"
+          @update:model-value="updateTime"
+          @blur="formatInput('seconds')"
+          maxlength="2"
+          class="time-field"
+        >
+          <template v-slot:append>
+            <div class="text-caption">秒</div>
+          </template>
+        </q-input>
+      </div>
+    </div>
+  </BorderLabel>
+</template>
+
+<script>
+import BorderLabel from "./BorderLabel.vue";
+
+export default {
+  name: "TimeInput",
+  components: {
+    BorderLabel,
+  },
+  props: {
+    modelValue: {
+      type: String,
+      default: "00:00:00",
+    },
+    label: {
+      type: String,
+      default: "",
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    iconClickable: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: String,
+      default: "00:00:00",
+    },
+  },
+  data() {
+    return {
+      hours: "00",
+      minutes: "00",
+      seconds: "00",
+    };
+  },
+  watch: {
+    modelValue: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) {
+          const parts = newVal.split(":");
+          if (parts.length === 3) {
+            this.hours = parts[0];
+            this.minutes = parts[1];
+            this.seconds = parts[2];
+          }
+        }
+      },
+    },
+  },
+  methods: {
+    // 更新时间
+    updateTime() {
+      const formattedTime = `${this.hours}:${this.minutes}:${this.seconds}`;
+      this.$emit("update:model-value", formattedTime);
+    },
+    // 格式化输入
+    formatInput(field) {
+      const value = this[field];
+      let num = parseInt(value) || 0;
+
+      // 限制范围
+      switch (field) {
+        case "hours":
+          num = Math.min(Math.max(num, 0), 99);
+          break;
+        case "minutes":
+        case "seconds":
+          num = Math.min(Math.max(num, 0), 59);
+          break;
+      }
+
+      // 格式化为两位数
+      this[field] = num.toString().padStart(2, "0");
+      this.updateTime();
+    },
+  },
+};
+</script>
+
+<style scoped>
+.time-input {
+  width: 100%;
+  height: 36px;
+}
+
+.time-input :deep(.content) {
+  padding: 0 8px;
+}
+
+.time-field {
+  font-size: 13px;
+}
+
+.time-input :deep(.border-label) {
+  margin-top: 0;
+}
+
+/* 文本居中显示 */
+.time-input :deep(.q-field__native) {
+  text-align: center;
+  padding: 0;
+  height: 34px;
+}
+
+.time-input :deep(.q-field__control) {
+  padding: 0 4px;
+  height: 34px;
+}
+
+/* 调整单位标签样式 */
+.time-input :deep(.q-field__append) {
+  padding-left: 0;
+  height: 34px;
+}
+</style>
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 9723a101..52a7d0b5 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -22,6 +22,7 @@ import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import ControlInput from "components/composer/common/ControlInput.vue";
 import CheckGroup from "components/composer/common/CheckGroup.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
+import TimeInput from "components/composer/common/TimeInput.vue";
 import { QInput, QSelect, QToggle, QCheckbox } from "quasar";
 const CodeEditor = defineAsyncComponent(() =>
   import("components/composer/common/CodeEditor.vue")
@@ -42,6 +43,7 @@ export default defineComponent({
     QInput,
     QSelect,
     QCheckbox,
+    TimeInput,
     CodeEditor,
   },
   props: {
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 961f9d22..f8dcea82 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -19,6 +19,7 @@ import { statusCommands } from "./statusCommands";
 import { macosCommands } from "./macosCommands";
 import { scriptCommands } from "./scriptCommands";
 import { browserCommands } from "./browserCommands";
+import { videoCommands } from "./videoCommands";
 
 const platformCommands = {
   win32: [windowsCommands],
@@ -32,6 +33,7 @@ export const commandCategories = [
   systemCommands,
   audioCommands,
   imageCommands,
+  ...(utools.runFFmpeg ? [videoCommands] : []),
   utoolsCommands,
   ...platformCommands[window.processPlatform],
   browserCommands,
diff --git a/src/js/composer/commands/videoCommands.js b/src/js/composer/commands/videoCommands.js
new file mode 100644
index 00000000..b0e0db88
--- /dev/null
+++ b/src/js/composer/commands/videoCommands.js
@@ -0,0 +1,1394 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+const getDesktopPath = (fileName) => {
+  return window.joinPath(utools.getPath("desktop"), fileName);
+};
+
+// 视频编码器选项
+const VIDEO_ENCODERS = [
+  { label: "H.264", value: "libx264" },
+  { label: "H.265", value: "libx265" },
+  { label: "VP8", value: "libvpx" },
+  { label: "VP9", value: "libvpx-vp9" },
+];
+
+// 音频编码器选项
+const AUDIO_ENCODERS = [
+  { label: "AAC", value: "aac" },
+  { label: "MP3", value: "libmp3lame" },
+  { label: "Opus", value: "libopus" },
+  { label: "Vorbis", value: "libvorbis" },
+];
+
+// 图片格式选项
+const IMAGE_FORMATS = [
+  { label: "JPG", value: "jpg" },
+  { label: "PNG", value: "png" },
+];
+
+// 编码器预设选项
+const ENCODER_PRESETS = [
+  { label: "保持不变", value: "keep" },
+  { label: "超快", value: "ultrafast" },
+  { label: "非常快", value: "veryfast" },
+  { label: "快速", value: "fast" },
+  { label: "中等", value: "medium" },
+  { label: "慢速", value: "slow" },
+  { label: "非常慢", value: "veryslow" },
+];
+
+// 视频质量选项
+const VIDEO_QUALITY = [
+  { label: "保持不变", value: "keep" },
+  { label: "高质量", value: "high" },
+  { label: "中等质量", value: "medium" },
+  { label: "低质量", value: "low" },
+];
+
+// 分辨率选项
+const RESOLUTIONS = [
+  { label: "保持不变", value: "keep" },
+  { label: "4K(3840x2160)", value: "3840:2160" },
+  { label: "2K(2560x1440)", value: "2560:1440" },
+  { label: "1080P(1920x1080)", value: "1920:1080" },
+  { label: "720P(1280x720)", value: "1280:720" },
+  { label: "480P(854x480)", value: "854:480" },
+];
+
+// 视频格式选项
+const VIDEO_FORMATS = [
+  { label: "MP4 (通用格式)", value: "mp4" },
+  { label: "WebM (网页视频)", value: "webm" },
+  { label: "MKV (高清视频)", value: "mkv" },
+  { label: "AVI (传统格式)", value: "avi" },
+];
+
+// 设备优化选项
+const DEVICE_PRESETS = [
+  { label: "通用", value: "general" },
+  { label: "手机", value: "mobile" },
+  { label: "平板", value: "tablet" },
+  { label: "电视", value: "tv" },
+];
+
+// 码率控制模式
+const BITRATE_MODES = [
+  { label: "自动", value: "auto" },
+  { label: "固定码率", value: "cbr" },
+  { label: "可变码率", value: "vbr" },
+];
+
+// 声道选项
+const AUDIO_CHANNELS = [
+  { label: "保持原有", value: "keep" },
+  { label: "单声道", value: "mono" },
+  { label: "立体声", value: "stereo" },
+  { label: "5.1环绕", value: "5.1" },
+];
+
+// 采样率选项
+const SAMPLE_RATES = [
+  { label: "保持原有", value: "keep" },
+  { label: "44.1kHz", value: "44100" },
+  { label: "48kHz", value: "48000" },
+];
+
+export const videoCommands = {
+  label: "视频操作",
+  icon: "video_library",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.video.convertFormat",
+      label: "格式转换",
+      icon: "transform",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: [
+                      "mp4",
+                      "avi",
+                      "mkv",
+                      "mov",
+                      "wmv",
+                      "flv",
+                      "webm",
+                    ],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "MP4视频",
+                    extensions: ["mp4"],
+                  },
+                  {
+                    name: "WebM视频",
+                    extensions: ["webm"],
+                  },
+                  {
+                    name: "MKV视频",
+                    extensions: ["mkv"],
+                  },
+                  {
+                    name: "AVI视频",
+                    extensions: ["avi"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            format: {
+              label: "目标格式",
+              component: "QSelect",
+              width: 3,
+              options: VIDEO_FORMATS,
+            },
+            devicePreset: {
+              label: "设备优化",
+              component: "QSelect",
+              width: 3,
+              options: DEVICE_PRESETS,
+            },
+            resolution: {
+              label: "分辨率",
+              component: "QSelect",
+              width: 3,
+              options: RESOLUTIONS,
+            },
+            fps: {
+              label: "帧率",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+              max: 60,
+              placeholder: "保持原有",
+            },
+            quality: {
+              label: "视频质量",
+              component: "QSelect",
+              width: 4,
+              options: VIDEO_QUALITY,
+            },
+            preset: {
+              label: "编码速度",
+              component: "QSelect",
+              width: 4,
+              options: ENCODER_PRESETS,
+            },
+            crf: {
+              label: "CRF(0-51)",
+              component: "NumberInput",
+              width: 4,
+              min: 0,
+              max: 51,
+              placeholder: "自动",
+            },
+            bitrateMode: {
+              label: "码率控制",
+              component: "QSelect",
+              width: 4,
+              options: BITRATE_MODES,
+            },
+            videoBitrate: {
+              label: "视频码率(Kbps)",
+              component: "NumberInput",
+              width: 4,
+              min: 100,
+              placeholder: "自动",
+            },
+            videoCodec: {
+              label: "视频编码器",
+              component: "QSelect",
+              width: 4,
+              options: [
+                { label: "自动选择", value: "copy" },
+                ...VIDEO_ENCODERS,
+              ],
+            },
+            audioChannels: {
+              label: "声道",
+              component: "QSelect",
+              width: 4,
+              options: AUDIO_CHANNELS,
+            },
+            sampleRate: {
+              label: "采样率",
+              component: "QSelect",
+              width: 4,
+              options: SAMPLE_RATES,
+            },
+            audioBitrate: {
+              label: "音频码率(Kbps)",
+              component: "NumberInput",
+              width: 4,
+              min: 32,
+              max: 320,
+              placeholder: "自动",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 12,
+            },
+          },
+          defaultValue: {
+            format: "mp4",
+            devicePreset: "general",
+            resolution: "keep",
+            fps: null,
+            quality: "keep",
+            preset: "keep",
+            crf: null,
+            bitrateMode: "auto",
+            videoBitrate: null,
+            videoCodec: "copy",
+            audioChannels: "keep",
+            sampleRate: "keep",
+            audioBitrate: null,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.compressVideo",
+      label: "视频压缩",
+      icon: "compress",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                properties: ["openFile", "showHiddenFiles"],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            encoder: {
+              label: "视频编码器",
+              component: "QSelect",
+              width: 3,
+              options: VIDEO_ENCODERS,
+            },
+            preset: {
+              label: "压缩预设",
+              component: "QSelect",
+              width: 3,
+              options: ENCODER_PRESETS,
+            },
+            crf: {
+              label: "质量(0-51)",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+              max: 51,
+            },
+            resolution: {
+              label: "分辨率",
+              component: "QSelect",
+              width: 3,
+              options: RESOLUTIONS,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 12,
+            },
+          },
+          defaultValue: {
+            encoder: "libx264",
+            preset: "medium",
+            crf: 23,
+            resolution: "keep",
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.convertToGif",
+      label: "视频转GIF",
+      icon: "gif",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存GIF",
+                filters: [
+                  {
+                    name: "GIF图片",
+                    extensions: ["gif"],
+                  },
+                ],
+                defaultPath: "output.gif",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.gif")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            fps: {
+              label: "帧率",
+              component: "NumberInput",
+              icon: "speed",
+              width: 4,
+              min: 1,
+              max: 60,
+            },
+            width: {
+              label: "宽度",
+              component: "NumberInput",
+              icon: "width",
+              width: 4,
+              min: 1,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 4,
+            },
+          },
+          defaultValue: {
+            fps: 15,
+            width: 480,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.extractAudio",
+      label: "提取音频",
+      icon: "audio_file",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存音频",
+                filters: [
+                  {
+                    name: "音频文件",
+                    extensions: ["mp3", "aac", "wav", "m4a"],
+                  },
+                ],
+                defaultPath: "output.mp3",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp3")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            quality: {
+              label: "音频质量",
+              component: "NumberInput",
+              icon: "high_quality",
+              width: 6,
+              min: 0,
+              max: 9,
+              placeholder: "0-9，0为最高质量",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 6,
+            },
+          },
+          defaultValue: {
+            quality: 0,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    // utools接口目前好像有问题，无法结束录制，暂时注释
+    // {
+    //   value: "quickcomposer.video.recordScreen",
+    //   label: "录制屏幕",
+    //   icon: "screen_record",
+    //   asyncMode: "await",
+    //   config: [
+    //     {
+    //       label: "输出文件",
+    //       component: "VariableInput",
+    //       icon: "save",
+    //       width: 12,
+    //       options: {
+    //         dialog: {
+    //           type: "save",
+    //           options: {
+    //             title: "保存录屏",
+    //             filters: [
+    //               {
+    //                 name: "视频文件",
+    //                 extensions: ["mp4"],
+    //               },
+    //             ],
+    //             defaultPath: "output.mp4",
+    //           },
+    //         },
+    //       },
+    //       defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+    //     },
+    //     {
+    //       component: "OptionEditor",
+    //       width: 12,
+    //       options: {
+    //         fps: {
+    //           label: "帧率",
+    //           component: "NumberInput",
+    //           icon: "speed",
+    //           width: 6,
+    //           min: 1,
+    //           max: 60,
+    //         },
+    //         overwrite: {
+    //           label: "覆盖已存在目标文件",
+    //           component: "CheckButton",
+    //           width: 6,
+    //         },
+    //       },
+    //       defaultValue: {
+    //         fps: 30,
+    //         overwrite: true,
+    //       },
+    //     },
+    //   ],
+    // },
+    {
+      value: "quickcomposer.video.cutVideo",
+      label: "截取片段",
+      icon: "content_cut",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            start: {
+              label: "开始时间",
+              component: "TimeInput",
+              icon: "schedule",
+              width: 4,
+              placeholder: "00:00:00",
+            },
+            duration: {
+              label: "持续时长",
+              component: "TimeInput",
+              icon: "timer",
+              width: 4,
+              placeholder: "00:00:00",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 4,
+            },
+          },
+          defaultValue: {
+            start: "00:00:00",
+            duration: "00:00:10",
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.rotateVideo",
+      label: "旋转/翻转",
+      icon: "rotate_90_degrees_ccw",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            rotate: {
+              label: "旋转角度",
+              component: "QSelect",
+              width: 3,
+              options: [
+                { label: "不旋转", value: 0 },
+                { label: "90度", value: 90 },
+                { label: "180度", value: 180 },
+                { label: "270度", value: 270 },
+              ],
+            },
+            flipH: {
+              label: "水平翻转",
+              component: "CheckButton",
+              width: 3,
+            },
+            flipV: {
+              label: "垂直翻转",
+              component: "CheckButton",
+              width: 3,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 3,
+            },
+          },
+          defaultValue: {
+            rotate: 0,
+            flipH: false,
+            flipV: false,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.addWatermark",
+      label: "添加水印",
+      icon: "branding_watermark",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "水印图片",
+          component: "VariableInput",
+          icon: "image",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择水印图片",
+                filters: [
+                  {
+                    name: "图片文件",
+                    extensions: ["png", "jpg", "jpeg", "gif"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            position: {
+              label: "位置",
+              component: "QSelect",
+              width: 3,
+              options: [
+                { label: "左上", value: "topleft" },
+                { label: "右上", value: "topright" },
+                { label: "左下", value: "bottomleft" },
+                { label: "右下", value: "bottomright" },
+                { label: "居中", value: "center" },
+              ],
+            },
+            padding: {
+              label: "边距",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+            },
+            scale: {
+              label: "缩放比例",
+              component: "NumberInput",
+              width: 3,
+              min: 0.1,
+              max: 1,
+              step: 0.1,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 3,
+            },
+          },
+          defaultValue: {
+            position: "bottomright",
+            padding: 10,
+            scale: 0.1,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.mergeVideos",
+      label: "合并视频",
+      icon: "merge",
+      description: "将多个视频文件合并为一个，分辨率会统一为第一个视频的分辨率",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          placeholder: "合并的视频顺序依据选择的视频顺序",
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                properties: ["openFile", "multiSelections"],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 12,
+            },
+          },
+          defaultValue: {
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.changeSpeed",
+      label: "视频调速",
+      icon: "speed",
+      description: "调整视频播放速度，调速区间0.25-4",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            speed: {
+              label: "速度倍数",
+              component: "NumberInput",
+              width: 4,
+              min: 0.25,
+              max: 4,
+              step: 0.25,
+              placeholder: "0.25-4",
+            },
+            keepPitch: {
+              label: "保持音调",
+              component: "CheckButton",
+              width: 4,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 4,
+            },
+          },
+          defaultValue: {
+            speed: 1,
+            keepPitch: true,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.resizeVideo",
+      label: "调整分辨率",
+      icon: "aspect_ratio",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            width: {
+              label: "宽度",
+              component: "NumberInput",
+              width: 3,
+              min: -1,
+              placeholder: "保持比例填-1",
+            },
+            height: {
+              label: "高度",
+              component: "NumberInput",
+              width: 3,
+              min: -1,
+              placeholder: "保持比例填-1",
+            },
+            keepAspectRatio: {
+              label: "保持宽高比",
+              component: "CheckButton",
+              width: 3,
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 3,
+            },
+          },
+          defaultValue: {
+            width: -1,
+            height: -1,
+            keepAspectRatio: true,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.cropVideo",
+      label: "裁剪画面",
+      icon: "crop",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存视频",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+                defaultPath: "output.mp4",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("output.mp4")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            x: {
+              label: "X坐标",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+              placeholder: "起始X坐标",
+            },
+            y: {
+              label: "Y坐标",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+              placeholder: "起始Y坐标",
+            },
+            width: {
+              label: "宽度",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+              placeholder: "裁剪宽度",
+            },
+            height: {
+              label: "高度",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+              placeholder: "裁剪高度",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 12,
+            },
+          },
+          defaultValue: {
+            x: 0,
+            y: 0,
+            width: 1920,
+            height: 1080,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.extractFrames",
+      label: "导出帧序列",
+      icon: "burst_mode",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          description: "使用 %d 表示帧序号，例如: frame_%d.jpg",
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存图片序列",
+                filters: [
+                  {
+                    name: "JPG图片",
+                    extensions: ["jpg"],
+                  },
+                  {
+                    name: "PNG图片",
+                    extensions: ["png"],
+                  },
+                ],
+                defaultPath: "frame_%d.jpg",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("frame_%d.jpg")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            fps: {
+              label: "每秒帧数",
+              component: "NumberInput",
+              width: 3,
+              min: 0.1,
+              max: 60,
+              step: 0.1,
+            },
+            format: {
+              label: "图片格式",
+              component: "QSelect",
+              width: 3,
+              options: IMAGE_FORMATS,
+            },
+            quality: {
+              label: "图片质量",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+              max: 100,
+              placeholder: "1-100",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 3,
+            },
+          },
+          defaultValue: {
+            fps: 1,
+            format: "jpg",
+            quality: 90,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+    {
+      value: "quickcomposer.video.generateThumbnail",
+      label: "生成缩略图",
+      icon: "photo",
+      asyncMode: "await",
+      config: [
+        {
+          label: "输入文件",
+          component: "VariableInput",
+          icon: "video_file",
+          width: 12,
+          options: {
+            dialog: {
+              type: "open",
+              options: {
+                title: "选择视频文件",
+                filters: [
+                  {
+                    name: "视频文件",
+                    extensions: ["mp4", "avi", "mkv", "mov", "wmv", "flv"],
+                  },
+                ],
+              },
+            },
+          },
+        },
+        {
+          label: "输出文件",
+          component: "VariableInput",
+          icon: "save",
+          width: 12,
+          options: {
+            dialog: {
+              type: "save",
+              options: {
+                title: "保存缩略图",
+                filters: [
+                  {
+                    name: "JPG图片",
+                    extensions: ["jpg"],
+                  },
+                  {
+                    name: "PNG图片",
+                    extensions: ["png"],
+                  },
+                ],
+                defaultPath: "thumbnail.jpg",
+              },
+            },
+          },
+          defaultValue: newVarInputVal("str", getDesktopPath("thumbnail.jpg")),
+        },
+        {
+          component: "OptionEditor",
+          width: 12,
+          options: {
+            time: {
+              label: "时间点(秒)",
+              component: "NumberInput",
+              width: 3,
+              min: 0,
+              step: 0.1,
+            },
+            width: {
+              label: "宽度",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+            },
+            format: {
+              label: "图片格式",
+              component: "QSelect",
+              width: 3,
+              options: IMAGE_FORMATS,
+            },
+            quality: {
+              label: "图片质量",
+              component: "NumberInput",
+              width: 3,
+              min: 1,
+              max: 100,
+              placeholder: "1-100",
+            },
+            overwrite: {
+              label: "覆盖已存在目标文件",
+              component: "CheckButton",
+              width: 12,
+            },
+          },
+          defaultValue: {
+            time: 0,
+            width: 320,
+            format: "jpg",
+            quality: 90,
+            overwrite: true,
+          },
+        },
+      ],
+    },
+  ],
+};
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 0102ff96..e3f73e56 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -131,7 +131,5 @@ export function generateCode(flow) {
 
   const finalCode = code.join("\n");
 
-  console.log(finalCode);
-
   return finalCode;
 }

From ae8edfd710bd6cbc685f9b215dca098a5b05e080 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 29 Jan 2025 15:34:20 +0800
Subject: [PATCH 149/332] =?UTF-8?q?multiparam=E5=8F=82=E6=95=B0=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerFlow.vue |  2 +-
 src/components/composer/MultiParams.vue  | 48 ++++++++++++------------
 src/js/composer/composerConfig.js        | 31 +++++++--------
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index cddeea0e..8ab3f0c8 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { defineComponent, inject } from "vue";
+import { defineComponent } from "vue";
 import draggable from "vuedraggable";
 import ComposerCard from "./ComposerCard.vue";
 import ChainStyles from "./flow/ChainStyles.vue";
diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 2730a41d..74b79826 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -2,8 +2,8 @@
   <div class="multi-params">
     <OperationCard
       v-if="hasSubCommands"
-      :model-value="funcName"
-      @update:model-value="updateFuncName($event)"
+      :model-value="subCommand"
+      @update:model-value="updateSubCommand($event)"
       :options="localCommand.subCommands"
     />
     <ParamInput :configs="localConfig" :values="argvs" @update="updateArgv" />
@@ -63,8 +63,8 @@ export default defineComponent({
     defaultArgvs() {
       return this.localConfig.map((item) => item.value);
     },
-    funcName() {
-      return this.modelValue.value;
+    subCommand() {
+      return this.modelValue.subCommand || this.modelValue.value;
     },
     argvs() {
       return (
@@ -76,18 +76,18 @@ export default defineComponent({
     },
   },
   methods: {
-    getSelectSubCommand(funcName = this.funcName) {
+    getSelectSubCommand(subCommand = this.subCommand) {
       return this.modelValue.subCommands?.find(
-        (item) => item.value === funcName
+        (item) => item.value === subCommand
       );
     },
     updateArgv(index, value) {
       const newArgvs = [...this.argvs];
       newArgvs[index] = value;
 
-      this.updateModelValue(this.funcName, newArgvs);
+      this.updateModelValue(this.subCommand, newArgvs);
     },
-    updateFuncName(value) {
+    updateSubCommand(value) {
       // 构建新的参数数组
       const newArgvs = [];
 
@@ -103,7 +103,7 @@ export default defineComponent({
 
       this.updateModelValue(value, newArgvs, true);
     },
-    generateCode(funcName, argvs) {
+    generateCode(subCommand, argvs) {
       if (this.localCommand.isExpression) {
         return argvs.join("");
       }
@@ -120,13 +120,13 @@ export default defineComponent({
        * 5. 如果不想传递对应参数，将varInput切为变量模式并留空
        * 6. 如果想传递空参数，将varInput切为变量模式并设置为null或undefined
 
-       * [undefined, undefined] -> funcName()
+       * [undefined, undefined] -> subCommand()
        * [undefined, 1] -> ''
-       * [1, undefined] -> funcName(1)
-       * [null, 1] -> funcName(null, 1)
-       * [1, 字符串模式下varInput留空] -> funcName(1, "")
-       * [1, 变量模式下varInput留空] -> funcName(1)
-       * [1, 变量模式下varInput设置为null] -> funcName(1, null)
+       * [1, undefined] -> subCommand(1)
+       * [null, 1] -> subCommand(null, 1)
+       * [1, 字符串模式下varInput留空] -> subCommand(1, "")
+       * [1, 变量模式下varInput留空] -> subCommand(1)
+       * [1, 变量模式下varInput设置为null] -> subCommand(1, null)
        */
       // 空参数后面跟着非空参数，不生成代码
       const isEmpty = (v) => v === undefined || v === "" || v === null;
@@ -139,7 +139,7 @@ export default defineComponent({
       // 过滤空参数，由于前面已经对处于非空参数中间的空参数做了处理，这里直接过滤空参数不会对参数顺序造成影响
       const finalArgvs = stringifiedArgvs.filter((v) => !isEmpty(v));
 
-      return `${funcName}(${finalArgvs.join(",")})`;
+      return `${subCommand}(${finalArgvs.join(",")})`;
     },
     parseCodeToArgvs(code) {
       let argvs = window.lodashM.cloneDeep(this.defaultArgvs);
@@ -199,10 +199,10 @@ export default defineComponent({
       });
       return flatArgvs;
     },
-    getSummary(funcName, argvs) {
+    getSummary(subCommand, argvs) {
       // 虽然header里对溢出做了处理，但是这里截断主要是为了节省存储空间
-      const funcNameLabel = this.getSelectSubCommand(funcName)?.label;
-      const subFeature = funcNameLabel ? `${funcNameLabel} ` : "";
+      const subCommandLabel = this.getSelectSubCommand(subCommand)?.label;
+      const subFeature = subCommandLabel ? `${subCommandLabel} ` : "";
       const allArgvs = this.getAllInputValues(argvs).map((item) =>
         window.lodashM.truncate(item, {
           length: 30,
@@ -211,13 +211,13 @@ export default defineComponent({
       );
       return `${subFeature}${allArgvs.join(",")}`;
     },
-    updateModelValue(funcName, argvs, resetOutputVariable = false) {
+    updateModelValue(subCommand, argvs, resetOutputVariable = false) {
       const newModelValue = {
         ...this.modelValue,
-        value: funcName,
+        subCommand,
         argvs,
-        summary: this.getSummary(funcName, argvs),
-        code: this.generateCode(funcName, argvs),
+        summary: this.getSummary(subCommand, argvs),
+        code: this.generateCode(subCommand, argvs),
       };
       if (resetOutputVariable) {
         delete newModelValue.outputVariable;
@@ -234,7 +234,7 @@ export default defineComponent({
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;
     if (!this.modelValue.code && Array.isArray(argvs)) {
-      this.updateModelValue(this.funcName, argvs);
+      this.updateModelValue(this.subCommand, argvs);
     }
   },
 });
diff --git a/src/js/composer/composerConfig.js b/src/js/composer/composerConfig.js
index 1c45dc35..3977b0ac 100644
--- a/src/js/composer/composerConfig.js
+++ b/src/js/composer/composerConfig.js
@@ -1,26 +1,21 @@
-export {
-  ubrowserOperationConfigs,
-  defaultUBrowserConfigs,
-} from "./ubrowserConfig";
+import { commandCategories } from "./commands";
 
-import { commandCategories as categories } from "./commands";
+let availableCommands = [];
+let commandValueMap = {};
 
 // 从commandCategories中提取所有命令
-export const availableCommands = categories.reduce((commands, category) => {
-  return commands.concat(
-    category.commands.map((cmd) => ({
+commandCategories.forEach((category) => {
+  category.commands.forEach((cmd) => {
+    availableCommands.push({
       type: category.label,
       ...cmd,
-    }))
-  );
-}, []);
+    });
+    commandValueMap[cmd.value] = cmd;
+  });
+});
 
-export const findCommandByValue = (value) => {
-  return availableCommands.find(
-    (cmd) =>
-      cmd.value === value ||
-      cmd.subCommands?.find((subCmd) => subCmd.value === value)
-  );
+const findCommandByValue = (value) => {
+  return commandValueMap[value];
 };
 
-export const commandCategories = categories;
+export { availableCommands, commandCategories, findCommandByValue };

From 5a0675d9135aa887467aa505036cf6152e3bcc1f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 29 Jan 2025 20:56:59 +0800
Subject: [PATCH 150/332] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=87=8D=E6=9E=84Ubrowser=E7=9A=84operations?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/common/CheckGroup.vue |   6 +-
 src/components/composer/common/DictEditor.vue |   5 +-
 .../composer/common/FunctionInput.vue         | 175 +++++
 .../composer/network/AxiosConfigEditor.vue    |   1 +
 .../composer/param/ParamImporter.vue          |   3 +
 .../composer/ubrowser/UBrowserBasic.vue       | 231 ++++---
 .../composer/ubrowser/UBrowserEditor.vue      | 229 +++---
 .../composer/ubrowser/UBrowserOperations.vue  | 304 ++++----
 .../composer/ubrowser/UBrowserRun.vue         | 285 ++++----
 .../operations/UBrowserCookieList.vue         | 105 ---
 .../operations/UBrowserDeviceName.vue         |  72 --
 .../ubrowser/operations/UBrowserFileList.vue  |  79 ---
 .../operations/UBrowserFunctionInput.vue      | 237 -------
 .../operations/UBrowserNamedParamList.vue     |  87 ---
 .../ubrowser/operations/UBrowserOperation.vue | 266 -------
 src/js/composer/commands/browserCommands.js   |   3 +-
 src/js/composer/generateUBrowserCode.js       | 415 +++--------
 src/js/composer/ubrowserConfig.js             | 652 ++++++++----------
 18 files changed, 1065 insertions(+), 2090 deletions(-)
 create mode 100644 src/components/composer/common/FunctionInput.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserCookieList.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserFileList.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserFunctionInput.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
 delete mode 100644 src/components/composer/ubrowser/operations/UBrowserOperation.vue

diff --git a/src/components/composer/common/CheckGroup.vue b/src/components/composer/common/CheckGroup.vue
index db7ca742..0b543272 100644
--- a/src/components/composer/common/CheckGroup.vue
+++ b/src/components/composer/common/CheckGroup.vue
@@ -18,7 +18,9 @@
           { 'check-btn--selected': isSelected(option.value) },
         ]"
         :style="{
-          flex: `1 0 ${100 / options.length}%`,
+          flex: `1 0 calc(${100 / options.length}% - ${
+            (4 * (options.length - 1)) / options.length
+          }px)`,
         }"
         @click="toggleOption(option.value)"
       >
@@ -108,7 +110,7 @@ export default defineComponent({
   height: auto !important;
   min-height: 32px;
   font-size: 12px;
-  padding: 4px 12px;
+  padding: 4px 8px;
   border-radius: 4px !important;
   transition: all 0.3s;
   background-color: rgba(0, 0, 0, 0.03);
diff --git a/src/components/composer/common/DictEditor.vue b/src/components/composer/common/DictEditor.vue
index a0a19094..d2718169 100644
--- a/src/components/composer/common/DictEditor.vue
+++ b/src/components/composer/common/DictEditor.vue
@@ -168,7 +168,10 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   created() {
-    if (!this.modelValue || Object.keys(this.modelValue).length === 0) {
+    if (
+      (!this.modelValue || Object.keys(this.modelValue).length === 0) &&
+      !this.options?.disableAdd
+    ) {
       this.$emit("update:modelValue", { "": newVarInputVal("str") });
     }
   },
diff --git a/src/components/composer/common/FunctionInput.vue b/src/components/composer/common/FunctionInput.vue
new file mode 100644
index 00000000..ba508cb2
--- /dev/null
+++ b/src/components/composer/common/FunctionInput.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="row q-col-gutter-sm function-input">
+    <div class="col-12">
+      <div class="row q-col-gutter-sm">
+        <div class="col-3">
+          <q-select
+            :model-value="params"
+            use-input
+            use-chips
+            multiple
+            dense
+            borderless
+            hide-dropdown-icon
+            options-dense
+            input-debounce="0"
+            new-value-mode="add-unique"
+            label="参数"
+            @update:model-value="updateParams"
+            @input-value="handleInput"
+            @blur="handleBlur"
+            ref="paramSelect"
+          >
+            <template v-slot:prepend>
+              <div class="text-primary func-symbol">(</div>
+            </template>
+            <template v-slot:append>
+              <div class="text-primary func-symbol">)</div>
+            </template>
+          </q-select>
+        </div>
+        <div class="col-9">
+          <q-input
+            :model-value="funcContent"
+            :label="label"
+            type="textarea"
+            dense
+            borderless
+            :placeholder="placeholder"
+            style="font-family: Consolas, Monaco, 'Courier New'"
+            autogrow
+            @update:model-value="updateContent"
+          >
+            <template v-slot:prepend>
+              <div class="text-primary func-symbol">=> {</div>
+            </template>
+            <template v-slot:append>
+              <div class="text-primary func-symbol">}</div>
+            </template>
+          </q-input>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import { newVarInputVal } from "src/js/composer/varInputValManager";
+
+export default defineComponent({
+  name: "FunctionInput",
+  props: {
+    modelValue: {
+      type: Object,
+      default: newVarInputVal("var", ""),
+    },
+    label: {
+      type: String,
+      default: "函数内容",
+    },
+    icon: {
+      type: String,
+      default: "code",
+    },
+    placeholder: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update:model-value"],
+  computed: {
+    funcStr() {
+      return this.modelValue.value;
+    },
+    params() {
+      const match = this.funcStr.match(/^\((.*?)\)/);
+      if (!match) return [];
+      return match[1]
+        .split(",")
+        .map((p) => p.trim())
+        .filter((p) => p);
+    },
+    funcContent() {
+      const match = this.funcStr.match(/\{([\s\S]*)\}/);
+      if (!match) return "";
+      return match[1].trim();
+    },
+  },
+  methods: {
+    updateParams(newParams) {
+      const functionStr = `(${newParams.join(", ")}) => { ${
+        this.funcContent
+      } }`;
+      this.updateModelValue(functionStr);
+    },
+    updateContent(newContent) {
+      const functionStr = `(${this.params.join(", ")}) => { ${newContent} }`;
+      this.updateModelValue(functionStr);
+    },
+    handleInput(val) {
+      if (!val) return;
+
+      if (val.includes(",") || val.includes(" ")) {
+        const newParams = val
+          .split(/[,\s]+/)
+          .map((p) => p.trim())
+          .filter((p) => p);
+
+        const allParams = [...new Set([...this.params, ...newParams])];
+        this.updateParams(allParams);
+        this.$refs.paramSelect.updateInputValue("");
+      }
+    },
+    handleBlur() {
+      const inputValue = this.$refs.paramSelect.inputValue;
+      if (inputValue && !this.params.includes(inputValue)) {
+        const newParams = [...this.params, inputValue];
+        this.updateParams(newParams);
+        this.$refs.paramSelect.updateInputValue("");
+      }
+    },
+    updateModelValue(newVal) {
+      this.$emit("update:model-value", newVarInputVal("var", newVal));
+    },
+  },
+});
+</script>
+
+<style scoped>
+.function-input :deep(.q-field__control) .text-primary.func-symbol {
+  font-size: 24px !important;
+}
+
+.function-input :deep(.q-select__input) {
+  display: flex !important;
+  flex-wrap: nowrap !important;
+  overflow-x: auto !important;
+  scrollbar-width: none !important;
+  -ms-overflow-style: none !important;
+}
+
+.function-input :deep(.q-select .q-field__native) {
+  display: flex !important;
+  flex-wrap: nowrap !important;
+  overflow-x: auto !important;
+  scrollbar-width: none !important;
+  -ms-overflow-style: none !important;
+}
+
+.function-input :deep(.q-select .q-field__native > div) {
+  display: flex !important;
+  flex-wrap: nowrap !important;
+  flex: 0 0 auto !important;
+}
+
+.function-input :deep(.q-select .q-chip) {
+  flex: 0 0 auto !important;
+  margin-right: 4px !important;
+}
+
+.function-input :deep(.q-select__input::-webkit-scrollbar),
+.function-input :deep(.q-select .q-field__native::-webkit-scrollbar) {
+  display: none !important;
+}
+</style>
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index a436b3ee..ec17074f 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -74,6 +74,7 @@
                 filled
                 emit-value
                 map-options
+                options-dense
                 :options="contentTypes"
                 @update:model-value="
                   updateArgvs('headers.Content-Type', $event)
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 52a7d0b5..7fb6ea87 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -23,6 +23,7 @@ import ControlInput from "components/composer/common/ControlInput.vue";
 import CheckGroup from "components/composer/common/CheckGroup.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
 import TimeInput from "components/composer/common/TimeInput.vue";
+import FunctionInput from "components/composer/common/FunctionInput.vue";
 import { QInput, QSelect, QToggle, QCheckbox } from "quasar";
 const CodeEditor = defineAsyncComponent(() =>
   import("components/composer/common/CodeEditor.vue")
@@ -45,6 +46,7 @@ export default defineComponent({
     QCheckbox,
     TimeInput,
     CodeEditor,
+    FunctionInput,
   },
   props: {
     config: {
@@ -85,6 +87,7 @@ export default defineComponent({
       if (this.isQuasarSelect) {
         props.emitValue = true;
         props.mapOptions = true;
+        props.optionsDense = true;
       }
 
       return props;
diff --git a/src/components/composer/ubrowser/UBrowserBasic.vue b/src/components/composer/ubrowser/UBrowserBasic.vue
index c0394576..3fb165e5 100644
--- a/src/components/composer/ubrowser/UBrowserBasic.vue
+++ b/src/components/composer/ubrowser/UBrowserBasic.vue
@@ -1,126 +1,161 @@
 <template>
-  <div class="row q-col-gutter-sm">
-    <!-- 基础配置 -->
-    <div class="col-12">
-      <VariableInput
-        v-model="localConfigs.goto.url"
-        label="网址"
-        icon="link"
-        @update:model-value="updateConfigs"
-      />
-    </div>
-
-    <!-- Headers配置 -->
-    <div class="col-12">
-      <div class="row q-col-gutter-sm">
-        <div class="col-12">
-          <VariableInput
-            v-model="localConfigs.goto.headers.Referer"
-            label="Referer"
-            icon="link"
-            @update:model-value="updateConfigs"
-          />
-        </div>
-        <div class="col-12">
-          <div class="row q-col-gutter-sm">
-            <div class="col">
-              <VariableInput
-                v-model="localConfigs.goto.headers.userAgent"
-                label="User-Agent"
-                icon="devices"
-                @update:model-value="updateConfigs"
-              />
-            </div>
-            <div class="col-auto">
-              <q-select
-                :model-value="selectedUA"
-                @update:model-value="handleUAChange"
-                :options="userAgentOptions"
-                label="常用 UA"
-                dense
-                filled
-                emit-value
-                map-options
-                options-dense
-                style="min-width: 150px"
-              >
-                <template v-slot:prepend>
-                  <q-icon name="list" />
-                </template>
-              </q-select>
-            </div>
+  <div class="ubrowser-basic">
+    <div class="row q-col-gutter-sm">
+      <!-- 基础配置 -->
+      <div class="col-12">
+        <div class="row q-col-gutter-sm">
+          <div class="col-9">
+            <VariableInput
+              v-model="url"
+              label="网址"
+              icon="link"
+              class="col"
+              :options="{
+                items: userAgentOptions,
+              }"
+            />
+          </div>
+          <div class="col-3">
+            <NumberInput
+              v-model="timeout"
+              label="超时时间(ms)"
+              icon="timer"
+              :min="0"
+              :step="1000"
+            />
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- 超时配置 -->
-    <div class="col-12">
-      <NumberInput
-        v-model="localConfigs.goto.timeout"
-        icon="timer"
-        label="超时时间(ms)"
-        @update:model-value="updateConfigs"
-      />
+      <!-- Headers配置 -->
+      <div class="col-12">
+        <div class="row q-col-gutter-sm">
+          <div class="col-12">
+            <VariableInput
+              v-model="userAgent"
+              label="User-Agent"
+              icon="devices"
+              :options="{
+                items: userAgentOptions,
+              }"
+            />
+          </div>
+          <div class="col-12">
+            <DictEditor
+              v-model="otherHeaders"
+              label="其他请求头"
+              :options="{
+                optionKeys: commonHeaders,
+              }"
+            />
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { defineComponent, ref, computed } from "vue";
-import { userAgent } from "js/options/httpOptions";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
+import DictEditor from "components/composer/common/DictEditor.vue";
+import { userAgent, commonHeaders } from "js/options/httpOptions";
 import { newVarInputVal } from "js/composer/varInputValManager";
-export default defineComponent({
+
+export default {
   name: "UBrowserBasic",
   components: {
     VariableInput,
     NumberInput,
+    DictEditor,
   },
   props: {
-    configs: {
+    modelValue: {
       type: Object,
       required: true,
     },
   },
-  emits: ["update:configs"],
-  setup(props, { emit }) {
-    const selectedUA = ref(null);
-
-    // 使用 computed 处理配置
-    const localConfigs = computed({
-      get: () => props.configs,
-      set: (val) => {
-        emit("update:configs", val);
-      },
-    });
-
-    // 更新配置
-    const updateConfigs = () => {
-      emit("update:configs", localConfigs.value);
-    };
-
-    // 处理 UA 选择
-    const handleUAChange = (val) => {
-      if (!val) return;
-
-      const newConfigs = window.lodashM.cloneDeep(props.configs);
-      if (!newConfigs.goto.headers) {
-        newConfigs.goto.headers = {};
-      }
-      newConfigs.goto.headers.userAgent = newVarInputVal("str", val);
-      emit("update:configs", newConfigs);
-      selectedUA.value = null;
-    };
-
+  emits: ["update:model-value"],
+  data() {
     return {
-      selectedUA,
-      localConfigs,
+      selectedUA: null,
       userAgentOptions: userAgent,
-      updateConfigs,
-      handleUAChange,
+      commonHeaders: commonHeaders,
     };
   },
-});
+  computed: {
+    url: {
+      get() {
+        return this.modelValue.url || newVarInputVal("str", "");
+      },
+      set(value) {
+        this.updateField("url", value);
+      },
+    },
+    userAgent: {
+      get() {
+        return (
+          this.modelValue.headers?.["User-Agent"] || newVarInputVal("str", "")
+        );
+      },
+      set(value) {
+        this.updateHeaders("User-Agent", value);
+      },
+    },
+    timeout: {
+      get() {
+        return this.modelValue.timeout || 60000;
+      },
+      set(value) {
+        this.updateField("timeout", value);
+      },
+    },
+    otherHeaders: {
+      get() {
+        if (!this.modelValue.headers) return {};
+        const standardHeaders = ["User-Agent"];
+        return Object.entries(this.modelValue.headers)
+          .filter(([key]) => !standardHeaders.includes(key))
+          .reduce((acc, [key, value]) => {
+            acc[key] = value;
+            return acc;
+          }, {});
+      },
+      set(value) {
+        const userAgent = this.modelValue.headers?.["User-Agent"];
+        const newHeaders = {
+          ...(userAgent ? { "User-Agent": userAgent } : {}),
+          ...value,
+        };
+        this.updateField("headers", newHeaders);
+      },
+    },
+  },
+  methods: {
+    updateField(field, value) {
+      this.$emit("update:model-value", {
+        ...this.modelValue,
+        [field]: value,
+      });
+    },
+    updateHeaders(key, value) {
+      const headers = {
+        ...this.modelValue.headers,
+        [key]: value,
+      };
+      this.updateField("headers", headers);
+    },
+    handleUAChange(value) {
+      if (!value) return;
+      this.updateHeaders("User-Agent", newVarInputVal("str", value));
+      this.selectedUA = null;
+    },
+  },
+};
 </script>
+
+<style scoped>
+.ubrowser-basic {
+  width: 100%;
+}
+</style>
diff --git a/src/components/composer/ubrowser/UBrowserEditor.vue b/src/components/composer/ubrowser/UBrowserEditor.vue
index 416a2e06..c2e75444 100644
--- a/src/components/composer/ubrowser/UBrowserEditor.vue
+++ b/src/components/composer/ubrowser/UBrowserEditor.vue
@@ -1,52 +1,57 @@
 <template>
   <div class="ubrowser-editor">
-    <!-- 标签页导航 -->
     <q-tabs
-      v-model="step"
-      class="ubrowser-tabs"
+      v-model="tab"
       dense
+      class="text-grey"
+      active-color="primary"
+      indicator-color="primary"
       align="left"
       narrow-indicator
+      no-caps
       inline-label
-      active-class="ubrowser-tabs-active"
+      outside-arrows
+      mobile-arrows
     >
-      <q-tab name="1" icon="settings" label="基础参数" size="sm" />
-      <q-tab name="2" icon="touch_app" label="浏览器操作" size="sm" />
-      <q-tab name="3" icon="settings_applications" label="运行参数" size="sm" />
+      <q-tab name="1" label="基础配置" icon="link" class="q-px-sm" />
+      <q-tab name="2" label="操作配置" icon="touch_app" class="q-px-sm" />
+      <q-tab name="3" label="运行配置" icon="settings" class="q-px-sm" />
     </q-tabs>
 
-    <!-- 内容区域 -->
-    <q-tab-panels v-model="step" class="ubrowser-panels">
+    <q-separator />
+
+    <q-tab-panels v-model="tab" class="ubrowser-panels" animated>
       <q-tab-panel name="1" class="panel-content">
-        <UBrowserBasic :configs="configs" @update:configs="updateConfigs" />
+        <UBrowserBasic
+          v-model="argvs.goto"
+          @update:model-value="updateArgvs('goto', $event)"
+        />
       </q-tab-panel>
 
       <q-tab-panel name="2" class="panel-content">
         <UBrowserOperations
-          :configs="configs"
-          :selected-actions="selectedActions"
-          @update:configs="updateConfigs"
-          @update:selected-actions="(val) => (selectedActions = val)"
-          @remove-action="http://github.com/removeAction"
+          v-model="argvs.operations"
+          @update:model-value="updateArgvs('operations', $event)"
         />
       </q-tab-panel>
 
       <q-tab-panel name="3" class="panel-content">
-        <UBrowserRun :configs="configs" @update:configs="updateConfigs" />
+        <UBrowserRun
+          v-model="argvs.run"
+          @update:model-value="updateArgvs('run', $event)"
+        />
       </q-tab-panel>
     </q-tab-panels>
   </div>
 </template>
 
 <script>
-import { defineComponent, ref, computed } from "vue";
-import UBrowserBasic from "./UBrowserBasic.vue";
-import UBrowserOperations from "./UBrowserOperations.vue";
-import UBrowserRun from "./UBrowserRun.vue";
-import { defaultUBrowserConfigs } from "js/composer/ubrowserConfig";
+import UBrowserBasic from "components/composer/ubrowser/UBrowserBasic.vue";
+import UBrowserOperations from "components/composer/ubrowser/UBrowserOperations.vue";
+import UBrowserRun from "components/composer/ubrowser/UBrowserRun.vue";
 import { generateUBrowserCode } from "js/composer/generateUBrowserCode";
 
-export default defineComponent({
+export default {
   name: "UBrowserEditor",
   components: {
     UBrowserBasic,
@@ -59,76 +64,59 @@ export default defineComponent({
       required: true,
     },
   },
-  emits: ["update:modelValue"],
-  setup(props, { emit }) {
-    // 基础状态
-    const step = ref("1");
-    const selectedActions = ref([]);
-
-    // 初始化配置，确保包含 run 参数
-    const localConfigs = ref(window.lodashM.cloneDeep(defaultUBrowserConfigs));
-    if (props.modelValue?.argvs) {
-      // 合并配置，保留默认的 run 参数
-      localConfigs.value = {
-        ...localConfigs.value,
-        ...props.modelValue.argvs,
-        run: {
-          ...localConfigs.value.run,
-          ...props.modelValue.argvs.run,
-        },
-      };
-    }
-
-    const getSummary = (argvs) => {
-      return argvs.goto.url.value;
-    };
-
-    // 计算 argvs
-    const argvs = computed({
-      get: () => localConfigs.value,
-      set: (val) => {
-        // 确保保留 run 参数
-        const newConfigs = {
-          ...val,
-          run: {
-            ...localConfigs.value.run,
-            ...val.run,
-          },
-        };
-        localConfigs.value = newConfigs;
-        emit("update:modelValue", {
-          ...props.modelValue,
-          argvs: newConfigs,
-          summary: getSummary(newConfigs),
-          code: generateUBrowserCode(newConfigs, selectedActions.value),
-        });
-      },
-    });
-
-    // 更新配置
-    const updateConfigs = (newConfigs) => {
-      argvs.value = window.lodashM.cloneDeep(newConfigs);
-    };
-
-    // 移除操作
-    const removeAction = (action) => {
-      selectedActions.value = selectedActions.value.filter(
-        (a) => a.id !== action.id
-      );
-      const newConfigs = { ...argvs.value };
-      delete newConfigs[action.value];
-      argvs.value = newConfigs;
-    };
-
+  emits: ["update:model-value"],
+  data() {
     return {
-      step,
-      selectedActions,
-      configs: argvs,
-      updateConfigs,
-      removeAction,
+      tab: "1",
+      defaultArgvs: {
+        goto: [],
+        operations: [],
+        run: {},
+      },
     };
   },
-});
+  computed: {
+    configs() {
+      return this.modelValue;
+    },
+    argvs() {
+      return this.modelValue.argvs || this.defaultArgvs;
+    },
+    summary() {
+      const goto = this.argvs.goto?.url || "";
+      return `访问 ${goto}`;
+    },
+  },
+  mounted() {
+    this.initializeConfigs();
+  },
+  methods: {
+    initializeConfigs() {
+      if (!this.modelValue.argvs) {
+        this.updateModelValue(this.defaultArgvs);
+      }
+    },
+    generateCode() {
+      return generateUBrowserCode(this.argvs);
+    },
+    updateArgvs(key, value) {
+      const newArgvs = { ...this.argvs };
+      newArgvs[key] = value;
+      this.updateModelValue(newArgvs);
+    },
+    updateModelValue(argvs) {
+      this.$emit("update:model-value", {
+        ...this.modelValue,
+        argvs,
+        summary: this.summary,
+        code: this.generateCode(),
+      });
+    },
+    parseCodeToArgvs(code) {
+      // TODO: 实现代码解析逻辑
+    },
+  },
+};
 </script>
 
 <style>
@@ -137,42 +125,67 @@ export default defineComponent({
   flex-direction: column;
   height: 100%;
   width: 100%;
+  background-color: var(--q-card-background);
 }
 
-.ubrowser-tabs-active {
-  color: var(--q-primary);
-}
-
-.ubrowser-tabs {
-  flex-shrink: 0;
+.ubrowser-panels {
+  flex: 1;
+  overflow: hidden;
+  background-color: transparent;
+  display: flex;
+  flex-direction: column;
 }
 
-.ubrowser-panels {
+.ubrowser-panels :deep(.q-tab-panel) {
+  padding: 0;
   flex: 1;
   overflow: auto;
 }
 
 .panel-content {
-  padding: 8px;
-  min-height: 200px;
+  padding: 12px;
+  height: 100%;
+  overflow: auto;
 }
 
-.ubrowser-panels :deep(.q-tab-panel) {
-  padding: 0;
+.ubrowser-editor :deep(.q-tabs) {
+  min-height: 36px;
+  padding: 0 8px;
+  background-color: var(--q-card-background);
 }
 
-.ubrowser-tabs :deep(.q-tab) {
-  min-height: 40px;
-  padding: 0 16px;
+.ubrowser-editor :deep(.q-tab) {
+  min-height: 36px;
+  padding: 0 12px;
+  font-size: 13px;
+  font-weight: 500;
+  text-transform: none;
+  opacity: 0.7;
 }
 
-.ubrowser-tabs :deep(.q-tab__icon) {
-  font-size: 20px;
+.ubrowser-editor :deep(.q-tab--active) {
+  opacity: 1;
 }
 
-.ubrowser-tabs :deep(.q-tab__label) {
-  font-size: 14px;
+.ubrowser-editor :deep(.q-tab__icon) {
+  font-size: 16px;
+  margin-right: 4px;
+}
+
+.ubrowser-editor :deep(.q-tab__label) {
   line-height: 1.2;
-  margin-left: 8px;
+}
+
+.ubrowser-editor :deep(.q-tab__indicator) {
+  height: 2px;
+}
+
+/* 暗色模式适配 */
+.body--dark .ubrowser-editor {
+  background-color: var(--q-dark);
+}
+
+.body--dark .ubrowser-editor :deep(.q-tabs) {
+  background-color: var(--q-dark);
 }
 </style>
diff --git a/src/components/composer/ubrowser/UBrowserOperations.vue b/src/components/composer/ubrowser/UBrowserOperations.vue
index 082af2d9..37af6a4b 100644
--- a/src/components/composer/ubrowser/UBrowserOperations.vue
+++ b/src/components/composer/ubrowser/UBrowserOperations.vue
@@ -1,179 +1,174 @@
 <template>
-  <div class="row q-col-gutter-sm">
-    <div class="col-12">
-      <!-- 操作选择网格 -->
-      <div class="row q-col-gutter-xs">
-        <div
-          v-for="action in ubrowserOperationConfigs"
-          :key="action.value"
-          class="col-2"
-        >
-          <q-card
-            flat
-            bordered
-            class="action-card cursor-pointer"
-            :class="{
-              'action-selected': selectedActions.some(
-                (a) => a.value === action.value
-              ),
-            }"
-            @click="toggleAction(action)"
+  <div class="ubrowser-operations">
+    <div class="row q-col-gutter-sm">
+      <div class="col-12">
+        <!-- 操作选择网格 -->
+        <div class="row q-col-gutter-xs">
+          <div
+            v-for="[actionKey, action] in Object.entries(operationsMap)"
+            :key="actionKey"
+            class="col-2"
           >
-            <div class="q-pa-xs text-caption text-wrap text-center">
-              {{ action.label }}
-            </div>
-          </q-card>
+            <q-card
+              flat
+              bordered
+              class="action-card cursor-pointer"
+              :class="{
+                'action-selected': selectedActionKeys.includes(actionKey),
+              }"
+              @click="toggleAction(actionKey)"
+            >
+              <div class="q-pa-xs text-caption text-wrap text-center">
+                {{ action.label }}
+              </div>
+            </q-card>
+          </div>
         </div>
       </div>
+    </div>
 
-      <!-- 已选操作列表 -->
-      <q-list separator class="operation-list q-mt-md">
-        <div
-          v-for="(action, index) in selectedActions"
-          :key="action.id"
-          class="operation-item"
-        >
-          <div class="row items-center justify-between">
-            <q-chip
-              square
-              removable
-              @remove="$emit('remove-action', action)"
-              class="text-caption q-mx-none q-mb-sm"
-            >
-              <q-avatar color="primary">
-                <q-icon
-                  color="white"
-                  :name="getActionProps(action, 'icon') || 'touch_app'"
-                  size="14px"
-                />
-              </q-avatar>
-              <div class="q-mx-sm">{{ action.label }}</div>
-            </q-chip>
-            <div class="row items-start q-gutter-xs">
-              <q-btn
-                round
-                dense
-                color="primary"
-                icon="north"
-                v-show="index !== 0"
-                @click="moveAction(index, -1)"
-                size="xs"
-                class="q-mb-xs move-btn"
-              />
-              <q-btn
-                round
-                dense
-                color="primary"
-                icon="south"
-                v-show="index !== selectedActions.length - 1"
-                @click="moveAction(index, 1)"
-                size="xs"
-                class="move-btn"
+    <!-- 已选操作列表 -->
+    <q-list separator class="operation-list q-mt-md">
+      <div
+        v-for="(selectedActionKey, index) in selectedActionKeys"
+        :key="selectedActionKey"
+        class="operation-item"
+      >
+        <div class="row items-center justify-between">
+          <q-chip
+            square
+            removable
+            @remove="toggleAction(selectedActionKey)"
+            class="text-caption q-mb-sm"
+            :style="{
+              paddingLeft: '7px',
+            }"
+          >
+            <q-avatar color="primary">
+              <q-icon
+                color="white"
+                :name="operationsMap[selectedActionKey].icon || 'touch_app'"
+                size="14px"
               />
+            </q-avatar>
+            <div class="q-mx-sm">
+              {{ operationsMap[selectedActionKey].label }}
             </div>
-          </div>
-          <div v-if="getActionProps(action, 'config')">
-            <UBrowserOperation
-              :configs="configs"
-              :action="http://github.com/action.value"
-              :fields="getActionProps(action, 'config')"
-              @update:configs="$emit('update:configs', $event)"
+          </q-chip>
+          <div class="row items-start q-gutter-xs">
+            <q-btn
+              round
+              dense
+              color="primary"
+              icon="north"
+              v-show="index !== 0"
+              @click="moveAction(index, -1)"
+              size="xs"
+              class="q-mb-xs move-btn"
+            />
+            <q-btn
+              round
+              dense
+              color="primary"
+              icon="south"
+              v-show="index !== selectedActionKeys.length - 1"
+              @click="moveAction(index, 1)"
+              size="xs"
+              class="move-btn"
             />
           </div>
         </div>
-      </q-list>
-    </div>
+        <div
+          v-if="operationsMap[selectedActionKey].config"
+          class="operation-config"
+        >
+          <ParamInput
+            :configs="operationsMap[selectedActionKey].config"
+            :values="selectedActionArgs[index]"
+            @update="
+              (argvIndex, argvVal) =>
+                updateActionArgs(argvIndex, argvVal, index)
+            "
+          />
+        </div>
+      </div>
+    </q-list>
   </div>
 </template>
 
 <script>
-import { defineComponent } from "vue";
-import { ubrowserOperationConfigs } from "js/composer/composerConfig";
-import UBrowserOperation from "./operations/UBrowserOperation.vue";
+import { ubrowserOperationConfigs } from "js/composer/ubrowserConfig";
+import ParamInput from "components/composer/param/ParamInput.vue";
 
-export default defineComponent({
+export default {
   name: "UBrowserOperations",
   components: {
-    UBrowserOperation,
+    ParamInput,
   },
   props: {
-    configs: {
-      type: Object,
-      required: true,
-    },
-    selectedActions: {
+    modelValue: {
       type: Array,
       required: true,
+      default: () => [],
     },
   },
-  emits: ["remove-action", "update:selectedActions", "update:configs"],
-  setup() {
+  emits: ["update:model-value"],
+  data() {
     return {
-      ubrowserOperationConfigs,
+      operationsMap: ubrowserOperationConfigs,
     };
   },
+  computed: {
+    selectedActionKeys() {
+      return this.modelValue.map((x) => x.key || x.value);
+    },
+    selectedActionArgs() {
+      return this.modelValue.map((x) => x.args);
+    },
+  },
   methods: {
     moveAction(index, direction) {
       const newIndex = index + direction;
-      if (newIndex >= 0 && newIndex < this.selectedActions.length) {
-        const actions = [...this.selectedActions];
-        [actions[index], actions[newIndex]] = [
-          actions[newIndex],
-          actions[index],
+      if (newIndex >= 0 && newIndex < this.selectedActionKeys.length) {
+        const newOperation = [...this.modelValue];
+        [newOperation[index], newOperation[newIndex]] = [
+          newOperation[newIndex],
+          newOperation[index],
         ];
-        this.$emit("update:selectedActions", actions);
+        this.$emit("update:model-value", newOperation);
       }
     },
-    toggleAction(action) {
-      const index = this.selectedActions.findIndex(
-        (a) => a.value === action.value
-      );
-
-      if (index === -1) {
+    toggleAction(actionKey) {
+      const index = this.selectedActionKeys.indexOf(actionKey);
+      let newOperation = [...this.modelValue];
+      if (index !== -1) {
+        // 移除操作
+        newOperation.splice(index, 1);
+      } else {
         // 添加操作
-        const newAction = {
-          ...action,
-          id: this.$root.getUniqueId(),
-          argv: "",
-          saveOutput: false,
-          cmd: action.value || action.cmd,
-          value: action.value || action.cmd,
-        };
-
-        this.$emit("update:selectedActions", [
-          ...this.selectedActions,
-          newAction,
-        ]);
-
-        // 初始化配置对象
-        const { config } = action;
-        if (config) {
-          const newConfigs = { ...this.configs };
-          if (!newConfigs[action.value]) {
-            newConfigs[action.value] = {};
-            // 设置默认值
-            config.forEach((field) => {
-              if (field.defaultValue !== undefined) {
-                newConfigs[action.value][field.key] = field.defaultValue;
-              }
-            });
-            this.$emit("update:configs", newConfigs);
-          }
+        const { config, value } = this.operationsMap[actionKey];
+        const args = config?.length
+          ? config.map((field) => field.defaultValue)
+          : [];
+
+        const newOperationItem = { value, args };
+        if (actionKey !== value) {
+          newOperationItem.key = actionKey;
         }
-      } else {
-        // 移除操作
-        const newActions = [...this.selectedActions];
-        newActions.splice(index, 1);
-        this.$emit("update:selectedActions", newActions);
+
+        newOperation.push(newOperationItem);
       }
+      this.$emit("update:model-value", newOperation);
     },
-    getActionProps(action, key) {
-      return this.ubrowserOperationConfigs.find(
-        (a) => a.value === action.value
-      )?.[key];
+    updateActionArgs(argvIndex, argvVal, actionIndex) {
+      const newOperation = [...this.modelValue];
+      const newArgs = [...newOperation[actionIndex].args];
+      newArgs[argvIndex] = argvVal;
+      newOperation[actionIndex].args = newArgs;
+      this.$emit("update:model-value", newOperation);
     },
   },
-});
+};
 </script>
 
 <style scoped>
@@ -196,14 +191,10 @@ export default defineComponent({
   padding: 2px 4px;
   border-color: rgba(0, 0, 0, 0.15);
 }
-/*
-.operation-item:hover {
-  background: rgba(0, 0, 0, 0.05);
-}
 
-.body--dark .operation-item:hover {
-  background: rgba(0, 0, 0, 0.25);
-} */
+.operation-config {
+  width: 100%;
+}
 
 .move-btn {
   opacity: 0.6;
@@ -214,32 +205,9 @@ export default defineComponent({
   opacity: 1;
 }
 
-.delete-btn {
-  opacity: 0.6;
-  transition: opacity 0.3s;
-}
-
-.operation-item:hover .delete-btn {
-  opacity: 1;
-}
-
-.text-subtitle2 {
-  font-size: 0.9rem;
-  font-weight: 500;
-}
-
-.q-item-section {
-  transition: all 0.3s;
-}
-
-.operation-item:hover .q-item-section {
-  opacity: 1;
-}
-
 .action-card {
   transition: all 0.3s ease;
   border: 1px solid rgba(0, 0, 0, 0.05);
-  /* min-height: 42px; */
 }
 
 .action-card:hover {
diff --git a/src/components/composer/ubrowser/UBrowserRun.vue b/src/components/composer/ubrowser/UBrowserRun.vue
index 9c445ff0..75146815 100644
--- a/src/components/composer/ubrowser/UBrowserRun.vue
+++ b/src/components/composer/ubrowser/UBrowserRun.vue
@@ -1,193 +1,152 @@
 <template>
-  <div class="row q-col-gutter-sm">
-    <!-- 窗口显示控制 -->
-    <div class="col-12">
-      <div class="row items-center q-gutter-x-md">
-        <q-checkbox
-          :model-value="localConfigs.run.show"
-          label="显示窗口"
-          @update:model-value="updateConfig('show', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.center"
-          label="居中显示"
-          @update:model-value="updateConfig('center', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.alwaysOnTop"
-          label="总在最前"
-          @update:model-value="updateConfig('alwaysOnTop', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.fullscreen"
-          label="全屏显示"
-          @update:model-value="updateConfig('fullscreen', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.fullscreenable"
-          label="允许全屏"
-          @update:model-value="updateConfig('fullscreenable', $event)"
-        />
+  <div class="ubrowser-run">
+    <div class="row q-col-gutter-sm">
+      <!-- 窗口显示控制 -->
+      <div class="col-12">
+        <div class="row items-center q-gutter-x-md">
+          <q-checkbox v-model="fields.show" label="显示窗口" />
+          <q-checkbox v-model="fields.center" label="居中显示" />
+          <q-checkbox v-model="fields.alwaysOnTop" label="总在最前" />
+          <q-checkbox v-model="fields.fullscreen" label="全屏显示" />
+          <q-checkbox v-model="fields.fullscreenable" label="允许全屏" />
+        </div>
       </div>
-    </div>
 
-    <!-- 窗口尺寸和位置 -->
-    <div class="col-12">
-      <div class="row q-col-gutter-sm">
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.width"
-            label="窗口宽度"
-            @update:model-value="updateConfig('width', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.height"
-            label="窗口高度"
-            @update:model-value="updateConfig('height', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.x"
-            label="X坐标"
-            @update:model-value="updateConfig('x', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.y"
-            label="Y坐标"
-            @update:model-value="updateConfig('y', $event)"
-          />
+      <!-- 窗口尺寸和位置 -->
+      <div class="col-12">
+        <div class="row q-col-gutter-sm">
+          <div class="col-3">
+            <NumberInput v-model="fields.width" label="窗口宽度" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.height" label="窗口高度" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.x" label="X坐标" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.y" label="Y坐标" />
+          </div>
         </div>
       </div>
-    </div>
 
-    <!-- 最大最小尺寸 -->
-    <div class="col-12">
-      <div class="row q-col-gutter-sm">
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.minWidth"
-            label="最小宽度"
-            @update:model-value="updateConfig('minWidth', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.minHeight"
-            label="最小高度"
-            @update:model-value="updateConfig('minHeight', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.maxWidth"
-            label="最大宽度"
-            @update:model-value="updateConfig('maxWidth', $event)"
-          />
-        </div>
-        <div class="col-3">
-          <NumberInput
-            v-model="localConfigs.run.maxHeight"
-            label="最大高度"
-            @update:model-value="updateConfig('maxHeight', $event)"
-          />
+      <!-- 最大最小尺寸 -->
+      <div class="col-12">
+        <div class="row q-col-gutter-sm">
+          <div class="col-3">
+            <NumberInput v-model="fields.minWidth" label="最小宽度" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.minHeight" label="最小高度" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.maxWidth" label="最大宽度" />
+          </div>
+          <div class="col-3">
+            <NumberInput v-model="fields.maxHeight" label="最大高度" />
+          </div>
         </div>
       </div>
-    </div>
 
-    <!-- 窗口行为控制 -->
-    <div class="col-12">
-      <div class="row items-center q-gutter-x-md">
-        <q-checkbox
-          :model-value="localConfigs.run.resizable"
-          label="可调整大小"
-          @update:model-value="updateConfig('resizable', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.movable"
-          label="可移动"
-          @update:model-value="updateConfig('movable', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.minimizable"
-          label="可最小化"
-          @update:model-value="updateConfig('minimizable', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.maximizable"
-          label="可最大化"
-          @update:model-value="updateConfig('maximizable', $event)"
-        />
-        <q-checkbox
-          :model-value="localConfigs.run.enableLargerThanScreen"
-          label="允许超出屏幕"
-          @update:model-value="updateConfig('enableLargerThanScreen', $event)"
-        />
+      <!-- 窗口行为控制 -->
+      <div class="col-12">
+        <div class="row items-center q-gutter-x-md">
+          <q-checkbox v-model="fields.resizable" label="可调整大小" />
+          <q-checkbox v-model="fields.movable" label="可移动" />
+          <q-checkbox v-model="fields.minimizable" label="可最小化" />
+          <q-checkbox v-model="fields.maximizable" label="可最大化" />
+          <q-checkbox
+            v-model="fields.enableLargerThanScreen"
+            label="允许超出屏幕"
+          />
+        </div>
       </div>
-    </div>
 
-    <!-- 透明度控制 -->
-    <div class="col-12">
-      <div class="row items-center q-px-sm" style="height: 36px">
-        <div class="q-mr-md" style="font-size: 12px">透明度</div>
-        <q-slider
-          class="col"
-          v-model="localConfigs.run.opacity"
-          :min="0"
-          :max="1"
-          :step="0.1"
-          label
-          color="primary"
-          dense
-          @update:model-value="updateConfig('opacity', $event)"
-        >
-          <template v-slot:thumb-label>
-            {{ localConfigs.run.opacity.toFixed(1) }}
-          </template>
-        </q-slider>
+      <!-- 透明度控制 -->
+      <div class="col-12">
+        <div class="row items-center q-px-sm" style="height: 36px">
+          <div class="q-mr-md" style="font-size: 12px">透明度</div>
+          <q-slider
+            v-model="fields.opacity"
+            class="col"
+            :min="0"
+            :max="1"
+            :step="0.1"
+            label
+            color="primary"
+            dense
+          >
+            <template v-slot:thumb-label>
+              {{ fields.opacity.toFixed(1) }}
+            </template>
+          </q-slider>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { defineComponent, ref, computed } from "vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 
-export default defineComponent({
+const defaultValues = {
+  show: true,
+  center: false,
+  alwaysOnTop: false,
+  fullscreen: false,
+  fullscreenable: true,
+  width: 800,
+  height: 600,
+  x: undefined,
+  y: undefined,
+  minWidth: 0,
+  minHeight: 0,
+  maxWidth: undefined,
+  maxHeight: undefined,
+  resizable: true,
+  movable: true,
+  minimizable: true,
+  maximizable: true,
+  enableLargerThanScreen: false,
+  opacity: 1,
+};
+
+export default {
   name: "UBrowserRun",
   components: {
     NumberInput,
   },
   props: {
-    configs: {
+    modelValue: {
       type: Object,
       required: true,
     },
   },
-  emits: ["update:configs"],
-  setup(props, { emit }) {
-    const localConfigs = ref(window.lodashM.cloneDeep(props.configs));
-
-    // 监听 configs 变化
-    const watchConfigs = computed(() => props.configs);
-    watchConfigs.value &&
-      (localConfigs.value = window.lodashM.cloneDeep(props.configs));
-
-    // 更新配置
-    const updateConfig = (key, value) => {
-      localConfigs.value.run[key] = value;
-      emit("update:configs", window.lodashM.cloneDeep(localConfigs.value));
-    };
-
-    return {
-      localConfigs,
-      updateConfig,
-    };
+  emits: ["update:model-value"],
+  computed: {
+    fields() {
+      return Object.keys(defaultValues).reduce((acc, field) => {
+        Object.defineProperty(acc, field, {
+          get: () => this.modelValue[field] ?? defaultValues[field],
+          set: (value) => this.updateField(field, value),
+        });
+        return acc;
+      }, {});
+    },
   },
-});
+  methods: {
+    updateField(field, value) {
+      this.$emit("update:model-value", {
+        ...this.modelValue,
+        [field]: value,
+      });
+    },
+  },
+};
 </script>
+
+<style scoped>
+.ubrowser-run {
+  width: 100%;
+}
+</style>
diff --git a/src/components/composer/ubrowser/operations/UBrowserCookieList.vue b/src/components/composer/ubrowser/operations/UBrowserCookieList.vue
deleted file mode 100644
index d2208648..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserCookieList.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div>
-    <div class="row q-col-gutter-sm">
-      <div
-        v-for="(cookie, index) in modelValue || [{}]"
-        :key="index"
-        class="col-12"
-      >
-        <div class="row items-center q-gutter-x-sm">
-          <div class="col">
-            <VariableInput
-              :model-value="cookie.name"
-              label="名称"
-              icon="label"
-              @update:model-value="
-                (value) => handleUpdate(index, 'name', value)
-              "
-            />
-          </div>
-          <div class="col">
-            <VariableInput
-              :model-value="cookie.value"
-              label="值"
-              icon="edit"
-              @update:model-value="
-                (value) => handleUpdate(index, 'value', value)
-              "
-            />
-          </div>
-          <div class="col-auto">
-            <q-btn
-              flat
-              round
-              dense
-              color="negative"
-              icon="remove"
-              @click="removeCookie(index)"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-    <q-btn
-      flat
-      dense
-      color="primary"
-      icon="add"
-      label="添加Cookie"
-      @click="addCookie"
-      class="q-mt-xs"
-    />
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import { newVarInputVal } from "js/composer/varInputValManager";
-export default defineComponent({
-  name: "UBrowserCookieList",
-  components: {
-    VariableInput,
-  },
-  props: {
-    modelValue: {
-      type: Array,
-      default: () => [
-        {
-          name: newVarInputVal("str"),
-          value: newVarInputVal("str"),
-        },
-      ],
-    },
-  },
-  emits: ["update:modelValue"],
-  methods: {
-    addCookie() {
-      const newValue = [
-        ...this.modelValue,
-        {
-          name: newVarInputVal("str"),
-          value: newVarInputVal("str"),
-        },
-      ];
-      this.$emit("update:modelValue", newValue);
-    },
-    removeCookie(index) {
-      const newValue = [...this.modelValue];
-      newValue.splice(index, 1);
-      if (newValue.length === 0) {
-        newValue.push({
-          name: newVarInputVal("str"),
-          value: newVarInputVal("str"),
-        });
-      }
-      this.$emit("update:modelValue", newValue);
-    },
-    handleUpdate(index, field, value) {
-      const newValue = [...this.modelValue];
-      newValue[index] = { ...newValue[index], [field]: value };
-      this.$emit("update:modelValue", newValue);
-    },
-  },
-});
-</script>
diff --git a/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue b/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
deleted file mode 100644
index 4c45a436..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserDeviceName.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div class="row q-col-gutter-sm">
-    <div class="col">
-      <VariableInput
-        icon="label"
-        :model-value="modelValue"
-        :label="label"
-        @update:model-value="$emit('update:modelValue', $event)"
-      />
-    </div>
-    <div class="col-auto">
-      <q-select
-        v-model="selectedDevice"
-        :options="deviceOptions"
-        label="常用设备"
-        dense
-        filled
-        emit-value
-        map-options
-        options-dense
-        style="min-width: 150px"
-        @update:model-value="handleDeviceSelect"
-      >
-        <template v-slot:prepend>
-          <q-icon name="list" />
-        </template>
-      </q-select>
-    </div>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import { deviceName } from "js/options/httpOptions";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import { newVarInputVal } from "js/composer/varInputValManager";
-export default defineComponent({
-  name: "UBrowserDeviceName",
-  components: {
-    VariableInput,
-  },
-  props: {
-    modelValue: {
-      type: Object,
-      default: () => newVarInputVal("str"),
-    },
-    label: {
-      type: String,
-      required: true,
-    },
-    icon: {
-      type: String,
-      default: "",
-    },
-  },
-  emits: ["update:modelValue"],
-  data() {
-    return {
-      selectedDevice: null,
-      deviceOptions: deviceName,
-    };
-  },
-  methods: {
-    handleDeviceSelect(value) {
-      if (value) {
-        this.$emit("update:modelValue", value);
-        this.selectedDevice = null;
-      }
-    },
-  },
-});
-</script>
diff --git a/src/components/composer/ubrowser/operations/UBrowserFileList.vue b/src/components/composer/ubrowser/operations/UBrowserFileList.vue
deleted file mode 100644
index 12e20eac..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserFileList.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div>
-    <div class="row q-col-gutter-sm">
-      <div
-        v-for="(file, index) in modelValue || []"
-        :key="index"
-        class="col-12"
-      >
-        <div class="row q-col-gutter-sm">
-          <div class="col">
-            <VariableInput
-              :model-value="modelValue[index]"
-              label="文件路径"
-              :command="{ icon: 'folder' }"
-              @update:model-value="(value) => handleUpdate(index, value)"
-            />
-          </div>
-          <div class="col-auto">
-            <q-btn
-              flat
-              round
-              dense
-              color="negative"
-              icon="remove"
-              @click="removeFile(index)"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-    <q-btn
-      flat
-      dense
-      color="primary"
-      icon="add"
-      label="添加文件"
-      @click="addFile"
-      class="q-mt-xs"
-    />
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import { newVarInputVal } from "js/composer/varInputValManager";
-export default defineComponent({
-  name: "UBrowserFileList",
-  components: {
-    VariableInput,
-  },
-  props: {
-    modelValue: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  emits: ["update:modelValue"],
-  methods: {
-    addFile() {
-      const newValue = [
-        ...(this.modelValue || []),
-        newVarInputVal("str"),
-      ];
-      this.$emit("update:modelValue", newValue);
-    },
-    removeFile(index) {
-      const newValue = [...this.modelValue];
-      newValue.splice(index, 1);
-      this.$emit("update:modelValue", newValue);
-    },
-    handleUpdate(index, value) {
-      const newValue = [...this.modelValue];
-      newValue[index] = value;
-      this.$emit("update:modelValue", newValue);
-    },
-  },
-});
-</script>
diff --git a/src/components/composer/ubrowser/operations/UBrowserFunctionInput.vue b/src/components/composer/ubrowser/operations/UBrowserFunctionInput.vue
deleted file mode 100644
index 7e8d5af2..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserFunctionInput.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <div class="row q-col-gutter-sm ubrowser-function-input">
-    <div class="col-12">
-      <div class="row q-col-gutter-sm">
-        <div class="col-3">
-          <q-select
-            v-model="localParams"
-            use-input
-            use-chips
-            multiple
-            dense
-            borderless
-            hide-dropdown-icon
-            options-dense
-            input-debounce="0"
-            new-value-mode="add-unique"
-            label="参数"
-            @update:model-value="updateParams"
-            @input-value="handleInput"
-            @blur="handleBlur"
-            ref="paramSelect"
-          >
-            <template v-slot:prepend>
-              <div class="text-primary func-symbol">(</div>
-            </template>
-            <template v-slot:append>
-              <div class="text-primary func-symbol">)</div>
-            </template>
-          </q-select>
-        </div>
-        <div class="col-9">
-          <q-input
-            v-model="localFunction"
-            :label="label"
-            type="textarea"
-            dense
-            borderless
-            style="font-family: Consolas, Monaco, 'Courier New'"
-            autogrow
-            @update:model-value="updateFunction"
-          >
-            <template v-slot:prepend>
-              <div class="text-primary func-symbol">=> {</div>
-            </template>
-            <template v-slot:append>
-              <div class="text-primary func-symbol">}</div>
-            </template>
-          </q-input>
-        </div>
-      </div>
-    </div>
-    <template v-if="localParams.length">
-      <div v-for="param in localParams" :key="param" class="col-12">
-        <div class="row q-col-gutter-sm items-center">
-          <div class="col-3">
-            <q-chip
-              dense
-              color="primary"
-              text-color="white"
-              removable
-              @remove="removeParam(param)"
-            >
-              {{ param }}
-            </q-chip>
-          </div>
-          <div class="col-9">
-            <q-input
-              v-model="paramValues[param]"
-              :label="`传递给参数 ${param} 的值`"
-              dense
-              filled
-              @update:model-value="updateParamValue(param, $event)"
-            />
-          </div>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-
-export default defineComponent({
-  name: "UBrowserFunctionInput",
-  props: {
-    function: {
-      type: String,
-      default: "",
-    },
-    args: {
-      type: Array,
-      default: () => [],
-    },
-    label: {
-      type: String,
-      default: "函数内容",
-    },
-    icon: {
-      type: String,
-      default: "code",
-    },
-  },
-  emits: ["update:function", "update:args"],
-  data() {
-    return {
-      localFunction: "",
-      localParams: [],
-      paramValues: {},
-      newParamName: "",
-    };
-  },
-  created() {
-    // 初始化本地数据
-    this.localFunction = this.function;
-    this.localParams = this.args?.map((arg) => arg.name) || [];
-    this.paramValues = Object.fromEntries(
-      this.args?.map((arg) => [arg.name, arg.value]) || []
-    );
-  },
-  methods: {
-    updateFunction(value) {
-      this.localFunction = value;
-      this.emitUpdate();
-    },
-    updateParams(value) {
-      this.localParams = value;
-      this.emitUpdate();
-    },
-    removeParam(param) {
-      const index = this.localParams.indexOf(param);
-      if (index > -1) {
-        this.localParams.splice(index, 1);
-        delete this.paramValues[param];
-        this.emitUpdate();
-      }
-    },
-    updateParamValue(param, value) {
-      this.paramValues[param] = value;
-      this.emitUpdate();
-    },
-    emitUpdate() {
-      this.$emit("update:function", this.localFunction);
-      this.$emit(
-        "update:args",
-        this.localParams.map((name) => ({
-          name,
-          value: this.paramValues[name] || "",
-        }))
-      );
-    },
-    handleInput(val) {
-      if (!val) return;
-      this.newParamName = val;
-
-      if (val.includes(",") || val.includes(" ")) {
-        const params = val
-          .split(/[,\s]+/)
-          .map((p) => p.trim())
-          .filter((p) => p);
-        params.forEach((param) => {
-          if (param && !this.localParams.includes(param)) {
-            this.localParams = [...this.localParams, param];
-            this.paramValues[param] = "";
-          }
-        });
-        this.newParamName = "";
-        this.emitUpdate();
-        this.$refs.paramSelect.updateInputValue("");
-      }
-    },
-    handleBlur() {
-      if (this.newParamName && !this.localParams.includes(this.newParamName)) {
-        this.localParams = [...this.localParams, this.newParamName];
-        this.paramValues[this.newParamName] = "";
-        this.newParamName = "";
-        this.emitUpdate();
-        this.$refs.paramSelect.updateInputValue("");
-      }
-    },
-  },
-  watch: {
-    function: {
-      handler(newValue) {
-        this.localFunction = newValue;
-      },
-    },
-    args: {
-      deep: true,
-      handler(newValue) {
-        this.localParams = newValue?.map((arg) => arg.name) || [];
-        this.paramValues = Object.fromEntries(
-          newValue?.map((arg) => [arg.name, arg.value]) || []
-        );
-      },
-    },
-  },
-});
-</script>
-
-<style scoped>
-.ubrowser-function-input :deep(.q-field__control) .text-primary.func-symbol {
-  font-size: 24px !important;
-}
-
-.ubrowser-function-input :deep(.q-select__input) {
-  display: flex !important;
-  flex-wrap: nowrap !important;
-  overflow-x: auto !important;
-  scrollbar-width: none !important;
-  -ms-overflow-style: none !important;
-}
-
-.ubrowser-function-input :deep(.q-select .q-field__native) {
-  display: flex !important;
-  flex-wrap: nowrap !important;
-  overflow-x: auto !important;
-  scrollbar-width: none !important;
-  -ms-overflow-style: none !important;
-}
-
-.ubrowser-function-input :deep(.q-select .q-field__native > div) {
-  display: flex !important;
-  flex-wrap: nowrap !important;
-  flex: 0 0 auto !important;
-}
-
-.ubrowser-function-input :deep(.q-select .q-chip) {
-  flex: 0 0 auto !important;
-  margin-right: 4px !important;
-}
-
-.ubrowser-function-input :deep(.q-select__input::-webkit-scrollbar),
-.ubrowser-function-input :deep(.q-select .q-field__native::-webkit-scrollbar) {
-  display: none !important;
-}
-</style>
diff --git a/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue b/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
deleted file mode 100644
index f99a4efc..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserNamedParamList.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div>
-    <div class="text-caption q-mb-sm">{{ label }}</div>
-    <div
-      v-for="(param, index) in modelValue || []"
-      :key="index"
-      class="row q-col-gutter-sm q-mb-sm"
-    >
-      <div class="col-5">
-        <VariableInput
-          :model-value="param.name"
-          label="参数名"
-          icon="label"
-          @update:model-value="(value) => handleUpdate(index, 'name', value)"
-        />
-      </div>
-      <div class="col-5">
-        <VariableInput
-          :model-value="param.value"
-          label="传递给参数的值"
-          icon="edit"
-          @update:model-value="(value) => handleUpdate(index, 'value', value)"
-        />
-      </div>
-      <div class="col-2">
-        <q-btn
-          flat
-          round
-          dense
-          color="negative"
-          icon="remove"
-          @click="removeParam(index)"
-        />
-      </div>
-    </div>
-    <q-btn
-      flat
-      dense
-      color="primary"
-      icon="add"
-      label="添加参数"
-      @click="addParam"
-    />
-  </div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import { newVarInputVal } from "js/composer/varInputValManager";
-export default defineComponent({
-  name: "UBrowserNamedParamList",
-  components: {
-    VariableInput,
-  },
-  props: {
-    modelValue: {
-      type: Array,
-      default: () => [newVarInputVal("str"), newVarInputVal("str")],
-    },
-    label: String,
-  },
-  emits: ["update:modelValue"],
-  methods: {
-    addParam() {
-      const newValue = [
-        ...(this.modelValue || []),
-        {
-          name: newVarInputVal("str"),
-          value: newVarInputVal("str"),
-        },
-      ];
-      this.$emit("update:modelValue", newValue);
-    },
-    removeParam(index) {
-      const newValue = [...this.modelValue];
-      newValue.splice(index, 1);
-      this.$emit("update:modelValue", newValue);
-    },
-    handleUpdate(index, field, value) {
-      const newValue = [...this.modelValue];
-      newValue[index] = { ...newValue[index], [field]: value };
-      this.$emit("update:modelValue", newValue);
-    },
-  },
-});
-</script>
diff --git a/src/components/composer/ubrowser/operations/UBrowserOperation.vue b/src/components/composer/ubrowser/operations/UBrowserOperation.vue
deleted file mode 100644
index f3a191ac..00000000
--- a/src/components/composer/ubrowser/operations/UBrowserOperation.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-  <div class="row q-col-gutter-sm items-center">
-    <template v-for="field in fields" :key="field.key">
-      <div
-        v-if="!field.showWhen || fieldValue[field.showWhen] === field.showValue"
-        :class="['col', field.width ? `col-${field.width}` : 'col-12']"
-      >
-        <!-- 复选框组 -->
-        <template v-if="field.type === 'checkbox-group'">
-          <q-option-group
-            :model-value="
-              Array.isArray(fieldValue[field.key]) ? fieldValue[field.key] : []
-            "
-            :options="field.options"
-            type="checkbox"
-            class="row items-center"
-            inline
-            dense
-            @update:model-value="updateValue(field.key, $event)"
-          />
-        </template>
-
-        <!-- 是/否选择 -->
-        <template v-else-if="field.type === 'boolean-toggle'">
-          <div class="row items-center no-wrap">
-            <q-badge class="q-pa-xs">{{ field.label }}</q-badge>
-            <q-btn-toggle
-              :model-value="fieldValue[field.key] ? 'true' : 'false'"
-              :options="[
-                { label: '是', value: 'true' },
-                { label: '否', value: 'false' },
-              ]"
-              dense
-              flat
-              no-caps
-              spread
-              class="button-group"
-              @update:model-value="updateValue(field.key, $event === 'true')"
-            />
-          </div>
-        </template>
-
-        <!-- 基本输入类型的处理 -->
-        <template v-if="field.type === 'varInput'">
-          <!-- 设备名称特殊处理 -->
-          <template v-if="field.key === 'deviceName'">
-            <UBrowserDeviceName
-              v-model="fieldValue[field.key]"
-              :label="field.label"
-              :icon="field.icon"
-              @update:model-value="updateValue(field.key, $event)"
-            />
-          </template>
-          <!-- 普通输入框 -->
-          <template v-else>
-            <VariableInput
-              :model-value="fieldValue[field.key]"
-              :label="field.label"
-              :icon="field.icon"
-              @update:model-value="updateValue(field.key, $event)"
-            />
-          </template>
-        </template>
-
-        <!-- 数字输入框 -->
-        <template v-else-if="field.type === 'numInput'">
-          <NumberInput
-            v-model="fieldValue[field.key]"
-            :label="field.label"
-            :icon="field.icon"
-            @update:model-value="updateValue(field.key, $event)"
-          />
-        </template>
-
-        <!-- 选择框 -->
-        <template v-else-if="field.type === 'select'">
-          <q-select
-            :model-value="fieldValue[field.key]"
-            :label="field.label"
-            :options="field.options"
-            dense
-            filled
-            emit-value
-            map-options
-            @update:model-value="updateValue(field.key, $event)"
-          >
-            <template v-slot:prepend>
-              <q-icon :name="field.icon" />
-            </template>
-          </q-select>
-        </template>
-
-        <!-- Cookie列表 -->
-        <template v-else-if="field.type === 'cookie-list'">
-          <UBrowserCookieList
-            v-model="fieldValue[field.key]"
-            @update:model-value="updateValue(field.key, $event)"
-          />
-        </template>
-
-        <!-- 命名参数列表 -->
-        <template v-else-if="field.type === 'named-param-list'">
-          <UBrowserNamedParamList
-            v-model="fieldValue[field.key]"
-            :label="field.label"
-            @update:model-value="updateValue(field.key, $event)"
-          />
-        </template>
-
-        <!-- 文件列表 -->
-        <template v-else-if="field.type === 'file-list'">
-          <UBrowserFileList
-            v-model="fieldValue[field.key]"
-            @update:model-value="updateValue(field.key, $event)"
-          />
-        </template>
-
-        <!-- 按钮组 -->
-        <template v-else-if="field.type === 'button-toggle'">
-          <div class="row items-center no-wrap">
-            <q-badge class="q-pa-xs">{{ field.label }}</q-badge>
-            <q-btn-toggle
-              :model-value="fieldValue[field.key]"
-              :options="field.options"
-              dense
-              flat
-              no-caps
-              spread
-              class="button-group"
-              @update:model-value="updateValue(field.key, $event)"
-            />
-          </div>
-        </template>
-
-        <!-- 设备尺寸 -->
-        <template v-else-if="field.type === 'device-size'">
-          <div class="row q-col-gutter-sm">
-            <VariableInput
-              v-model.number="fieldValue.size[key]"
-              class="col-6"
-              v-for="key in ['width', 'height']"
-              :key="key"
-              label="宽度"
-              icon="width"
-              @update:model-value="
-                updateValue(field.key, {
-                  ...fieldValue.size,
-                  [key]: $event,
-                })
-              "
-            />
-          </div>
-        </template>
-
-        <!-- 带参数的函数输入 -->
-        <template v-else-if="field.type === 'function-with-params'">
-          <UBrowserFunctionInput
-            v-model:function="fieldValue.function"
-            v-model:args="fieldValue.args"
-            :label="field.label"
-            :icon="field.icon"
-            @update:function="(value) => updateValue('function', value)"
-            @update:args="(value) => updateValue('args', value)"
-          />
-        </template>
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-import { defineComponent, computed, ref, onMounted } from "vue";
-import { get, set } from "lodash";
-import UBrowserFunctionInput from "./UBrowserFunctionInput.vue";
-import UBrowserFileList from "./UBrowserFileList.vue";
-import UBrowserCookieList from "./UBrowserCookieList.vue";
-import UBrowserNamedParamList from "./UBrowserNamedParamList.vue";
-import UBrowserDeviceName from "./UBrowserDeviceName.vue";
-import VariableInput from "components/composer/common/VariableInput.vue";
-import NumberInput from "components/composer/common/NumberInput.vue";
-
-export default defineComponent({
-  name: "UBrowserOperation",
-  components: {
-    UBrowserFunctionInput,
-    UBrowserFileList,
-    UBrowserCookieList,
-    UBrowserNamedParamList,
-    UBrowserDeviceName,
-    VariableInput,
-    NumberInput,
-  },
-  props: {
-    configs: {
-      type: Object,
-      required: true,
-    },
-    action: {
-      type: String,
-      required: true,
-    },
-    fields: {
-      type: Array,
-      required: true,
-    },
-  },
-  emits: ["update:configs"],
-  setup(props, { emit }) {
-    const fieldValue = ref({});
-
-    // 初始化字段值
-    onMounted(() => {
-      props.fields.forEach((field) => {
-        const value = get(props.configs[props.action], field.key);
-        // 根据字段类型设置适当的默认值
-        if (field.type === "function-with-params") {
-          fieldValue.value.function = value?.function || "";
-          fieldValue.value.args = value?.args || [];
-          return;
-        }
-
-        const defaultValue =
-          field.type === "checkbox-group"
-            ? []
-            : field.type === "checkbox"
-            ? field.defaultValue || false
-            : field.defaultValue;
-
-        fieldValue.value[field.key] = Array.isArray(value)
-          ? value
-          : defaultValue;
-      });
-    });
-
-    // 更新值的方法
-    const updateValue = (key, value) => {
-      fieldValue.value[key] = value;
-
-      const newConfigs = { ...props.configs };
-      if (!newConfigs[props.action]) {
-        newConfigs[props.action] = {};
-      }
-
-      set(newConfigs[props.action], key, value);
-      emit("update:configs", newConfigs);
-    };
-
-    return {
-      fieldValue,
-      updateValue,
-    };
-  },
-});
-</script>
-
-<style scoped>
-.button-group {
-  flex: 1;
-  padding: 0 10px;
-}
-
-.button-group :deep(.q-btn) {
-  min-height: 24px;
-  font-size: 12px;
-}
-</style>
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index ba709afb..d4ed53ef 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -375,7 +375,8 @@ export const browserCommands = {
           placeholder: "输入JavaScript代码，使用return返回结果",
         },
         {
-          topLabel: "要传递的参数",
+          label: "要传递的参数",
+          isCollapse: false,
           component: "DictEditor",
           icon: "data_array",
           width: 12,
diff --git a/src/js/composer/generateUBrowserCode.js b/src/js/composer/generateUBrowserCode.js
index 26a509fb..2e7f5f6c 100644
--- a/src/js/composer/generateUBrowserCode.js
+++ b/src/js/composer/generateUBrowserCode.js
@@ -1,361 +1,102 @@
 /**
  * 生成 UBrowser 代码
- * @param {Object} configs UBrowser 配置对象
- * @param {Array} selectedActions 已选择的操作列表
+ * @param {Object} argvs UBrowser 配置对象
  * @returns {string} 生成的代码
  */
+import { stringifyVarInputVal } from "./varInputValManager";
 import { stringifyArgv } from "./formatString";
 
-// 生成 goto 参数字符串
-function generateGotoArgs(goto) {
-  const args = [];
+// ubrowser 默认运行配置
+const defaultRunConfigs = {
+  show: true,
+  width: 800,
+  height: 600,
+  center: true,
+  minWidth: 0,
+  minHeight: 0,
+  resizable: true,
+  movable: true,
+  minimizable: true,
+  maximizable: true,
+  alwaysOnTop: false,
+  fullscreen: false,
+  fullscreenable: true,
+  enableLargerThanScreen: false,
+  opacity: 1,
+};
 
-  // URL
-  const urlStr = stringifyArgv(goto.url);
-  args.push(urlStr);
-
-  // Headers
-  if (goto.headers?.Referer?.value || goto.headers?.userAgent?.value) {
-    const headers = {};
-    if (goto.headers.Referer?.value) {
-      headers.Referer = goto.headers.Referer;
-    }
-    if (goto.headers.userAgent?.value) {
-      headers.userAgent = goto.headers.userAgent;
+// 生成完整的 ubrowser 代码
+export function generateUBrowserCode(argvs) {
+  const lines = ["utools.ubrowser"];
+
+  // 首先添加 goto 操作
+  if (argvs.goto) {
+    const args = [];
+    // url
+    if (argvs.goto.url) {
+      args.push(stringifyVarInputVal(argvs.goto.url));
     }
-    console.log("Headers:", JSON.stringify(headers, null, 2));
-    args.push(stringifyArgv(headers, true));
-  }
-
-  // Timeout
-  if (goto.timeout !== 60000) {
-    args.push(goto.timeout);
-  }
-
-  return args.join(", ");
-}
-
-// 生成 run 参数字符串
-function generateRunArgs(run) {
-  const options = {};
-  const defaultValues = {
-    show: true,
-    center: true,
-    alwaysOnTop: false,
-    fullscreen: false,
-    fullscreenable: true,
-    resizable: true,
-    movable: true,
-    minimizable: true,
-    maximizable: true,
-    enableLargerThanScreen: false,
-    opacity: 1,
-  };
-
-  // 窗口显示控制
-  if (run.show !== undefined && run.show !== defaultValues.show)
-    options.show = run.show;
-  if (run.center !== undefined && run.center !== defaultValues.center)
-    options.center = run.center;
-  if (
-    run.alwaysOnTop !== undefined &&
-    run.alwaysOnTop !== defaultValues.alwaysOnTop
-  )
-    options.alwaysOnTop = run.alwaysOnTop;
-  if (
-    run.fullscreen !== undefined &&
-    run.fullscreen !== defaultValues.fullscreen
-  )
-    options.fullscreen = run.fullscreen;
-  if (
-    run.fullscreenable !== undefined &&
-    run.fullscreenable !== defaultValues.fullscreenable
-  )
-    options.fullscreenable = run.fullscreenable;
-
-  // 窗口尺寸和位置 - 只有设置了值才添加
-  if (run.width !== undefined && run.width > 0) options.width = run.width;
-  if (run.height !== undefined && run.height > 0) options.height = run.height;
-  if (run.x !== undefined && run.x !== 0) options.x = run.x;
-  if (run.y !== undefined && run.y !== 0) options.y = run.y;
-
-  // 最大最小尺寸 - 只有设置了值才添加
-  if (run.minWidth !== undefined && run.minWidth > 0)
-    options.minWidth = run.minWidth;
-  if (run.minHeight !== undefined && run.minHeight > 0)
-    options.minHeight = run.minHeight;
-  if (run.maxWidth !== undefined && run.maxWidth > 0)
-    options.maxWidth = run.maxWidth;
-  if (run.maxHeight !== undefined && run.maxHeight > 0)
-    options.maxHeight = run.maxHeight;
-
-  // 窗口行为控制
-  if (run.resizable !== undefined && run.resizable !== defaultValues.resizable)
-    options.resizable = run.resizable;
-  if (run.movable !== undefined && run.movable !== defaultValues.movable)
-    options.movable = run.movable;
-  if (
-    run.minimizable !== undefined &&
-    run.minimizable !== defaultValues.minimizable
-  )
-    options.minimizable = run.minimizable;
-  if (
-    run.maximizable !== undefined &&
-    run.maximizable !== defaultValues.maximizable
-  )
-    options.maximizable = run.maximizable;
-  if (
-    run.enableLargerThanScreen !== undefined &&
-    run.enableLargerThanScreen !== defaultValues.enableLargerThanScreen
-  )
-    options.enableLargerThanScreen = run.enableLargerThanScreen;
-
-  // 透明度 - 只有不是1时才添加
-  if (run.opacity !== undefined && run.opacity !== defaultValues.opacity)
-    options.opacity = run.opacity;
-
-  // 其他参数 - 只有设置了值才添加
-  if (run.headless) options.headless = run.headless;
-  if (run.devtools) options.devtools = run.devtools;
-  if (run.timeout && run.timeout !== 60000) options.timeout = run.timeout;
-  if (run.proxy) options.proxy = run.proxy;
-  if (run.viewport) options.viewport = run.viewport;
 
-  return Object.keys(options).length ? stringifyArgv(options) : "";
-}
-
-// 生成操作参数字符串
-function generateActionArgs(action, config) {
-  console.log(
-    "Generating args for action:",
-    action,
-    "config:",
-    JSON.stringify(config, null, 2)
-  );
-  if (!config) return "";
-
-  let result;
-  switch (action) {
-    case "wait":
-      result = generateWaitArgs(config);
-      break;
-    case "click":
-    case "mousedown":
-    case "mouseup":
-    case "focus":
-      result = stringifyArgv(config.selector);
-      break;
-    case "css":
-    case "paste":
-      result = stringifyArgv(config.value);
-      break;
-    case "press":
-      result = generatePressArgs(config);
-      break;
-    case "screenshot":
-      result = generateScreenshotArgs(config);
-      break;
-    case "pdf":
-      result = generatePdfArgs(config);
-      break;
-    case "device":
-      result = generateDeviceArgs(config);
-      break;
-    case "cookies":
-    case "removeCookies":
-      result = stringifyArgv(config.name);
-      break;
-    case "setCookies":
-      result = generateSetCookiesArgs(config);
-      break;
-    case "evaluate":
-      result = generateEvaluateArgs(config);
-      break;
-    case "when":
-      result = generateWhenArgs(config);
-      break;
-    case "file":
-      result = generateFileArgs(config);
-      break;
-    case "value":
-      result = generateValueArgs(config);
-      break;
-    case "check":
-      result = generateCheckArgs(config);
-      break;
-    case "scroll":
-      result = generateScrollArgs(config);
-      break;
-    case "download":
-      result = generateDownloadArgs(config);
-      break;
-    case "devTools":
-      result = stringifyArgv(config.mode);
-      break;
-    default:
-      result = "";
-  }
-  console.log(
-    "Generated args for action:",
-    action,
-    "result:",
-    JSON.stringify(result)
-  );
-  return result;
-}
-
-// 生成 wait 参数字符串
-function generateWaitArgs(config) {
-  switch (config.type) {
-    case "selector":
-      return stringifyArgv(config.selector);
-    case "function":
-      return config.function;
-    case "time":
-      return config.time;
-    default:
-      return "";
-  }
-}
-
-// 生成 press 参数字符串
-function generatePressArgs(config) {
-  const args = [stringifyArgv(config.key)];
-  if (config.modifiers?.length) {
-    args.push(JSON.stringify(config.modifiers));
-  }
-  return args.join(", ");
-}
+    // headers
+    const headers = {};
+    // 处理标准headers
+    Object.entries(argvs.goto.headers || {}).forEach(([key, value]) => {
+      if (value?.value) {
+        headers[key] = value.value;
+      }
+    });
+    // 处理其他headers
+    Object.entries(argvs.goto.otherHeaders || {}).forEach(([key, value]) => {
+      if (value?.value) {
+        headers[key] = value.value;
+      }
+    });
 
-// 生成 screenshot 参数字符串
-function generateScreenshotArgs(config) {
-  const args = [];
-  if (config.rect) {
-    args.push(stringifyArgv(config.rect));
-  } else if (config.selector) {
-    args.push(stringifyArgv(config.selector));
-  }
-  if (config.savePath) {
-    args.push(stringifyArgv(config.savePath));
-  }
-  return args.join(", ");
-}
+    if (Object.keys(headers).length > 0) {
+      args.push(stringifyArgv(headers));
+    }
 
-// 生成 pdf 参数字符串
-function generatePdfArgs(config) {
-  const args = [];
-  if (config.savePath) {
-    args.push(stringifyArgv(config.savePath));
-  }
-  if (config.options) {
-    args.push(stringifyArgv(config.options));
-  }
-  return args.join(", ");
-}
+    // timeout
+    if (argvs.goto.timeout) {
+      if (args.length === 1) {
+        args.push("undefined");
+      }
+      args.push(argvs.goto.timeout);
+    }
 
-// 生成 device 参数字符串
-function generateDeviceArgs(config) {
-  if (config.type === "preset") {
-    return stringifyArgv(config.deviceName);
-  } else {
-    const options = {};
-    if (config.size) options.size = config.size;
-    if (config.useragent) options.userAgent = config.useragent;
-    return stringifyArgv(options);
+    lines[0] += `.goto(${args.join(", ")})`;
   }
-}
-
-// 生成 setCookies 参数字符串
-function generateSetCookiesArgs(config) {
-  if (!config.items?.length) return "[]";
-  return stringifyArgv(config.items);
-}
 
-// 生成 evaluate 参数字符串
-function generateEvaluateArgs(config) {
-  const args = [config.function];
-  if (config.args?.length) {
-    args.push(...config.args.map(stringifyArgv));
-  }
-  return args.join(", ");
-}
+  // 添加其他操作
+  if (argvs.operations?.length) {
+    argvs.operations.forEach(({ value, args }) => {
+      if (!args?.length) return;
 
-// 生成 when 参数字符串
-function generateWhenArgs(config) {
-  if (config.type === "function") {
-    return config.function;
-  } else {
-    return stringifyArgv(config.selector);
-  }
-}
+      const stringifiedArgs = args
+        .map((arg) => stringifyArgv(arg))
+        .filter(Boolean);
 
-// 生成 file 参数字符串
-function generateFileArgs(config) {
-  const args = [stringifyArgv(config.selector)];
-  if (config.files) {
-    args.push(stringifyArgv(config.files));
+      lines.push(`  .${value}(${stringifiedArgs.join(", ")})`);
+    });
   }
-  return args.join(", ");
-}
 
-// 生成 value 参数字符串
-function generateValueArgs(config) {
-  return `${stringifyArgv(config.selector)}, ${stringifyArgv(
-    config.value
-  )}`;
-}
-
-// 生成 check 参数字符串
-function generateCheckArgs(config) {
-  return `${stringifyArgv(config.selector)}, ${config.checked}`;
-}
+  // 最后添加 run 配置（只包含非默认值）
+  if (argvs.run) {
+    const runOptions = {};
+    Object.entries(argvs.run).forEach(([key, value]) => {
+      if (value !== defaultRunConfigs[key]) {
+        runOptions[key] = value;
+      }
+    });
 
-// 生成 scroll 参数字符串
-function generateScrollArgs(config) {
-  if (config.type === "element") {
-    return stringifyArgv(config.selector);
-  } else {
-    if (config.x !== undefined) {
-      return `${config.x}, ${config.y}`;
+    if (Object.keys(runOptions).length > 0) {
+      lines.push(
+        `  .run(${JSON.stringify(runOptions, null, 2).replace(/\n/g, "\n  ")})`
+      );
     } else {
-      return String(config.y);
+      lines.push("  .run()");
     }
   }
-}
-
-// 生成 download 参数字符串
-function generateDownloadArgs(config) {
-  const args = [stringifyArgv(config.url)];
-  if (config.savePath) {
-    args.push(stringifyArgv(config.savePath));
-  }
-  return args.join(", ");
-}
-
-// 生成完整的 ubrowser 代码
-export function generateUBrowserCode(configs, selectedActions) {
-  const lines = [];
-  const indent = "  ";
-
-  // 添加 goto 参数
-  if (configs.goto) {
-    const gotoArgs = generateGotoArgs(configs.goto);
-    lines.push(`${indent}goto(${gotoArgs}),`);
-  }
-
-  // 添加选中的操作
-  if (selectedActions?.length) {
-    selectedActions.forEach((action) => {
-      const args = generateActionArgs(action.value, configs[action.value]);
-      lines.push(`${indent}${action.value}(${args}),`);
-    });
-  }
-
-  // 添加 run 参数
-  const runArgs = generateRunArgs(configs.run || {});
-  const runLine = runArgs ? `${indent}run(${runArgs})` : `${indent}run()`;
-  lines.push(runLine);
 
-  // 生成最终代码
-  return `utools.ubrowser\n${lines.join("\n")}`;
+  return lines.join("\n");
 }
diff --git a/src/js/composer/ubrowserConfig.js b/src/js/composer/ubrowserConfig.js
index 2840dc31..b0d1ed88 100644
--- a/src/js/composer/ubrowserConfig.js
+++ b/src/js/composer/ubrowserConfig.js
@@ -1,549 +1,591 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
+import { deviceName, userAgent } from "js/options/httpOptions";
 
 // ubrowser 浏览器操作配置
-export const ubrowserOperationConfigs = [
-  {
+export const ubrowserOperationConfigs = {
+  waitTime: {
     value: "wait",
-    label: "等待",
+    label: "等待时间",
+    icon: "timer",
     config: [
       {
-        key: "type",
-        label: "等待类型",
-        type: "button-toggle",
-        options: [
-          { label: "等待时间", value: "time" },
-          { label: "等待元素", value: "selector" },
-          { label: "等待条件", value: "function" },
-        ],
-        defaultValue: "time",
-      },
-      {
-        key: "time",
         label: "等待时间(ms)",
         icon: "timer",
         component: "NumberInput",
+        min: 0,
+        step: 100,
         width: 12,
-        showWhen: "type",
-        showValue: "time",
       },
+    ],
+  },
+  waitElement: {
+    value: "wait",
+    label: "等待元素",
+    icon: "find_in_page",
+    config: [
       {
-        key: "selector",
         label: "等待元素的CSS选择器",
         icon: "find_in_page",
         component: "VariableInput",
         width: 12,
-        showWhen: "type",
-        showValue: "selector",
       },
+    ],
+  },
+  waitCondition: {
+    value: "wait",
+    label: "等待条件",
+    icon: "code",
+    config: [
       {
-        key: "function",
-        label: "等待条件(返回 true 时结束等待)",
+        label: "等待条件",
         icon: "code",
-        type: "function-with-params",
+        component: "FunctionInput",
+        placeholder: "返回true时结束等待",
         width: 12,
-        showWhen: "type",
-        showValue: "function",
       },
       {
-        key: "timeout",
         label: "超时时间(ms)",
         icon: "timer_off",
         component: "NumberInput",
         width: 12,
         defaultValue: 60000,
-        showWhen: "type",
-        showValue: ["selector", "function"],
+      },
+      {
+        topLabel: "传递给函数的参数值",
+        component: "ArrayEditor",
       },
     ],
-    icon: "timer",
   },
-  {
+  click: {
     value: "click",
     label: "点击",
+    icon: "mouse",
     config: [
       {
-        key: "selector",
         label: "点击元素的CSS选择器",
         icon: "mouse",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "mouse",
   },
-  {
+  css: {
     value: "css",
     label: "注入CSS",
+    icon: "style",
     config: [
       {
-        key: "value",
         label: "注入的CSS样式",
         icon: "style",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "style",
   },
-  {
+  press: {
     value: "press",
     label: "按键",
+    icon: "keyboard",
     config: [
       {
-        key: "key",
         label: "按键",
         icon: "keyboard",
         component: "VariableInput",
-        width: 5,
+        width: 4,
       },
       {
-        key: "modifiers",
-        label: "修饰键",
-        type: "checkbox-group",
+        component: "CheckGroup",
         options: [
           { label: "Ctrl", value: "ctrl" },
           { label: "Shift", value: "shift" },
           { label: "Alt", value: "alt" },
           { label: "Meta", value: "meta" },
         ],
-        defaultValue: [],
-        width: 7,
+        width: 8,
       },
     ],
-    icon: "keyboard",
   },
-  {
+  paste: {
     value: "paste",
     label: "粘贴",
+    icon: "content_paste",
     config: [
       {
-        key: "text",
         label: "粘贴内容",
         icon: "content_paste",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "content_paste",
   },
-  {
+  viewport: {
     value: "viewport",
     label: "视窗",
+    icon: "crop",
     config: [
       {
-        key: "width",
         label: "视窗宽度",
-        icon: "width",
+        icon: "swap_horiz",
         component: "NumberInput",
+        min: 0,
+        step: 100,
         width: 6,
       },
       {
-        key: "height",
         label: "视窗高度",
         icon: "height",
         component: "NumberInput",
+        min: 0,
+        step: 100,
         width: 6,
       },
     ],
-    icon: "crop",
   },
-  {
+  screenshotElement: {
     value: "screenshot",
-    label: "截图",
+    label: "元素截图",
+    icon: "picture_as_pdf",
     config: [
       {
-        key: "selector",
         label: "元素选择器",
         icon: "crop",
         component: "VariableInput",
+        width: 12,
       },
       {
-        key: "rect.x",
-        label: "X坐标",
-        icon: "drag_handle",
-        component: "NumberInput",
-        width: 3,
-      },
-      {
-        key: "rect.y",
-        label: "Y坐标",
-        icon: "drag_handle",
-        component: "NumberInput",
-        width: 3,
-      },
-      {
-        key: "rect.width",
-        label: "宽度",
-        icon: "width",
-        component: "NumberInput",
-        width: 3,
+        label: "保存路径",
+        icon: "save",
+        component: "VariableInput",
+        options: {
+          dialog: {
+            type: "save",
+            options: {
+              defaultPath: "screenshot.png",
+            },
+          },
+        },
+        width: 12,
       },
+    ],
+  },
+  screenshotPosition: {
+    value: "screenshot",
+    label: "区域截图",
+    icon: "crop",
+    config: [
       {
-        key: "rect.height",
-        label: "高度",
-        icon: "height",
-        component: "NumberInput",
-        width: 3,
+        component: "OptionEditor",
+        options: {
+          x: {
+            label: "X坐标",
+            icon: "drag_handle",
+            component: "NumberInput",
+            min: 0,
+            step: 100,
+            width: 3,
+          },
+          y: {
+            label: "Y坐标",
+            icon: "drag_handle",
+            component: "NumberInput",
+            min: 0,
+            step: 100,
+            width: 3,
+          },
+          width: {
+            label: "宽度",
+            icon: "swap_horiz",
+            component: "NumberInput",
+            min: 0,
+            step: 100,
+            width: 3,
+          },
+          height: {
+            label: "高度",
+            icon: "height",
+            component: "NumberInput",
+            min: 0,
+            step: 100,
+            width: 3,
+          },
+        },
       },
       {
-        key: "savePath",
         label: "保存路径",
         icon: "save",
-        component: "VariableInput",
+        options: {
+          dialog: {
+            type: "save",
+            options: {
+              defaultPath: "screenshot.png",
+            },
+          },
+        },
+        width: 12,
       },
     ],
-    icon: "picture_as_pdf",
   },
-  {
+  pdf: {
     value: "pdf",
     label: "导出PDF",
+    icon: "picture_as_pdf",
     config: [
       {
-        key: "options.marginsType",
-        label: "边距类型",
-        component: "q-select",
-        options: [
-          { label: "默认边距", value: 0 },
-          { label: "无边距", value: 1 },
-          { label: "最小边距", value: 2 },
-        ],
-        width: 6,
-      },
-      {
-        key: "options.pageSize",
-        label: "页面大小",
-        component: "q-select",
-        options: ["A3", "A4", "A5", "Legal", "Letter", "Tabloid"],
-        width: 6,
+        component: "OptionEditor",
+        options: {
+          format: {
+            label: "格式",
+            component: "QSelect",
+            options: [
+              "A0",
+              "A1",
+              "A2",
+              "A3",
+              "A4",
+              "A5",
+              "A6",
+              "Legal",
+              "Letter",
+              "Tabloid",
+              "Ledger",
+            ],
+            width: 3,
+          },
+          landscape: {
+            label: "横向打印",
+            component: "CheckButton",
+            width: 3,
+          },
+          pageRanges: {
+            label: "页码范围",
+            component: "VariableInput",
+            placeholder: "1-5, 8",
+            width: 3,
+          },
+          scale: {
+            label: "缩放",
+            component: "NumberInput",
+            min: 0,
+            step: 0.1,
+            width: 3,
+          },
+        },
+        defaultValue: {
+          format: "A4",
+          landscape: false,
+          pageRanges: "",
+          scale: 1,
+        },
       },
       {
-        key: "savePath",
         label: "保存路径",
         icon: "save",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "devices",
   },
-  {
+  device: {
     value: "device",
     label: "模拟设备",
+    icon: "phone_iphone",
     config: [
       {
-        key: "type",
-        label: "设备类型",
-        type: "button-toggle",
-        options: [
-          { label: "特定设备", value: "preset" },
-          { label: "自定义设备", value: "custom" },
-        ],
-        defaultValue: "preset",
-      },
-      {
-        key: "deviceName",
-        label: "设备名称",
-        icon: "smartphone",
-        component: "VariableInput",
-        width: 12,
-        showWhen: "type",
-        showValue: "preset",
-      },
-      {
-        key: "size",
-        label: "设备尺寸",
-        type: "device-size",
-        width: 12,
-        showWhen: "type",
-        showValue: "custom",
-      },
-      {
-        key: "useragent",
-        label: "User-Agent",
-        icon: "devices",
-        component: "VariableInput",
-        width: 12,
-        showWhen: "type",
-        showValue: "custom",
+        component: "OptionEditor",
+        options: {
+          size: {
+            component: "DictEditor",
+            options: {
+              fixedKeys: ["width", "height"],
+              disableAdd: true,
+            },
+          },
+          userAgent: {
+            label: "User-Agent",
+            component: "VariableInput",
+            options: {
+              items: userAgent,
+            },
+          },
+        },
       },
     ],
-    icon: "phone_iphone",
   },
-  {
+  cookies: {
     value: "cookies",
     label: "获取Cookie",
+    icon: "cookie",
     config: [
       {
-        key: "name",
         label: "Cookie名称",
         icon: "cookie",
         component: "VariableInput",
         width: 12,
       },
     ],
-    icon: "cookie",
   },
-  {
+  setCookies: {
     value: "setCookies",
     label: "设置Cookie",
-    config: [{ key: "items", label: "Cookie列表", type: "cookie-list" }],
     icon: "cookie",
+    config: [
+      {
+        label: "Cookie列表",
+        component: "ArrayEditor",
+        columns: {
+          name: {
+            label: "名称",
+          },
+          value: {
+            label: "值",
+          },
+        },
+      },
+    ],
   },
-  {
+  removeCookies: {
     value: "removeCookies",
     label: "删除Cookie",
+    icon: "cookie",
     config: [
       {
-        key: "name",
         label: "Cookie名称",
         icon: "cookie",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "cookie",
   },
-  {
+  clearCookies: {
     value: "clearCookies",
     label: "清空Cookie",
+    icon: "cookie",
     config: [
       {
-        key: "url",
         label: "URL(可选)",
         icon: "link",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "cookie",
   },
-  {
+  evaluate: {
     value: "evaluate",
     label: "执行代码",
+    icon: "code",
     config: [
       {
-        key: "function",
         label: "执行的代码",
         icon: "code",
-        type: "function-with-params",
+        component: "FunctionInput",
         width: 12,
       },
+      {
+        topLabel: "传递给函数的参数值",
+        component: "ArrayEditor",
+      },
     ],
-    icon: "code",
   },
-  {
+  whenElement: {
     value: "when",
-    label: "条件判断",
+    label: "判断元素",
+    icon: "rule",
     config: [
       {
-        key: "type",
-        label: "条件类型",
-        type: "button-toggle",
-        options: [
-          { label: "等待元素", value: "selector" },
-          { label: "等待条件", value: "function" },
-        ],
-        defaultValue: "selector",
-      },
-      {
-        key: "selector",
-        label: "等待元素的CSS选择器",
+        label: "判断元素的CSS选择器",
         icon: "find_in_page",
         component: "VariableInput",
         width: 12,
-        showWhen: "type",
-        showValue: "selector",
       },
+    ],
+  },
+  whenCondition: {
+    value: "when",
+    label: "判断条件",
+    icon: "rule",
+    config: [
       {
-        key: "function",
-        label: "等待条件(返回 true 时结束等待)",
+        label: "判断条件",
         icon: "code",
-        type: "function-with-params",
+        component: "FunctionInput",
         width: 12,
-        showWhen: "type",
-        showValue: "function",
+        placeholder: "返回true时结束判断",
       },
       {
-        key: "timeout",
-        label: "超时时间(ms)",
-        icon: "timer_off",
-        component: "NumberInput",
-        width: 12,
-        defaultValue: 60000,
-        showWhen: "type",
-        showValue: ["selector", "function"],
+        topLabel: "传递给函数的参数值",
+        component: "ArrayEditor",
       },
     ],
-    icon: "rule",
   },
-  {
+  end: {
     value: "end",
-    label: "结束条件",
-    config: [],
+    label: "结束判断",
     icon: "stop",
+    config: [],
   },
-  {
+  mousedown: {
     value: "mousedown",
     label: "按下鼠标",
+    icon: "mouse",
     config: [
       {
-        key: "selector",
         label: "按下元素选择器",
         icon: "mouse",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "mouse",
   },
-  {
+  mouseup: {
     value: "mouseup",
     label: "释放鼠标",
+    icon: "mouse",
     config: [
       {
-        key: "selector",
         label: "释放元素选择器",
         icon: "mouse",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "mouse",
   },
-  {
+  file: {
     value: "file",
     label: "上传文件",
+    icon: "upload_file",
     config: [
       {
-        key: "selector",
         label: "文件输入框选择器",
         icon: "upload_file",
         component: "VariableInput",
+        placeholder: "必须是可选择文件的输入元素 input[type=file]",
+        width: 12,
+      },
+      {
+        label: "文件列表",
+        component: "VariableInput",
+        icon: "image",
+        width: 12,
+        options: {
+          dialog: {
+            type: "open",
+            options: {
+              title: "选择文件",
+              properties: ["openFile", "multiSelections"],
+            },
+          },
+        },
       },
-      { key: "files", label: "文件列表", type: "file-list", width: 12 },
     ],
-    icon: "upload_file",
   },
-  {
-    value: "value",
+  setValue: {
+    value: "setValue",
     label: "设置值",
+    icon: "check_box",
     config: [
       {
-        key: "selector",
         label: "元素选择器",
         icon: "varInput",
         component: "VariableInput",
         width: 6,
       },
       {
-        key: "value",
         label: "设置的值",
         icon: "edit",
         component: "VariableInput",
         width: 6,
       },
     ],
-    icon: "check_box",
   },
-  {
+  check: {
     value: "check",
     label: "设置选中",
+    icon: "center_focus_strong",
     config: [
       {
-        key: "selector",
         label: "复选框/选框选择器",
         icon: "check_box",
         component: "VariableInput",
         width: 8,
       },
       {
-        key: "checked",
         label: "选中状态",
-        type: "boolean-toggle",
+        component: "CheckButton",
         defaultValue: false,
         width: 4,
       },
     ],
-    icon: "center_focus_strong",
   },
-  {
+  focus: {
     value: "focus",
     label: "聚焦元素",
+    icon: "swap_vert",
     config: [
       {
-        key: "selector",
         label: "元素选择器",
         icon: "center_focus_strong",
         component: "VariableInput",
+        width: 12,
       },
     ],
-    icon: "swap_vert",
   },
-  {
+  scrollToElement: {
     value: "scroll",
-    label: "滚动",
+    label: "滚动到元素",
+    icon: "download",
     config: [
       {
-        key: "type",
-        label: "滚动类型",
-        type: "button-toggle",
-        options: [
-          { label: "滚动到元素", value: "element" },
-          { label: "滚动到坐标", value: "position" },
-        ],
-        defaultValue: "element",
-      },
-      {
-        key: "selector",
         label: "目标元素选择器",
         icon: "swap_vert",
         component: "VariableInput",
         width: 12,
-        showWhen: "type",
-        showValue: "element",
       },
+    ],
+  },
+  scrollToPosition: {
+    value: "scroll",
+    label: "滚动到坐标",
+    icon: "download",
+    config: [
       {
-        key: "x",
         label: "X坐标",
         icon: "drag_handle",
         component: "NumberInput",
         width: 6,
-        showWhen: "type",
-        showValue: "position",
       },
       {
-        key: "y",
         label: "Y坐标",
         icon: "drag_handle",
         component: "NumberInput",
         width: 6,
-        showWhen: "type",
-        showValue: "position",
       },
     ],
-    icon: "download",
   },
-  {
+  download: {
     value: "download",
     label: "下载",
+    icon: "download",
     config: [
       {
-        key: "url",
         label: "下载URL",
         icon: "link",
         component: "VariableInput",
         width: 6,
       },
       {
-        key: "savePath",
         label: "保存路径",
         icon: "save",
         component: "VariableInput",
         width: 6,
       },
     ],
-    icon: "download",
   },
-  {
+  devTools: {
     value: "devTools",
     label: "开发工具",
+    icon: "developer_board",
     config: [
       {
-        key: "mode",
-        label: "开发工具位置",
-        type: "button-toggle",
+        component: "ButtonGroup",
         options: [
           { label: "右侧", value: "right" },
           { label: "底部", value: "bottom" },
@@ -551,142 +593,20 @@ export const ubrowserOperationConfigs = [
           { label: "分离", value: "detach" },
         ],
         defaultValue: "right",
+        width: 12,
       },
     ],
-    icon: "developer_board",
   },
-  {
+  hide: {
     value: "hide",
     label: "隐藏",
-    config: [],
     icon: "visibility_off",
+    config: [],
   },
-  {
+  show: {
     value: "show",
     label: "显示",
-    config: [],
     icon: "visibility",
+    config: [],
   },
-];
-
-// 添加默认运行配置
-const defaultUBrowserRunConfigs = {
-  show: true,
-  width: 1280,
-  height: 800,
-  center: true,
-  minWidth: 800,
-  minHeight: 600,
-  resizable: true,
-  movable: true,
-  minimizable: true,
-  maximizable: true,
-  alwaysOnTop: false,
-  fullscreen: false,
-  fullscreenable: true,
-  enableLargerThanScreen: false,
-  opacity: 1,
-};
-
-// ubrowser 默认配置 基础参数-浏览器操作-运行参数
-export const defaultUBrowserConfigs = {
-  // 基础参数
-  goto: {
-    url: newVarInputVal("str"),
-    headers: {
-      Referer: newVarInputVal("str"),
-      userAgent: newVarInputVal("str"),
-    },
-    timeout: 60000,
-  },
-  // 浏览器操作
-  wait: {
-    value: "",
-    timeout: 60000,
-  },
-  click: {
-    selector: newVarInputVal("str"),
-  },
-  css: {
-    value: newVarInputVal("str"),
-  },
-  press: {
-    key: newVarInputVal("str"),
-    modifiers: [],
-  },
-  paste: {
-    text: newVarInputVal("str"),
-  },
-  screenshot: {
-    selector: newVarInputVal("str"),
-    rect: { x: 0, y: 0, width: 0, height: 0 },
-    savePath: newVarInputVal("str"),
-  },
-  pdf: {
-    options: {
-      marginsType: 0,
-      pageSize: "A4",
-    },
-    savePath: newVarInputVal("str"),
-  },
-  device: {
-    size: { width: 1280, height: 800 },
-    useragent: newVarInputVal("str"),
-  },
-  cookies: {
-    name: newVarInputVal("str"),
-  },
-  setCookies: {
-    items: [
-      {
-        name: newVarInputVal("str"),
-        value: newVarInputVal("str"),
-      },
-    ],
-  },
-  removeCookies: {
-    name: newVarInputVal("str"),
-  },
-  clearCookies: {
-    url: newVarInputVal("str"),
-  },
-  evaluate: {
-    function: "",
-    params: [],
-  },
-  when: {
-    condition: newVarInputVal("var"),
-  },
-  mousedown: {
-    selector: newVarInputVal("str"),
-  },
-  mouseup: {
-    selector: newVarInputVal("str"),
-  },
-  file: {
-    selector: newVarInputVal("str"),
-    files: [],
-  },
-  value: {
-    selector: newVarInputVal("str"),
-    value: newVarInputVal("str"),
-  },
-  check: {
-    selector: newVarInputVal("str"),
-    checked: false,
-  },
-  focus: {
-    selector: newVarInputVal("str"),
-  },
-  scroll: {
-    target: newVarInputVal("str"),
-    x: 0,
-    y: 0,
-  },
-  download: {
-    url: newVarInputVal("str"),
-    savePath: newVarInputVal("str"),
-  },
-  // 运行参数
-  run: defaultUBrowserRunConfigs,
 };

From 742b5122c258a54cb33cd3dbb838648f1c4cec55 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 9 Feb 2025 22:10:50 +0800
Subject: [PATCH 151/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=20AxiosConfigEditor?=
 =?UTF-8?q?=20=20=E5=92=8C=20ubrowser=20=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/network/AxiosConfigEditor.vue    | 20 ++++++++++++----
 .../composer/ubrowser/UBrowserEditor.vue      | 23 ++++++-------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index ec17074f..03e25f96 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="row q-col-gutter-sm">
+  <div class="row q-col-gutter-sm axios-config-editor">
     <!-- 基础配置 -->
     <div class="col-12">
       <div class="row q-col-gutter-sm">
@@ -64,7 +64,7 @@
 
       <q-tab-panels v-model="activeTab" animated class="q-px-none">
         <!-- Headers tab -->
-        <q-tab-panel name="headers" class="q-pa-sm">
+        <q-tab-panel name="headers" class="q-pa-none q-pt-sm">
           <div class="row q-col-gutter-sm">
             <div class="col-12">
               <q-select
@@ -112,14 +112,18 @@
         </q-tab-panel>
 
         <!-- 请求体和URL参数 tabs -->
-        <q-tab-panel v-if="hasRequestData" name="data" class="q-pa-sm">
+        <q-tab-panel
+          v-if="hasRequestData"
+          name="data"
+          class="q-pa-none q-pt-sm"
+        >
           <DictEditor
             v-model="argvs.data"
             @update:model-value="updateArgvs('data', $event)"
           />
         </q-tab-panel>
 
-        <q-tab-panel name="params" class="q-pa-sm">
+        <q-tab-panel name="params" class="q-pa-none q-pt-sm">
           <DictEditor
             v-model="argvs.params"
             @update:model-value="updateArgvs('params', $event)"
@@ -128,7 +132,7 @@
 
         <!-- 其他通用 panels -->
         <template v-for="panel in commonPanels" :key="panel.name">
-          <q-tab-panel :name="panel.name" class="q-pa-sm">
+          <q-tab-panel :name="panel.name" class="q-pa-none q-pt-sm">
             <div class="row q-col-gutter-sm">
               <div
                 v-for="field in panel.fields"
@@ -501,3 +505,9 @@ export default defineComponent({
   },
 });
 </script>
+
+<style scoped>
+.axios-config-editor :deep(.q-tab-panel) {
+  overflow: hidden;
+}
+</style>
diff --git a/src/components/composer/ubrowser/UBrowserEditor.vue b/src/components/composer/ubrowser/UBrowserEditor.vue
index c2e75444..b0de0742 100644
--- a/src/components/composer/ubrowser/UBrowserEditor.vue
+++ b/src/components/composer/ubrowser/UBrowserEditor.vue
@@ -119,7 +119,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .ubrowser-editor {
   display: flex;
   flex-direction: column;
@@ -142,8 +142,8 @@ export default {
   overflow: auto;
 }
 
-.panel-content {
-  padding: 12px;
+.ubrowser-editor :deep(.panel-content) {
+  padding: 8px 0 0 0;
   height: 100%;
   overflow: auto;
 }
@@ -154,15 +154,6 @@ export default {
   background-color: var(--q-card-background);
 }
 
-.ubrowser-editor :deep(.q-tab) {
-  min-height: 36px;
-  padding: 0 12px;
-  font-size: 13px;
-  font-weight: 500;
-  text-transform: none;
-  opacity: 0.7;
-}
-
 .ubrowser-editor :deep(.q-tab--active) {
   opacity: 1;
 }
@@ -172,14 +163,14 @@ export default {
   margin-right: 4px;
 }
 
-.ubrowser-editor :deep(.q-tab__label) {
-  line-height: 1.2;
-}
-
 .ubrowser-editor :deep(.q-tab__indicator) {
   height: 2px;
 }
 
+.ubrowser-editor :deep(.q-tab__label) {
+  font-size: 13px;
+}
+
 /* 暗色模式适配 */
 .body--dark .ubrowser-editor {
   background-color: var(--q-dark);

From e3d399af4e02ad697d3e4a88c125b232a2c56363 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 9 Feb 2025 22:16:05 +0800
Subject: [PATCH 152/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=20CommandEditor=20?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=98=B4=E5=BD=B1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 64e68b25..01565423 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -9,7 +9,7 @@
       ref="sidebar"
       :canCommandSave="canCommandSave"
       :quickcommandInfo="quickcommandInfo"
-      class="absolute-left shadow-10"
+      class="absolute-left shadow-1"
       :style="{
         width: sideBarWidth + 'px',
         zIndex: 1,

From 63635fe9335041620d743fe44422d57d665f9891 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 00:04:45 +0800
Subject: [PATCH 153/332] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=A0=E5=85=A5=E6=96=B0=E5=BB=BA=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=86=E5=8C=96=E7=BC=96=E6=8E=92=E7=9A=84=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue              | 208 ++++++------------
 .../composer/flow/ComposerButtons.vue         |  16 +-
 src/components/config/FooterBar.vue           |  48 +++-
 src/pages/ConfigurationPage.vue               |  84 ++++---
 4 files changed, 166 insertions(+), 190 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 01565423..46af7401 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -1,84 +1,74 @@
 <template>
-  <div
-    class="command-editor-container"
-    :class="{ leaving: isLeaving, 'run-code': isRunCodePage }"
-    @animationend="$emit('animationend')"
-  >
-    <!-- 命令设置栏 -->
-    <CommandSideBar
-      ref="sidebar"
-      :canCommandSave="canCommandSave"
-      :quickcommandInfo="quickcommandInfo"
-      class="absolute-left shadow-1"
-      :style="{
-        width: sideBarWidth + 'px',
-        zIndex: 1,
-        transform: isFullscreen ? 'translateX(-100%)' : 'translateX(0)',
-        transition: 'transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
-      }"
-      :sideBarWidth="sideBarWidth"
-      v-if="showSidebar"
-      @back="handleBack"
-    ></CommandSideBar>
+  <!-- 命令设置栏 -->
+  <CommandSideBar
+    ref="sidebar"
+    :canCommandSave="canCommandSave"
+    :quickcommandInfo="quickcommandInfo"
+    class="absolute-left shadow-1"
+    :style="{
+      width: sideBarWidth + 'px',
+      zIndex: 1,
+      transform: isFullscreen ? 'translateX(-100%)' : 'translateX(0)',
+      transition: 'transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
+    }"
+    :sideBarWidth="sideBarWidth"
+    v-if="showSidebar"
+    @back="handleBack"
+  ></CommandSideBar>
 
-    <!-- 编程语言栏 -->
-    <CommandLanguageBar
-      class="absolute-top"
-      :style="{
-        left: showSidebar ? sideBarWidth + 'px' : 65,
-        zIndex: 1,
-        transform: isFullscreen ? 'translateY(-100%)' : 'translateY(0)',
-        opacity: isFullscreen ? 0 : 1,
-        transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
-      }"
-      v-model="quickcommandInfo"
-      :height="languageBarHeight"
-      :canCommandSave="canCommandSave"
-      :isRunCodePage="isRunCodePage"
-      @program-changed="programChanged"
-      @run="runCurrentCommand"
-      @save="saveCurrentCommand"
-      @show-composer="showComposer = true"
-    />
+  <!-- 编程语言栏 -->
+  <CommandLanguageBar
+    class="absolute-top"
+    :style="{
+      left: showSidebar ? sideBarWidth + 'px' : 65,
+      zIndex: 1,
+      transform: isFullscreen ? 'translateY(-100%)' : 'translateY(0)',
+      opacity: isFullscreen ? 0 : 1,
+      transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
+    }"
+    v-model="quickcommandInfo"
+    :height="languageBarHeight"
+    :canCommandSave="canCommandSave"
+    :isRunCodePage="isRunCodePage"
+    @program-changed="programChanged"
+    @run="runCurrentCommand"
+    @save="saveCurrentCommand"
+    @show-composer="showComposer = true"
+  />
 
-    <!-- 编辑器 -->
-    <MonacoEditor
-      class="editor-transition"
-      :placeholder="true"
-      ref="editor"
-      @loaded="monacoInit"
-      @typing="(val) => monacoTyping(val)"
-      @keyStroke="monacoKeyStroke"
-      :style="{
-        position: 'absolute',
-        top: isFullscreen ? 0 : languageBarHeight + 'px',
-        left: isFullscreen
-          ? 0
-          : action.type === 'run'
-          ? 0
-          : sideBarWidth + 'px',
-        right: 0,
-        bottom: 0,
-      }"
-    />
+  <!-- 编辑器 -->
+  <MonacoEditor
+    class="editor-transition"
+    :placeholder="true"
+    ref="editor"
+    @loaded="monacoInit"
+    @typing="(val) => monacoTyping(val)"
+    @keyStroke="monacoKeyStroke"
+    :style="{
+      position: 'absolute',
+      top: isFullscreen ? 0 : languageBarHeight + 'px',
+      left: isFullscreen ? 0 : action.type === 'run' ? 0 : sideBarWidth + 'px',
+      right: 0,
+      bottom: 0,
+    }"
+  />
 
-    <!-- 编辑器工具按钮组 -->
-    <EditorTools
-      ref="editorTools"
-      :commandCode="quickcommandInfo?.features?.code || 'temp'"
-      :isFullscreen="isFullscreen"
-      @restore="restoreHistory"
-      @toggle-fullscreen="toggleFullscreen"
-    />
+  <!-- 编辑器工具按钮组 -->
+  <EditorTools
+    ref="editorTools"
+    :commandCode="quickcommandInfo?.features?.code || 'temp'"
+    :isFullscreen="isFullscreen"
+    @restore="restoreHistory"
+    @toggle-fullscreen="toggleFullscreen"
+  />
 
-    <!-- 可视化编排 -->
-    <q-dialog v-model="showComposer" maximized>
-      <CommandComposer ref="composer" @use-composer="handleComposer" />
-    </q-dialog>
+  <!-- 可视化编排 -->
+  <q-dialog v-model="showComposer" maximized>
+    <CommandComposer ref="composer" @use-composer="handleComposer" />
+  </q-dialog>
 
-    <!-- 运行结果 -->
-    <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
-  </div>
+  <!-- 运行结果 -->
+  <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
 </template>
 
 <script>
@@ -338,72 +328,4 @@ export default {
   transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
   will-change: transform, left, top, opacity;
 }
-
-.command-editor-container {
-  color: black;
-  background: white;
-  overflow: hidden;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 5000;
-  background: var(--q-page-background);
-  animation: slideUpDefault 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-.command-editor-container.run-code {
-  animation: none;
-}
-
-.command-editor-container.leaving {
-  animation: slideDownOut 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  background: transparent;
-}
-
-.command-editor-container.leaving.run-code {
-  animation: slideUpOut 0.2s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-@keyframes slideUpDefault {
-  from {
-    transform: translateY(100%);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes slideDownIn {
-  from {
-    transform: translateY(-100%);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes slideDownOut {
-  from {
-    transform: translateY(0);
-  }
-  to {
-    transform: translateY(100%);
-  }
-}
-
-@keyframes slideUpOut {
-  from {
-    transform: translateY(0);
-  }
-  to {
-    transform: translateY(-100%);
-  }
-}
-
-.body--dark .command-editor-container {
-  color: white;
-  background: var(--q-dark-page);
-}
 </style>
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index bf9de0e7..3591ab5c 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="composer-buttons">
     <div class="right-buttons">
-      <q-separator vertical />
+      <q-btn icon="close" dense flat v-close-popup v-if="showCloseButton">
+        <q-tooltip>退出可视化编排</q-tooltip>
+      </q-btn>
       <q-btn
         :icon="isAllCollapsed ? 'unfold_more' : 'unfold_less'"
         dense
@@ -10,7 +12,6 @@
       >
         <q-tooltip>{{ isAllCollapsed ? "展开所有" : "折叠所有" }}</q-tooltip>
       </q-btn>
-      <q-separator vertical />
       <q-btn
         icon="settings"
         dense
@@ -19,7 +20,6 @@
       >
         <q-tooltip>流程管理</q-tooltip>
       </q-btn>
-      <q-separator vertical />
       <q-btn
         @click="$q.dark.toggle()"
         :icon="$q.dark.isActive ? 'dark_mode' : 'light_mode'"
@@ -28,11 +28,7 @@
         v-if="isDev"
       >
       </q-btn>
-      <q-btn icon="close" dense flat v-close-popup v-if="showCloseButton">
-        <q-tooltip>退出可视化编排</q-tooltip>
-      </q-btn>
-      <q-separator vertical v-if="showCloseButton" />
-      <q-btn
+      <!-- <q-btn
         dense
         icon="read_more"
         flat
@@ -41,7 +37,7 @@
         v-if="showCloseButton"
       >
         <q-tooltip>插入到编辑器光标处</q-tooltip>
-      </q-btn>
+      </q-btn> -->
       <q-btn
         dense
         flat
@@ -52,14 +48,12 @@
       >
         <q-tooltip>清空编辑器内容并插入</q-tooltip>
       </q-btn>
-      <q-separator vertical v-if="showCloseButton" />
       <q-btn dense flat icon="save" @click="$emit('action', 'save')">
         <q-tooltip>保存</q-tooltip>
       </q-btn>
       <q-btn dense flat icon="history" @click="$emit('action', 'load')">
         <q-tooltip>载入</q-tooltip>
       </q-btn>
-      <q-separator vertical />
       <q-btn flat dense icon="preview" @click="isVisible = true">
         <q-tooltip>预览代码</q-tooltip>
       </q-btn>
diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index ccc5c1d8..b5860181 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -68,20 +68,32 @@
             flat
             @click="goShareCenter"
             color="primary"
-            label="分享中心"
             icon="groups"
             class="share-btn"
-          />
+          >
+            <q-tooltip>分享中心</q-tooltip>
+          </q-btn>
           <!-- 新建按钮 -->
           <q-btn
             split
             flat
-            @click="$emit('add-new')"
+            @click="$emit('add-new', 'CommandEditor')"
             color="primary"
-            label="新建"
-            icon="add"
             class="new-btn"
-          />
+          >
+            <q-icon name="code" class="icon-with-badge" />
+            <q-tooltip>新建命令（直接编写脚本）</q-tooltip>
+          </q-btn>
+          <q-btn
+            split
+            flat
+            @click="$emit('add-new', 'ComposerEditor')"
+            color="primary"
+            class="new-btn"
+          >
+            <q-icon name="view_timeline" class="icon-with-badge" />
+            <q-tooltip>新建命令（可视化编排）</q-tooltip>
+          </q-btn>
           <!-- 菜单按钮 -->
           <q-btn
             stretch
@@ -226,4 +238,28 @@ export default {
   animation: searchIconShake 0.8s ease;
   color: var(--q-primary);
 }
+
+/* 图标角标样式 */
+.icon-with-badge {
+  position: relative;
+}
+
+.icon-with-badge::after {
+  content: "+";
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  transform: translate(50%, -50%);
+  background-color: var(--q-primary);
+  color: white;
+  width: 14px;
+  height: 14px;
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: bold;
+  display: grid;
+  place-items: center;
+  font-family: monospace;
+  line-height: 0;
+}
 </style>
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 8706e464..f7872402 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="config-page-container">
     <!-- 主界面内容 -->
-    <div
-      class="main-content"
-      :class="{ hide: isCommandEditorShow && !isEditorLeaving }"
-    >
+    <div class="main-content">
       <BackgroundLayer />
       <!-- 标签栏 -->
       <TagBar
@@ -39,15 +36,16 @@
     </div>
 
     <!-- 命令编辑界面 -->
-    <CommandEditor
-      v-if="isCommandEditorShow"
-      ref="commandEditor"
-      :action="http://github.com/commandEditorAction"
-      @editorEvent="editorEvent"
-      :allQuickCommandTags="allQuickCommandTags"
-      :isLeaving="isEditorLeaving"
-      @animationend="handleAnimationEnd"
-    ></CommandEditor>
+    <transition name="slide">
+      <div v-if="isEditorShow" class="editor-container">
+        <component
+          :is="commandEditorAction.data.component"
+          :action="http://github.com/commandEditorAction"
+          @editorEvent="editorEvent"
+          :allQuickCommandTags="allQuickCommandTags"
+        />
+      </div>
+    </transition>
 
     <CommandRunResult
       :action="http://github.com/%7B%20type:'config' }"
@@ -63,6 +61,7 @@ import importAll from "js/common/importAll.js";
 import changeLog from "js/options/changeLog.js";
 import pinyinMatch from "pinyin-match";
 import CommandEditor from "components/CommandEditor";
+import ComposerEditor from "components/ComposerEditor";
 import FooterBar from "src/components/config/FooterBar.vue";
 import TagBar from "src/components/config/TagBar.vue";
 import BackgroundLayer from "src/components/config/BackgroundLayer.vue";
@@ -78,6 +77,7 @@ let defaultCommands = importAll(require.context("../json/", false, /\.json$/));
 export default {
   components: {
     CommandEditor,
+    ComposerEditor,
     CommandRunResult,
     FooterBar,
     TagBar,
@@ -93,10 +93,9 @@ export default {
       allQuickCommands: {},
       allQuickCommandTags: [],
       commandSearchKeyword: "",
-      isCommandEditorShow: false,
+      isEditorShow: false,
       commandEditorAction: {},
       footerBarHeight: "40px",
-      isEditorLeaving: false,
     };
   },
   computed: {
@@ -286,7 +285,7 @@ export default {
         type: "edit",
         data: window.lodashM.cloneDeep(command),
       };
-      this.isCommandEditorShow = true;
+      this.isEditorShow = true;
     },
     // 是否为默认命令
     isDefaultCommand(code) {
@@ -419,12 +418,14 @@ export default {
       }
     },
     // 新建命令
-    addNewCommand() {
+    addNewCommand(component = "CommandEditor") {
       this.commandEditorAction = {
         type: "new",
-        data: {},
+        data: {
+          component,
+        },
       };
-      this.isCommandEditorShow = true;
+      this.isEditorShow = true;
     },
     saveCommand(command) {
       let code = command.features.code;
@@ -444,7 +445,7 @@ export default {
           this.saveCommand(event.data);
           break;
         case "back":
-          this.isEditorLeaving = true;
+          this.isEditorShow = false;
           break;
         default:
           return;
@@ -470,12 +471,6 @@ export default {
         );
       }
     },
-    handleAnimationEnd(e) {
-      if (this.isEditorLeaving) {
-        this.isEditorLeaving = false;
-        this.isCommandEditorShow = false;
-      }
-    },
     handleCommandsReorder({ tag, commands }) {
       // 更新当前tag下的命令顺序
       const tagCommands = {};
@@ -522,11 +517,40 @@ export default {
   background: transparent;
 }
 
-.main-content {
-  transition: opacity 0.3s ease;
+.editor-container {
+  color: black;
+  background: white;
+  overflow: hidden;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 5000;
+  background: var(--q-page-background);
+}
+
+.body--dark .editor-container {
+  color: white;
+  background: var(--q-dark-page);
+}
+
+/* 编辑器容器动画 */
+.slide-enter-active,
+.slide-leave-active {
+  transition: transform 0.3s ease-in-out;
+}
+
+.slide-enter-from {
+  transform: translateY(100%);
+}
+
+.slide-leave-to {
+  transform: translateY(100%);
 }
 
-.main-content.hide {
-  opacity: 0;
+.slide-enter-to,
+.slide-leave-from {
+  transform: translateY(0);
 }
 </style>

From ad06d3505144d7a01f13699ba4f3ade9ba339b4d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 00:08:15 +0800
Subject: [PATCH 154/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=20ubrowser=20?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=91=BD=E4=BB=A4=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/networkCommands.js | 29 ++++++---------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index 9ff758e0..407d7119 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -17,27 +17,6 @@ export const networkCommands = {
         },
       ],
     },
-    {
-      value: "utools.ubrowser.goto",
-      label: "ubrowser打开网址",
-      neverHasOutput: true,
-      config: [
-        {
-          label: "要访问的网址链接",
-          component: "VariableInput",
-          icon: "public",
-        },
-      ],
-      asyncMode: "await",
-    },
-    {
-      value: "ubrowser",
-      label: "ubrowser浏览器操作",
-      config: [],
-      component: "UBrowserEditor",
-      asyncMode: "await",
-      icon: "public",
-    },
     {
       value: "axios",
       label: "HTTP请求(Axios)",
@@ -61,6 +40,14 @@ export const networkCommands = {
         },
       },
     },
+    {
+      value: "ubrowser",
+      label: "ubrowser控制",
+      config: [],
+      component: "UBrowserEditor",
+      asyncMode: "await",
+      icon: "public",
+    },
     {
       value: "quickcomposer.network.url.parse",
       label: "URL操作",

From d2a93e9add0fa2412edc04a0c11d59794ef0a2ff Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 09:49:54 +0800
Subject: [PATCH 155/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=92=8C=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandCard.vue                 |  2 +-
 src/components/quickcommandUI/QuickCommand.vue |  4 ++--
 src/css/app.css                                | 12 ++++++++----
 src/pages/ConfigurationPage.vue                | 17 ++++++++---------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/CommandCard.vue b/src/components/CommandCard.vue
index dc65a253..0e4d6aac 100644
--- a/src/components/CommandCard.vue
+++ b/src/components/CommandCard.vue
@@ -119,6 +119,6 @@ export default {
 }
 
 .card-wrapper-hover {
-  transform: scale(1.02);
+  transform: translateY(-1px);
 }
 </style>
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index f4b7846e..8395b4e7 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -370,10 +370,10 @@ export default {
 
 <style>
 .quickcommand-ui.q-card {
-  background-color: #f4f4f4;
+  background-color: var(--utools-bright-bg);
 }
 
 .body--dark .quickcommand-ui.q-card {
-  background-color: var(--q-dark-page);
+  background-color: var(--utools-dark-bg);
 }
 </style>
diff --git a/src/css/app.css b/src/css/app.css
index 215a42dc..696f9820 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -1,16 +1,20 @@
 /* app global css */
 :root {
+  --utools-bright-bg: #f4f4f4;
+  --utools-bright-font-color: #333;
+  --utools-dark-bg: #303133;
+  --utools-dark-font-color: #fff;
   --q-dark: #464646;
-  --q-dark-page: #303133;
+  --q-dark-page: var(--utools-dark-bg);
 }
 
 .q-card--dark {
-  background: var(--q-dark-page);
+  background: var(--utools-dark-bg);
 }
 
 body {
-  background: #f4f4f4;
-  color: #333;
+  background: var(--utools-bright-bg);
+  color: var(--utools-bright-font-color);
 }
 
 /* Monaco Editor 调整行号栏样式 */
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index f7872402..37b1fc87 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -39,7 +39,7 @@
     <transition name="slide">
       <div v-if="isEditorShow" class="editor-container">
         <component
-          :is="commandEditorAction.data.component"
+          :is="commandEditorAction.component"
           :action="http://github.com/commandEditorAction"
           @editorEvent="editorEvent"
           :allQuickCommandTags="allQuickCommandTags"
@@ -284,6 +284,7 @@ export default {
       this.commandEditorAction = {
         type: "edit",
         data: window.lodashM.cloneDeep(command),
+        component: "CommandEditor",
       };
       this.isEditorShow = true;
     },
@@ -421,9 +422,8 @@ export default {
     addNewCommand(component = "CommandEditor") {
       this.commandEditorAction = {
         type: "new",
-        data: {
-          component,
-        },
+        data: {},
+        component,
       };
       this.isEditorShow = true;
     },
@@ -518,8 +518,7 @@ export default {
 }
 
 .editor-container {
-  color: black;
-  background: white;
+  color: var(--utools-bright-font-color);
   overflow: hidden;
   position: fixed;
   top: 0;
@@ -527,12 +526,12 @@ export default {
   right: 0;
   bottom: 0;
   z-index: 5000;
-  background: var(--q-page-background);
+  background: var(--utools-bright-bg);
 }
 
 .body--dark .editor-container {
-  color: white;
-  background: var(--q-dark-page);
+  color: var(--utools-dark-font-color);
+  background: var(--utools-dark-bg);
 }
 
 /* 编辑器容器动画 */

From de441e4e6d35bd43c147350e59dd8635614963ac Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 09:59:32 +0800
Subject: [PATCH 156/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=20FooterBar=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BE=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/FooterBar.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index b5860181..b72ab17f 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -99,11 +99,10 @@
             stretch
             color="primary"
             flat
-            size="xs"
             id="menuBtn"
+            icon="settings"
             :style="{ height: height }"
           >
-            <q-spinner-bars color="primary" size="1.5em" />
             <ConfigurationMenu
               :isTagStared="isTagStared"
               :currentTag="currentTag"
@@ -247,9 +246,8 @@ export default {
 .icon-with-badge::after {
   content: "+";
   position: absolute;
-  top: 4px;
   right: 4px;
-  transform: translate(50%, -50%);
+  transform: translate(50%, 50%);
   background-color: var(--q-primary);
   color: white;
   width: 14px;

From 1a95259aef6aa00ab71fe7022d800152ddb61644 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 10:33:37 +0800
Subject: [PATCH 157/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F=EF=BC=8Clinux=E4=B8=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8win32=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/service.js |  3 ++-
 plugin/lib/dialog/style.css  | 28 +++++++++-------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 3753801f..280f8a94 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -12,7 +12,8 @@ const createDialog = (config, customDialogOptions = {}) => {
     const dialogPath = "lib/dialog/view.html";
     const preloadPath = "lib/dialog/controller.js";
 
-    const platform = os.platform();
+    // linux 和 win32 都使用 win32 的样式
+    const platform = os.platform() === "darwin" ? "darwin" : "win32";
 
     const dialogWidth =
       config.type === "textarea" || config.type === "select"
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 09f1e724..ad2619a0 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -114,21 +114,18 @@ body {
   margin-right: 6px;
 }
 
-.platform-darwin .title-left,
-.platform-linux .title-left {
+.platform-darwin .title-left {
   display: flex;
   align-items: center;
   justify-content: center
 }
 
-/* macOS 和 Linux 样式 */
-.platform-darwin .title-bar,
-.platform-linux .title-bar {
+/* macOS 样式 */
+.platform-darwin .title-bar {
   border-bottom: 1px solid var(--border-color);
 }
 
-.platform-darwin .close-btn,
-.platform-linux .close-btn {
+.platform-darwin .close-btn {
   position: absolute;
   left: 8px;
   top: 7px;
@@ -145,9 +142,7 @@ body {
 }
 
 .platform-darwin .close-btn::before,
-.platform-darwin .close-btn::after,
-.platform-linux .close-btn::before,
-.platform-linux .close-btn::after {
+.platform-darwin .close-btn::after {
   content: "";
   position: absolute;
   width: 8px;
@@ -158,25 +153,20 @@ body {
   transition: opacity 0.2s;
 }
 
-.platform-darwin .close-btn::before,
-.platform-linux .close-btn::before {
+.platform-darwin .close-btn::before {
   transform: rotate(45deg);
 }
 
-.platform-darwin .close-btn::after,
-.platform-linux .close-btn::after {
+.platform-darwin .close-btn::after {
   transform: rotate(-45deg);
 }
 
-.platform-darwin .close-btn:hover,
-.platform-linux .close-btn:hover {
+.platform-darwin .close-btn:hover {
   background-color: var(--mac-close-btn);
 }
 
 .platform-darwin .close-btn:hover::before,
-.platform-darwin .close-btn:hover::after,
-.platform-linux .close-btn:hover::before,
-.platform-linux .close-btn:hover::after {
+.platform-darwin .close-btn:hover::after {
   opacity: 1;
 }
 

From 039a820952096cb37f75407192ea3c7d48936c9f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 10 Feb 2025 22:37:20 +0800
Subject: [PATCH 158/332] =?UTF-8?q?=E5=B0=86=E5=94=AF=E4=B8=80ID=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD=E6=8F=90=E5=8F=96=E5=88=B0=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=9A=84=E5=85=B7=E6=A8=A1=E5=9D=97=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                              |  7 -------
 src/components/composer/ComposerFlow.vue | 18 ++++++++----------
 src/components/composer/FlowTabs.vue     |  3 ++-
 src/js/common/uuid.js                    |  7 +++++++
 4 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 src/js/common/uuid.js

diff --git a/src/App.vue b/src/App.vue
index 61ffc659..91ee87c9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -252,13 +252,6 @@ export default defineComponent({
           .padStart(2, "0")
       );
     },
-    getUniqueId() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-        const r = (Math.random() * 16) | 0;
-        const v = c === "x" ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-      });
-    },
   },
   watch: {
     // 监听 glassEffect 值变化
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 8ab3f0c8..78853543 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -63,6 +63,7 @@ import ComposerCard from "./ComposerCard.vue";
 import ChainStyles from "./flow/ChainStyles.vue";
 import DropArea from "./flow/DropArea.vue";
 import { findCommandByValue } from "js/composer/composerConfig";
+import { getUniqueId } from "js/common/uuid";
 
 // 拖拽前的命令列表，非响应式
 let commandsBeforeDrag = [];
@@ -262,7 +263,7 @@ export default defineComponent({
           }
         } else {
           // 处理链式命令
-          const chainId = this.getUniqueId();
+          const chainId = getUniqueId();
           let insertIndex =
             this.dragIndex >= 0 ? this.dragIndex : newCommands.length;
 
@@ -270,7 +271,7 @@ export default defineComponent({
           for (const commandType of commandChain) {
             const commandItem = {
               ...newCommand,
-              id: this.getUniqueId(),
+              id: getUniqueId(),
               commandType,
               chainId,
             };
@@ -286,13 +287,10 @@ export default defineComponent({
     createNewCommand(parsedAction) {
       const newCommand = {
         ...parsedAction,
-        id: this.getUniqueId(),
+        id: getUniqueId(),
       };
       return newCommand;
     },
-    getUniqueId() {
-      return this.$root.getUniqueId();
-    },
     isFirstCommandInChain(command) {
       if (!command.commandChain) return false;
       return command.commandType === command.commandChain?.[0];
@@ -347,7 +345,7 @@ export default defineComponent({
       const newCommands = [...this.commands];
       const branchCommand = {
         ...window.lodashM.cloneDeep(findCommandByValue(value)),
-        id: this.getUniqueId(),
+        id: getUniqueId(),
         chainId: chainId,
         commandType: commandType,
       };
@@ -409,12 +407,12 @@ export default defineComponent({
     },
     copyCommands(commands) {
       // 生成新的chainId
-      const newChainId = this.getUniqueId();
+      const newChainId = getUniqueId();
       // 复制并修改每个命令
       const newCommands = [];
       commands.forEach((cmd) => {
         const copiedCommand = window.lodashM.cloneDeep(cmd);
-        copiedCommand.id = this.getUniqueId();
+        copiedCommand.id = getUniqueId();
         if (copiedCommand.chainId) copiedCommand.chainId = newChainId;
         newCommands.push(copiedCommand);
       });
@@ -439,7 +437,7 @@ export default defineComponent({
           // 单个命令的复制逻辑
           const newCommand = {
             ...command,
-            id: this.getUniqueId(),
+            id: getUniqueId(),
           };
           const newCommands = [...this.commands];
           newCommands.splice(index + 1, 0, newCommand);
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index e0a7692a..d0fbc641 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -102,6 +102,7 @@ import FlowManager from "components/composer/flow/FlowManager.vue";
 import { generateCode } from "js/composer/generateCode";
 import { findCommandByValue } from "js/composer/composerConfig";
 import { generateUniqSuffix } from "js/composer/variableManager";
+import { getUniqueId } from "js/common/uuid";
 export default defineComponent({
   name: "FlowTabs",
   components: {
@@ -228,7 +229,7 @@ export default defineComponent({
       );
     },
     addFlow(options = {}) {
-      const id = this.$root.getUniqueId();
+      const id = getUniqueId();
       const name = options.name || this.generateFlowName();
       const newFlow = {
         id,
diff --git a/src/js/common/uuid.js b/src/js/common/uuid.js
new file mode 100644
index 00000000..84ef06cb
--- /dev/null
+++ b/src/js/common/uuid.js
@@ -0,0 +1,7 @@
+export const getUniqueId = () => {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+    const r = (Math.random() * 16) | 0;
+    const v = c === "x" ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+};

From 343572568cb5fbe3b2d6a4485f2edee8c4c8dc47 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 00:14:11 +0800
Subject: [PATCH 159/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             |  1 +
 src/components/menu/PersonalizeMenu.vue | 18 +++++++--------
 src/components/menu/index.vue           |  3 +--
 src/components/popup/UserInfo.vue       | 29 ++++++++++---------------
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 91ee87c9..116149b0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,6 +31,7 @@ export default defineComponent({
       cronJobs: {},
       enterData: {},
       subInputEvent: null,
+      isVIP: false,
     };
   },
   created: function () {
diff --git a/src/components/menu/PersonalizeMenu.vue b/src/components/menu/PersonalizeMenu.vue
index d7e0b868..3c408ac1 100644
--- a/src/components/menu/PersonalizeMenu.vue
+++ b/src/components/menu/PersonalizeMenu.vue
@@ -1,14 +1,14 @@
 <template>
   <q-menu anchor="top end" self="top start">
     <q-list>
-      <q-item clickable :disable="!user.isVIP">
+      <q-item clickable :disable="!$root.isVIP">
         <q-item-section side>
           <q-icon name="color_lens" />
         </q-item-section>
         <q-item-section>主颜色</q-item-section>
         <q-tooltip>你可以更改界面的主题色，会员限定 😎</q-tooltip>
         <q-menu
-          v-if="user.isVIP"
+          v-if="$root.isVIP"
           anchor="center left"
           self="center right"
           style="min-width: 250px"
@@ -29,13 +29,13 @@
           </div>
         </q-menu>
       </q-item>
-      <q-item clickable :disable="!user.isVIP" class="bg-img-menu">
+      <q-item clickable :disable="!$root.isVIP" class="bg-img-menu">
         <q-item-section side>
           <q-icon name="image" />
         </q-item-section>
         <q-item-section>背景图片设置</q-item-section>
         <q-tooltip>设置背景图片，会员限定 😎</q-tooltip>
-        <q-menu v-if="user.isVIP" anchor="center left" self="center right">
+        <q-menu v-if="$root.isVIP" anchor="center left" self="center right">
           <q-list style="min-width: 280px">
             <q-item>
               <q-item-section>
@@ -84,7 +84,7 @@
           </q-list>
         </q-menu>
       </q-item>
-      <q-item clickable :disable="!user.isVIP">
+      <q-item clickable :disable="!$root.isVIP">
         <q-item-section side>
           <q-icon name="blur_on" />
         </q-item-section>
@@ -97,6 +97,7 @@
               :min="0"
               :max="12"
               :step="1"
+              :disable="!$root.isVIP"
               color="primary"
               @update:model-value="toggleGlassEffect"
               size="34px"
@@ -109,7 +110,7 @@
           </div>
         </q-item-section>
       </q-item>
-      <q-item clickable :disable="!user.isVIP">
+      <q-item clickable :disable="!$root.isVIP">
         <q-item-section side>
           <q-icon name="label" />
         </q-item-section>
@@ -120,7 +121,7 @@
         <q-item-section side>
           <q-toggle
             v-model="$root.profile.denseTagBar"
-            :disable="!user.isVIP"
+            :disable="!$root.isVIP"
             color="primary"
             @update:model-value="$root.saveProfile"
           />
@@ -149,9 +150,6 @@ import pictureCompress from "picture-compressor";
 
 export default {
   name: "PersonalizeMenu",
-  props: {
-    user: Object,
-  },
   data() {
     return {
       selectFileLight: null,
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 1f397a19..15ca2160 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -9,7 +9,6 @@
     >
       <!-- 用户信息 -->
       <UserInfo
-        ref="user"
         :allQuickCommandsLength="allQuickCommandsLength"
         :allFeaturesLength="allFeaturesLength"
       />
@@ -49,7 +48,7 @@
             <q-icon name="keyboard_arrow_left" />
           </q-item-section>
           <q-item-section>个性化设置</q-item-section>
-          <PersonalizeMenu :user="$refs.user" />
+          <PersonalizeMenu />
         </q-item>
 
         <!-- 收藏 -->
diff --git a/src/components/popup/UserInfo.vue b/src/components/popup/UserInfo.vue
index d9bbdf67..c5c742a0 100644
--- a/src/components/popup/UserInfo.vue
+++ b/src/components/popup/UserInfo.vue
@@ -4,7 +4,7 @@
       <q-avatar size="48px">
         <q-img :src="http://github.com/userInfo.avatar" />
         <q-badge
-          v-if="isVIP"
+          v-if="$root.isVIP"
           floating
           color="deep-orange"
           :label="isDoubleVIP ? 'V²' : 'V'"
@@ -146,20 +146,11 @@ export default {
       showPayPage: false,
       memberPrice: 2,
       isPluginVIP: false,
+      isUtoolsVIP: false,
+      isDoubleVIP: false,
       goodsId: "3LHZ9WdXnUnBSgGRzr2c7bDOyGJBzUyD",
     };
   },
-  computed: {
-    isDoubleVIP() {
-      return this.isUtoolsVIP && this.isPluginVIP;
-    },
-    isVIP() {
-      return this.isUtoolsVIP || this.isPluginVIP;
-    },
-    isUtoolsVIP() {
-      return this.userInfo.type === "member";
-    },
-  },
   props: {
     allFeaturesLength: Number,
     allQuickCommandsLength: Number,
@@ -168,7 +159,7 @@ export default {
     this.getUserInfo();
   },
   methods: {
-    getUserInfo() {
+    async getUserInfo() {
       Object.assign(this.userInfo, this.$root.utools.whole.getUser());
       this.userInfo.exp = this.$root.utools.getDB("cfg_exp");
       this.userInfo.level = this.levelDetail
@@ -183,11 +174,13 @@ export default {
             ).toFixed(2)
           )
         : 1;
-      this.$root.utools.whole.fetchUserPayments().then((ret) => {
-        console.log("PayInfo:", ret);
-        !ret.filter((x) => x.goods_id === this.goodsId).length ||
-          (this.isPluginVIP = true);
-      });
+      let ret = await this.$root.utools.whole.fetchUserPayments();
+      console.log("PayInfo:", ret);
+
+      this.isPluginVIP = ret.find((x) => x.goods_id === this.goodsId);
+      this.isUtoolsVIP = this.userInfo.type === "member";
+      this.isDoubleVIP = this.isUtoolsVIP && this.isPluginVIP;
+      this.$root.isVIP = this.isUtoolsVIP || this.isPluginVIP;
     },
     thinkOver() {
       let that = this;

From ed609b3fa964e74dd1822cf363f21e7cd7727b87 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 09:27:51 +0800
Subject: [PATCH 160/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CommandManager?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=BF=9B=E8=A1=8C=E5=91=BD=E4=BB=A4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/commandManager.js        | 208 ++++++++++++++++++++++++++++++++
 src/pages/ConfigurationPage.vue | 161 ++++++------------------
 2 files changed, 244 insertions(+), 125 deletions(-)
 create mode 100644 src/js/commandManager.js

diff --git a/src/js/commandManager.js b/src/js/commandManager.js
new file mode 100644
index 00000000..025df161
--- /dev/null
+++ b/src/js/commandManager.js
@@ -0,0 +1,208 @@
+import { reactive } from "vue";
+import quickcommandParser from "js/common/quickcommandParser.js";
+import importAll from "js/common/importAll.js";
+import utoolsFull from "js/utools.js";
+
+// 默认命令
+const defaultCommands = importAll(
+  require.context("../json/", false, /\.json$/)
+);
+
+// 响应式状态
+const state = reactive({
+  allQuickCommands: {},
+  allQuickCommandTags: [],
+  activatedQuickCommandFeatureCodes: [],
+  activatedQuickPanels: [],
+});
+
+// 使用函数工厂模式，确保每个组件获取自己的状态副本
+export function useCommandManager() {
+  // 获取已启用的命令
+  const getActivatedFeatures = () => {
+    let features = utoolsFull.whole.getFeatures();
+    let currentFts = [];
+    let quickpanels = [];
+    features.forEach((x) =>
+      x.code.slice(0, 6) == "panel_"
+        ? quickpanels.push(window.hexDecode(x.code.slice(6)))
+        : currentFts.push(x)
+    );
+    state.activatedQuickCommandFeatureCodes = currentFts.map((f) => f.code);
+    state.activatedQuickPanels = quickpanels;
+  };
+  // 清除所有命令
+  const clearAllFeatures = () => {
+    for (var feature of utoolsFull.whole.getFeatures()) {
+      if (feature.code.slice(0, 8) === "feature_") continue;
+      utoolsFull.whole.removeFeature(feature.code);
+    }
+    state.activatedQuickCommandFeatureCodes = [];
+  };
+  // 获取所有的命令
+  const getAllQuickCommands = () => {
+    state.allQuickCommands = window.lodashM.cloneDeep(defaultCommands);
+    utoolsFull.getAll("qc_").forEach((x) => {
+      if (x.data.features.code.includes("default_")) return;
+      state.allQuickCommands[x.data.features.code] = x.data;
+    });
+    getAllQuickCommandTags();
+  };
+
+  // 获取所有标签
+  const getAllQuickCommandTags = () => {
+    state.allQuickCommandTags = window.lodashM
+      .union(...Object.values(state.allQuickCommands).map((x) => x.tags))
+      .concat(["未分类"])
+      .filter((x) => x);
+  };
+
+  // 保存命令
+  const saveCommand = (command) => {
+    const code = command.features.code;
+    state.allQuickCommands[code] = command;
+
+    if (!state.activatedQuickCommandFeatureCodes.includes(code)) {
+      state.activatedQuickCommandFeatureCodes.push(code);
+    }
+
+    utoolsFull.whole.removeFeature(code);
+    utoolsFull.whole.setFeature(command.features);
+
+    if (!isDefaultCommand(code)) {
+      utoolsFull.putDB(window.lodashM.cloneDeep(command), "qc_" + code);
+    }
+
+    getAllQuickCommandTags();
+    return code;
+  };
+
+  // 删除命令
+  const removeCommand = (code) => {
+    utoolsFull.whole.copyText(
+      JSON.stringify(state.allQuickCommands[code], null, 4)
+    );
+    delete state.allQuickCommands[code];
+    utoolsFull.delDB("qc_" + code);
+    removeCommandFromHistory(code);
+    disableCommand(code);
+    getAllQuickCommandTags();
+    quickcommand.showMessageBox(
+      "删除成功，为防止误操作，已将删除的命令复制到剪贴板",
+      "success",
+      1000,
+      "bottom-right"
+    );
+  };
+
+  // 从历史记录中删除命令
+  const removeCommandFromHistory = (code) => {
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key.startsWith("editor_history_" + code)) {
+        localStorage.removeItem(key);
+      }
+    }
+  };
+
+  // 启用命令
+  const enableCommand = (code) => {
+    utoolsFull.whole.setFeature(
+      window.lodashM.cloneDeep(state.allQuickCommands[code].features)
+    );
+    state.activatedQuickCommandFeatureCodes.push(code);
+  };
+
+  // 禁用命令
+  const disableCommand = (code) => {
+    utoolsFull.whole.removeFeature(code);
+    state.activatedQuickCommandFeatureCodes =
+      state.activatedQuickCommandFeatureCodes.filter((x) => x !== code);
+  };
+
+  // 导入命令
+  const importCommand = async (quickCommandInfo) => {
+    if (!quickCommandInfo) {
+      quickcommand.showMessageBox("导入未完成！", "warning");
+      return false;
+    }
+
+    let parsedData = await quickcommandParser(quickCommandInfo);
+    if (!parsedData) {
+      quickcommand.showMessageBox("格式错误", "error");
+      return false;
+    }
+
+    let dataToPushed = {};
+    if (parsedData.single) {
+      if (isDefaultCommand(parsedData.qc.features.code)) {
+        quickcommand.showMessageBox("默认命令不能导入！", "error");
+        return false;
+      }
+      dataToPushed[parsedData.qc.features.code] = parsedData.qc;
+    } else {
+      dataToPushed = parsedData.qc;
+    }
+
+    for (var code of Object.keys(dataToPushed)) {
+      if (isDefaultCommand(code)) continue;
+      utoolsFull.putDB(dataToPushed[code], "qc_" + code);
+    }
+
+    Object.assign(state.allQuickCommands, dataToPushed);
+    getAllQuickCommandTags();
+    quickcommand.showMessageBox("导入成功！");
+    return parsedData.qc;
+  };
+
+  // 是否为默认命令
+  const isDefaultCommand = (code) => {
+    return code.slice(0, 8) === "default_";
+  };
+
+  // 导出所有命令
+  const exportAllCommands = (saveAsFile = true) => {
+    let options = {
+      title: "选择保存位置",
+      defaultPath: "quickCommand",
+      filters: [{ name: "json", extensions: ["json"] }],
+    };
+
+    let commandsToExport = window.lodashM.cloneDeep(state.allQuickCommands);
+    Object.keys(commandsToExport).forEach((code) => {
+      if (isDefaultCommand(code)) delete commandsToExport[code];
+    });
+
+    let stringifyCommands = JSON.stringify(commandsToExport);
+    if (saveAsFile) {
+      return window.saveFile(stringifyCommands, options);
+    } else {
+      utoolsFull.whole.copyText(stringifyCommands);
+      return true;
+    }
+  };
+
+  // 清空所有命令
+  const clearAllCommands = () => {
+    exportAllCommands(false);
+    utoolsFull.delAll("qc_");
+    clearAllFeatures();
+    getAllQuickCommands();
+  };
+
+  return {
+    state,
+    getAllQuickCommands,
+    getAllQuickCommandTags,
+    saveCommand,
+    removeCommand,
+    enableCommand,
+    disableCommand,
+    importCommand,
+    isDefaultCommand,
+    exportAllCommands,
+    getActivatedFeatures,
+    clearAllFeatures,
+    clearAllCommands,
+  };
+}
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 37b1fc87..5e240853 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -56,8 +56,7 @@
 
 <script>
 import { defineAsyncComponent } from "vue";
-import quickcommandParser from "js/common/quickcommandParser.js";
-import importAll from "js/common/importAll.js";
+import { useCommandManager } from "js/commandManager.js";
 import changeLog from "js/options/changeLog.js";
 import pinyinMatch from "pinyin-match";
 import CommandEditor from "components/CommandEditor";
@@ -71,9 +70,6 @@ const CommandRunResult = defineAsyncComponent(() =>
 );
 // Performance Rendering > 300ms
 
-// 默认命令
-let defaultCommands = importAll(require.context("../json/", false, /\.json$/));
-
 export default {
   components: {
     CommandEditor,
@@ -84,14 +80,14 @@ export default {
     BackgroundLayer,
     CommandPanels,
   },
+  setup() {
+    const commandManager = useCommandManager();
+    return { commandManager };
+  },
   data() {
     return {
       currentTag: "",
       lastTag: "",
-      activatedQuickCommandFeatureCodes: [],
-      activatedQuickPanels: [],
-      allQuickCommands: {},
-      allQuickCommandTags: [],
       commandSearchKeyword: "",
       isEditorShow: false,
       commandEditorAction: {},
@@ -99,6 +95,18 @@ export default {
     };
   },
   computed: {
+    allQuickCommands() {
+      return this.commandManager.state.allQuickCommands;
+    },
+    allQuickCommandTags() {
+      return this.commandManager.state.allQuickCommandTags;
+    },
+    activatedQuickCommandFeatureCodes() {
+      return this.commandManager.state.activatedQuickCommandFeatureCodes;
+    },
+    activatedQuickPanels() {
+      return this.commandManager.state.activatedQuickPanels;
+    },
     // 当前标签下的所有快捷命令
     currentTagQuickCommands() {
       let commands = Object.values(
@@ -184,33 +192,11 @@ export default {
     },
     // 获取所有已启用的命令的 features 以及面板名称
     getActivatedFeatures() {
-      let features = utools.getFeatures();
-      let currentFts = [];
-      let quickpanels = [];
-      features.forEach((x) =>
-        x.code.slice(0, 6) == "panel_"
-          ? quickpanels.push(window.hexDecode(x.code.slice(6)))
-          : currentFts.push(x)
-      );
-      this.activatedQuickCommandFeatureCodes = currentFts.map((f) => f.code);
-      // 已启用的面板
-      this.activatedQuickPanels = quickpanels;
+      this.commandManager.getActivatedFeatures();
     },
     // 获取所有的命令（导出的格式）
     getAllQuickCommands() {
-      this.allQuickCommands = window.lodashM.cloneDeep(defaultCommands);
-      this.$root.utools.getAll("qc_").forEach((x) => {
-        if (x.data.features.code.includes("default_")) return;
-        this.allQuickCommands[x.data.features.code] = x.data;
-      });
-      this.getAllQuickCommandTags();
-    },
-    getAllQuickCommandTags() {
-      // 获取所有标签
-      this.allQuickCommandTags = window.lodashM
-        .union(...Object.values(this.allQuickCommands).map((x) => x.tags))
-        .concat(["未分类"])
-        .filter((x) => x);
+      this.commandManager.getAllQuickCommands();
     },
     // 监听命令变更事件
     commandChanged(event) {
@@ -241,40 +227,17 @@ export default {
     },
     // 启用命令
     enableCommand(code) {
-      this.$root.utools.whole.setFeature(
-        window.lodashM.cloneDeep(this.allQuickCommands[code].features)
-      );
-      this.activatedQuickCommandFeatureCodes.push(code);
+      this.commandManager.enableCommand(code);
     },
     // 禁用命令
     disableCommand(code) {
-      this.$root.utools.whole.removeFeature(code);
-      this.activatedQuickCommandFeatureCodes =
-        this.activatedQuickCommandFeatureCodes.filter((x) => x !== code);
+      this.commandManager.disableCommand(code);
     },
     // 删除命令
     removeCommand(code) {
-      utools.copyText(JSON.stringify(this.allQuickCommands[code], null, 4));
-      delete this.allQuickCommands[code];
-      this.$root.utools.delDB("qc_" + code);
-      this.removeCommandFromHistory(code);
-      this.disableCommand(code);
-      this.getAllQuickCommandTags();
-      if (!this.allQuickCommandTags.includes(this.currentTag))
+      this.commandManager.removeCommand(code);
+      if (!this.allQuickCommandTags.includes(this.currentTag)) {
         this.changeCurrentTag("默认");
-      quickcommand.showMessageBox(
-        "删除成功，为防止误操作，已将删除的命令复制到剪贴板",
-        "success",
-        1000,
-        "bottom-right"
-      );
-    },
-    removeCommandFromHistory(code) {
-      for (let i = 0; i < localStorage.length; i++) {
-        const key = localStorage.key(i);
-        if (key.startsWith("editor_history_" + code)) {
-          localStorage.removeItem(key);
-        }
       }
     },
     // 编辑命令
@@ -290,32 +253,14 @@ export default {
     },
     // 是否为默认命令
     isDefaultCommand(code) {
-      return code.slice(0, 8) === "default_";
+      return this.commandManager.isDefaultCommand(code);
     },
     // 导入命令
     async importCommand(quickCommandInfo) {
-      if (!quickCommandInfo)
-        return quickcommand.showMessageBox("导入未完成！", "warning");
-      let parsedData = await quickcommandParser(quickCommandInfo);
-      if (!parsedData) return quickcommand.showMessageBox("格式错误", "error");
-      // 单个命令导入
-      let dataToPushed = {};
-      if (parsedData.single) {
-        if (this.isDefaultCommand(parsedData.qc.features.code))
-          return quickcommand.showMessageBox("默认命令不能导入！", "error");
-        dataToPushed[parsedData.qc.features.code] = parsedData.qc;
-        // 多个
-      } else {
-        dataToPushed = parsedData.qc;
-      }
-      for (var code of Object.keys(dataToPushed)) {
-        if (this.isDefaultCommand(code)) continue;
-        this.$root.utools.putDB(dataToPushed[code], "qc_" + code);
+      const command = await this.commandManager.importCommand(quickCommandInfo);
+      if (command) {
+        this.locateToCommand(command.tags, command.features?.code);
       }
-      Object.assign(this.allQuickCommands, dataToPushed);
-      this.getAllQuickCommandTags();
-      quickcommand.showMessageBox("导入成功！");
-      this.locateToCommand(parsedData.qc.tags, parsedData.qc.features?.code);
     },
     // 定位命令, 包含changeCurrentTag
     locateToCommand(tags = ["默认"], code) {
@@ -347,27 +292,8 @@ export default {
     },
     // 全部导出
     exportAllCommands(saveAsFile = true) {
-      let options = {
-        title: "选择保存位置",
-        defaultPath: "quickCommand",
-        filters: [
-          {
-            name: "json",
-            extensions: ["json"],
-          },
-        ],
-      };
-      let commandsToExport = window.lodashM.cloneDeep(this.allQuickCommands);
-      // 不导出默认命令
-      Object.keys(commandsToExport).forEach((code) => {
-        if (this.isDefaultCommand(code)) delete commandsToExport[code];
-      });
-      let stringifyCommands = JSON.stringify(commandsToExport);
-      if (saveAsFile) {
-        window.saveFile(stringifyCommands, options) &&
-          quickcommand.showMessageBox("导出成功！");
-      } else {
-        utools.copyText(stringifyCommands);
+      if (this.commandManager.exportAllCommands(saveAsFile)) {
+        quickcommand.showMessageBox("导出成功！");
       }
     },
     // 清空
@@ -375,13 +301,10 @@ export default {
       quickcommand
         .showConfirmBox("将会清空所有自定义命令，停用所有实用功能，请确认！")
         .then((isConfirmed) => {
-          if (!isConfirmed)
+          if (!isConfirmed) {
             return quickcommand.showMessageBox("取消操作", "info");
-          this.exportAllCommands(false);
-          this.$root.utools.delAll("qc_");
-          this.clearAllFeatures();
-          this.allQuickCommands = window.lodashM.cloneDeep(defaultCommands);
-          this.getAllQuickCommandTags();
+          }
+          this.commandManager.clearAllCommands();
           this.changeCurrentTag("默认");
           quickcommand.showMessageBox(
             "清空完毕，为防止误操作，已将所有命令复制到剪贴板，可通过导入命令恢复",
@@ -393,11 +316,7 @@ export default {
     },
     // 删除所有 features
     clearAllFeatures() {
-      for (var feature of utools.getFeatures()) {
-        if (feature.code.slice(0, 8) === "feature_") continue;
-        this.$root.utools.whole.removeFeature(feature.code);
-      }
-      this.activatedQuickCommandFeatureCodes = [];
+      this.commandManager.clearAllFeatures();
     },
     // 搜索方法
     updateSearch(value) {
@@ -428,15 +347,7 @@ export default {
       this.isEditorShow = true;
     },
     saveCommand(command) {
-      let code = command.features.code;
-      this.allQuickCommands[code] = command;
-      //无论禁用还是启用都启用
-      if (!this.activatedQuickCommandFeatureCodes.includes(code))
-        this.activatedQuickCommandFeatureCodes.push(code);
-      // 先删除再添加，强制刷新
-      this.$root.utools.whole.removeFeature(code);
-      this.$root.utools.whole.setFeature(command.features);
-      this.getAllQuickCommandTags();
+      const code = this.commandManager.saveCommand(command);
       this.locateToCommand(command.tags, code);
     },
     editorEvent(event) {
@@ -482,8 +393,8 @@ export default {
       });
 
       // 更新存储
-      this.allQuickCommands = {
-        ...this.allQuickCommands,
+      this.commandManager.state.allQuickCommands = {
+        ...this.commandManager.state.allQuickCommands,
         ...tagCommands,
       };
 

From 6e8a0c79e3841be1d43df3cd8472a6b6d417af86 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 15:09:42 +0800
Subject: [PATCH 161/332] =?UTF-8?q?=E8=B0=83=E6=95=B4buttongroup=E5=92=8Cc?=
 =?UTF-8?q?heckgroup=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/ButtonGroup.vue           | 52 +++++++++++++++----
 src/components/composer/common/CheckGroup.vue | 43 +++++++++++----
 2 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/src/components/composer/common/ButtonGroup.vue b/src/components/composer/common/ButtonGroup.vue
index afe80e00..87535108 100644
--- a/src/components/composer/common/ButtonGroup.vue
+++ b/src/components/composer/common/ButtonGroup.vue
@@ -7,15 +7,32 @@
   >
     <div class="button-group">
       <div
-        v-for="opt in options"
+        v-for="opt in formattedOptions"
         :key="opt.value"
         :style="{
           height: height,
+          flex: `1 0 calc(${100 / formattedOptions.length}% - ${
+            (4 * (formattedOptions.length - 1)) / formattedOptions.length
+          }px)`,
         }"
-        :class="['button-item', { active: modelValue === opt.value }]"
+        :class="[
+          'button-item',
+          {
+            active: modelValue === opt.value,
+            disabled: opt.disabled,
+          },
+        ]"
         @click="$emit('update:modelValue', opt.value)"
       >
-        {{ opt.label }}
+        <div class="q-mr-sm" v-if="opt.icon">
+          <q-img
+            :src="http://github.com/opt.icon"
+            width="24px"
+            v-if="opt.icon.includes('.png')"
+          />
+          <q-icon :name="opt.icon" v-else />
+        </div>
+        <div>{{ opt.label }}</div>
       </div>
     </div>
   </component>
@@ -34,10 +51,6 @@ export default defineComponent({
     modelValue: {
       required: true,
     },
-    height: {
-      type: String,
-      default: "26px",
-    },
     options: {
       type: Array,
       required: true,
@@ -54,8 +67,20 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    height: {
+      type: String,
+      default: "32px",
+    },
   },
   emits: ["update:modelValue"],
+  computed: {
+    formattedOptions() {
+      return this.options.map((opt) => ({
+        ...opt,
+        value: opt.value ?? opt.name,
+      }));
+    },
+  },
 });
 </script>
 
@@ -64,13 +89,11 @@ export default defineComponent({
   display: flex;
   width: 100%;
   flex-wrap: wrap;
-  gap: 6px;
-  border-radius: 6px;
+  gap: 4px;
 }
 
 .button-item {
-  flex: 1;
-  min-width: 80px;
+  min-width: fit-content;
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -95,4 +118,11 @@ export default defineComponent({
   background: var(--q-primary);
   border-color: var(--q-primary);
 }
+
+.button-item.disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+  pointer-events: none;
+  filter: grayscale(1);
+}
 </style>
diff --git a/src/components/composer/common/CheckGroup.vue b/src/components/composer/common/CheckGroup.vue
index 0b543272..1d3522e7 100644
--- a/src/components/composer/common/CheckGroup.vue
+++ b/src/components/composer/common/CheckGroup.vue
@@ -7,7 +7,7 @@
   >
     <div class="check-btn-group">
       <q-btn
-        v-for="option in options"
+        v-for="option in formattedOptions"
         :key="option.value"
         :color="isSelected(option.value) ? 'primary' : 'grey-7'"
         :flat="!isSelected(option.value)"
@@ -18,15 +18,24 @@
           { 'check-btn--selected': isSelected(option.value) },
         ]"
         :style="{
-          flex: `1 0 calc(${100 / options.length}% - ${
-            (4 * (options.length - 1)) / options.length
+          flex: `1 0 calc(${100 / formattedOptions.length}% - ${
+            (4 * (formattedOptions.length - 1)) / formattedOptions.length
           }px)`,
+          height: height,
         }"
         @click="toggleOption(option.value)"
       >
         <template #default>
           <div class="row items-center full-width">
-            <div class="check-btn-content">
+            <div class="check-btn-content row items-center">
+              <div class="q-mr-sm" v-if="option.icon">
+                <q-img
+                  :src="http://github.com/option.icon"
+                  width="24px"
+                  v-if="option.icon.includes('.png')"
+                />
+                <q-icon :name="option.icon" v-else />
+              </div>
               <div class="check-btn-label">{{ option.label }}</div>
             </div>
             <q-icon
@@ -61,8 +70,6 @@ export default defineComponent({
     options: {
       type: Array,
       required: true,
-      validator: (options) =>
-        options.every((opt) => opt.label && opt.value !== undefined),
     },
     label: {
       type: String,
@@ -76,6 +83,26 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    height: {
+      type: String,
+      default: "36px",
+    },
+  },
+  computed: {
+    formattedOptions() {
+      return this.options.map((opt) => {
+        if (typeof opt === "string") {
+          return {
+            label: opt,
+            value: opt,
+          };
+        }
+        return {
+          ...opt,
+          value: opt.value ?? opt.name,
+        };
+      });
+    },
   },
   emits: ["update:model-value"],
   methods: {
@@ -107,10 +134,8 @@ export default defineComponent({
 .check-btn {
   min-width: fit-content !important;
   max-width: 100% !important;
-  height: auto !important;
-  min-height: 32px;
   font-size: 12px;
-  padding: 4px 8px;
+  padding: 0 8px;
   border-radius: 4px !important;
   transition: all 0.3s;
   background-color: rgba(0, 0, 0, 0.03);

From b4a14e2a9e481679b42ee7bec0779e66c4711f06 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 15:14:55 +0800
Subject: [PATCH 162/332] =?UTF-8?q?=E4=BF=AE=E6=94=B9programs=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue          |  2 +-
 src/components/card/layouts/DenseLayout.vue  |  6 ++++--
 src/components/card/layouts/ListLayout.vue   |  4 +++-
 src/components/editor/CommandLanguageBar.vue | 14 ++++++++++----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index f74b8aed..de821422 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -171,7 +171,7 @@ export default {
       let option =
         command.program === "custom"
           ? command.customOptions
-          : this.$root.programs[command.program];
+          : programs[command.program];
       option.scptarg = command.scptarg || "";
       option.charset = command.charset || {};
       option.envPath = this.$root.nativeProfile.envPath.trim() || "";
diff --git a/src/components/card/layouts/DenseLayout.vue b/src/components/card/layouts/DenseLayout.vue
index 3fd5d293..4e1db697 100644
--- a/src/components/card/layouts/DenseLayout.vue
+++ b/src/components/card/layouts/DenseLayout.vue
@@ -46,7 +46,7 @@
         width="16px"
       />
       <div>|</div>
-      <q-img :src="http://github.com/$root.programs[commandInfo.program].icon" width="16px" />
+      <q-img :src="http://github.com/programs[commandInfo.program].icon" width="16px" />
       <div class="text-subtitle2">{{ programName }}</div>
     </div>
   </q-card-section>
@@ -55,6 +55,7 @@
 <script>
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
+import programs from "js/options/programs.js";
 
 export default {
   name: "DenseLayout",
@@ -69,11 +70,12 @@ export default {
   data() {
     return {
       platformTypes,
+      programs,
     };
   },
   computed: {
     program() {
-      return this.$root.programs[this.commandInfo.program];
+      return this.programs[this.commandInfo.program];
     },
     programName() {
       return this.program.shortName ?? this.program.name;
diff --git a/src/components/card/layouts/ListLayout.vue b/src/components/card/layouts/ListLayout.vue
index fda694f3..82ac87b5 100644
--- a/src/components/card/layouts/ListLayout.vue
+++ b/src/components/card/layouts/ListLayout.vue
@@ -50,6 +50,7 @@
 <script>
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
+import programs from "js/options/programs.js";
 
 export default {
   name: "ListLayout",
@@ -64,11 +65,12 @@ export default {
   data() {
     return {
       platformTypes,
+      programs,
     };
   },
   computed: {
     program() {
-      return this.$root.programs[this.commandInfo.program];
+      return this.programs[this.commandInfo.program];
     },
   },
 };
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index c207c1d9..daeb744e 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -17,13 +17,13 @@
         >
           <template v-slot:append>
             <q-avatar size="lg" square>
-              <img :src="http://github.com/$root.programs[modelValue.program].icon" />
+              <img :src="http://github.com/programs[modelValue.program].icon" />
             </q-avatar>
           </template>
           <template v-slot:option="scope">
             <q-item v-bind="scope.itemProps">
               <q-item-section avatar>
-                <img width="32" :src="http://github.com/$root.programs[scope.opt].icon" />
+                <img width="32" :src="http://github.com/programs[scope.opt].icon" />
               </q-item-section>
               <q-item-section>
                 <q-item-label v-html="scope.opt" />
@@ -162,6 +162,7 @@
 </template>
 
 <script>
+import programs from "js/options/programs.js";
 
 export default {
   name: "CommandLanguageBar",
@@ -190,9 +191,14 @@ export default {
     "save",
     "show-composer",
   ],
+  data() {
+    return {
+      programs,
+    };
+  },
   computed: {
     programLanguages() {
-      return Object.keys(this.$root.programs);
+      return Object.keys(this.programs);
     },
   },
   methods: {
@@ -235,7 +241,7 @@ export default {
     },
     matchLanguage() {
       if (!this.modelValue.customOptions.ext) return;
-      let language = Object.values(this.$root.programs).filter(
+      let language = Object.values(this.programs).filter(
         (program) => program.ext === this.modelValue.customOptions.ext
       );
       if (language.length) {

From e71d7081a8ef12e89610958fbc8cae8cdf74cd14 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 15:16:30 +0800
Subject: [PATCH 163/332] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
 =?UTF-8?q?=EF=BC=8C=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/CommandTypeTag.vue           | 10 +++++-----
 src/components/composer/ComposerCard.vue         |  2 +-
 src/components/composer/ComposerFlow.vue         |  5 -----
 src/components/composer/card/OutputEditor.vue    |  9 +--------
 src/components/composer/flow/ComposerButtons.vue |  8 +++++++-
 src/components/composer/flow/DropArea.vue        |  7 +++++--
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/components/card/CommandTypeTag.vue b/src/components/card/CommandTypeTag.vue
index df48d580..6827afc7 100644
--- a/src/components/card/CommandTypeTag.vue
+++ b/src/components/card/CommandTypeTag.vue
@@ -114,8 +114,8 @@ export default {
       // window类型的额外应用数量标签的宽度
       for (let i = 0; i < visibleTagCount; i++) {
         const cmd = this.cmds[i];
-        if (cmd.type === 'window' && cmd.match.app.length > 1) {
-          extraBadgesWidth += 31;  // 额外应用数量标签的宽度
+        if (cmd.type === "window" && cmd.match.app.length > 1) {
+          extraBadgesWidth += 31; // 额外应用数量标签的宽度
         }
       }
 
@@ -163,7 +163,7 @@ export default {
           width += 1;
         }
       }
-      return width * 6;  // 假设每个英文字符宽度为6px
+      return width * 6; // 假设每个英文字符宽度为6px
     },
     // 判断是否需要显示tooltip（文本是否溢出）
     needTooltip(cmd) {
@@ -182,8 +182,8 @@ export default {
       }
 
       // 计算文本是否超出可用宽度
-      const iconWidth = 20;      // 图标宽度
-      const paddingWidth = 16;   // 内边距宽度
+      const iconWidth = 20; // 图标宽度
+      const paddingWidth = 16; // 内边距宽度
       const availableWidth = this.maxTagWidth - iconWidth - paddingWidth;
 
       return this.getTextWidth(text) > availableWidth;
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 5e9212a6..f7fbc803 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { defineComponent, inject, provide, computed } from "vue";
+import { defineComponent, provide, computed } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import MultiParams from "components/composer/MultiParams.vue";
 import CommandHead from "components/composer/card/CommandHead.vue";
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 78853543..a6ff593c 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -568,7 +568,6 @@ export default defineComponent({
 
 .command-flow-container {
   padding: 8px;
-  background-color: rgba(255, 255, 255, 0.8);
   border-radius: 4px;
   transition: all 0.3s ease;
   display: flex;
@@ -576,10 +575,6 @@ export default defineComponent({
   position: relative;
 }
 
-.body--dark .command-flow-container {
-  background-color: rgba(32, 32, 32, 0.8);
-}
-
 /* 滑动淡出动画 */
 .slide-fade-enter-active,
 .slide-fade-leave-active {
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 07ab4941..c9149c75 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -203,12 +203,6 @@ export default defineComponent({
         (cmd) => cmd.value === this.command.value
       );
     },
-    defaultOutputVariable() {
-      return (
-        this.currentSubCommand?.defaultOutputVariable ||
-        this.command.defaultOutputVariable
-      );
-    },
     commandName() {
       return this.currentSubCommand.label || this.command.label;
     },
@@ -256,8 +250,7 @@ export default defineComponent({
     },
   },
   methods: {
-    initOutputVars(value) {
-      const outputVariable = value || this.defaultOutputVariable;
+    initOutputVars(outputVariable) {
       // 初始化完整输出变量名
       if (!outputVariable) {
         this.simpleOutputVar = "";
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 3591ab5c..0fd7e97d 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="composer-buttons">
     <div class="right-buttons">
-      <q-btn icon="close" dense flat v-close-popup v-if="showCloseButton">
+      <q-btn
+        icon="close"
+        dense
+        flat
+        v-if="showCloseButton"
+        @click="$emit('action', 'close')"
+      >
         <q-tooltip>退出可视化编排</q-tooltip>
       </q-btn>
       <q-btn
diff --git a/src/components/composer/flow/DropArea.vue b/src/components/composer/flow/DropArea.vue
index 1c0ac87f..ec1eca93 100644
--- a/src/components/composer/flow/DropArea.vue
+++ b/src/components/composer/flow/DropArea.vue
@@ -48,13 +48,16 @@ export default defineComponent({
   justify-content: center;
   border: 2px dashed #e0e0e0;
   border-radius: 4px;
-  margin: 8px 0;
   transition: all 0.3s ease;
   flex: 1;
   user-select: none;
   transition: all 0.3s ease;
 }
 
+.drop-area:has(.add-area) {
+  margin: 8px 0;
+}
+
 .body--dark .drop-area {
   border-color: #676666;
 }
@@ -94,7 +97,7 @@ export default defineComponent({
   display: flex;
   align-items: center;
   justify-content: center;
-  color: grey
+  color: grey;
 }
 
 .add-area {

From e843f7afdca11c76348088befbb8e04561c0faac Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 16:02:31 +0800
Subject: [PATCH 164/332] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E4=B8=AD=E7=9A=84hasSubInput=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json/default_VSSnippet.json        |  1 -
 src/json/default_findGui.json          |  3 +-
 src/json/default_shellRunner.json      |  3 +-
 src/json/default_textManipulation.json |  1 -
 src/json/default_textReplacer.json     | 53 +++++++++++----------
 src/json/default_urlToQrCode.json      |  1 -
 src/json/default_windowsTerminal.json  | 65 +++++++++++++-------------
 7 files changed, 60 insertions(+), 67 deletions(-)

diff --git a/src/json/default_VSSnippet.json b/src/json/default_VSSnippet.json
index 185e3545..5492514d 100644
--- a/src/json/default_VSSnippet.json
+++ b/src/json/default_VSSnippet.json
@@ -15,7 +15,6 @@
     "program": "quickcommand",
     "cmd": "var snippet = {}\nquickcommand.showTextArea(\"请输入代码片段\").then(code => {\n    snippet.body = code.split(\"\\n\")\n    quickcommand.showInputBox([\"代码片段的描述\", \"触发代码片段的关键词\"])\n        .then(inputs => {\n            snippet.prefix = inputs[1]\n            snippet.description = inputs[0]\n            var result = `\"${inputs[0]}\": ` + JSON.stringify(snippet, null, '\\t')\n            console.log(result+'\\n结果已复制')\n            utools.copyText(result)})\n})",
     "output": "text",
-    "hasSubInput": false,
     "scptarg": "",
     "tags": [
         "默认"
diff --git a/src/json/default_findGui.json b/src/json/default_findGui.json
index 808eefd7..ddf7d57c 100644
--- a/src/json/default_findGui.json
+++ b/src/json/default_findGui.json
@@ -20,8 +20,7 @@
         ]
     },
     "output": "html",
-    "hasSubInput": true,
     "tags": [
         "默认"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/json/default_shellRunner.json b/src/json/default_shellRunner.json
index da2128c6..589f7eeb 100644
--- a/src/json/default_shellRunner.json
+++ b/src/json/default_shellRunner.json
@@ -16,8 +16,7 @@
         ]
     },
     "output": "text",
-    "hasSubInput": true,
     "tags": [
         "默认"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/json/default_textManipulation.json b/src/json/default_textManipulation.json
index 6471c5ff..4964e192 100644
--- a/src/json/default_textManipulation.json
+++ b/src/json/default_textManipulation.json
@@ -29,7 +29,6 @@
     ]
   },
   "output": "text",
-  "hasSubInput": false,
   "tags": [
     "默认"
   ]
diff --git a/src/json/default_textReplacer.json b/src/json/default_textReplacer.json
index e4bbd5b3..626095e4 100644
--- a/src/json/default_textReplacer.json
+++ b/src/json/default_textReplacer.json
@@ -1,27 +1,26 @@
-{
-    "program": "quickcommand",
-    "cmd": "quickcommand.showInputBox([\"要替换的内容，两边加 / 使用正则\", \"替换为的内容\"])\n  .then(([search, repl]) => {\n    let reg = search.match(/^\\/(.*?)\\/([igm]*)$/)\n    if (reg) search = new RegExp(reg[1], reg[2])\n    let source = quickcommand.enterData.payload\n    source = source.replace(search, repl)\n    utools.hideMainWindow()\n    quickcommand.sleep(50)\n    send(source)\n    quickcommand.setTimeout(() => {\n      utools.outPlugin()\n    }, 100)\n  })",
-    "scptarg": "",
-    "features": {
-        "code": "default_textReplacer",
-        "explain": "替换选中的文本",
-        "cmds": [
-            {
-                "label": "替换选中的文本",
-                "type": "over",
-                "minNum": 1
-            }
-        ],
-        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABmJLR0QA/wD/AP+gvaeTAAAKUklEQVR4nO2dbWwcRxnH/8/s2Xm5O9vNS928KPFdrKhp0oQmgarQopYSSNSQVAKcQCkiUpvkzknVFCSEgHKhAgoFVbXO5xiktAIpKG0F9AUaQvoBCFFBMSBo0yLsO1tJ0zYkqeNbO419Ow8f4gjnfDe7e7t7ty77k/IhO8/O8+z8b2Z3Z55ZAwEBAQEBAQEBAQFVh2odgF1aO841jIY0rb5gGL0PzB6qdTxO8aUAC9JDs9/c1XCu+HisM38MhFuKDp8G0AdwlkFZXCp09O+5ZrA6kTonVOsAAGB555nICKbfAaKNANYT0AfgYyVM9RLH5l/+R7cRUBjjpsc8DdZlaidAikX8upH1MOR9I4SNAOquFDHQhBQLpEhedQ7BbMg5ceohuuhBtJ5REwFimaFNgP4dllhRZhBsaJmXX9oPvDHxIBHlmblsvQzqcTXQKlCbHsBiKYhXqEzIEGtRJABL1lV3LcF8vFxZLJMvr5xFmJDqT0T3Oq1nIsLNyqxyKRTOgPGOyoaI1xYfY6K86hzJ0rMe4EXjAzUS4PQOGgHohyobZkwSQECqBCgURhv+4Ti4UrF41PhAjQQALPWCm25P8VVDpEkP8OQG7GXjAx4JEPuJ3hzrzH8bzGVH7NM7aASCyj0yXgTQc7JZnzXxYC4RTeeSUdIKo40GjFljpC0EyZsZ9CWgbF0VQ4y9XjY+4MGL2MKukQV10jgCwvUgPJxLRB8pZzu/m2dOK+hZEJoBFAA8x5J/VhiNHnb712z3JkyMvdn2aMrNGEr6cbOyWPriYhaFlwlYMn6IAWzJJaPPlDunJaM/KAir2NBSuV0zBtyM56rYbAhAwInsnMhKtJHhVTwTfLlDa8e5BiNU/ycAxY+XF1nKO/p3Nf7ZLV+VYPsxlPF0bm7k816L4Mo94PYUhwyt/llMbnwAmEFC/KK1Y2ShG76qBqEtdlZ/wms3rggw0Kw/AcI6hcl8WWc81/zY22E3/FWR9liXfq+XDhwL0JIZuhuMpJkdM1bPmBne6NRf1WF0tabzy72q3pEArR35ucS0z4KpBGF3f3v0oBN/tYHDhsAz87t5phe1OxLAqENm/BFSBRPx/blENO3ElxcwIUXEX7NgumyaoVuxs03FAsTT+p1gfMbMjoBHsomG/ZX68Yorb7jZRMOjzPSohVO+sigzGHc7jsoEYCYW8nsWLA9mE5FURT48pHh6of8/4a8DOGJy2nQN2uNux1KRALGM/mmAPmhidpIvFXaCyPE0sJuUnNtJkRSEewh40+T0TbF0/qNuxlNZDxB42MSCSdI2v63NqibW+hLRM8ycMK1Ew0NuxmRbgHjn0K1g3Kg0YhzI7oq8XHFUHmBlYi3X3vACM/9GWRHjU63dg0uUNjawLQATtpuYjGkh41sVxuMZVifWhMYPAhhTmRgF7QFXgoJNARZlBq8B6LMqG2Ls793R1OcsrNqR3dn4bzCeVhoRvlC8VlEptgQIIbQBwHSVDQn47nnfLoKE2dPOrP5m/VZXfNkxZsj1JiZH+xLRVx3E4wv6kuEeBo6pbARjsxu+rAvATGD6hInNUw7j8Q9MymGIgU1uuLEsQDw9vMJk2oHHROiQCzH5ApaF501M4gu7RhY49WO9B2gmj56EV08lZpq9yEwZBnY35QAoh1ONeaVTP5YFYOIblOWMo06D8RvM9BdVOcGongAovdr1v4pY/WuZoqjzjIhWOXVg4yaMxapiKXDCaTB+g8FqAUzaxAp2ekCDqjAkjJMOY/EdFOK3VOUCaHLqwzUBcEmb8rtVJlEQyslE9pUAiLzvBAgZ4XfVFtTo1IcdAaSqsBD153Ynb+F6pzXYEUD5C6fCsONfg9/gOt3smhz3ejsCKMdDuiTffwKQ6TVdcOrDhgCsdCY1mu80GN9R0BaZWFRRAKLTymKzVbIpiNRYmZBFgONkYusCSJO3Qjh/K/QbxFAKwITXnPqwcw8wEYDNsiSmHgxlBgSbTNZZwbIAxCav5cDKWPqi41dzv7AoMxgH4XqVTcjAP536sSxA9my0F8BZdW0FVxYp/IAG7S4Tk9O97RHH81/Wh6AUSYB/bWKlXLCfYmxTFTLTITeSzmytCROT2SrRbfF9w5O2l041Yl0XPgTgJpUNgV9yw5ctAWbg4mEA76lsWBq7HUXkB6QwyfuhYc0YPeyGK1sCvNZ+rQ6GSS+grW5mjlWb2D59FQifU1vxz936VlEFmXHSLGem3pDaj6zUFe/Mp+z69xwpH4VJu5AQ3W65sy1Af7LxFQCvKI0Ym2OdujKFJd6ZTzHBVymMLV35rQCpc5+Yj2d3hst+FMQulWVHE8zz5An7LqcyTsaPjb+4e3gesXlWHxGn3PRbkQC5dyLPEuGvaiuOhaDtL/5cgR8bf0031wmDjwGYrTQk/CGbbDR7FLdFZT0gRZIk78blnfBlYeDuWGb4y1f+78fGBzOdL+g9ALeYmQppaT+ZLRytYsUyQz8FyGwfLTNom2COlWr8XDJau5U0Zop16X8E8BEzUyJ6KpuIKF/OKsFRirXUtK8KQ24AMEdhRgT5JBP5a8mSmVoy+aMg+rCpLeGUfG9sjxdhONqmOrAj/JaE+CJM1osB/zV+LKMfIiuNDzBLut+r7VaOd8oPJMMvAfiuC7FUjVjX8PdBUGd6X4FxoL894lnSsSvfisjNiaRA8NWeMBUCdBCAScrJOISNLekLN3sXixu0kTGiD28GpkaCbl8y3CMg1sGaCI0kxG+9EsHVsbnl8XebqF57HUTXWT3Hy6egeHpoKQTtYVBdLhm5r7h8SWZ4jYT8HYCSL4xFXGApP+n2d49cvfhKnvPdFmBBemh2HdHHBWHr+C4WAcCQjBsH2qOvF9vXWgTXLr7SlyyVAPG0ficLuZrAJxjUizoxeEmG85c/e3k1S7ry10rmFwFagxJDKwMH+pPRe0r5qaUIrtwDvHrDZSHvBegHDPEiQG9gjN+eZujDsUye4136kxNt+2ZHzgHiBpS5JgK2LO7MLytVVst7gmMBvJ1eoDXlSpg5etWBNjIA/ruiMo0EvlmusFYiOBLAy8Zf3nkmAqDkL3acaPEBIiiniYnRVq4XALURofLvBXk8sTbCM1YD0Moa8GQBmMlsnl4jwjdUBtUWoeK5oPFvL6QqPd8MErSWVZOtVEIATR4no/xzBQEnAPzezHdfMtyzJDO8zuKN+YoIFd2Ya/btaHPMMu0oUnykf3v0X5icxS0BHAHzpmwisiKXjP7Yivdq9QTfCsBA2RvwuMWkHgAiJuBvAM4DeB7M21FH83PJ6Lpce8MLdvN4qiGCv2YpJ7A4M7xBI2MVM30AwDKAogA3AYjg8p87Gc0lo9OKz2vtyM/tPR85N+nPnzjAy/cE3wrgN7wSwbdDkN/oS4Z7pOC7YG1b0kwImmel3qAH2MRCTxiTxFsGEg2/tFJfIEAFKESw1fhAMARVRJmnozEGt9lpfCDoAY6Y0BMiDG7rTzb8qtYx/d+xeN/QLS3pIVc+XxYQEBAQEBAQEBAQEBAQEBDgMf8FVs3dBYo/zx4AAAAASUVORK5CYII=",
-        "platform": [
-            "win32",
-            "darwin",
-            "linux"
-        ]
-    },
-    "output": "text",
-    "hasSubInput": false,
-    "tags": [
-        "默认"
-    ]
-}
+{
+    "program": "quickcommand",
+    "cmd": "quickcommand.showInputBox([\"要替换的内容，两边加 / 使用正则\", \"替换为的内容\"])\n  .then(([search, repl]) => {\n    let reg = search.match(/^\\/(.*?)\\/([igm]*)$/)\n    if (reg) search = new RegExp(reg[1], reg[2])\n    let source = quickcommand.enterData.payload\n    source = source.replace(search, repl)\n    utools.hideMainWindow()\n    quickcommand.sleep(50)\n    send(source)\n    quickcommand.setTimeout(() => {\n      utools.outPlugin()\n    }, 100)\n  })",
+    "scptarg": "",
+    "features": {
+        "code": "default_textReplacer",
+        "explain": "替换选中的文本",
+        "cmds": [
+            {
+                "label": "替换选中的文本",
+                "type": "over",
+                "minNum": 1
+            }
+        ],
+        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABmJLR0QA/wD/AP+gvaeTAAAKUklEQVR4nO2dbWwcRxnH/8/s2Xm5O9vNS928KPFdrKhp0oQmgarQopYSSNSQVAKcQCkiUpvkzknVFCSEgHKhAgoFVbXO5xiktAIpKG0F9AUaQvoBCFFBMSBo0yLsO1tJ0zYkqeNbO419Ow8f4gjnfDe7e7t7ty77k/IhO8/O8+z8b2Z3Z55ZAwEBAQEBAQEBAQFVh2odgF1aO841jIY0rb5gGL0PzB6qdTxO8aUAC9JDs9/c1XCu+HisM38MhFuKDp8G0AdwlkFZXCp09O+5ZrA6kTonVOsAAGB555nICKbfAaKNANYT0AfgYyVM9RLH5l/+R7cRUBjjpsc8DdZlaidAikX8upH1MOR9I4SNAOquFDHQhBQLpEhedQ7BbMg5ceohuuhBtJ5REwFimaFNgP4dllhRZhBsaJmXX9oPvDHxIBHlmblsvQzqcTXQKlCbHsBiKYhXqEzIEGtRJABL1lV3LcF8vFxZLJMvr5xFmJDqT0T3Oq1nIsLNyqxyKRTOgPGOyoaI1xYfY6K86hzJ0rMe4EXjAzUS4PQOGgHohyobZkwSQECqBCgURhv+4Ti4UrF41PhAjQQALPWCm25P8VVDpEkP8OQG7GXjAx4JEPuJ3hzrzH8bzGVH7NM7aASCyj0yXgTQc7JZnzXxYC4RTeeSUdIKo40GjFljpC0EyZsZ9CWgbF0VQ4y9XjY+4MGL2MKukQV10jgCwvUgPJxLRB8pZzu/m2dOK+hZEJoBFAA8x5J/VhiNHnb712z3JkyMvdn2aMrNGEr6cbOyWPriYhaFlwlYMn6IAWzJJaPPlDunJaM/KAir2NBSuV0zBtyM56rYbAhAwInsnMhKtJHhVTwTfLlDa8e5BiNU/ycAxY+XF1nKO/p3Nf7ZLV+VYPsxlPF0bm7k816L4Mo94PYUhwyt/llMbnwAmEFC/KK1Y2ShG76qBqEtdlZ/wms3rggw0Kw/AcI6hcl8WWc81/zY22E3/FWR9liXfq+XDhwL0JIZuhuMpJkdM1bPmBne6NRf1WF0tabzy72q3pEArR35ucS0z4KpBGF3f3v0oBN/tYHDhsAz87t5phe1OxLAqENm/BFSBRPx/blENO3ElxcwIUXEX7NgumyaoVuxs03FAsTT+p1gfMbMjoBHsomG/ZX68Yorb7jZRMOjzPSohVO+sigzGHc7jsoEYCYW8nsWLA9mE5FURT48pHh6of8/4a8DOGJy2nQN2uNux1KRALGM/mmAPmhidpIvFXaCyPE0sJuUnNtJkRSEewh40+T0TbF0/qNuxlNZDxB42MSCSdI2v63NqibW+hLRM8ycMK1Ew0NuxmRbgHjn0K1g3Kg0YhzI7oq8XHFUHmBlYi3X3vACM/9GWRHjU63dg0uUNjawLQATtpuYjGkh41sVxuMZVifWhMYPAhhTmRgF7QFXgoJNARZlBq8B6LMqG2Ls793R1OcsrNqR3dn4bzCeVhoRvlC8VlEptgQIIbQBwHSVDQn47nnfLoKE2dPOrP5m/VZXfNkxZsj1JiZH+xLRVx3E4wv6kuEeBo6pbARjsxu+rAvATGD6hInNUw7j8Q9MymGIgU1uuLEsQDw9vMJk2oHHROiQCzH5ApaF501M4gu7RhY49WO9B2gmj56EV08lZpq9yEwZBnY35QAoh1ONeaVTP5YFYOIblOWMo06D8RvM9BdVOcGongAovdr1v4pY/WuZoqjzjIhWOXVg4yaMxapiKXDCaTB+g8FqAUzaxAp2ekCDqjAkjJMOY/EdFOK3VOUCaHLqwzUBcEmb8rtVJlEQyslE9pUAiLzvBAgZ4XfVFtTo1IcdAaSqsBD153Ynb+F6pzXYEUD5C6fCsONfg9/gOt3smhz3ejsCKMdDuiTffwKQ6TVdcOrDhgCsdCY1mu80GN9R0BaZWFRRAKLTymKzVbIpiNRYmZBFgONkYusCSJO3Qjh/K/QbxFAKwITXnPqwcw8wEYDNsiSmHgxlBgSbTNZZwbIAxCav5cDKWPqi41dzv7AoMxgH4XqVTcjAP536sSxA9my0F8BZdW0FVxYp/IAG7S4Tk9O97RHH81/Wh6AUSYB/bWKlXLCfYmxTFTLTITeSzmytCROT2SrRbfF9w5O2l041Yl0XPgTgJpUNgV9yw5ctAWbg4mEA76lsWBq7HUXkB6QwyfuhYc0YPeyGK1sCvNZ+rQ6GSS+grW5mjlWb2D59FQifU1vxz936VlEFmXHSLGem3pDaj6zUFe/Mp+z69xwpH4VJu5AQ3W65sy1Af7LxFQCvKI0Ym2OdujKFJd6ZTzHBVymMLV35rQCpc5+Yj2d3hst+FMQulWVHE8zz5An7LqcyTsaPjb+4e3gesXlWHxGn3PRbkQC5dyLPEuGvaiuOhaDtL/5cgR8bf0031wmDjwGYrTQk/CGbbDR7FLdFZT0gRZIk78blnfBlYeDuWGb4y1f+78fGBzOdL+g9ALeYmQppaT+ZLRytYsUyQz8FyGwfLTNom2COlWr8XDJau5U0Zop16X8E8BEzUyJ6KpuIKF/OKsFRirXUtK8KQ24AMEdhRgT5JBP5a8mSmVoy+aMg+rCpLeGUfG9sjxdhONqmOrAj/JaE+CJM1osB/zV+LKMfIiuNDzBLut+r7VaOd8oPJMMvAfiuC7FUjVjX8PdBUGd6X4FxoL894lnSsSvfisjNiaRA8NWeMBUCdBCAScrJOISNLekLN3sXixu0kTGiD28GpkaCbl8y3CMg1sGaCI0kxG+9EsHVsbnl8XebqF57HUTXWT3Hy6egeHpoKQTtYVBdLhm5r7h8SWZ4jYT8HYCSL4xFXGApP+n2d49cvfhKnvPdFmBBemh2HdHHBWHr+C4WAcCQjBsH2qOvF9vXWgTXLr7SlyyVAPG0ficLuZrAJxjUizoxeEmG85c/e3k1S7ry10rmFwFagxJDKwMH+pPRe0r5qaUIrtwDvHrDZSHvBegHDPEiQG9gjN+eZujDsUye4136kxNt+2ZHzgHiBpS5JgK2LO7MLytVVst7gmMBvJ1eoDXlSpg5etWBNjIA/ruiMo0EvlmusFYiOBLAy8Zf3nkmAqDkL3acaPEBIiiniYnRVq4XALURofLvBXk8sTbCM1YD0Moa8GQBmMlsnl4jwjdUBtUWoeK5oPFvL6QqPd8MErSWVZOtVEIATR4no/xzBQEnAPzezHdfMtyzJDO8zuKN+YoIFd2Ya/btaHPMMu0oUnykf3v0X5icxS0BHAHzpmwisiKXjP7Yivdq9QTfCsBA2RvwuMWkHgAiJuBvAM4DeB7M21FH83PJ6Lpce8MLdvN4qiGCv2YpJ7A4M7xBI2MVM30AwDKAogA3AYjg8p87Gc0lo9OKz2vtyM/tPR85N+nPnzjAy/cE3wrgN7wSwbdDkN/oS4Z7pOC7YG1b0kwImmel3qAH2MRCTxiTxFsGEg2/tFJfIEAFKESw1fhAMARVRJmnozEGt9lpfCDoAY6Y0BMiDG7rTzb8qtYx/d+xeN/QLS3pIVc+XxYQEBAQEBAQEBAQEBAQEBDgMf8FVs3dBYo/zx4AAAAASUVORK5CYII=",
+        "platform": [
+            "win32",
+            "darwin",
+            "linux"
+        ]
+    },
+    "output": "text",
+    "tags": [
+        "默认"
+    ]
+}
diff --git a/src/json/default_urlToQrCode.json b/src/json/default_urlToQrCode.json
index 633cf7de..25dcd914 100644
--- a/src/json/default_urlToQrCode.json
+++ b/src/json/default_urlToQrCode.json
@@ -31,7 +31,6 @@
         ]
     },
     "output": "html",
-    "hasSubInput": false,
     "tags": [
         "默认"
     ]
diff --git a/src/json/default_windowsTerminal.json b/src/json/default_windowsTerminal.json
index dfc662c5..24b73020 100644
--- a/src/json/default_windowsTerminal.json
+++ b/src/json/default_windowsTerminal.json
@@ -1,33 +1,32 @@
-{
-    "features": {
-        "code": "default_windowsTerminal",
-        "explain": "Windows Terminal 中打开",
-        "cmds": [
-            {
-                "label": "Windows Terminal 中打开",
-                "type": "window",
-                "match": {
-                    "app": [
-                        "explorer.exe"
-                    ]
-                }
-            }
-        ],
-        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAANT0lEQVR4Xu1cSWhUXRa+VRk00tj80ijd6kICIk6JMU4xlUmFduHSARFNCMFp0ajQP1EIhmBMSEhUslBx0boRURxAaFFwIS5sW39jm2UWktk5Jk6JJtV8F8/j5OTe+175rIa/qYKQqld3Ot/5zvnOva+qIir1CIVAJFTvVGeVAjAkCVIApgAMiUDI7ikGpgAMiUDI7ikGpgAMiUDI7ikGpgAMiUDI7ikGJgPAjo6OPwwPD/8p5NjG7v39/X8eGhr6y9jYmH4/LS1N0fMw80Wj0Tj6d3d3Tx0cHMyMRqOaHJFIRF/HHJjL9pDvj4+Px8fHx1V6enoE782ZM+fxwYMHn8n+koGRBw8erEpPT78ejUZnhTHI1re/v1/19fV5b8fjcRip+P/vhus28jp15H3oGgzu7e1VmCMajf6U5WN+jIulzJ079281NTVt5BS9Tj7Lo0eP/qiUehyJRLJ/yuyGQQYGBlRPT48GLRmPrq4u9fLly2QMDQa/nDVr1pKjR496E0ywoqOjY+HIyMhvSqkpSVmBUur3DCAwmT59+pLm5uYOLxI4UO3t7SvHxsb+lSzwMO6LFy+Qp36XDERayMrKWtra2urlwgkM/F8ACAYiTyXrkcwQ9gXw2bNn+aOjo//+mcZRsqcxkwEgnwPsBst/9gNiAhV3MjAZAEpDkgEgnyNZAGIOXwY+efJkxfj4+MMf8Z6pFJHjoA1KGCpjqETh7UidbeULtbX1RQibGGhqL9eHNro0sVQIuJ6RkbG0ra3NnANv3Ljx17S0tH9SDUUDBgVUhqsJwFevXnkG8vY2B3BAuXEmgNEW4GEOEwhB7OFtZI2KMbOzs5fW1NSYAayqqmrs6en5uyfR3wtcvObekZOYALYtFlW9rcg19Ql6zcVMFMIc0CBj2tZfWlqaU1tb+x9jGVNVVdXQ29v7q41x3ytyDQBNYFsMrvN2fEzZx/baZoTpumQqB1Sy1RTOfqSgPsXFxbl1dXVPjQBWVlY29Pf3/0rhJClMTLQZQADbckuQ64mAxiPDb2yMa7OHxjGlILmeWCy2rL6+vt0KYF9fnwYwkcVxbwcJZ1P+Ml1zrcEEGGcWASaZ7xIpV2TQ2E4AKyoqGgYGBjwGcs/4gWQy1hXmLq/b5nKxU4qGCUDbnJydJsD5+74AUgi7ACNDJFP9chupqM24H2F90D62XB3ETi9cIxHlCyBCmKskDy0To3i+NCVnGWpob8uVEgxuNPUzlTV+AoBxSYlN9vjlT15iFRQU5DY2NppFBCFMAMp8YhKQrKwstXnzZjVt2jR1+fJlr/6SDOXA+CmgK4cGERgpFLY+0okgDa5JgOW549q1a/0BdBWhNPHUqVNVVVWVWr58ubZ5cHBQNTY2emd9GMOv9nLlTT9WcEe46jyb8pocKUE1gV9WVmYvY4iB0nAeppgEf9XV1WrhwoUTQmNoaEjV1taq169fe8WyjY22XYtkPg95G5tcjuC2SID80oJpvuLiYnsZwwHkhhO1cQ1hu3fvXpWTk+MV07QwvI9tVHNzs95SSRZKhSNRMSXyIIJkSzN+7DWtQyq0zcG+AGInQl6T3v/27Ztav369qqio0DdppCDAIICJdocPH/aYKAtz2+Io2bvyoE11bZUBB4Y7SrYnEvjVwL4A9vT0TFJhKjsAWkFBgdq/f78GSTKHqzRu7LS0tGgQuUN4KeMnGDL8XDsFbrgr1KXTTSSwgYjrhYWFbhEBgFJEKITp/+7du9WaNWs8YAhgDgjavn//XjU1NenjKxqTSiQXGK7azFTq0Ni8VEk0jKXacpv4WmOx2I8DCNZhYDBxz549qqioSL/mC+csJHU+fvy4ZiI96P5sIqJgAo7nUD4vN9g0Bw9f1/tcwWmukpISt4hIBpInCCiAR+FbXl6uc6Ipt/B8hlPoU6dOaWEBA/l5o4ntJnGxqbkEIBHwbOs2RQCtMyEGEniUJwAelTHExgMHDqiVK1dOON7ioBMYX758UXV1dfq2JhjIAeEg2hgRVHFt4e9iux+QZANsLysrszOwvLy8wZQDOSAmECsrK9WGDRu8j2jwcOK5BDe8W1tb1Zs3byYcqkoWmnKqTOw2QGTY+ak2gccrBZ4/+Tx4XlJSYs+BQQAkIQGQBCYGhjKvXr3a+5gGLYLakxexYwGIUGmuzkEASjRn8hJG9nU5wCZACQMo0ac8yPMh1X0AAAV2LBbTOdLmUSxueHhYkbBQTuS7BA6mHCcI0DbW8VDluZKXMq5yKBCA3d3dk8oYWhAPZQKRACQl3rVrF2g+iYnSGVDltrY2b8cihcOWyE3hbQs51/WgDJS51zeECUCbmtHEJCYIYw4mXkNYli1b5gmFBAN9wbzR0VFVU1Oj60WZB7nxtrX4sUWGYiJOMUUQruGeiPU4CznQxECuxhxAuk4gInQpLx46dEjvl+VDbujPnj2r2tvbJ92p44DybRYXCW6kDG2XEHBW8egyOZHbjrZOBu7cudOowrbF8B0KZyLYN2/ePLVkyRI1e/Zs7+4cDz8sFqc32KnQdg/XuLBwNacQl9dcLJOguo69gqSB72WMnYFhAQSIUOL58+fr8Pz48aPKy8vDpzt1OHMA8d6xY8d0SYO6ECHNAYRBcoPvJw6mEJU5jDPYxEQpNPw12qOQbmlpMZ9I79ixQ98Xlkf6Ji/zIyzKhzhoWLRokfr69asGcGRkRH3+/FlfAyPpBAelzOnTp1VnZyc+QqsBlOCZ5gxSxrjyIi+tXCFvchSlC5zGNDU1mW9rcgBdi8UEBAbVg4WFhVo4kAfxBwA5iDi5njlzpsKOpKGhQX/ELSMjQwNHpYzMQUHAkOv0WzcHh8oXycQfBhAh7CpjaGAuBAAQhwq5ubk6RAlAAhFsBBMBJtreu3dPvX371gMN7KPDBQIzyNG6BMJW3pgADVrCyJSAfkVFRf4hbFMjDiAGA3OQ81asWKHzFbGR/hOIeP3p0yd1584d9e7duwms4+FLYWxSfRnSQZkXFkDZP1AONOUHTncYA0YVFxdrkaCET6oM1vHnAO/SpUuaiRSuPGzlh4143edK6qYSRDJR2iJfB3UE2Z8QA/ngtDACBls25DxeypBBxED0gWDcunVL7zi4YJDqmj6pZWINL0GkosuISSQPJiJWGBeFtFOF5WkMFkeCgckQllBbgMcLWQwuT67BODAPOY9KFV6u0HMCnofwL7/8gk/Ea/toHpkbOQMJCFlcSzBRFcCZJuEIkiZ8AYSI8ANPHhJ4np2drTZu3DiJebKswYHB1atXNQMxHuU6We+Z2LN48WJ15MgRrdK89CAweDSYEr1cM2cs0suJEyfU06dPnV/GkXmY1ukbwgSgDBMqXXAvuLS0VK+btyH24RqK5Js3b3rfGJKFsukrV7z/unXr1L59+ybNIRnH5ydG8XFkCqI9+JUrV9T169c9ALkTZR/JysAMlADiNcIXeWzLli1qxowZOrS5t7FACMbFixfVhw8fPOYRAykcTazjrCorK9MAyhQhmWUqqyQ7JWsxJgC8du2aFxUy/DloUnQCASgLWFoE3Q8BiJs2bdL7XPqiINogbME8nDwTaFwsTLsN6Sg4AQz3Y6ApnG2Ak4ISMAAQ6SUzMzOhL/xgThwmOEWECmlbHuEnLlu3btW7C4CI3ALBQJ3HQ9YEIB+bCwRtCYmBMk3QaxnKFLa81OJzyPbEQORYLmQuRSaHOQHcvn37hNMYng+oUCYjAeSUKVPUqlWrtCcfP37sHQwQ02StR3mKj8vDENcxfn5+vhYROEWuQYIoQaYxeDsucLiOg9yHDx9OcLQJPD4GPS8tLbUz0AYgzysEIHkdQOI5wpq2Ylxp+R04V5lA49F5IraHOICQxvOQ5yHL1dgEOuVffHbn9u3bxrJKAiaZi/l8GShVmC+SwJPqR8zChPy+r6lI5rsMaSixh28LuapifFMtSIZKceLXyZFoQ/tvnpPlvWqZZshBsVgs5+TJk+avOYCB/DDB5EnOCJlnCEAyJJEdAgdK3iaw5T5iFWefLRT5mmRe5n1kepFj4/OBVhHZtm2bPg+U0m0CigzmxlEI0yKwUL4g2+J4HiSW2coRaZDfmDw6yC65GzLlOnKOZGJRUZGdgTgPfP78uQbQll9kruEhyT1pK055XuGsMKUFWaqYwt8EoC1NkEN56FJbSRpypHw/Pz8/59y5c+YQrq6uLr5///4dpZTeQ5kWJxlFrzlgfDEcBLlIF9N5rvNjMVd36VDel8/HScLZ5grnzMzMtwsWLFh64cIF7wvPE75wfebMmYy7d+/+o6uraztUNUhukSBjYTLRcwP9xpSss+U07jheB8qUQsyWrDOtUZKGnAHmotrIzc09dP78+Vbrj05gAIDY2dm5uqura97o6GgED2lEPB73flLEporCkxN+goS/RzsZXPuulPpnRujnUGjfzNvx/kHmp76unz2hMeU8+PmUeDw+npeX91t9fb0XutQ+OT+dYaPN/+H1FIAhnZoCMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdv8vxSbWMp7spukAAAAASUVORK5CYII=",
-        "platform": [
-            "win32"
-        ]
-    },
-    "program": "quickcommand",
-    "cmd": "var currentFolder = \"{{pwd}}\"\nvar home = utools.getPath('home')\nvar wt = path.join(home, '/AppData/Local/Microsoft/WindowsApps/wt.exe')\nchild_process.exec(`start \"\" \"${wt}\" -d \"${currentFolder.replace('\\\\', '\\\\\\\\')}\"`)",
-    "output": "ignore",
-    "hasSubInput": false,
-    "scptarg": "",
-    "charset": {
-        "scriptCode": "",
-        "outputCode": ""
-    },
-    "tags": [
-        "默认"
-    ]
-}
\ No newline at end of file
+{
+    "features": {
+        "code": "default_windowsTerminal",
+        "explain": "Windows Terminal 中打开",
+        "cmds": [
+            {
+                "label": "Windows Terminal 中打开",
+                "type": "window",
+                "match": {
+                    "app": [
+                        "explorer.exe"
+                    ]
+                }
+            }
+        ],
+        "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAANT0lEQVR4Xu1cSWhUXRa+VRk00tj80ijd6kICIk6JMU4xlUmFduHSARFNCMFp0ajQP1EIhmBMSEhUslBx0boRURxAaFFwIS5sW39jm2UWktk5Jk6JJtV8F8/j5OTe+175rIa/qYKQqld3Ot/5zvnOva+qIir1CIVAJFTvVGeVAjAkCVIApgAMiUDI7ikGpgAMiUDI7ikGpgAMiUDI7ikGpgAMiUDI7ikGJgPAjo6OPwwPD/8p5NjG7v39/X8eGhr6y9jYmH4/LS1N0fMw80Wj0Tj6d3d3Tx0cHMyMRqOaHJFIRF/HHJjL9pDvj4+Px8fHx1V6enoE782ZM+fxwYMHn8n+koGRBw8erEpPT78ejUZnhTHI1re/v1/19fV5b8fjcRip+P/vhus28jp15H3oGgzu7e1VmCMajf6U5WN+jIulzJ079281NTVt5BS9Tj7Lo0eP/qiUehyJRLJ/yuyGQQYGBlRPT48GLRmPrq4u9fLly2QMDQa/nDVr1pKjR496E0ywoqOjY+HIyMhvSqkpSVmBUur3DCAwmT59+pLm5uYOLxI4UO3t7SvHxsb+lSzwMO6LFy+Qp36XDERayMrKWtra2urlwgkM/F8ACAYiTyXrkcwQ9gXw2bNn+aOjo//+mcZRsqcxkwEgnwPsBst/9gNiAhV3MjAZAEpDkgEgnyNZAGIOXwY+efJkxfj4+MMf8Z6pFJHjoA1KGCpjqETh7UidbeULtbX1RQibGGhqL9eHNro0sVQIuJ6RkbG0ra3NnANv3Ljx17S0tH9SDUUDBgVUhqsJwFevXnkG8vY2B3BAuXEmgNEW4GEOEwhB7OFtZI2KMbOzs5fW1NSYAayqqmrs6en5uyfR3wtcvObekZOYALYtFlW9rcg19Ql6zcVMFMIc0CBj2tZfWlqaU1tb+x9jGVNVVdXQ29v7q41x3ytyDQBNYFsMrvN2fEzZx/baZoTpumQqB1Sy1RTOfqSgPsXFxbl1dXVPjQBWVlY29Pf3/0rhJClMTLQZQADbckuQ64mAxiPDb2yMa7OHxjGlILmeWCy2rL6+vt0KYF9fnwYwkcVxbwcJZ1P+Ml1zrcEEGGcWASaZ7xIpV2TQ2E4AKyoqGgYGBjwGcs/4gWQy1hXmLq/b5nKxU4qGCUDbnJydJsD5+74AUgi7ACNDJFP9chupqM24H2F90D62XB3ETi9cIxHlCyBCmKskDy0To3i+NCVnGWpob8uVEgxuNPUzlTV+AoBxSYlN9vjlT15iFRQU5DY2NppFBCFMAMp8YhKQrKwstXnzZjVt2jR1+fJlr/6SDOXA+CmgK4cGERgpFLY+0okgDa5JgOW549q1a/0BdBWhNPHUqVNVVVWVWr58ubZ5cHBQNTY2emd9GMOv9nLlTT9WcEe46jyb8pocKUE1gV9WVmYvY4iB0nAeppgEf9XV1WrhwoUTQmNoaEjV1taq169fe8WyjY22XYtkPg95G5tcjuC2SID80oJpvuLiYnsZwwHkhhO1cQ1hu3fvXpWTk+MV07QwvI9tVHNzs95SSRZKhSNRMSXyIIJkSzN+7DWtQyq0zcG+AGInQl6T3v/27Ztav369qqio0DdppCDAIICJdocPH/aYKAtz2+Io2bvyoE11bZUBB4Y7SrYnEvjVwL4A9vT0TFJhKjsAWkFBgdq/f78GSTKHqzRu7LS0tGgQuUN4KeMnGDL8XDsFbrgr1KXTTSSwgYjrhYWFbhEBgFJEKITp/+7du9WaNWs8YAhgDgjavn//XjU1NenjKxqTSiQXGK7azFTq0Ni8VEk0jKXacpv4WmOx2I8DCNZhYDBxz549qqioSL/mC+csJHU+fvy4ZiI96P5sIqJgAo7nUD4vN9g0Bw9f1/tcwWmukpISt4hIBpInCCiAR+FbXl6uc6Ipt/B8hlPoU6dOaWEBA/l5o4ntJnGxqbkEIBHwbOs2RQCtMyEGEniUJwAelTHExgMHDqiVK1dOON7ioBMYX758UXV1dfq2JhjIAeEg2hgRVHFt4e9iux+QZANsLysrszOwvLy8wZQDOSAmECsrK9WGDRu8j2jwcOK5BDe8W1tb1Zs3byYcqkoWmnKqTOw2QGTY+ak2gccrBZ4/+Tx4XlJSYs+BQQAkIQGQBCYGhjKvXr3a+5gGLYLakxexYwGIUGmuzkEASjRn8hJG9nU5wCZACQMo0ac8yPMh1X0AAAV2LBbTOdLmUSxueHhYkbBQTuS7BA6mHCcI0DbW8VDluZKXMq5yKBCA3d3dk8oYWhAPZQKRACQl3rVrF2g+iYnSGVDltrY2b8cihcOWyE3hbQs51/WgDJS51zeECUCbmtHEJCYIYw4mXkNYli1b5gmFBAN9wbzR0VFVU1Oj60WZB7nxtrX4sUWGYiJOMUUQruGeiPU4CznQxECuxhxAuk4gInQpLx46dEjvl+VDbujPnj2r2tvbJ92p44DybRYXCW6kDG2XEHBW8egyOZHbjrZOBu7cudOowrbF8B0KZyLYN2/ePLVkyRI1e/Zs7+4cDz8sFqc32KnQdg/XuLBwNacQl9dcLJOguo69gqSB72WMnYFhAQSIUOL58+fr8Pz48aPKy8vDpzt1OHMA8d6xY8d0SYO6ECHNAYRBcoPvJw6mEJU5jDPYxEQpNPw12qOQbmlpMZ9I79ixQ98Xlkf6Ji/zIyzKhzhoWLRokfr69asGcGRkRH3+/FlfAyPpBAelzOnTp1VnZyc+QqsBlOCZ5gxSxrjyIi+tXCFvchSlC5zGNDU1mW9rcgBdi8UEBAbVg4WFhVo4kAfxBwA5iDi5njlzpsKOpKGhQX/ELSMjQwNHpYzMQUHAkOv0WzcHh8oXycQfBhAh7CpjaGAuBAAQhwq5ubk6RAlAAhFsBBMBJtreu3dPvX371gMN7KPDBQIzyNG6BMJW3pgADVrCyJSAfkVFRf4hbFMjDiAGA3OQ81asWKHzFbGR/hOIeP3p0yd1584d9e7duwms4+FLYWxSfRnSQZkXFkDZP1AONOUHTncYA0YVFxdrkaCET6oM1vHnAO/SpUuaiRSuPGzlh4143edK6qYSRDJR2iJfB3UE2Z8QA/ngtDACBls25DxeypBBxED0gWDcunVL7zi4YJDqmj6pZWINL0GkosuISSQPJiJWGBeFtFOF5WkMFkeCgckQllBbgMcLWQwuT67BODAPOY9KFV6u0HMCnofwL7/8gk/Ea/toHpkbOQMJCFlcSzBRFcCZJuEIkiZ8AYSI8ANPHhJ4np2drTZu3DiJebKswYHB1atXNQMxHuU6We+Z2LN48WJ15MgRrdK89CAweDSYEr1cM2cs0suJEyfU06dPnV/GkXmY1ukbwgSgDBMqXXAvuLS0VK+btyH24RqK5Js3b3rfGJKFsukrV7z/unXr1L59+ybNIRnH5ydG8XFkCqI9+JUrV9T169c9ALkTZR/JysAMlADiNcIXeWzLli1qxowZOrS5t7FACMbFixfVhw8fPOYRAykcTazjrCorK9MAyhQhmWUqqyQ7JWsxJgC8du2aFxUy/DloUnQCASgLWFoE3Q8BiJs2bdL7XPqiINogbME8nDwTaFwsTLsN6Sg4AQz3Y6ApnG2Ak4ISMAAQ6SUzMzOhL/xgThwmOEWECmlbHuEnLlu3btW7C4CI3ALBQJ3HQ9YEIB+bCwRtCYmBMk3QaxnKFLa81OJzyPbEQORYLmQuRSaHOQHcvn37hNMYng+oUCYjAeSUKVPUqlWrtCcfP37sHQwQ02StR3mKj8vDENcxfn5+vhYROEWuQYIoQaYxeDsucLiOg9yHDx9OcLQJPD4GPS8tLbUz0AYgzysEIHkdQOI5wpq2Ylxp+R04V5lA49F5IraHOICQxvOQ5yHL1dgEOuVffHbn9u3bxrJKAiaZi/l8GShVmC+SwJPqR8zChPy+r6lI5rsMaSixh28LuapifFMtSIZKceLXyZFoQ/tvnpPlvWqZZshBsVgs5+TJk+avOYCB/DDB5EnOCJlnCEAyJJEdAgdK3iaw5T5iFWefLRT5mmRe5n1kepFj4/OBVhHZtm2bPg+U0m0CigzmxlEI0yKwUL4g2+J4HiSW2coRaZDfmDw6yC65GzLlOnKOZGJRUZGdgTgPfP78uQbQll9kruEhyT1pK055XuGsMKUFWaqYwt8EoC1NkEN56FJbSRpypHw/Pz8/59y5c+YQrq6uLr5///4dpZTeQ5kWJxlFrzlgfDEcBLlIF9N5rvNjMVd36VDel8/HScLZ5grnzMzMtwsWLFh64cIF7wvPE75wfebMmYy7d+/+o6uraztUNUhukSBjYTLRcwP9xpSss+U07jheB8qUQsyWrDOtUZKGnAHmotrIzc09dP78+Vbrj05gAIDY2dm5uqura97o6GgED2lEPB73flLEporCkxN+goS/RzsZXPuulPpnRujnUGjfzNvx/kHmp76unz2hMeU8+PmUeDw+npeX91t9fb0XutQ+OT+dYaPN/+H1FIAhnZoCMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdk8xMAVgSARCdv8vxSbWMp7spukAAAAASUVORK5CYII=",
+        "platform": [
+            "win32"
+        ]
+    },
+    "program": "quickcommand",
+    "cmd": "var currentFolder = \"{{pwd}}\"\nvar home = utools.getPath('home')\nvar wt = path.join(home, '/AppData/Local/Microsoft/WindowsApps/wt.exe')\nchild_process.exec(`start \"\" \"${wt}\" -d \"${currentFolder.replace('\\\\', '\\\\\\\\')}\"`)",
+    "output": "ignore",
+    "scptarg": "",
+    "charset": {
+        "scriptCode": "",
+        "outputCode": ""
+    },
+    "tags": [
+        "默认"
+    ]
+}

From 8c564f8d975530825ec3535c3e099304d91e2d01 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 17:46:12 +0800
Subject: [PATCH 165/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9=E5=87=BD=E6=95=B0=E6=97=B6?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E5=8F=82=E6=95=B0=E7=9A=84bug=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=AF=A6=E7=BB=86=E8=BE=93=E5=87=BA=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E5=8F=98=E9=87=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/output/OutputField.vue     | 4 +++-
 src/components/composer/card/output/OutputStructure.vue | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/composer/card/output/OutputField.vue b/src/components/composer/card/output/OutputField.vue
index 2f307040..74c6f7b2 100644
--- a/src/components/composer/card/output/OutputField.vue
+++ b/src/components/composer/card/output/OutputField.vue
@@ -44,6 +44,7 @@
     dense
     emit-value
     map-options
+    options-dense
     class="output-field"
     @update:model-value="$emit('update:modelValue', $event)"
   />
@@ -94,7 +95,8 @@ export default defineComponent({
   emits: ["update:modelValue"],
   methods: {
     updateValBySelect(_type, val) {
-      this.$emit("update:modelValue", val);
+      // 如果是函数，去除参数
+      this.$emit("update:modelValue", val.replace(/\(.*?\)/g, ""));
     },
     updateSuggestName(val) {
       const existingNames = this.getExistingFuncAndParams();
diff --git a/src/components/composer/card/output/OutputStructure.vue b/src/components/composer/card/output/OutputStructure.vue
index 312c5b77..bd8fd540 100644
--- a/src/components/composer/card/output/OutputStructure.vue
+++ b/src/components/composer/card/output/OutputStructure.vue
@@ -12,6 +12,7 @@
                 :label="subOutput.label"
                 :placeholder="subOutput.placeholder"
                 :suggest-name="subOutput.suggestName"
+                :show-variable-list="true"
                 autofocus
               />
             </div>
@@ -27,6 +28,7 @@
         :label="output.label"
         :placeholder="output.placeholder"
         :suggest-name="output.suggestName"
+        :show-variable-list="true"
         autofocus
       />
     </div>

From 2cb0c6bb325ce9f2d5a9904cc5745e4364363781 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 23:41:49 +0800
Subject: [PATCH 166/332] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue              |  44 +-
 src/components/CommandRunResult.vue           |  32 +-
 src/components/ComposerEditor.vue             | 127 ++++-
 src/components/card/layouts/DenseLayout.vue   |   8 +-
 src/components/card/layouts/ListLayout.vue    |   6 +
 src/components/composer/CommandComposer.vue   |  14 +-
 src/components/composer/ComposerCard.vue      |   9 +-
 src/components/composer/ComposerFlow.vue      |   4 -
 src/components/composer/FlowTabs.vue          | 164 +++----
 .../composer/flow/ComposerButtons.vue         |  26 +-
 src/components/editor/CommandConfig.vue       | 336 +++++++++++++
 src/components/editor/MatchRuleEditor.vue     | 449 ++++++++++++++++++
 src/css/composer.css                          |   4 +
 src/js/autoDetach.js                          |  66 ---
 src/js/commandManager.js                      |  53 ++-
 src/js/common/uuid.js                         |   6 +-
 src/js/composer/generateCode.js               |   7 +
 src/js/options/commandTypes.js                |  17 +-
 src/pages/CommandPage.vue                     |   2 +-
 src/pages/ConfigurationPage.vue               |  16 +-
 20 files changed, 1147 insertions(+), 243 deletions(-)
 create mode 100644 src/components/editor/CommandConfig.vue
 create mode 100644 src/components/editor/MatchRuleEditor.vue
 delete mode 100644 src/js/autoDetach.js

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 46af7401..81e818bd 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -4,9 +4,9 @@
     ref="sidebar"
     :canCommandSave="canCommandSave"
     :quickcommandInfo="quickcommandInfo"
+    :allQuickCommandTags="allQuickCommandTags"
     class="absolute-left shadow-1"
     :style="{
-      width: sideBarWidth + 'px',
       zIndex: 1,
       transform: isFullscreen ? 'translateX(-100%)' : 'translateX(0)',
       transition: 'transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
@@ -64,7 +64,11 @@
 
   <!-- 可视化编排 -->
   <q-dialog v-model="showComposer" maximized>
-    <CommandComposer ref="composer" @use-composer="handleComposer" />
+    <CommandComposer
+      ref="composer"
+      @action="http://github.com/handleComposerAction"
+      :model-value="{ flows }"
+    />
   </q-dialog>
 
   <!-- 运行结果 -->
@@ -78,6 +82,7 @@ import CommandLanguageBar from "components/editor/CommandLanguageBar";
 import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
 import CommandComposer from "components/composer/CommandComposer.vue";
+import programs from "js/options/programs.js";
 
 // 预加载 MonacoEditor
 const MonacoEditorPromise = import("components/editor/MonacoEditor");
@@ -109,13 +114,22 @@ export default {
   },
   data() {
     return {
-      programLanguages: Object.keys(this.$root.programs),
+      programLanguages: Object.keys(programs),
       sideBarWidth: 200,
       languageBarHeight: 40,
       showComposer: false,
       isRunCodePage: this.action.type === "run",
       canCommandSave: this.action.type !== "run",
       showSidebar: this.action.type !== "run",
+      flows: [
+        {
+          id: "main",
+          name: "main",
+          label: "主流程",
+          commands: [],
+          customVariables: [],
+        },
+      ],
       quickcommandInfo: {
         program: "quickcommand",
         cmd: "",
@@ -141,15 +155,9 @@ export default {
       required: true,
     },
     allQuickCommandTags: Array,
-    isLeaving: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  created() {
-    this.commandInit();
   },
   mounted() {
+    this.commandInit();
     this.sidebarInit();
   },
   computed: {
@@ -196,7 +204,7 @@ export default {
     // 匹配编程语言
     matchLanguage() {
       if (!this.quickcommandInfo.customOptions.ext) return;
-      let language = Object.values(this.$root.programs).filter(
+      let language = Object.values(programs).filter(
         (program) => program.ext === this.quickcommandInfo.customOptions.ext
       );
       if (language.length) {
@@ -205,7 +213,7 @@ export default {
     },
     // 设置编程语言
     setLanguage(language) {
-      let highlight = this.$root.programs[language].highlight;
+      let highlight = programs[language].highlight;
       this.$refs.editor.setEditorLanguage(highlight ? highlight : language);
     },
     insertText(text) {
@@ -216,14 +224,16 @@ export default {
       this.$refs.editor.setEditorValue(text);
       this.$refs.editor.formatDocument();
     },
-    handleComposer({ type, code }) {
-      switch (type) {
+    handleComposerAction(actionType, actionData) {
+      switch (actionType) {
         case "run":
-          return this.runCurrentCommand(code);
+          return this.runCurrentCommand(actionData);
         case "insert":
-          return this.insertText(code);
+          return this.insertText(actionData);
         case "apply":
-          return this.replaceText(code);
+          return this.replaceText(actionData);
+        case "close":
+          return this.showComposer = false;
       }
     },
     // 保存
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index de821422..19f8428a 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -75,6 +75,8 @@ import specialVars from "js/options/specialVars.js";
 import commandTypes from "js/options/commandTypes.js";
 import ResultArea from "components/ResultArea.vue";
 import ResultMenu from "components/popup/ResultMenu.vue";
+import { generateFlowsCode } from "js/composer/generateCode";
+import { getValidCommand } from "js/commandManager";
 
 export default {
   components: { ResultArea, ResultMenu },
@@ -127,11 +129,20 @@ export default {
   methods: {
     // 运行命令
     async runCurrentCommand(currentCommand) {
+      let command = window.lodashM.cloneDeep(currentCommand);
+      // 如果是composer命令，则动态生成cmd
+      if (command.program === "quickcomposer") {
+        command.cmd = generateFlowsCode(command.flows);
+      }
       this.$root.isRunningCommand = true;
-      await this.getTempPayload(currentCommand);
-      if (currentCommand.cmd.includes("{{subinput"))
-        return this.setSubInput(currentCommand);
-      this.fire(currentCommand);
+      try {
+        await this.getTempPayload(command);
+      } catch (error) {
+        return quickcommand.showMessageBox(error.toString(), "error");
+      }
+      // 如果命令包含子输入框，则设置子输入框
+      if (command.cmd.includes("{{subinput")) return this.setSubInput(command);
+      this.fire(command);
     },
     async fire(currentCommand) {
       currentCommand.cmd = this.assignSpecialVars(currentCommand.cmd);
@@ -147,6 +158,7 @@ export default {
       let resultOpts = { outPlugin, action, earlyExit };
       switch (currentCommand.program) {
         case "quickcommand":
+        case "quickcomposer":
           window.runCodeInSandbox(
             currentCommand.cmd,
             (stdout, stderr) => this.handleResult(stdout, stderr, resultOpts),
@@ -278,11 +290,15 @@ export default {
     // payload 临时赋值
     async getTempPayload(currentCommand) {
       if (!this.needTempPayload) return;
-      let type =
-        currentCommand.cmdType || currentCommand.features?.cmds[0].type;
+      currentCommand = getValidCommand(currentCommand);
+      const firstCmd = currentCommand.features.cmds[0];
+      const type = firstCmd.type || "text";
       this.$root.enterData = {
-        type: type || "text",
-        payload: await commandTypes[type]?.tempPayload?.(),
+        type,
+        payload:
+          type === "text"
+            ? firstCmd
+            : (await commandTypes[type]?.tempPayload?.()) || {},
       };
     },
     handleResult(stdout, stderr, options) {
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index 19b7cdbf..6cdfc8a3 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -1,8 +1,9 @@
 <template>
   <CommandComposer
     ref="composer"
-    @use-composer="handleComposer"
-    :show-close-button="false"
+    @action="http://github.com/handleComposerAction"
+    v-model="quickcommandInfo"
+    :show-close-button="!isRunComposePage"
     class="fixed-full"
   />
   <!-- 运行结果 -->
@@ -12,29 +13,131 @@
 <script>
 import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
+import { findCommandByValue } from "js/composer/composerConfig";
+import programs from "js/options/programs.js";
+import { provide, ref } from "vue";
 
 export default {
   components: { CommandComposer, CommandRunResult },
+  setup(props) {
+    provide("allQuickCommandTags", props.allQuickCommandTags);
+
+    const retoreToFullCommand = (command) => {
+      const { flows } = command;
+      if (!flows) return command;
+      const newFlows = flows.map((flow) => ({
+        ...flow,
+        commands: flow.commands.map((cmd) => {
+          // 恢复所有属性
+          const command = findCommandByValue(cmd.value);
+          return {
+            ...command,
+            ...cmd,
+          };
+        }),
+      }));
+      return {
+        ...command,
+        flows: newFlows,
+      };
+    };
+
+    const getLitedComposerCommand = (command) => {
+      const { flows } = command;
+      if (!flows) return command;
+      const newFlows = flows.map((flow) => ({
+        ...flow,
+        commands: flow.commands.map((cmd) => {
+          const cmdCopy = { ...cmd };
+          // 移除不必要保存的属性
+          const uselessProps = [
+            "config",
+            "label",
+            "component",
+            "subCommands",
+            "outputs",
+            "options",
+            "icon",
+            "width",
+            "placeholder",
+            "summary",
+            "type",
+          ];
+          uselessProps.forEach((prop) => delete cmdCopy[prop]);
+          return cmdCopy;
+        }),
+      }));
+      return {
+        ...command,
+        flows: newFlows,
+      };
+    };
+
+    const commandAction = window.lodashM.cloneDeep(props.action);
+    const savedCommand = commandAction.data || {};
+    const defaultCommand = {
+      program: "quickcomposer",
+      features: {
+        icon: programs.quickcommand.icon,
+        explain: "",
+        platform: ["win32", "linux", "darwin"],
+        mainPush: false,
+        cmds: [""],
+      },
+      flows: [
+        {
+          id: "main",
+          name: "main",
+          label: "主流程",
+          commands: [],
+          customVariables: [],
+        },
+      ],
+      output: "text",
+      tags: [],
+    };
+    const quickcommandInfo = ref({
+      ...defaultCommand,
+      ...retoreToFullCommand(savedCommand),
+    });
+    return {
+      quickcommandInfo,
+      getLitedComposerCommand,
+    };
+  },
+  emits: ["editorEvent"],
   props: {
     action: {
       type: Object,
       required: true,
     },
+    allQuickCommandTags: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      isRunComposePage: this.action.type === "composer",
+    };
   },
   methods: {
-    handleComposer({ type, code }) {
-      switch (type) {
+    handleComposerAction(actionType, command) {
+      switch (actionType) {
         case "run":
-          return this.runCurrentCommand(code);
+          return this.runCurrentCommand(command);
+        case "close":
+          return this.$emit("editorEvent", {
+            type: "back",
+          });
+        case "save":
+          return this.$emit("editorEvent", {
+            type: "save",
+            data: this.getLitedComposerCommand(command),
+          });
       }
     },
-    runCurrentCommand(cmd) {
-      if (!cmd) return;
-      let command = {
-        cmd: cmd,
-        output: "text",
-        program: "quickcommand",
-      };
+    runCurrentCommand(command) {
       this.$refs.result.runCurrentCommand(command);
     },
   },
diff --git a/src/components/card/layouts/DenseLayout.vue b/src/components/card/layouts/DenseLayout.vue
index 4e1db697..ab9d0d72 100644
--- a/src/components/card/layouts/DenseLayout.vue
+++ b/src/components/card/layouts/DenseLayout.vue
@@ -46,7 +46,7 @@
         width="16px"
       />
       <div>|</div>
-      <q-img :src="http://github.com/programs[commandInfo.program].icon" width="16px" />
+      <q-img :src="http://github.com/program.icon" width="16px" />
       <div class="text-subtitle2">{{ programName }}</div>
     </div>
   </q-card-section>
@@ -75,6 +75,12 @@ export default {
   },
   computed: {
     program() {
+      if (this.commandInfo.program === "quickcomposer") {
+        return {
+          ...this.programs.quickcommand,
+          shortName: "可视化",
+        };
+      }
       return this.programs[this.commandInfo.program];
     },
     programName() {
diff --git a/src/components/card/layouts/ListLayout.vue b/src/components/card/layouts/ListLayout.vue
index 82ac87b5..351aad75 100644
--- a/src/components/card/layouts/ListLayout.vue
+++ b/src/components/card/layouts/ListLayout.vue
@@ -70,6 +70,12 @@ export default {
   },
   computed: {
     program() {
+      if (this.commandInfo.program === "quickcomposer") {
+        return {
+          ...this.programs.quickcommand,
+          name: "可视化编排",
+        };
+      }
       return this.programs[this.commandInfo.program];
     },
   },
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index a13c8d84..e8ce4446 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -10,8 +10,10 @@
       <!-- 右侧命令流程 -->
       <div class="col command-section">
         <FlowTabs
-          @action="http://github.com/handleComposer"
+          @action="http://github.com/handleAction"
           :show-close-button="showCloseButton"
+          :model-value="modelValue"
+          @update:model-value="$emit('update:modelValue', $event)"
         />
       </div>
     </div>
@@ -44,12 +46,16 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    modelValue: {
+      type: Object,
+      default: () => ({}),
+    },
   },
-  emits: ["use-composer"],
+  emits: ["action", "update:modelValue"],
   methods: {
-    handleComposer(type, code) {
+    handleAction(actionType, actionData) {
       // 直接转发事件和代码
-      this.$emit("use-composer", { type, code });
+      this.$emit("action", actionType, actionData);
     },
     findCommandNeedLoading(flow) {
       // 暂时只在运行单独命令时显示载入界面，因为运行整个命令流时，如果不打印输出，是无法判断什么时候运行结束的，
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index f7fbc803..c4bb269d 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -197,7 +197,7 @@ export default defineComponent({
       };
       const consoleLogVars =
         this.getAvailableOutputVariableName(outputVariable);
-      const tempFlow = {
+      const tempFlows = [{
         name: "main",
         commands: [
           tempCommand,
@@ -207,9 +207,10 @@ export default defineComponent({
               console.log(${consoleLogVars})
             }`,
           },
-        ],
-      };
-      this.$emit("run", tempFlow);
+          ],
+        },
+      ];
+      this.$emit("run", tempFlows);
     },
     handleToggleCollapse() {
       if (this.localCommand.isControlFlow) {
diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index a6ff593c..3e327ab1 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -82,10 +82,6 @@ export default defineComponent({
       required: true,
       default: () => [],
     },
-    generateCode: {
-      type: Function,
-      required: true,
-    },
     showCloseButton: {
       type: Boolean,
       default: true,
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index d0fbc641..bc9aefc5 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -59,9 +59,9 @@
       </div>
 
       <ComposerButtons
-        :generate-code="generateAllFlowCode"
         :is-all-collapsed="isAllCollapsed"
         :show-close-button="showCloseButton"
+        :flows="flows"
         @action="http://github.com/handleAction"
       />
     </div>
@@ -72,10 +72,15 @@
       :key="flow.id"
       v-show="activeTab === flow.id"
     >
+      <CommandConfig
+        class="command-config-panel"
+        v-if="flow.id === 'main' && commandConfig.features"
+        :model-value="commandConfig"
+        @update:model-value="updateCommandConfig"
+      />
       <ComposerFlow
         class="flow-wrapper"
         v-model="flow.commands"
-        :generate-code="() => generateFlowCode(flow)"
         :show-close-button="flows.length > 1"
         @action="http://github.com/(type,%20payload)%20=%3E%20handleAction(type,%20payload)"
         ref="flowRefs"
@@ -84,7 +89,7 @@
         v-model="showVariableManager"
         :flow="flow"
         :variables="flow.customVariables"
-        @update-flow="Sub(flow)"
+        @update-flow="updateFlows(flow)"
         :is-main-flow="flow.id === 'main'"
         :output-variables="outputVariables"
         class="variable-panel"
@@ -99,10 +104,10 @@ import draggable from "vuedraggable";
 import ComposerFlow from "components/composer/ComposerFlow.vue";
 import ComposerButtons from "components/composer/flow/ComposerButtons.vue";
 import FlowManager from "components/composer/flow/FlowManager.vue";
-import { generateCode } from "js/composer/generateCode";
-import { findCommandByValue } from "js/composer/composerConfig";
+import CommandConfig from "components/editor/CommandConfig.vue";
 import { generateUniqSuffix } from "js/composer/variableManager";
 import { getUniqueId } from "js/common/uuid";
+
 export default defineComponent({
   name: "FlowTabs",
   components: {
@@ -110,23 +115,44 @@ export default defineComponent({
     ComposerButtons,
     draggable,
     FlowManager,
+    CommandConfig,
   },
+  emits: ["update:modelValue", "action"],
   props: {
     showCloseButton: {
       type: Boolean,
       default: true,
     },
+    modelValue: {
+      type: Object,
+      default: () => ({}),
+    },
   },
-  setup() {
-    const mainFlow = ref({
-      id: "main",
-      name: "main",
-      label: "主流程",
-      commands: [],
-      customVariables: [],
+  setup(props, { emit }) {
+    const updateFlows = (newFlows) => {
+      emit("update:modelValue", {
+        ...props.modelValue,
+        flows: newFlows,
+      });
+    };
+
+    const flows = computed(() => props.modelValue.flows);
+
+    const mainFlow = computed({
+      get: () => flows.value[0],
+      set: (newVal) => {
+        const newFlows = [newVal, ...flows.value.slice(1)];
+        updateFlows(newFlows);
+      },
     });
 
-    const subFlows = ref([]);
+    const subFlows = computed({
+      get: () => flows.value.slice(1),
+      set: (newVal) => {
+        const newFlows = [mainFlow.value, ...newVal];
+        updateFlows(newFlows);
+      },
+    });
 
     // 获取所有函数
     const getCurrentFunctions = () => {
@@ -140,8 +166,6 @@ export default defineComponent({
     };
     provide("getCurrentFunctions", getCurrentFunctions);
 
-    const flows = computed(() => [mainFlow.value, ...subFlows.value]);
-
     const activeTab = ref("main");
 
     const getCurrentFlow = () => {
@@ -208,6 +232,7 @@ export default defineComponent({
       subFlows,
       activeTab,
       getOutputVariables,
+      updateFlows,
     };
   },
   data() {
@@ -217,6 +242,12 @@ export default defineComponent({
       outputVariables: [],
     };
   },
+  computed: {
+    commandConfig() {
+      const { tags, output, features } = this.modelValue;
+      return { tags, output, features };
+    },
+  },
   methods: {
     generateFlowName(baseName = "func_") {
       return (
@@ -249,7 +280,7 @@ export default defineComponent({
         });
       }
 
-      this.subFlows.push(newFlow);
+      this.subFlows = [...this.subFlows, newFlow];
 
       if (options.silent) {
         return;
@@ -263,7 +294,10 @@ export default defineComponent({
     removeFlow(flow) {
       const index = this.subFlows.findIndex((f) => f.id === flow.id);
       if (index > -1) {
-        this.subFlows.splice(index, 1);
+        this.subFlows = [
+          ...this.subFlows.slice(0, index),
+          ...this.subFlows.slice(index + 1),
+        ];
         this.activeTab = this.flows[0].id;
       }
     },
@@ -279,25 +313,13 @@ export default defineComponent({
       // 完全更新参数
       this.subFlows[index].customVariables = [...newParams, ...localVars];
     },
-    generateFlowCode(flow) {
-      return generateCode(flow);
-    },
-    generateAllFlowCode() {
-      // 生成所有flow的代码
-      return [...this.subFlows, this.mainFlow]
-        .map((flow) => this.generateFlowCode(flow))
-        .join("\n\n");
-    },
     handleAction(type, payload) {
       switch (type) {
         case "save":
           this.saveFlows();
           break;
-        case "load":
-          this.loadFlows();
-          break;
         case "run":
-          this.runFlows(payload);
+          this.runCommand(payload);
           break;
         case "collapseAll":
           this.collapseAll();
@@ -308,6 +330,9 @@ export default defineComponent({
         case "toggleVariableManager":
           this.toggleVariableManager();
           break;
+        case "close":
+          this.$emit("action", "close");
+          break;
         case "addFlow":
           // 处理新函数创建
           const index = this.subFlows.findIndex((f) => f.name === payload.name);
@@ -319,7 +344,7 @@ export default defineComponent({
           }
           break;
         default:
-          this.$emit("action", type, this.generateAllFlowCode());
+          this.$emit("action", type, payload);
       }
     },
     toggleVariableManager() {
@@ -327,61 +352,17 @@ export default defineComponent({
       this.outputVariables = this.getOutputVariables();
     },
     saveFlows() {
-      const flowsData = this.flows.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          const cmdCopy = { ...cmd };
-          // 移除不必要保存的属性
-          const uselessProps = [
-            "config",
-            "code",
-            "label",
-            "component",
-            "subCommands",
-            "outputs",
-            "options",
-            "defaultValue",
-            "icon",
-            "width",
-            "placeholder",
-            "summary",
-            "type",
-            "defaultOutputVariable",
-          ];
-          uselessProps.forEach((prop) => delete cmdCopy[prop]);
-          return cmdCopy;
-        }),
-      }));
-      localStorage.setItem("quickcomposer.flows", JSON.stringify(flowsData));
-      quickcommand.showMessageBox("保存成功");
-    },
-    loadFlows() {
-      const savedFlows = localStorage.getItem("quickcomposer.flows");
-      if (!savedFlows) return;
-
-      const flowsData = JSON.parse(savedFlows);
-      const newFlows = flowsData.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          // 恢复所有属性
-          const command = findCommandByValue(cmd.value);
-          return {
-            ...command,
-            ...cmd,
-          };
-        }),
-      }));
-      this.Sub(newFlows);
-      this.activeTab = this.mainFlow.id;
+      this.$emit("action", "save", {
+        ...this.modelValue,
+        flows: this.flows,
+      });
     },
-    runFlows(flow) {
-      const code = flow
-        ? this.generateFlowCode(flow)
-        : this.generateAllFlowCode();
-      this.$emit("action", "run", code);
-      if (!code.includes("console.log")) {
-        quickcommand.showMessageBox("已运行");
-      }
+    runCommand(flows = this.flows) {
+      const command = {
+        ...this.modelValue,
+        flows,
+      };
+      this.$emit("action", "run", command);
     },
     collapseAll() {
       this.$refs.flowRefs.forEach((flow) => {
@@ -399,9 +380,12 @@ export default defineComponent({
       this.activeTab = flow.id;
       this.toggleVariableManager();
     },
-    Sub(flow) {
-      this.mainFlow = flow[0];
-      this.subFlows = flow.slice(1);
+    updateCommandConfig(newVal) {
+      const newModelValue = {
+        ...this.modelValue,
+        ...newVal,
+      };
+      this.$emit("update:modelValue", newModelValue);
     },
   },
 });
@@ -556,4 +540,8 @@ export default defineComponent({
   border-bottom: 2px solid var(--q-primary);
   transition: all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
+
+.command-config-panel {
+  padding: 8px;
+}
 </style>
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 0fd7e97d..bc7a7eb1 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -57,9 +57,6 @@
       <q-btn dense flat icon="save" @click="$emit('action', 'save')">
         <q-tooltip>保存</q-tooltip>
       </q-btn>
-      <q-btn dense flat icon="history" @click="$emit('action', 'load')">
-        <q-tooltip>载入</q-tooltip>
-      </q-btn>
       <q-btn flat dense icon="preview" @click="isVisible = true">
         <q-tooltip>预览代码</q-tooltip>
       </q-btn>
@@ -92,15 +89,12 @@
 
 <script>
 import { defineComponent } from "vue";
+import { generateFlowsCode } from "js/composer/generateCode";
 
 export default defineComponent({
   name: "ComposerButtons",
 
   props: {
-    generateCode: {
-      type: Function,
-      required: true,
-    },
     isAllCollapsed: {
       type: Boolean,
       default: false,
@@ -109,6 +103,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    flows: {
+      type: Array,
+      default: () => [],
+    },
   },
 
   emits: ["action"],
@@ -124,7 +122,7 @@ export default defineComponent({
   watch: {
     isVisible(val) {
       if (val) {
-        this.code = this.generateCode();
+        this.code = generateFlowsCode(this.flows);
       }
     },
   },
@@ -172,16 +170,6 @@ export default defineComponent({
 
 /* 自定义滚动条 */
 .preview-code::-webkit-scrollbar {
-  width: 6px;
-}
-
-.preview-code::-webkit-scrollbar-thumb {
-  background: var(--q-primary-opacity-20);
-  border-radius: 3px;
-  transition: background 0.3s;
-}
-
-.preview-code::-webkit-scrollbar-thumb:hover {
-  background: var(--q-primary-opacity-30);
+  width: 5px;
 }
 </style>
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
new file mode 100644
index 00000000..463ff76e
--- /dev/null
+++ b/src/components/editor/CommandConfig.vue
@@ -0,0 +1,336 @@
+<template>
+  <q-expansion-item
+    v-model="isExpanded"
+    class="command-config"
+    @dragover="isExpanded = false"
+  >
+    <template v-slot:header>
+      <div class="row q-col-gutter-sm basic-config">
+        <div class="col-auto">
+          <q-avatar size="36px" square class="featureIco">
+            <q-img
+              @click.stop="showIconPicker = true"
+              :src="
+                currentCommand.features.icon
+              "
+            />
+          </q-avatar>
+        </div>
+        <div class="col">
+          <q-input
+            :model-value="currentCommand.features.explain"
+            filled
+            dense
+            @update:model-value="updateCommand('features.explain', $event)"
+            placeholder="名称"
+            @click.stop
+          >
+            <template v-slot:append>
+              <q-icon name="drive_file_rename_outline" />
+            </template>
+          </q-input>
+        </div>
+      </div>
+    </template>
+
+    <!-- 展开的配置项 -->
+    <div class="expanded-config">
+      <!-- 匹配规则 -->
+      <div class="config-section">
+        <div class="section-title">
+          <q-icon name="rule" size="16px" />
+          <span class="q-ml-sm">匹配规则</span>
+          <q-icon
+            name="help"
+            size="16px"
+            class="q-ml-sm cursor-pointer"
+            @click="showMatchRuleHelp"
+          >
+            <q-tooltip>查看帮助</q-tooltip>
+          </q-icon>
+          <q-icon
+            name="data_object"
+            size="16px"
+            class="q-ml-sm cursor-pointer"
+            :color="showMatchRuleJson ? 'primary' : 'grey'"
+            @click="showMatchRuleJson = !showMatchRuleJson"
+          >
+            <q-tooltip>编辑JSON配置</q-tooltip>
+          </q-icon>
+        </div>
+        <MatchRuleEditor
+          :showJson="showMatchRuleJson"
+          :model-value="currentCommand.features.cmds"
+          @update:model-value="updateCommand('features.cmds', $event)"
+        />
+      </div>
+
+      <!-- 标签 -->
+      <div class="config-section">
+        <div class="section-title">
+          <q-icon name="label" size="16px" />
+          <span class="q-ml-sm">标签</span>
+        </div>
+        <q-select
+          :model-value="currentCommand.tags"
+          @update:model-value="updateCommand('tags', $event)"
+          :options="allQuickCommandTags"
+          dense
+          options-dense
+          filled
+          use-input
+          use-chips
+          multiple
+          hide-dropdown-icon
+          new-value-mode="add-unique"
+          placeholder="回车添加，最多3个"
+          max-values="3"
+          @new-value="tagVerify"
+          input-debounce="0"
+          ref="commandTagRef"
+          @blur="(e) => autoAddInputVal(e, $refs.commandTagRef)"
+        />
+      </div>
+
+      <!-- 输出 -->
+      <div class="config-section">
+        <div class="section-title">
+          <q-icon name="output" size="16px" />
+          <span class="q-ml-sm">输出</span>
+        </div>
+        <div class="row q-col-gutter-sm">
+          <div class="col-12">
+            <ButtonGroup
+              :model-value="currentCommand.output"
+              :options="outputTypesOptionsDy"
+              @update:model-value="updateCommand('output', $event)"
+              height="26px"
+            />
+          </div>
+          <div class="col-12">
+            <div class="section-title">
+              <q-icon name="search" size="16px" />
+              <span class="q-ml-sm"
+                >搜索面板推送
+                <q-btn
+                  flat
+                  round
+                  size="xs"
+                  icon="help"
+                  @click="showMainPushHelp"
+                />
+              </span>
+            </div>
+            <ButtonGroup
+              :model-value="currentCommand.features.mainPush"
+              :options="searchPushOptions"
+              @update:model-value="handleMainPushChange"
+              height="30px"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- 平台 -->
+      <div class="config-section">
+        <div class="section-title">
+          <q-icon name="devices" size="16px" />
+          <span class="q-ml-sm">平台</span>
+        </div>
+        <CheckGroup
+          :model-value="currentCommand.features.platform"
+          :options="Object.values(platformTypes)"
+          @update:model-value="updateCommand('features.platform', $event)"
+          height="30px"
+        />
+      </div>
+    </div>
+
+    <!-- 图标选择对话框 -->
+    <q-dialog v-model="showIconPicker" position="left">
+      <iconPicker
+        @iconChanged="(dataUrl) => updateCommand('features.icon', dataUrl)"
+        ref="icon"
+      />
+    </q-dialog>
+  </q-expansion-item>
+</template>
+
+<script>
+import { defineComponent, inject, computed } from "vue";
+import iconPicker from "components/popup/IconPicker.vue";
+import outputTypes from "js/options/outputTypes.js";
+import platformTypes from "js/options/platformTypes.js";
+import CheckGroup from "components/composer/common/CheckGroup.vue";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+import commandTypes from "js/options/commandTypes.js";
+import MatchRuleEditor from "components/editor/MatchRuleEditor.vue";
+
+export default defineComponent({
+  name: "CommandConfig",
+  components: {
+    iconPicker,
+    CheckGroup,
+    ButtonGroup,
+    MatchRuleEditor,
+  },
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props) {
+    const allQuickCommandTags = inject("allQuickCommandTags").filter(
+      (tag) => !["默认", "未分类", "搜索结果"].includes(tag)
+    );
+
+    const currentCommand = computed(() => props.modelValue);
+
+    return {
+      allQuickCommandTags,
+      currentCommand,
+    };
+  },
+  data() {
+    return {
+      isExpanded: false,
+      showIconPicker: false,
+      showMatchRuleJson: false,
+      commandTypes,
+      outputTypes,
+      platformTypes,
+      isFileTypeDirectory: false,
+      searchPushOptions: [
+        { value: false, label: "禁用（进入插件后才执行命令）" },
+        { value: true, label: "启用（在uTools主搜索框直接执行命令）" },
+      ],
+    };
+  },
+  computed: {
+    commandTypesOptions() {
+      const options = Object.values(this.commandTypes);
+      return this.currentCommand.features.mainPush
+        ? options.map((cmdType) =>
+            ["regex", "over", "key"].includes(cmdType.name)
+              ? cmdType
+              : { ...cmdType, disabled: true }
+          )
+        : options;
+    },
+    outputTypesOptionsDy() {
+      const options = Object.values(this.outputTypes);
+      return this.currentCommand.features.mainPush
+        ? options.map((outputType) =>
+            outputType.name !== "text"
+              ? { ...outputType, disabled: true }
+              : outputType
+          )
+        : options;
+    },
+  },
+  methods: {
+    updateCommand(path, value) {
+      const newCommand = { ...this.currentCommand };
+      const keys = path.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((obj, key) => obj[key], newCommand);
+      target[lastKey] = value;
+      this.$emit("update:modelValue", newCommand);
+    },
+    tagVerify(val, done) {
+      if (["默认", "未分类", "搜索结果"].includes(val)) {
+        return done(`_${val}_`);
+      }
+      done(val);
+    },
+    autoAddInputVal(e, ref) {
+      const inputValue = e.target.value;
+      if (!inputValue) return;
+      ref.add(inputValue, true);
+    },
+    handleMainPushChange(val) {
+      this.updateCommand("features.mainPush", val);
+      if (val) {
+        this.updateCommand("output", "text");
+      }
+    },
+    showMainPushHelp() {
+      window.showUb.help("#u0e9f1430");
+    },
+    showMatchRuleHelp() {
+      utools.ubrowser
+        .goto(
+          "https://www.u-tools.cn/docs/developer/information/plugin-json.html#%E5%8A%9F%E8%83%BD%E6%8C%87%E4%BB%A4"
+        )
+        .run();
+    },
+  },
+});
+</script>
+
+<style scoped>
+.command-config {
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.command-config :deep(.q-field__inner) {
+  font-family: "Consolas", "Monaco", monospace;
+}
+
+.basic-config {
+  width: 100%;
+}
+
+.command-config :deep(.q-item) {
+  padding: 0;
+  min-height: unset;
+  cursor: default;
+}
+
+.command-config :deep(.q-item__section--side) {
+  padding: 0;
+}
+
+.command-config :deep(.q-item:hover) {
+  background: transparent;
+}
+
+.command-config :deep(.q-focus-helper) {
+  display: none;
+}
+
+.config-section {
+  margin-bottom: 4px;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+  color: var(--q-primary);
+  padding: 4px 2px;
+  user-select: none;
+}
+
+.featureIco {
+  cursor: pointer;
+  transition: 0.2s;
+}
+
+.featureIco:hover {
+  transform: scale(1.02) translateY(-2px);
+}
+
+.expanded-config {
+  overflow-y: auto;
+  max-height: 450px;
+  padding: 0 5px;
+}
+
+::-webkit-scrollbar {
+  width: 1px;
+}
+</style>
diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
new file mode 100644
index 00000000..c1d97e79
--- /dev/null
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -0,0 +1,449 @@
+<template>
+  <div class="match-rule-editor">
+    <!-- JSON编辑模式 -->
+    <div v-if="showJson" class="json-editor">
+      <q-input
+        :model-value="jsonText"
+        @update:model-value="updateJsonText($event)"
+        type="textarea"
+        filled
+        autogrow
+      />
+    </div>
+
+    <!-- 可视化编辑模式 -->
+    <div v-else class="visual-editor">
+      <!-- 规则类型选择按钮组 -->
+      <div class="rule-type-buttons q-mb-sm q-mt-xs">
+        <div v-for="type in ruleTypeOptions" :key="type.value" class="col-auto">
+          <q-btn
+            :label="type.label"
+            :icon="type.icon"
+            :color="type.color"
+            outline
+            dense
+            class="rule-type-btn"
+            @click="addRuleByType(type.value)"
+          >
+            <q-badge
+              v-if="ruleTypeCounts[type.value]"
+              floating
+              :label="ruleTypeCounts[type.value]"
+            />
+          </q-btn>
+        </div>
+      </div>
+
+      <!-- 规则列表 -->
+      <div class="rules-container">
+        <!-- 关键词匹配规则组 -->
+        <div v-if="keyRules.length" class="key-rules-row">
+          <div
+            v-for="(rule, index) in keyRules"
+            :key="'key-' + index"
+            class="key-input-wrapper"
+          >
+            <q-input
+              :model-value="rule"
+              @update:model-value="updateModelValueByIndex($event, index)"
+              dense
+              filled
+              :label="`关键词 ${index + 1}`"
+            >
+              <template v-slot:append>
+                <q-icon
+                  name="cancel"
+                  @click="removeRule(index)"
+                  size="12px"
+                  class="cursor-pointer text-grey"
+                />
+              </template>
+            </q-input>
+          </div>
+        </div>
+
+        <!-- 其他类型规则 -->
+        <div
+          v-for="(rule, index) in nonKeyRules"
+          :key="'other-' + index"
+          class="rule-item"
+        >
+          <div class="row items-center">
+            <div class="col-auto q-mr-sm">
+              <q-field dense filled>
+                <template v-slot:control>
+                  <q-icon :name="commandTypes[rule.type].icon" />
+                  <div class="q-mx-xs" style="user-select: none">
+                    {{ commandTypes[rule.type].label }}
+                  </div>
+                  <q-icon
+                    name="cancel"
+                    @click="removeRule(index + keyRules.length)"
+                    size="12px"
+                    class="cursor-pointer text-grey"
+                  />
+                </template>
+              </q-field>
+            </div>
+
+            <!-- 正则匹配 -->
+            <template v-if="rule.type === 'regex'">
+              <div class="col row q-gutter-sm">
+                <q-input
+                  v-model="rule.match"
+                  dense
+                  filled
+                  label="匹配文本正则表达式"
+                  placeholder="例：/xxx/，任意匹配的正则会被 uTools 忽略"
+                  class="col"
+                  @blur="validateRegex(rule)"
+                />
+                <q-input
+                  v-model.number="rule.minLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最小长度"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+                <q-input
+                  v-model.number="rule.maxLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最大长度"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+              </div>
+            </template>
+
+            <!-- 文件匹配 -->
+            <template v-else-if="rule.type === 'files'">
+              <div class="col row q-gutter-sm">
+                <q-input
+                  v-model="rule.match"
+                  dense
+                  filled
+                  label="匹配文件(夹)名正则表达式"
+                  placeholder="可选，例：/xxx/"
+                  class="col"
+                  @blur="validateRegex(rule)"
+                />
+                <q-select
+                  :model-value="rule.fileType || 'file'"
+                  @update:model-value="rule.fileType = $event"
+                  :options="[
+                    { label: '文件', value: 'file' },
+                    { label: '文件夹', value: 'directory' },
+                  ]"
+                  label="文件类型"
+                  dense
+                  options-dense
+                  filled
+                  emit-value
+                  map-options
+                  class="col-2"
+                />
+                <q-input
+                  v-model.number="rule.minLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最小数量"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+                <q-input
+                  v-model.number="rule.maxLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最大数量"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+              </div>
+            </template>
+
+            <!-- 窗口匹配 -->
+            <template v-else-if="rule.type === 'window'">
+              <div class="col row q-gutter-sm">
+                <q-input
+                  :model-value="rule.match.app.join(',')"
+                  @update:model-value="
+                    rule.match.app = getArrayFromString($event)
+                  "
+                  dense
+                  filled
+                  class="col"
+                  label="程序/应用名，逗号隔开"
+                  placeholder="例：xxx.exe,xxx.app"
+                />
+                <q-input
+                  v-model="rule.match.title"
+                  dense
+                  filled
+                  label="匹配窗口标题正则表达式"
+                  placeholder="可选，例：/xxx/"
+                  class="col-5"
+                  @blur="validateRegex({ match: rule.match.title })"
+                />
+              </div>
+            </template>
+
+            <!-- 图片匹配 -->
+            <template v-else-if="rule.type === 'img'">
+              <q-field v-model="rule.label" dense filled class="col">
+                <template v-slot:control>
+                  <div>无需配置</div>
+                </template>
+              </q-field>
+            </template>
+
+            <!-- 所有文本匹配 -->
+            <template v-else-if="rule.type === 'over'">
+              <div class="col row q-gutter-sm">
+                <q-input
+                  v-model="rule.exclude"
+                  dense
+                  filled
+                  label="排除的正则表达式字符串"
+                  placeholder="可选，例：/xxx/"
+                  class="col"
+                  @blur="validateRegex({ match: rule.exclude })"
+                />
+                <q-input
+                  v-model.number="rule.minLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最小长度"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+                <q-input
+                  v-model.number="rule.maxLength"
+                  type="number"
+                  dense
+                  filled
+                  label="最大长度"
+                  placeholder="可选"
+                  style="width: 65px"
+                />
+              </div>
+            </template>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import commandTypes from "js/options/commandTypes.js";
+
+export default defineComponent({
+  name: "MatchRuleEditor",
+  props: {
+    modelValue: {
+      type: Array,
+      required: true,
+    },
+    showJson: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  emits: ["update:modelValue"],
+
+  data() {
+    return {
+      ruleTypeOptions: Object.values(commandTypes)
+        .filter((type) => type.name !== "professional")
+        .map((type) => ({
+          label: type.label,
+          value: type.name,
+          icon: type.icon,
+          color: type.color,
+        })),
+      commandTypes,
+    };
+  },
+
+  computed: {
+    localRules() {
+      return [...this.keyRules, ...this.nonKeyRules];
+    },
+
+    // 关键词规则
+    keyRules() {
+      return this.modelValue.filter((rule) => typeof rule === "string");
+    },
+
+    // 非关键词规则
+    nonKeyRules() {
+      return this.modelValue.filter((rule) => typeof rule !== "string");
+    },
+
+    // JSON文本
+    jsonText() {
+      return JSON.stringify(this.modelValue, null, 2);
+    },
+
+    // 计算每种规则类型的数量
+    ruleTypeCounts() {
+      return this.localRules.reduce((counts, rule) => {
+        const type = typeof rule === "string" ? "key" : rule.type;
+        counts[type] = (counts[type] || 0) + 1;
+        return counts;
+      }, {});
+    },
+  },
+
+  methods: {
+    validateRegex(rule) {
+      const matchValue = rule.match;
+      if (!matchValue) return;
+
+      try {
+        if (!matchValue.startsWith("/")) {
+          rule.match = `/${matchValue}/`;
+        }
+        new RegExp(matchValue.replace(/^\/|\/[gimuy]*$/g, ""));
+      } catch (e) {
+        rule.match = "/./";
+      }
+    },
+
+    removeRule(index) {
+      const newRules = [...this.localRules];
+      newRules.splice(index, 1);
+      if (newRules.length == 0) {
+        return;
+      }
+      this.updateModelValue(newRules);
+    },
+
+    updateJsonText(newJsonText) {
+      try {
+        const parsed = JSON.parse(newJsonText);
+        const validConfig = parsed.filter((rule) => {
+          if (typeof rule === "string") return true;
+          return Object.values(commandTypes).some(
+            (type) => type.name === rule.type
+          );
+        });
+        this.updateModelValue(validConfig);
+      } catch (_) {}
+    },
+
+    updateModelValue(newRules) {
+      this.$emit("update:modelValue", newRules);
+    },
+
+    updateModelValueByIndex(newValue, index) {
+      const newRules = [...this.localRules];
+      newRules[index] = newValue;
+      this.updateModelValue(newRules);
+    },
+
+    getArrayFromString(str) {
+      return str
+        .split(",")
+        .filter(Boolean)
+        .map((item) => item.trim());
+    },
+
+    // 根据类型添加新规则
+    addRuleByType(type) {
+      const newRules = [...this.localRules];
+
+      if (type === "key") {
+        // 在所有关键词后面插入新的关键词
+        newRules.splice(this.keyRules.length, 0, "");
+      } else {
+        // 非关键词类型，直接添加到末尾
+        newRules.push({
+          type,
+          match: {
+            window: { app: [] },
+            regex: "",
+          }[type],
+        });
+      }
+
+      this.updateModelValue(newRules);
+    },
+  },
+});
+</script>
+
+<style scoped>
+.rule-type-buttons {
+  display: flex;
+  gap: 8px;
+  justify-content: space-between;
+}
+
+.rule-type-buttons :deep(.q-btn) {
+  padding: 0;
+  font-size: 12px;
+  height: 24px;
+  min-width: 85px;
+}
+
+.body--dark .rule-type-count {
+  background-color: rgba(255, 255, 255, 0.9);
+}
+
+.rules-container {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-bottom: -4px;
+}
+
+.key-rules-row {
+  display: flex;
+  gap: 8px;
+}
+
+.key-input-wrapper {
+  flex: 1;
+  min-width: 0;
+}
+
+.key-input-wrapper :deep(.q-field__append) {
+  padding: 0 4px;
+}
+
+.key-input-wrapper :deep(.q-icon) {
+  font-size: 16px;
+  opacity: 0.7;
+  transition: opacity 0.3s;
+}
+
+.key-input-wrapper :deep(.q-icon:hover) {
+  opacity: 1;
+}
+
+.json-editor {
+  font-family: monospace;
+}
+
+.json-editor :deep(.q-field__native) {
+  min-height: 200px;
+  font-family: monospace;
+}
+
+/* 隐藏默认的数字输入框箭头 - Chrome, Safari, Edge, Opera */
+.match-rule-editor :deep(input[type="number"]::-webkit-outer-spin-button),
+.match-rule-editor :deep(input[type="number"]::-webkit-inner-spin-button) {
+  -webkit-appearance: none;
+  margin: 0;
+}
+</style>
diff --git a/src/css/composer.css b/src/css/composer.css
index e8b5c14e..997e72fe 100644
--- a/src/css/composer.css
+++ b/src/css/composer.css
@@ -25,6 +25,10 @@
   font-size: 12px;
 }
 
+.command-composer .q-field--filled.q-select--with-chips .q-field__control .q-chip {
+  margin: 0 4px;
+}
+
 /* 输入框图标大小 */
 .command-composer .q-field--filled .q-field__control .q-icon {
   font-size: 18px;
diff --git a/src/js/autoDetach.js b/src/js/autoDetach.js
deleted file mode 100644
index 5ed51162..00000000
--- a/src/js/autoDetach.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const winScpt = `Add-Type -TypeDefinition @"
-using System;
-using System.Runtime.InteropServices;
-public class Win32 {
-    [StructLayout(LayoutKind.Sequential)]
-    public struct RECT {
-        public int Left;
-        public int Top;
-        public int Right;
-        public int Bottom;
-    }
-    [DllImport("user32.dll", SetLastError=true)]
-    public static extern IntPtr GetForegroundWindow();
-    [DllImport("user32.dll", SetLastError=true)]
-    public static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect);
-}
-"@
-$foregroundWindow = [Win32]::GetForegroundWindow()
-$windowRect = New-Object Win32+RECT
-$_ = [Win32]::GetWindowRect($foregroundWindow, [ref]$windowRect)
-$result = New-Object PSObject
-$result | Add-Member -Type NoteProperty -Name Left -Value $windowRect.Left
-$result | Add-Member -Type NoteProperty -Name Top -Value $windowRect.Top
-$result | Add-Member -Type NoteProperty -Name Right -Value $windowRect.Right
-$result | Add-Member -Type NoteProperty -Name Bottom -Value $windowRect.Bottom
-$result | ConvertTo-Json`;
-
-const macScpt = `tell application "System Events"
-  set frontmostProcess to first application process where it is frontmost
-  set frontmostWindow to first window of frontmostProcess
-  set {windowLeft, windowTop} to position of frontmostWindow
-  set {windowWidth, windowHeight} to size of frontmostWindow
-  set windowRight to windowLeft + windowWidth
-  set windowBottom to windowTop + windowHeight
-end tell
-return "{ \\"Left\\": " & windowLeft & ", \\"Top\\": " & windowTop & ", \\"Right\\": " & windowRight & ", \\"Bottom\\": " &windowBottom & " }"`;
-
-const getForegroundWindowPos = async () => {
-  let foregroundWindowPos;
-  try {
-    if (window.utools.isWindows()) {
-      foregroundWindowPos = await window.quickcommand.runPowerShell(winScpt);
-    } else if (window.utools.isMacOS()) {
-      foregroundWindowPos = await window.quickcommand.runAppleScript(macScpt);
-    }
-  } catch (error) {
-    console.log(error);
-  }
-  if (!foregroundWindowPos) return;
-  return JSON.parse(foregroundWindowPos);
-};
-
-let autoDetach = async () => {
-  const foregroundWindowPos = await getForegroundWindowPos();
-  console.log(foregroundWindowPos);
-  if (foregroundWindowPos) {
-    const { Left, Top, Right, Bottom } = foregroundWindowPos;
-    let { x, y } = window.utools.getCursorScreenPoint();
-    window.utools.simulateMouseDoubleClick(Left + 200, Top + 30);
-    window.utools.simulateMouseMove(x, y);
-  }
-};
-
-export default {
-  autoDetach,
-};
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 025df161..e2e4f5b2 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -2,6 +2,8 @@ import { reactive } from "vue";
 import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
 import utoolsFull from "js/utools.js";
+import { getUniqueId } from "js/common/uuid.js";
+import outputTypes from "js/options/outputTypes.js";
 
 // 默认命令
 const defaultCommands = importAll(
@@ -16,6 +18,50 @@ const state = reactive({
   activatedQuickPanels: [],
 });
 
+const getCmdType = (cmds) => {
+  const firstCmdType = cmds[0].type || "key";
+  if (!cmds.find((x) => typeof x !== "string")) return "key";
+  if (!cmds.find((x) => x.type !== firstCmdType)) return firstCmdType;
+  return "professional";
+};
+
+const getFeatureCode = (cmds) => {
+  return `${getCmdType(cmds)}_${getUniqueId({ short: true })}`;
+};
+
+const getLabeledCmds = (cmds, explain) => {
+  return cmds.map((cmd) => {
+    if (typeof cmd === "string") {
+      return cmd || explain;
+    }
+    return {
+      ...cmd,
+      label: cmd.label || explain,
+    };
+  });
+};
+
+export const getValidCommand = (command) => {
+  const { cmds, explain } = command.features;
+  if (!explain) throw "名称不能为空";
+  if (!Array.isArray(cmds)) throw "匹配规则格式错误";
+
+  // 未配置label或关键字时，直接使用名称
+  command.features.cmds = getLabeledCmds(cmds, explain);
+
+  // 不需要显示输入框的输入类型，添加mainHide属性
+  if (outputTypes[command.output].outPlugin) {
+    command.features.mainHide = true;
+  }
+
+  // 生成唯一code
+  if (!command.features.code) {
+    command.features.code = getFeatureCode(cmds);
+  }
+
+  return window.lodashM.cloneDeep(command);
+};
+
 // 使用函数工厂模式，确保每个组件获取自己的状态副本
 export function useCommandManager() {
   // 获取已启用的命令
@@ -59,6 +105,11 @@ export function useCommandManager() {
 
   // 保存命令
   const saveCommand = (command) => {
+    try {
+      command = getValidCommand(command);
+    } catch (e) {
+      return quickcommand.showMessageBox(e.toString(), "error");
+    }
     const code = command.features.code;
     state.allQuickCommands[code] = command;
 
@@ -70,7 +121,7 @@ export function useCommandManager() {
     utoolsFull.whole.setFeature(command.features);
 
     if (!isDefaultCommand(code)) {
-      utoolsFull.putDB(window.lodashM.cloneDeep(command), "qc_" + code);
+      utoolsFull.putDB(command, "qc_" + code);
     }
 
     getAllQuickCommandTags();
diff --git a/src/js/common/uuid.js b/src/js/common/uuid.js
index 84ef06cb..37ef469c 100644
--- a/src/js/common/uuid.js
+++ b/src/js/common/uuid.js
@@ -1,7 +1,9 @@
-export const getUniqueId = () => {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+export const getUniqueId = (options = {}) => {
+  const { short = false } = options;
+  const uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
     const r = (Math.random() * 16) | 0;
     const v = c === "x" ? r : (r & 0x3) | 0x8;
     return v.toString(16);
   });
+  return short ? uuid.substring(0, 8) : uuid;
 };
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index e3f73e56..b0292920 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -133,3 +133,10 @@ export function generateCode(flow) {
 
   return finalCode;
 }
+
+export function generateFlowsCode(flows) {
+  const [mainFlow, ...subFlows] = flows;
+  return [...subFlows, mainFlow]
+    .map((flow) => generateCode(flow))
+    .join("\n\n");
+}
diff --git a/src/js/options/commandTypes.js b/src/js/options/commandTypes.js
index 85efabc7..ae8c8d16 100644
--- a/src/js/options/commandTypes.js
+++ b/src/js/options/commandTypes.js
@@ -3,7 +3,8 @@
  */
 
 const jsonSample = [
-  "关键词",
+  "关键词1",
+  "关键词2",
   {
     type: "img",
     label: "图片匹配",
@@ -41,12 +42,12 @@ const jsonSample = [
   },
 ];
 
-const commandTypes = {
+export default {
   key: {
     name: "key",
     label: "关键词",
     icon: "font_download",
-    color: "teal",
+    color: "blue",
     matchLabel: "关键词",
     desc: "直接在主输入框输入对应关键字，最通用的一种模式，关键字可以设置多个",
     valueType: "array",
@@ -57,7 +58,7 @@ const commandTypes = {
   },
   regex: {
     name: "regex",
-    label: "正则/划词",
+    label: "正则",
     icon: "rule",
     color: "cyan",
     matchLabel: "正则",
@@ -82,7 +83,7 @@ const commandTypes = {
   over: {
     name: "over",
     label: "所有文本",
-    matchLabel: "无需设置",
+    matchLabel: "无需配置",
     icon: "emergency",
     color: "light-green",
     desc: "匹配主输入框的所有文本，但只有在该文本未设置对应的插件或功能时才生效",
@@ -104,7 +105,7 @@ const commandTypes = {
   },
   window: {
     name: "window",
-    label: "窗口/进程",
+    label: "窗口",
     matchLabel: "进程名",
     icon: "widgets",
     color: "indigo",
@@ -154,7 +155,7 @@ const commandTypes = {
   },
   files: {
     name: "files",
-    label: "复制/选中文件",
+    label: "文件",
     matchLabel: "正则",
     icon: "description",
     color: "light-blue",
@@ -200,5 +201,3 @@ const commandTypes = {
     jsonSample: jsonSample,
   },
 };
-
-export default commandTypes;
diff --git a/src/pages/CommandPage.vue b/src/pages/CommandPage.vue
index 3a8eceec..fc2de94e 100644
--- a/src/pages/CommandPage.vue
+++ b/src/pages/CommandPage.vue
@@ -27,7 +27,7 @@ export default {
   },
   methods: {
     runCurrentCommand(command) {
-      this.$refs.result.runCurrentCommand(window.lodashM.cloneDeep(command));
+      this.$refs.result.runCurrentCommand(command);
     },
   },
 };
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 5e240853..b30d1818 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -221,9 +221,7 @@ export default {
       }
     },
     runCommand(code) {
-      this.$refs.result.runCurrentCommand(
-        window.lodashM.cloneDeep(this.allQuickCommands[code])
-      );
+      this.$refs.result.runCurrentCommand(this.allQuickCommands[code]);
     },
     // 启用命令
     enableCommand(code) {
@@ -241,13 +239,16 @@ export default {
       }
     },
     // 编辑命令
-    editCommand(command) {
+    editCommand(commandOrCode) {
       // 即可传入 code，也可直接传入 command
-      if (typeof command === "string") command = this.allQuickCommands[command];
+      const command =
+        typeof commandOrCode === "string"
+          ? this.allQuickCommands[commandOrCode]
+          : commandOrCode;
       this.commandEditorAction = {
         type: "edit",
         data: window.lodashM.cloneDeep(command),
-        component: "CommandEditor",
+        component: command.flows ? "ComposerEditor" : "CommandEditor",
       };
       this.isEditorShow = true;
     },
@@ -349,6 +350,7 @@ export default {
     saveCommand(command) {
       const code = this.commandManager.saveCommand(command);
       this.locateToCommand(command.tags, code);
+      quickcommand.showMessageBox("保存成功！");
     },
     editorEvent(event) {
       switch (event.type) {
@@ -394,7 +396,7 @@ export default {
 
       // 更新存储
       this.commandManager.state.allQuickCommands = {
-        ...this.commandManager.state.allQuickCommands,
+        ...this.allQuickCommands,
         ...tagCommands,
       };
 

From a8c3528566abbd1b2796a962d57feb255c521120 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 23:55:07 +0800
Subject: [PATCH 167/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9sub?=
 =?UTF-8?q?command=E6=97=B6=EF=BC=8Coutput=E4=B8=8D=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       | 5 ++++-
 src/components/composer/card/OutputEditor.vue | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 74b79826..b765c35e 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -220,7 +220,10 @@ export default defineComponent({
         code: this.generateCode(subCommand, argvs),
       };
       if (resetOutputVariable) {
-        delete newModelValue.outputVariable;
+        newModelValue.outputVariable = {
+          name: "",
+          details: {},
+        };
       }
       this.$emit("update:modelValue", newModelValue);
     },
diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index c9149c75..07b1e9eb 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -200,7 +200,7 @@ export default defineComponent({
     currentSubCommand() {
       if (!this.command.subCommands) return {};
       return this.command.subCommands.find(
-        (cmd) => cmd.value === this.command.value
+        (cmd) => cmd.value === this.command.subCommand
       );
     },
     commandName() {

From 8d7e6e7a80fe1685189510904f27f3ff9a0b7d21 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 12 Feb 2025 23:59:08 +0800
Subject: [PATCH 168/332] =?UTF-8?q?=E5=8E=BB=E9=99=A4composer=E7=9A=84appl?=
 =?UTF-8?q?y=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/flow/ComposerButtons.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index bc7a7eb1..0e1ced69 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -44,7 +44,7 @@
       >
         <q-tooltip>插入到编辑器光标处</q-tooltip>
       </q-btn> -->
-      <q-btn
+      <!-- <q-btn
         dense
         flat
         v-close-popup
@@ -53,7 +53,7 @@
         v-if="showCloseButton"
       >
         <q-tooltip>清空编辑器内容并插入</q-tooltip>
-      </q-btn>
+      </q-btn> -->
       <q-btn dense flat icon="save" @click="$emit('action', 'save')">
         <q-tooltip>保存</q-tooltip>
       </q-btn>

From 5960acd201152845c86675649e098a281c177856 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 00:49:02 +0800
Subject: [PATCH 169/332] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92uTools=E5=8A=9F=E8=83=BD=E5=88=86=E7=B1=BB=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=8C=B9=E9=85=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/utoolsCommand.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 072de681..88374f0f 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -2,6 +2,29 @@ export const utoolsCommands = {
   label: "uTools功能",
   icon: "insights",
   commands: [
+    {
+      value: "quickcommand.enterData.valueOf",
+      label: "获取匹配数据",
+      icon: "visibility_off",
+      outputs: {
+        label: "匹配数据",
+        suggestName: "enterData",
+        placeholder: "返回 {code, type, payload, from}",
+        structure: {
+          type: {
+            label: "匹配类型",
+            suggestName: "enterType",
+            placeholder:
+              '返回 "text" | "img" | "file" | "regex" | "over" | "window"',
+          },
+          payload: {
+            label: "匹配的数据",
+            suggestName: "enterPayload",
+            placeholder: "返回 string | MatchFile[] | MatchWindow",
+          },
+        },
+      },
+    },
     {
       value: "utools.hideMainWindow",
       label: "隐藏主窗口",

From dcac385dbd979b5d4d1a4ebb6f98d70c71d37ecc Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 00:49:18 +0800
Subject: [PATCH 170/332] =?UTF-8?q?flowTabs=E6=B7=BB=E5=8A=A0=E5=8F=98?=
 =?UTF-8?q?=E9=87=8Ftype=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index bc9aefc5..0cb3d61b 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -210,6 +210,11 @@ export default defineComponent({
      * [
      *   { name: "变量名", type: "变量类型", sourceCommand: { label: "变量来源" , index?: 来源命令索引, id?: 来源命令id} }
      * ]
+     *
+     * type:
+     * 1. output: 输出变量
+     * 2. param: 函数参数
+     * 3. var: 局部变量
      */
     const getCurrentVariables = () => {
       const currentFlow = getCurrentFlow();

From 05e5223ef33aa5cfaaaf001aaf8c70d55d44875e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 01:14:37 +0800
Subject: [PATCH 171/332] =?UTF-8?q?=E8=A7=84=E8=8C=83utools=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 68 ++++++-------------
 src/components/CommandEditor.vue              |  9 +--
 src/components/CommandRunResult.vue           |  3 +-
 src/components/config/TagBar.vue              |  7 +-
 src/components/menu/UtilityFeaturesMenu.vue   | 10 ++-
 src/components/menu/index.vue                 |  4 +-
 src/components/popup/PanelSetting.vue         |  6 +-
 src/components/popup/ShareDialog.vue          |  6 +-
 src/components/popup/UserData.vue             |  9 +--
 src/components/popup/UserInfo.vue             | 11 +--
 .../quickcommandUI/QuickCommand.vue           |  3 +-
 src/js/commandManager.js                      | 30 ++++----
 src/js/utools.js                              | 23 +++----
 src/pages/CommandPage.vue                     |  4 +-
 src/pages/ConfigurationPage.vue               |  8 ++-
 src/pages/FeaturesPage.vue                    |  6 +-
 src/pages/ServerPage.vue                      | 14 ++--
 src/pages/ShareCenterPage.vue                 |  5 +-
 18 files changed, 107 insertions(+), 119 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 116149b0..2486df7d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@
 <script>
 import { defineComponent } from "vue";
 import { setCssVar } from "quasar";
-import UTOOLS from "./js/utools.js";
+import { utoolsFull, dbManager } from "./js/utools.js";
 import programmings from "./js/options/programs.js";
 import defaultProfile from "./js/options/defaultProfile.js";
 import Cron from "croner";
@@ -27,7 +27,7 @@ export default defineComponent({
       isRunningCommand: false,
       profile: defaultProfile.common,
       nativeProfile: defaultProfile.native,
-      utools: UTOOLS,
+      utools: utoolsFull,
       cronJobs: {},
       enterData: {},
       subInputEvent: null,
@@ -60,11 +60,11 @@ export default defineComponent({
     startUp() {
       this.loadProfile();
       this.startUpOnce();
-      this.utools.whole.onPluginEnter((enter) => {
+      this.utools.onPluginEnter((enter) => {
         this.enterPlugin(enter);
       });
       window.isAppVersion4() &&
-        this.utools.whole.onMainPush(
+        this.utools.onMainPush(
           async ({ code, type, payload }) => {
             let result = await this.runCommand(code, payload, 5000);
             return result.map((x) => {
@@ -78,13 +78,13 @@ export default defineComponent({
             window.utools.showNotification("已复制");
           }
         );
-      this.utools.whole.onPluginOut(() => {
+      this.utools.onPluginOut(() => {
         this.outPlugin();
       });
     },
     loadProfile() {
-      let commonProfile = this.utools.getDB("cfg_profile");
-      let nativeProfile = this.utools.getDB(
+      let commonProfile = dbManager.getDB("cfg_profile");
+      let nativeProfile = dbManager.getDB(
         "cfg_" + utools.getNativeId() + "_profile"
       );
       this.profile = Object.assign(
@@ -97,8 +97,11 @@ export default defineComponent({
       );
     },
     saveProfile() {
-      this.utools.putDB(window.lodashM.cloneDeep(this.profile), "cfg_profile");
-      this.utools.putDB(
+      dbManager.putDB(
+        window.lodashM.cloneDeep(this.profile),
+        "cfg_profile"
+      );
+      dbManager.putDB(
         window.lodashM.cloneDeep(this.nativeProfile),
         "cfg_" + utools.getNativeId() + "_profile"
       );
@@ -148,7 +151,7 @@ export default defineComponent({
           setTimeout(() => {
             reslove([`超过${timeout}ms未响应`]);
           }, timeout);
-        let command = this.utools.getDB("qc_" + featureCode);
+        let command = dbManager.getDB("qc_" + featureCode);
         let commandCode = command.cmd;
         if (mainInput)
           commandCode = commandCode.replace(/\{\{input\}\}/g, mainInput);
@@ -180,39 +183,24 @@ export default defineComponent({
     runCommandSilently(featureCode) {
       this.runCommand(featureCode);
     },
-    // usageStatistics(featureCode, runTime) {
-    //   let statisticsData = this.utools.getDB("cfg_statisticsData");
-    //   let thisYear = runTime.year;
-    //   if (!statisticsData[thisYear]) statisticsData[thisYear] = [];
-    //   statisticsData[thisYear].push({
-    //     code: featureCode,
-    //     time: {
-    //       month: runTime.month,
-    //       day: runTime.day,
-    //       hour: runTime.hour,
-    //       minute: runTime.minute,
-    //     },
-    //   });
-    //   this.utools.putDB(statisticsData, "cfg_statisticsData");
-    // },
     updateExp() {
-      let exp = this.utools.getDB("cfg_exp");
+      let exp = dbManager.getDB("cfg_exp");
       if (typeof exp !== "object") {
         exp += 1;
-        this.utools.putDB(exp, "cfg_exp");
+        dbManager.putDB(exp, "cfg_exp");
         return;
       }
       try {
-        let statisticsData = this.utools.getDB("cfg_statisticsData");
+        let statisticsData = dbManager.getDB("cfg_statisticsData");
         exp = Object.values(statisticsData)
           .map((x) => x.length)
           .reduce((x, y) => x + y);
         // 有BUG可能删不掉
-        this.utools.delDB("cfg_statisticsData");
+        dbManager.delDB("cfg_statisticsData");
       } catch (error) {
         exp = 0;
       }
-      this.utools.putDB(exp, "cfg_exp");
+      dbManager.putDB(exp, "cfg_exp");
     },
     parseDate: (dateString) => {
       return {
@@ -225,25 +213,11 @@ export default defineComponent({
       };
     },
     firstRun() {
-      if (this.utools.getStorage("st_v300Inited")) return;
+      if (dbManager.getStorage("st_v300Inited")) return;
       window.showUb.help();
-      // 处理统计数据
-      // let statisticsData = this.utools.getDB("cfg_statisticsData");
-      // window.lodashM.forIn(statisticsData, (data, year) => {
-      //   statisticsData[year] = data.map((x) => {
-      //     if (!x.command) return x;
-      //     let code =
-      //       x.command.code === "options" ? "configuration" : x.command.code;
-      //     return {
-      //       code: code,
-      //       time: x.time,
-      //     };
-      //   });
-      // });
-      // this.utools.putDB(statisticsData, "cfg_statisticsData");
       // 删掉数据库内的默认命令
-      this.utools.delAll("qc_default");
-      this.utools.setStorage("st_v300Inited", true);
+      dbManager.delAll("qc_default");
+      dbManager.setStorage("st_v300Inited", true);
     },
     getOpacityColor(color, percent) {
       return (
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 81e818bd..a845f18d 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -83,6 +83,7 @@ import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
 import CommandComposer from "components/composer/CommandComposer.vue";
 import programs from "js/options/programs.js";
+import { dbManager } from "js/utools.js";
 
 // 预加载 MonacoEditor
 const MonacoEditorPromise = import("components/editor/MonacoEditor");
@@ -169,7 +170,7 @@ export default {
     // 命令初始化
     commandInit() {
       let quickCommandInfo = this.isRunCodePage
-        ? this.$root.utools.getDB("cfg_codeHistory")
+        ? dbManager.getDB("cfg_codeHistory")
         : this.action.data;
       quickCommandInfo?.program &&
         Object.assign(
@@ -233,7 +234,7 @@ export default {
         case "apply":
           return this.replaceText(actionData);
         case "close":
-          return this.showComposer = false;
+          return (this.showComposer = false);
       }
     },
     // 保存
@@ -245,7 +246,7 @@ export default {
         window.lodashM.cloneDeep(updatedData)
       );
       let newQuickcommandInfo = window.lodashM.cloneDeep(this.quickcommandInfo);
-      this.$root.utools.putDB(
+      dbManager.putDB(
         newQuickcommandInfo,
         "qc_" + this.quickcommandInfo.features.code
       );
@@ -272,7 +273,7 @@ export default {
       if (this.action.type !== "run") return;
       let command = window.lodashM.cloneDeep(this.quickcommandInfo);
       command.cursorPosition = this.$refs.editor.getCursorPosition();
-      this.$root.utools.putDB(command, "cfg_codeHistory");
+      dbManager.putDB(command, "cfg_codeHistory");
     },
     monacoTyping(val) {
       this.quickcommandInfo.cmd = val;
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 19f8428a..14dd63e7 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -77,6 +77,7 @@ import ResultArea from "components/ResultArea.vue";
 import ResultMenu from "components/popup/ResultMenu.vue";
 import { generateFlowsCode } from "js/composer/generateCode";
 import { getValidCommand } from "js/commandManager";
+import { dbManager } from "js/utools.js";
 
 export default {
   components: { ResultArea, ResultMenu },
@@ -225,7 +226,7 @@ export default {
     },
     // 特殊变量赋值
     assignSpecialVars(cmd) {
-      let userData = this.$root.utools.userData.all();
+      let userData = dbManager.userData.all();
       let spVars = window.lodashM.filter(specialVars, (sp) => sp.repl);
       window.lodashM.forIn(spVars, (val, key) => {
         let label = val.label.slice(0, -2);
diff --git a/src/components/config/TagBar.vue b/src/components/config/TagBar.vue
index fcb02f2c..cd7bc59b 100644
--- a/src/components/config/TagBar.vue
+++ b/src/components/config/TagBar.vue
@@ -59,6 +59,7 @@
 
 <script>
 import draggable from "vuedraggable";
+import { dbManager } from "js/utools.js";
 
 const FIXED_TAGS = ["未分类", "默认", "搜索结果"];
 const TAG_ORDER_KEY = "cfg_tagOrder";
@@ -98,7 +99,7 @@ export default {
   },
   created() {
     // 初始化时读取一次数据库
-    this.savedTagOrder = this.$root.utools.getDB(TAG_ORDER_KEY);
+    this.savedTagOrder = dbManager.getDB(TAG_ORDER_KEY);
     if (!this.savedTagOrder.length) {
       this.savedTagOrder = this.allQuickCommandTags;
     }
@@ -145,7 +146,7 @@ export default {
         // 更新内部缓存
         this.savedTagOrder = value;
         // 保存到数据库
-        this.$root.utools.putDB(value, TAG_ORDER_KEY);
+        dbManager.putDB(value, TAG_ORDER_KEY);
         // 触发标签重排序事件
         this.$emit("tags-reordered", value);
       },
@@ -158,7 +159,7 @@ export default {
         // 更新内部缓存
         this.savedTagOrder = newOrder;
         // 保存到数据库
-        this.$root.utools.putDB(newOrder, TAG_ORDER_KEY);
+        dbManager.putDB(newOrder, TAG_ORDER_KEY);
         // 触发重新加载标签
         this.$emit("tags-reordered", newOrder);
       }
diff --git a/src/components/menu/UtilityFeaturesMenu.vue b/src/components/menu/UtilityFeaturesMenu.vue
index 2c73e028..6008f54b 100644
--- a/src/components/menu/UtilityFeaturesMenu.vue
+++ b/src/components/menu/UtilityFeaturesMenu.vue
@@ -142,16 +142,22 @@
 
 <script>
 import features from "js/options/quickFeatures.js";
+import { utoolsFull } from "js/utools.js";
 
 export default {
   name: "UtilityFeaturesMenu",
+  data() {
+    return {
+      utools: utoolsFull,
+    };
+  },
   methods: {
     toggleFeature(type, enable) {
       enable
-        ? this.$root.utools.whole.setFeature(
+        ? this.utools.setFeature(
             window.lodashM.cloneDeep(features[type])
           )
-        : this.$root.utools.whole.removeFeature(features[type].code);
+        : this.utools.removeFeature(features[type].code);
     },
   },
 };
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 15ca2160..1e6247ab 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -103,6 +103,7 @@ import UtilityFeaturesMenu from "./UtilityFeaturesMenu.vue";
 import EnvConfigMenu from "./EnvConfigMenu.vue";
 import PersonalizeMenu from "./PersonalizeMenu.vue";
 import UserData from "../popup/UserData.vue";
+import { utoolsFull } from "js/utools.js";
 
 export default {
   name: "ConfigurationMenu",
@@ -121,6 +122,7 @@ export default {
       showAbout: false,
       showPanelConf: false,
       showUserData: false,
+      utools: utoolsFull,
     };
   },
   props: {
@@ -140,7 +142,7 @@ export default {
   },
   methods: {
     unMarkTag() {
-      this.$root.utools.whole.removeFeature(
+      this.utools.removeFeature(
         `panel_${window.hexEncode(this.currentTag)}`
       );
       window.lodashM.pull(
diff --git a/src/components/popup/PanelSetting.vue b/src/components/popup/PanelSetting.vue
index 56441f6b..6d06b153 100644
--- a/src/components/popup/PanelSetting.vue
+++ b/src/components/popup/PanelSetting.vue
@@ -51,11 +51,13 @@
 
 <script>
 import IconPicker from "components/popup/IconPicker";
+import { utoolsFull } from "js/utools.js";
 
 export default {
   components: { IconPicker },
   data() {
     return {
+      utools: utoolsFull,
       features: {
         explain: `进入${this.currentTag}的面板视图`,
         icon: "logo/quickcommand.png",
@@ -71,9 +73,7 @@ export default {
   },
   methods: {
     markTag() {
-      this.$root.utools.whole.setFeature(
-        window.lodashM.cloneDeep(this.features)
-      );
+      this.utools.setFeature(window.lodashM.cloneDeep(this.features));
       this.$root.$refs.view.activatedQuickPanels.push(this.currentTag);
       quickcommand.showMessageBox(
         `主输入框输入『${this.features.cmds.join("、")}』即可直接进入『${
diff --git a/src/components/popup/ShareDialog.vue b/src/components/popup/ShareDialog.vue
index 591b11cc..e3fa8d68 100644
--- a/src/components/popup/ShareDialog.vue
+++ b/src/components/popup/ShareDialog.vue
@@ -62,7 +62,7 @@ const joinLink = [
   "https://www.yuque.com/g/fofolee/qcshares4/collaborator/join?token=DXb4XAVatwn2OoGK#",
   "https://www.yuque.com/g/fofolee/qcshares5/collaborator/join?token=tw1kyfD2T4jjsQHc#",
 ];
-
+import { dbManager } from "js/utools.js";
 export default {
   data() {
     return {
@@ -167,10 +167,10 @@ export default {
         });
     },
     loadYuQueInfo() {
-      return this.$root.utools.getDB("cfg_extraInfo");
+      return dbManager.getDB("cfg_extraInfo");
     },
     saveYuQueInfo() {
-      this.$root.utools.putDB(
+      dbManager.putDB(
         window.lodashM.cloneDeep(this.yuQueInfo),
         "cfg_extraInfo"
       );
diff --git a/src/components/popup/UserData.vue b/src/components/popup/UserData.vue
index e8c54375..9be6da9e 100644
--- a/src/components/popup/UserData.vue
+++ b/src/components/popup/UserData.vue
@@ -58,6 +58,7 @@
 </template>
 
 <script>
+import { dbManager } from "js/utools.js";
 export default {
   data() {
     return {
@@ -68,18 +69,18 @@ export default {
     showInsertBtn: Boolean,
   },
   mounted() {
-    this.allUserData = this.$root.utools.userData.all();
+    this.allUserData = dbManager.userData.all();
   },
   methods: {
     saveUserData() {
       this.allUserData.forEach((item) => {
-        this.$root.utools.userData.put(item.value, item.id, item.isNative);
+        dbManager.userData.put(item.value, item.id, item.isNative);
       });
       quickcommand.showMessageBox("更新完毕！");
     },
     delUserData(id) {
       quickcommand.showConfirmBox("删除后不可恢复").then(() => {
-        this.$root.utools.userData.del(id);
+        dbManager.userData.del(id);
         this.allUserData = this.allUserData.filter((item) => item.id !== id);
       });
     },
@@ -97,7 +98,7 @@ export default {
           value,
           isNative: true,
         });
-        this.$root.utools.userData.put(value, id, true);
+        dbManager.userData.put(value, id, true);
       });
     },
   },
diff --git a/src/components/popup/UserInfo.vue b/src/components/popup/UserInfo.vue
index c5c742a0..3754e276 100644
--- a/src/components/popup/UserInfo.vue
+++ b/src/components/popup/UserInfo.vue
@@ -130,10 +130,12 @@
 
 <script>
 import levelDetail from "js/options/levelDetail.js";
+import { dbManager, utoolsFull } from "js/utools.js";
 
 export default {
   data() {
     return {
+      utools: utoolsFull,
       userInfo: {
         exp: 0,
         level: 1,
@@ -160,8 +162,8 @@ export default {
   },
   methods: {
     async getUserInfo() {
-      Object.assign(this.userInfo, this.$root.utools.whole.getUser());
-      this.userInfo.exp = this.$root.utools.getDB("cfg_exp");
+      Object.assign(this.userInfo, this.utools.getUser());
+      this.userInfo.exp = dbManager.getDB("cfg_exp");
       this.userInfo.level = this.levelDetail
         .filter((x) => this.userInfo.exp > x.minExp)
         .pop().lv;
@@ -174,8 +176,7 @@ export default {
             ).toFixed(2)
           )
         : 1;
-      let ret = await this.$root.utools.whole.fetchUserPayments();
-      console.log("PayInfo:", ret);
+      let ret = await this.utools.fetchUserPayments();
 
       this.isPluginVIP = ret.find((x) => x.goods_id === this.goodsId);
       this.isUtoolsVIP = this.userInfo.type === "member";
@@ -189,7 +190,7 @@ export default {
       }, 3000);
     },
     payForMember() {
-      this.$root.utools.whole.openPayment({ goodsId: this.goodsId }, () => {
+      this.utools.openPayment({ goodsId: this.goodsId }, () => {
         this.isPluginVIP = true;
         this.showPayPage = false;
       });
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 8395b4e7..c7fd0566 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -37,6 +37,7 @@ import ConfirmBox from "components/quickcommandUI/ConfirmBox";
 import TextArea from "components/quickcommandUI/TextArea";
 import SelectList from "components/quickcommandUI/SelectList";
 import programs from "js/options/programs";
+import { dbManager } from "js/utools.js";
 
 export default {
   components: {
@@ -264,7 +265,7 @@ export default {
     Object.assign(window.quickcommand, quickcommandUI);
 
     // 获取用户数据
-    window.quickcommand.userData = this.$root.utools.userData;
+    window.quickcommand.userData = dbManager.userData;
 
     /**
      * 执行代码
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index e2e4f5b2..88da80a4 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -1,7 +1,7 @@
 import { reactive } from "vue";
 import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
-import utoolsFull from "js/utools.js";
+import { utoolsFull, dbManager } from "js/utools.js";
 import { getUniqueId } from "js/common/uuid.js";
 import outputTypes from "js/options/outputTypes.js";
 
@@ -66,7 +66,7 @@ export const getValidCommand = (command) => {
 export function useCommandManager() {
   // 获取已启用的命令
   const getActivatedFeatures = () => {
-    let features = utoolsFull.whole.getFeatures();
+    let features = utoolsFull.getFeatures();
     let currentFts = [];
     let quickpanels = [];
     features.forEach((x) =>
@@ -79,16 +79,16 @@ export function useCommandManager() {
   };
   // 清除所有命令
   const clearAllFeatures = () => {
-    for (var feature of utoolsFull.whole.getFeatures()) {
+    for (var feature of utoolsFull.getFeatures()) {
       if (feature.code.slice(0, 8) === "feature_") continue;
-      utoolsFull.whole.removeFeature(feature.code);
+      utoolsFull.removeFeature(feature.code);
     }
     state.activatedQuickCommandFeatureCodes = [];
   };
   // 获取所有的命令
   const getAllQuickCommands = () => {
     state.allQuickCommands = window.lodashM.cloneDeep(defaultCommands);
-    utoolsFull.getAll("qc_").forEach((x) => {
+    dbManager.getAll("qc_").forEach((x) => {
       if (x.data.features.code.includes("default_")) return;
       state.allQuickCommands[x.data.features.code] = x.data;
     });
@@ -117,11 +117,11 @@ export function useCommandManager() {
       state.activatedQuickCommandFeatureCodes.push(code);
     }
 
-    utoolsFull.whole.removeFeature(code);
-    utoolsFull.whole.setFeature(command.features);
+    utoolsFull.removeFeature(code);
+    utoolsFull.setFeature(command.features);
 
     if (!isDefaultCommand(code)) {
-      utoolsFull.putDB(command, "qc_" + code);
+      dbManager.putDB(command, "qc_" + code);
     }
 
     getAllQuickCommandTags();
@@ -130,11 +130,11 @@ export function useCommandManager() {
 
   // 删除命令
   const removeCommand = (code) => {
-    utoolsFull.whole.copyText(
+    utoolsFull.copyText(
       JSON.stringify(state.allQuickCommands[code], null, 4)
     );
     delete state.allQuickCommands[code];
-    utoolsFull.delDB("qc_" + code);
+    dbManager.delDB("qc_" + code);
     removeCommandFromHistory(code);
     disableCommand(code);
     getAllQuickCommandTags();
@@ -158,7 +158,7 @@ export function useCommandManager() {
 
   // 启用命令
   const enableCommand = (code) => {
-    utoolsFull.whole.setFeature(
+    utoolsFull.setFeature(
       window.lodashM.cloneDeep(state.allQuickCommands[code].features)
     );
     state.activatedQuickCommandFeatureCodes.push(code);
@@ -166,7 +166,7 @@ export function useCommandManager() {
 
   // 禁用命令
   const disableCommand = (code) => {
-    utoolsFull.whole.removeFeature(code);
+    utoolsFull.removeFeature(code);
     state.activatedQuickCommandFeatureCodes =
       state.activatedQuickCommandFeatureCodes.filter((x) => x !== code);
   };
@@ -197,7 +197,7 @@ export function useCommandManager() {
 
     for (var code of Object.keys(dataToPushed)) {
       if (isDefaultCommand(code)) continue;
-      utoolsFull.putDB(dataToPushed[code], "qc_" + code);
+      dbManager.putDB(dataToPushed[code], "qc_" + code);
     }
 
     Object.assign(state.allQuickCommands, dataToPushed);
@@ -228,7 +228,7 @@ export function useCommandManager() {
     if (saveAsFile) {
       return window.saveFile(stringifyCommands, options);
     } else {
-      utoolsFull.whole.copyText(stringifyCommands);
+      utoolsFull.copyText(stringifyCommands);
       return true;
     }
   };
@@ -236,7 +236,7 @@ export function useCommandManager() {
   // 清空所有命令
   const clearAllCommands = () => {
     exportAllCommands(false);
-    utoolsFull.delAll("qc_");
+    dbManager.delAll("qc_");
     clearAllFeatures();
     getAllQuickCommands();
   };
diff --git a/src/js/utools.js b/src/js/utools.js
index c83bc763..dce2eb01 100644
--- a/src/js/utools.js
+++ b/src/js/utools.js
@@ -4,7 +4,7 @@
  */
 
 // 禁用危险函数
-let whole = window.utools;
+export const utoolsFull = window.utools;
 
 // 数据库前缀
 const DBPRE = {
@@ -17,40 +17,40 @@ const DBPRE = {
 
 // 数据库函数封装
 let getDB = (id) => {
-  let db = whole.db.get(id);
+  let db = utoolsFull.db.get(id);
   return db ? db.data : {};
 };
 
 let putDB = (value, id) => {
-  let db = whole.db.get(id);
+  let db = utoolsFull.db.get(id);
   return db
-    ? whole.db.put({
+    ? utoolsFull.db.put({
         _id: id,
         data: value,
         _rev: db._rev,
       })
-    : whole.db.put({
+    : utoolsFull.db.put({
         _id: id,
         data: value,
       });
 };
 
 let delDB = (id) => {
-  return whole.db.remove(id);
+  return utoolsFull.db.remove(id);
 };
 
 let getAll = (key) => {
-  return whole.db.allDocs(key);
+  return utoolsFull.db.allDocs(key);
 };
 
 let delAll = (key) => {
   return getAll(key).forEach((x) => delDB(x._id));
 };
 
-let setStorage = whole.dbStorage.setItem;
-let getStorage = whole.dbStorage.getItem;
+let setStorage = utoolsFull.dbStorage.setItem;
+let getStorage = utoolsFull.dbStorage.getItem;
 
-const nativeId = utools.getNativeId();
+const nativeId = utoolsFull.getNativeId();
 
 let userData = {
   put: function (value, id, isNative = true) {
@@ -85,8 +85,7 @@ let userData = {
   },
 };
 
-export default {
-  whole,
+export const dbManager = {
   getDB,
   putDB,
   delDB,
diff --git a/src/pages/CommandPage.vue b/src/pages/CommandPage.vue
index fc2de94e..43a57717 100644
--- a/src/pages/CommandPage.vue
+++ b/src/pages/CommandPage.vue
@@ -6,11 +6,13 @@
 
 <script>
 import CommandRunResult from "components/CommandRunResult";
+import { utoolsFull } from "js/utools.js";
 
 export default {
   components: { CommandRunResult },
   data() {
     return {
+      utools: utoolsFull,
       action: {
         type: "input",
         data: {},
@@ -22,7 +24,7 @@ export default {
     let command =
       this.featureCode.slice(0, 8) === "default_"
         ? require(`../json/${this.featureCode}.json`)
-        : this.$root.utools.whole.db.get("qc_" + this.featureCode).data;
+        : this.utools.db.get("qc_" + this.featureCode).data;
     this.runCurrentCommand(command);
   },
   methods: {
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index b30d1818..fef8830f 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -58,6 +58,7 @@
 import { defineAsyncComponent } from "vue";
 import { useCommandManager } from "js/commandManager.js";
 import changeLog from "js/options/changeLog.js";
+import { utoolsFull, dbManager } from "js/utools.js";
 import pinyinMatch from "pinyin-match";
 import CommandEditor from "components/CommandEditor";
 import ComposerEditor from "components/ComposerEditor";
@@ -86,6 +87,7 @@ export default {
   },
   data() {
     return {
+      utools: utoolsFull,
       currentTag: "",
       lastTag: "",
       commandSearchKeyword: "",
@@ -367,7 +369,7 @@ export default {
     showChangeLog() {
       let lastNeedLogEvent = changeLog[changeLog.length - 1];
       let loggedVersion =
-        this.$root.utools.whole.dbStorage.getItem("cfg_loggedVersion") ||
+        this.utools.dbStorage.getItem("cfg_loggedVersion") ||
         "0.0.0";
       if (loggedVersion < lastNeedLogEvent.version) {
         quickcommand.showConfirmBox(
@@ -378,7 +380,7 @@ export default {
           true,
           700
         );
-        this.$root.utools.whole.dbStorage.setItem(
+        this.utools.dbStorage.setItem(
           "cfg_loggedVersion",
           lastNeedLogEvent.version
         );
@@ -407,7 +409,7 @@ export default {
       // 只保存被修改的命令
       Object.entries(tagCommands).forEach(([code, command]) => {
         if (!this.isDefaultCommand(code)) {
-          this.$root.utools.putDB(
+          dbManager.putDB(
             window.lodashM.cloneDeep(command),
             "qc_" + code
           );
diff --git a/src/pages/FeaturesPage.vue b/src/pages/FeaturesPage.vue
index ba0c6320..c7fbf403 100644
--- a/src/pages/FeaturesPage.vue
+++ b/src/pages/FeaturesPage.vue
@@ -7,6 +7,7 @@ import PluginNickName from "components/quickFeatures/PluginNickName";
 import FavFile from "components/quickFeatures/FavFile";
 import FavUrl from "components/quickFeatures/FavUrl";
 import { markRaw } from "vue";
+import { utoolsFull, dbManager } from "js/utools.js";
 
 export default {
   components: {
@@ -16,14 +17,15 @@ export default {
   },
   data() {
     return {
+      utools: utoolsFull,
       currentComponent: this.$route.params.featuretype,
     };
   },
   methods: {
     importCommand(command) {
       command = window.lodashM.cloneDeep(command);
-      this.$root.utools.putDB(command, "qc_" + command.features.code);
-      this.$root.utools.whole.setFeature(command.features);
+      dbManager.putDB(command, "qc_" + command.features.code);
+      this.utools.setFeature(command.features);
     },
     getUid() {
       return Number(
diff --git a/src/pages/ServerPage.vue b/src/pages/ServerPage.vue
index e621bcf0..93707931 100644
--- a/src/pages/ServerPage.vue
+++ b/src/pages/ServerPage.vue
@@ -16,14 +16,7 @@
       }"
     />
     <div
-      class="
-        absolute-bottom
-        flex
-        items-center
-        justify-between
-        q-px-md
-        shadow-10
-      "
+      class="absolute-bottom flex items-center justify-between q-px-md shadow-10"
       :style="{
         height: bottomHeight + 'px',
       }"
@@ -81,6 +74,7 @@
 
 <script>
 import MonacoEditor from "components/editor/MonacoEditor";
+import { dbManager } from "js/utools.js";
 
 export default {
   components: { MonacoEditor },
@@ -92,7 +86,7 @@ export default {
     };
   },
   mounted() {
-    this.cmd = this.$root.utools.getStorage("cfg_serverCode") || "";
+    this.cmd = dbManager.getStorage("cfg_serverCode") || "";
     this.$refs.editor.setEditorValue(this.cmd);
     this.$refs.editor.setEditorLanguage("javascript");
   },
@@ -132,7 +126,7 @@ export default {
     saveCode() {
       clearTimeout(this.saveCodeTimer);
       this.saveCodeTimer = setTimeout(() => {
-        this.$root.utools.setStorage("cfg_serverCode", this.cmd);
+        dbManager.setStorage("cfg_serverCode", this.cmd);
         this.saveCodeTimer = null;
       }, 1000);
     },
diff --git a/src/pages/ShareCenterPage.vue b/src/pages/ShareCenterPage.vue
index 91d94244..1f77f02f 100644
--- a/src/pages/ShareCenterPage.vue
+++ b/src/pages/ShareCenterPage.vue
@@ -126,6 +126,7 @@
 
 <script>
 import commandTypes from "js/options/commandTypes.js";
+import { dbManager } from "js/utools.js";
 
 export default {
   data() {
@@ -197,7 +198,7 @@ export default {
       this.installedCodes.push(code);
       let pushData = window.lodashM.cloneDeep(command);
       pushData.fromShare = true;
-      this.$root.utools.putDB(window.lodashM.cloneDeep(pushData), "qc_" + code);
+      dbManager.putDB(window.lodashM.cloneDeep(pushData), "qc_" + code);
       // 通过模拟访问页面来统计下载量
       utools.ubrowser
         .goto(`https://www.yuque.com/${this.releaseRepo}/${code}`)
@@ -256,7 +257,7 @@ export default {
     checkCommands() {
       let installed = [];
       let needUpdate = [];
-      this.$root.utools.getAll("qc_").forEach((item) => {
+      dbManager.getAll("qc_").forEach((item) => {
         if (!item.data.fromShare) return;
         let code = item._id.slice(3);
         let remote = this.remoteCommands.filter((cmd) => cmd.slug === code)[0];

From 04da4a4a55540b92b224d0f79be513695794ce08 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 01:20:54 +0800
Subject: [PATCH 172/332] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 automation.cs | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 automation.cs

diff --git a/automation.cs b/automation.cs
deleted file mode 100644
index 9c2dc580..00000000
--- a/automation.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-        // 如果指定了过滤条件，创建一个组合条件
-        if (!string.IsNullOrEmpty(filter))
-        {
-            searchCondition = new OrCondition(
-                new PropertyCondition(AutomationElement.NameProperty, filter, PropertyConditionFlags.IgnoreCase),
-                new PropertyCondition(AutomationElement.ClassNameProperty, filter, PropertyConditionFlags.IgnoreCase),
-                new PropertyCondition(AutomationElement.AutomationIdProperty, filter, PropertyConditionFlags.IgnoreCase)
-            );
-        }

From cd16d7fc59510b0b5364417b1f6346f12bdc8be9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 18:00:40 +0800
Subject: [PATCH 173/332] =?UTF-8?q?=E8=B0=83=E6=95=B4ruleeditor=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ComposerEditor.vue         |   2 +-
 src/components/editor/MatchRuleEditor.vue | 176 ++++++++++++++++++----
 src/js/commandManager.js                  |   5 +-
 3 files changed, 149 insertions(+), 34 deletions(-)

diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index 6cdfc8a3..70d757b1 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -82,7 +82,7 @@ export default {
         explain: "",
         platform: ["win32", "linux", "darwin"],
         mainPush: false,
-        cmds: [""],
+        cmds: [],
       },
       flows: [
         {
diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
index c1d97e79..d9f718f4 100644
--- a/src/components/editor/MatchRuleEditor.vue
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -15,22 +15,66 @@
     <div v-else class="visual-editor">
       <!-- 规则类型选择按钮组 -->
       <div class="rule-type-buttons q-mb-sm q-mt-xs">
-        <div v-for="type in ruleTypeOptions" :key="type.value" class="col-auto">
-          <q-btn
-            :label="type.label"
-            :icon="type.icon"
-            :color="type.color"
-            outline
-            dense
-            class="rule-type-btn"
-            @click="addRuleByType(type.value)"
-          >
-            <q-badge
-              v-if="ruleTypeCounts[type.value]"
-              floating
-              :label="ruleTypeCounts[type.value]"
-            />
-          </q-btn>
+        <div
+          v-for="type in ruleTypeOptions"
+          :key="type.value"
+          class="col-auto rule-type-btn-wrapper"
+        >
+          <div class="btn-container">
+            <!-- 默认显示的类型按钮 -->
+            <q-btn
+              :label="type.label"
+              :icon="type.icon"
+              :color="type.color"
+              outline
+              dense
+              class="rule-type-btn"
+              :class="{ 'btn-hidden': isHovering[type.value] }"
+              @mouseenter="setHovering(type.value, true)"
+            >
+              <q-badge
+                v-if="ruleTypeCounts[type.value]"
+                floating
+                :label="ruleTypeCounts[type.value]"
+              />
+            </q-btn>
+
+            <!-- 悬浮时显示的按钮组 -->
+            <div
+              class="hover-buttons"
+              :class="{ 'buttons-visible': isHovering[type.value] }"
+              @mouseleave="setHovering(type.value, false)"
+            >
+              <q-btn-group outline>
+                <q-btn
+                  dense
+                  outline
+                  :color="type.color"
+                  icon="add"
+                  class="hover-btn"
+                  @click="addRuleByType(type.value)"
+                >
+                  <q-badge
+                    v-if="ruleTypeCounts[type.value]"
+                    floating
+                    :label="ruleTypeCounts[type.value]"
+                  />
+                </q-btn>
+                <q-btn
+                  dense
+                  outline
+                  :color="
+                    !ruleTypeCounts[type.value] || modelValue.length === 1
+                      ? 'grey'
+                      : type.color
+                  "
+                  icon="remove"
+                  class="hover-btn"
+                  @click="removeLastRuleByType(type.value)"
+                />
+              </q-btn-group>
+            </div>
+          </div>
         </div>
       </div>
 
@@ -271,6 +315,7 @@ export default defineComponent({
           color: type.color,
         })),
       commandTypes,
+      isHovering: {},
     };
   },
 
@@ -323,7 +368,7 @@ export default defineComponent({
       const newRules = [...this.localRules];
       newRules.splice(index, 1);
       if (newRules.length == 0) {
-        return;
+        return quickcommand.showMessageBox("请至少保留一个规则", "error");
       }
       this.updateModelValue(newRules);
     },
@@ -378,6 +423,25 @@ export default defineComponent({
 
       this.updateModelValue(newRules);
     },
+
+    setHovering(type, value) {
+      this.isHovering = {
+        ...this.isHovering,
+        [type]: value,
+      };
+    },
+
+    removeLastRuleByType(type) {
+      const newRules = [...this.localRules];
+      if (newRules.length === 1) return;
+      const lastIndex = newRules.findLastIndex((rule) =>
+        type === "key" ? typeof rule === "string" : rule.type === type
+      );
+
+      if (lastIndex === -1) return;
+      newRules.splice(lastIndex, 1);
+      this.updateModelValue(newRules);
+    },
   },
 });
 </script>
@@ -389,27 +453,28 @@ export default defineComponent({
   justify-content: space-between;
 }
 
-.rule-type-buttons :deep(.q-btn) {
-  padding: 0;
+/* 合并按钮基础样式 */
+.rule-type-buttons :deep(.q-btn),
+.hover-btn {
+  padding: 2px;
   font-size: 12px;
   height: 24px;
-  min-width: 85px;
 }
 
 .body--dark .rule-type-count {
   background-color: rgba(255, 255, 255, 0.9);
 }
 
-.rules-container {
+/* 合并容器样式 */
+.rules-container,
+.key-rules-row {
   display: flex;
-  flex-direction: column;
   gap: 8px;
-  margin-bottom: -4px;
 }
 
-.key-rules-row {
-  display: flex;
-  gap: 8px;
+.rules-container {
+  flex-direction: column;
+  margin-bottom: -4px;
 }
 
 .key-input-wrapper {
@@ -417,6 +482,7 @@ export default defineComponent({
   min-width: 0;
 }
 
+/* 合并图标样式 */
 .key-input-wrapper :deep(.q-field__append) {
   padding: 0 4px;
 }
@@ -431,19 +497,69 @@ export default defineComponent({
   opacity: 1;
 }
 
-.json-editor {
-  font-family: monospace;
+/* 合并编辑器样式 */
+.json-editor,
+.json-editor :deep(.q-field__native) {
+  font-family: consolas, Monaco, monospace;
 }
 
 .json-editor :deep(.q-field__native) {
   min-height: 200px;
-  font-family: monospace;
 }
 
-/* 隐藏默认的数字输入框箭头 - Chrome, Safari, Edge, Opera */
+/* 隐藏数字输入框箭头 */
 .match-rule-editor :deep(input[type="number"]::-webkit-outer-spin-button),
 .match-rule-editor :deep(input[type="number"]::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
+
+/* 按钮容器样式 */
+.rule-type-btn-wrapper,
+.btn-container {
+  position: relative;
+  width: 85px;
+  height: 24px;
+}
+
+.btn-container {
+  width: 100%;
+  height: 100%;
+}
+
+/* 按钮状态样式 */
+.rule-type-btn {
+  width: 100%;
+  position: absolute;
+  transition: opacity 0.3s ease;
+}
+
+.btn-hidden {
+  opacity: 0;
+  pointer-events: none;
+}
+
+/* 悬浮按钮组样式 */
+.hover-buttons {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  justify-content: center;
+  opacity: 0;
+  transition: all 0.5s ease;
+  pointer-events: none;
+}
+
+.hover-buttons :deep(.q-btn-group) {
+  width: 100%;
+}
+
+.hover-buttons :deep(.q-btn) {
+  flex: 1;
+}
+
+.buttons-visible {
+  opacity: 1;
+  pointer-events: auto;
+}
 </style>
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 88da80a4..6e1504dd 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -30,6 +30,7 @@ const getFeatureCode = (cmds) => {
 };
 
 const getLabeledCmds = (cmds, explain) => {
+  if (cmds.length === 0) return [explain];
   return cmds.map((cmd) => {
     if (typeof cmd === "string") {
       return cmd || explain;
@@ -130,9 +131,7 @@ export function useCommandManager() {
 
   // 删除命令
   const removeCommand = (code) => {
-    utoolsFull.copyText(
-      JSON.stringify(state.allQuickCommands[code], null, 4)
-    );
+    utoolsFull.copyText(JSON.stringify(state.allQuickCommands[code], null, 4));
     delete state.allQuickCommands[code];
     dbManager.delDB("qc_" + code);
     removeCommandFromHistory(code);

From d73fc94826a939cc6bdc2631758253efcf3a332f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 19:21:40 +0800
Subject: [PATCH 174/332] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?=
 =?UTF-8?q?=E7=9A=84shareCenter=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ShareCenterPage.vue | 310 ----------------------------------
 src/router/routes.js          |   5 -
 2 files changed, 315 deletions(-)
 delete mode 100644 src/pages/ShareCenterPage.vue

diff --git a/src/pages/ShareCenterPage.vue b/src/pages/ShareCenterPage.vue
deleted file mode 100644
index 1f77f02f..00000000
--- a/src/pages/ShareCenterPage.vue
+++ /dev/null
@@ -1,310 +0,0 @@
-<template>
-  <div>
-    <div class="flex absolute-top" style="bottom: 60px; overflow-y: auto">
-      <div
-        style="width: 50%"
-        class="q-pa-sm wrapper"
-        v-for="count in currentPageCounts"
-        :key="count"
-      >
-        <q-card class="command">
-          <q-item v-if="loading">
-            <q-item-section avatar>
-              <q-skeleton square width="48px" height="48px" animation="fade" />
-            </q-item-section>
-            <q-item-section>
-              <q-skeleton type="text" square width="70%" animation="fade" />
-              <q-skeleton type="text" square width="30%" animation="fade" />
-              <q-skeleton type="text" square width="40%" animation="fade" />
-            </q-item-section>
-          </q-item>
-          <q-item v-else>
-            <q-item-section avatar>
-              <q-avatar square size="48px">
-                <q-img :src="http://github.com/commands[count%20-%201]?.features?.icon" />
-              </q-avatar>
-            </q-item-section>
-            <q-item-section>
-              <q-item-label class="text-h6" lines="1">{{
-                commands[count - 1]?.features?.explain
-              }}</q-item-label>
-              <q-item-label caption lines="1"
-                ><q-icon name="account_circle"></q-icon
-                >{{ commands[count - 1]?.authorName }}
-                <q-icon name="watch_later"></q-icon
-                >{{
-                  commands[count - 1]?.updateTime.slice(0, 10)
-                }}</q-item-label
-              >
-              <q-item-label caption
-                ><q-icon name="fiber_manual_record"></q-icon
-                >{{ commands[count - 1]?.program }}</q-item-label
-              >
-              <q-item-label caption>
-                <span
-                  v-for="tag in [
-                    commandTypes[
-                      commands[count - 1]?.features.cmds[0].type || 'key'
-                    ].label,
-                    ...commands[count - 1]?.tags,
-                  ]"
-                  :key="tag"
-                  class="tag"
-                >
-                  {{ tag }}
-                </span>
-              </q-item-label>
-            </q-item-section>
-            <q-item-label side>
-              <q-btn
-                @click="importCommand(commands[count - 1])"
-                flat
-                dense
-                :color="
-                  !commands[count - 1]?.features.platform.includes(platform)
-                    ? 'grey'
-                    : needUpdateCodes.includes(
-                        commands[count - 1]?.features.code
-                      )
-                    ? 'negative'
-                    : 'primary'
-                "
-                icon="download"
-                :label="
-                  needUpdateCodes.includes(commands[count - 1]?.features.code)
-                    ? '更新'
-                    : '导入'
-                "
-                v-show="
-                  !installedCodes.includes(commands[count - 1]?.features.code)
-                "
-                ><q-tooltip
-                  v-if="
-                    !commands[count - 1]?.features.platform.includes(platform)
-                  "
-                >
-                  该命令不支持当前操作系统！但你仍可以导入它
-                </q-tooltip></q-btn
-              >
-            </q-item-label>
-          </q-item>
-        </q-card>
-      </div>
-    </div>
-    <div
-      class="absolute flex flex-center"
-      :style="{ left: 0, right: 0, bottom: '10px' }"
-    >
-      <q-pagination v-model="currentPage" :max="maxPages" input />
-    </div>
-    <div class="absolute" :style="{ left: '25px', bottom: '12px' }">
-      <q-input
-        v-model="commandSearchKeyword"
-        debounce="200"
-        standout="bg-primary text-white"
-        dense
-        @keydown="(e) => e.keyCode === 13 && updateSearch()"
-        placeholder="搜索"
-      >
-        <template v-slot:append>
-          <q-btn dense flat icon="search" @click="updateSearch" />
-        </template>
-      </q-input>
-    </div>
-    <div class="absolute" :style="{ right: '25px', bottom: '12px' }">
-      <q-btn
-        color="primary"
-        flat
-        to="/configuration"
-        label="主配置界面"
-        icon="tune"
-      >
-      </q-btn>
-    </div>
-  </div>
-</template>
-
-<script>
-import commandTypes from "js/options/commandTypes.js";
-import { dbManager } from "js/utools.js";
-
-export default {
-  data() {
-    return {
-      remoteCommands: [],
-      matchedCommands: [],
-      commands: [],
-      installedCodes: [],
-      needUpdateCodes: [],
-      currentPage: 1,
-      perPage: 8,
-      commandSearchKeyword: "",
-      releaseRepo: "fofolee/qcreleases",
-      commandTypes: commandTypes,
-      platform: window.processPlatform,
-      errCommandsCount: 0,
-    };
-  },
-  computed: {
-    maxPages() {
-      return Math.ceil(this.matchedCommands.length / this.perPage) || 1;
-    },
-    loading() {
-      return this.commands.length === this.currentPageCounts ? false : true;
-    },
-    currentPageCounts() {
-      return (
-        (this.currentPage === this.maxPages
-          ? this.matchedCommands.length % this.perPage
-          : this.perPage) - this.errCommandsCount
-      );
-    },
-  },
-  mounted() {
-    this.fetchCommands();
-  },
-  watch: {
-    currentPage(val) {
-      this.fetchCommandDetails(val);
-    },
-  },
-  methods: {
-    fetchCommandDetails(page) {
-      this.errCommandsCount = 0;
-      this.commands = [];
-      this.matchedCommands
-        .slice((page - 1) * this.perPage, page * this.perPage)
-        .forEach((item) => {
-          this.getCommand(
-            item.slug,
-            item.content_updated_at,
-            item.last_editor.name,
-            item.last_editor.id
-          ).then((command) => {
-            if (!command) {
-              this.errCommandsCount++;
-              return;
-            }
-            command.updated
-              ? this.commands.unshift(command.data)
-              : this.commands.push(command.data);
-          });
-        });
-    },
-    importCommand(command) {
-      let code = command?.features?.code;
-      if (!code)
-        return quickcommand.showMessageBox("该命令格式有误！", "error");
-      this.installedCodes.push(code);
-      let pushData = window.lodashM.cloneDeep(command);
-      pushData.fromShare = true;
-      dbManager.putDB(window.lodashM.cloneDeep(pushData), "qc_" + code);
-      // 通过模拟访问页面来统计下载量
-      utools.ubrowser
-        .goto(`https://www.yuque.com/${this.releaseRepo}/${code}`)
-        .run({ show: false });
-      quickcommand.showMessageBox("导入成功！可到「来自分享」标签查看");
-    },
-    updateSearch() {
-      if (!this.commandSearchKeyword)
-        this.matchedCommands = this.remoteCommands;
-      else
-        this.matchedCommands = this.remoteCommands.filter((x) =>
-          x.title
-            .toLowerCase()
-            .includes(this.commandSearchKeyword.toLowerCase())
-        );
-      this.fetchCommandDetails(1);
-    },
-    // 如果远端更新时间和本地相同则读取本地缓存，否则更新
-    async getCommand(id, updateTime, authorName, authorId) {
-      let localCache = JSON.parse(localStorage.getItem(id));
-      if (localCache?.updateTime === updateTime)
-        return {
-          data: localCache,
-          updated: false,
-        };
-      let res = await window.yuQueClient(
-        `repos/${this.releaseRepo}/docs/${id}?raw=1`
-      );
-      let command;
-      try {
-        command = JSON.parse(
-          res.data?.data.body.match(/```json([\s\S]*)```/)?.[1]
-        );
-      } catch (error) {
-        console.log("parseErr", command, error);
-      }
-      if (!command) return;
-      Object.assign(command, { authorName, updateTime, authorId });
-      localStorage.setItem(id, JSON.stringify(command));
-      return {
-        data: command,
-        updated: true,
-      };
-    },
-    fetchCommands() {
-      window.yuQueClient(`repos/${this.releaseRepo}/docs`).then((res) => {
-        // 按更新日期排序
-        this.remoteCommands = res.data.data.sort((x, y) =>
-          this.compareTime(y.content_updated_at, x.content_updated_at)
-        );
-        this.checkCommands();
-        this.matchedCommands = window.lodashM.cloneDeep(this.remoteCommands);
-        this.fetchCommandDetails(1);
-      });
-    },
-    checkCommands() {
-      let installed = [];
-      let needUpdate = [];
-      dbManager.getAll("qc_").forEach((item) => {
-        if (!item.data.fromShare) return;
-        let code = item._id.slice(3);
-        let remote = this.remoteCommands.filter((cmd) => cmd.slug === code)[0];
-        if (!remote) return;
-        let localUpdateTime =
-          item.data.updateTime || "2022-04-01T00:00:00.000Z";
-        if (this.compareTime(remote.content_updated_at, localUpdateTime) > 0) {
-          needUpdate.push(code);
-          window.lodashM.pull(this.remoteCommands, remote);
-          this.remoteCommands.unshift(remote);
-        } else installed.push(code);
-        this.installedCodes = installed;
-        this.needUpdateCodes = needUpdate;
-      });
-      console.log("installedCodes", this.installedCodes);
-      console.log("needUpdateCodes", this.needUpdateCodes);
-      console.log("remoteCommands", this.remoteCommands);
-    },
-    compareTime(x, y) {
-      return new Date(x).getTime() - new Date(y).getTime();
-    },
-  },
-};
-</script>
-
-<style scoped>
-.q-card.command {
-  user-select: none;
-  padding: 8px;
-  background: #00000008;
-}
-.q-card--dark.command {
-  background: #ffffff08;
-}
-.tag {
-  background: var(--q-primary);
-  border-radius: 2px;
-  padding: 2px;
-  margin-right: 2px;
-  color: white;
-}
-.wrapper {
-  transition: 0.5s;
-}
-.wrapper:hover {
-  transition: 0.5s;
-  transform: scale(0.97);
-  filter: drop-shadow(1px 1px 5px #0000008e);
-}
-</style>
diff --git a/src/router/routes.js b/src/router/routes.js
index 4c689832..e9d5cbd0 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -45,11 +45,6 @@ const routes = [
     name: "loading",
     component: () => import("pages/LoadingPage.vue"),
   },
-  {
-    path: "/share",
-    name: "share",
-    component: () => import("pages/ShareCenterPage.vue"),
-  },
   {
     path: "/feature_:featuretype(\\w+)",
     name: "feature",

From a1c00e962c3f1d76a05d3c4064dea455b2378e2e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 19:46:58 +0800
Subject: [PATCH 175/332] =?UTF-8?q?=E8=B0=83=E6=95=B4quickcommandparser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/common/quickcommandParser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/common/quickcommandParser.js b/src/js/common/quickcommandParser.js
index c537ff99..24ce36d3 100644
--- a/src/js/common/quickcommandParser.js
+++ b/src/js/common/quickcommandParser.js
@@ -5,8 +5,8 @@
 // 是否含有 quickcommand 键值
 let isJsonQc = (obj, strict = true) => {
   var keys = strict
-    ? ["features", "program", "cmd", "output"]
-    : ["program", "cmd"];
+    ? ["features", "program", "output"]
+    : ["program"];
   if (keys.filter((x) => typeof obj[x] == "undefined").length) return false;
   return true;
 };

From 9ffa941e727e9c68164aa8ae6841575a4360e4e4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 13 Feb 2025 21:43:18 +0800
Subject: [PATCH 176/332] =?UTF-8?q?=E9=87=8D=E6=9E=84ConfigurationPage?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/lodashMini.js                  |  21 ---
 src/components/CommandEditor.vue          |   5 -
 src/components/ComposerEditor.vue         |  17 +-
 src/components/config/CommandPanels.vue   | 158 +++++++++++------
 src/components/config/FooterBar.vue       |  56 ++++--
 src/components/config/TagBar.vue          |  40 ++---
 src/components/editor/CommandConfig.vue   |  28 ++-
 src/components/menu/CommandManageMenu.vue |  70 ++++++--
 src/components/menu/index.vue             |  44 +++--
 src/components/popup/PanelSetting.vue     |   3 +-
 src/js/commandManager.js                  |  16 +-
 src/pages/ConfigurationPage.vue           | 202 ++--------------------
 12 files changed, 291 insertions(+), 369 deletions(-)

diff --git a/plugin/lib/lodashMini.js b/plugin/lib/lodashMini.js
index 0c49d174..f9cab6a3 100644
--- a/plugin/lib/lodashMini.js
+++ b/plugin/lib/lodashMini.js
@@ -249,27 +249,6 @@ const lodashMini = {
     );
   },
 
-  /**
-   * 移除数组中所有给定值
-   * @param {Array} array - 要修改的数组
-   * @param {...*} values - 要移除的值
-   * @returns {Array} 返回数组本身
-   * @example
-   * pull([1, 2, 3, 1, 2, 3], 2, 3) => [1, 1]
-   */
-  pull: function (array, ...values) {
-    if (!array || !array.length || !values.length) return array;
-    let i = 0;
-    while (i < array.length) {
-      if (values.includes(array[i])) {
-        array.splice(i, 1);
-      } else {
-        i++;
-      }
-    }
-    return array;
-  },
-
   /**
    * 截断字符串
    * @param {string} [string=''] - 要截断的字符串
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index a845f18d..b88367fb 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -161,11 +161,6 @@ export default {
     this.commandInit();
     this.sidebarInit();
   },
-  computed: {
-    configurationPage() {
-      return this.$root.$refs.view;
-    },
-  },
   methods: {
     // 命令初始化
     commandInit() {
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index 70d757b1..fa04d192 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -15,13 +15,11 @@ import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
 import { findCommandByValue } from "js/composer/composerConfig";
 import programs from "js/options/programs.js";
-import { provide, ref } from "vue";
+import { ref } from "vue";
 
 export default {
   components: { CommandComposer, CommandRunResult },
   setup(props) {
-    provide("allQuickCommandTags", props.allQuickCommandTags);
-
     const retoreToFullCommand = (command) => {
       const { flows } = command;
       if (!flows) return command;
@@ -100,9 +98,13 @@ export default {
       ...defaultCommand,
       ...retoreToFullCommand(savedCommand),
     });
+
+    const isRunComposePage = ref(props.action.type === "composer");
+
     return {
       quickcommandInfo,
       getLitedComposerCommand,
+      isRunComposePage,
     };
   },
   emits: ["editorEvent"],
@@ -111,15 +113,6 @@ export default {
       type: Object,
       required: true,
     },
-    allQuickCommandTags: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      isRunComposePage: this.action.type === "composer",
-    };
   },
   methods: {
     handleComposerAction(actionType, command) {
diff --git a/src/components/config/CommandPanels.vue b/src/components/config/CommandPanels.vue
index 8750b736..cc7e4c16 100644
--- a/src/components/config/CommandPanels.vue
+++ b/src/components/config/CommandPanels.vue
@@ -25,21 +25,24 @@
         }"
       >
         <draggable
-          v-model="sortedCommands"
+          :model-value="currentTagQuickCommands"
+          @update:model-value="handleCommandsReorder"
           :component-data="{
             type: 'div',
-            class: 'row center q-pa-xs'
+            class: 'row center q-pa-xs',
           }"
           item-key="features.code"
-          @start="drag=true"
-          @end="onDragEnd"
           handle=".q-card"
           :disabled="currentTag === '默认' || currentTag === '搜索结果'"
         >
-          <template #item="{element: commandInfo}">
-            <div :key="commandInfo.features.code" :style="{
-              width: cardStyleSheet[$root.profile.commandCardStyle].width,
-            }" class="relative-position q-pa-sm command-item">
+          <template #item="{ element: commandInfo }">
+            <div
+              :key="commandInfo.features.code"
+              :style="{
+                width: cardStyleSheet[$root.profile.commandCardStyle].width,
+              }"
+              class="relative-position q-pa-sm command-item"
+            >
               <CommandCard
                 :commandInfo="commandInfo"
                 :isCommandActivated="
@@ -60,16 +63,20 @@
 
 <script>
 import CommandCard from "components/CommandCard.vue";
-import draggable from 'vuedraggable';
+import draggable from "vuedraggable";
+import pinyinMatch from "pinyin-match";
+import { useCommandManager } from "js/commandManager.js";
+import { dbManager } from "js/utools.js";
 
 export default {
   name: "CommandPanels",
   components: {
     CommandCard,
-    draggable
-  },
+    draggable,
+  },  
   data() {
     return {
+      commandManager: useCommandManager(),
       cardStyleSheet: {
         mini: {
           width: "20%",
@@ -88,8 +95,6 @@ export default {
           code: 4,
         },
       },
-      sortedCommands: [],
-      drag: false
     };
   },
   props: {
@@ -101,55 +106,110 @@ export default {
       type: String,
       required: true,
     },
-    modelValue: {
-      type: String,
-      required: true,
-    },
-    allQuickCommandTags: {
-      type: Array,
-      required: true,
-    },
-    currentTagQuickCommands: {
-      type: Array,
-      required: true,
-    },
-    activatedQuickCommandFeatureCodes: {
-      type: Array,
-      required: true,
-    },
   },
   computed: {
     currentTag: {
       get() {
-        return this.modelValue;
+        return this.commandManager.state.currentTag;
       },
       set(value) {
-        this.$emit("update:modelValue", value);
+        this.commandManager.state.currentTag = value;
       },
     },
-  },
-  watch: {
-    currentTagQuickCommands: {
-      immediate: true,
-      handler(newCommands) {
-        this.sortedCommands = [...newCommands];
+    allQuickCommandTags() {
+      return this.commandManager.state.allQuickCommandTags;
+    },
+    activatedQuickCommandFeatureCodes() {
+      return this.commandManager.state.activatedQuickCommandFeatureCodes;
+    },
+    commandSearchKeyword() {
+      return this.commandManager.state.commandSearchKeyword;
+    },
+    allQuickCommands() {
+      return this.commandManager.state.allQuickCommands;
+    },
+    // 当前标签下的所有快捷命令
+    currentTagQuickCommands() {
+      let commands = Object.values(
+        window.lodashM.cloneDeep(this.allQuickCommands)
+      );
+
+      // 根据 order 排序
+      const sortByOrder = (cmds) => {
+        return cmds.sort((a, b) => {
+          const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
+          const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
+          return orderA - orderB;
+        });
+      };
+
+      switch (this.currentTag) {
+        case "未分类":
+          return sortByOrder(
+            commands.filter((cmd) => !cmd.tags || cmd.tags.length === 0)
+          );
+        case "搜索结果":
+          if (this.commandSearchKeyword?.length < 2) return;
+          let searchResult = [];
+          commands.forEach((cmd) => {
+            // 拼音搜索
+            let explain = cmd.features.explain;
+            let matchedWordPositions = pinyinMatch.match(
+              explain,
+              this.commandSearchKeyword
+            );
+            if (!matchedWordPositions) return;
+            let matchedWords = explain.slice(
+              matchedWordPositions[0],
+              matchedWordPositions[1] + 1
+            );
+            // 高亮
+            cmd.features.explain = explain.replace(
+              matchedWords,
+              `<strong style="color:#ed6237">${matchedWords}</strong>`
+            );
+            searchResult.push(cmd);
+          });
+          return searchResult;
+        case "默认":
+          return commands.filter((cmd) => cmd.tags?.includes(this.currentTag));
+        default:
+          return sortByOrder(
+            commands.filter((cmd) => cmd.tags?.includes(this.currentTag))
+          );
       }
-    }
+    },
   },
   methods: {
-    onDragEnd() {
-      this.drag = false;
-      this.$emit('commands-reordered', {
-        tag: this.currentTag,
-        commands: this.sortedCommands
+    handleCommandsReorder(commands) {
+      // 更新当前tag下的命令顺序
+      const tagCommands = {};
+      commands.forEach((command, index) => {
+        tagCommands[command.features.code] = {
+          ...command,
+          order: index, // 添加排序信息
+        };
       });
-    }
+
+      // 更新存储
+      this.commandManager.state.allQuickCommands = {
+        ...this.allQuickCommands,
+        ...tagCommands,
+      };
+
+      // 只保存被修改的命令
+      this.saveCurrentTagOrderedCommand(tagCommands);
+    },
+    saveCurrentTagOrderedCommand(tagCommands) {
+      // 只保存被修改的命令
+      Object.entries(tagCommands).forEach(([code, command]) => {
+        if (!this.commandManager.isDefaultCommand(code)) {
+          dbManager.putDB(window.lodashM.cloneDeep(command), "qc_" + code);
+        }
+      });
+    },
   },
-  emits: [
-    "update:modelValue",
-    "command-changed",
-    "commands-reordered"
-  ],
+  emits: ["command-changed"],
 };
 </script>
 
diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index b72ab17f..fb9cc307 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -7,7 +7,7 @@
       <!-- 搜索栏 -->
       <div class="col">
         <q-input
-          :model-value="searchKeyword"
+          :model-value="commandSearchKeyword"
           @update:model-value="updateSearch"
           debounce="200"
           filled
@@ -103,10 +103,7 @@
             icon="settings"
             :style="{ height: height }"
           >
-            <ConfigurationMenu
-              :isTagStared="isTagStared"
-              :currentTag="currentTag"
-            />
+            <ConfigurationMenu />
           </q-btn>
         </q-btn-group>
       </div>
@@ -116,6 +113,7 @@
 
 <script>
 import ConfigurationMenu from "components/menu";
+import { useCommandManager } from "js/commandManager.js";
 
 export default {
   name: "FooterBar",
@@ -131,30 +129,33 @@ export default {
       type: String,
       required: true,
     },
-    isTagStared: {
-      type: Boolean,
-      required: true,
+  },
+  emits: ["add-new"],
+  computed: {
+    commandSearchKeyword() {
+      return this.commandManager.state.commandSearchKeyword;
     },
-    currentTag: {
-      type: String,
-      required: true,
+    currentTag() {
+      return this.commandManager.state.currentTag;
     },
-    searchKeyword: {
-      type: String,
-      default: "",
+    allQuickCommandTags: {
+      get() {
+        return this.commandManager.state.allQuickCommandTags;
+      },
+      set(value) {
+        this.commandManager.state.allQuickCommandTags = value;
+      },
     },
   },
-  emits: ["update:search", "add-new"],
   data() {
     return {
+      commandManager: useCommandManager(),
       isDarkMode: this.$q.dark.isActive,
       isDev: utools.isDev(),
+      lastTag: "",
     };
   },
   methods: {
-    updateSearch(value) {
-      this.$emit("update:search", value);
-    },
     toggleDarkMode() {
       this.$q.dark.toggle();
       this.isDarkMode = this.$q.dark.isActive;
@@ -162,6 +163,25 @@ export default {
     goShareCenter() {
       utools.shellOpenExternal("https://qc.qaz.ink/");
     },
+    // 搜索方法
+    updateSearch(value) {
+      this.commandManager.state.commandSearchKeyword = value;
+      // 记录当前标签页
+      let searchTagName = "搜索结果";
+      if (this.currentTag !== searchTagName) this.lastTag = this.currentTag;
+      if (this.commandSearchKeyword?.length > 1) {
+        if (!this.allQuickCommandTags.includes(searchTagName))
+          this.allQuickCommandTags.push(searchTagName);
+        // 搜索时跳转到搜索结果标签
+        this.commandManager.changeCurrentTag(searchTagName);
+      } else {
+        // 清空搜索回跳到之前标签
+        if (this.allQuickCommandTags.slice(-1)[0] === searchTagName)
+          this.allQuickCommandTags.pop();
+        if (this.currentTag !== this.lastTag)
+          this.commandManager.changeCurrentTag(this.lastTag);
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/config/TagBar.vue b/src/components/config/TagBar.vue
index cd7bc59b..02cb6909 100644
--- a/src/components/config/TagBar.vue
+++ b/src/components/config/TagBar.vue
@@ -14,8 +14,7 @@
       v-model="currentTag"
       vertical
       switch-indicator
-      :key="denseTagBar"
-      :dense="denseTagBar"
+      :dense="$root.profile.denseTagBar"
     >
       <!-- 可拖拽标签 -->
       <draggable
@@ -31,7 +30,7 @@
         <template #item="{ element }">
           <q-tab
             :name="element"
-            :data-active-panel="activatedQuickPanels.includes(element)"
+            :data-active-panel="isTagStared(element)"
             class="draggable-tag"
           >
             {{ element }}
@@ -44,7 +43,7 @@
         :key="tag"
         :name="tag"
         :data-search-result="tag === '搜索结果'"
-        :data-active-panel="activatedQuickPanels.includes(tag)"
+        :data-active-panel="isTagStared(tag)"
         class="fixed-tag"
       >
         {{ tag }}
@@ -60,6 +59,7 @@
 <script>
 import draggable from "vuedraggable";
 import { dbManager } from "js/utools.js";
+import { useCommandManager } from "js/commandManager.js";
 
 const FIXED_TAGS = ["未分类", "默认", "搜索结果"];
 const TAG_ORDER_KEY = "cfg_tagOrder";
@@ -69,31 +69,15 @@ export default {
   components: {
     draggable,
   },
-  emits: ["update:modelValue", "tags-reordered"],
   props: {
     tabBarWidth: {
       type: String,
       required: true,
     },
-    allQuickCommandTags: {
-      type: Array,
-      required: true,
-    },
-    activatedQuickPanels: {
-      type: Array,
-      required: true,
-    },
-    modelValue: {
-      type: String,
-      required: true,
-    },
-    denseTagBar: {
-      type: Boolean,
-      default: false,
-    },
   },
   data() {
     return {
+      commandManager: useCommandManager(),
       savedTagOrder: null, // 缓存标签顺序
     };
   },
@@ -108,12 +92,15 @@ export default {
   computed: {
     currentTag: {
       get() {
-        return this.modelValue;
+        return this.commandManager.state.currentTag;
       },
       set(value) {
-        this.$emit("update:modelValue", value);
+        this.commandManager.state.currentTag = value;
       },
     },
+    allQuickCommandTags() {
+      return this.commandManager.state.allQuickCommandTags;
+    },
     // 固定标签（不可拖拽）
     fixedTags() {
       return FIXED_TAGS.filter((tag) => this.allQuickCommandTags.includes(tag));
@@ -147,8 +134,6 @@ export default {
         this.savedTagOrder = value;
         // 保存到数据库
         dbManager.putDB(value, TAG_ORDER_KEY);
-        // 触发标签重排序事件
-        this.$emit("tags-reordered", value);
       },
     },
   },
@@ -160,10 +145,11 @@ export default {
         this.savedTagOrder = newOrder;
         // 保存到数据库
         dbManager.putDB(newOrder, TAG_ORDER_KEY);
-        // 触发重新加载标签
-        this.$emit("tags-reordered", newOrder);
       }
     },
+    isTagStared(tag) {
+      return this.commandManager.state.activatedQuickPanels.includes(tag);
+    },
   },
 };
 </script>
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index 463ff76e..a4c37b7b 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -10,9 +10,7 @@
           <q-avatar size="36px" square class="featureIco">
             <q-img
               @click.stop="showIconPicker = true"
-              :src="
-                currentCommand.features.icon
-              "
+              :src="http://github.com/currentCommand.features.icon"
             />
           </q-avatar>
         </div>
@@ -157,7 +155,7 @@
 </template>
 
 <script>
-import { defineComponent, inject, computed } from "vue";
+import { defineComponent, computed } from "vue";
 import iconPicker from "components/popup/IconPicker.vue";
 import outputTypes from "js/options/outputTypes.js";
 import platformTypes from "js/options/platformTypes.js";
@@ -165,6 +163,7 @@ import CheckGroup from "components/composer/common/CheckGroup.vue";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import commandTypes from "js/options/commandTypes.js";
 import MatchRuleEditor from "components/editor/MatchRuleEditor.vue";
+import { useCommandManager } from "js/commandManager.js";
 
 export default defineComponent({
   name: "CommandConfig",
@@ -181,20 +180,9 @@ export default defineComponent({
     },
   },
   emits: ["update:modelValue"],
-  setup(props) {
-    const allQuickCommandTags = inject("allQuickCommandTags").filter(
-      (tag) => !["默认", "未分类", "搜索结果"].includes(tag)
-    );
-
-    const currentCommand = computed(() => props.modelValue);
-
-    return {
-      allQuickCommandTags,
-      currentCommand,
-    };
-  },
   data() {
     return {
+      commandManager: useCommandManager(),
       isExpanded: false,
       showIconPicker: false,
       showMatchRuleJson: false,
@@ -209,6 +197,14 @@ export default defineComponent({
     };
   },
   computed: {
+    allQuickCommandTags() {
+      return this.commandManager.state.allQuickCommandTags.filter(
+        (tag) => !["默认", "未分类", "搜索结果"].includes(tag)
+      );
+    },
+    currentCommand() {
+      return this.modelValue;
+    },
     commandTypesOptions() {
       const options = Object.values(this.commandTypes);
       return this.currentCommand.features.mainPush
diff --git a/src/components/menu/CommandManageMenu.vue b/src/components/menu/CommandManageMenu.vue
index b1f0b379..dd4663f0 100644
--- a/src/components/menu/CommandManageMenu.vue
+++ b/src/components/menu/CommandManageMenu.vue
@@ -2,13 +2,21 @@
   <q-menu anchor="top end" self="top start">
     <q-list>
       <!-- 导入 -->
-      <q-item clickable v-close-popup @click="importCommand(importCommandFromFile())">
+      <q-item
+        clickable
+        v-close-popup
+        @click="importCommand(importCommandFromFile())"
+      >
         <q-item-section side>
           <q-icon name="text_snippet" />
         </q-item-section>
         <q-item-section>从文件导入命令</q-item-section>
       </q-item>
-      <q-item clickable v-close-popup @click="importCommand(importCommandFromClipboard())">
+      <q-item
+        clickable
+        v-close-popup
+        @click="importCommand(importCommandFromClipboard())"
+      >
         <q-item-section side>
           <q-icon name="content_paste" />
         </q-item-section>
@@ -34,7 +42,12 @@
         <q-item-section>禁用本页所有命令</q-item-section>
       </q-item>
       <!-- 清空 -->
-      <q-item style="color: red" clickable v-close-popup @click="clearAllCommands">
+      <q-item
+        style="color: red"
+        clickable
+        v-close-popup
+        @click="clearAllCommands"
+      >
         <q-item-section side>
           <q-icon name="delete" />
         </q-item-section>
@@ -45,16 +58,18 @@
 </template>
 
 <script>
+import { useCommandManager } from "src/js/commandManager";
+
 export default {
-  name: 'CommandManageMenu',
-  computed: {
-    configurationPage() {
-      return this.$root.$refs.view;
-    }
+  name: "CommandManageMenu",
+  data() {
+    return {
+      commandManager: useCommandManager(),
+    };
   },
   methods: {
     importCommand(command) {
-      this.configurationPage.importCommand(command);
+      this.commandManager.importCommand(command);
     },
     importCommandFromFile() {
       let options = {
@@ -68,20 +83,39 @@ export default {
     importCommandFromClipboard() {
       return window.clipboardReadText();
     },
-    exportAllCommands() {
-      this.configurationPage.exportAllCommands();
+    // 全部导出
+    exportAllCommands(saveAsFile = true) {
+      if (this.commandManager.exportAllCommands(saveAsFile)) {
+        quickcommand.showMessageBox("导出成功！");
+      }
     },
+    // 清空
     clearAllCommands() {
-      this.configurationPage.clearAllCommands();
+      quickcommand
+        .showConfirmBox("将会清空所有自定义命令，停用所有实用功能，请确认！")
+        .then((isConfirmed) => {
+          if (!isConfirmed) {
+            return quickcommand.showMessageBox("取消操作", "info");
+          }
+          this.commandManager.clearAllCommands();
+          quickcommand.showMessageBox(
+            "清空完毕，为防止误操作，已将所有命令复制到剪贴板，可通过导入命令恢复",
+            "success",
+            2000,
+            "bottom-right"
+          );
+        });
     },
     enableAllCommands() {
-      document.querySelectorAll('.q-toggle[aria-checked="false"]')
-        .forEach(x => x.click());
+      document
+        .querySelectorAll('.q-toggle[aria-checked="false"]')
+        .forEach((x) => x.click());
     },
     disableAllCommands() {
-      document.querySelectorAll('.q-toggle[aria-checked="true"]')
-        .forEach(x => x.click());
-    }
-  }
+      document
+        .querySelectorAll('.q-toggle[aria-checked="true"]')
+        .forEach((x) => x.click());
+    },
+  },
 };
 </script>
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 1e6247ab..6c05c2a1 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -52,7 +52,12 @@
         </q-item>
 
         <!-- 收藏 -->
-        <q-item v-if="isTagStared" clickable v-close-popup @click="unMarkTag">
+        <q-item
+          v-if="activatedQuickPanels.includes(currentTag)"
+          clickable
+          v-close-popup
+          @click="unMarkTag"
+        >
           <q-item-section side>
             <q-icon name="star_border" />
           </q-item-section>
@@ -86,7 +91,10 @@
       <AboutThis />
     </q-dialog>
     <q-dialog v-model="showPanelConf">
-      <PanelSetting :isTagStared="isTagStared" :currentTag="currentTag" />
+      <PanelSetting
+        :currentTag="currentTag"
+        @update-activated-quick-panels="activatedQuickPanels = $event"
+      />
     </q-dialog>
     <q-dialog v-model="showUserData">
       <UserData :showInsertBtn="false" />
@@ -104,6 +112,7 @@ import EnvConfigMenu from "./EnvConfigMenu.vue";
 import PersonalizeMenu from "./PersonalizeMenu.vue";
 import UserData from "../popup/UserData.vue";
 import { utoolsFull } from "js/utools.js";
+import { useCommandManager } from "src/js/commandManager";
 
 export default {
   name: "ConfigurationMenu",
@@ -119,35 +128,38 @@ export default {
   },
   data() {
     return {
+      commandManager: useCommandManager(),
       showAbout: false,
       showPanelConf: false,
       showUserData: false,
       utools: utoolsFull,
     };
   },
-  props: {
-    isTagStared: Boolean,
-    currentTag: String,
-  },
   computed: {
-    configurationPage() {
-      return this.$root.$refs.view;
+    activatedQuickPanels: {
+      get() {
+        return this.commandManager.state.activatedQuickPanels;
+      },
+      set(value) {
+        this.commandManager.state.activatedQuickPanels = value;
+      },
+    },
+    currentTag() {
+      return this.commandManager.state.currentTag;
     },
     allQuickCommandsLength() {
-      return Object.keys(this.configurationPage.allQuickCommands).length;
+      return Object.keys(this.commandManager.state.allQuickCommands).length;
     },
     allFeaturesLength() {
-      return this.configurationPage.activatedQuickCommandFeatureCodes.length;
+      return this.commandManager.state.activatedQuickCommandFeatureCodes.length;
     },
   },
   methods: {
     unMarkTag() {
-      this.utools.removeFeature(
-        `panel_${window.hexEncode(this.currentTag)}`
-      );
-      window.lodashM.pull(
-        this.$root.$refs.view.activatedQuickPanels,
-        this.currentTag
+      this.utools.removeFeature(`panel_${window.hexEncode(this.currentTag)}`);
+      const newPanels = [...this.activatedQuickPanels];
+      this.activatedQuickPanels = newPanels.filter(
+        (panel) => panel !== this.currentTag
       );
       quickcommand.showMessageBox("取消收藏成功");
     },
diff --git a/src/components/popup/PanelSetting.vue b/src/components/popup/PanelSetting.vue
index 6d06b153..08274028 100644
--- a/src/components/popup/PanelSetting.vue
+++ b/src/components/popup/PanelSetting.vue
@@ -55,6 +55,7 @@ import { utoolsFull } from "js/utools.js";
 
 export default {
   components: { IconPicker },
+  emits: ["update-activated-quick-panels"],
   data() {
     return {
       utools: utoolsFull,
@@ -74,7 +75,7 @@ export default {
   methods: {
     markTag() {
       this.utools.setFeature(window.lodashM.cloneDeep(this.features));
-      this.$root.$refs.view.activatedQuickPanels.push(this.currentTag);
+      this.$emit("update-activated-quick-panels", this.currentTag);
       quickcommand.showMessageBox(
         `主输入框输入『${this.features.cmds.join("、")}』即可直接进入『${
           this.currentTag
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 6e1504dd..2689ba69 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -1,4 +1,4 @@
-import { reactive } from "vue";
+import { reactive, nextTick } from "vue";
 import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
 import { utoolsFull, dbManager } from "js/utools.js";
@@ -16,6 +16,8 @@ const state = reactive({
   allQuickCommandTags: [],
   activatedQuickCommandFeatureCodes: [],
   activatedQuickPanels: [],
+  currentTag: "",
+  commandSearchKeyword: "",
 });
 
 const getCmdType = (cmds) => {
@@ -238,6 +240,17 @@ export function useCommandManager() {
     dbManager.delAll("qc_");
     clearAllFeatures();
     getAllQuickCommands();
+    state.currentTag = "默认";
+  };
+
+  // 修改并定位当前标签事件
+  const changeCurrentTag = (tagName) => {
+    state.currentTag = tagName;
+    nextTick(() => {
+      document.querySelector(".q-tab--active").scrollIntoView({
+        behavior: "smooth",
+      });
+    });
   };
 
   return {
@@ -254,5 +267,6 @@ export function useCommandManager() {
     getActivatedFeatures,
     clearAllFeatures,
     clearAllCommands,
+    changeCurrentTag,
   };
 }
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index fef8830f..7e21f560 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -4,33 +4,16 @@
     <div class="main-content">
       <BackgroundLayer />
       <!-- 标签栏 -->
-      <TagBar
-        v-model="currentTag"
-        :tab-bar-width="tabBarWidth"
-        :all-quick-command-tags="allQuickCommandTags"
-        :activated-quick-panels="activatedQuickPanels"
-        :dense-tag-bar="$root.profile.denseTagBar"
-      />
+      <TagBar :tab-bar-width="tabBarWidth" />
       <CommandPanels
-        v-model="currentTag"
         :footer-bar-height="footerBarHeight"
         :tab-bar-width="tabBarWidth"
-        :all-quick-command-tags="allQuickCommandTags"
-        :current-tag-quick-commands="currentTagQuickCommands"
-        :activated-quick-command-feature-codes="
-          activatedQuickCommandFeatureCodes
-        "
         @command-changed="commandChanged"
-        @commands-reordered="handleCommandsReorder"
       />
       <!-- 底栏 -->
       <FooterBar
         :height="footerBarHeight"
         :left="tabBarWidth"
-        :is-tag-stared="activatedQuickPanels.includes(currentTag)"
-        :current-tag="currentTag"
-        :search-keyword="commandSearchKeyword"
-        @update:search="updateSearch"
         @add-new="addNewCommand"
       />
     </div>
@@ -42,7 +25,6 @@
           :is="commandEditorAction.component"
           :action="http://github.com/commandEditorAction"
           @editorEvent="editorEvent"
-          :allQuickCommandTags="allQuickCommandTags"
         />
       </div>
     </transition>
@@ -59,7 +41,6 @@ import { defineAsyncComponent } from "vue";
 import { useCommandManager } from "js/commandManager.js";
 import changeLog from "js/options/changeLog.js";
 import { utoolsFull, dbManager } from "js/utools.js";
-import pinyinMatch from "pinyin-match";
 import CommandEditor from "components/CommandEditor";
 import ComposerEditor from "components/ComposerEditor";
 import FooterBar from "src/components/config/FooterBar.vue";
@@ -81,16 +62,10 @@ export default {
     BackgroundLayer,
     CommandPanels,
   },
-  setup() {
-    const commandManager = useCommandManager();
-    return { commandManager };
-  },
   data() {
     return {
+      commandManager: useCommandManager(),
       utools: utoolsFull,
-      currentTag: "",
-      lastTag: "",
-      commandSearchKeyword: "",
       isEditorShow: false,
       commandEditorAction: {},
       footerBarHeight: "40px",
@@ -103,62 +78,13 @@ export default {
     allQuickCommandTags() {
       return this.commandManager.state.allQuickCommandTags;
     },
-    activatedQuickCommandFeatureCodes() {
-      return this.commandManager.state.activatedQuickCommandFeatureCodes;
-    },
-    activatedQuickPanels() {
-      return this.commandManager.state.activatedQuickPanels;
-    },
-    // 当前标签下的所有快捷命令
-    currentTagQuickCommands() {
-      let commands = Object.values(
-        window.lodashM.cloneDeep(this.allQuickCommands)
-      );
-
-      // 根据 order 排序
-      const sortByOrder = (cmds) => {
-        return cmds.sort((a, b) => {
-          const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
-          const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
-          return orderA - orderB;
-        });
-      };
-
-      switch (this.currentTag) {
-        case "未分类":
-          return sortByOrder(
-            commands.filter((cmd) => !cmd.tags || cmd.tags.length === 0)
-          );
-        case "搜索结果":
-          if (this.commandSearchKeyword?.length < 2) return;
-          let searchResult = [];
-          commands.forEach((cmd) => {
-            // 拼音搜索
-            let explain = cmd.features.explain;
-            let matchedWordPositions = pinyinMatch.match(
-              explain,
-              this.commandSearchKeyword
-            );
-            if (!matchedWordPositions) return;
-            let matchedWords = explain.slice(
-              matchedWordPositions[0],
-              matchedWordPositions[1] + 1
-            );
-            // 高亮
-            cmd.features.explain = explain.replace(
-              matchedWords,
-              `<strong style="color:#ed6237">${matchedWords}</strong>`
-            );
-            searchResult.push(cmd);
-          });
-          return searchResult;
-        case "默认":
-          return commands.filter((cmd) => cmd.tags?.includes(this.currentTag));
-        default:
-          return sortByOrder(
-            commands.filter((cmd) => cmd.tags?.includes(this.currentTag))
-          );
-      }
+    currentTag: {
+      get() {
+        return this.commandManager.state.currentTag;
+      },
+      set(value) {
+        this.commandManager.state.currentTag = value;
+      },
     },
     // 标签栏宽度
     tabBarWidth() {
@@ -189,16 +115,10 @@ export default {
       }
       this.showChangeLog();
       // 异步读取
-      setTimeout(this.getActivatedFeatures, 0);
-      setTimeout(this.getAllQuickCommands, 0);
-    },
-    // 获取所有已启用的命令的 features 以及面板名称
-    getActivatedFeatures() {
-      this.commandManager.getActivatedFeatures();
-    },
-    // 获取所有的命令（导出的格式）
-    getAllQuickCommands() {
-      this.commandManager.getAllQuickCommands();
+      // 获取所有已启用的命令的 features 以及面板名称
+      setTimeout(this.commandManager.getActivatedFeatures(), 0);
+      // 获取所有的命令（导出的格式）
+      setTimeout(this.commandManager.getAllQuickCommands(), 0);
     },
     // 监听命令变更事件
     commandChanged(event) {
@@ -222,6 +142,9 @@ export default {
           return;
       }
     },
+    changeCurrentTag(tagName) {
+      this.commandManager.changeCurrentTag(tagName);
+    },
     runCommand(code) {
       this.$refs.result.runCurrentCommand(this.allQuickCommands[code]);
     },
@@ -254,10 +177,6 @@ export default {
       };
       this.isEditorShow = true;
     },
-    // 是否为默认命令
-    isDefaultCommand(code) {
-      return this.commandManager.isDefaultCommand(code);
-    },
     // 导入命令
     async importCommand(quickCommandInfo) {
       const command = await this.commandManager.importCommand(quickCommandInfo);
@@ -284,62 +203,6 @@ export default {
           .scrollIntoView({ behavior: "smooth" });
       });
     },
-    // 修改并定位当前标签事件
-    changeCurrentTag(tagName) {
-      this.currentTag = tagName;
-      this.$nextTick(() => {
-        document
-          .querySelector(".q-tab--active")
-          .scrollIntoView({ behavior: "smooth" });
-      });
-    },
-    // 全部导出
-    exportAllCommands(saveAsFile = true) {
-      if (this.commandManager.exportAllCommands(saveAsFile)) {
-        quickcommand.showMessageBox("导出成功！");
-      }
-    },
-    // 清空
-    clearAllCommands() {
-      quickcommand
-        .showConfirmBox("将会清空所有自定义命令，停用所有实用功能，请确认！")
-        .then((isConfirmed) => {
-          if (!isConfirmed) {
-            return quickcommand.showMessageBox("取消操作", "info");
-          }
-          this.commandManager.clearAllCommands();
-          this.changeCurrentTag("默认");
-          quickcommand.showMessageBox(
-            "清空完毕，为防止误操作，已将所有命令复制到剪贴板，可通过导入命令恢复",
-            "success",
-            2000,
-            "bottom-right"
-          );
-        });
-    },
-    // 删除所有 features
-    clearAllFeatures() {
-      this.commandManager.clearAllFeatures();
-    },
-    // 搜索方法
-    updateSearch(value) {
-      this.commandSearchKeyword = value;
-      // 记录当前标签页
-      let searchTagName = "搜索结果";
-      if (this.currentTag !== searchTagName) this.lastTag = this.currentTag;
-      if (this.commandSearchKeyword?.length > 1) {
-        if (!this.allQuickCommandTags.includes(searchTagName))
-          this.allQuickCommandTags.push(searchTagName);
-        // 搜索时跳转到搜索结果标签
-        this.changeCurrentTag(searchTagName);
-      } else {
-        // 清空搜索回跳到之前标签
-        if (this.allQuickCommandTags.slice(-1)[0] === searchTagName)
-          this.allQuickCommandTags.pop();
-        if (this.currentTag !== this.lastTag)
-          this.changeCurrentTag(this.lastTag);
-      }
-    },
     // 新建命令
     addNewCommand(component = "CommandEditor") {
       this.commandEditorAction = {
@@ -369,8 +232,7 @@ export default {
     showChangeLog() {
       let lastNeedLogEvent = changeLog[changeLog.length - 1];
       let loggedVersion =
-        this.utools.dbStorage.getItem("cfg_loggedVersion") ||
-        "0.0.0";
+        this.utools.dbStorage.getItem("cfg_loggedVersion") || "0.0.0";
       if (loggedVersion < lastNeedLogEvent.version) {
         quickcommand.showConfirmBox(
           '<pre style="white-space: pre-wrap;word-wrap: break-word;">' +
@@ -386,36 +248,6 @@ export default {
         );
       }
     },
-    handleCommandsReorder({ tag, commands }) {
-      // 更新当前tag下的命令顺序
-      const tagCommands = {};
-      commands.forEach((command, index) => {
-        tagCommands[command.features.code] = {
-          ...command,
-          order: index, // 添加排序信息
-        };
-      });
-
-      // 更新存储
-      this.commandManager.state.allQuickCommands = {
-        ...this.allQuickCommands,
-        ...tagCommands,
-      };
-
-      // 只保存被修改的命令
-      this.saveCurrentTagOrderedCommand(tagCommands);
-    },
-    saveCurrentTagOrderedCommand(tagCommands) {
-      // 只保存被修改的命令
-      Object.entries(tagCommands).forEach(([code, command]) => {
-        if (!this.isDefaultCommand(code)) {
-          dbManager.putDB(
-            window.lodashM.cloneDeep(command),
-            "qc_" + code
-          );
-        }
-      });
-    },
   },
 };
 </script>

From c6b511696ae34aabe5e5cc27b8a7ed15f604e529 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 11:28:26 +0800
Subject: [PATCH 177/332] =?UTF-8?q?=E9=87=8D=E6=9E=84CommandEditor?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue              | 408 +++++-----
 src/components/CommandRunResult.vue           |   1 +
 src/components/ComposerEditor.vue             |  37 +-
 src/components/composer/CommandComposer.vue   |   8 +-
 src/components/composer/ComposerCard.vue      |  25 +-
 src/components/composer/FlowTabs.vue          |  55 +-
 .../composer/flow/ComposerButtons.vue         |  67 +-
 .../composer/param/ParamImporter.vue          |   2 +-
 .../composer/script/ScriptEditor.vue          |   2 +-
 .../common => editor}/CodeEditor.vue          | 154 ++--
 src/components/editor/CommandConfig.vue       | 153 ++--
 src/components/editor/CommandLanguageBar.vue  | 539 +++++++------
 src/components/editor/CommandSideBar.vue      | 739 ------------------
 src/components/editor/EditorTools.vue         |  58 +-
 src/components/editor/MatchRuleEditor.vue     |  81 +-
 src/components/editor/MonacoEditor.vue        |  95 +--
 src/js/commandManager.js                      |   2 +-
 src/js/options/programs.js                    |   2 -
 src/js/options/specialVars.js                 | 292 +++----
 src/pages/ConfigurationPage.vue               |  25 +-
 src/pages/RunCodePage.vue                     |   4 +-
 src/pages/ServerPage.vue                      |  57 +-
 22 files changed, 1034 insertions(+), 1772 deletions(-)
 rename src/components/{composer/common => editor}/CodeEditor.vue (76%)
 delete mode 100644 src/components/editor/CommandSideBar.vue

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index b88367fb..6f862719 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -1,73 +1,50 @@
 <template>
-  <!-- 命令设置栏 -->
-  <CommandSideBar
-    ref="sidebar"
-    :canCommandSave="canCommandSave"
-    :quickcommandInfo="quickcommandInfo"
-    :allQuickCommandTags="allQuickCommandTags"
-    class="absolute-left shadow-1"
-    :style="{
-      zIndex: 1,
-      transform: isFullscreen ? 'translateX(-100%)' : 'translateX(0)',
-      transition: 'transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
-    }"
-    :sideBarWidth="sideBarWidth"
-    v-if="showSidebar"
-    @back="handleBack"
-  ></CommandSideBar>
+  <div class="command-editor">
+    <!-- 编程语言栏 -->
+    <CommandLanguageBar
+      v-model="quickcommandInfo"
+      :canCommandSave="canCommandSave"
+      :isRunCodePage="isRunCodePage"
+      @action="http://github.com/handleAction"
+    />
 
-  <!-- 编程语言栏 -->
-  <CommandLanguageBar
-    class="absolute-top"
-    :style="{
-      left: showSidebar ? sideBarWidth + 'px' : 65,
-      zIndex: 1,
-      transform: isFullscreen ? 'translateY(-100%)' : 'translateY(0)',
-      opacity: isFullscreen ? 0 : 1,
-      transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
-    }"
-    v-model="quickcommandInfo"
-    :height="languageBarHeight"
-    :canCommandSave="canCommandSave"
-    :isRunCodePage="isRunCodePage"
-    @program-changed="programChanged"
-    @run="runCurrentCommand"
-    @save="saveCurrentCommand"
-    @show-composer="showComposer = true"
-  />
+    <!-- 命令设置栏 -->
+    <CommandConfig
+      v-if="!isRunCodePage"
+      :model-value="commandConfig"
+      @update:is-expanded="isConfigExpanded = $event"
+      :expand-on-focus="true"
+      class="command-config"
+      @update:model-value="updateCommandConfig"
+    />
 
-  <!-- 编辑器 -->
-  <MonacoEditor
-    class="editor-transition"
-    :placeholder="true"
-    ref="editor"
-    @loaded="monacoInit"
-    @typing="(val) => monacoTyping(val)"
-    @keyStroke="monacoKeyStroke"
-    :style="{
-      position: 'absolute',
-      top: isFullscreen ? 0 : languageBarHeight + 'px',
-      left: isFullscreen ? 0 : action.type === 'run' ? 0 : sideBarWidth + 'px',
-      right: 0,
-      bottom: 0,
-    }"
-  />
+    <!-- 编辑器 -->
+    <CodeEditor
+      v-model="quickcommandInfo.cmd"
+      :language="getLanguage()"
+      :cursor-position="quickcommandInfo.cursorPosition"
+      @update:cursor-position="quickcommandInfo.cursorPosition = $event"
+      placeholder="请输入代码"
+      class="codeEditor"
+      ref="editor"
+    />
+  </div>
 
   <!-- 编辑器工具按钮组 -->
   <EditorTools
     ref="editorTools"
+    v-show="!isConfigExpanded"
     :commandCode="quickcommandInfo?.features?.code || 'temp'"
-    :isFullscreen="isFullscreen"
     @restore="restoreHistory"
-    @toggle-fullscreen="toggleFullscreen"
   />
 
   <!-- 可视化编排 -->
   <q-dialog v-model="showComposer" maximized>
     <CommandComposer
       ref="composer"
+      v-model="composerInfo"
       @action="http://github.com/handleComposerAction"
-      :model-value="{ flows }"
+      :disabled-control-buttons="['save']"
     />
   </q-dialog>
 
@@ -76,8 +53,8 @@
 </template>
 
 <script>
-import { defineAsyncComponent } from "vue";
-import CommandSideBar from "components/editor/CommandSideBar";
+import { defineAsyncComponent, ref, computed } from "vue";
+import CommandConfig from "./editor/CommandConfig.vue";
 import CommandLanguageBar from "components/editor/CommandLanguageBar";
 import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
@@ -86,68 +63,44 @@ import programs from "js/options/programs.js";
 import { dbManager } from "js/utools.js";
 
 // 预加载 MonacoEditor
-const MonacoEditorPromise = import("components/editor/MonacoEditor");
+const CodeEditorPromise = import("components/editor/CodeEditor.vue");
 // 在空闲时预加载
 if (window.requestIdleCallback) {
   window.requestIdleCallback(() => {
-    MonacoEditorPromise;
+    CodeEditorPromise;
   });
 } else {
   setTimeout(() => {
-    MonacoEditorPromise;
+    CodeEditorPromise;
   }, 0);
 }
 
 // Performance Scripting > 500ms
-const MonacoEditor = defineAsyncComponent({
-  loader: () => MonacoEditorPromise,
+const CodeEditor = defineAsyncComponent({
+  loader: () => CodeEditorPromise,
   timeout: 3000,
 });
 
+// TODO: 对称加密声明，保存命令不需要设置
 export default {
   components: {
-    MonacoEditor,
-    CommandSideBar,
+    CodeEditor,
+    CommandConfig,
     CommandRunResult,
     CommandLanguageBar,
     CommandComposer,
     EditorTools,
   },
+  emits: ["editorEvent"],
   data() {
     return {
       programLanguages: Object.keys(programs),
-      sideBarWidth: 200,
-      languageBarHeight: 40,
       showComposer: false,
-      isRunCodePage: this.action.type === "run",
-      canCommandSave: this.action.type !== "run",
-      showSidebar: this.action.type !== "run",
-      flows: [
-        {
-          id: "main",
-          name: "main",
-          label: "主流程",
-          commands: [],
-          customVariables: [],
-        },
-      ],
-      quickcommandInfo: {
-        program: "quickcommand",
-        cmd: "",
-        scptarg: "",
-        charset: {
-          scriptCode: "",
-          outputCode: "",
-        },
-        customOptions: {
-          bin: "",
-          argv: "",
-          ext: "",
-        },
-      },
-      resultMaxLength: 10000,
       listener: null,
-      isFullscreen: false,
+      isConfigExpanded: false,
+      composerInfo: {
+        program: "quickcomposer",
+      },
     };
   },
   props: {
@@ -155,125 +108,105 @@ export default {
       type: Object,
       required: true,
     },
-    allQuickCommandTags: Array,
+  },
+  setup(props) {
+    const isRunCodePage = ref(props.action.type === "run");
+    const canCommandSave = ref(!isRunCodePage.value);
+
+    const commandAction = window.lodashM.cloneDeep(props.action);
+    const savedCommand = isRunCodePage.value
+      ? dbManager.getDB("cfg_codeHistory")
+      : commandAction.data || {};
+
+    const defaultCommand = {
+      program: "quickcommand",
+      features: {
+        icon: programs.quickcommand.icon,
+        explain: "",
+        platform: ["win32", "linux", "darwin"],
+        mainPush: false,
+        cmds: [],
+      },
+      output: "text",
+      tags: [],
+      cmd: "",
+      scptarg: "",
+      charset: {
+        scriptCode: "",
+        outputCode: "",
+      },
+      customOptions: {
+        bin: "",
+        argv: "",
+        ext: "",
+      },
+    };
+    const quickcommandInfo = ref({
+      ...defaultCommand,
+      ...savedCommand,
+    });
+
+    // 默认命令不可编辑
+    if (quickcommandInfo.value.tags?.includes("默认") && !utools.isDev()) {
+      canCommandSave.value = false;
+    }
+
+    const commandConfig = computed(() => {
+      const { tags, output, features, program } = quickcommandInfo.value;
+      return { tags, output, features, program };
+    });
+
+    return {
+      quickcommandInfo,
+      isRunCodePage,
+      canCommandSave,
+      commandConfig,
+    };
   },
   mounted() {
-    this.commandInit();
-    this.sidebarInit();
+    this.saveToHistory();
+    document.addEventListener("keydown", this.handleKeydown);
+  },
+  beforeUnmount() {
+    document.removeEventListener("keydown", this.handleKeydown);
   },
   methods: {
-    // 命令初始化
-    commandInit() {
-      let quickCommandInfo = this.isRunCodePage
-        ? dbManager.getDB("cfg_codeHistory")
-        : this.action.data;
-      quickCommandInfo?.program &&
-        Object.assign(
-          this.quickcommandInfo,
-          window.lodashM.cloneDeep(quickCommandInfo)
-        );
-      // 默认命令不可编辑
-      if (this.quickcommandInfo.tags?.includes("默认") && !utools.isDev()) {
-        this.canCommandSave = false;
-      }
-    },
-    // 侧边栏初始化
-    sidebarInit() {
-      this.$refs.sidebar?.init();
-    },
-    // Monaco编辑器初始化，Monaco异步加载完执行
-    monacoInit() {
-      this.$refs.editor.setEditorValue(this.quickcommandInfo.cmd);
-      this.setLanguage(this.quickcommandInfo.program);
-      this.$refs.editor.setCursorPosition(this.quickcommandInfo.cursorPosition);
-
-      // 等待编辑器内容加载完成后再保存
-      setTimeout(() => {
-        this.saveToHistory();
-      }, 1000); // 给予足够的时间让编辑器加载完成
-    },
-    programChanged(value) {
-      this.setLanguage(value);
-      if (value === "custom") this.$refs.settings.show();
-      this.$refs.sidebar?.setIcon(value);
-    },
-    // 匹配编程语言
-    matchLanguage() {
-      if (!this.quickcommandInfo.customOptions.ext) return;
-      let language = Object.values(programs).filter(
-        (program) => program.ext === this.quickcommandInfo.customOptions.ext
-      );
-      if (language.length) {
-        this.setLanguage(language[0].name);
-      }
-    },
-    // 设置编程语言
-    setLanguage(language) {
-      let highlight = programs[language].highlight;
-      this.$refs.editor.setEditorLanguage(highlight ? highlight : language);
-    },
-    insertText(text) {
-      this.$refs.editor.repacleEditorSelection(text);
-      this.$refs.editor.formatDocument();
-    },
-    replaceText(text) {
-      this.$refs.editor.setEditorValue(text);
-      this.$refs.editor.formatDocument();
-    },
     handleComposerAction(actionType, actionData) {
       switch (actionType) {
         case "run":
-          return this.runCurrentCommand(actionData);
-        case "insert":
-          return this.insertText(actionData);
+          // actionData 完整命令
+          this.runCurrentCommand(actionData);
+          break;
         case "apply":
-          return this.replaceText(actionData);
+          // actionData 命令的cmd
+          console.log(actionData);
+          this.showComposer = false;
+          this.quickcommandInfo.cmd = actionData;
+          break;
         case "close":
-          return (this.showComposer = false);
+          this.showComposer = false;
+          break;
       }
     },
     // 保存
-    saveCurrentCommand(message = "保存成功") {
-      let updatedData = this.$refs.sidebar?.SaveMenuData();
-      if (!updatedData) return;
-      Object.assign(
-        this.quickcommandInfo,
-        window.lodashM.cloneDeep(updatedData)
-      );
-      let newQuickcommandInfo = window.lodashM.cloneDeep(this.quickcommandInfo);
-      dbManager.putDB(
-        newQuickcommandInfo,
-        "qc_" + this.quickcommandInfo.features.code
-      );
-      this.$emit("editorEvent", {
-        type: "save",
-        data: newQuickcommandInfo,
-      });
+    saveCurrentCommand() {
+      this.$emit("editorEvent", "save", this.quickcommandInfo);
       this.saveToHistory(); // 保存时记录历史
-      if (!message) return;
-      quickcommand.showMessageBox(message, "success", 1000, "bottom-right");
     },
     // 运行
-    runCurrentCommand(cmd) {
-      this.saveToHistory(); // 运行时不保存但记录历史
-      let command = window.lodashM.cloneDeep(this.quickcommandInfo);
-      if (cmd) command.cmd = cmd;
-      command.output =
-        this.$refs.sidebar?.currentCommand.output ||
-        (command.program === "html" ? "html" : "text");
-      command.cmdType = this.$refs.sidebar?.cmdType.name;
+    runCurrentCommand(command) {
+      if (!command) {
+        this.saveToHistory(); // 运行时不保存但记录历史
+        command = { ...this.quickcommandInfo };
+      }
       this.$refs.result.runCurrentCommand(command);
     },
     saveCodeHistory() {
-      if (this.action.type !== "run") return;
+      if (!this.isRunCodePage) return;
       let command = window.lodashM.cloneDeep(this.quickcommandInfo);
-      command.cursorPosition = this.$refs.editor.getCursorPosition();
       dbManager.putDB(command, "cfg_codeHistory");
     },
-    monacoTyping(val) {
-      this.quickcommandInfo.cmd = val;
-    },
-    monacoKeyStroke(event, data) {
+    handleAction(event, data) {
       switch (event) {
         case "run":
           this.runCurrentCommand();
@@ -281,28 +214,22 @@ export default {
         case "save":
           this.saveCurrentCommand();
           break;
-        case "log":
-          if (this.quickcommandInfo.program !== "quickcommand") return;
-          this.runCurrentCommand(`console.log(${data})`);
+        case "back":
+          this.$emit("editorEvent", "back");
+          break;
+        case "show-composer":
+          this.showComposer = true;
           break;
-        case "fullscreen":
-          this.toggleFullscreen();
+        case "insert-text":
+          this.$refs.editor.repacleEditorSelection(data);
           break;
         default:
           break;
       }
     },
-    toggleFullscreen() {
-      this.isFullscreen = !this.isFullscreen;
-
-      // 重新布局编辑器
-      setTimeout(() => {
-        this.$refs.editor.resizeEditor();
-      }, 300);
-    },
     saveToHistory() {
       this.$refs.editorTools.tryToSave(
-        this.$refs.editor.getEditorValue(),
+        this.quickcommandInfo.cmd,
         this.quickcommandInfo.program
       );
     },
@@ -311,27 +238,72 @@ export default {
       this.saveToHistory();
 
       // 恢复历史内容
-      this.$refs.editor.setEditorValue(item.content);
+      this.quickcommandInfo.cmd = item.content;
+      this.quickcommandInfo.program = item.program;
+    },
+    updateCommandConfig(value) {
+      this.quickcommandInfo = {
+        ...this.quickcommandInfo,
+        ...value,
+      };
     },
-    handleBack() {
-      // 触发返回事件
-      this.$emit("editorEvent", { type: "back" });
+    getLanguage() {
+      if (this.quickcommandInfo.program !== "custom") {
+        return this.quickcommandInfo.program;
+      }
+      if (!this.quickcommandInfo.customOptions.ext) return;
+      let language = Object.values(programs).find(
+        (program) => program.ext === this.quickcommandInfo.customOptions.ext
+      );
+      if (!language) return;
+      return language.name;
+    },
+    // 添加快捷键处理
+    handleKeydown(e) {
+      // 检查是否按下 Ctrl 键 (Windows) 或 Command 键 (Mac)
+      const isCmdOrCtrl = window.utools.isMacOS() ? e.metaKey : e.ctrlKey;
+      if (!isCmdOrCtrl) return;
+
+      switch (e.key.toLowerCase()) {
+        case "s":
+          e.preventDefault();
+          if (!this.canCommandSave) return;
+          this.saveCurrentCommand();
+          break;
+        case "b":
+          e.preventDefault();
+          this.runCurrentCommand();
+          break;
+      }
     },
   },
 };
 </script>
 
 <style scoped>
-/* 统一过渡效果 */
-.sidebar-transition,
-.language-bar-transition {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  will-change: transform, left, top, opacity;
+.command-editor {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  border-radius: 10px;
+  overflow: hidden;
+  background-color: #fffffe;
+  position: fixed;
+  inset: 0;
+}
+
+.body--dark .command-editor {
+  background-color: #1e1e1e;
+}
+
+.codeEditor {
+  flex: 1;
+  min-height: 0;
+  border-radius: 0 0 10px 10px;
+  overflow: hidden;
 }
 
-/* 编辑器动画不一致，可以产生一个回弹效果 */
-.editor-transition {
-  transition: all 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
-  will-change: transform, left, top, opacity;
+.command-config {
+  padding: 4px 10px;
 }
 </style>
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 14dd63e7..23ed9a59 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -78,6 +78,7 @@ import ResultMenu from "components/popup/ResultMenu.vue";
 import { generateFlowsCode } from "js/composer/generateCode";
 import { getValidCommand } from "js/commandManager";
 import { dbManager } from "js/utools.js";
+import programs from "js/options/programs.js";
 
 export default {
   components: { ResultArea, ResultMenu },
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index fa04d192..b197ac90 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -3,7 +3,7 @@
     ref="composer"
     @action="http://github.com/handleComposerAction"
     v-model="quickcommandInfo"
-    :show-close-button="!isRunComposePage"
+    :disabled-control-buttons="disabledControlButtons"
     class="fixed-full"
   />
   <!-- 运行结果 -->
@@ -15,7 +15,7 @@ import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
 import { findCommandByValue } from "js/composer/composerConfig";
 import programs from "js/options/programs.js";
-import { ref } from "vue";
+import { ref, computed } from "vue";
 
 export default {
   components: { CommandComposer, CommandRunResult },
@@ -82,15 +82,7 @@ export default {
         mainPush: false,
         cmds: [],
       },
-      flows: [
-        {
-          id: "main",
-          name: "main",
-          label: "主流程",
-          commands: [],
-          customVariables: [],
-        },
-      ],
+      flows: [],
       output: "text",
       tags: [],
     };
@@ -99,12 +91,18 @@ export default {
       ...retoreToFullCommand(savedCommand),
     });
 
-    const isRunComposePage = ref(props.action.type === "composer");
+    const isRunComposePage = computed(() => {
+      return props.action.type === "composer";
+    });
+
+    const disabledControlButtons = computed(() => {
+      return isRunComposePage.value ? ["close", "save", "apply"] : ["apply"];
+    });
 
     return {
       quickcommandInfo,
       getLitedComposerCommand,
-      isRunComposePage,
+      disabledControlButtons,
     };
   },
   emits: ["editorEvent"],
@@ -120,14 +118,13 @@ export default {
         case "run":
           return this.runCurrentCommand(command);
         case "close":
-          return this.$emit("editorEvent", {
-            type: "back",
-          });
+          return this.$emit("editorEvent", "back");
         case "save":
-          return this.$emit("editorEvent", {
-            type: "save",
-            data: this.getLitedComposerCommand(command),
-          });
+          return this.$emit(
+            "editorEvent",
+            "save",
+            this.getLitedComposerCommand(command)
+          );
       }
     },
     runCurrentCommand(command) {
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index e8ce4446..779776a2 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -11,7 +11,7 @@
       <div class="col command-section">
         <FlowTabs
           @action="http://github.com/handleAction"
-          :show-close-button="showCloseButton"
+          :disabled-control-buttons="disabledControlButtons"
           :model-value="modelValue"
           @update:model-value="$emit('update:modelValue', $event)"
         />
@@ -42,9 +42,9 @@ export default defineComponent({
     };
   },
   props: {
-    showCloseButton: {
-      type: Boolean,
-      default: true,
+    disabledControlButtons: {
+      type: Array,
+      default: () => [],
     },
     modelValue: {
       type: Object,
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index c4bb269d..e25209fe 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -197,16 +197,17 @@ export default defineComponent({
       };
       const consoleLogVars =
         this.getAvailableOutputVariableName(outputVariable);
-      const tempFlows = [{
-        name: "main",
-        commands: [
-          tempCommand,
-          {
-            //没有输出，则不打印
-            code: `if(${consoleLogVars}!==undefined){
+      const tempFlows = [
+        {
+          name: "main",
+          commands: [
+            tempCommand,
+            {
+              //没有输出，则不打印
+              code: `if(${consoleLogVars}!==undefined){
               console.log(${consoleLogVars})
             }`,
-          },
+            },
           ],
         },
       ];
@@ -314,6 +315,14 @@ export default defineComponent({
   position: relative;
 }
 
+.composer-card .q-card {
+  background-color: rgba(0, 0, 0, 0.02);
+}
+
+.body--dark .composer-card .q-card {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
 /* 控制流程组件样式 */
 .control-component {
   flex: 1;
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 0cb3d61b..cf0363a1 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -60,7 +60,7 @@
 
       <ComposerButtons
         :is-all-collapsed="isAllCollapsed"
-        :show-close-button="showCloseButton"
+        :disabled-buttons="disabledControlButtons"
         :flows="flows"
         @action="http://github.com/handleAction"
       />
@@ -86,7 +86,7 @@
         ref="flowRefs"
       />
       <FlowManager
-        v-model="showVariableManager"
+        v-model="showFlowManager"
         :flow="flow"
         :variables="flow.customVariables"
         @update-flow="updateFlows(flow)"
@@ -119,9 +119,9 @@ export default defineComponent({
   },
   emits: ["update:modelValue", "action"],
   props: {
-    showCloseButton: {
-      type: Boolean,
-      default: true,
+    disabledControlButtons: {
+      type: Array,
+      default: () => [],
     },
     modelValue: {
       type: Object,
@@ -136,7 +136,26 @@ export default defineComponent({
       });
     };
 
-    const flows = computed(() => props.modelValue.flows);
+    const defaultFlow = [
+      {
+        id: "main",
+        name: "main",
+        label: "主流程",
+        commands: [],
+        customVariables: [],
+      },
+    ];
+
+    if (!props.modelValue.flows || props.modelValue.flows.length === 0) {
+      updateFlows(defaultFlow);
+    }
+
+    const flows = computed(() => props.modelValue.flows || []);
+
+    const commandConfig = computed(() => {
+      const { tags, output, features, program } = props.modelValue;
+      return { tags, output, features, program };
+    });
 
     const mainFlow = computed({
       get: () => flows.value[0],
@@ -235,6 +254,7 @@ export default defineComponent({
       flows,
       mainFlow,
       subFlows,
+      commandConfig,
       activeTab,
       getOutputVariables,
       updateFlows,
@@ -243,16 +263,10 @@ export default defineComponent({
   data() {
     return {
       isAllCollapsed: false,
-      showVariableManager: false,
+      showFlowManager: false,
       outputVariables: [],
     };
   },
-  computed: {
-    commandConfig() {
-      const { tags, output, features } = this.modelValue;
-      return { tags, output, features };
-    },
-  },
   methods: {
     generateFlowName(baseName = "func_") {
       return (
@@ -293,7 +307,7 @@ export default defineComponent({
 
       this.activeTab = id;
       this.$nextTick(() => {
-        this.toggleVariableManager();
+        this.toggleFlowManager();
       });
     },
     removeFlow(flow) {
@@ -332,12 +346,15 @@ export default defineComponent({
         case "expandAll":
           this.expandAll();
           break;
-        case "toggleVariableManager":
-          this.toggleVariableManager();
+        case "toggleFlowManager":
+          this.toggleFlowManager();
           break;
         case "close":
           this.$emit("action", "close");
           break;
+        case "apply":
+          this.$emit("action", "apply", payload);
+          break;
         case "addFlow":
           // 处理新函数创建
           const index = this.subFlows.findIndex((f) => f.name === payload.name);
@@ -352,8 +369,8 @@ export default defineComponent({
           this.$emit("action", type, payload);
       }
     },
-    toggleVariableManager() {
-      this.showVariableManager = !this.showVariableManager;
+    toggleFlowManager() {
+      this.showFlowManager = !this.showFlowManager;
       this.outputVariables = this.getOutputVariables();
     },
     saveFlows() {
@@ -383,7 +400,7 @@ export default defineComponent({
     },
     editFunction(flow) {
       this.activeTab = flow.id;
-      this.toggleVariableManager();
+      this.toggleFlowManager();
     },
     updateCommandConfig(newVal) {
       const newModelValue = {
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 0e1ced69..064a2233 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -5,8 +5,8 @@
         icon="close"
         dense
         flat
-        v-if="showCloseButton"
         @click="$emit('action', 'close')"
+        v-if="!disabledButtons.includes('close')"
       >
         <q-tooltip>退出可视化编排</q-tooltip>
       </q-btn>
@@ -15,6 +15,7 @@
         dense
         flat
         @click="$emit('action', isAllCollapsed ? 'expandAll' : 'collapseAll')"
+        v-if="!disabledButtons.includes('expand')"
       >
         <q-tooltip>{{ isAllCollapsed ? "展开所有" : "折叠所有" }}</q-tooltip>
       </q-btn>
@@ -22,7 +23,8 @@
         icon="settings"
         dense
         flat
-        @click="$emit('action', 'toggleVariableManager')"
+        @click="$emit('action', 'toggleFlowManager')"
+        v-if="!disabledButtons.includes('manager')"
       >
         <q-tooltip>流程管理</q-tooltip>
       </q-btn>
@@ -34,33 +36,40 @@
         v-if="isDev"
       >
       </q-btn>
-      <!-- <q-btn
+      <q-btn
         dense
-        icon="read_more"
         flat
-        v-close-popup
-        @click="$emit('action', 'insert')"
-        v-if="showCloseButton"
+        icon="done_all"
+        @click="handleApply"
+        v-if="!disabledButtons.includes('apply')"
       >
-        <q-tooltip>插入到编辑器光标处</q-tooltip>
-      </q-btn> -->
-      <!-- <q-btn
+        <q-tooltip>清空编辑器内容并插入</q-tooltip>
+      </q-btn>
+      <q-btn
         dense
         flat
-        v-close-popup
-        icon="done_all"
-        @click="$emit('action', 'apply')"
-        v-if="showCloseButton"
+        icon="save"
+        @click="$emit('action', 'save')"
+        v-if="!disabledButtons.includes('save')"
       >
-        <q-tooltip>清空编辑器内容并插入</q-tooltip>
-      </q-btn> -->
-      <q-btn dense flat icon="save" @click="$emit('action', 'save')">
         <q-tooltip>保存</q-tooltip>
       </q-btn>
-      <q-btn flat dense icon="preview" @click="isVisible = true">
+      <q-btn
+        flat
+        dense
+        icon="preview"
+        @click="handlePreviewCode"
+        v-if="!disabledButtons.includes('preview')"
+      >
         <q-tooltip>预览代码</q-tooltip>
       </q-btn>
-      <q-btn dense flat icon="play_circle" @click="$emit('action', 'run')">
+      <q-btn
+        dense
+        flat
+        icon="play_circle"
+        @click="$emit('action', 'run')"
+        v-if="!disabledButtons.includes('run')"
+      >
         <q-tooltip>运行</q-tooltip>
       </q-btn>
     </div>
@@ -99,9 +108,9 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
-    showCloseButton: {
-      type: Boolean,
-      default: true,
+    disabledButtons: {
+      type: Array,
+      default: () => [],
     },
     flows: {
       type: Array,
@@ -119,11 +128,15 @@ export default defineComponent({
     };
   },
 
-  watch: {
-    isVisible(val) {
-      if (val) {
-        this.code = generateFlowsCode(this.flows);
-      }
+  methods: {
+    handlePreviewCode() {
+      this.code = generateFlowsCode(this.flows);
+      this.isVisible = true;
+    },
+    // 清空编辑器内容并插入
+    handleApply() {
+      const code = generateFlowsCode(this.flows);
+      this.$emit("action", "apply", code);
     },
   },
 });
diff --git a/src/components/composer/param/ParamImporter.vue b/src/components/composer/param/ParamImporter.vue
index 7fb6ea87..60a4a1d2 100644
--- a/src/components/composer/param/ParamImporter.vue
+++ b/src/components/composer/param/ParamImporter.vue
@@ -26,7 +26,7 @@ import TimeInput from "components/composer/common/TimeInput.vue";
 import FunctionInput from "components/composer/common/FunctionInput.vue";
 import { QInput, QSelect, QToggle, QCheckbox } from "quasar";
 const CodeEditor = defineAsyncComponent(() =>
-  import("components/composer/common/CodeEditor.vue")
+  import("components/editor/CodeEditor.vue")
 );
 
 export default defineComponent({
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index 0b5640c9..392ee429 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -127,7 +127,7 @@
 <script>
 import { defineComponent } from "vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
-import CodeEditor from "components/composer/common/CodeEditor.vue";
+import CodeEditor from "components/editor/CodeEditor.vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import ArrayEditor from "components/composer/common/ArrayEditor.vue";
 import BorderLabel from "components/composer/common/BorderLabel.vue";
diff --git a/src/components/composer/common/CodeEditor.vue b/src/components/editor/CodeEditor.vue
similarity index 76%
rename from src/components/composer/common/CodeEditor.vue
rename to src/components/editor/CodeEditor.vue
index 0bf47308..7316991b 100644
--- a/src/components/composer/common/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="code-editor" :style="{ height: height }">
     <div ref="editorContainer" class="editor-container" />
-    <div class="placeholder-wrapper" v-show="!value && placeholder">
+    <div class="placeholder-wrapper" v-show="showPlaceholder">
       <div class="placeholder">
         {{ placeholder }}
       </div>
@@ -11,7 +11,6 @@
 
 <script>
 import * as monaco from "monaco-editor";
-import { toRaw } from "vue";
 import importAll from "js/common/importAll.js";
 import { defineComponent } from "vue";
 
@@ -21,6 +20,7 @@ let languageCompletions = importAll(
 );
 
 let monacoCompletionProviders = {};
+let editor = null;
 
 // 声明文件映射
 const typeDefinitions = {
@@ -70,12 +70,15 @@ export default defineComponent({
       type: String,
       default: "请输入...",
     },
+    // 光标位置
+    cursorPosition: {
+      type: Object,
+      default: () => ({}),
+    },
   },
-  emits: ["update:modelValue", "change"],
+  emits: ["update:modelValue", "update:cursorPosition"],
   data() {
     return {
-      editor: null,
-      value: null,
       resizeTimeout: null,
       defaultOptions: {
         value: "",
@@ -138,12 +141,19 @@ export default defineComponent({
     modelValue: {
       immediate: true,
       handler(newValue) {
-        if (this.value !== newValue) {
-          this.value = newValue;
-          if (this.editor && this.editor.getValue() !== newValue) {
-            this.editor.setValue(newValue || "");
-          }
-        }
+        if (!editor || editor.getValue() === newValue) return;
+        editor.setValue(newValue || "");
+      },
+    },
+    cursorPosition: {
+      immediate: true,
+      handler(newValue) {
+        if (!editor) return;
+        const { lineNumber, column } = newValue;
+        if (!lineNumber || !column) return;
+        const pos = editor.getPosition();
+        if (pos.lineNumber === lineNumber && pos.column === column) return;
+        editor.setPosition(newValue);
       },
     },
     "$q.dark.isActive": {
@@ -155,11 +165,10 @@ export default defineComponent({
     language: {
       immediate: true,
       handler(newValue) {
-        if (this.editor) {
-          const language = this.getHighlighter(newValue);
-          monaco.editor.setModelLanguage(this.rawEditor().getModel(), language);
-          this.loadTypes();
-        }
+        if (!editor) return;
+        const language = this.getHighlighter(newValue);
+        monaco.editor.setModelLanguage(editor.getModel(), language);
+        this.loadTypes();
       },
     },
   },
@@ -180,16 +189,17 @@ export default defineComponent({
       const options = {
         ...this.defaultOptions,
         ...this.options,
-        value: this.value || "",
+        value: this.modelValue || "",
         language,
         theme: this.theme,
       };
 
-      this.editor = monaco.editor.create(this.$refs.editorContainer, options);
+      editor = monaco.editor.create(this.$refs.editorContainer, options);
       this.listenEditorValue();
       this.loadTypes();
       this.registerLanguage();
-
+      this.bindKeys();
+      this.setCursorPosition(this.cursorPosition);
       // 初始化完成后立即触发一次布局更新
       this.$nextTick(() => {
         this.resizeEditor();
@@ -197,11 +207,14 @@ export default defineComponent({
     },
     // 监听编辑器值变化
     listenEditorValue() {
-      this.rawEditor().focus();
-      this.rawEditor().onDidChangeModelContent(() => {
-        this.value = this.getEditorValue();
-        this.$emit("update:modelValue", this.value);
-        this.$emit("change", this.value);
+      editor.focus();
+      editor.onDidChangeModelContent(() => {
+        this.$emit("update:modelValue", editor.getValue());
+      });
+
+      // 监听光标位置变化
+      editor.onDidChangeCursorPosition((e) => {
+        this.$emit("update:cursorPosition", e.position);
       });
     },
     // 处理窗口大小变化
@@ -210,50 +223,24 @@ export default defineComponent({
         clearTimeout(this.resizeTimeout);
       }
       this.resizeTimeout = setTimeout(() => {
-        this.rawEditor().layout();
+        editor.layout();
       }, 50);
     },
     // 销毁编辑器
     destroyEditor() {
-      if (this.editor) {
-        window.removeEventListener("resize", this.resizeEditor);
-        this.rawEditor().dispose();
-        this.editor = null;
-      }
-    },
-    // 获取原始编辑器实例
-    rawEditor() {
-      return toRaw(this.editor);
-    },
-    // 获取编辑器实例
-    getEditor() {
-      return this.editor;
-    },
-    // 设置编辑器内容
-    setValue(value) {
-      if (this.editor) {
-        this.editor.setValue(value || "");
-      }
-    },
-    // 获取编辑器内容
-    getValue() {
-      return this.editor ? this.editor.getValue() : "";
-    },
-    // 获取编辑器内容
-    getEditorValue() {
-      return this.rawEditor().getValue();
+      window.removeEventListener("resize", this.resizeEditor);
+      if (!editor) return;
+      editor.dispose();
+      editor = null;
     },
     // 聚焦编辑器
     focus() {
-      if (this.editor) {
-        this.editor.focus();
-      }
+      editor && editor.focus();
     },
     registerLanguage() {
-      let that = this;
       const identifierPattern = "([a-zA-Z_]\\w*)";
       let getTokens = (code) => {
-        let identifier = new RegExp(identifierPattern, "g");
+        const identifier = new RegExp(identifierPattern, "g");
         let tokens = [];
         let array1;
         while ((array1 = identifier.exec(code)) !== null) {
@@ -264,7 +251,7 @@ export default defineComponent({
       let createDependencyProposals = (range, keyWords, editor, curWord) => {
         let keys = [];
         // fix getValue of undefined
-        let tokens = getTokens(toRaw(editor).getModel()?.getValue());
+        const tokens = getTokens(editor.getModel()?.getValue());
         // 自定义变量、字符串
         for (const item of tokens) {
           if (item != curWord.word) {
@@ -312,7 +299,7 @@ export default defineComponent({
               suggestions: createDependencyProposals(
                 range,
                 languageCompletions[language].default,
-                toRaw(that.editor),
+                editor,
                 word
               ),
             };
@@ -366,11 +353,7 @@ export default defineComponent({
       }
     },
     getHighlighter(language) {
-      if (
-        ["quickcommand", "javascript", "webjavascript"].includes(
-          language
-        )
-      ) {
+      if (["quickcommand", "javascript", "webjavascript"].includes(language)) {
         return "javascript";
       }
       if (language === "cmd") {
@@ -378,10 +361,38 @@ export default defineComponent({
       }
       return language;
     },
+    setCursorPosition(position) {
+      if (!position.lineNumber || !position.column) return;
+      editor.setPosition(position);
+    },
+    bindKeys() {
+      // alt + z 换行
+      const revWordWrap = this.wordWrap === "on" ? "off" : "on";
+      editor.addCommand(monaco.KeyMod.Alt | monaco.KeyCode.KeyZ, () => {
+        editor.updateOptions({ wordWrap: revWordWrap });
+      });
+    },
+    repacleEditorSelection(text) {
+      var selection = editor.getSelection();
+      var range = new monaco.Range(
+        selection.startLineNumber,
+        selection.startColumn,
+        selection.endLineNumber,
+        selection.endColumn
+      );
+      var id = { major: 1, minor: 1 };
+      var op = {
+        identifier: id,
+        range: range,
+        text: text,
+        forceMoveMarkers: true,
+      };
+      editor.executeEdits("my-source", [op]);
+    },
   },
   computed: {
     showPlaceholder() {
-      return this.placeholder && (!this.value || this.value.trim() === "");
+      return this.placeholder && !this.modelValue;
     },
   },
 });
@@ -390,10 +401,9 @@ export default defineComponent({
 <style scoped>
 .code-editor {
   width: 100%;
-  border: 1px solid rgba(0, 0, 0, 0.12);
-  border-radius: 4px;
   overflow: hidden;
   position: relative;
+  border-radius: 4px;
 }
 
 .editor-container {
@@ -406,7 +416,7 @@ export default defineComponent({
   top: 0;
   left: 0;
   right: 0;
-  padding-left: 45px;
+  padding-left: 40px;
   pointer-events: none;
 }
 
@@ -414,12 +424,6 @@ export default defineComponent({
   font-size: 14px;
   font-family: sans-serif;
   user-select: none;
-  font-style: italic;
-  opacity: 0;
-  transition: opacity 0.1s ease-in-out;
-}
-
-.code-editor:focus-within .placeholder {
-  opacity: 0.3;
+  opacity: 0.4;
 }
 </style>
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index a4c37b7b..b7af58c5 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -1,33 +1,29 @@
 <template>
   <q-expansion-item
     v-model="isExpanded"
-    class="command-config"
-    @dragover="isExpanded = false"
+    @update:model-value="$emit('update:is-expanded', $event)"
+    class="command-composer command-config"
   >
     <template v-slot:header>
-      <div class="row q-col-gutter-sm basic-config">
-        <div class="col-auto">
-          <q-avatar size="36px" square class="featureIco">
-            <q-img
-              @click.stop="showIconPicker = true"
-              :src="http://github.com/currentCommand.features.icon"
-            />
-          </q-avatar>
-        </div>
-        <div class="col">
-          <q-input
-            :model-value="currentCommand.features.explain"
-            filled
-            dense
-            @update:model-value="updateCommand('features.explain', $event)"
-            placeholder="名称"
-            @click.stop
-          >
-            <template v-slot:append>
-              <q-icon name="drive_file_rename_outline" />
-            </template>
-          </q-input>
-        </div>
+      <div class="row basic-config">
+        <q-avatar size="36px" square class="featureIco">
+          <q-img
+            @click.stop="showIconPicker = true"
+            :src="http://github.com/currentCommand.features.icon"
+          />
+        </q-avatar>
+        <q-input
+          ref="explainInput"
+          :model-value="currentCommand.features.explain"
+          borderless
+          dense
+          @update:model-value="updateModelValue('features.explain', $event)"
+          @click.stop
+          placeholder="请输入名称"
+          @focus="expandOnFocus && updateExpanded(true)"
+          class="col"
+        >
+        </q-input>
       </div>
     </template>
 
@@ -59,7 +55,7 @@
         <MatchRuleEditor
           :showJson="showMatchRuleJson"
           :model-value="currentCommand.features.cmds"
-          @update:model-value="updateCommand('features.cmds', $event)"
+          @update:model-value="updateModelValue('features.cmds', $event)"
         />
       </div>
 
@@ -71,7 +67,7 @@
         </div>
         <q-select
           :model-value="currentCommand.tags"
-          @update:model-value="updateCommand('tags', $event)"
+          @update:model-value="updateModelValue('tags', $event)"
           :options="allQuickCommandTags"
           dense
           options-dense
@@ -81,6 +77,7 @@
           multiple
           hide-dropdown-icon
           new-value-mode="add-unique"
+          popup-content-class="command-tag-popup"
           placeholder="回车添加，最多3个"
           max-values="3"
           @new-value="tagVerify"
@@ -101,7 +98,7 @@
             <ButtonGroup
               :model-value="currentCommand.output"
               :options="outputTypesOptionsDy"
-              @update:model-value="updateCommand('output', $event)"
+              @update:model-value="updateModelValue('output', $event)"
               height="26px"
             />
           </div>
@@ -138,7 +135,7 @@
         <CheckGroup
           :model-value="currentCommand.features.platform"
           :options="Object.values(platformTypes)"
-          @update:model-value="updateCommand('features.platform', $event)"
+          @update:model-value="handlePlatformChange"
           height="30px"
         />
       </div>
@@ -147,7 +144,7 @@
     <!-- 图标选择对话框 -->
     <q-dialog v-model="showIconPicker" position="left">
       <iconPicker
-        @iconChanged="(dataUrl) => updateCommand('features.icon', dataUrl)"
+        @iconChanged="(dataUrl) => updateModelValue('features.icon', dataUrl)"
         ref="icon"
       />
     </q-dialog>
@@ -155,7 +152,7 @@
 </template>
 
 <script>
-import { defineComponent, computed } from "vue";
+import { defineComponent } from "vue";
 import iconPicker from "components/popup/IconPicker.vue";
 import outputTypes from "js/options/outputTypes.js";
 import platformTypes from "js/options/platformTypes.js";
@@ -178,8 +175,12 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    expandOnFocus: {
+      type: Boolean,
+      default: false,
+    },
   },
-  emits: ["update:modelValue"],
+  emits: ["update:modelValue", "update:is-expanded"],
   data() {
     return {
       commandManager: useCommandManager(),
@@ -205,29 +206,42 @@ export default defineComponent({
     currentCommand() {
       return this.modelValue;
     },
-    commandTypesOptions() {
-      const options = Object.values(this.commandTypes);
-      return this.currentCommand.features.mainPush
-        ? options.map((cmdType) =>
-            ["regex", "over", "key"].includes(cmdType.name)
-              ? cmdType
-              : { ...cmdType, disabled: true }
-          )
-        : options;
-    },
     outputTypesOptionsDy() {
       const options = Object.values(this.outputTypes);
-      return this.currentCommand.features.mainPush
-        ? options.map((outputType) =>
-            outputType.name !== "text"
-              ? { ...outputType, disabled: true }
-              : outputType
-          )
-        : options;
+      if (this.currentCommand.features.mainPush) {
+        return this.setOutputOptionDisabled(options, "text", false);
+      }
+      if (this.currentCommand.program === "html") {
+        return this.setOutputOptionDisabled(options, "html", false);
+      }
+      if (
+        ["quickcommand", "quickcomposer"].includes(this.currentCommand.program)
+      ) {
+        return this.setOutputOptionDisabled(options, "terminal", true);
+      }
+      return options;
     },
   },
+  mounted() {
+    if (!this.modelValue.features.explain) {
+      setTimeout(this.$refs.explainInput.focus);
+    }
+    // 添加全局点击事件监听器
+    document.addEventListener("click", this.handleOutsideClick);
+  },
+  beforeUnmount() {
+    // 组件销毁前移除监听器
+    document.removeEventListener("click", this.handleOutsideClick);
+  },
   methods: {
-    updateCommand(path, value) {
+    setOutputOptionDisabled(options, option, disabled = true) {
+      return options.map((opt) =>
+        opt.name === option
+          ? { ...opt, disabled }
+          : { ...opt, disabled: !disabled }
+      );
+    },
+    updateModelValue(path, value) {
       const newCommand = { ...this.currentCommand };
       const keys = path.split(".");
       const lastKey = keys.pop();
@@ -246,12 +260,6 @@ export default defineComponent({
       if (!inputValue) return;
       ref.add(inputValue, true);
     },
-    handleMainPushChange(val) {
-      this.updateCommand("features.mainPush", val);
-      if (val) {
-        this.updateCommand("output", "text");
-      }
-    },
     showMainPushHelp() {
       window.showUb.help("#u0e9f1430");
     },
@@ -262,6 +270,33 @@ export default defineComponent({
         )
         .run();
     },
+    handleOutsideClick(event) {
+      // 如果面板已经折叠，不需要处理
+      if (!this.isExpanded) return;
+
+      // 检查点击是否在标签选择框的弹出菜单内
+      const tagPopup = document.querySelector(".command-tag-popup");
+      if (tagPopup?.contains(event.target)) return;
+
+      // 检查点击是否在组件内部
+      const componentEl = this.$el;
+      if (componentEl.contains(event.target)) return;
+      this.updateExpanded(false);
+    },
+    handleMainPushChange(newMainPush) {
+      this.updateModelValue("features.mainPush", newMainPush);
+      if (newMainPush) {
+        this.updateModelValue("output", "text");
+      }
+    },
+    handlePlatformChange(newPlatform) {
+      if (newPlatform.length === 0) return;
+      this.updateModelValue("features.platform", newPlatform);
+    },
+    updateExpanded(value) {
+      this.isExpanded = value;
+      this.$emit("update:is-expanded", value);
+    },
   },
 });
 </script>
@@ -280,6 +315,11 @@ export default defineComponent({
   width: 100%;
 }
 
+.basic-config :deep(.q-field__native),
+.basic-config :deep(.q-field__control) {
+  height: 36px;
+}
+
 .command-config :deep(.q-item) {
   padding: 0;
   min-height: unset;
@@ -314,6 +354,7 @@ export default defineComponent({
 .featureIco {
   cursor: pointer;
   transition: 0.2s;
+  margin-right: 10px;
 }
 
 .featureIco:hover {
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index daeb744e..c1148b22 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -1,168 +1,231 @@
 <template>
-  <div class="row" v-show="!!height">
-    <div class="col">
-      <div>
-        <q-select
-          dense
-          standout="bg-primary text-white"
-          square
-          hide-bottom-space
-          color="primary"
-          transition-show="jump-down"
-          transition-hide="jump-up"
-          @update:model-value="updateProgram"
-          :model-value="modelValue.program"
-          :options="programLanguages"
+  <div class="command-language-bar">
+    <q-select
+      class="q-pl-xs"
+      dense
+      options-dense
+      borderless
+      square
+      hide-bottom-space
+      color="primary"
+      transition-show="jump-down"
+      transition-hide="jump-up"
+      :model-value="currentCommand.program"
+      @update:model-value="handleProgramChange"
+      :options="Object.keys(programs)"
+    >
+      <template v-slot:prepend>
+        <q-badge
           label="环境"
-        >
-          <template v-slot:append>
-            <q-avatar size="lg" square>
-              <img :src="http://github.com/programs[modelValue.program].icon" />
-            </q-avatar>
-          </template>
-          <template v-slot:option="scope">
-            <q-item v-bind="scope.itemProps">
-              <q-item-section avatar>
-                <img width="32" :src="http://github.com/programs[scope.opt].icon" />
-              </q-item-section>
-              <q-item-section>
-                <q-item-label v-html="scope.opt" />
-              </q-item-section>
-            </q-item>
-          </template>
-        </q-select>
-      </div>
-    </div>
-    <q-separator vertical />
-    <div class="col-auto justify-end flex">
-      <q-btn-group unelevated class="button-group">
-        <template v-if="modelValue.program === 'quickcommand'">
-          <q-btn
-            v-for="(item, index) in [
-              'help_center',
-              'view_timeline',
-            ]"
+          color="primary"
+          text-color="white"
+          class="q-ml-sm"
+          style="height: 20px"
+        />
+      </template>
+      <template v-slot:append>
+        <q-avatar size="20px" square v-if="isRunCodePage">
+          <img :src="http://github.com/programs[currentCommand.program].icon" />
+        </q-avatar>
+      </template>
+      <template v-slot:option="scope">
+        <q-item v-bind="scope.itemProps">
+          <q-item-section avatar>
+            <img width="32" :src="http://github.com/programs[scope.opt].icon" />
+          </q-item-section>
+          <q-item-section>
+            <q-item-label v-html="scope.opt" />
+          </q-item-section>
+        </q-item>
+      </template>
+    </q-select>
+    <q-btn-group unelevated class="button-group">
+      <q-btn-dropdown
+        class="special-var-btn"
+        dense
+        flat
+        label="变量"
+        color="primary"
+        icon="data_object"
+      >
+        <q-list>
+          <q-item
+            v-for="(item, index) in Object.values(specialVars)"
             :key="index"
-            dense
-            flat
-            color="primary"
-            class="settings-btn"
-            :icon="item"
-            @click="handleQuickCommandAction(index)"
+            clickable
+            v-close-popup
+            @click="handleSpecialVarClick(item)"
           >
-            <q-tooltip>
-              {{ ["查看文档", "可视化编排"][index] }}
-            </q-tooltip>
-          </q-btn>
-        </template>
+            <q-item-section>
+              <q-item-label class="row items-center justify-between">
+                <div v-text="item.label" />
+                <div v-if="item.onlyCmdTypes" class="row">
+                  <q-badge color="grey-9" class="q-ml-xs"> 仅 </q-badge>
+                  <q-badge
+                    v-for="type in item.onlyCmdTypes"
+                    :key="type"
+                    class="q-ml-xs"
+                    v-text="commandTypes[type].label"
+                    color="grey-9"
+                  />
+                </div>
+              </q-item-label>
+              <q-tooltip v-if="item.tooltip">
+                {{ item.tooltip }}
+              </q-tooltip>
+              <q-item-label caption>{{ item.desc }}</q-item-label>
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </q-btn-dropdown>
 
-        <q-btn-dropdown
-          v-else-if="modelValue.program !== 'html'"
-          class="settings-btn"
+      <template v-if="currentCommand.program === 'quickcommand'">
+        <q-btn
+          v-for="(item, index) in ['help_center', 'view_timeline']"
+          :key="index"
           dense
           flat
-          ref="settings"
           color="primary"
-          icon="settings"
+          class="settings-btn"
+          :label="['文档', '可视化'][index]"
+          :icon="item"
+          @click="handleQuickCommandAction(index)"
         >
-          <q-list>
-            <!-- 自定义解释器 -->
-            <q-item
-              v-for="(item, index) in Object.keys(modelValue.customOptions)"
-              :key="index"
-              v-show="modelValue.program === 'custom'"
+        </q-btn>
+      </template>
+
+      <q-btn-dropdown
+        v-model="isSettingsVisible"
+        v-else-if="currentCommand.program !== 'html'"
+        class="settings-btn"
+        dense
+        flat
+        label="设置"
+        color="primary"
+        icon="settings"
+      >
+        <q-list>
+          <!-- 自定义解释器 -->
+          <q-item
+            v-for="(item, index) in Object.keys(currentCommand.customOptions)"
+            :key="index"
+            v-show="currentCommand.program === 'custom'"
+          >
+            <q-input
+              stack-label
+              autofocus
+              dense
+              outlined
+              class="full-width"
+              :label="
+                [
+                  '解释器路径，如：/opt/python',
+                  '运行参数，如：-u',
+                  '脚本后缀，不含点，如：py',
+                ][index]
+              "
+              :model-value="currentCommand.customOptions[item]"
+              @update:model-value="
+                (val) => updateModelValue(`customOptions.${item}`, val)
+              "
             >
-              <q-input
-                stack-label
-                autofocus
-                dense
-                outlined
-                class="full-width"
-                @blur="matchLanguage"
-                :label="
-                  [
-                    '解释器路径，如：/opt/python',
-                    '运行参数，如：-u',
-                    '脚本后缀，不含点，如：py',
-                  ][index]
-                "
-                :model-value="modelValue.customOptions[item]"
-                @update:model-value="(val) => updateCustomOption(item, val)"
-              >
-                <template v-slot:prepend>
-                  <q-icon name="code" />
-                </template>
-              </q-input>
-            </q-item>
-            <!-- 脚本参数 -->
-            <q-item v-show="modelValue.program !== 'quickcommand'">
-              <q-input
-                dense
-                stack-label
-                outlined
-                label="脚本参数"
-                class="full-width"
-                :model-value="modelValue.scptarg"
-                @update:model-value="updateScptarg"
-              >
-                <template v-slot:prepend>
-                  <q-icon name="input" />
-                </template>
-              </q-input>
-            </q-item>
-            <!-- 编码设置 -->
-            <q-item
-              v-for="(item, index) in Object.keys(modelValue.charset)"
-              :key="index"
-              v-show="modelValue.program !== 'quickcommand'"
+              <template v-slot:prepend>
+                <q-icon name="code" />
+              </template>
+            </q-input>
+          </q-item>
+          <!-- 脚本参数 -->
+          <q-item v-show="currentCommand.program !== 'quickcommand'">
+            <q-input
+              dense
+              stack-label
+              outlined
+              label="脚本参数"
+              class="full-width"
+              :model-value="currentCommand.scptarg"
+              @update:model-value="updateModelValue('scptarg', $event)"
             >
-              <q-select
-                dense
-                outlined
-                stack-label
-                clearable
-                class="full-width"
-                :label="['脚本编码', '输出编码'][index]"
-                :model-value="modelValue.charset[item]"
-                @update:model-value="(val) => updateCharset(item, val)"
-                :options="['GBK', 'utf8', 'Big5']"
-                type="text"
-              >
-                <template v-slot:prepend>
-                  <q-icon :name="['format_size', 'output'][index]" />
-                </template>
-              </q-select>
-            </q-item>
-          </q-list>
-        </q-btn-dropdown>
-        <q-separator vertical inset />
-        <q-btn
-          class="action-btn run-btn"
-          dense
-          flat
-          color="primary"
-          icon="play_arrow"
-          label="运行"
-          @click="$emit('run')"
-        ></q-btn>
-        <q-btn
-          class="action-btn save-btn"
-          flat
-          dense
-          v-if="!isRunCodePage"
-          :disable="!canCommandSave"
-          :color="canCommandSave ? 'primary' : 'grey'"
-          icon="save"
-          label="保存"
-          @click="$emit('save')"
-        ></q-btn>
-      </q-btn-group>
-    </div>
+              <template v-slot:prepend>
+                <q-icon name="input" />
+              </template>
+            </q-input>
+          </q-item>
+          <!-- 编码设置 -->
+          <q-item
+            v-for="(item, index) in Object.keys(currentCommand.charset)"
+            :key="index"
+            v-show="currentCommand.program !== 'quickcommand'"
+          >
+            <q-select
+              dense
+              outlined
+              stack-label
+              clearable
+              class="full-width"
+              :label="['脚本编码', '输出编码'][index]"
+              :model-value="currentCommand.charset[item]"
+              @update:model-value="
+                (val) => updateModelValue(`charset.${item}`, val)
+              "
+              :options="['GBK', 'utf8', 'Big5']"
+              type="text"
+            >
+              <template v-slot:prepend>
+                <q-icon :name="['format_size', 'output'][index]" />
+              </template>
+            </q-select>
+          </q-item>
+        </q-list>
+      </q-btn-dropdown>
+      <q-separator vertical inset />
+      <q-btn
+        v-if="!isRunCodePage"
+        class="action-btn run-btn"
+        dense
+        flat
+        color="primary"
+        icon="arrow_back"
+        label="退出"
+        @click="$emit('action', 'back')"
+      ></q-btn>
+      <q-btn
+        class="action-btn run-btn"
+        dense
+        flat
+        color="primary"
+        icon="play_arrow"
+        label="运行"
+        @click="$emit('action', 'run')"
+      ></q-btn>
+      <q-btn
+        v-if="!isRunCodePage"
+        :disable="!canCommandSave"
+        :color="canCommandSave ? 'primary' : 'grey'"
+        class="action-btn save-btn"
+        flat
+        dense
+        icon="save"
+        label="保存"
+        @click="$emit('action', 'save')"
+      ></q-btn>
+    </q-btn-group>
+    <q-dialog v-model="showUserData">
+      <UserData
+        @insertText="
+          insertSpecialVar($event);
+          showUserData = false;
+        "
+        :showInsertBtn="true"
+      />
+    </q-dialog>
   </div>
 </template>
 
 <script>
 import programs from "js/options/programs.js";
+import specialVars from "js/options/specialVars.js";
+import commandTypes from "js/options/commandTypes.js";
+import UserData from "components/popup/UserData.vue";
 
 export default {
   name: "CommandLanguageBar",
@@ -171,10 +234,6 @@ export default {
       type: Object,
       required: true,
     },
-    height: {
-      type: Number,
-      default: 40,
-    },
     canCommandSave: {
       type: Boolean,
       default: true,
@@ -184,149 +243,121 @@ export default {
       default: false,
     },
   },
-  emits: [
-    "update:modelValue",
-    "program-changed",
-    "run",
-    "save",
-    "show-composer",
-  ],
+  emits: ["update:modelValue", "action"],
+  components: {
+    UserData,
+  },
   data() {
     return {
       programs,
+      specialVars,
+      commandTypes,
+      isSettingsVisible: false,
+      showUserData: false,
     };
   },
   computed: {
-    programLanguages() {
-      return Object.keys(this.programs);
+    currentCommand() {
+      return this.modelValue;
     },
   },
   methods: {
-    updateProgram(value) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        program: value,
-      });
-      this.programChanged(value);
-    },
-    updateCustomOption(key, value) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        customOptions: {
-          ...this.modelValue.customOptions,
-          [key]: value,
-        },
-      });
-    },
-    updateScptarg(value) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        scptarg: value,
-      });
-    },
-    updateCharset(key, value) {
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        charset: {
-          ...this.modelValue.charset,
-          [key]: value,
-        },
-      });
-    },
-    programChanged(value) {
-      this.$emit("program-changed", value);
-      if (value === "custom") {
-        this.$refs.settings.show();
+    handleProgramChange(newProgram) {
+      const newCommand = { ...this.currentCommand };
+      newCommand.program = newProgram;
+      if (newProgram === "custom") {
+        this.isSettingsVisible = true;
       }
-    },
-    matchLanguage() {
-      if (!this.modelValue.customOptions.ext) return;
-      let language = Object.values(this.programs).filter(
-        (program) => program.ext === this.modelValue.customOptions.ext
-      );
-      if (language.length) {
-        this.$emit("program-changed", language[0].name);
+      if (newProgram === "html") {
+        newCommand.output = "html";
+      }
+      const featuresIcon = this.currentCommand.features.icon || "";
+      if (featuresIcon.slice(0, 10) !== "data:image") {
+        newCommand.features.icon = this.programs[newProgram].icon;
       }
+      this.$emit("update:modelValue", newCommand);
+    },
+    updateModelValue(keyPath, value) {
+      const newModelValue = { ...this.modelValue };
+      const keys = keyPath.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((obj, key) => obj[key], newModelValue);
+      target[lastKey] = value;
+      this.$emit("update:modelValue", newModelValue);
     },
     handleQuickCommandAction(index) {
       const actions = [
         () => this.showHelp(),
-        () => this.$emit("show-composer"),
+        () => this.$emit("action", "show-composer"),
       ];
       actions[index]();
     },
     showHelp() {
       window.showUb.docs();
     },
+    handleSpecialVarClick(item) {
+      if (item.label === "{{usr:}}") this.showUserData = true;
+      else this.insertSpecialVar(item.label);
+    },
+    insertSpecialVar(text) {
+      if (!text) return;
+      this.$emit("action", "insert-text", `"${text}"`);
+    },
   },
 };
 </script>
 
 <style scoped>
 .button-group {
-  .action-btn {
-    padding: 0 10px;
-  }
+  padding: 0 5px;
+}
+
+.button-group :deep(.q-focus-helper) {
+  display: none;
+}
+
+.button-group :deep(.q-btn__content) {
+  font-size: 12px;
+}
+
+.button-group :deep(.q-btn-dropdown__arrow) {
+  margin-left: 0;
+}
+
+.button-group .q-btn:hover {
+  filter: brightness(1.2);
+  transition: all 0.2s ease;
 }
 
 /* 运行按钮动画 */
 .run-btn:hover :deep(.q-icon) {
   display: inline-block;
-  animation: slideRight 1.5s infinite;
+  animation: leftRight 1.5s infinite;
 }
 
 /* 保存按钮动画 */
 .save-btn:not([disabled]):hover :deep(.q-icon) {
   display: inline-block;
-  animation: saveAnimation 1.2s infinite;
+  animation: upDown 1.2s infinite;
 }
 
-/* 设置按钮动画 */
-.settings-btn :deep(.q-icon:first-child) {
-  display: inline-block;
-  transform: scale(1);
-  transition: transform 0.5s ease;
+.command-language-bar {
+  background-color: #fffffe;
+  height: 30px;
+  margin-bottom: 2px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
-.settings-btn:hover :deep(.q-icon:first-child) {
-  transform: scale(1.05);
+.body--dark .command-language-bar {
+  background-color: #1e1e1e;
 }
 
-@keyframes slideRight {
-  0% {
-    transform: translateX(-2px);
-    opacity: 0.7;
-  }
-  50% {
-    transform: translateX(2px);
-    opacity: 1;
-  }
-  100% {
-    transform: translateX(-2px);
-    opacity: 0.7;
-  }
-}
-
-@keyframes saveAnimation {
-  0% {
-    transform: translateY(-1px);
-    opacity: 1;
-  }
-  50% {
-    transform: translateY(1px);
-    opacity: 0.6;
-  }
-  75% {
-    transform: translateY(0.5px);
-    opacity: 0.8;
-  }
-  100% {
-    transform: translateY(-1px);
-    opacity: 1;
-  }
-}
-
-.settings-btn:hover :deep(.q-icon) {
-  display: inline-block;
+.command-language-bar :deep(.q-field__control),
+.command-language-bar :deep(.q-field__control > *),
+.command-language-bar :deep(.q-field__native) {
+  max-height: 30px;
+  min-height: 30px;
 }
 </style>
diff --git a/src/components/editor/CommandSideBar.vue b/src/components/editor/CommandSideBar.vue
deleted file mode 100644
index f7895597..00000000
--- a/src/components/editor/CommandSideBar.vue
+++ /dev/null
@@ -1,739 +0,0 @@
-<template>
-  <div
-    class="command-side-bar"
-    :style="{
-      width: sideBarWidth + 'px',
-      '--icon-url': `url(http://github.com/$%7BcurrentCommand.features.icon%7D)`,
-    }"
-  >
-    <!-- 头部区域 -->
-    <div class="header-section">
-      <div class="header-content">
-        <q-btn
-          dense
-          flat
-          color="grey"
-          icon="arrow_back_ios_new"
-          v-close-popup
-          class="back-btn"
-          @click="$emit('back')"
-        />
-        <div class="logo-container">
-          <q-avatar size="64" square class="featureIco">
-            <q-img
-              @click="showIconPicker = true"
-              :src="http://github.com/currentCommand.features.icon"
-            />
-          </q-avatar>
-        </div>
-      </div>
-    </div>
-
-    <!-- 可滚动的内容区域 -->
-    <q-scroll-area
-      :thumb-style="{
-        width: '3px',
-      }"
-      :horizontal-thumb-style="{
-        height: '5px',
-      }"
-      class="scroll-area"
-    >
-      <div
-        class="row"
-        :style="{
-          paddingLeft: sideBarPadding + 'px',
-          paddingRight: sideBarPadding + 'px',
-          paddingBottom: sideBarPadding + 'px',
-        }"
-      >
-        <div class="col-12">
-          <div class="row">
-            <div
-              class="command-side-bar-content"
-              :style="{ width: sideBarWidth - sideBarPadding * 2 + 'px' }"
-            >
-              <!-- 说明 -->
-              <q-input
-                :disable="!canCommandSave"
-                stack-label
-                label-color="primary"
-                borderless
-                square
-                v-model="currentCommand.features.explain"
-                type="text"
-                placeholder="请输入说明"
-                label="说明"
-              >
-                <template v-slot:prepend>
-                  <q-icon
-                    class="command-side-bar-icon"
-                    name="drive_file_rename_outline"
-                  />
-                </template>
-              </q-input>
-              <!-- 匹配类型 -->
-              <q-select
-                :disable="!canCommandSave"
-                popup-content-class="side-bar-popup-content"
-                hide-dropdown-icon
-                stack-label
-                label-color="primary"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                @update:model-value="(val) => handleCmdTypeChange(val)"
-                :options="commandTypesOptions"
-                v-model="cmdType"
-                type="text"
-                label="匹配类型"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" :name="cmdType.icon" />
-                </template>
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps" class="row items-center">
-                    <q-icon :name="scope.opt.icon" class="q-mr-md" />
-                    <div>
-                      <q-item-label v-html="scope.opt.name" />
-                      <q-item-label caption>{{ scope.opt.desc }}</q-item-label>
-                    </div>
-                  </q-item>
-                </template>
-              </q-select>
-              <!-- 匹配规则 -->
-              <q-select
-                v-if="cmdType.valueType === 'array'"
-                :disable="!canCommandSave"
-                popup-content-class="side-bar-popup-content"
-                hide-dropdown-icon
-                stack-label
-                label-color="primary"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                v-model="cmdMatch"
-                max-values="3"
-                type="text"
-                placeholder="回车添加"
-                use-input
-                use-chips
-                multiple
-                new-value-mode="add-unique"
-                input-debounce="0"
-                :label="cmdType.matchLabel"
-                ref="cmdMatchRef"
-                @blur="(e) => autoAddInputVal(e, $refs.cmdMatchRef)"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="square_foot" />
-                </template>
-              </q-select>
-              <q-input
-                v-else
-                :disable="!canCommandSave"
-                autogrow
-                borderless
-                square
-                v-model="cmdMatch"
-                hide-bottom-space
-                @blur="regexVerify"
-                :readonly="!cmdType.valueType"
-                type="text"
-                :label="cmdType.matchLabel"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="square_foot" />
-                </template>
-                <template v-slot:append>
-                  <q-icon
-                    v-if="cmdType.name === 'files'"
-                    name="folder"
-                    size="xs"
-                    :color="isFileTypeDirectory ? 'primary' : ''"
-                    @click="isFileTypeDirectory = !isFileTypeDirectory"
-                    style="cursor: pointer"
-                  >
-                    <q-tooltip>
-                      切换匹配类型，当前：{{
-                        isFileTypeDirectory ? "文件夹" : "文件"
-                      }}
-                    </q-tooltip>
-                  </q-icon>
-                </template>
-              </q-input>
-              <!-- 标签 -->
-              <q-select
-                :disable="!canCommandSave"
-                hide-dropdown-icon
-                stack-label
-                popup-content-class="side-bar-popup-content"
-                label-color="primary"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                v-model="currentCommand.tags"
-                max-values="3"
-                type="text"
-                label="标签"
-                placeholder="回车添加"
-                use-input
-                use-chips
-                multiple
-                new-value-mode="add-unique"
-                @new-value="tagVerify"
-                input-debounce="0"
-                :options="allQuickCommandTags"
-                ref="commandTagRef"
-                @blur="(e) => autoAddInputVal(e, $refs.commandTagRef)"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="label" />
-                </template>
-              </q-select>
-              <!-- 特殊变量 -->
-              <q-select
-                :disable="!canCommandSave"
-                hide-dropdown-icon
-                popup-content-class="side-bar-popup-content"
-                stack-label
-                label-color="primary"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                @popup-hide="
-                  () => {
-                    if (specialVar.label === '{{usr:}}') showUserData = true;
-                    else insertSpecialVar(specialVar.label);
-                  }
-                "
-                square
-                :options="specialVarsOptions"
-                v-model="specialVar"
-                input-debounce="0"
-                type="text"
-                label="特殊变量"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="attach_money" />
-                </template>
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps">
-                    <q-item-section>
-                      <q-item-label v-html="scope.opt.label" />
-                      <q-tooltip v-if="scope.opt.tooltip">
-                        {{ scope.opt.tooltip }}
-                      </q-tooltip>
-                      <q-item-label caption>{{ scope.opt.desc }}</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                </template></q-select
-              >
-              <!-- 输出 -->
-              <q-select
-                :disable="!canCommandSave"
-                hide-dropdown-icon
-                stack-label
-                label-color="primary"
-                popup-content-class="side-bar-popup-content"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                color="primary"
-                v-model="currentCommand.output"
-                :display-value="outputTypes[currentCommand.output].label"
-                :options="outputTypesOptionsDy"
-                label="输出"
-              >
-                <template v-slot:prepend>
-                  <q-icon
-                    class="command-side-bar-icon"
-                    :name="outputTypes[currentCommand.output].icon"
-                  />
-                </template>
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps" class="row items-center">
-                    <q-icon
-                      :name="outputTypes[scope.opt].icon"
-                      class="q-mr-md"
-                    />
-                    <div>
-                      <q-item-label v-html="outputTypes[scope.opt].label" />
-                    </div>
-                  </q-item>
-                </template>
-              </q-select>
-              <!-- 搜索面板推送 -->
-              <q-select
-                :disable="!canCommandSave"
-                hide-dropdown-icon
-                stack-label
-                label-color="primary"
-                popup-content-class="side-bar-popup-content"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                v-model="searchPushValue"
-                :options="searchPushOptions"
-                label="搜索面板推送"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="search" />
-                </template>
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps">
-                    <q-item-section>
-                      <q-item-label>{{ scope.opt.label }}</q-item-label>
-                      <q-item-label caption>{{ scope.opt.desc }}</q-item-label>
-                    </q-item-section>
-                    <q-item-section side v-if="scope.opt.value">
-                      <q-btn
-                        flat
-                        round
-                        icon="help_outline"
-                        size="xs"
-                        dense
-                        @click.stop="showMainPushHelp"
-                      />
-                    </q-item-section>
-                  </q-item>
-                </template>
-              </q-select>
-              <!-- 平台 -->
-              <q-select
-                :disable="!canCommandSave"
-                hide-dropdown-icon
-                stack-label
-                label-color="primary"
-                popup-content-class="side-bar-popup-content"
-                transition-show="jump-down"
-                transition-hide="jump-up"
-                borderless
-                square
-                :options="Object.keys(platformTypes)"
-                use-chips
-                @blur="platformVerify()"
-                v-model="currentCommand.features.platform"
-                multiple
-                label="平台"
-              >
-                <template v-slot:prepend>
-                  <q-icon class="command-side-bar-icon" name="window" />
-                </template>
-                <template v-slot:selected-item="scope">
-                  <q-chip
-                    removable
-                    dense
-                    @remove="scope.removeAtIndex(scope.index)"
-                    :tabindex="scope.tabindex"
-                  >
-                    {{ platformTypes[scope.opt].label }}
-                  </q-chip>
-                </template>
-                <template v-slot:option="scope">
-                  <q-item v-bind="scope.itemProps" class="row items-center">
-                    <q-img
-                      :src="http://github.com/platformTypes[scope.opt].icon"
-                      width="24px"
-                      class="q-mr-md"
-                    />
-                    <div>
-                      <q-item-label v-html="platformTypes[scope.opt].label" />
-                      <q-item-label caption>{{ scope.opt.desc }}</q-item-label>
-                    </div>
-                  </q-item>
-                </template>
-              </q-select>
-            </div>
-          </div>
-        </div>
-      </div>
-    </q-scroll-area>
-
-    <!-- 对话框部分保持不变 -->
-    <q-dialog v-model="showIconPicker" position="left">
-      <iconPicker
-        @iconChanged="(dataUrl) => (currentCommand.features.icon = dataUrl)"
-        ref="icon"
-      />
-    </q-dialog>
-    <q-dialog v-model="showUserData">
-      <UserData @insertText="insertSpecialVar" :showInsertBtn="true" />
-    </q-dialog>
-  </div>
-</template>
-
-<script>
-import commandTypes from "js/options/commandTypes.js";
-import outputTypes from "js/options/outputTypes.js";
-import specialVars from "js/options/specialVars.js";
-import platformTypes from "js/options/platformTypes.js";
-import iconPicker from "components/popup/IconPicker.vue";
-import UserData from "components/popup/UserData.vue";
-
-export default {
-  components: { iconPicker, UserData },
-  data() {
-    return {
-      currentCommand: {
-        tags: [],
-        output: "text",
-        features: {
-          explain: "",
-          platform: ["win32", "linux", "darwin"],
-          icon: "",
-          mainPush: false,
-        },
-      },
-      searchPushOptions: [
-        { value: false, label: "禁用", desc: "需要进入插件才能执行命令" },
-        {
-          value: true,
-          label: "启用",
-          desc: "可以在uTools主搜索框直接执行命令",
-        },
-      ],
-      commandTypes: commandTypes,
-      platformTypes: platformTypes,
-      currentMatchType: "关键字",
-      cmdType: {},
-      cmdMatch: "",
-      outputTypes: outputTypes,
-      outputTypesOptions: Object.keys(outputTypes),
-      specialVar: "{{}}",
-      allQuickCommandTags: this.$parent.allQuickCommandTags,
-      showIconPicker: false,
-      showUserData: false,
-      sideBarPadding: 20,
-      isFileTypeDirectory: false,
-    };
-  },
-  props: {
-    quickcommandInfo: Object,
-    canCommandSave: Boolean,
-    sideBarWidth: Number,
-  },
-  computed: {
-    commandTypesOptions() {
-      return this.currentCommand.features.mainPush
-        ? Object.values(commandTypes).filter((x) =>
-            ["regex", "over", "key"].includes(x.name)
-          )
-        : Object.values(commandTypes);
-    },
-    specialVarsOptions() {
-      if (this.currentCommand.features.mainPush) return [specialVars.input];
-      let x = Object.values(specialVars).filter(
-        (x) => !x.label.match(this.cmdType.disabledSpecialVars)
-      );
-      return x;
-    },
-    outputTypesOptionsDy() {
-      if (this.currentCommand.features.mainPush) return ["text"];
-      switch (this.$parent.quickcommandInfo.program) {
-        case "quickcommand":
-          return window.lodashM.without(this.outputTypesOptions, "terminal");
-        case "html":
-          return ["html"];
-        default:
-          return this.outputTypesOptions;
-      }
-    },
-    searchPushValue: {
-      get() {
-        return (
-          this.searchPushOptions.find(
-            (opt) => opt.value === this.currentCommand.features.mainPush
-          ) || this.searchPushOptions[0]
-        );
-      },
-      set(option) {
-        this.currentCommand.features.mainPush = option.value;
-      },
-    },
-  },
-  watch: {
-    outputTypesOptionsDy(val) {
-      if (!val.includes(this.currentCommand.output)) {
-        this.currentCommand.output = val[0];
-      }
-    },
-    commandTypesOptions(val) {
-      if (!val.map((x) => x.name).includes(this.cmdType.name)) {
-        this.cmdType = val[0];
-      }
-    },
-  },
-  methods: {
-    init() {
-      let currentQuickCommandCmds = this.getCommandType();
-      this.cmdType = this.commandTypes[currentQuickCommandCmds.type];
-      this.cmdMatch = currentQuickCommandCmds.match;
-      Object.assign(
-        this.currentCommand,
-        window.lodashM.cloneDeep(
-          window.lodashM.pick(
-            this.quickcommandInfo,
-            "tags",
-            "output",
-            "features"
-          )
-        )
-      );
-      this.setIcon(this.quickcommandInfo.program);
-      this.platformVerify();
-    },
-    setIcon(language) {
-      this.currentCommand.features.icon?.slice(0, 10) === "data:image" ||
-        (this.currentCommand.features.icon =
-          this.$root.programs[language].icon);
-    },
-    getCommandType() {
-      let data = { type: "key", match: [] };
-      let cmds = this.quickcommandInfo.features?.cmds;
-      if (!cmds) return data;
-      if (cmds.length === 1) {
-        let { type, match, fileType } = cmds[0];
-        data.type = type ? type : "key";
-        data.match =
-          data.type === "key" ? cmds : match?.app ? match.app : match;
-        this.isFileTypeDirectory = fileType === "directory";
-      } else {
-        data.type = cmds.filter((x) => !x.length).length
-          ? "professional"
-          : "key";
-        data.match = data.type === "key" ? cmds : JSON.stringify(cmds, null, 4);
-      }
-      return data;
-    },
-    handleCmdTypeChange(val) {
-      this.cmdMatch =
-        val.name === "professional"
-          ? JSON.stringify(val.jsonSample, null, 4)
-          : null;
-    },
-    tagVerify(val, done) {
-      if (
-        [
-          "默认",
-          "未分类",
-          "搜索结果",
-          // "来自分享"
-        ].includes(val)
-      ) {
-        return done(`_${val}_`);
-      }
-      done(val);
-    },
-    // 平台为空自动补充
-    platformVerify() {
-      this.currentCommand.features.platform?.length > 0 ||
-        (this.currentCommand.features.platform = [window.processPlatform]);
-    },
-    // 正则不和规则自动加斜杠
-    regexVerify() {
-      if (
-        this.cmdType.valueType === "regex" &&
-        !/^\/.*?\/[igm]*$/.test(this.cmdMatch)
-      )
-        this.cmdMatch = `/${this.cmdMatch}/`;
-    },
-    autoAddInputVal(e, ref) {
-      let inputValue = e.target.value;
-      if (!inputValue) return;
-      ref.add(inputValue, true);
-    },
-    insertSpecialVar(text) {
-      if (!text) return;
-      this.$parent.$refs.editor.repacleEditorSelection(`"${text}"`);
-    },
-    showMainPushHelp() {
-      window.showUb.help("#u0e9f1430");
-    },
-    // 保存各类数据
-    SaveMenuData() {
-      let updateData = {
-        features: this.currentCommand.features,
-        output: this.currentCommand.output,
-        tags: this.currentCommand.tags,
-        cmd: "",
-      };
-
-      // 说明为空填充一个空格
-      updateData.features.explain || (updateData.features.explain = " ");
-
-      if (!updateData.features.code) {
-        // 生成唯一code
-        let uid = Number(
-          Math.random().toString().substr(3, 3) + Date.now()
-        ).toString(36);
-        updateData.features.code = `${this.cmdType.name}_${uid}`;
-      }
-      let verify = this.cmdType.verify(this.cmdMatch);
-      if (verify !== true) {
-        return quickcommand.showMessageBox(verify, "error");
-      }
-
-      if (outputTypes[updateData.output].outPlugin) {
-        updateData.features.mainHide = true;
-      }
-      // 匹配文件时，额外添加文件类型
-      let rules = this.cmdMatch;
-      if (this.cmdType.name === "files") {
-        rules = {
-          fileType: this.isFileTypeDirectory ? "directory" : "file",
-          match: this.cmdMatch,
-        };
-      }
-      updateData.features.cmds = this.cmdType.matchToCmds(
-        rules,
-        updateData.features.explain
-      );
-
-      updateData.cmd = this.$parent.$refs.editor.getEditorValue();
-
-      let blackLisk = updateData.cmd.match(this.cmdType.disabledSpecialVars);
-      if (blackLisk) {
-        return quickcommand.showMessageBox(
-          `当前模式无法使用${[...new Set(blackLisk)].join("、")}`,
-          "error"
-        );
-      }
-
-      // 子输入框
-      if (updateData.cmd.includes("{{subinput")) {
-        updateData.hasSubInput = true;
-      } else {
-        updateData.hasSubInput = false;
-      }
-      return updateData;
-    },
-  },
-  emits: ["back"],
-};
-</script>
-<style scoped>
-/* 其他样式从app.css中继承 */
-.featureIco {
-  cursor: pointer;
-}
-
-.featureIco:hover {
-  transform: scale(1.02) translateY(-2px);
-}
-
-.featureIco:hover::after {
-  opacity: 0.8;
-  transform: scale(1.05);
-}
-
-.command-side-bar {
-  height: 100%;
-  background: #f4f4f4;
-  display: flex;
-  flex-direction: column;
-}
-
-.header-section {
-  height: 60px;
-  min-height: 60px;
-  background: inherit;
-  position: relative;
-}
-
-.header-content {
-  height: 100%;
-  display: flex;
-  align-items: center;
-}
-
-.back-btn {
-  position: absolute;
-  left: 20px;
-  top: 50%;
-  transform: translateY(-50%);
-  height: 48px;
-  width: 22px;
-  z-index: 1;
-}
-
-.logo-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-}
-
-.scroll-area {
-  flex: 1;
-  background: inherit;
-}
-
-.body--dark .command-side-bar {
-  background: #303133;
-}
-
-.commandLogo {
-  cursor: pointer;
-  transition: 0.2s;
-  filter: drop-shadow(2px 1px 1px grey);
-}
-
-.commandLogo:hover {
-  transition: 0.5s;
-  transform: translateY(-1px);
-  filter: drop-shadow(2px 1px 5px grey);
-}
-
-/* 输入框图标基础样式 */
-.command-side-bar-icon {
-  background: var(--q-primary);
-  border-radius: 8px;
-  padding: 4px;
-  color: #f4f4f4;
-  font-size: 14px;
-  /* 分开设置不同属性的过渡效果 */
-  transition: transform 0.3s cubic-bezier(0.34, 1.56, 0.64, 1),
-    box-shadow 0.3s cubic-bezier(0.4, 0, 0.2, 1),
-    opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  backface-visibility: hidden;
-  transform-style: preserve-3d;
-  will-change: transform;
-  -webkit-font-smoothing: subpixel-antialiased;
-  /* 添加初始transform状态 */
-  transform: translateZ(0);
-}
-
-/* 输入框容器悬浮效果 */
-.q-field:hover .command-side-bar-icon {
-  transform: scale(1.05) translateY(-1px) translateZ(0);
-  background: var(--q-primary);
-  opacity: 0.9;
-}
-
-/* 输入框得焦点时的图标效果 */
-.q-field--focused .command-side-bar-icon {
-  transform: scale(1.1) translateY(-1px) translateZ(0);
-  background: var(--q-primary);
-  opacity: 0.85;
-}
-
-.side-bar-popup-content .q-item .q-icon {
-  font-size: 20px;
-}
-
-.command-side-bar-content .q-field,
-.side-bar-popup-content .q-item__label {
-  font-size: 13px;
-}
-
-.side-bar-popup-content .q-item__label--caption,
-.command-side-bar-content :deep(.q-chip) {
-  font-size: 12px;
-}
-</style>
diff --git a/src/components/editor/EditorTools.vue b/src/components/editor/EditorTools.vue
index e28058ef..d65e97e8 100644
--- a/src/components/editor/EditorTools.vue
+++ b/src/components/editor/EditorTools.vue
@@ -6,20 +6,6 @@
       :commandCode="commandCode"
       @restore="$emit('restore', $event)"
     />
-
-    <!-- 全屏按钮 -->
-    <q-btn
-      round
-      dense
-      :icon="isFullscreen ? 'fullscreen_exit' : 'fullscreen'"
-      @click="$emit('toggle-fullscreen')"
-      class="fullscreen-btn"
-      :class="{ 'btn-fullscreen': isFullscreen }"
-    >
-      <q-tooltip>{{
-        isFullscreen ? "退出全屏 (F11)" : "全屏编辑 (F11)"
-      }}</q-tooltip>
-    </q-btn>
   </div>
 </template>
 
@@ -36,12 +22,8 @@ export default {
       type: String,
       default: "temp",
     },
-    isFullscreen: {
-      type: Boolean,
-      default: false,
-    },
   },
-  emits: ["restore", "toggle-fullscreen"],
+  emits: ["restore"],
   methods: {
     showHistory() {
       this.$refs.history.open();
@@ -58,46 +40,10 @@ export default {
   position: fixed;
   right: 24px;
   bottom: 24px;
-  z-index: 1000;
+  z-index: 500;
   display: flex;
   flex-direction: column;
   gap: 12px;
   transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
 }
-
-.fullscreen-btn {
-  z-index: 1000;
-  transform-origin: center;
-  color: #666;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-}
-
-.fullscreen-btn:hover {
-  transform: scale(1.1) translateY(-2px);
-}
-
-.fullscreen-btn:active {
-  transform: scale(0.95);
-  transition-duration: 0.1s;
-}
-
-.btn-fullscreen {
-  transform: rotate(180deg);
-}
-
-.btn-fullscreen:hover {
-  transform: rotate(180deg) scale(1.1);
-}
-
-.body--dark .fullscreen-btn {
-  background: rgba(255, 255, 255, 0.1);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-  color: #bbb;
-}
-
-.body--dark .fullscreen-btn:hover {
-  background: rgba(255, 255, 255, 0.15);
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-}
 </style>
diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
index d9f718f4..eab92d56 100644
--- a/src/components/editor/MatchRuleEditor.vue
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -45,34 +45,32 @@
               :class="{ 'buttons-visible': isHovering[type.value] }"
               @mouseleave="setHovering(type.value, false)"
             >
-              <q-btn-group outline>
-                <q-btn
-                  dense
-                  outline
-                  :color="type.color"
-                  icon="add"
-                  class="hover-btn"
-                  @click="addRuleByType(type.value)"
-                >
-                  <q-badge
-                    v-if="ruleTypeCounts[type.value]"
-                    floating
-                    :label="ruleTypeCounts[type.value]"
-                  />
-                </q-btn>
-                <q-btn
-                  dense
-                  outline
-                  :color="
-                    !ruleTypeCounts[type.value] || modelValue.length === 1
-                      ? 'grey'
-                      : type.color
-                  "
-                  icon="remove"
-                  class="hover-btn"
-                  @click="removeLastRuleByType(type.value)"
+              <q-btn
+                dense
+                outline
+                :color="type.color"
+                icon="add"
+                class="hover-btn"
+                @click="addRuleByType(type.value)"
+              >
+                <q-badge
+                  v-if="ruleTypeCounts[type.value]"
+                  floating
+                  :label="ruleTypeCounts[type.value]"
                 />
-              </q-btn-group>
+              </q-btn>
+              <q-btn
+                dense
+                outline
+                :color="
+                  !ruleTypeCounts[type.value] || modelValue.length === 1
+                    ? 'grey'
+                    : type.color
+                "
+                icon="remove"
+                class="hover-btn"
+                @click="removeLastRuleByType(type.value)"
+              />
             </div>
           </div>
         </div>
@@ -140,7 +138,7 @@
                   label="匹配文本正则表达式"
                   placeholder="例：/xxx/，任意匹配的正则会被 uTools 忽略"
                   class="col"
-                  @blur="validateRegex(rule)"
+                  @blur="validateRegex('match', rule)"
                 />
                 <q-input
                   v-model.number="rule.minLength"
@@ -173,7 +171,7 @@
                   label="匹配文件(夹)名正则表达式"
                   placeholder="可选，例：/xxx/"
                   class="col"
-                  @blur="validateRegex(rule)"
+                  @blur="validateRegex('match', rule)"
                 />
                 <q-select
                   :model-value="rule.fileType || 'file'"
@@ -232,7 +230,7 @@
                   label="匹配窗口标题正则表达式"
                   placeholder="可选，例：/xxx/"
                   class="col-5"
-                  @blur="validateRegex({ match: rule.match.title })"
+                  @blur="validateRegex('match.title', rule)"
                 />
               </div>
             </template>
@@ -256,7 +254,7 @@
                   label="排除的正则表达式字符串"
                   placeholder="可选，例：/xxx/"
                   class="col"
-                  @blur="validateRegex({ match: rule.exclude })"
+                  @blur="validateRegex('exclude', rule)"
                 />
                 <q-input
                   v-model.number="rule.minLength"
@@ -350,17 +348,21 @@ export default defineComponent({
   },
 
   methods: {
-    validateRegex(rule) {
-      const matchValue = rule.match;
+    validateRegex(keyPath, rule) {
+      const keys = keyPath.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((obj, key) => obj[key], rule);
+
+      const matchValue = target[lastKey];
       if (!matchValue) return;
 
       try {
         if (!matchValue.startsWith("/")) {
-          rule.match = `/${matchValue}/`;
+          target[lastKey] = `/${matchValue}/`;
         }
         new RegExp(matchValue.replace(/^\/|\/[gimuy]*$/g, ""));
       } catch (e) {
-        rule.match = "/./";
+        target[lastKey] = "/./";
       }
     },
 
@@ -450,7 +452,6 @@ export default defineComponent({
 .rule-type-buttons {
   display: flex;
   gap: 8px;
-  justify-content: space-between;
 }
 
 /* 合并按钮基础样式 */
@@ -490,7 +491,7 @@ export default defineComponent({
 .key-input-wrapper :deep(.q-icon) {
   font-size: 16px;
   opacity: 0.7;
-  transition: opacity 0.3s;
+  transition: opacity 0.2s;
 }
 
 .key-input-wrapper :deep(.q-icon:hover) {
@@ -518,8 +519,8 @@ export default defineComponent({
 .rule-type-btn-wrapper,
 .btn-container {
   position: relative;
-  width: 85px;
   height: 24px;
+  flex: 1;
 }
 
 .btn-container {
@@ -531,7 +532,7 @@ export default defineComponent({
 .rule-type-btn {
   width: 100%;
   position: absolute;
-  transition: opacity 0.3s ease;
+  transition: opacity 0.2s ease;
 }
 
 .btn-hidden {
@@ -544,9 +545,9 @@ export default defineComponent({
   position: absolute;
   inset: 0;
   display: flex;
+  gap: 4px;
   justify-content: center;
   opacity: 0;
-  transition: all 0.5s ease;
   pointer-events: none;
 }
 
diff --git a/src/components/editor/MonacoEditor.vue b/src/components/editor/MonacoEditor.vue
index 4dec0b69..75a88197 100644
--- a/src/components/editor/MonacoEditor.vue
+++ b/src/components/editor/MonacoEditor.vue
@@ -1,12 +1,17 @@
 <template>
   <div class="monaco-container">
     <div id="monacoEditor" class="monaco-editor-instance"></div>
-    <div class="absolute-center flex" v-show="!value && placeholder">
-      <div class="placeholder text-center q-gutter-md">
-        <div v-for="shortCut in shortCuts" :key="shortCut">
-          <span>{{ shortCut[0] }}</span
-          ><span class="shortcut-key">{{ shortCut[1] }}</span
-          ><span class="shortcut-key">{{ shortCut[2] }}</span>
+    <div class="placeholder-container" v-show="showPlaceholder">
+      {{ placeholder }}
+    </div>
+    <div class="shortcut-container" v-show="showPlaceholder">
+      <div class="shortcut text-center row q-gutter-md items-center">
+        <div
+          v-for="shortCut in shortCuts"
+          :key="shortCut"
+          class="row q-gutter-xs"
+        >
+          <q-badge v-for="item in shortCut" :key="item">{{ item }}</q-badge>
         </div>
       </div>
     </div>
@@ -31,7 +36,6 @@ let languageCompletions = importAll(
 let monacoCompletionProviders = {};
 
 let cmdCtrlKey = utools.isMacOs() ? "⌘" : "Ctrl";
-let optAltKey = utools.isMacOs() ? "⌥" : "Alt";
 
 export default {
   data() {
@@ -42,10 +46,14 @@ export default {
       shortCuts: [
         ["保存", cmdCtrlKey, "S"],
         ["运行", cmdCtrlKey, "B"],
-        ["换行", optAltKey, "Z"],
       ],
     };
   },
+  computed: {
+    showPlaceholder() {
+      return !this.value && !!this.placeholder;
+    },
+  },
   mounted() {
     this.initEditor();
     // 手动监听窗口大小变化，解决Monaco自动调整大小时导致ResizeObserver loop limit exceeded错误
@@ -53,7 +61,7 @@ export default {
     this.$emit("loaded");
   },
   props: {
-    placeholder: Boolean,
+    placeholder: String,
   },
   methods: {
     initEditor() {
@@ -256,14 +264,7 @@ export default {
       });
     },
     bindKeys() {
-      let that = this;
-      // ctrl + b 运行
-      this.rawEditor().addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyB,
-        () => {
-          that.$emit("keyStroke", "run");
-        }
-      );
+      const that = this;
       // alt + z 换行
       this.rawEditor().addCommand(
         monaco.KeyMod.Alt | monaco.KeyCode.KeyZ,
@@ -272,24 +273,6 @@ export default {
           that.rawEditor().updateOptions({ wordWrap: that.wordWrap });
         }
       );
-      // ctrl + s 保存
-      this.rawEditor().addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS,
-        () => {
-          that.$emit("keyStroke", "save");
-        }
-      );
-      // ctrl + e 快速 console.log
-      this.rawEditor().addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyE,
-        () => {
-          that.$emit("keyStroke", "log", that.getSelectionOrLineContent());
-        }
-      );
-      // F11 全屏
-      this.rawEditor().addCommand(monaco.KeyCode.F11, () => {
-        this.$emit("keyStroke", "fullscreen");
-      });
     },
     getSelectionOrLineContent() {
       let selection = this.rawEditor().getSelection();
@@ -318,11 +301,7 @@ export default {
 
 <style scoped>
 .monaco-container {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  position: relative;
 }
 
 .monaco-editor-instance {
@@ -330,22 +309,32 @@ export default {
   height: 100%;
 }
 
-.placeholder {
-  font-size: 14px;
-  font-family: sans-serif;
-  color: #535353;
-  user-select: none;
+.placeholder-container {
+  position: absolute;
+  top: 0;
+  left: 40px;
+  font-style: italic;
+  color: grey;
 }
 
-.shortcut-key {
-  background-color: #f3f4f6;
-  border-radius: 0.25rem;
-  margin-left: 0.5rem;
-  padding-left: 0.25rem;
-  padding-right: 0.25rem;
+.shortcut-container {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.shortcut .q-badge {
+  user-select: none;
+  background-color: rgba(0, 0, 0, 0.1);
+  color: rgba(0, 0, 0, 0.6);
 }
 
-.body--dark .shortcut-key {
-  background-color: #262626;
+.body--dark .shortcut .q-badge {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: rgba(255, 255, 255, 0.8);
 }
 </style>
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 2689ba69..002abddd 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -59,7 +59,7 @@ export const getValidCommand = (command) => {
 
   // 生成唯一code
   if (!command.features.code) {
-    command.features.code = getFeatureCode(cmds);
+    command.features.code = getFeatureCode(command.features.cmds);
   }
 
   return window.lodashM.cloneDeep(command);
diff --git a/src/js/options/programs.js b/src/js/options/programs.js
index 82904de2..e8c053d1 100644
--- a/src/js/options/programs.js
+++ b/src/js/options/programs.js
@@ -5,7 +5,6 @@
 const programs = {
   quickcommand: {
     name: "quickcommand",
-    highlight: "javascript",
     bin: "",
     argv: "",
     ext: "",
@@ -40,7 +39,6 @@ const programs = {
   },
   cmd: {
     name: "cmd",
-    highlight: "bat",
     bin: "",
     argv: "",
     ext: "bat",
diff --git a/src/js/options/specialVars.js b/src/js/options/specialVars.js
index 5c57675d..7360824e 100644
--- a/src/js/options/specialVars.js
+++ b/src/js/options/specialVars.js
@@ -3,153 +3,155 @@
  */
 
 let handlingJsonVar = (jsonVar, name, payload) => {
-    try {
-        return window.evalCodeInSandbox(jsonVar.slice(2, -2), {
-            [name]: payload
-        })
-    } catch (e) {
-        return utools.showNotification(e)
-    }
-}
+  try {
+    return window.evalCodeInSandbox(jsonVar.slice(2, -2), {
+      [name]: payload,
+    });
+  } catch (e) {
+    return utools.showNotification(e);
+  }
+};
 
-let handlingJsExpression = js => {
-    try {
-        return window.evalCodeInSandbox(js.slice(5, -2), {
-            utools: window.getuToolsLite(),
-        })
-    } catch (e) {
-        return utools.showNotification(e)
-    }
-}
+let handlingJsExpression = (js) => {
+  try {
+    return window.evalCodeInSandbox(js.slice(5, -2), {
+      utools: window.getuToolsLite(),
+    });
+  } catch (e) {
+    return utools.showNotification(e);
+  }
+};
 
 const specialVars = {
-    isWin: {
-        name: "isWin",
-        label: "{{isWin}}",
-        desc: "是否为 windows 系统，返回 0 或 1",
-        disabledType: [],
-        match: /{{isWin}}/mg,
-        repl: () => utools.isWindows() ? 1 : 0
+  isWin: {
+    name: "isWin",
+    label: "{{isWin}}",
+    desc: "是否为 windows 系统，返回 0 或 1",
+    match: /{{isWin}}/gm,
+    repl: () => (utools.isWindows() ? 1 : 0),
+  },
+  LocalId: {
+    name: "LocalId",
+    label: "{{LocalId}}",
+    desc: "本机唯一ID",
+    match: /{{LocalId}}/gm,
+    repl: () => utools.getNativeId(),
+  },
+  BrowserUrl: {
+    name: "BrowserUrl",
+    label: "{{BrowserUrl}}",
+    desc: "浏览器当前链接",
+    match: /{{BrowserUrl}}/gm,
+    repl: () => utools.getCurrentBrowserUrl(),
+  },
+  ClipText: {
+    name: "ClipText",
+    label: "{{ClipText}}",
+    desc: "剪贴板内容",
+    match: /{{ClipText}}/gm,
+    repl: () => window.clipboardReadText(),
+  },
+  subinput: {
+    name: "subinput",
+    label: "{{subinput:请输入}}",
+    desc: "子输入框的文本，冒号后为占位符",
+    match: /{{subinput(:.+?){0,1}}}/gm,
+  },
+  input: {
+    name: "input",
+    label: "{{input}}",
+    desc: "主输入框的文本",
+    match: /{{input}}/gm,
+    onlyCmdTypes: ["regex", "over"],
+    repl: (text, enterData) => enterData.payload,
+  },
+  pwd: {
+    name: "pwd",
+    label: "{{pwd}}",
+    desc: "文件管理器当前目录",
+    match: /{{pwd}}/gm,
+    repl: () => window.getCurrentFolderPathFix(),
+  },
+  WindowInfo: {
+    name: "WindowInfo",
+    label: "{{WindowInfo}}",
+    desc: "当前窗口信息，JSON格式，可以指定键值，如{{WindowInfo.id}}",
+    type: "json",
+    match: /{{WindowInfo(.*?)}}/gm,
+    onlyCmdTypes: ["window"],
+    repl: (jsonVar, enterData) =>
+      handlingJsonVar(jsonVar, "WindowInfo", enterData.payload),
+  },
+  MatchImage: {
+    name: "MatchImage",
+    label: "{{MatchImage}}",
+    desc: "匹配到图片的 DataUrl",
+    match: /{{MatchImage}}/gm,
+    onlyCmdTypes: ["img"],
+    repl: (text, enterData) => enterData.payload,
+  },
+  SelectFile: {
+    name: "SelectFile",
+    label: "{{SelectFile}}",
+    desc: "文件管理器选中的文件，不支持Linux",
+    match: /{{SelectFile}}/gm,
+    repl: (text, enterData) => window.getSelectFile(enterData.payload.id),
+  },
+  MatchedFiles: {
+    name: "MatchedFiles",
+    label: "{{MatchedFiles}}",
+    desc: "匹配的文件，JSON格式，可以指定键值，如{{MatchedFiles[0].path}}",
+    type: "json",
+    match: /{{MatchedFiles(.*?)}}/gm,
+    onlyCmdTypes: ["files"],
+    repl: (jsonVar, enterData) =>
+      handlingJsonVar(jsonVar, "MatchedFiles", enterData.payload),
+  },
+  type: {
+    name: "type",
+    label: "{{type}}",
+    desc: "onPluginEnter的type，匹配的类型",
+    match: /{{type}}/gm,
+    repl: (text, enterData) => enterData.type,
+  },
+  payload: {
+    name: "payload",
+    label: "{{payload}}",
+    desc: "onPluginEnter的payload,当为JSON时可以指定键值，如{{payload.id}}",
+    type: "json",
+    match: /{{payload(.*?)}}/gm,
+    repl: (jsonVar, enterData) =>
+      handlingJsonVar(jsonVar, "payload", enterData.payload),
+  },
+  js: {
+    name: "js",
+    label: "{{js:}}",
+    desc: "获取js表达式的值，如{{js:utools.isMacOs()}}",
+    tooltip: "注意，必须为表达式而非语句，类似Vue的文本插值",
+    type: "command",
+    match: /{{js:(.*?)}}/gm,
+    repl: (js) => handlingJsExpression(js),
+  },
+  python: {
+    name: "python",
+    label: "{{py:}}",
+    desc: "模拟python -c，并获取返回值，如{{py:print(1)}}",
+    tooltip: "只支持单行语句",
+    type: "command",
+    match: /{{py:(.*?)}}/gm,
+    repl: (py) => window.runPythonCommand(py.slice(5, -2)),
+  },
+  userData: {
+    name: "userData",
+    label: "{{usr:}}",
+    desc: "用户设置的变量，类似一个全局配置项",
+    match: /{{usr:(.*?)}}/gm,
+    repl: (text, userData) => {
+      let filterd = userData.filter((x) => x.id === text.slice(6, -2));
+      return filterd.length ? filterd[0].value : "";
     },
-    LocalId: {
-        name: "LocalId",
-        label: "{{LocalId}}",
-        desc: "本机唯一ID",
-        disabledType: [],
-        match: /{{LocalId}}/mg,
-        repl: () => utools.getNativeId()
-    },
-    BrowserUrl: {
-        name: "BrowserUrl",
-        label: "{{BrowserUrl}}",
-        disabledType: [],
-        desc: "浏览器当前链接",
-        match: /{{BrowserUrl}}/mg,
-        repl: () => utools.getCurrentBrowserUrl()
-    },
-    ClipText: {
-        name: "ClipText",
-        label: "{{ClipText}}",
-        disabledType: [],
-        desc: "剪贴板内容",
-        match: /{{ClipText}}/mg,
-        repl: () => window.clipboardReadText()
-    },
-    subinput: {
-        name: "subinput",
-        label: "{{subinput:请输入}}",
-        disabledType: [],
-        desc: "子输入框的文本，冒号后为占位符",
-        match: /{{subinput(:.+?){0,1}}}/mg,
-    },
-    input: {
-        name: "input",
-        label: "{{input}}",
-        desc: "主输入框的文本",
-        match: /{{input}}/mg,
-        repl: (text, enterData) => enterData.payload
-    },
-    pwd: {
-        name: "pwd",
-        label: "{{pwd}}",
-        desc: "文件管理器当前目录",
-        match: /{{pwd}}/mg,
-        repl: () => window.getCurrentFolderPathFix()
-    },
-    WindowInfo: {
-        name: "WindowInfo",
-        label: "{{WindowInfo}}",
-        desc: "当前窗口信息，JSON格式，可以指定键值，如{{WindowInfo.id}}",
-        type: "json",
-        match: /{{WindowInfo(.*?)}}/mg,
-        repl: (jsonVar, enterData) => handlingJsonVar(jsonVar, "WindowInfo", enterData.payload)
-    },
-    MatchImage: {
-        name: "MatchImage",
-        label: "{{MatchImage}}",
-        desc: "匹配到图片的 DataUrl",
-        match: /{{MatchImage}}/mg,
-        repl: (text, enterData) => enterData.payload
-    },
-    SelectFile: {
-        name: "SelectFile",
-        label: "{{SelectFile}}",
-        desc: "文件管理器选中的文件，不支持Linux",
-        match: /{{SelectFile}}/mg,
-        repl: (text, enterData) => window.getSelectFile(enterData.payload.id)
-    },
-    MatchedFiles: {
-        name: "MatchedFiles",
-        label: "{{MatchedFiles}}",
-        desc: "匹配的文件，JSON格式，可以指定键值，如{{MatchedFiles[0].path}}",
-        type: "json",
-        match: /{{MatchedFiles(.*?)}}/mg,
-        repl: (jsonVar, enterData) => handlingJsonVar(jsonVar, "MatchedFiles", enterData.payload)
-    },
-    type: {
-        name: "type",
-        label: "{{type}}",
-        desc: "onPluginEnter的type，匹配的类型",
-        match: /{{type}}/mg,
-        repl: (text, enterData) => enterData.type
-    },
-    payload: {
-        name: "payload",
-        label: "{{payload}}",
-        desc: "onPluginEnter的payload,当为JSON时可以指定键值，如{{payload.id}}",
-        type: "json",
-        match: /{{payload(.*?)}}/mg,
-        repl: (jsonVar, enterData) => handlingJsonVar(jsonVar, "payload", enterData.payload)
-    },
-    js: {
-        name: "js",
-        label: "{{js:}}",
-        desc: "获取js表达式的值，如{{js:utools.isMacOs()}}",
-        tooltip: "注意，必须为表达式而非语句，类似Vue的文本插值",
-        type: "command",
-        match: /{{js:(.*?)}}/mg,
-        repl: js => handlingJsExpression(js)
-    },
-    python: {
-        name: "python",
-        label: "{{py:}}",
-        desc: "模拟python -c，并获取返回值，如{{py:print(1)}}",
-        tooltip: "只支持单行语句",
-        type: "command",
-        match: /{{py:(.*?)}}/mg,
-        repl: py => window.runPythonCommand(py.slice(5, -2))
-    },
-    userData: {
-        name: "userData",
-        label: "{{usr:}}",
-        desc: "用户设置的变量，类似一个全局配置项",
-        match: /{{usr:(.*?)}}/mg,
-        repl: (text, userData) => {
-            let filterd = userData.filter(x => x.id === text.slice(6, -2))
-            return filterd.length ? filterd[0].value : ''
-        },
-        tooltip: "仅本机可用时，该变量值只在本机有效，否则，所有电脑有效",
-    }
-}
+    tooltip: "仅本机可用时，该变量值只在本机有效，否则，所有电脑有效",
+  },
+};
 
-export default specialVars
+export default specialVars;
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 7e21f560..0b00aa57 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -24,7 +24,7 @@
         <component
           :is="commandEditorAction.component"
           :action="http://github.com/commandEditorAction"
-          @editorEvent="editorEvent"
+          @editorEvent="handleEditorEvent"
         />
       </div>
     </transition>
@@ -40,7 +40,7 @@
 import { defineAsyncComponent } from "vue";
 import { useCommandManager } from "js/commandManager.js";
 import changeLog from "js/options/changeLog.js";
-import { utoolsFull, dbManager } from "js/utools.js";
+import { utoolsFull } from "js/utools.js";
 import CommandEditor from "components/CommandEditor";
 import ComposerEditor from "components/ComposerEditor";
 import FooterBar from "src/components/config/FooterBar.vue";
@@ -214,13 +214,14 @@ export default {
     },
     saveCommand(command) {
       const code = this.commandManager.saveCommand(command);
+      if (!code) return;
       this.locateToCommand(command.tags, code);
       quickcommand.showMessageBox("保存成功！");
     },
-    editorEvent(event) {
-      switch (event.type) {
+    handleEditorEvent(event, data) {
+      switch (event) {
         case "save":
-          this.saveCommand(event.data);
+          this.saveCommand(data);
           break;
         case "back":
           this.isEditorShow = false;
@@ -265,20 +266,12 @@ export default {
 }
 
 .editor-container {
-  color: var(--utools-bright-font-color);
+  color: var(--utools-font-color);
   overflow: hidden;
   position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
+  inset: 0;
   z-index: 5000;
-  background: var(--utools-bright-bg);
-}
-
-.body--dark .editor-container {
-  color: var(--utools-dark-font-color);
-  background: var(--utools-dark-bg);
+  background: var(--utools-bg-color);
 }
 
 /* 编辑器容器动画 */
diff --git a/src/pages/RunCodePage.vue b/src/pages/RunCodePage.vue
index af676e25..7c60d94d 100644
--- a/src/pages/RunCodePage.vue
+++ b/src/pages/RunCodePage.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <CommandEditor ref="commandEditor" :http://github.com/action="action"></CommandEditor>
-  </div>
+  <CommandEditor ref="commandEditor" :http://github.com/action="action" />
 </template>
 
 <script>
diff --git a/src/pages/ServerPage.vue b/src/pages/ServerPage.vue
index 93707931..78a0c6aa 100644
--- a/src/pages/ServerPage.vue
+++ b/src/pages/ServerPage.vue
@@ -1,26 +1,12 @@
 <template>
-  <div>
-    <MonacoEditor
-      :placeholder="false"
-      class="absolute-top"
-      ref="editor"
-      @typing="
-        (val) => {
-          if (cmd === val) return;
-          cmd = val;
-          saveCode();
-        }
-      "
-      :style="{
-        bottom: bottomHeight + 'px',
-      }"
+  <div class="server-page">
+    <CodeEditor
+      v-model="cmd"
+      @update:modelValue="saveCode"
+      language="quickcommand"
+      style="flex: 1"
     />
-    <div
-      class="absolute-bottom flex items-center justify-between q-px-md shadow-10"
-      :style="{
-        height: bottomHeight + 'px',
-      }"
-    >
+    <div class="flex items-center justify-between q-px-md shadow-10">
       <div class="q-gutter-xs flex items-center full-height content-center">
         <q-badge color="primary" dense square>POST</q-badge
         ><q-badge color="primary" dense square>GET</q-badge>
@@ -73,22 +59,16 @@
 </template>
 
 <script>
-import MonacoEditor from "components/editor/MonacoEditor";
+import CodeEditor from "components/editor/CodeEditor.vue";
 import { dbManager } from "js/utools.js";
+import { ref } from "vue";
 
 export default {
-  components: { MonacoEditor },
-  data() {
-    return {
-      bottomHeight: 40,
-      saveCodeTimer: null,
-      cmd: null,
-    };
-  },
-  mounted() {
-    this.cmd = dbManager.getStorage("cfg_serverCode") || "";
-    this.$refs.editor.setEditorValue(this.cmd);
-    this.$refs.editor.setEditorLanguage("javascript");
+  components: { CodeEditor },
+  setup() {
+    const cmd = ref(dbManager.getStorage("cfg_serverCode") || "");
+    const saveCodeTimer = ref(null);
+    return { cmd, saveCodeTimer };
   },
   methods: {
     enableServer() {
@@ -136,3 +116,12 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.server-page {
+  display: flex;
+  flex-direction: column;
+  position: fixed;
+  inset: 0;
+}
+</style>

From 4262182f63d6bcd740fdcfede361a86a69797408 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 12:06:34 +0800
Subject: [PATCH 178/332] =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandCard.vue                | 20 ------
 src/components/card/CommandCardContent.vue    |  8 ++-
 src/components/composer/CommandComposer.vue   |  6 +-
 src/components/composer/ComposerCard.vue      | 17 +----
 src/components/composer/ComposerList.vue      | 15 +---
 src/components/composer/flow/DropArea.vue     |  9 +--
 src/components/popup/EditorHistory.vue        | 13 +---
 .../quickcommandUI/QuickCommand.vue           |  6 +-
 src/css/app.css                               | 72 +++++++++++++++----
 src/css/composer.css                          |  6 --
 10 files changed, 71 insertions(+), 101 deletions(-)

diff --git a/src/components/CommandCard.vue b/src/components/CommandCard.vue
index 0e4d6aac..07c6131e 100644
--- a/src/components/CommandCard.vue
+++ b/src/components/CommandCard.vue
@@ -92,26 +92,6 @@ export default {
 </script>
 
 <style scoped>
-.q-card.command {
-  cursor: pointer;
-  user-select: none;
-  transition: all 0.3s ease;
-  background: rgba(255, 255, 255, 0.3) !important;
-  backdrop-filter: blur(calc(var(--glass-effect-strength) * 1px)) !important;
-  -webkit-backdrop-filter: blur(
-    calc(var(--glass-effect-strength) * 1px)
-  ) !important;
-  border: 1px solid rgba(255, 255, 255, 0.1);
-  box-shadow: 0 4px 16px 0 rgba(31, 38, 135, 0.07);
-}
-
-.body--dark .q-card.command {
-  background: rgba(57, 57, 57, 0.09) !important;
-  border: 1px solid rgb(59 58 58 / 5%);
-  box-shadow: 0 1px 5px rgb(0 0 0 / 20%), 0 2px 2px rgb(0 0 0 / 14%),
-    0 3px 1px -2px rgb(69 67 67 / 12%);
-}
-
 .card-wrapper {
   transition: all 0.35s cubic-bezier(0.4, 0, 0.2, 1);
   will-change: transform, width;
diff --git a/src/components/card/CommandCardContent.vue b/src/components/card/CommandCardContent.vue
index 846c5e57..52e51e96 100644
--- a/src/components/card/CommandCardContent.vue
+++ b/src/components/card/CommandCardContent.vue
@@ -61,7 +61,6 @@ export default {
 </script>
 
 <style scoped>
-/* 保留卡片基础样式 */
 .q-card.command {
   cursor: pointer;
   user-select: none;
@@ -74,4 +73,11 @@ export default {
   border: 1px solid rgba(255, 255, 255, 0.1);
   box-shadow: 0 4px 16px 0 rgba(31, 38, 135, 0.07);
 }
+
+.body--dark .q-card.command {
+  background: rgba(57, 57, 57, 0.09) !important;
+  border: 1px solid rgb(59 58 58 / 5%);
+  box-shadow: 0 1px 5px rgb(0 0 0 / 20%), 0 2px 2px rgb(0 0 0 / 14%),
+    0 3px 1px -2px rgb(69 67 67 / 12%);
+}
 </style>
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 779776a2..148c36b7 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -76,11 +76,7 @@ export default defineComponent({
   display: flex;
   flex-direction: column;
   height: 100%;
-  background-color: #f4f4f4;
-}
-
-.body--dark .command-composer {
-  background-color: #303132;
+  background-color: var(--utools-bg-color);
 }
 
 .composer-body {
diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index e25209fe..a0a00c5b 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -315,14 +315,6 @@ export default defineComponent({
   position: relative;
 }
 
-.composer-card .q-card {
-  background-color: rgba(0, 0, 0, 0.02);
-}
-
-.body--dark .composer-card .q-card {
-  background-color: rgba(255, 255, 255, 0.05);
-}
-
 /* 控制流程组件样式 */
 .control-component {
   flex: 1;
@@ -340,6 +332,7 @@ export default defineComponent({
 
 .command-item {
   transition: all 0.3s ease;
+  background-color: var(--transparent-bg-color);
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
   border: 1px solid rgba(0, 0, 0, 0.05);
   border-radius: inherit;
@@ -353,14 +346,6 @@ export default defineComponent({
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 
-.body--dark .composer-card.drag-handle:hover::before {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-.body--dark .composer-card.drag-handle:active::before {
-  background: rgba(255, 255, 255, 0.15);
-}
-
 /* 收起状态样式 */
 .composer-card.collapsed {
   transform-origin: top;
diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index c2260ce6..72864492 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -294,7 +294,7 @@ export default defineComponent({
   margin: 4px 8px;
   padding: 0 8px;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  background: rgba(0, 0, 0, 0.02);
+  background: var(--transparent-bg-color);
   cursor: grab;
   font-size: 12px;
   min-height: 40px;
@@ -315,8 +315,7 @@ export default defineComponent({
 }
 
 .command-item.q-item-type:hover {
-  background-color: rgba(0, 0, 0, 0.1);
-  transform: translateX(4px);
+  transform: translateX(3px);
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
@@ -325,16 +324,6 @@ export default defineComponent({
   transform: scale(0.95);
 }
 
-/* 暗色模式适配 */
-.body--dark .command-item.q-item-type {
-  border-color: rgba(255, 255, 255, 0.05);
-  background: rgba(255, 255, 255, 0.05);
-}
-
-.body--dark .command-item.q-item-type:hover {
-  background-color: rgba(255, 255, 255, 0.1);
-}
-
 .body--dark .section-header {
   border-bottom-color: rgba(255, 255, 255, 0.05);
 }
diff --git a/src/components/composer/flow/DropArea.vue b/src/components/composer/flow/DropArea.vue
index ec1eca93..656c8ede 100644
--- a/src/components/composer/flow/DropArea.vue
+++ b/src/components/composer/flow/DropArea.vue
@@ -64,14 +64,7 @@ export default defineComponent({
 
 .drop-area:hover,
 .drop-area-dragging {
-  border-color: #bdbdbd;
-  background-color: #f9f9f9;
-}
-
-.body--dark .drop-area:hover,
-.body--dark .drop-area-dragging {
-  border: 2px dashed #676666;
-  background-color: #303132;
+  background-color: var(--utools-bg-color);
 }
 
 .drop-area-dragging {
diff --git a/src/components/popup/EditorHistory.vue b/src/components/popup/EditorHistory.vue
index 0cc746c5..77ca1118 100644
--- a/src/components/popup/EditorHistory.vue
+++ b/src/components/popup/EditorHistory.vue
@@ -339,6 +339,7 @@ export default {
   height: 100vh;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
   border-radius: 10px;
+  background-color: var(--utools-bg-color);
 }
 
 .history-layout {
@@ -361,7 +362,6 @@ export default {
 .header-section {
   padding: 16px 16px 8px;
   position: relative;
-  background: #f4f4f4;
 }
 
 .preview-container {
@@ -371,7 +371,6 @@ export default {
   align-items: stretch;
   justify-content: stretch;
   overflow: hidden;
-  background: #f4f4f4;
   transition: all 0.3s ease;
   position: relative;
 }
@@ -386,7 +385,6 @@ export default {
 .history-list {
   flex: 1;
   padding: 0;
-  background: #f4f4f4;
   overflow-y: auto;
   overflow-x: hidden;
   height: calc(100vh - 64px); /* Subtract header height */
@@ -499,15 +497,6 @@ export default {
   opacity: 0.3;
 }
 
-/* 暗色模式适配 */
-.body--dark .history-card,
-.body--dark .history-list-container,
-.body--dark .header-section,
-.body--dark .history-list,
-.body--dark .preview-container {
-  background: #303133;
-}
-
 .history-btn {
   color: #666;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index c7fd0566..18f50211 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -371,10 +371,6 @@ export default {
 
 <style>
 .quickcommand-ui.q-card {
-  background-color: var(--utools-bright-bg);
-}
-
-.body--dark .quickcommand-ui.q-card {
-  background-color: var(--utools-dark-bg);
+  background-color: var(--utools-bg-color);
 }
 </style>
diff --git a/src/css/app.css b/src/css/app.css
index 696f9820..510b2355 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -1,20 +1,25 @@
 /* app global css */
 :root {
-  --utools-bright-bg: #f4f4f4;
-  --utools-bright-font-color: #333;
-  --utools-dark-bg: #303133;
-  --utools-dark-font-color: #fff;
+  --utools-bg-color: #f4f4f4;
+  --utools-font-color: #333;
+  --transparent-bg-color: rgba(0, 0, 0, 0.02);
   --q-dark: #464646;
-  --q-dark-page: var(--utools-dark-bg);
+  --q-dark-page: #303133;
+}
+
+:root:has(.body--dark) {
+  --utools-bg-color: #303133;
+  --utools-font-color: #fff;
+  --transparent-bg-color: rgba(255, 255, 255, 0.05);
 }
 
 .q-card--dark {
-  background: var(--utools-dark-bg);
+  background: var(--q-dark-page);
 }
 
 body {
-  background: var(--utools-bright-bg);
-  color: var(--utools-bright-font-color);
+  background: var(--utools-bg-color);
+  color: var(--utools-font-color);
 }
 
 /* Monaco Editor 调整行号栏样式 */
@@ -32,7 +37,7 @@ body {
 /* Monaco Editor 当前行高亮样式 */
 .monaco-editor .current-line {
   border: none !important;
-  background-color: rgba(0, 0, 0, 0.03);
+  background-color: transparent !important;
 }
 
 .monaco-editor .line-numbers {
@@ -47,10 +52,6 @@ body {
   color: var(--q-primary) !important;
 }
 
-.body--dark .monaco-editor .current-line {
-  background-color: rgba(255, 255, 255, 0.05);
-}
-
 .monaco-editor .margin-view-overlays .current-line {
   background-color: transparent !important;
 }
@@ -188,14 +189,14 @@ body.body--dark.glass-effect-menu .q-card.command {
 }
 
 /* 标签栏毛玻璃效果 */
-body.glass-effect-menu .q-tabs {
+body.glass-effect-menu .tag-bar .q-tabs {
   background: rgba(255, 255, 255, calc(0.15 + var(--glass-effect-strength) * 0.01)) !important;
   backdrop-filter: blur(calc(var(--glass-effect-strength) * 1px)) !important;
   -webkit-backdrop-filter: blur(calc(var(--glass-effect-strength) * 1px)) !important;
   border-right: 1px solid rgba(255, 255, 255, 0.1);
 }
 
-body.body--dark.glass-effect-menu .q-tabs {
+body.body--dark.glass-effect-menu .tag-bar .q-tabs {
   background: rgba(0, 0, 0, calc(0.2 + var(--glass-effect-strength) * 0.02)) !important;
   border-right: 1px solid rgba(255, 255, 255, 0.05);
 }
@@ -305,3 +306,44 @@ body.body--dark.glass-effect-menu .q-menu {
   justify-content: flex-end;
   font-size: 12px;
 }
+
+/* 左右抖动 */
+@keyframes leftRight {
+  0% {
+    transform: translateX(-2px);
+    opacity: 0.7;
+  }
+
+  50% {
+    transform: translateX(2px);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translateX(-2px);
+    opacity: 0.7;
+  }
+}
+
+/* 上下抖动 */
+@keyframes upDown {
+  0% {
+    transform: translateY(-1px);
+    opacity: 1;
+  }
+
+  50% {
+    transform: translateY(1px);
+    opacity: 0.6;
+  }
+
+  75% {
+    transform: translateY(0.5px);
+    opacity: 0.8;
+  }
+
+  100% {
+    transform: translateY(-1px);
+    opacity: 1;
+  }
+}
diff --git a/src/css/composer.css b/src/css/composer.css
index 997e72fe..cc133eb1 100644
--- a/src/css/composer.css
+++ b/src/css/composer.css
@@ -89,12 +89,6 @@
   margin: 4px 0px;
 }
 
-/* 暗黑模式下的标签栏背景颜色 */
-.body--dark .command-composer .q-tab,
-.body--dark .command-composer .q-tab-panel {
-  background-color: #303133;
-}
-
 .body--dark .command-composer .q-tab--inactive {
   opacity: 2;
 }

From 0dc695277eb01281efcd87b66f9f5340e53a5db2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 12:28:27 +0800
Subject: [PATCH 179/332] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E6=9B=BF=E6=8D=A2Mon?=
 =?UTF-8?q?ocoEditor=E7=BB=84=E4=BB=B6=E4=B8=BACodeEditor=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue       |   4 +-
 src/components/editor/CodeEditor.vue   |   5 +
 src/components/editor/MonacoEditor.vue | 340 -------------------------
 3 files changed, 7 insertions(+), 342 deletions(-)
 delete mode 100644 src/components/editor/MonacoEditor.vue

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 6f862719..c518337f 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -81,7 +81,7 @@ const CodeEditor = defineAsyncComponent({
   timeout: 3000,
 });
 
-// TODO: 对称加密声明，保存命令不需要设置
+// TODO: 对称加密声明，运行命令不需要设置，commandTypes调整
 export default {
   components: {
     CodeEditor,
@@ -179,9 +179,9 @@ export default {
           break;
         case "apply":
           // actionData 命令的cmd
-          console.log(actionData);
           this.showComposer = false;
           this.quickcommandInfo.cmd = actionData;
+          this.$refs.editor.formatDocument();
           break;
         case "close":
           this.showComposer = false;
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 7316991b..06a94b8d 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -372,6 +372,7 @@ export default defineComponent({
         editor.updateOptions({ wordWrap: revWordWrap });
       });
     },
+    // 替换选中的文本，供外部调用
     repacleEditorSelection(text) {
       var selection = editor.getSelection();
       var range = new monaco.Range(
@@ -389,6 +390,10 @@ export default defineComponent({
       };
       editor.executeEdits("my-source", [op]);
     },
+    // 格式化文档，供外部调用
+    formatDocument() {
+      editor.getAction("editor.action.formatDocument").run();
+    },
   },
   computed: {
     showPlaceholder() {
diff --git a/src/components/editor/MonacoEditor.vue b/src/components/editor/MonacoEditor.vue
deleted file mode 100644
index 75a88197..00000000
--- a/src/components/editor/MonacoEditor.vue
+++ /dev/null
@@ -1,340 +0,0 @@
-<template>
-  <div class="monaco-container">
-    <div id="monacoEditor" class="monaco-editor-instance"></div>
-    <div class="placeholder-container" v-show="showPlaceholder">
-      {{ placeholder }}
-    </div>
-    <div class="shortcut-container" v-show="showPlaceholder">
-      <div class="shortcut text-center row q-gutter-md items-center">
-        <div
-          v-for="shortCut in shortCuts"
-          :key="shortCut"
-          class="row q-gutter-xs"
-        >
-          <q-badge v-for="item in shortCut" :key="item">{{ item }}</q-badge>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import * as monaco from "monaco-editor";
-import { toRaw } from "vue";
-import importAll from "js/common/importAll.js";
-
-// 批量导入声明文件
-let apis = importAll(
-  require.context("!raw-loader!plugins/monaco/types/", false, /\.ts$/)
-);
-
-// 批量导入关键字补全
-let languageCompletions = importAll(
-  require.context("plugins/monaco/completions/", false, /\.js$/)
-);
-
-let monacoCompletionProviders = {};
-
-let cmdCtrlKey = utools.isMacOs() ? "⌘" : "Ctrl";
-
-export default {
-  data() {
-    return {
-      editor: null,
-      value: null,
-      wordWrap: "off",
-      shortCuts: [
-        ["保存", cmdCtrlKey, "S"],
-        ["运行", cmdCtrlKey, "B"],
-      ],
-    };
-  },
-  computed: {
-    showPlaceholder() {
-      return !this.value && !!this.placeholder;
-    },
-  },
-  mounted() {
-    this.initEditor();
-    // 手动监听窗口大小变化，解决Monaco自动调整大小时导致ResizeObserver loop limit exceeded错误
-    window.addEventListener("resize", this.resizeEditor);
-    this.$emit("loaded");
-  },
-  props: {
-    placeholder: String,
-  },
-  methods: {
-    initEditor() {
-      let monacoEditorPreferences = {
-        value: "",
-        // 自动布局
-        automaticLayout: true,
-        // 折叠策略
-        foldingStrategy: "indentation",
-        // 自动关闭括号
-        autoClosingBrackets: true,
-        // 制表符大小
-        tabSize: 2,
-        minimap: {
-          enabled: false,
-        },
-        // 自动格式化
-        formatOnType: true,
-        formatOnPaste: true,
-        // 自动缩进
-        autoIndent: "full",
-        // 行号
-        lineNumbersMinChars: 3,
-        renderLineNumbers: "on",
-        // 行装饰宽度
-        lineDecorationsWidth: 0,
-        // 圆角
-        roundedSelection: false,
-        // 行高亮
-        renderLineHighlight: "all",
-        // 仅在聚焦时高亮行
-        renderLineHighlightOnlyWhenFocus: true,
-        // 隐藏光标
-        hideCursorInOverviewRuler: true,
-        // 隐藏概览边框
-        overviewRulerBorder: false,
-        // 隐藏概览线
-        overviewRulerLanes: 0,
-        // JavaScript 特定的格式化选项
-        "javascript.format.insertSpaceAfterSemicolonInForStatements": true,
-        "javascript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
-        "javascript.format.insertSpaceAfterConstructor": true,
-        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": true,
-        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": true,
-        "javascript.format.insertSpaceAfterKeywordsInControlFlowStatements": true,
-      };
-      this.editor = monaco.editor.create(
-        document.getElementById("monacoEditor"),
-        monacoEditorPreferences
-      );
-      this.loadTypes();
-      this.registerLanguage();
-      this.setEditorTheme();
-      this.listenEditorValue();
-      this.bindKeys();
-    },
-    resizeEditor() {
-      if (this.resizeTimeout) {
-        clearTimeout(this.resizeTimeout);
-      }
-      this.resizeTimeout = setTimeout(() => {
-        this.rawEditor().layout();
-      }, 50);
-    },
-    loadTypes() {
-      monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
-        noSemanticValidation: true,
-        noSyntaxValidation: false,
-      });
-      monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-        target: monaco.languages.typescript.ScriptTarget.ES6,
-        allowNonTsExtensions: true,
-        allowJs: true,
-        lib: [],
-      });
-      // 引入声明文件
-      monaco.languages.typescript.javascriptDefaults.addExtraLib(
-        Object.values(apis)
-          .map((x) => x.default)
-          .join("\n"),
-        "api.d.ts"
-      );
-    },
-    registerLanguage() {
-      let that = this;
-      const identifierPattern = "([a-zA-Z_]\\w*)";
-      let getTokens = (code) => {
-        let identifier = new RegExp(identifierPattern, "g");
-        let tokens = [];
-        let array1;
-        while ((array1 = identifier.exec(code)) !== null) {
-          tokens.push(array1[0]);
-        }
-        return Array.from(new Set(tokens));
-      };
-      let createDependencyProposals = (range, keyWords, editor, curWord) => {
-        let keys = [];
-        // fix getValue of undefined
-        let tokens = getTokens(toRaw(editor).getModel()?.getValue());
-        // 自定义变量、字符串
-        for (const item of tokens) {
-          if (item != curWord.word) {
-            keys.push({
-              label: item,
-              kind: monaco.languages.CompletionItemKind.Text,
-              documentation: "",
-              insertText: item,
-              range: range,
-            });
-          }
-        }
-        // 关键字、函数
-        Object.keys(keyWords).forEach((ItemKind) => {
-          keyWords[ItemKind].forEach((item) => {
-            keys.push({
-              label: item,
-              kind: monaco.languages.CompletionItemKind[ItemKind],
-              documentation: "",
-              insertText: item,
-              range: range,
-            });
-          });
-        });
-        return keys;
-      };
-      // 注册 applescript
-      monaco.languages.register({
-        id: "applescript",
-      });
-      // 注册自动补全
-      Object.keys(languageCompletions).forEach((language) => {
-        // 防止自动补全被多次注册
-        if (monacoCompletionProviders[language]) return;
-        monaco.languages.registerCompletionItemProvider(language, {
-          provideCompletionItems: function (model, position) {
-            var word = model.getWordUntilPosition(position);
-            var range = {
-              startLineNumber: position.lineNumber,
-              endLineNumber: position.lineNumber,
-              startColumn: word.startColumn,
-              endColumn: word.endColumn,
-            };
-            return {
-              suggestions: createDependencyProposals(
-                range,
-                languageCompletions[language].default,
-                toRaw(that.editor),
-                word
-              ),
-            };
-          },
-        });
-        monacoCompletionProviders[language] = true;
-      });
-    },
-    setEditorTheme() {
-      monaco.editor.setTheme(this.$q.dark.isActive ? "vs-dark" : "vs");
-    },
-    getEditorValue() {
-      return this.rawEditor().getValue();
-    },
-    setEditorValue(value) {
-      this.rawEditor().setValue(value);
-    },
-    setEditorLanguage(language) {
-      monaco.editor.setModelLanguage(this.rawEditor().getModel(), language);
-    },
-    getCursorPosition() {
-      return this.rawEditor().getPosition();
-    },
-    setCursorPosition(pos) {
-      if (!pos) return;
-      this.rawEditor().setPosition(pos);
-    },
-    repacleEditorSelection(text) {
-      var selection = this.rawEditor().getSelection();
-      var range = new monaco.Range(
-        selection.startLineNumber,
-        selection.startColumn,
-        selection.endLineNumber,
-        selection.endColumn
-      );
-      var id = { major: 1, minor: 1 };
-      var op = {
-        identifier: id,
-        range: range,
-        text: text,
-        forceMoveMarkers: true,
-      };
-      this.rawEditor().executeEdits("my-source", [op]);
-    },
-    formatDocument() {
-      this.rawEditor().getAction("editor.action.formatDocument").run();
-    },
-    listenEditorValue() {
-      this.rawEditor().focus();
-      this.rawEditor().onDidChangeModelContent(() => {
-        this.value = this.getEditorValue();
-        this.$emit("typing", this.value);
-      });
-    },
-    bindKeys() {
-      const that = this;
-      // alt + z 换行
-      this.rawEditor().addCommand(
-        monaco.KeyMod.Alt | monaco.KeyCode.KeyZ,
-        () => {
-          that.wordWrap = that.wordWrap === "off" ? "on" : "off";
-          that.rawEditor().updateOptions({ wordWrap: that.wordWrap });
-        }
-      );
-    },
-    getSelectionOrLineContent() {
-      let selection = this.rawEditor().getSelection();
-      let range = new monaco.Range(
-        selection.startLineNumber,
-        selection.startColumn,
-        selection.endLineNumber,
-        selection.endColumn
-      );
-      let model = this.rawEditor().getModel();
-      return (
-        model.getValueInRange(range) ||
-        model.getLineContent(selection.startLineNumber)
-      );
-    },
-    rawEditor() {
-      return toRaw(this.editor);
-    },
-  },
-  beforeUnmount() {
-    window.removeEventListener("resize", this.resizeEditor);
-    this.rawEditor().dispose();
-  },
-};
-</script>
-
-<style scoped>
-.monaco-container {
-  position: relative;
-}
-
-.monaco-editor-instance {
-  width: 100%;
-  height: 100%;
-}
-
-.placeholder-container {
-  position: absolute;
-  top: 0;
-  left: 40px;
-  font-style: italic;
-  color: grey;
-}
-
-.shortcut-container {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.shortcut .q-badge {
-  user-select: none;
-  background-color: rgba(0, 0, 0, 0.1);
-  color: rgba(0, 0, 0, 0.6);
-}
-
-.body--dark .shortcut .q-badge {
-  background-color: rgba(255, 255, 255, 0.1);
-  color: rgba(255, 255, 255, 0.8);
-}
-</style>

From 61c75a899b38b06a5400652134fb2ba97795dfb4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 12:58:43 +0800
Subject: [PATCH 180/332] =?UTF-8?q?=E5=8E=BB=E9=99=A4CommandTypes=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=B1=9E=E6=80=A7=EF=BC=8C=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue          |   2 +-
 src/components/CommandRunResult.vue       |  24 ++--
 src/components/editor/MatchRuleEditor.vue |   1 -
 src/js/commandManager.js                  |   2 +-
 src/js/options/commandTypes.js            | 137 +---------------------
 5 files changed, 17 insertions(+), 149 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index c518337f..d4b4e81c 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -81,7 +81,7 @@ const CodeEditor = defineAsyncComponent({
   timeout: 3000,
 });
 
-// TODO: 对称加密声明，运行命令不需要设置，commandTypes调整
+// TODO: 对称加密声明
 export default {
   components: {
     CodeEditor,
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 23ed9a59..f6ff1fbe 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -76,7 +76,6 @@ import commandTypes from "js/options/commandTypes.js";
 import ResultArea from "components/ResultArea.vue";
 import ResultMenu from "components/popup/ResultMenu.vue";
 import { generateFlowsCode } from "js/composer/generateCode";
-import { getValidCommand } from "js/commandManager";
 import { dbManager } from "js/utools.js";
 import programs from "js/options/programs.js";
 
@@ -132,16 +131,13 @@ export default {
     // 运行命令
     async runCurrentCommand(currentCommand) {
       let command = window.lodashM.cloneDeep(currentCommand);
+      if (!command.output) command.output = "text";
       // 如果是composer命令，则动态生成cmd
       if (command.program === "quickcomposer") {
         command.cmd = generateFlowsCode(command.flows);
       }
       this.$root.isRunningCommand = true;
-      try {
-        await this.getTempPayload(command);
-      } catch (error) {
-        return quickcommand.showMessageBox(error.toString(), "error");
-      }
+      this.needTempPayload && (await this.getTempPayload(command));
       // 如果命令包含子输入框，则设置子输入框
       if (command.cmd.includes("{{subinput")) return this.setSubInput(command);
       this.fire(command);
@@ -291,16 +287,18 @@ export default {
     },
     // payload 临时赋值
     async getTempPayload(currentCommand) {
-      if (!this.needTempPayload) return;
-      currentCommand = getValidCommand(currentCommand);
-      const firstCmd = currentCommand.features.cmds[0];
+      const firstCmd = currentCommand.features?.cmds?.[0];
+      if (!firstCmd) return;
       const type = firstCmd.type || "text";
+      const getPayload = async () => {
+        if (type === "text") return firstCmd;
+        const cmdType = commandTypes[type];
+        if (!cmdType.tempPayload) return {};
+        return await cmdType.tempPayload();
+      };
       this.$root.enterData = {
         type,
-        payload:
-          type === "text"
-            ? firstCmd
-            : (await commandTypes[type]?.tempPayload?.()) || {},
+        payload: await getPayload(),
       };
     },
     handleResult(stdout, stderr, options) {
diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
index eab92d56..c1a50756 100644
--- a/src/components/editor/MatchRuleEditor.vue
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -305,7 +305,6 @@ export default defineComponent({
   data() {
     return {
       ruleTypeOptions: Object.values(commandTypes)
-        .filter((type) => type.name !== "professional")
         .map((type) => ({
           label: type.label,
           value: type.name,
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 002abddd..e086f60c 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -44,7 +44,7 @@ const getLabeledCmds = (cmds, explain) => {
   });
 };
 
-export const getValidCommand = (command) => {
+const getValidCommand = (command) => {
   const { cmds, explain } = command.features;
   if (!explain) throw "名称不能为空";
   if (!Array.isArray(cmds)) throw "匹配规则格式错误";
diff --git a/src/js/options/commandTypes.js b/src/js/options/commandTypes.js
index ae8c8d16..ed99d676 100644
--- a/src/js/options/commandTypes.js
+++ b/src/js/options/commandTypes.js
@@ -1,145 +1,49 @@
 /**
  * 所有的匹配类型
  */
-
-const jsonSample = [
-  "关键词1",
-  "关键词2",
-  {
-    type: "img",
-    label: "图片匹配",
-  },
-  {
-    type: "files",
-    label: "文件匹配",
-    fileType: "file",
-    match: "/aaa/",
-    minLength: 1,
-    maxLength: 99,
-  },
-  {
-    type: "regex",
-    label: "文本正则匹配",
-    match: "/bbb/i",
-    minLength: 1,
-    maxLength: 99,
-  },
-  {
-    type: "over",
-    label: "无匹配时",
-    exclude: "/ccc/i",
-    minLength: 1,
-    maxLength: 99,
-  },
-  {
-    type: "window",
-    label: "窗口动作",
-    match: {
-      app: ["ddd.app", "eee.exe"],
-      title: "/fff/",
-      class: ["ggg"],
-    },
-  },
-];
-
 export default {
   key: {
     name: "key",
     label: "关键词",
     icon: "font_download",
     color: "blue",
-    matchLabel: "关键词",
     desc: "直接在主输入框输入对应关键字，最通用的一种模式，关键字可以设置多个",
-    valueType: "array",
-    disabledSpecialVars:
-      /{{input}}|{{SelectFile}}|{{pwd}}|{{WindowInfo.*?}}|{{MatchedFiles.*?}}/g,
-    matchToCmds: (rules, desc) => rules,
-    verify: (rules) => !window.lodashM.isEmpty(rules) || "关键词不能为空",
   },
   regex: {
     name: "regex",
     label: "正则",
     icon: "rule",
     color: "cyan",
-    matchLabel: "正则",
     desc: "匹配主输入框或超级面板选中的文本，可以获取输入框文本或选中文本作为变量",
-    valueType: "regex",
-    disabledSpecialVars:
-      /{{SelectFile}}|{{MatchImage}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g,
-    matchToCmds: (rules, desc) => [
-      {
-        label: desc,
-        type: "regex",
-        match: rules,
-        minNum: 1,
-      },
-    ],
-    verify: (rules) => !!rules > 0 || "正则不能为空",
     tempPayload: async () => {
-      let values = await quickcommand.showInputBox(["需要处理的文本"]);
-      return values[0];
+      let [payload] = await quickcommand.showInputBox(["需要处理的文本"]);
+      return payload;
     },
   },
   over: {
     name: "over",
     label: "所有文本",
-    matchLabel: "无需配置",
     icon: "emergency",
     color: "light-green",
     desc: "匹配主输入框的所有文本，但只有在该文本未设置对应的插件或功能时才生效",
-    valueType: null,
-    disabledSpecialVars:
-      /{{SelectFile}}|{{MatchImage}}|{{WindowInfo.*?}}|{{pwd}}|{{MatchedFiles.*?}}/g,
-    matchToCmds: (rules, desc) => [
-      {
-        label: desc,
-        type: "over",
-        minNum: 1,
-      },
-    ],
-    verify: (rules) => true,
     tempPayload: async () => {
-      let values = await quickcommand.showInputBox(["需要处理的文本"]);
-      return values[0];
+      let [payload] = await quickcommand.showInputBox(["需要处理的文本"]);
+      return payload;
     },
   },
   window: {
     name: "window",
     label: "窗口",
-    matchLabel: "进程名",
     icon: "widgets",
     color: "indigo",
     desc: "匹配呼出uTools前或唤出超级面板时的活动窗口，可以获取窗口的信息或文件夹路径作为变量",
-    valueType: "array",
-    disabledSpecialVars: /{{input}}|{{MatchImage}}|{{MatchedFiles.*?}}/g,
-    matchToCmds: (rules, desc) => [
-      {
-        type: "window",
-        label: desc,
-        match: {
-          app: rules,
-        },
-      },
-    ],
-    verify: (rules) => !window.lodashM.isEmpty(rules) || "进程名不能为空",
   },
   img: {
     name: "img",
     label: "图片",
-    matchLabel: "无需配置",
     icon: "panorama",
     color: "deep-orange",
     desc: "匹配剪贴板的图片，并返回图片的 DataUrl",
-    valueType: null,
-    disabledSpecialVars:
-      /{{input}}|{{SelectFile}}|{{pwd}}|{{WindowInfo.*?}}|{{MatchedFiles.*?}}/g,
-    matchToCmds: (rules, desc) => [
-      {
-        label: desc,
-        type: "img",
-      },
-    ],
-    verify: (rules) => true,
     tempPayload: () =>
       window.resolveFileToBase64(
         utools.showOpenDialog({
@@ -156,23 +60,9 @@ export default {
   files: {
     name: "files",
     label: "文件",
-    matchLabel: "正则",
     icon: "description",
     color: "light-blue",
     desc: "匹配主输入框或超级面板选中的文件，可以获取复制及选中的文件信息作为变量",
-    valueType: "regex",
-    disabledSpecialVars:
-      /{{input}}|{{MatchImage}}|{{SelectFile}}|{{pwd}}|{{WindowInfo.*?}}/g,
-    matchToCmds: (rules, desc) => [
-      {
-        type: "files",
-        label: desc,
-        match: rules.match,
-        fileType: rules.fileType,
-        minLength: 1,
-      },
-    ],
-    verify: (rules) => !!rules > 0 || "正则不能为空",
     tempPayload: () =>
       window.convertFilePathToUtoolsPayload(
         utools.showOpenDialog({
@@ -181,23 +71,4 @@ export default {
         })
       ),
   },
-  professional: {
-    name: "professional",
-    label: "专业模式",
-    matchLabel: "json配置",
-    icon: "construction",
-    desc: "通过json格式的配置实现同时匹配关键字、窗口、文件甚至图片，或者指定文件数量、窗口类等",
-    valueType: "json",
-    disabledSpecialVars: null,
-    matchToCmds: (rules, desc) => JSON.parse(rules),
-    verify: (rules) => {
-      try {
-        JSON.parse(rules);
-        return true;
-      } catch (error) {
-        return "专业模式json配置错误";
-      }
-    },
-    jsonSample: jsonSample,
-  },
 };

From 02f4b2f13285d1a6a5fc0460f6d9a2ecb0e234d8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 13:04:07 +0800
Subject: [PATCH 181/332] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8F=98=E9=87=8F=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/generateCode.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index b0292920..036c763d 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -59,7 +59,7 @@ export function generateCode(flow) {
             cmdCode = `${cmdCode}.then(${cmd.callbackFunc})`;
           } else {
             // 如果输出变量有详细变量，则需要为每个变量赋值
-            const promiseName = name || "result";
+            const promiseName = name || "__result";
 
             const extractVarCode = Object.entries(details)
               .map(
@@ -82,7 +82,7 @@ export function generateCode(flow) {
         code.push(indent + cmdCode);
       } else if (cmd.asyncMode === "await") {
         // 使用 await 模式
-        const promiseName = name || "result";
+        const promiseName = name || "__result";
         cmdCode = getVarAssignCode(promiseName, `await ${cmdCode}`);
         code.push(indent + cmdCode);
         // 处理详细变量
@@ -98,7 +98,7 @@ export function generateCode(flow) {
         }
       } else {
         // 非Async命令
-        const resultVarName = name || "result";
+        const resultVarName = name || "__result";
         cmdCode = getVarAssignCode(resultVarName, `${cmdCode}`);
         code.push(indent + cmdCode);
         // 处理详细变量

From d239953125d3ae80372c8a5df87e0a6fff9afa08 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 13:31:26 +0800
Subject: [PATCH 182/332] =?UTF-8?q?=E4=BF=AE=E6=AD=A3quickcomposer?=
 =?UTF-8?q?=E5=AF=B9=E7=A7=B0=E5=8A=A0=E5=AF=86=E5=92=8C=E9=9D=9E=E5=AF=B9?=
 =?UTF-8?q?=E7=A7=B0=E5=8A=A0=E5=AF=86=E7=9A=84=E5=A3=B0=E6=98=8E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue            |  3 +-
 src/plugins/monaco/types/quickcomposer.d.ts | 86 +++++++++++++++------
 2 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index d4b4e81c..0c7f6478 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -54,7 +54,7 @@
 
 <script>
 import { defineAsyncComponent, ref, computed } from "vue";
-import CommandConfig from "./editor/CommandConfig.vue";
+import CommandConfig from "components/editor/CommandConfig.vue";
 import CommandLanguageBar from "components/editor/CommandLanguageBar";
 import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
@@ -81,7 +81,6 @@ const CodeEditor = defineAsyncComponent({
   timeout: 3000,
 });
 
-// TODO: 对称加密声明
 export default {
   components: {
     CodeEditor,
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index 7b96303b..30022082 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -993,41 +993,77 @@ interface quickcomposerApi {
      * 对称加密
      * @param config 加密配置
      * @param config.text 要加密的文本
-     * @param config.key 密钥
-     * @param config.algorithm 加密算法：aes-128-cbc, aes-192-cbc, aes-256-cbc, des-cbc, des3-cbc
-     * @param config.mode 操作模式：encrypt-加密，decrypt-解密
-     * @param config.encoding 输出编码：base64, hex
+     * @param config.algorithm 加密算法：AES, SM4
+     * @param config.mode 操作模式：CBC, ECB, GCM (GCM仅AES支持)
+     * @param config.padding AES填充方式：Pkcs7, NoPadding, Iso97971, AnsiX923, Iso10126, ZeroPadding
+     *                      SM4填充方式：Pkcs#7, None
+     * @param config.key 密钥配置
+     * @param config.key.value 密钥值
+     * @param config.key.codec 密钥编码：Utf8, Base64, Hex
+     * @param config.keyLength 密钥长度：128, 192, 256 (仅AES支持192/256)
+     * @param config.operation 操作类型：encrypt-加密，decrypt-解密
+     * @param config.format 输出格式：Base64, Hex
+     * @param config.iv IV配置(ECB模式不需要)
+     * @param config.iv.value IV值
+     * @param config.iv.codec IV编码：Utf8, Base64, Hex
      */
     symmetricCrypto(config: {
       text: string;
-      key: string;
-      algorithm:
-        | "aes-128-cbc"
-        | "aes-192-cbc"
-        | "aes-256-cbc"
-        | "des-cbc"
-        | "des3-cbc";
-      mode: "encrypt" | "decrypt";
-      encoding?: "base64" | "hex";
-    }): string;
+      algorithm: "AES" | "SM4";
+      mode?: "CBC" | "ECB" | "GCM";
+      padding?:
+        | "Pkcs7"
+        | "NoPadding"
+        | "Iso97971"
+        | "AnsiX923"
+        | "Iso10126"
+        | "ZeroPadding"
+        | "Pkcs#7"
+        | "None";
+      key: {
+        value: string;
+        codec: "Utf8" | "Base64" | "Hex";
+      };
+      keyLength?: 128 | 192 | 256;
+      operation?: "encrypt" | "decrypt";
+      format?: "Base64" | "Hex";
+      iv?: {
+        value: string;
+        codec: "Utf8" | "Base64" | "Hex";
+      };
+    }): string | { enc: string; tag: string }; // GCM模式返回包含tag的对象
 
     /**
      * 非对称加密
      * @param config 加密配置
-     * @param config.text 要加密的文本
-     * @param config.key 密钥(公钥或私钥)
-     * @param config.algorithm 加密算法：rsa, sm2
-     * @param config.mode 操作模式：encrypt-加密，decrypt-解密，sign-签名，verify-验签
-     * @param config.encoding 输出编码：base64, hex
-     * @param config.padding 填充方式：pkcs1, pkcs1_oaep
+     * @param config.text 要加密/解密的文本
+     * @param config.algorithm 加密算法：SM2, RSA
+     * @param config.operation 操作类型：encrypt-加密，decrypt-解密
+     * @param config.format 输出格式：Base64, Hex
+     * @param config.publicKey 公钥配置(加密时必需)
+     * @param config.publicKey.key 公钥值
+     * @param config.publicKey.codec 公钥编码：Pem, Hex (SM2仅支持Hex，RSA仅支持Pem)
+     * @param config.privateKey 私钥配置(解密时必需)
+     * @param config.privateKey.key 私钥值
+     * @param config.privateKey.codec 私钥编码：Pem, Hex (SM2仅支持Hex，RSA仅支持Pem)
+     * @param config.padding RSA填充方式：RSAES-PKCS1-V1_5 (仅RSA支持)
+     * @param config.cipherMode SM2加密模式：0-C1C2C3, 1-C1C3C2 (仅SM2支持，默认1)
      */
     asymmetricCrypto(config: {
       text: string;
-      key: string;
-      algorithm: "rsa" | "sm2";
-      mode: "encrypt" | "decrypt" | "sign" | "verify";
-      encoding?: "base64" | "hex";
-      padding?: "pkcs1" | "pkcs1_oaep";
+      algorithm: "SM2" | "RSA";
+      operation: "encrypt" | "decrypt";
+      format?: "Base64" | "Hex";
+      publicKey?: {
+        key: string;
+        codec: "Pem" | "Hex";
+      };
+      privateKey?: {
+        key: string;
+        codec: "Pem" | "Hex";
+      };
+      padding?: "RSAES-PKCS1-V1_5";
+      cipherMode?: 0 | 1;
     }): string;
 
     /**

From 49631ac60dbf0c0302ec5bf64f57de824e3e4b72 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 13:40:40 +0800
Subject: [PATCH 183/332] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CommandLanguageBar.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index c1148b22..dd2d97ef 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -194,7 +194,7 @@
         flat
         color="primary"
         icon="play_arrow"
-        label="运行"
+        :label="`运行(${ctrlKey}B)`"
         @click="$emit('action', 'run')"
       ></q-btn>
       <q-btn
@@ -205,7 +205,7 @@
         flat
         dense
         icon="save"
-        label="保存"
+        :label="`保存(${ctrlKey}S)`"
         @click="$emit('action', 'save')"
       ></q-btn>
     </q-btn-group>
@@ -254,6 +254,7 @@ export default {
       commandTypes,
       isSettingsVisible: false,
       showUserData: false,
+      ctrlKey: utools.isMacOs ? "⌘" : "⌃",
     };
   },
   computed: {

From ddd1fc11d7553a87e856d72a8bf73173c5edc703 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 23:04:55 +0800
Subject: [PATCH 184/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=97=B4=E6=95=B0=E7=BB=84=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  |  27 ++--
 src/components/CommandEditor.vue             | 123 +++++++------------
 src/components/CommandRunResult.vue          |  14 +--
 src/components/ComposerEditor.vue            |  60 ++++-----
 src/components/composer/FlowTabs.vue         |  10 +-
 src/components/config/FooterBar.vue          |   4 +-
 src/components/editor/CommandLanguageBar.vue |   7 +-
 src/js/commandManager.js                     |  35 ++++++
 src/pages/CommandPage.vue                    |   6 +-
 src/pages/ConfigurationPage.vue              |  42 +++----
 src/pages/RunCodePage.vue                    |  17 +--
 src/pages/RunComposerPage.vue                |  18 +--
 12 files changed, 167 insertions(+), 196 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2486df7d..288e4780 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,6 +11,7 @@
 import { defineComponent } from "vue";
 import { setCssVar } from "quasar";
 import { utoolsFull, dbManager } from "./js/utools.js";
+import { useCommandManager } from "./js/commandManager.js";
 import programmings from "./js/options/programs.js";
 import defaultProfile from "./js/options/defaultProfile.js";
 import Cron from "croner";
@@ -22,6 +23,7 @@ export default defineComponent({
   name: "App",
   data() {
     return {
+      commandManager: useCommandManager(),
       setCssVar: setCssVar,
       programs: programmings,
       isRunningCommand: false,
@@ -65,7 +67,7 @@ export default defineComponent({
       });
       window.isAppVersion4() &&
         this.utools.onMainPush(
-          async ({ code, type, payload }) => {
+          async ({ code, payload }) => {
             let result = await this.runCommand(code, payload, 5000);
             return result.map((x) => {
               return {
@@ -73,7 +75,7 @@ export default defineComponent({
               };
             });
           },
-          ({ code, type, payload, option }) => {
+          ({ option }) => {
             window.quickcommand.writeClipboard(option.text);
             window.utools.showNotification("已复制");
           }
@@ -97,10 +99,7 @@ export default defineComponent({
       );
     },
     saveProfile() {
-      dbManager.putDB(
-        window.lodashM.cloneDeep(this.profile),
-        "cfg_profile"
-      );
+      dbManager.putDB(window.lodashM.cloneDeep(this.profile), "cfg_profile");
       dbManager.putDB(
         window.lodashM.cloneDeep(this.nativeProfile),
         "cfg_" + utools.getNativeId() + "_profile"
@@ -124,19 +123,21 @@ export default defineComponent({
       }
     },
     enterPlugin(enter) {
-      // 使用情况统计
-      // this.usageStatistics(enter.code, this.parseDate(new Date()));
       this.updateExp();
       this.$q.dark.set(utools.isDarkColors());
       this.enterData = enter;
-      // 自动分离目前还没有好的方案
-      // if (this.$root.profile.autoDetachFeatures?.includes(enter.code)) {
-      // autoDetach.autoDetach();
-      // }
       this.$router.push(enter.code);
     },
     outPlugin() {
-      this.$refs.view.$refs?.commandEditor?.saveCodeHistory();
+      // 退出时保存RunCode和RunComposer的命令
+      if (!["code", "composer"].includes(this.$route.name)) return;
+
+      const currentCommand = window.lodashM.cloneDeep(
+        this.commandManager.state.currentCommand
+      );
+
+      dbManager.putDB(currentCommand, `cfg_${this.$route.name}History`);
+
       this.$router.push("/");
       this.saveProfile();
     },
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 0c7f6478..facb4c91 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -2,28 +2,27 @@
   <div class="command-editor">
     <!-- 编程语言栏 -->
     <CommandLanguageBar
-      v-model="quickcommandInfo"
+      v-model="commandManager.state.currentCommand"
       :canCommandSave="canCommandSave"
-      :isRunCodePage="isRunCodePage"
       @action="http://github.com/handleAction"
     />
 
     <!-- 命令设置栏 -->
     <CommandConfig
       v-if="!isRunCodePage"
-      :model-value="commandConfig"
+      v-model="commandManager.state.currentCommand"
       @update:is-expanded="isConfigExpanded = $event"
       :expand-on-focus="true"
       class="command-config"
-      @update:model-value="updateCommandConfig"
     />
 
     <!-- 编辑器 -->
     <CodeEditor
-      v-model="quickcommandInfo.cmd"
+      v-model="commandManager.state.currentCommand.cmd"
+      v-model:cursor-position="
+        commandManager.state.currentCommand.cursorPosition
+      "
       :language="getLanguage()"
-      :cursor-position="quickcommandInfo.cursorPosition"
-      @update:cursor-position="quickcommandInfo.cursorPosition = $event"
       placeholder="请输入代码"
       class="codeEditor"
       ref="editor"
@@ -34,7 +33,7 @@
   <EditorTools
     ref="editorTools"
     v-show="!isConfigExpanded"
-    :commandCode="quickcommandInfo?.features?.code || 'temp'"
+    :commandCode="currentCommand.features?.code || 'temp'"
     @restore="restoreHistory"
   />
 
@@ -49,7 +48,7 @@
   </q-dialog>
 
   <!-- 运行结果 -->
-  <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
+  <CommandRunResult ref="result"></CommandRunResult>
 </template>
 
 <script>
@@ -61,6 +60,7 @@ import CommandRunResult from "components/CommandRunResult";
 import CommandComposer from "components/composer/CommandComposer.vue";
 import programs from "js/options/programs.js";
 import { dbManager } from "js/utools.js";
+import { useCommandManager } from "js/commandManager.js";
 
 // 预加载 MonacoEditor
 const CodeEditorPromise = import("components/editor/CodeEditor.vue");
@@ -102,64 +102,23 @@ export default {
       },
     };
   },
-  props: {
-    action: {
-      type: Object,
-      required: true,
-    },
-  },
-  setup(props) {
-    const isRunCodePage = ref(props.action.type === "run");
-    const canCommandSave = ref(!isRunCodePage.value);
+  setup() {
+    const commandManager = useCommandManager();
 
-    const commandAction = window.lodashM.cloneDeep(props.action);
-    const savedCommand = isRunCodePage.value
-      ? dbManager.getDB("cfg_codeHistory")
-      : commandAction.data || {};
+    const defaultCommand = commandManager.getDefaultCommand("quickcommand");
 
-    const defaultCommand = {
-      program: "quickcommand",
-      features: {
-        icon: programs.quickcommand.icon,
-        explain: "",
-        platform: ["win32", "linux", "darwin"],
-        mainPush: false,
-        cmds: [],
-      },
-      output: "text",
-      tags: [],
-      cmd: "",
-      scptarg: "",
-      charset: {
-        scriptCode: "",
-        outputCode: "",
-      },
-      customOptions: {
-        bin: "",
-        argv: "",
-        ext: "",
-      },
-    };
-    const quickcommandInfo = ref({
+    commandManager.state.currentCommand = {
       ...defaultCommand,
-      ...savedCommand,
-    });
-
-    // 默认命令不可编辑
-    if (quickcommandInfo.value.tags?.includes("默认") && !utools.isDev()) {
-      canCommandSave.value = false;
-    }
+      ...commandManager.state.currentCommand,
+    };
 
-    const commandConfig = computed(() => {
-      const { tags, output, features, program } = quickcommandInfo.value;
-      return { tags, output, features, program };
+    const currentCommand = computed(() => {
+      return commandManager.state.currentCommand;
     });
 
     return {
-      quickcommandInfo,
-      isRunCodePage,
-      canCommandSave,
-      commandConfig,
+      commandManager,
+      currentCommand,
     };
   },
   mounted() {
@@ -169,6 +128,17 @@ export default {
   beforeUnmount() {
     document.removeEventListener("keydown", this.handleKeydown);
   },
+  computed: {
+    isRunCodePage() {
+      return this.$route.name === "code";
+    },
+    canCommandSave() {
+      if (this.isRunCodePage) return false;
+      if (window.utools.isDev()) return true;
+      if (this.currentCommand.tags?.includes("默认")) return false;
+      return true;
+    },
+  },
   methods: {
     handleComposerAction(actionType, actionData) {
       switch (actionType) {
@@ -179,7 +149,7 @@ export default {
         case "apply":
           // actionData 命令的cmd
           this.showComposer = false;
-          this.quickcommandInfo.cmd = actionData;
+          this.commandManager.state.currentCommand.cmd = actionData;
           this.$refs.editor.formatDocument();
           break;
         case "close":
@@ -189,22 +159,17 @@ export default {
     },
     // 保存
     saveCurrentCommand() {
-      this.$emit("editorEvent", "save", this.quickcommandInfo);
+      this.$emit("editorEvent", "save", this.currentCommand);
       this.saveToHistory(); // 保存时记录历史
     },
     // 运行
     runCurrentCommand(command) {
       if (!command) {
         this.saveToHistory(); // 运行时不保存但记录历史
-        command = { ...this.quickcommandInfo };
+        command = { ...this.currentCommand };
       }
       this.$refs.result.runCurrentCommand(command);
     },
-    saveCodeHistory() {
-      if (!this.isRunCodePage) return;
-      let command = window.lodashM.cloneDeep(this.quickcommandInfo);
-      dbManager.putDB(command, "cfg_codeHistory");
-    },
     handleAction(event, data) {
       switch (event) {
         case "run":
@@ -228,8 +193,8 @@ export default {
     },
     saveToHistory() {
       this.$refs.editorTools.tryToSave(
-        this.quickcommandInfo.cmd,
-        this.quickcommandInfo.program
+        this.currentCommand.cmd,
+        this.currentCommand.program
       );
     },
     restoreHistory(item) {
@@ -237,22 +202,16 @@ export default {
       this.saveToHistory();
 
       // 恢复历史内容
-      this.quickcommandInfo.cmd = item.content;
-      this.quickcommandInfo.program = item.program;
-    },
-    updateCommandConfig(value) {
-      this.quickcommandInfo = {
-        ...this.quickcommandInfo,
-        ...value,
-      };
+      this.currentCommand.cmd = item.content;
+      this.currentCommand.program = item.program;
     },
     getLanguage() {
-      if (this.quickcommandInfo.program !== "custom") {
-        return this.quickcommandInfo.program;
+      if (this.currentCommand.program !== "custom") {
+        return this.currentCommand.program;
       }
-      if (!this.quickcommandInfo.customOptions.ext) return;
+      if (!this.currentCommand.customOptions.ext) return;
       let language = Object.values(programs).find(
-        (program) => program.ext === this.quickcommandInfo.customOptions.ext
+        (program) => program.ext === this.currentCommand.customOptions.ext
       );
       if (!language) return;
       return language.name;
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index f6ff1fbe..77563739 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -100,22 +100,12 @@ export default {
         /^((ht|f)tps?):\/\/([\w\-]+(\.[\w\-]+)*\/)*[\w\-]+(\.[\w\-]+)*\/?(\?([\w\-\.,@?^=%&:\/~\+#]*)+)?/,
     };
   },
-  props: {
-    /**
-     * run：    「RunCode界面」 无侧栏，运行结果弹窗显示，保存命令历史
-     * edit：   「编辑命令界面』 有侧栏，运行结果弹窗显示，需要对payload临时赋值
-     * new：    『新建命令界面」 有侧栏，运行结果弹窗显示，需要对payload临时赋值
-     * config： 「配置界面』    运行结果弹窗显示，需要对payload临时赋值
-     * input：  『主输入框进入」 运行结果直接展示，动态调整窗体高度
-     */
-    action: Object,
-  },
   computed: {
     fromUtools() {
-      return this.action.type === "input";
+      return this.$route.name === "command";
     },
     needTempPayload() {
-      return ["edit", "new", "config"].includes(this.action.type);
+      return !["command", "code", "composer"].includes(this.$route.name);
     },
     maxHeight() {
       return this.fromUtools ? 600 : 400;
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index b197ac90..e5b46f64 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -2,27 +2,29 @@
   <CommandComposer
     ref="composer"
     @action="http://github.com/handleComposerAction"
-    v-model="quickcommandInfo"
+    v-model="commandManager.state.currentCommand"
     :disabled-control-buttons="disabledControlButtons"
     class="fixed-full"
   />
   <!-- 运行结果 -->
-  <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
+  <CommandRunResult ref="result"></CommandRunResult>
 </template>
 
 <script>
 import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
 import { findCommandByValue } from "js/composer/composerConfig";
-import programs from "js/options/programs.js";
-import { ref, computed } from "vue";
+import { useCommandManager } from "js/commandManager.js";
 
 export default {
   components: { CommandComposer, CommandRunResult },
-  setup(props) {
+  setup() {
+    const commandManager = useCommandManager();
+
     const retoreToFullCommand = (command) => {
-      const { flows } = command;
-      if (!flows) return command;
+      const newCommand = window.lodashM.cloneDeep(command);
+      const { flows } = newCommand;
+      if (!flows) return newCommand;
       const newFlows = flows.map((flow) => ({
         ...flow,
         commands: flow.commands.map((cmd) => {
@@ -71,45 +73,25 @@ export default {
       };
     };
 
-    const commandAction = window.lodashM.cloneDeep(props.action);
-    const savedCommand = commandAction.data || {};
-    const defaultCommand = {
-      program: "quickcomposer",
-      features: {
-        icon: programs.quickcommand.icon,
-        explain: "",
-        platform: ["win32", "linux", "darwin"],
-        mainPush: false,
-        cmds: [],
-      },
-      flows: [],
-      output: "text",
-      tags: [],
-    };
-    const quickcommandInfo = ref({
-      ...defaultCommand,
-      ...retoreToFullCommand(savedCommand),
-    });
+    const defaultCommand = commandManager.getDefaultCommand("quickcomposer");
 
-    const isRunComposePage = computed(() => {
-      return props.action.type === "composer";
-    });
-
-    const disabledControlButtons = computed(() => {
-      return isRunComposePage.value ? ["close", "save", "apply"] : ["apply"];
-    });
+    commandManager.state.currentCommand = {
+      ...defaultCommand,
+      ...retoreToFullCommand(commandManager.state.currentCommand),
+    };
 
     return {
-      quickcommandInfo,
+      commandManager,
       getLitedComposerCommand,
-      disabledControlButtons,
     };
   },
   emits: ["editorEvent"],
-  props: {
-    action: {
-      type: Object,
-      required: true,
+  computed: {
+    isRunComposerPage() {
+      return this.$route.name === "composer";
+    },
+    disabledControlButtons() {
+      return this.isRunComposerPage ? ["close", "save", "apply"] : ["apply"];
     },
   },
   methods: {
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index cf0363a1..5fa696b3 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -74,7 +74,7 @@
     >
       <CommandConfig
         class="command-config-panel"
-        v-if="flow.id === 'main' && commandConfig.features"
+        v-if="flow.id === 'main' && showCommandConfig"
         :model-value="commandConfig"
         @update:model-value="updateCommandConfig"
       />
@@ -267,6 +267,14 @@ export default defineComponent({
       outputVariables: [],
     };
   },
+  computed: {
+    isRunComposerPage() {
+      return this.$route.name === "composer";
+    },
+    showCommandConfig() {
+      return !this.isRunComposerPage && this.commandConfig.features;
+    },
+  },
   methods: {
     generateFlowName(baseName = "func_") {
       return (
diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index fb9cc307..d1717591 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -77,7 +77,7 @@
           <q-btn
             split
             flat
-            @click="$emit('add-new', 'CommandEditor')"
+            @click="$emit('add-new', 'quickcommand')"
             color="primary"
             class="new-btn"
           >
@@ -87,7 +87,7 @@
           <q-btn
             split
             flat
-            @click="$emit('add-new', 'ComposerEditor')"
+            @click="$emit('add-new', 'quickcomposer')"
             color="primary"
             class="new-btn"
           >
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index dd2d97ef..96b70d3c 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -238,10 +238,6 @@ export default {
       type: Boolean,
       default: true,
     },
-    isRunCodePage: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ["update:modelValue", "action"],
   components: {
@@ -261,6 +257,9 @@ export default {
     currentCommand() {
       return this.modelValue;
     },
+    isRunCodePage() {
+      return this.$route.name === "code";
+    },
   },
   methods: {
     handleProgramChange(newProgram) {
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index e086f60c..7a4b4b30 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -3,6 +3,7 @@ import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
 import { utoolsFull, dbManager } from "js/utools.js";
 import { getUniqueId } from "js/common/uuid.js";
+import programs from "js/options/programs.js";
 import outputTypes from "js/options/outputTypes.js";
 
 // 默认命令
@@ -18,6 +19,7 @@ const state = reactive({
   activatedQuickPanels: [],
   currentTag: "",
   commandSearchKeyword: "",
+  currentCommand: {},
 });
 
 const getCmdType = (cmds) => {
@@ -253,6 +255,38 @@ export function useCommandManager() {
     });
   };
 
+  const getDefaultCommand = (program = "quickcommand") => {
+    const quickcomposerCommand = {
+      program,
+      features: {
+        icon: programs.quickcommand.icon,
+        explain: "",
+        platform: ["win32", "linux", "darwin"],
+        mainPush: false,
+        cmds: [],
+      },
+      output: "text",
+      tags: [],
+    };
+    const quickcommandCommand = {
+      ...quickcomposerCommand,
+      cmd: "",
+      scptarg: "",
+      charset: {
+        scriptCode: "",
+        outputCode: "",
+      },
+      customOptions: {
+        bin: "",
+        argv: "",
+        ext: "",
+      },
+    };
+    return program === "quickcomposer"
+      ? quickcomposerCommand
+      : quickcommandCommand;
+  };
+
   return {
     state,
     getAllQuickCommands,
@@ -268,5 +302,6 @@ export function useCommandManager() {
     clearAllFeatures,
     clearAllCommands,
     changeCurrentTag,
+    getDefaultCommand,
   };
 }
diff --git a/src/pages/CommandPage.vue b/src/pages/CommandPage.vue
index 43a57717..9ccfe8f9 100644
--- a/src/pages/CommandPage.vue
+++ b/src/pages/CommandPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <CommandRunResult :http://github.com/action="action" ref="result"></CommandRunResult>
+    <CommandRunResult ref="result"></CommandRunResult>
   </div>
 </template>
 
@@ -13,10 +13,6 @@ export default {
   data() {
     return {
       utools: utoolsFull,
-      action: {
-        type: "input",
-        data: {},
-      },
       featureCode: this.$route.path.slice(1),
     };
   },
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 0b00aa57..438ec0f4 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -21,18 +21,11 @@
     <!-- 命令编辑界面 -->
     <transition name="slide">
       <div v-if="isEditorShow" class="editor-container">
-        <component
-          :is="commandEditorAction.component"
-          :action="http://github.com/commandEditorAction"
-          @editorEvent="handleEditorEvent"
-        />
+        <component :is="editorComponent" @editorEvent="handleEditorEvent" />
       </div>
     </transition>
 
-    <CommandRunResult
-      :action="http://github.com/%7B%20type:'config' }"
-      ref="result"
-    ></CommandRunResult>
+    <CommandRunResult ref="result"></CommandRunResult>
   </div>
 </template>
 
@@ -69,6 +62,7 @@ export default {
       isEditorShow: false,
       commandEditorAction: {},
       footerBarHeight: "40px",
+      editorComponent: "CommandEditor",
     };
   },
   computed: {
@@ -170,18 +164,19 @@ export default {
         typeof commandOrCode === "string"
           ? this.allQuickCommands[commandOrCode]
           : commandOrCode;
-      this.commandEditorAction = {
-        type: "edit",
-        data: window.lodashM.cloneDeep(command),
-        component: command.flows ? "ComposerEditor" : "CommandEditor",
-      };
+      this.editorComponent =
+        command.program === "quickcomposer"
+          ? "ComposerEditor"
+          : "CommandEditor";
+      this.commandManager.state.currentCommand =
+        window.lodashM.cloneDeep(command);
       this.isEditorShow = true;
     },
     // 导入命令
-    async importCommand(quickCommandInfo) {
-      const command = await this.commandManager.importCommand(quickCommandInfo);
-      if (command) {
-        this.locateToCommand(command.tags, command.features?.code);
+    async importCommand(command) {
+      const result = await this.commandManager.importCommand(command);
+      if (result) {
+        this.locateToCommand(result.tags, result.features?.code);
       }
     },
     // 定位命令, 包含changeCurrentTag
@@ -204,12 +199,11 @@ export default {
       });
     },
     // 新建命令
-    addNewCommand(component = "CommandEditor") {
-      this.commandEditorAction = {
-        type: "new",
-        data: {},
-        component,
-      };
+    addNewCommand(program = "quickcommand") {
+      this.editorComponent =
+        program === "quickcomposer" ? "ComposerEditor" : "CommandEditor";
+      this.commandManager.state.currentCommand =
+        this.commandManager.getDefaultCommand(program);
       this.isEditorShow = true;
     },
     saveCommand(command) {
diff --git a/src/pages/RunCodePage.vue b/src/pages/RunCodePage.vue
index 7c60d94d..a4028dc2 100644
--- a/src/pages/RunCodePage.vue
+++ b/src/pages/RunCodePage.vue
@@ -1,18 +1,21 @@
 <template>
-  <CommandEditor ref="commandEditor" :http://github.com/action="action" />
+  <CommandEditor />
 </template>
 
 <script>
 import CommandEditor from "components/CommandEditor";
+import { dbManager } from "js/utools.js";
+import { useCommandManager } from "js/commandManager.js";
 
 export default {
   components: { CommandEditor },
-  data() {
-    return {
-      action: {
-        type: "run",
-        data: {},
-      },
+  setup() {
+    const commandManager = useCommandManager();
+    const savedCommand = dbManager.getDB("cfg_codeHistory");
+    const defaultCommand = commandManager.getDefaultCommand("quickcommand");
+    commandManager.state.currentCommand = {
+      ...defaultCommand,
+      ...savedCommand,
     };
   },
 };
diff --git a/src/pages/RunComposerPage.vue b/src/pages/RunComposerPage.vue
index f351fd8a..c312eca5 100644
--- a/src/pages/RunComposerPage.vue
+++ b/src/pages/RunComposerPage.vue
@@ -1,20 +1,24 @@
 <template>
   <div>
-    <ComposerEditor :http://github.com/action="action"></ComposerEditor>
+    <ComposerEditor />
   </div>
 </template>
 
 <script>
 import ComposerEditor from "components/ComposerEditor";
+import { dbManager } from "js/utools.js";
+import { useCommandManager } from "js/commandManager.js";
 
 export default {
   components: { ComposerEditor },
-  data() {
-    return {
-      action: {
-        type: "composer",
-        data: {},
-      },
+  setup() {
+    const commandManager = useCommandManager();
+    const savedCommand = dbManager.getDB("cfg_composerHistory");
+    const defaultCommand = commandManager.getDefaultCommand("quickcomposer");
+    commandManager.state.currentCommand = {
+      ...defaultCommand,
+      ...savedCommand,
+      program: "quickcomposer",
     };
   },
 };

From ca24afe4b2d24bf59d5ce402bc85e4b363fc7b72 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Feb 2025 23:19:19 +0800
Subject: [PATCH 185/332] =?UTF-8?q?runComposer=E8=87=AA=E5=8A=A8=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E5=91=BD=E4=BB=A4=E4=B9=9F=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       |  7 +++-
 src/components/ComposerEditor.vue | 60 +++----------------------------
 src/js/commandManager.js          | 55 ++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 288e4780..947306ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -132,10 +132,15 @@ export default defineComponent({
       // 退出时保存RunCode和RunComposer的命令
       if (!["code", "composer"].includes(this.$route.name)) return;
 
-      const currentCommand = window.lodashM.cloneDeep(
+      let currentCommand = window.lodashM.cloneDeep(
         this.commandManager.state.currentCommand
       );
 
+      if (this.$route.name === "composer") {
+        currentCommand =
+          this.commandManager.getLitedComposerCommand(currentCommand);
+      }
+
       dbManager.putDB(currentCommand, `cfg_${this.$route.name}History`);
 
       this.$router.push("/");
diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index e5b46f64..2a4142b3 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -13,7 +13,6 @@
 <script>
 import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
-import { findCommandByValue } from "js/composer/composerConfig";
 import { useCommandManager } from "js/commandManager.js";
 
 export default {
@@ -21,68 +20,17 @@ export default {
   setup() {
     const commandManager = useCommandManager();
 
-    const retoreToFullCommand = (command) => {
-      const newCommand = window.lodashM.cloneDeep(command);
-      const { flows } = newCommand;
-      if (!flows) return newCommand;
-      const newFlows = flows.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          // 恢复所有属性
-          const command = findCommandByValue(cmd.value);
-          return {
-            ...command,
-            ...cmd,
-          };
-        }),
-      }));
-      return {
-        ...command,
-        flows: newFlows,
-      };
-    };
-
-    const getLitedComposerCommand = (command) => {
-      const { flows } = command;
-      if (!flows) return command;
-      const newFlows = flows.map((flow) => ({
-        ...flow,
-        commands: flow.commands.map((cmd) => {
-          const cmdCopy = { ...cmd };
-          // 移除不必要保存的属性
-          const uselessProps = [
-            "config",
-            "label",
-            "component",
-            "subCommands",
-            "outputs",
-            "options",
-            "icon",
-            "width",
-            "placeholder",
-            "summary",
-            "type",
-          ];
-          uselessProps.forEach((prop) => delete cmdCopy[prop]);
-          return cmdCopy;
-        }),
-      }));
-      return {
-        ...command,
-        flows: newFlows,
-      };
-    };
-
     const defaultCommand = commandManager.getDefaultCommand("quickcomposer");
 
     commandManager.state.currentCommand = {
       ...defaultCommand,
-      ...retoreToFullCommand(commandManager.state.currentCommand),
+      ...commandManager.getFullComposerCommand(
+        commandManager.state.currentCommand
+      ),
     };
 
     return {
       commandManager,
-      getLitedComposerCommand,
     };
   },
   emits: ["editorEvent"],
@@ -105,7 +53,7 @@ export default {
           return this.$emit(
             "editorEvent",
             "save",
-            this.getLitedComposerCommand(command)
+            this.commandManager.getLitedComposerCommand(command)
           );
       }
     },
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 7a4b4b30..306cf225 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -3,6 +3,7 @@ import quickcommandParser from "js/common/quickcommandParser.js";
 import importAll from "js/common/importAll.js";
 import { utoolsFull, dbManager } from "js/utools.js";
 import { getUniqueId } from "js/common/uuid.js";
+import { findCommandByValue } from "js/composer/composerConfig";
 import programs from "js/options/programs.js";
 import outputTypes from "js/options/outputTypes.js";
 
@@ -287,6 +288,58 @@ export function useCommandManager() {
       : quickcommandCommand;
   };
 
+  const getFullComposerCommand = (command) => {
+    const newCommand = window.lodashM.cloneDeep(command);
+    const { flows } = newCommand;
+    if (!flows) return newCommand;
+    const newFlows = flows.map((flow) => ({
+      ...flow,
+      commands: flow.commands.map((cmd) => {
+        // 恢复所有属性
+        const command = findCommandByValue(cmd.value);
+        return {
+          ...command,
+          ...cmd,
+        };
+      }),
+    }));
+    return {
+      ...command,
+      flows: newFlows,
+    };
+  };
+
+  const getLitedComposerCommand = (command) => {
+    const { flows } = command;
+    if (!flows) return command;
+    const newFlows = flows.map((flow) => ({
+      ...flow,
+      commands: flow.commands.map((cmd) => {
+        const cmdCopy = { ...cmd };
+        // 移除不必要保存的属性
+        const uselessProps = [
+          "config",
+          "label",
+          "component",
+          "subCommands",
+          "outputs",
+          "options",
+          "icon",
+          "width",
+          "placeholder",
+          "summary",
+          "type",
+        ];
+        uselessProps.forEach((prop) => delete cmdCopy[prop]);
+        return cmdCopy;
+      }),
+    }));
+    return {
+      ...command,
+      flows: newFlows,
+    };
+  };
+
   return {
     state,
     getAllQuickCommands,
@@ -303,5 +356,7 @@ export function useCommandManager() {
     clearAllCommands,
     changeCurrentTag,
     getDefaultCommand,
+    getFullComposerCommand,
+    getLitedComposerCommand,
   };
 }

From 44ed767e8c2fc5f5d132b9c661bcda9b78fbee5d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 00:38:16 +0800
Subject: [PATCH 186/332] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerList.vue      |  5 ++++
 .../composer/common/BorderLabel.vue           |  4 +--
 .../composer/ubrowser/UBrowserEditor.vue      | 11 --------
 src/components/config/FooterBar.vue           | 16 +-----------
 src/css/app.css                               | 25 +++++++++++++++++--
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index 72864492..bb91324f 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -342,4 +342,9 @@ export default defineComponent({
   display: flex;
   align-items: center;
 }
+
+.section-header .q-field--focused .q-field__prepend .q-icon {
+  animation: shake 0.8s ease;
+  color: var(--q-primary);
+}
 </style>
diff --git a/src/components/composer/common/BorderLabel.vue b/src/components/composer/common/BorderLabel.vue
index 8983495e..eb7f3d15 100644
--- a/src/components/composer/common/BorderLabel.vue
+++ b/src/components/composer/common/BorderLabel.vue
@@ -79,7 +79,7 @@ export default {
   position: absolute;
   top: -9px;
   left: 16px;
-  background: #fff;
+  background-color: #fafafa;
   color: rgba(0, 0, 0, 0.6);
   font-size: 12px;
   line-height: 16px;
@@ -153,8 +153,8 @@ export default {
 }
 
 .body--dark .label-header {
-  background: #303133;
   color: rgba(255, 255, 255, 0.7);
+  background-color: #2e2e2e;
 }
 
 /* 动画优化 */
diff --git a/src/components/composer/ubrowser/UBrowserEditor.vue b/src/components/composer/ubrowser/UBrowserEditor.vue
index b0de0742..8ca5f053 100644
--- a/src/components/composer/ubrowser/UBrowserEditor.vue
+++ b/src/components/composer/ubrowser/UBrowserEditor.vue
@@ -125,7 +125,6 @@ export default {
   flex-direction: column;
   height: 100%;
   width: 100%;
-  background-color: var(--q-card-background);
 }
 
 .ubrowser-panels {
@@ -151,7 +150,6 @@ export default {
 .ubrowser-editor :deep(.q-tabs) {
   min-height: 36px;
   padding: 0 8px;
-  background-color: var(--q-card-background);
 }
 
 .ubrowser-editor :deep(.q-tab--active) {
@@ -170,13 +168,4 @@ export default {
 .ubrowser-editor :deep(.q-tab__label) {
   font-size: 13px;
 }
-
-/* 暗色模式适配 */
-.body--dark .ubrowser-editor {
-  background-color: var(--q-dark);
-}
-
-.body--dark .ubrowser-editor :deep(.q-tabs) {
-  background-color: var(--q-dark);
-}
 </style>
diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index d1717591..0fe5c4ac 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -239,22 +239,8 @@ export default {
   background: rgba(var(--q-primary-rgb), 0.1) !important;
 }
 
-/* 搜索框动画 */
-@keyframes searchIconShake {
-  0%,
-  100% {
-    transform: rotate(0deg);
-  }
-  25% {
-    transform: rotate(-10deg);
-  }
-  75% {
-    transform: rotate(10deg);
-  }
-}
-
 .q-field--focused .q-field__prepend .q-icon {
-  animation: searchIconShake 0.8s ease;
+  animation: shake 0.8s ease;
   color: var(--q-primary);
 }
 
diff --git a/src/css/app.css b/src/css/app.css
index 510b2355..8a782b3c 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -307,7 +307,11 @@ body.body--dark.glass-effect-menu .q-menu {
   font-size: 12px;
 }
 
-/* 左右抖动 */
+.body--dark .q-tab-panels {
+  background-color: transparent;
+}
+
+/* 左右移动 */
 @keyframes leftRight {
   0% {
     transform: translateX(-2px);
@@ -325,7 +329,7 @@ body.body--dark.glass-effect-menu .q-menu {
   }
 }
 
-/* 上下抖动 */
+/* 上下移动 */
 @keyframes upDown {
   0% {
     transform: translateY(-1px);
@@ -347,3 +351,20 @@ body.body--dark.glass-effect-menu .q-menu {
     opacity: 1;
   }
 }
+
+/* 左右抖动 */
+@keyframes shake {
+
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+
+  25% {
+    transform: rotate(-10deg);
+  }
+
+  75% {
+    transform: rotate(10deg);
+  }
+}

From 41170fb1cacea7ea76d164dce3e1235afe845dcd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 00:38:24 +0800
Subject: [PATCH 187/332] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md          | 185 +++++++++++++++++++++++++++------------------
 plugin/plugin.json |   4 +-
 2 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index c4612ab5..ee4f87bf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 快捷命令
+# 快捷命令 5.0
 
 [![GitHub stars](https://img.shields.io/github/stars/fofolee/uTools-quickcommand?style=flat-square)](https://github.com/fofolee/uTools-quickcommand/stargazers) [![GitHub forks](https://img.shields.io/github/forks/fofolee/uTools-quickcommand?style=flat-square)](https://github.com/fofolee/uTools-quickcommand/network/members) [![version](https://img.shields.io/badge/dynamic/json?color=f58142&label=version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Ffofolee%2FuTools-quickcommand%2Fmaster%2Fplugin%2Fplugin.json&style=flat-square)](https://www.yuque.com/fofolee/qcdocs3/ucnd2o) [![猿料](https://img.shields.io/badge/%E7%8C%BF%E6%96%99-%2Fd%2F424-red?style=flat-square)](https://yuanliao.info/d/424) [![评论](https://img.shields.io/badge/dynamic/json?color=e05d44&label=%E8%AF%84%E8%AE%BA&query=%24.data.attributes.commentCount&url=https%3A%2F%2Fyuanliao.info%2Fapi%2Fdiscussions%2F424&style=flat-square)](https://yuanliao.info/d/424) ![rating](https://img.shields.io/badge/dynamic/json?color=05d44&label=评分&query=%24.rating&url=http%3A%2F%2Fopen.u-tools.cn%2Fplugins%2F9a1d1d03%3Ftag_id%3D0%26mid%3Dd1fef324-b4fd-5f81-b05e-4d4d822277b3%26nid%3Df1960e006c87cf1107f2017711668d6c&style=flat-square) ![downloads](https://img.shields.io/badge/dynamic/json?color=05d44&label=下载&query=%24.downloads&url=http%3A%2F%2Fopen.u-tools.cn%2Fplugins%2F9a1d1d03%3Ftag_id%3D0%26mid%3Dd1fef324-b4fd-5f81-b05e-4d4d822277b3%26nid%3Df1960e006c87cf1107f2017711668d6c&style=flat-square)
 
@@ -16,61 +16,29 @@ quasar build
 
 # 一、核心功能
 
+## ① 编写脚本
+
 - 快速执行命令：如打开文件夹、软件、网址等
 - 快速运行脚本：如批处理、`shell`、`python` 等
-- 直接编写网页：可以直接编写简单的  `html` 页面
+- 直接编写网页：可以直接编写简单的 `html` 页面
 
 - 无需编写插件：实现需要使用 `utools` 的 api 或者带 UI 界面的功能
 
+## ② 可视化编排
 
+- 自动化：支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过 20 种类型的自动化处理
+- 工具集：所有功能既可以组合使用，也可以单独运行，具备视频压缩、格式转换，图片裁剪、旋转，文本朗读，音频播放，编解码，模拟按键，鼠标连点等超过 100 种实用功能
 
 # 二、其他特色
 
-- 内置了执行`shell`命令、文本处理、文本替换、网址二维码等实用命令
-- 支持在插件内下载别人分享的命令
-- 快速编辑及运行代码
+- 可以对命令进行分享和下载
 - 快速收藏文件、网址、插件别名，通过面板视图，实现类似软件启动器、网页搜藏夹、插件面板等功能
 - 定时运行命令
 - 提供后台服务，将插件内部和外部环境打通
 
+# 三、配置参数
 
-
-# 三、功能一览
-
-## ① 内置命令
-
-当前内置的命令有：`Windows Terminal 中打开`、`执行 shell 命令`、`文本处理`、`文本替换`、`vscode代码片段生成器`、`通过 find 查找文件`、`网址二维码`
-
-
-
-## ② 导入、导出、分享命令
-
-- 支持通过文件导入导出命令
-- 支持通过剪贴板导入导出命令
-- 支持一键分享命令
-- 支持在线获取及导入别人分享的命令
-
-
-
-## ③ 自定义命令
-
-### 「 快捷动作 」
-
-- 打开文件/文件夹/软件 （实现在主输入框启动自定义的软件名称及路径 ）
-- 在文件管理器中定位文件
-- 用默认浏览器打开网址（实现类似网页快开的功能）
-- 用 `ubrowser` 打开网址
-- 执行系统命令
-- 将内容写入剪贴板
-- 发送系统消息
-- 弹窗显示消息
-- 发送文本到活动窗口
-- 转至指定插件(实现自定义插件关键字)
-- 添加延时
-
-
-
-### 「 匹配 」
+## 「 匹配 」
 
 支持以下模式激活插件
 
@@ -84,26 +52,21 @@ quasar build
 
 - 窗口/进程
 
- 匹配呼出 uTools 前或唤出超级面板时的活动窗口，可以获取窗口的信息或文件夹路径作为变量
+匹配呼出 uTools 前或唤出超级面板时的活动窗口，可以获取窗口的信息或文件夹路径作为变量
 
 - 复制/选中文件
 
- 匹配拖入主输入框的文件或唤出超级面板时选中的文件，可以获取复制及选中的文件信息作为变量
+匹配拖入主输入框的文件或唤出超级面板时选中的文件，可以获取复制及选中的文件信息作为变量
 
 - 图片
 
- 匹配剪贴板的图片
-
-- 专业模式
-
-匹配 JSON 格式的配置，等效于插件开发中的`features.cmds`
-
+匹配剪贴板的图片
 
-
-### 「 环境 」
+## 「 环境 」
 
 支持以下环境
 
+- quickcomposer (可视化编排)
 - qucikcommand (electron + nodejs + utools)
 - html
 - cmd
@@ -114,44 +77,120 @@ quasar build
 - javascript
 - 等
 
-
-
-### 「 输出 」
+## 「 输出 」
 
 - 隐藏并忽略输出
 - 显示纯文本输出 (不解析 html 内容)
-- 显示html格式的输出 (可以进一步编写简单的 GUI 界面，参考内置动作特殊符号大全)
+- 显示 html 格式的输出 (可以进一步编写简单的 GUI 界面，参考内置动作特殊符号大全)
 - 复制到剪贴板
 - 发送到活动窗口（可实现发送常用短语之类的功能）
 - 发送到系统通知
 - 在终端中显示
 
+# 四、可视化编排功能概览
+
+## 音频操作
+
+文本朗读（支持中文、英文、日语、韩语等）、系统音效播放（提示音、错误音、警告音等）、音频播放/停止、音频录制、音频信息分析（时长、声道、采样率）...
+
+## 浏览器操作
+
+启动浏览器实例、标签页管理、Cookie操作、文本输入、页面滚动、尺寸控制、网络请求拦截、设备模拟、JavaScript注入、DOM元素操作、截图、表单提交...
+
+## 编码加密
+
+Base64编解码、十六进制编解码、URL编解码、MD5哈希、SHA1哈希、SHA256哈希、SHA512哈希、SM3哈希、AES加密、SM4加密、RSA加密、SM2加密...
+
+## 流程控制
+
+if-else条件判断、循环执行、数组遍历、对象遍历、switch-case分支、try-catch异常处理...
 
+## 数据处理
 
-### ④ 面板视图
+字符串处理（反转、替换、分割、合并、去重、统计）、数组操作（过滤、排序、分组、聚合、扁平化、并集、交集、差集）、时间处理（格式化、计算、比较）、JSON处理、正则匹配...
 
-- 将某一个标签下的命令以面板形式展现
-- 可实现网址导航面板、软件启动面板之类的功能
+## 文件操作
 
+文件/文件夹创建、复制、移动、删除、重命名、属性获取、文件监控、文件图标获取、文件归档、快捷方式创建、默认程序打开...
 
+## 图片处理
 
-### ⑤ 运行代码
+格式转换、图片压缩、尺寸调整、旋转翻转、水印添加、PNG转图标、图片信息获取、亮度对比度调整、图片合并、图片裁剪...
 
-- 内置了一个简单的脚本编辑器，可以快速运行代码
-- 会自动记录上次运行的代码
+## macOS特定功能
 
+应用管理（启动、退出、前台切换）、系统设置（音量、亮度、Dock）、Finder操作（窗口控制、文件操作）、系统事件、快捷键绑定...
 
+## Windows特定功能
+窗口控制（置顶、透明度、位置、大小、最大/最小化）、窗口查找（通过标题、类名、进程名）、窗口消息发送（按键、文本、命令）、进程管理（启动、结束、查找、权限提升）、注册表操作（读取、写入、删除、监控）、服务管理（启动、停止、重启、查询、创建、删除）、软件管理（安装、卸载、版本查询）、系统工具（磁盘管理、电源管理、网络配置）、快捷方式管理（创建、修改、删除）、系统设置修改（显示器、音频、电源等）、文件系统监控（文件变化、目录变化）、系统热键注册、UAC权限控制、界面自动化（UI元素查找、点击、输入）、系统事件监听（剪贴板变化、文件变化）...
 
-详细介绍见 https://www.yuque.com/fofolee/mwsoos/bg31vl
+## 数学计算
+基础运算、随机数生成、统计计算（平均值、中位数、众数）、几何计算、三角函数、对数运算、进制转换、单位换算...
 
+## 通知消息
+
+控制台输出、系统通知、自定义通知样式...
+
+## 编程相关
+
+JS代码注入、脚本执行（支持多种语言）、函数返回、变量管理...
+
+## 模拟操作
+
+键盘按键模拟、按键序列、文本复制粘贴、鼠标点击和移动、屏幕截图（全屏、区域、窗口）、拖拽操作...
+
+## 系统操作
+
+剪贴板读写（文本、图片、文件）、系统路径获取、系统信息获取、进程管理、环境变量操作、系统命令执行...
+
+## 用户数据
+
+数据存取、数据删除、数据同步、数据导入导出...
+
+## 用户界面
+
+消息提示框、确认框、输入框、按钮组、选择列表、进度条、文件选择框、颜色选择器、日期选择器...
+
+## uTools功能
+
+匹配数据获取、插件跳转、窗口控制、版本信息获取、主题切换、快捷键管理...
+Windows特定功能
+窗口控制（置顶、透明度、位置）、消息发送、文件系统监控、进程管理、注册表操作、服务管理、快捷方式管理、系统设置修改...
+## 视频处理
+
+格式转换、视频压缩、视频剪辑、视频合并、速度调整、视频截图、GIF转换、音频提取、水印添加、分辨率调整、帧率设置、码率控制...
+
+## 状态获取
+
+当前文件管理器路径、当前浏览器URL、选中文本、选中图片、选中文件、剪贴板内容、系统状态...
+
+## 脚本命令
+
+Shell脚本执行、Python脚本执行、Node.js脚本执行、PowerShell脚本执行、AppleScript执行...
+
+## 其他功能
+
+延时操作、定时任务...
+
+
+# 五、截图
+>详细介绍见 https://www.yuque.com/fofolee/mwsoos/bg31vl
+
+
+>划词
 [![OhN9xJ.gif](https://s1.ax1x.com/2022/05/16/OhN9xJ.gif)](https://imgtu.com/i/OhN9xJ)
-[![OhNYi8.png](https://s1.ax1x.com/2022/05/16/OhNYi8.png)](https://imgtu.com/i/OhNYi8)
-[![OhNGIf.png](https://s1.ax1x.com/2022/05/16/OhNGIf.png)](https://imgtu.com/i/OhNGIf)
-[![OhNAVx.png](https://s1.ax1x.com/2022/05/16/OhNAVx.png)](https://imgtu.com/i/OhNAVx)
-[![OhNirR.png](https://s1.ax1x.com/2022/05/16/OhNirR.png)](https://imgtu.com/i/OhNirR)
-[![OhNPM9.png](https://s1.ax1x.com/2022/05/16/OhNPM9.png)](https://imgtu.com/i/OhNPM9)
-[![OhNFq1.png](https://s1.ax1x.com/2022/05/16/OhNFq1.png)](https://imgtu.com/i/OhNFq1)
-[![OhNEa6.png](https://s1.ax1x.com/2022/05/16/OhNEa6.png)](https://imgtu.com/i/OhNEa6)
-[![OhNVIK.png](https://s1.ax1x.com/2022/05/16/OhNVIK.png)](https://imgtu.com/i/OhNVIK)
-[![OhNePO.png](https://s1.ax1x.com/2022/05/16/OhNePO.png)](https://imgtu.com/i/OhNePO)
-[![OhNmGD.png](https://s1.ax1x.com/2022/05/16/OhNmGD.png)](https://imgtu.com/i/OhNmGD)
+
+>配置界面
+![xb2g30.png](https://files.catbox.moe/xb2g30.png)
+
+>脚本编辑界面
+![d2bcmu.png](https://files.catbox.moe/d2bcmu.png)
+
+>可视化编排界面
+![5mbyoa.png](https://files.catbox.moe/5mbyoa.png)
+
+>浏览器自动化
+![cgibo6.png](https://files.catbox.moe/cgibo6.png)
+
+>后台服务
+![iiv1jv.png](https://files.catbox.moe/iiv1jv.png)
diff --git a/plugin/plugin.json b/plugin/plugin.json
index ffb93ba6..81de885f 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -1,10 +1,10 @@
 {
   "pluginName": "快捷命令",
-  "description": "快速打开软件、网址及运行批处理、shell等脚本，免编写插件使用utools的api及实现UI交互",
+  "description": "实现具备UI交互的自动化操作，支持可视化拖拽及直接编写脚本两种形式。1.可视化拖拽支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过20种类型的自动化处理，2.编写脚本支持utools的api，python、js、shell、cmd等多种脚本语言。关联关键词：自动化、可视化、RPA",
   "main": "index.html",
   "homepage": "https://github.com/fofolee/uTools-quickcommand",
   "publishPage": "https://yuanliao.info/d/424",
-  "version": "4.0.3",
+  "version": "5.0.0",
   "development": {
     "main": "http://127.0.0.1:8080/"
   },

From 522c452f851704a3a30f98b22aad8f5fdbfbcbf0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 10:02:24 +0800
Subject: [PATCH 188/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AFBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandButtons.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/composer/card/CommandButtons.vue b/src/components/composer/card/CommandButtons.vue
index 14cb9387..b804a7b5 100644
--- a/src/components/composer/card/CommandButtons.vue
+++ b/src/components/composer/card/CommandButtons.vue
@@ -10,10 +10,7 @@
         <q-icon
           name="output"
           v-if="!command.neverHasOutput"
-          :class="[
-            'output-btn',
-            command.outputVariable ? 'output-btn-active' : '',
-          ]"
+          :class="['output-btn', outputLength > 0 ? 'output-btn-active' : '']"
           @click="showOutputEditor = true"
         >
           <q-tooltip>

From c44016a5ca3509dbf62ff08afc911758dbd140b5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 13:42:35 +0800
Subject: [PATCH 189/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A1=B5=E9=9D=A2=E8=BE=93=E5=87=BA=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CommandLanguageBar.vue | 4 ++++
 src/pages/RunComposerPage.vue                | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index 96b70d3c..1071d73e 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -269,7 +269,11 @@ export default {
         this.isSettingsVisible = true;
       }
       if (newProgram === "html") {
+        // 如果是html命令，则设置output为html
         newCommand.output = "html";
+      } else if (this.isRunCodePage) {
+        // 否则，运行代码页面，恢复output为text
+        newCommand.output = "text";
       }
       const featuresIcon = this.currentCommand.features.icon || "";
       if (featuresIcon.slice(0, 10) !== "data:image") {
diff --git a/src/pages/RunComposerPage.vue b/src/pages/RunComposerPage.vue
index c312eca5..991e84b6 100644
--- a/src/pages/RunComposerPage.vue
+++ b/src/pages/RunComposerPage.vue
@@ -19,6 +19,7 @@ export default {
       ...defaultCommand,
       ...savedCommand,
       program: "quickcomposer",
+      output: "text",
     };
   },
 };

From fec8eb3f0935f445432afbfe82cb406a386513eb Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 15:31:33 +0800
Subject: [PATCH 190/332] =?UTF-8?q?=E8=8E=B7=E5=8F=96CSS=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=AE=9E=E4=BE=8B=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/varinput/CssSelector.vue        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/composer/common/varinput/CssSelector.vue b/src/components/composer/common/varinput/CssSelector.vue
index 0b5db1b0..42a150af 100644
--- a/src/components/composer/common/varinput/CssSelector.vue
+++ b/src/components/composer/common/varinput/CssSelector.vue
@@ -12,10 +12,15 @@ export default defineComponent({
   emits: ["emitValue"],
   methods: {
     async inspectElement() {
-      window.utools.hideMainWindow();
-      const selectElement = await quickcomposer.browser.getSelector();
-      window.utools.showMainWindow();
-      this.$emit("emitValue", "str", selectElement || "");
+      try {
+        const tab = await quickcomposer.browser.getCurrentTab();
+        window.utools.hideMainWindow();
+        const selectElement = await quickcomposer.browser.getSelector(tab);
+        window.utools.showMainWindow();
+        this.$emit("emitValue", "str", selectElement || "");
+      } catch (error) {
+        quickcommand.showMessageBox(error.toString(), "error");
+      }
     },
   },
 });

From 9f7d8dde052c954d6a9935e11772d04326edaa8a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 15:42:49 +0800
Subject: [PATCH 191/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue            |  9 +++++++++
 .../composer/flow/ComposerButtons.vue           | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 5fa696b3..45221433 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -146,6 +146,11 @@ export default defineComponent({
       },
     ];
 
+    const clearFlows = () => {
+      updateFlows(defaultFlow);
+      activeTab.value = "main";
+    };
+
     if (!props.modelValue.flows || props.modelValue.flows.length === 0) {
       updateFlows(defaultFlow);
     }
@@ -258,6 +263,7 @@ export default defineComponent({
       activeTab,
       getOutputVariables,
       updateFlows,
+      clearFlows,
     };
   },
   data() {
@@ -373,6 +379,9 @@ export default defineComponent({
             this.addFlow(payload);
           }
           break;
+        case "clear":
+          this.clearFlows();
+          break;
         default:
           this.$emit("action", type, payload);
       }
diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index 064a2233..aebfb0b5 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -54,6 +54,15 @@
       >
         <q-tooltip>保存</q-tooltip>
       </q-btn>
+      <q-btn
+        dense
+        flat
+        icon="delete_sweep"
+        @click="handleClear"
+        v-if="!disabledButtons.includes('clear')"
+      >
+        <q-tooltip>清空所有流程</q-tooltip>
+      </q-btn>
       <q-btn
         flat
         dense
@@ -138,6 +147,14 @@ export default defineComponent({
       const code = generateFlowsCode(this.flows);
       this.$emit("action", "apply", code);
     },
+    handleClear() {
+      quickcommand
+        .showConfirmBox("确定要清空所有流程吗？", "FBI WARNING")
+        .then((isConfirm) => {
+          if (!isConfirm) return;
+          this.$emit("action", "clear");
+        });
+    },
   },
 });
 </script>

From 5a65f4c5f97fa43a9e3db421562619b4164e4509 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 16:37:42 +0800
Subject: [PATCH 192/332] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu/UtilityFeaturesMenu.vue | 31 +++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/menu/UtilityFeaturesMenu.vue b/src/components/menu/UtilityFeaturesMenu.vue
index 6008f54b..3b12ac6a 100644
--- a/src/components/menu/UtilityFeaturesMenu.vue
+++ b/src/components/menu/UtilityFeaturesMenu.vue
@@ -110,11 +110,9 @@
           </template>
           <q-tooltip>
             通过本地监听
-            {{
-              $root.nativeProfile.serverPort
-            }}
+            {{ $root.nativeProfile.serverPort }}
             端口的形式，接收用户传送过来的参数，然后根据参数执行不同的操作
-            <br />需要配置插件跟随 utools 启动和保留后台<br />也可在主输入框通过关键字「快捷命令服务配置」进入
+            <br />需要配置插件跟随 utools 启动和保留后台<br />可在主输入框通过关键字「快捷命令服务配置」进入
           </q-tooltip>
         </q-field>
       </q-item>
@@ -132,7 +130,26 @@
             <q-btn flat @click="$router.push('code')" icon="open_in_new" />
           </template>
           <q-tooltip>
-            一个可以直接运行代码的代码编辑器<br />也可在主输入框输入关键字「RunCode」进入
+            一个可以直接运行代码的代码编辑器<br />可在主输入框输入关键字「RunCode」进入
+          </q-tooltip>
+        </q-field>
+      </q-item>
+      <q-item>
+        <q-item-section side>
+          <q-icon name="view_timeline" />
+        </q-item-section>
+        <q-field dense outlined style="width: 280px">
+          <template v-slot:control>
+            <div class="self-center full-width no-outline" tabindex="0">
+              可视化编排
+            </div>
+          </template>
+          <template v-slot:append>
+            <q-btn flat @click="$router.push('composer')" icon="open_in_new" />
+          </template>
+          <q-tooltip>
+            一个可视化编排工具，包含可以直接运行的超过一百种实用工具，也可以组合功能创建自动化流程
+            <br />可在主输入框输入关键字「RunComposer」进入
           </q-tooltip>
         </q-field>
       </q-item>
@@ -154,9 +171,7 @@ export default {
   methods: {
     toggleFeature(type, enable) {
       enable
-        ? this.utools.setFeature(
-            window.lodashM.cloneDeep(features[type])
-          )
+        ? this.utools.setFeature(window.lodashM.cloneDeep(features[type]))
         : this.utools.removeFeature(features[type].code);
     },
   },

From 02f81db47c5638abc400ab18b0d0169066880564 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 16:55:45 +0800
Subject: [PATCH 193/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/getUtoolsPlugins.js |  5 +++--
 plugin/plugin.json             |  2 +-
 src/components/menu/index.vue  | 18 +++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugin/lib/getUtoolsPlugins.js b/plugin/lib/getUtoolsPlugins.js
index f5c81ba8..d6579e76 100644
--- a/plugin/lib/getUtoolsPlugins.js
+++ b/plugin/lib/getUtoolsPlugins.js
@@ -1,10 +1,11 @@
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
-const _ = require("lodash");
 
 const pluginInfo = () => {
-  return JSON.parse(fs.readFileSync(path.join(__dirname, "plugin.json")));
+  return JSON.parse(
+    fs.readFileSync(path.resolve(__dirname, "..", "plugin.json"))
+  );
 };
 
 const getUtoolsPlugins = () => {
diff --git a/plugin/plugin.json b/plugin/plugin.json
index 81de885f..2ca140a3 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "pluginName": "快捷命令",
-  "description": "实现具备UI交互的自动化操作，支持可视化拖拽及直接编写脚本两种形式。1.可视化拖拽支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过20种类型的自动化处理，2.编写脚本支持utools的api，python、js、shell、cmd等多种脚本语言。关联关键词：自动化、可视化、RPA",
+  "description": "实现具备UI交互的自动化操作，支持可视化拖拽及直接编写脚本两种形式。1.可视化拖拽：支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过20种类型的自动化处理，2.编写脚本：支持utools的api，python、js、shell、cmd等多种脚本语言。关联关键词：自动化、可视化、RPA",
   "main": "index.html",
   "homepage": "https://github.com/fofolee/uTools-quickcommand",
   "publishPage": "https://yuanliao.info/d/424",
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 6c05c2a1..fdad1e53 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -103,16 +103,16 @@
 </template>
 
 <script>
-import AboutThis from "../popup/AboutThis";
-import PanelSetting from "../popup/PanelSetting";
-import UserInfo from "../popup/UserInfo";
-import CommandManageMenu from "./CommandManageMenu.vue";
-import UtilityFeaturesMenu from "./UtilityFeaturesMenu.vue";
-import EnvConfigMenu from "./EnvConfigMenu.vue";
-import PersonalizeMenu from "./PersonalizeMenu.vue";
-import UserData from "../popup/UserData.vue";
+import AboutThis from "components/popup/AboutThis";
+import PanelSetting from "components/popup/PanelSetting";
+import UserInfo from "components/popup/UserInfo";
+import CommandManageMenu from "components/menu/CommandManageMenu.vue";
+import UtilityFeaturesMenu from "components/menu/UtilityFeaturesMenu.vue";
+import EnvConfigMenu from "components/menu/EnvConfigMenu.vue";
+import PersonalizeMenu from "components/menu/PersonalizeMenu.vue";
+import UserData from "components/popup/UserData.vue";
 import { utoolsFull } from "js/utools.js";
-import { useCommandManager } from "src/js/commandManager";
+import { useCommandManager } from "js/commandManager";
 
 export default {
   name: "ConfigurationMenu",

From 856e38172625f83ff286bfdcbb7b2323ac83307f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 16 Feb 2025 18:27:24 +0800
Subject: [PATCH 194/332] =?UTF-8?q?=E4=B8=BA=E7=A7=BB=E9=99=A4=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E8=A7=84=E5=88=99=E7=9A=84q-ico=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E9=98=BB=E6=AD=A2=E5=86=92?=
 =?UTF-8?q?=E6=B3=A1=E5=A4=84=E7=90=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/MatchRuleEditor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
index c1a50756..4553e69f 100644
--- a/src/components/editor/MatchRuleEditor.vue
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -95,7 +95,7 @@
               <template v-slot:append>
                 <q-icon
                   name="cancel"
-                  @click="removeRule(index)"
+                  @click.stop="removeRule(index)"
                   size="12px"
                   class="cursor-pointer text-grey"
                 />
@@ -120,7 +120,7 @@
                   </div>
                   <q-icon
                     name="cancel"
-                    @click="removeRule(index + keyRules.length)"
+                    @click.stop="removeRule(index + keyRules.length)"
                     size="12px"
                     class="cursor-pointer text-grey"
                   />

From bf1d6ff0070aeb4c38f4c7e8e735a2f53b1d7d3b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 00:05:47 +0800
Subject: [PATCH 195/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=B8=B4=E6=97=B6=E5=8F=98=E9=87=8F=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF=E5=92=8C=E6=9C=AA=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue | 12 +++++++++---
 src/components/composer/FlowTabs.vue     |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index a0a00c5b..1d308cd6 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -258,8 +258,11 @@ export default defineComponent({
       }
     },
     getAvailableOutputVariable() {
-      let outputVariable = this.localCommand.outputVariable || {};
-      if (!outputVariable.name && !outputVariable.details) {
+      let outputVariable = { ...this.localCommand.outputVariable };
+      if (
+        window.lodashM.isEmpty(outputVariable.name) &&
+        window.lodashM.isEmpty(outputVariable.details)
+      ) {
         outputVariable.name = `temp_${Date.now()}`;
       }
       return outputVariable;
@@ -279,7 +282,10 @@ export default defineComponent({
     handleAddPrint() {
       // 创建一个打印命令
       const outputVariable = this.getAvailableOutputVariable();
-      this.localCommand.outputVariable = outputVariable;
+      this.localCommand = {
+        ...this.localCommand,
+        outputVariable,
+      };
       const consoleLogVars =
         this.getAvailableOutputVariableName(outputVariable);
 
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 45221433..24cfb64b 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -147,12 +147,12 @@ export default defineComponent({
     ];
 
     const clearFlows = () => {
-      updateFlows(defaultFlow);
+      updateFlows(window.lodashM.cloneDeep(defaultFlow));
       activeTab.value = "main";
     };
 
     if (!props.modelValue.flows || props.modelValue.flows.length === 0) {
-      updateFlows(defaultFlow);
+      updateFlows(window.lodashM.cloneDeep(defaultFlow));
     }
 
     const flows = computed(() => props.modelValue.flows || []);

From 49fdd973c1ee68c6289d08e4829f9268da33bb0c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 00:06:08 +0800
Subject: [PATCH 196/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E6=8E=A7=E5=88=B6=E7=BD=91=E7=BB=9C=E8=A2=AB=E9=98=BB?=
 =?UTF-8?q?=E5=A1=9E=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/cdp.js       |  4 +--
 plugin/lib/quickcomposer/browser/network.js   | 32 ++++++++++++++++++-
 plugin/lib/quickcomposer/browser/url.js       | 22 +++++++++++++
 .../composer/common/varinput/CssSelector.vue  |  5 ++-
 4 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/cdp.js b/plugin/lib/quickcomposer/browser/cdp.js
index 02cf5669..609deb95 100644
--- a/plugin/lib/quickcomposer/browser/cdp.js
+++ b/plugin/lib/quickcomposer/browser/cdp.js
@@ -9,12 +9,11 @@ const initCDP = async (targetId) => {
       port,
     });
 
-    const { Page, Runtime, Target, Network, Emulation, DOM, Fetch } = client;
+    const { Page, Runtime, Target, Network, Emulation, DOM } = client;
     await Promise.all([
       Page.enable(),
       Runtime.enable(),
       DOM.enable(),
-      Fetch.enable(),
     ]);
 
     return {
@@ -25,7 +24,6 @@ const initCDP = async (targetId) => {
       Network,
       Emulation,
       DOM,
-      Fetch,
     };
   } catch (err) {
     console.log(err);
diff --git a/plugin/lib/quickcomposer/browser/network.js b/plugin/lib/quickcomposer/browser/network.js
index 0b37a9e5..dc656ad4 100644
--- a/plugin/lib/quickcomposer/browser/network.js
+++ b/plugin/lib/quickcomposer/browser/network.js
@@ -1,5 +1,35 @@
-const { initCDP, cleanupCDP } = require("./cdp");
 const { searchTarget } = require("./tabs");
+const { getCurrentClientPort } = require("./client");
+const CDP = require("chrome-remote-interface");
+
+// 不从cdp.js导入initCDP，单独启用一个Fetch域的CDP
+const initCDP = async (targetId) => {
+  try {
+    const port = await getCurrentClientPort();
+    const client = await CDP({
+      target: targetId,
+      port,
+    });
+
+    const { Fetch } = client;
+    await Promise.all([Fetch.enable()]);
+
+    return { Fetch };
+  } catch (err) {
+    throw new Error(`连接到浏览器失败: ${err.message}`);
+  }
+};
+
+const cleanupCDP = async (targetId) => {
+  try {
+    // 直接关闭传入的 client
+    if (targetId?.client) {
+      await targetId.client.close();
+    }
+  } catch (error) {
+    console.log("关闭CDP连接失败:", error);
+  }
+};
 
 // 使用正则替换内容
 const replaceWithRegex = (content, pattern, replacement) => {
diff --git a/plugin/lib/quickcomposer/browser/url.js b/plugin/lib/quickcomposer/browser/url.js
index 596db30d..077944fb 100644
--- a/plugin/lib/quickcomposer/browser/url.js
+++ b/plugin/lib/quickcomposer/browser/url.js
@@ -1,5 +1,7 @@
 const { initCDP, cleanupCDP } = require("./cdp");
 const { searchTarget } = require("./tabs");
+const CDP = require("chrome-remote-interface");
+
 
 const getUrl = async (tab) => {
   const target = await searchTarget(tab);
@@ -15,6 +17,26 @@ const setUrl = async (tab, url) => {
   await Page.navigate({ url });
   await Page.loadEventFired();
   await cleanupCDP(target.id);
+  // let client;
+  // try {
+  //   // 连接到浏览器实例（默认端口 9222）
+  //   client = await CDP();
+  //   const { Page } = client;
+
+  //   // 启用 Page 域的监听
+  //   await Page.enable();
+
+  //   // 导航到指定 URL
+  //   await Page.navigate({ url });
+
+  //   // 等待页面加载完成（可选）
+  //   await new Promise((resolve) => Page.loadEventFired(resolve));
+  //   console.log("页面加载完成");
+  // } catch (err) {
+  //   console.error("发生错误:", err);
+  // } finally {
+  //   if (client) await client.close();
+  // }
 };
 
 module.exports = {
diff --git a/src/components/composer/common/varinput/CssSelector.vue b/src/components/composer/common/varinput/CssSelector.vue
index 42a150af..00fddae9 100644
--- a/src/components/composer/common/varinput/CssSelector.vue
+++ b/src/components/composer/common/varinput/CssSelector.vue
@@ -15,7 +15,10 @@ export default defineComponent({
       try {
         const tab = await quickcomposer.browser.getCurrentTab();
         window.utools.hideMainWindow();
-        const selectElement = await quickcomposer.browser.getSelector(tab);
+        const selectElement = await quickcomposer.browser.getSelector({
+          by: "id",
+          searchValue: tab.id,
+        });
         window.utools.showMainWindow();
         this.$emit("emitValue", "str", selectElement || "");
       } catch (error) {

From 66a4283b9b0a7b18769f67f477b5390206204265 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 01:14:31 +0800
Subject: [PATCH 197/332] =?UTF-8?q?=E4=BC=98=E5=8C=96CommandConfig?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=8C=E8=8A=82=E7=9C=81=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue        |   1 +
 src/components/composer/FlowTabs.vue    |   1 +
 src/components/editor/CommandConfig.vue | 127 ++++++++++++++----------
 3 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index facb4c91..96dfce2e 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -11,6 +11,7 @@
     <CommandConfig
       v-if="!isRunCodePage"
       v-model="commandManager.state.currentCommand"
+      from="quickcommand"
       @update:is-expanded="isConfigExpanded = $event"
       :expand-on-focus="true"
       class="command-config"
diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 24cfb64b..2d1a0fa7 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -76,6 +76,7 @@
         class="command-config-panel"
         v-if="flow.id === 'main' && showCommandConfig"
         :model-value="commandConfig"
+        from="quickcomposer"
         @update:model-value="updateCommandConfig"
       />
       <ComposerFlow
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index b7af58c5..5cb6251e 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -3,9 +3,10 @@
     v-model="isExpanded"
     @update:model-value="$emit('update:is-expanded', $event)"
     class="command-composer command-config"
+    expand-icon-toggle
   >
     <template v-slot:header>
-      <div class="row basic-config">
+      <div class="row basic-config q-col-gutter-sm">
         <q-avatar size="36px" square class="featureIco">
           <q-img
             @click.stop="showIconPicker = true"
@@ -15,7 +16,7 @@
         <q-input
           ref="explainInput"
           :model-value="currentCommand.features.explain"
-          borderless
+          filled
           dense
           @update:model-value="updateModelValue('features.explain', $event)"
           @click.stop
@@ -24,6 +25,28 @@
           class="col"
         >
         </q-input>
+        <q-select
+          class="col-6 tag-select"
+          :model-value="currentCommand.tags"
+          @update:model-value="updateModelValue('tags', $event)"
+          :options="allQuickCommandTags"
+          @focus="expandOnFocus && updateExpanded(true)"
+          dense
+          options-dense
+          filled
+          use-input
+          use-chips
+          multiple
+          hide-dropdown-icon
+          new-value-mode="add-unique"
+          popup-content-class="command-tag-popup"
+          placeholder="标签，回车添加，最多3个"
+          max-values="3"
+          @new-value="tagVerify"
+          input-debounce="0"
+          ref="commandTagRef"
+          @blur="(e) => autoAddInputVal(e, $refs.commandTagRef)"
+        />
       </div>
     </template>
 
@@ -59,42 +82,19 @@
         />
       </div>
 
-      <!-- 标签 -->
+      <!-- 输出和搜索面板推送 -->
       <div class="config-section">
-        <div class="section-title">
-          <q-icon name="label" size="16px" />
-          <span class="q-ml-sm">标签</span>
-        </div>
-        <q-select
-          :model-value="currentCommand.tags"
-          @update:model-value="updateModelValue('tags', $event)"
-          :options="allQuickCommandTags"
-          dense
-          options-dense
-          filled
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          new-value-mode="add-unique"
-          popup-content-class="command-tag-popup"
-          placeholder="回车添加，最多3个"
-          max-values="3"
-          @new-value="tagVerify"
-          input-debounce="0"
-          ref="commandTagRef"
-          @blur="(e) => autoAddInputVal(e, $refs.commandTagRef)"
-        />
-      </div>
-
-      <!-- 输出 -->
-      <div class="config-section">
-        <div class="section-title">
-          <q-icon name="output" size="16px" />
-          <span class="q-ml-sm">输出</span>
-        </div>
         <div class="row q-col-gutter-sm">
-          <div class="col-12">
+          <div
+            :class="{
+              'col-12': from === 'quickcomposer',
+              'col-8': from === 'quickcommand',
+            }"
+          >
+            <div class="section-title">
+              <q-icon name="output" size="16px" />
+              <span class="q-ml-sm">输出</span>
+            </div>
             <ButtonGroup
               :model-value="currentCommand.output"
               :options="outputTypesOptionsDy"
@@ -102,25 +102,29 @@
               height="26px"
             />
           </div>
-          <div class="col-12">
+          <div
+            :class="{
+              'col-12': from === 'quickcomposer',
+              'col-4': from === 'quickcommand',
+            }"
+            :style="{
+              'margin-top': from === 'quickcomposer' ? '-4px' : '0',
+            }"
+          >
             <div class="section-title">
               <q-icon name="search" size="16px" />
-              <span class="q-ml-sm"
-                >搜索面板推送
-                <q-btn
-                  flat
-                  round
-                  size="xs"
-                  icon="help"
-                  @click="showMainPushHelp"
-                />
-              </span>
+              <span class="q-ml-sm q-mr-xs"> 搜索面板推送 </span>
+              <q-icon
+                name="help"
+                class="cursor-pointer"
+                @click.stop="showMainPushHelp"
+              />
             </div>
             <ButtonGroup
               :model-value="currentCommand.features.mainPush"
               :options="searchPushOptions"
               @update:model-value="handleMainPushChange"
-              height="30px"
+              height="26px"
             />
           </div>
         </div>
@@ -179,6 +183,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    from: {
+      type: String,
+      default: "quickcommand",
+    },
   },
   emits: ["update:modelValue", "update:is-expanded"],
   data() {
@@ -315,9 +323,19 @@ export default defineComponent({
   width: 100%;
 }
 
-.basic-config :deep(.q-field__native),
-.basic-config :deep(.q-field__control) {
-  height: 36px;
+.tag-select :deep(.q-field__control) {
+  overflow-x: auto;
+}
+
+.tag-select :deep(.q-field__native) {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+  padding-bottom: 4px;
+}
+
+.tag-select :deep(.q-field__native::-webkit-scrollbar) {
+  height: 1px;
 }
 
 .command-config :deep(.q-item) {
@@ -327,7 +345,12 @@ export default defineComponent({
 }
 
 .command-config :deep(.q-item__section--side) {
-  padding: 0;
+  padding-left: 8px;
+  padding-right: 0;
+}
+
+.command-config :deep(.q-item__section--side .q-icon) {
+  top: 13px;
 }
 
 .command-config :deep(.q-item:hover) {

From 45b22f6115cfb0c0d19da3768de2b177ad6a17ae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 01:22:37 +0800
Subject: [PATCH 198/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E7=BC=96=E6=8E=92=E5=B8=AE=E5=8A=A9=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/flow/ComposerButtons.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index aebfb0b5..b4211303 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -36,6 +36,9 @@
         v-if="isDev"
       >
       </q-btn>
+      <q-btn flat dense icon="help" @click="showHelp" v-if="isDev">
+        <q-tooltip>帮助</q-tooltip>
+      </q-btn>
       <q-btn
         dense
         flat
@@ -155,6 +158,9 @@ export default defineComponent({
           this.$emit("action", "clear");
         });
     },
+    showHelp() {
+      window.showUb.help("#TMtYg");
+    },
   },
 });
 </script>

From e130b050333eebdeb0729c171ea8a20d1a633b48 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 08:48:29 +0800
Subject: [PATCH 199/332] =?UTF-8?q?linux=E4=B8=8B=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=AE=89=E8=A3=85=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quickcomposer/simulate/screenCapture.js   | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/plugin/lib/quickcomposer/simulate/screenCapture.js b/plugin/lib/quickcomposer/simulate/screenCapture.js
index 9bb7fa91..954b720d 100644
--- a/plugin/lib/quickcomposer/simulate/screenCapture.js
+++ b/plugin/lib/quickcomposer/simulate/screenCapture.js
@@ -13,12 +13,7 @@ const unlinkAsync = promisify(fs.unlink);
 async function captureWindowsScreen() {
   const tmpFile = path.join(os.tmpdir(), `screen-${Date.now()}.png`);
   try {
-    await runCsharpFeature("utils", [
-      "-type",
-      "screenshot",
-      "-path",
-      tmpFile,
-    ]);
+    await runCsharpFeature("utils", ["-type", "screenshot", "-path", tmpFile]);
     const imageBuffer = await readFileAsync(tmpFile);
     return `data:image/png;base64,${imageBuffer.toString("base64")}`;
   } catch (error) {
@@ -64,7 +59,9 @@ async function captureLinuxScreen() {
           await execFileAsync("which", ["import"]);
           tool = "import";
         } catch {
-          console.error("未找到可用的Linux截图工具");
+          quickcommand.showSystemMessageBox(
+            "请先安装截图工具，命令：sudo apt install scrot"
+          );
           return null;
         }
       }
@@ -86,8 +83,7 @@ async function captureLinuxScreen() {
     const imageBuffer = await readFileAsync(tmpFile);
     return `data:image/png;base64,${imageBuffer.toString("base64")}`;
   } catch (error) {
-    console.error("Linux截图失败:", error);
-    return null;
+    throw error;
   } finally {
     await unlinkAsync(tmpFile).catch(() => {});
   }
@@ -95,18 +91,13 @@ async function captureLinuxScreen() {
 
 // 统一的截图接口
 async function captureFullScreen() {
-  try {
-    if (process.platform === "darwin") {
-      return await captureMacScreen();
-    } else if (process.platform === "win32") {
-      return await captureWindowsScreen();
-    } else if (process.platform === "linux") {
-      return await captureLinuxScreen();
-    }
-  } catch (error) {
-    console.error("截图失败:", error);
+  if (process.platform === "darwin") {
+    return await captureMacScreen();
+  } else if (process.platform === "win32") {
+    return await captureWindowsScreen();
+  } else if (process.platform === "linux") {
+    return await captureLinuxScreen();
   }
-  return null;
 }
 
 function captureAreaScreen() {

From 98c9b5ba331f2d51215192c892d524cd0f771550 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 08:52:14 +0800
Subject: [PATCH 200/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlinux=E4=B8=8B?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue             | 1 -
 src/components/editor/CommandLanguageBar.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 96dfce2e..0a5dc51b 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -60,7 +60,6 @@ import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
 import CommandComposer from "components/composer/CommandComposer.vue";
 import programs from "js/options/programs.js";
-import { dbManager } from "js/utools.js";
 import { useCommandManager } from "js/commandManager.js";
 
 // 预加载 MonacoEditor
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguageBar.vue
index 1071d73e..3f35a210 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguageBar.vue
@@ -250,7 +250,7 @@ export default {
       commandTypes,
       isSettingsVisible: false,
       showUserData: false,
-      ctrlKey: utools.isMacOs ? "⌘" : "⌃",
+      ctrlKey: window.utools.isMacOS() ? "⌘" : "⌃",
     };
   },
   computed: {

From 2476037c0929a1014e1cea7aab164ba6a8306c77 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 09:04:41 +0800
Subject: [PATCH 201/332] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=92=8C=E7=8E=AF=E5=A2=83=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?win=E8=87=AA=E5=8A=A8=E5=8C=96=E3=80=81mac=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E5=92=8C=E8=A7=86=E9=A2=91=E5=A4=84=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/video/ffmpeg.js |  6 ++++++
 src/js/composer/commands/index.js        | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugin/lib/quickcomposer/video/ffmpeg.js b/plugin/lib/quickcomposer/video/ffmpeg.js
index 6f048d48..2402d91d 100644
--- a/plugin/lib/quickcomposer/video/ffmpeg.js
+++ b/plugin/lib/quickcomposer/video/ffmpeg.js
@@ -11,6 +11,12 @@
  * @returns {Promise} 返回Promise
  */
 async function runFFmpeg(args, options = {}) {
+  if (!utools.runFFmpeg) {
+    quickcommand.showSystemMessageBox(
+      "请先升级uTools到6.1.0及以上版本"
+    );
+    return;
+  }
   const {
     title = "FFmpeg处理",
     text = "处理中...",
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index f8dcea82..46ea57df 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -21,21 +21,16 @@ import { scriptCommands } from "./scriptCommands";
 import { browserCommands } from "./browserCommands";
 import { videoCommands } from "./videoCommands";
 
-const platformCommands = {
-  win32: [windowsCommands],
-  darwin: [macosCommands],
-  linux: [],
-};
-
 export const commandCategories = [
   fileCommands,
   networkCommands,
   systemCommands,
   audioCommands,
   imageCommands,
-  ...(utools.runFFmpeg ? [videoCommands] : []),
+  videoCommands,
   utoolsCommands,
-  ...platformCommands[window.processPlatform],
+  windowsCommands,
+  macosCommands,
   browserCommands,
   dataCommands,
   codingCommands,

From 174d3ed7e7830966109cc7374706a96652704959 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 11:46:08 +0800
Subject: [PATCH 202/332] =?UTF-8?q?=E9=87=8D=E5=86=99=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E6=89=BE=E5=9B=BE=E7=AE=97=E6=B3=95=EF=BC=8C=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E5=87=86=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/quickcomposer/simulate/imageFinder.js | 273 +++++-------------
 .../composer/simulate/ImageSearchEditor.vue   |  32 +-
 2 files changed, 95 insertions(+), 210 deletions(-)

diff --git a/plugin/lib/quickcomposer/simulate/imageFinder.js b/plugin/lib/quickcomposer/simulate/imageFinder.js
index 81381097..879e674c 100644
--- a/plugin/lib/quickcomposer/simulate/imageFinder.js
+++ b/plugin/lib/quickcomposer/simulate/imageFinder.js
@@ -1,68 +1,10 @@
 const { nativeImage } = require("electron");
 const { captureScreen } = require("./screenCapture");
 
-// 将颜色值映射到8个区间
-function mapColorValue(val) {
-  if (val > 223) return 7; // [224 ~ 255]
-  if (val > 191) return 6; // [192 ~ 223]
-  if (val > 159) return 5; // [160 ~ 191]
-  if (val > 127) return 4; // [128 ~ 159]
-  if (val > 95) return 3; // [96 ~ 127]
-  if (val > 63) return 2; // [64 ~ 95]
-  if (val > 31) return 1; // [32 ~ 63]
-  return 0; // [0 ~ 31]
-}
-
-// 计算图像特征向量
-function calculateFeatureVector(
-  buffer,
-  width,
-  height,
-  startX = 0,
-  startY = 0,
-  w = width,
-  h = height
-) {
-  // 8^4 = 4096 维向量，表示RGBA各8个区间的组合
-  const vector = new Array(8 * 8 * 8 * 8).fill(0);
-
-  for (let y = startY; y < startY + h; y++) {
-    for (let x = startX; x < startX + w; x++) {
-      const idx = (y * width + x) * 4;
-      // 计算四个通道的量化值
-      const r = mapColorValue(buffer[idx]);
-      const g = mapColorValue(buffer[idx + 1]);
-      const b = mapColorValue(buffer[idx + 2]);
-      const a = mapColorValue(buffer[idx + 3]);
-
-      // 计算在向量中的位置
-      const vectorIdx = r * 512 + g * 64 + b * 8 + a;
-      vector[vectorIdx]++;
-    }
-  }
-
-  return vector;
-}
-
-// 计算余弦相似度
-function calculateCosineSimilarity(v1, v2) {
-  let dotProduct = 0;
-  let norm1 = 0;
-  let norm2 = 0;
-
-  for (let i = 0; i < v1.length; i++) {
-    dotProduct += v1[i] * v2[i];
-    norm1 += v1[i] * v1[i];
-    norm2 += v2[i] * v2[i];
-  }
-
-  return dotProduct / (Math.sqrt(norm1) * Math.sqrt(norm2));
-}
-
 // 获取显示器缩放比例
 function getDisplayScale() {
+  // MacOS 上要考虑缩放比例
   if (process.platform === "darwin") {
-    // 在 macOS 上，通过比较实际分辨率和报告的分辨率来计算缩放比例
     const primaryDisplay = utools.getPrimaryDisplay();
     const { scaleFactor } = primaryDisplay;
     return scaleFactor;
@@ -71,153 +13,94 @@ function getDisplayScale() {
 }
 
 // 在屏幕上查找图片
-async function findImage(targetImageData, options = {}) {
-  try {
-    // 获取屏幕截图
-    const screenDataUrl = await captureScreen();
-    if (!screenDataUrl) return null;
-
-    // 获取显示器缩放比例
-    const scale = getDisplayScale();
-
-    // 读取屏幕截图
-    const screenImage = nativeImage.createFromDataURL(screenDataUrl);
-    const screenBuffer = screenImage.toBitmap();
-    const { width: actualWidth, height: actualHeight } = screenImage.getSize();
-
-    // 计算缩放后的实际尺寸
-    const screenWidth = Math.round(actualWidth / scale);
-    const screenHeight = Math.round(actualHeight / scale);
-
-    // 从 base64 字符串创建目标图片
-    const targetImage = nativeImage.createFromDataURL(targetImageData);
-    const targetBuffer = targetImage.toBitmap();
-    const { width: targetWidth, height: targetHeight } = targetImage.getSize();
-
-    // 计算目标图片的特征向量
-    const targetVector = calculateFeatureVector(
-      targetBuffer,
-      targetWidth,
-      targetHeight
-    );
-
-    // 设置匹配阈值
-    const threshold = options.threshold || 0.9;
-
-    let bestMatch = null;
-    let bestSimilarity = 0;
-
-    // 使用滑动窗口搜索
-    const stepSize = Math.round(8 * scale); // 根据缩放比例调整步长
-    for (let y = 0; y <= actualHeight - targetHeight; y += stepSize) {
-      for (let x = 0; x <= actualWidth - targetWidth; x += stepSize) {
-        // 计算当前区域的特征向量
-        const regionVector = calculateFeatureVector(
-          screenBuffer,
-          actualWidth,
-          actualHeight,
-          x,
-          y,
-          targetWidth,
-          targetHeight
-        );
-
-        // 计算相似度
-        const similarity = calculateCosineSimilarity(
-          targetVector,
-          regionVector
-        );
-
-        // 更新最佳匹配
-        if (similarity > bestSimilarity) {
-          bestSimilarity = similarity;
-          bestMatch = { x: Math.round(x / scale), y: Math.round(y / scale) };
-
-          // 如果相似度已经很高，进行精确搜索
-          if (similarity >= threshold) {
-            // 在周围进行精确搜索，注意搜索范围也要考虑缩放
-            const searchRange = Math.round(4 * scale);
-            for (let dy = -searchRange; dy <= searchRange; dy++) {
-              for (let dx = -searchRange; dx <= searchRange; dx++) {
-                const newX = x + dx;
-                const newY = y + dy;
-
-                if (
-                  newX < 0 ||
-                  newY < 0 ||
-                  newX > actualWidth - targetWidth ||
-                  newY > actualHeight - targetHeight
-                ) {
-                  continue;
-                }
+async function findImage(subDataURL, options = {}) {
+  const mainDataURL = await captureScreen();
+  if (!mainDataURL) return null;
+  // 解析主图和子图
+  const mainImg = nativeImage.createFromDataURL(mainDataURL);
+  const subImg = nativeImage.createFromDataURL(subDataURL);
+
+  // 获取图像基本信息
+  const mainSize = mainImg.getSize();
+  const subSize = subImg.getSize();
+
+  // 获取像素数据（返回Buffer，RGBA格式）
+  const mainPixels = mainImg.getBitmap();
+  const subPixels = subImg.getBitmap();
+
+  // 边界检查
+  if (subSize.width > mainSize.width || subSize.height > mainSize.height) {
+    throw new Error("要查找图片尺寸大于屏幕");
+  }
 
-                const preciseVector = calculateFeatureVector(
-                  screenBuffer,
-                  actualWidth,
-                  actualHeight,
-                  newX,
-                  newY,
-                  targetWidth,
-                  targetHeight
-                );
+  // 预提取子图首像素值（优化点）
+  const firstSubPixel = [
+    subPixels[0], // R
+    subPixels[1], // G
+    subPixels[2], // B
+    subPixels[3], // A
+  ];
+
+  // 主图遍历边界
+  const maxX = mainSize.width - subSize.width;
+  const maxY = mainSize.height - subSize.height;
+
+  // 遍历主图每个可能的位置
+  for (let y = 0; y <= maxY; y++) {
+    for (let x = 0; x <= maxX; x++) {
+      // 快速检查首像素（性能优化关键）
+      const mainOffset = (y * mainSize.width + x) * 4;
+      if (
+        mainPixels[mainOffset] !== firstSubPixel[0] ||
+        mainPixels[mainOffset + 1] !== firstSubPixel[1] ||
+        mainPixels[mainOffset + 2] !== firstSubPixel[2] ||
+        mainPixels[mainOffset + 3] !== firstSubPixel[3]
+      ) {
+        continue;
+      }
 
-                const preciseSimilarity = calculateCosineSimilarity(
-                  targetVector,
-                  preciseVector
-                );
-                if (preciseSimilarity > bestSimilarity) {
-                  bestSimilarity = preciseSimilarity;
-                  bestMatch = {
-                    x: Math.round(newX / scale),
-                    y: Math.round(newY / scale),
-                  };
-                }
-              }
-            }
+      // 完整像素比对
+      let match = true;
+      for (let subY = 0; subY < subSize.height; subY++) {
+        for (let subX = 0; subX < subSize.width; subX++) {
+          // 计算像素位置
+          const mainPixelPos = ((y + subY) * mainSize.width + (x + subX)) * 4;
+          const subPixelPos = (subY * subSize.width + subX) * 4;
+
+          // 精确匹配每个通道
+          if (
+            mainPixels[mainPixelPos] !== subPixels[subPixelPos] ||
+            mainPixels[mainPixelPos + 1] !== subPixels[subPixelPos + 1] ||
+            mainPixels[mainPixelPos + 2] !== subPixels[subPixelPos + 2] ||
+            mainPixels[mainPixelPos + 3] !== subPixels[subPixelPos + 3]
+          ) {
+            match = false;
+            break;
           }
         }
-
-        // 如果找到足够好的匹配，提前返回
-        if (bestSimilarity >= threshold) {
-          const position = {
-            x: bestMatch.x,
-            y: bestMatch.y,
-            width: Math.round(targetWidth / scale),
-            height: Math.round(targetHeight / scale),
-            confidence: bestSimilarity,
-          };
-
-          clickImage(position, options.mouseAction);
-
-          return position;
-        }
+        if (!match) break;
       }
-    }
 
-    // 如果没有找到足够好的匹配，但有最佳匹配且相似度不太低，也返回
-    if (bestMatch && bestSimilarity > threshold * 0.8) {
-      const position = {
-        x: bestMatch.x,
-        y: bestMatch.y,
-        width: Math.round(targetWidth / scale),
-        height: Math.round(targetHeight / scale),
-        confidence: bestSimilarity,
-      };
-      clickImage(position, options.mouseAction);
-      return position;
+      if (match) {
+        const displayScale = getDisplayScale();
+        const position = {
+          x: Math.round(x / displayScale),
+          y: Math.round(y / displayScale),
+          width: Math.round(subSize.width / displayScale),
+          height: Math.round(subSize.height / displayScale),
+        };
+        clickImage(position, options.mouseAction);
+        return position;
+      }
     }
-
-    return null;
-  } catch (error) {
-    console.error("查找图片失败:", error);
-    return null;
   }
+
+  return null;
 }
 
 const clickImage = (position, mouseAction) => {
-  // 计算中心点
-  const centerX = position.x + position.width / 2;
-  const centerY = position.y + position.height / 2;
+  const centerX = Math.round(position.x + position.width / 2);
+  const centerY = Math.round(position.y + position.height / 2);
 
   // 根据配置执行鼠标动作
   switch (mouseAction) {
diff --git a/src/components/composer/simulate/ImageSearchEditor.vue b/src/components/composer/simulate/ImageSearchEditor.vue
index e12feb18..a4468912 100644
--- a/src/components/composer/simulate/ImageSearchEditor.vue
+++ b/src/components/composer/simulate/ImageSearchEditor.vue
@@ -36,7 +36,7 @@
 
       <!-- 配置区域 -->
       <div class="col-12 col-sm-4">
-        <div class="row q-col-gutter-sm">
+        <div class="row">
           <!-- 从剪贴板读取按钮 -->
           <div class="col-12">
             <q-btn
@@ -53,8 +53,13 @@
           <!-- 匹配阈值设置 -->
           <div class="col-12">
             <NumberInput
-              v-model="argvs.threshold"
+              v-if="false"
+              :model-value="argvs.threshold"
+              @update:model-value="updateArgvs('threshold', $event)"
               label="匹配阈值"
+              :min="0"
+              :max="1"
+              :step="0.1"
               class="border-primary"
               :command="{
                 icon: 'tune',
@@ -64,20 +69,15 @@
 
           <!-- 鼠标动作选择 -->
           <div class="col-12">
-            <q-select
-              v-model="argvs.mouseAction"
+            <ButtonGroup
+              :is-collapse="false"
+              :model-value="argvs.mouseAction"
+              @update:model-value="updateArgvs('mouseAction', $event)"
               :options="mouseActionOptions"
               label="找到后"
               class="border-primary"
-              dense
-              filled
-              emit-value
-              map-options
             >
-              <template v-slot:prepend>
-                <q-icon name="mouse" />
-              </template>
-            </q-select>
+            </ButtonGroup>
           </div>
         </div>
       </div>
@@ -97,11 +97,13 @@
 <script>
 import { defineComponent } from "vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 
 export default defineComponent({
   name: "ImageSearchEditor",
   components: {
     NumberInput,
+    ButtonGroup,
   },
 
   props: {
@@ -123,7 +125,7 @@ export default defineComponent({
       ],
       defaultArgvs: {
         imagePreview: "",
-        threshold: 0.9,
+        threshold: 1,
         mouseAction: "none",
       },
     };
@@ -266,8 +268,8 @@ export default defineComponent({
   border: 2px dashed var(--q-primary);
   border-radius: 8px;
   display: flex;
-  max-height: 128px;
-  min-height: 128px;
+  max-height: 138px;
+  min-height: 138px;
   justify-content: center;
   align-items: center;
   position: relative;

From daef39b02ab294469ab276a28ff72574254eeaae Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 12:14:28 +0800
Subject: [PATCH 203/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86Num?=
 =?UTF-8?q?berInput=E7=BB=84=E4=BB=B6=E4=B8=BAVariableInput=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/browserCommands.js  |  25 ++--
 src/js/composer/commands/dataCommands.js     | 121 +++++++++++--------
 src/js/composer/commands/imageCommands.js    |  40 +++---
 src/js/composer/commands/macosCommands.js    |   8 +-
 src/js/composer/commands/mathCommands.js     |  34 ++++--
 src/js/composer/commands/simulateCommands.js |  26 ++--
 src/js/composer/commands/systemCommands.js   |   5 +-
 src/js/composer/commands/uiCommands.js       |  19 +--
 src/js/composer/commands/utoolsCommand.js    |   8 +-
 src/js/composer/commands/windowsCommands.js  |  49 ++++----
 10 files changed, 181 insertions(+), 154 deletions(-)

diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index d4ed53ef..79e76557 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -135,12 +135,11 @@ export const browserCommands = {
           config: [
             {
               label: "浏览器实例端口",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "label",
               width: 12,
-              min: 9222,
-              max: 9322,
-              step: 1,
               placeholder: "留空关闭当前操控的实例",
             },
           ],
@@ -176,13 +175,11 @@ export const browserCommands = {
           config: [
             {
               label: "浏览器实例端口",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "label",
               width: 12,
-              defaultValue: 9222,
-              min: 9222,
-              max: 9322,
-              step: 1,
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
           ],
         },
@@ -701,17 +698,19 @@ export const browserCommands = {
           config: [
             {
               label: "X坐标",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "arrow_right",
               width: 12,
-              defaultValue: 0,
+              defaultValue: newVarInputVal("var", "0"),
+              disableToggleType: true,
             },
             {
               label: "Y坐标",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "arrow_drop_down",
               width: 12,
-              defaultValue: 0,
+              defaultValue: newVarInputVal("var", "0"),
+              disableToggleType: true,
             },
           ],
         },
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 8675ec89..647708f3 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -71,18 +71,18 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
-              min: 0,
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 6,
             },
             {
               label: "结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "last_page",
-              min: 0,
-              step: 1,
               width: 6,
             },
           ],
@@ -169,9 +169,9 @@ export const dataCommands = {
             },
             {
               label: "目标长度",
-              component: "NumberInput",
-              min: 0,
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "straighten",
               width: 4,
             },
@@ -264,9 +264,9 @@ export const dataCommands = {
             },
             {
               label: "重复次数",
-              component: "NumberInput",
-              min: 0,
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "repeat",
               width: 4,
               defaultValue: 1,
@@ -357,9 +357,9 @@ export const dataCommands = {
             },
             {
               label: "每行字符数",
-              component: "NumberInput",
-              min: 1,
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "straighten",
               width: 4,
               defaultValue: 80,
@@ -397,9 +397,9 @@ export const dataCommands = {
             },
             {
               label: "总宽度",
-              component: "NumberInput",
-              min: 1,
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "straighten",
               width: 6,
               defaultValue: 80,
@@ -487,16 +487,18 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
-              step: 1,
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
             {
               label: "结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "last_page",
-              step: 1,
               width: 4,
             },
           ],
@@ -520,13 +522,17 @@ export const dataCommands = {
             },
             {
               label: "偏移量",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
             {
               label: "长度",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "straighten",
               width: 4,
             },
@@ -568,13 +574,17 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
             {
               label: "结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "last_page",
               width: 4,
             },
@@ -616,19 +626,25 @@ export const dataCommands = {
             },
             {
               label: "目标起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
             {
               label: "源起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
             {
               label: "源结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "last_page",
               width: 4,
             },
@@ -669,7 +685,9 @@ export const dataCommands = {
             },
             {
               label: "总长度（可选）",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "straighten",
               width: 12,
             },
@@ -688,13 +706,17 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 6,
             },
             {
               label: "结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "last_page",
               width: 6,
             },
@@ -719,7 +741,9 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               icon: "first_page",
               width: 4,
             },
@@ -1062,19 +1086,19 @@ export const dataCommands = {
             },
             {
               label: "起始位置",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "first_page",
-              min: 0,
-              step: 1,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               width: 6,
               placeholder: "1",
             },
             {
               label: "结束位置",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "last_page",
-              min: 0,
-              step: 1,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               width: 6,
               placeholder: "3",
             },
@@ -1094,11 +1118,10 @@ export const dataCommands = {
             },
             {
               label: "扁平化深度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "format_indent_decrease",
-              min: 1,
-              step: 1,
-              defaultValue: 1,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               width: 4,
             },
           ],
@@ -1201,11 +1224,10 @@ export const dataCommands = {
             },
             {
               label: "块大小",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "straighten",
-              min: 1,
-              step: 1,
-              defaultValue: 2,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               width: 4,
             },
           ],
@@ -1344,10 +1366,11 @@ export const dataCommands = {
             },
             {
               label: "数值",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var", "1"),
               icon: "exposure",
               width: 6,
-              defaultValue: 1,
             },
             {
               label: "单位",
diff --git a/src/js/composer/commands/imageCommands.js b/src/js/composer/commands/imageCommands.js
index ce4e35a8..74e5e1a6 100644
--- a/src/js/composer/commands/imageCommands.js
+++ b/src/js/composer/commands/imageCommands.js
@@ -140,19 +140,19 @@ export const imageCommands = {
         },
         {
           label: "宽度(像素)",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "compare_arrows",
           width: 6,
-          min: 1,
-          step: 10,
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var", "100"),
         },
         {
           label: "高度(像素)",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "height",
           width: 6,
-          min: 1,
-          step: 10,
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var", "100"),
         },
         {
           label: "保持宽高比",
@@ -293,39 +293,35 @@ export const imageCommands = {
         },
         {
           label: "起始X坐标",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "arrow_right",
           width: 6,
-          min: 0,
-          step: 10,
-          defaultValue: 0,
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var", "0"),
         },
         {
           label: "起始Y坐标",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "arrow_downward",
           width: 6,
-          min: 0,
-          step: 10,
-          defaultValue: 0,
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var", "0"),
         },
         {
           label: "裁剪宽度",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "compare_arrows",
           width: 6,
-          min: 1,
-          step: 10,
-          defaultValue: "",
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var"),
         },
         {
           label: "裁剪高度",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "height",
           width: 6,
-          min: 1,
-          step: 10,
-          defaultValue: "",
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var"),
         },
         {
           label: "图片质量(0-1)",
diff --git a/src/js/composer/commands/macosCommands.js b/src/js/composer/commands/macosCommands.js
index bd63f257..f550d608 100644
--- a/src/js/composer/commands/macosCommands.js
+++ b/src/js/composer/commands/macosCommands.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 const windowOutputStructure = {
   name: { label: "应用名称", suggestName: "appName" },
   displayedName: {
@@ -432,10 +434,10 @@ export const macosCommands = {
           config: [
             {
               label: "窗口索引",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "window",
-              min: 1,
-              defaultValue: 1,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var", "1"),
               width: 12,
             },
           ],
diff --git a/src/js/composer/commands/mathCommands.js b/src/js/composer/commands/mathCommands.js
index 00a29ee9..c1236af2 100644
--- a/src/js/composer/commands/mathCommands.js
+++ b/src/js/composer/commands/mathCommands.js
@@ -201,10 +201,11 @@ export const mathCommands = {
           config: [
             {
               label: "半径",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "radio_button_checked",
               width: 12,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
           ],
         },
@@ -215,17 +216,19 @@ export const mathCommands = {
           config: [
             {
               label: "宽度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "swap_horiz",
               width: 6,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
             {
               label: "高度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "height",
               width: 6,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
           ],
         },
@@ -236,24 +239,27 @@ export const mathCommands = {
           config: [
             {
               label: "边长a",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "straighten",
               width: 4,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
             {
               label: "边长b",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "straighten",
               width: 4,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
             {
               label: "边长c",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "straighten",
               width: 4,
-              min: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
           ],
         },
@@ -266,9 +272,11 @@ export const mathCommands = {
       config: [
         {
           label: "角度值",
-          component: "NumberInput",
+          component: "VariableInput",
           icon: "rotate_right",
           width: 12,
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var"),
         },
       ],
       subCommands: [
diff --git a/src/js/composer/commands/simulateCommands.js b/src/js/composer/commands/simulateCommands.js
index 53c57c3d..146128ea 100644
--- a/src/js/composer/commands/simulateCommands.js
+++ b/src/js/composer/commands/simulateCommands.js
@@ -152,18 +152,16 @@ export const simulateCommands = {
             x: {
               label: "X坐标",
               icon: "drag_handle",
-              component: "NumberInput",
-              min: 0,
-              step: 10,
+              component: "VariableInput",
+              disableToggleType: true,
               width: 6,
               placeholder: "XY任意留空原地点击",
             },
             y: {
               label: "Y坐标",
               icon: "drag_handle",
-              component: "NumberInput",
-              min: 0,
-              step: 10,
+              component: "VariableInput",
+              disableToggleType: true,
               width: 6,
               placeholder: "XY任意留空原地点击",
             },
@@ -185,6 +183,8 @@ export const simulateCommands = {
           },
           defaultValue: {
             count: 1,
+            x: newVarInputVal("var"),
+            y: newVarInputVal("var"),
           },
         },
       ],
@@ -201,19 +201,17 @@ export const simulateCommands = {
             {
               label: "X坐标",
               icon: "drag_handle",
-              defaultValue: 0,
-              component: "NumberInput",
-              min: 0,
-              step: 10,
+              defaultValue: newVarInputVal("var", "0"),
+              component: "VariableInput",
+              disableToggleType: true,
               width: 6,
             },
             {
               label: "Y坐标",
               icon: "drag_handle",
-              defaultValue: 0,
-              component: "NumberInput",
-              min: 0,
-              step: 10,
+              defaultValue: newVarInputVal("var", "0"),
+              component: "VariableInput",
+              disableToggleType: true,
               width: 6,
             },
           ],
diff --git a/src/js/composer/commands/systemCommands.js b/src/js/composer/commands/systemCommands.js
index 16296d14..aaf54806 100644
--- a/src/js/composer/commands/systemCommands.js
+++ b/src/js/composer/commands/systemCommands.js
@@ -549,9 +549,8 @@ export const systemCommands = {
       config: [
         {
           label: "进程ID",
-          component: "NumberInput",
-          min: 0,
-          step: 100,
+          component: "VariableInput",
+          disableToggleType: true,
           icon: "developer_board",
           width: 7,
         },
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 69a3310d..f90e857d 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -444,21 +444,17 @@ export const uiCommands = {
               label: "标题",
               component: "VariableInput",
               width: 6,
-              defaultValue: newVarInputVal("str", "进度"),
             },
             text: {
               label: "文本",
               component: "VariableInput",
               width: 6,
-              defaultValue: newVarInputVal("str", "处理中..."),
             },
             value: {
               label: "初始进度值",
-              component: "NumberInput",
+              component: "VariableInput",
+              disableToggleType: true,
               width: 3,
-              min: 0,
-              max: 100,
-              defaultValue: 0,
             },
             position: {
               label: "位置",
@@ -470,7 +466,6 @@ export const uiCommands = {
                 { label: "屏幕左下角", value: "bottom-left" },
                 { label: "屏幕右下角", value: "bottom-right" },
               ],
-              defaultValue: "bottom-right",
             },
             onClose: {
               label: "关闭按钮回调函数",
@@ -496,7 +491,7 @@ export const uiCommands = {
           defaultValue: {
             title: newVarInputVal("str", "进度"),
             text: newVarInputVal("str", "处理中..."),
-            value: 0,
+            value: newVarInputVal("var", "0"),
             position: "bottom-right",
             onClose: newVarInputVal("var"),
             onPause: newVarInputVal("var"),
@@ -515,11 +510,9 @@ export const uiCommands = {
           options: {
             value: {
               label: "进度值",
-              component: "NumberInput",
+              component: "VariableInput",
               width: 4,
-              min: 0,
-              max: 100,
-              defaultValue: 0,
+              disableToggleType: true,
             },
             text: {
               label: "文本",
@@ -534,7 +527,7 @@ export const uiCommands = {
             },
           },
           defaultValue: {
-            value: 0,
+            value: newVarInputVal("var", "0"),
             text: newVarInputVal("str"),
             complete: false,
           },
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index 88374f0f..cdc9f9d2 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -1,3 +1,5 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
 export const utoolsCommands = {
   label: "uTools功能",
   icon: "insights",
@@ -49,9 +51,9 @@ export const utoolsCommands = {
       config: [
         {
           label: "高度",
-          component: "NumberInput",
-          min: 0,
-          step: 100,
+          component: "VariableInput",
+          disableToggleType: true,
+          defaultValue: newVarInputVal("var", "100"),
           icon: "straighten",
           width: 12,
         },
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index cb10a0be..c9acd114 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -293,19 +293,27 @@ export const windowsCommands = {
               options: {
                 x: {
                   label: "X坐标",
-                  component: "NumberInput",
+                  component: "VariableInput",
+                  disableToggleType: true,
                   icon: "arrow_right",
                   placeholder: "留空使用当前鼠标位置",
                   width: 6,
+                  disableToggleType: true,
                 },
                 y: {
                   label: "Y坐标",
-                  component: "NumberInput",
+                  component: "VariableInput",
+                  disableToggleType: true,
                   icon: "arrow_drop_down",
                   placeholder: "留空使用当前鼠标位置",
                   width: 6,
+                  disableToggleType: true,
                 },
               },
+              defaultValue: {
+                x: newVarInputVal("var"),
+                y: newVarInputVal("var"),
+              },
             },
           ],
           outputs: {
@@ -352,12 +360,11 @@ export const windowsCommands = {
           config: [
             {
               label: "透明度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "opacity",
               width: 12,
-              min: 0,
-              max: 100,
-              defaultValue: 80,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var", "80"),
             },
           ],
         },
@@ -368,33 +375,35 @@ export const windowsCommands = {
           config: [
             {
               label: "X坐标",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "arrow_right",
               width: 6,
-              defaultValue: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
             {
               label: "Y坐标",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "arrow_drop_down",
               width: 6,
-              defaultValue: 0,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
             },
             {
               label: "宽度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "swap_horiz",
               width: 6,
-              min: 0,
-              defaultValue: 800,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var", "800"),
             },
             {
               label: "高度",
-              component: "NumberInput",
+              component: "VariableInput",
               icon: "height",
               width: 6,
-              min: 0,
-              defaultValue: 600,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var", "600"),
             },
           ],
         },
@@ -629,17 +638,15 @@ export const windowsCommands = {
                 },
                 amount: {
                   label: "位置",
-                  component: "NumberInput",
+                  component: "VariableInput",
                   icon: "straighten",
                   width: 6,
-                  min: 0,
-                  max: 100,
-                  step: 10,
+                  disableToggleType: true,
                 },
               },
               defaultValue: {
                 direction: "vertical",
-                amount: 0,
+                amount: newVarInputVal("var"),
               },
             },
           ],

From 89a2e07b13c34882a49e42b284d156d8c7b9baef Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 15:59:22 +0800
Subject: [PATCH 204/332] =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=89=BE=E5=9B=BE?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BB=8E=E5=89=AA=E8=B4=B4=E6=9D=BF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=9B=BE=E7=89=87=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=B4=E6=8E=A5=E6=88=AA=E5=9B=BE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quickcomposer/simulate/screenCapture.js   |  6 ++---
 .../composer/simulate/ImageSearchEditor.vue   | 27 ++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/plugin/lib/quickcomposer/simulate/screenCapture.js b/plugin/lib/quickcomposer/simulate/screenCapture.js
index 954b720d..44905d93 100644
--- a/plugin/lib/quickcomposer/simulate/screenCapture.js
+++ b/plugin/lib/quickcomposer/simulate/screenCapture.js
@@ -115,15 +115,15 @@ async function captureScreen(range = "fullscreen") {
 }
 
 async function captureScreenToFile(range = "fullscreen", path = null) {
-  if (!path) return null;
+  if (!path) return;
   const result = await captureScreen(range);
-  if (!result) return null;
+  if (!result) return;
   fs.writeFileSync(
     path,
     result.replace("data:image/png;base64,", ""),
     "base64"
   );
-  return result;
+  return;
 }
 
 async function captureScreenToClipboard(range = "fullscreen") {
diff --git a/src/components/composer/simulate/ImageSearchEditor.vue b/src/components/composer/simulate/ImageSearchEditor.vue
index a4468912..8249b4a3 100644
--- a/src/components/composer/simulate/ImageSearchEditor.vue
+++ b/src/components/composer/simulate/ImageSearchEditor.vue
@@ -26,9 +26,7 @@
           <template v-else>
             <div class="upload-placeholder">
               <q-icon name="add_photo_alternate" size="48px" color="grey-6" />
-              <div class="text-grey-6 q-mt-sm">
-                点击上传或粘贴图片<br />支持从剪贴板读取
-              </div>
+              <div class="text-grey-6 q-mt-sm">点击上传或粘贴图片</div>
             </div>
           </template>
         </div>
@@ -37,16 +35,16 @@
       <!-- 配置区域 -->
       <div class="col-12 col-sm-4">
         <div class="row">
-          <!-- 从剪贴板读取按钮 -->
+          <!-- 截图按钮 -->
           <div class="col-12">
             <q-btn
               outline
               color="primary"
               class="full-width"
-              @click="pasteFromClipboard"
+              @click="getImgByCaptureScreen"
             >
-              <q-icon name="content_paste" class="q-mr-sm" />
-              从剪贴板读取
+              <q-icon name="crop" class="q-mr-sm" />
+              截图查找
             </q-btn>
           </div>
 
@@ -157,7 +155,6 @@ export default defineComponent({
         try {
           const reader = new FileReader();
           reader.onload = (e) => {
-            this.argvs.imagePreview = e.target.result;
             this.updateArgvs("imagePreview", e.target.result);
           };
           reader.readAsDataURL(file);
@@ -176,7 +173,6 @@ export default defineComponent({
           const blob = item.getAsFile();
           const reader = new FileReader();
           reader.onload = (e) => {
-            this.argvs.imagePreview = e.target.result;
             this.updateArgvs("imagePreview", e.target.result);
           };
           reader.readAsDataURL(blob);
@@ -186,17 +182,16 @@ export default defineComponent({
     },
 
     // 从剪贴板读取
-    async pasteFromClipboard() {
-      const clipboardImage = quickcommand.readClipboardImage();
-      if (!clipboardImage)
-        return quickcommand.showMessageBox("剪贴板中没有图片", "warning");
-      this.argvs.imagePreview = clipboardImage;
-      this.updateArgvs("imagePreview", clipboardImage);
+    async getImgByCaptureScreen() {
+      const img = await quickcomposer.simulate.captureScreenToClipboard({
+        type: "area",
+      });
+      if (!img) return;
+      this.updateArgvs("imagePreview", img);
     },
 
     // 清除图片
     clearImage() {
-      this.argvs.imagePreview = "";
       this.updateArgvs("imagePreview", "");
     },
 

From d7508c36a7845ec371721dfa822f3e86bf5df770 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 17:44:01 +0800
Subject: [PATCH 205/332] =?UTF-8?q?=E6=96=B0=E5=A2=9EAI=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E6=94=AF=E6=8C=81AI=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=EF=BC=88=E9=A2=84=E8=AE=BE=E7=BF=BB=E8=AF=91=E3=80=81?=
 =?UTF-8?q?=E6=80=BB=E7=BB=93=E3=80=81shell=E7=94=9F=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                   |   9 +-
 plugin/lib/quickcomposer.js                 |   1 +
 plugin/lib/quickcomposer/ai/chat.js         | 214 ++++++++++++++++++++
 plugin/lib/quickcomposer/ai/index.js        |   6 +
 plugin/plugin.json                          |   2 +-
 src/js/composer/commands/aiCommands.js      | 175 ++++++++++++++++
 src/js/composer/commands/audioCommands.js   |   2 -
 src/js/composer/commands/index.js           |   2 +
 src/plugins/monaco/types/quickcomposer.d.ts |  96 +++++++++
 9 files changed, 502 insertions(+), 5 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/ai/chat.js
 create mode 100644 plugin/lib/quickcomposer/ai/index.js
 create mode 100644 src/js/composer/commands/aiCommands.js

diff --git a/README.md b/README.md
index ee4f87bf..151251f6 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,8 @@ quasar build
 
 ## ② 可视化编排
 
-- 自动化：支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过 20 种类型的自动化处理
-- 工具集：所有功能既可以组合使用，也可以单独运行，具备视频压缩、格式转换，图片裁剪、旋转，文本朗读，音频播放，编解码，模拟按键，鼠标连点等超过 100 种实用功能
+- 自动化：文件操作、网络操作、系统操作、音频操作、图片操作、视频操作、uTools功能、Mac自动化、Window自动化、浏览器控制、数据处理、编码加密、流程控制、编程相关、用户交互、AI对话、模拟操作、获取状态、数学计算、用户数据、显示器、输出消息等20种以上不同类型命令。
+- 工具集：所有功能既可以组合使用，也可以单独运行，具备视频压缩、格式转换，图片裁剪、旋转，文本朗读，音频播放，编解码，模拟按键，鼠标连点等超过 100 种实用功能。
 
 # 二、其他特色
 
@@ -156,6 +156,11 @@ JS代码注入、脚本执行（支持多种语言）、函数返回、变量管
 匹配数据获取、插件跳转、窗口控制、版本信息获取、主题切换、快捷键管理...
 Windows特定功能
 窗口控制（置顶、透明度、位置）、消息发送、文件系统监控、进程管理、注册表操作、服务管理、快捷方式管理、系统设置修改...
+
+## AI对话
+
+获取API支持的模型列表、AI对话...
+
 ## 视频处理
 
 格式转换、视频压缩、视频剪辑、视频合并、速度调整、视频截图、GIF转换、音频提取、水印添加、分辨率调整、帧率设置、码率控制...
diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index 8c05e619..1dbccbca 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -13,6 +13,7 @@ const quickcomposer = {
   status: require("./quickcomposer/status"),
   browser: require("./quickcomposer/browser"),
   video: require("./quickcomposer/video"),
+  ai: require("./quickcomposer/ai"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/ai/chat.js b/plugin/lib/quickcomposer/ai/chat.js
new file mode 100644
index 00000000..ee89525b
--- /dev/null
+++ b/plugin/lib/quickcomposer/ai/chat.js
@@ -0,0 +1,214 @@
+const axios = require("axios");
+
+// 支持的模型类型
+const MODEL_TYPES = {
+  OPENAI: "openai",
+  OLLAMA: "ollama",
+};
+
+// 预设提示词
+const PRESET_PROMPTS = {
+  // 翻译
+  translate: `请将以下内容翻译成地道的中文，要求：
+1. 保持原文的专业性和准确性
+2. 符合中文的表达习惯
+3. 对于专业术语保留英文原文，并在括号中给出中文翻译
+4. 保持原文的段落格式
+
+原文：`,
+
+  // 生成SHELL命令
+  shell: `请根据以下描述生成一个 shell 命令，要求：
+1. 命令应当简洁高效
+2. 优先使用常见的命令行工具
+3. 确保命令的安全性和可靠性
+4. 对于复杂操作，添加注释说明
+5. 如果需要多个命令，使用 && 连接或使用脚本格式
+6. 直接输出命令，不要输出任何解释，不要使用markdown格式
+
+需求描述：`,
+
+  // 总结
+  summarize: `请总结以下内容的要点，要求：
+1. 提取最重要和最有价值的信息
+2. 使用简洁的语言
+3. 按重要性排序
+4. 保持逻辑性和连贯性
+5. 如果有专业术语，保留并解释
+
+原文：`,
+};
+
+/**
+ * AI对话功能
+ * @param {Object} apiConfig - API配置参数
+ * @param {string} apiConfig.modelType - 模型类型(openai/ollama)
+ * @param {string} apiConfig.apiUrl - API地址
+ * @param {string} apiConfig.apiToken - API令牌
+ * @param {string} apiConfig.model - 模型名称
+ * @param {Object} content - 对话内容参数
+ * @param {string} content.prompt - 用户输入的提示词
+ * @param {string} content.presetPrompt - 预设提示词类型
+ * @returns {Promise<Object>} 对话响应
+ */
+async function chat(apiConfig, content) {
+  try {
+    const { modelType, apiUrl, apiToken, model } = apiConfig;
+    const { prompt, presetPrompt } = content;
+
+    // 验证必要参数
+    if (!apiUrl || !prompt || !model) {
+      throw new Error("API地址、模型名称和提示词不能为空");
+    }
+
+    // 构建完整提示词
+    const fullPrompt = presetPrompt
+      ? `${PRESET_PROMPTS[presetPrompt]}\n${prompt}`
+      : prompt;
+
+    // 准备请求配置
+    const config = {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    };
+
+    let requestData;
+    let url = apiUrl;
+
+    // 根据不同的模型类型构建请求数据
+    if (modelType === MODEL_TYPES.OPENAI) {
+      // OpenAI API
+      config.headers["Authorization"] = `Bearer ${apiToken}`;
+      requestData = {
+        model: model,
+        messages: [
+          {
+            role: "user",
+            content: fullPrompt,
+          },
+        ],
+      };
+    } else if (modelType === MODEL_TYPES.OLLAMA) {
+      // Ollama API
+      // 如果用户没有指定完整的 API 路径，添加 /api/generate
+      if (!url.endsWith("/api/generate")) {
+        url = url.replace(/\/?$/, "/api/generate");
+      }
+
+      requestData = {
+        model: model,
+        prompt: fullPrompt,
+        stream: false,
+      };
+    } else {
+      throw new Error("不支持的模型类型");
+    }
+
+    // 发送请求
+    const response = await axios.post(url, requestData, config);
+
+    // 解析不同模型的响应
+    let result;
+    if (modelType === MODEL_TYPES.OPENAI) {
+      // OpenAI 响应格式
+      if (!response.data.choices || !response.data.choices[0]) {
+        throw new Error("OpenAI 响应格式错误");
+      }
+      result = response.data.choices[0].message.content;
+    } else {
+      // Ollama 响应格式
+      if (!response.data.response) {
+        throw new Error("Ollama 响应格式错误");
+      }
+      result = response.data.response;
+    }
+
+    return {
+      success: true,
+      result,
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error.response?.data?.error?.message || error.message,
+    };
+  }
+}
+
+/**
+ * 获取API支持的模型列表
+ * @param {Object} apiConfig - API配置参数
+ * @param {string} apiConfig.modelType - 模型类型(openai/ollama)
+ * @param {string} apiConfig.apiUrl - API地址
+ * @param {string} apiConfig.apiToken - API令牌
+ * @returns {Promise<Object>} 模型列表响应
+ */
+async function getModels(apiConfig) {
+  try {
+    const { modelType, apiUrl, apiToken } = apiConfig;
+
+    // 验证必要参数
+    if (!apiUrl) {
+      throw new Error("API地址不能为空");
+    }
+
+    // 准备请求配置
+    const config = {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    };
+
+    let url = apiUrl;
+
+    // 根据不同的模型类型构建请求
+    if (modelType === MODEL_TYPES.OPENAI) {
+      // OpenAI API
+      config.headers["Authorization"] = `Bearer ${apiToken}`;
+      // OpenAI的模型列表接口是 /v1/models
+      if (!url.endsWith("/models")) {
+        url = "https://api.openai.com/v1/models";
+      }
+    } else if (modelType === MODEL_TYPES.OLLAMA) {
+      // Ollama API
+      // Ollama的模型列表接口是 /api/tags
+      if (!url.endsWith("/api/tags")) {
+        url = url.replace(/\/?$/, "/api/tags");
+      }
+    } else {
+      throw new Error("不支持的模型类型");
+    }
+
+    // 发送请求
+    const response = await axios.get(url, config);
+
+    // 解析不同模型的响应
+    let models;
+    if (modelType === MODEL_TYPES.OPENAI) {
+      // OpenAI 响应格式
+      if (!response.data.data) {
+        throw new Error("OpenAI 响应格式错误");
+      }
+      models = response.data.data.map((model) => model.id);
+    } else {
+      // Ollama 响应格式
+      if (!response.data.models) {
+        throw new Error("Ollama 响应格式错误");
+      }
+      models = response.data.models.map((model) => model.name);
+    }
+
+    return {
+      success: true,
+      result: models,
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error.response?.data?.error?.message || error.message,
+    };
+  }
+}
+
+module.exports = { chat, getModels };
diff --git a/plugin/lib/quickcomposer/ai/index.js b/plugin/lib/quickcomposer/ai/index.js
new file mode 100644
index 00000000..d4af17cd
--- /dev/null
+++ b/plugin/lib/quickcomposer/ai/index.js
@@ -0,0 +1,6 @@
+const { chat, getModels } = require("./chat");
+
+module.exports = {
+  chat,
+  getModels,
+};
diff --git a/plugin/plugin.json b/plugin/plugin.json
index 2ca140a3..09e9b6b5 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "pluginName": "快捷命令",
-  "description": "实现具备UI交互的自动化操作，支持可视化拖拽及直接编写脚本两种形式。1.可视化拖拽：支持文件、网络、音视频、图片、文本、浏览器、键鼠等超过20种类型的自动化处理，2.编写脚本：支持utools的api，python、js、shell、cmd等多种脚本语言。关联关键词：自动化、可视化、RPA",
+  "description": "实现具备UI交互的自动化操作，支持可视化拖拽及直接编写脚本两种形式。1.可视化拖拽：支持文件、网络、音视频、图片、文本、浏览器、键鼠、AI对话等超过20种类型的自动化处理，2.编写脚本：支持utools的api，python、js、shell、cmd等多种脚本语言。关联关键词：自动化、可视化、RPA",
   "main": "index.html",
   "homepage": "https://github.com/fofolee/uTools-quickcommand",
   "publishPage": "https://yuanliao.info/d/424",
diff --git a/src/js/composer/commands/aiCommands.js b/src/js/composer/commands/aiCommands.js
new file mode 100644
index 00000000..ead3afe7
--- /dev/null
+++ b/src/js/composer/commands/aiCommands.js
@@ -0,0 +1,175 @@
+import { newVarInputVal } from "js/composer/varInputValManager";
+
+export const aiCommands = {
+  label: "AI操作",
+  icon: "smart_toy",
+  defaultOpened: false,
+  commands: [
+    {
+      value: "quickcomposer.ai.getModels",
+      label: "获取可用模型",
+      desc: "获取API支持的模型列表",
+      asyncMode: "await",
+      icon: "list",
+      showLoading: true,
+      config: [
+        {
+          label: "API配置",
+          component: "OptionEditor",
+          icon: "settings",
+          width: 12,
+          options: {
+            modelType: {
+              component: "ButtonGroup",
+              width: 12,
+              height: "26px",
+              options: [
+                { label: "OpenAI", value: "openai" },
+                { label: "Ollama", value: "ollama" },
+              ],
+            },
+            apiUrl: {
+              label: "API地址",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "输入API地址",
+            },
+            apiToken: {
+              label: "API令牌",
+              component: "VariableInput",
+              icon: "key",
+              width: 12,
+              placeholder: "ollama 则留空",
+            },
+          },
+          defaultValue: {
+            modelType: "openai",
+            apiUrl: newVarInputVal("str", "https://api.openai.com/v1/models"),
+          },
+        },
+      ],
+      outputs: {
+        label: "获取模型列表结果",
+        suggestName: "modelListResult",
+        structure: {
+          success: {
+            label: "是否成功",
+            suggestName: "isSuccess",
+          },
+          result: {
+            label: "模型列表",
+            suggestName: "modelList",
+          },
+          error: {
+            label: "错误信息",
+            suggestName: "resultErrorInfo",
+          },
+        },
+      },
+    },
+    {
+      value: "quickcomposer.ai.chat",
+      label: "AI对话",
+      desc: "与AI助手进行对话",
+      asyncMode: "await",
+      icon: "chat",
+      showLoading: true,
+      config: [
+        {
+          label: "API配置",
+          component: "OptionEditor",
+          icon: "settings",
+          width: 12,
+          options: {
+            modelType: {
+              component: "ButtonGroup",
+              width: 12,
+              height: "26px",
+              options: [
+                { label: "OpenAI", value: "openai" },
+                { label: "Ollama", value: "ollama" },
+              ],
+            },
+            apiUrl: {
+              label: "API地址",
+              component: "VariableInput",
+              icon: "link",
+              width: 12,
+              placeholder: "输入API地址",
+            },
+            apiToken: {
+              label: "API令牌",
+              component: "VariableInput",
+              icon: "key",
+              width: 6,
+              placeholder: "ollama 则留空",
+            },
+            model: {
+              label: "模型名称",
+              component: "VariableInput",
+              icon: "smart_toy",
+              width: 6,
+              placeholder: "如 gpt-3.5-turbo",
+            },
+          },
+          defaultValue: {
+            modelType: "openai",
+            apiUrl: newVarInputVal(
+              "str",
+              "https://api.openai.com/v1/chat/completions"
+            ),
+            model: newVarInputVal("str", "gpt-3.5-turbo"),
+          },
+        },
+        {
+          label: "对话内容",
+          component: "OptionEditor",
+          icon: "chat",
+          width: 12,
+          options: {
+            presetPrompt: {
+              component: "ButtonGroup",
+              width: 12,
+              height: "26px",
+              options: [
+                { label: "自由对话", value: "" },
+                { label: "翻译", value: "translate" },
+                { label: "总结", value: "summarize" },
+                { label: "生成SHELL命令", value: "shell" },
+              ],
+            },
+            prompt: {
+              label: "提示词",
+              component: "VariableInput",
+              icon: "edit",
+              width: 12,
+              placeholder: "输入要询问AI的内容",
+            },
+          },
+          defaultValue: {
+            presetPrompt: "",
+          },
+        },
+      ],
+      outputs: {
+        label: "AI响应",
+        suggestName: "aiResponse",
+        structure: {
+          success: {
+            label: "是否成功",
+            suggestName: "isAiResponseSuccess",
+          },
+          result: {
+            label: "响应内容",
+            suggestName: "aiResponseContent",
+          },
+          error: {
+            label: "错误信息",
+            suggestName: "aiResponseError",
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/src/js/composer/commands/audioCommands.js b/src/js/composer/commands/audioCommands.js
index 5fe8702c..45961712 100644
--- a/src/js/composer/commands/audioCommands.js
+++ b/src/js/composer/commands/audioCommands.js
@@ -1,5 +1,3 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
-
 // 系统音效选项
 const SYSTEM_SOUNDS = [
   { label: "提示音", value: "beep" },
diff --git a/src/js/composer/commands/index.js b/src/js/composer/commands/index.js
index 46ea57df..ddba40b7 100644
--- a/src/js/composer/commands/index.js
+++ b/src/js/composer/commands/index.js
@@ -20,6 +20,7 @@ import { macosCommands } from "./macosCommands";
 import { scriptCommands } from "./scriptCommands";
 import { browserCommands } from "./browserCommands";
 import { videoCommands } from "./videoCommands";
+import { aiCommands } from "./aiCommands";
 
 export const commandCategories = [
   fileCommands,
@@ -38,6 +39,7 @@ export const commandCategories = [
   scriptCommands,
   uiCommands,
   simulateCommands,
+  aiCommands,
   statusCommands,
   mathCommands,
   userdataCommands,
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index 30022082..fcb5dc7c 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -2512,4 +2512,100 @@ interface quickcomposerApi {
      */
     waitForElement(selector: string, timeout?: number): Promise<void>;
   };
+
+  /**
+   * AI 相关功能
+   */
+  ai: {
+    /**
+     * 与 AI 进行对话
+     * @param apiConfig API配置
+     * @param content 对话内容
+     * @example
+     * // OpenAI 示例
+     * const response = await quickcomposer.ai.chat(
+     *   {
+     *     modelType: "openai",
+     *     apiUrl: "https://api.openai.com/v1/chat/completions",
+     *     apiToken: "your-api-token",
+     *     model: "gpt-3.5-turbo"
+     *   },
+     *   {
+     *     prompt: "你好",
+     *     presetPrompt: ""  // 使用预设提示词：translate/shell/summarize
+     *   }
+     * );
+     *
+     * // Ollama 示例
+     * const response = await quickcomposer.ai.chat(
+     *   {
+     *     modelType: "ollama",
+     *     apiUrl: "http://localhost:11434/api/generate",
+     *     model: "qwen2.5:32b"
+     *   },
+     *   {
+     *     prompt: "查找进程名为chrome的进程并关闭",
+     *     presetPrompt: "shell"
+     *   }
+     * );
+     */
+    chat(
+      apiConfig: {
+        /** 模型类型：openai/ollama */
+        modelType: "openai" | "ollama";
+        /** API地址 */
+        apiUrl: string;
+        /** API令牌（仅 OpenAI 需要） */
+        apiToken?: string;
+        /** 模型名称 */
+        model: string;
+      },
+      content: {
+        /** 提示词 */
+        prompt: string;
+        /** 预设提示词类型 */
+        presetPrompt?: "" | "translate" | "shell" | "summarize";
+      }
+    ): Promise<{
+      /** 是否成功 */
+      success: boolean;
+      /** AI 响应内容 */
+      result?: string;
+      /** 错误信息 */
+      error?: string;
+    }>;
+
+    /**
+     * 获取 API 支持的模型列表
+     * @param apiConfig API配置
+     * @example
+     * // OpenAI 示例
+     * const models = await quickcomposer.ai.getModels({
+     *   modelType: "openai",
+     *   apiUrl: "https://api.openai.com/v1/models",
+     *   apiToken: "your-api-token"
+     * });
+     *
+     * // Ollama 示例
+     * const models = await quickcomposer.ai.getModels({
+     *   modelType: "ollama",
+     *   apiUrl: "http://localhost:11434/"
+     * });
+     */
+    getModels(apiConfig: {
+      /** 模型类型：openai/ollama */
+      modelType: "openai" | "ollama";
+      /** API地址 */
+      apiUrl: string;
+      /** API令牌（仅 OpenAI 需要） */
+      apiToken?: string;
+    }): Promise<{
+      /** 是否成功 */
+      success: boolean;
+      /** 模型名称列表 */
+      result?: string[];
+      /** 错误信息 */
+      error?: string;
+    }>;
+  };
 }

From 3eca3b448ed0df3b04041d9da0a6e0fb234be3bb Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 17 Feb 2025 22:38:19 +0800
Subject: [PATCH 206/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Equickcommand.showLoad?=
 =?UTF-8?q?ingBar=EF=BC=8C=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js               |  24 ++-
 plugin/lib/dialog/service.js                  | 150 ++++++++++++++----
 plugin/lib/dialog/style.css                   |  20 +++
 plugin/lib/dialog/view.html                   |   2 +-
 plugin/lib/quickcomposer/ai/chat.js           |  29 +++-
 plugin/lib/quickcomposer/video/ffmpeg.js      |   2 -
 plugin/lib/quickcomposer/windows/monitor.js   |  44 ++++-
 src/App.vue                                   |   1 -
 src/components/CommandRunResult.vue           |   3 -
 src/components/composer/CommandComposer.vue   |  14 --
 src/js/composer/commands/aiCommands.js        |   2 -
 src/js/composer/commands/uiCommands.js        |  76 +++++++--
 src/js/composer/commands/windowsCommands.js   |   1 -
 .../monaco/types/quickcommand.api.d.ts        |  55 ++++++-
 14 files changed, 339 insertions(+), 84 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index 00676915..a1e84be8 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -361,12 +361,19 @@ document.addEventListener("DOMContentLoaded", () => {
       case "process":
         document.getElementById("process").style.display = "block";
         document.body.classList.add("dialog-process");
+        // 创建进度条
+        const processBarInner = document.getElementById("process-bar-inner");
+        if (config.isLoading) {
+          // 如果是加载条模式，使用动画效果
+          processBarInner.className = "process-bar-loading";
+        } else {
+          // 如果是进度条模式，设置初始进度
+          processBarInner.className = "process-bar-inner";
+          processBarInner.style.width = `${config.value}%`;
+        }
 
-        // 设置初始文本和进度
+        // 设置初始文本
         document.getElementById("process-text").textContent = config.text;
-        document.getElementById(
-          "process-bar-inner"
-        ).style.width = `${config.value}%`;
 
         // 如果需要显示暂停按钮
         if (config.showPause) {
@@ -393,8 +400,13 @@ document.addEventListener("DOMContentLoaded", () => {
   // 监听进度条更新事件
   ipcRenderer.on("update-process", (event, data) => {
     const { value, text } = data;
-    if (typeof value === "number") {
-      document.getElementById("process-bar-inner").style.width = `${value}%`;
+    const processBarInner = document.getElementById("process-bar-inner");
+    if (
+      processBarInner &&
+      processBarInner.className === "process-bar-inner" &&
+      typeof value === "number"
+    ) {
+      processBarInner.style.width = `${value}%`;
     }
     if (text) {
       document.getElementById("process-text").textContent = text;
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 280f8a94..836aaf17 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -1,6 +1,25 @@
 const { ipcRenderer } = require("electron");
 const os = require("os");
 const { createBrowserWindow } = utools;
+
+const dialogPath = "lib/dialog/view.html";
+const preloadPath = "lib/dialog/controller.js";
+
+const commonBrowserWindowOptions = {
+  resizable: false,
+  minimizable: false,
+  maximizable: false,
+  fullscreenable: false,
+  skipTaskbar: true,
+  alwaysOnTop: true,
+  frame: false,
+  movable: true,
+  webPreferences: {
+    preload: preloadPath,
+    devTools: utools.isDev(),
+  },
+};
+
 /**
  * 创建对话框窗口
  * @param {object} config - 对话框配置
@@ -9,9 +28,6 @@ const { createBrowserWindow } = utools;
  */
 const createDialog = (config, customDialogOptions = {}) => {
   return new Promise((resolve) => {
-    const dialogPath = "lib/dialog/view.html";
-    const preloadPath = "lib/dialog/controller.js";
-
     // linux 和 win32 都使用 win32 的样式
     const platform = os.platform() === "darwin" ? "darwin" : "win32";
 
@@ -26,18 +42,8 @@ const createDialog = (config, customDialogOptions = {}) => {
       title: config.title || "对话框",
       width: dialogWidth,
       height: 80,
-      resizable: false,
-      minimizable: false,
-      maximizable: false,
-      fullscreenable: false,
-      skipTaskbar: true,
-      alwaysOnTop: true,
-      frame: false,
       opacity: 0,
-      webPreferences: {
-        preload: preloadPath,
-        devTools: utools.isDev(),
-      },
+      ...commonBrowserWindowOptions,
       ...customDialogOptions, // 合并自定义选项
     };
 
@@ -309,7 +315,6 @@ let lastProcessBar = null;
  */
 const showProcessBar = async (options = {}) => {
   const {
-    title = "进度",
     text = "处理中...",
     value = 0,
     position = "bottom-right",
@@ -335,26 +340,15 @@ const showProcessBar = async (options = {}) => {
 
   return new Promise((resolve) => {
     const UBrowser = createBrowserWindow(
-      "lib/dialog/view.html",
+      dialogPath,
       {
-        title,
         width: windowWidth,
         height: windowHeight,
         x,
         y,
-        resizable: false,
-        minimizable: false,
-        maximizable: false,
-        fullscreenable: false,
-        skipTaskbar: true,
-        alwaysOnTop: true,
-        frame: false,
         opacity: 0,
-        movable: true,
-        webPreferences: {
-          preload: "lib/dialog/controller.js",
-          devTools: utools.isDev(),
-        },
+        focusable: false,
+        ...commonBrowserWindowOptions,
       },
       () => {
         const windowId = UBrowser.webContents.id;
@@ -362,7 +356,6 @@ const showProcessBar = async (options = {}) => {
         // 发送配置到子窗口
         ipcRenderer.sendTo(windowId, "dialog-config", {
           type: "process",
-          title,
           text,
           value,
           isDark: utools.isDarkColors(),
@@ -443,8 +436,101 @@ const updateProcessBar = (options = {}, processBar = null) => {
   ipcRenderer.sendTo(processBar.id, "update-process", { value, text });
 
   if (complete) {
-    processBar.close();
+    setTimeout(() => {
+      processBar.close();
+    }, 600);
+  }
+};
+
+let lastLoadingBar = null;
+
+/**
+ * 显示一个加载条对话框
+ * @param {object} options - 配置选项
+ * @param {string} [options.text="加载中..."] - 加载条上方的文本
+ * @param {string} [options.position="bottom-right"] - 加载条位置，可选值：top-left, top-right, bottom-left, bottom-right
+ * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
+ * @returns {Promise<{id: number, close: Function}>} 返回加载条窗口ID和关闭函数
+ */
+const showLoadingBar = async (options = {}) => {
+  const { text = "加载中...", position = "bottom-right", onClose } = options;
+
+  const windowWidth = 250;
+  const windowHeight = 60;
+
+  // 计算窗口位置
+  const { x, y } = calculateWindowPosition({
+    position,
+    width: windowWidth,
+    height: windowHeight,
+  });
+
+  return new Promise((resolve) => {
+    const UBrowser = createBrowserWindow(
+      dialogPath,
+      {
+        width: windowWidth,
+        height: windowHeight,
+        x,
+        y,
+        opacity: 0,
+        focusable: false,
+        ...commonBrowserWindowOptions,
+      },
+      () => {
+        const windowId = UBrowser.webContents.id;
+
+        // 发送配置到子窗口
+        ipcRenderer.sendTo(windowId, "dialog-config", {
+          type: "process",
+          text,
+          value: 0,
+          isDark: utools.isDarkColors(),
+          platform: process.platform,
+          isLoading: true, // 标记为加载条模式
+        });
+
+        // 监听窗口准备就绪
+        ipcRenderer.once("dialog-ready", () => {
+          UBrowser.setOpacity(1);
+        });
+
+        // 监听对话框结果
+        ipcRenderer.once("dialog-result", (event, result) => {
+          if (result === "close" && typeof onClose === "function") {
+            onClose();
+          }
+          UBrowser.destroy();
+        });
+
+        const loadingBar = {
+          id: windowId,
+          close: () => {
+            if (typeof onClose === "function") {
+              onClose();
+            }
+            lastLoadingBar = null;
+            UBrowser.destroy();
+          },
+        };
+
+        lastLoadingBar = loadingBar;
+
+        // 返回窗口ID和关闭函数
+        resolve(loadingBar);
+      }
+    );
+  });
+};
+
+const closeLoadingBar = (loadingBar) => {
+  if (!loadingBar) {
+    if (!lastLoadingBar) {
+      throw new Error("没有找到已创建的加载条");
+    }
+    loadingBar = lastLoadingBar;
   }
+  loadingBar.close();
 };
 
 module.exports = {
@@ -457,4 +543,6 @@ module.exports = {
   showSystemWaitButton,
   showProcessBar,
   updateProcessBar,
+  showLoadingBar,
+  closeLoadingBar,
 };
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index ad2619a0..fc1ca30a 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -614,6 +614,7 @@ textarea:focus {
   background: rgba(255, 255, 255, 0.3);
   border-radius: 2px;
   overflow: hidden;
+  position: relative;
 }
 
 .process-bar-inner {
@@ -624,6 +625,25 @@ textarea:focus {
   transition: width 0.3s ease;
 }
 
+@keyframes loading-bar-animation {
+  0% {
+    left: -80px;
+  }
+
+  100% {
+    left: calc(100% + 80px);
+  }
+}
+
+.process-bar-loading {
+  position: absolute;
+  width: 80px;
+  height: 100%;
+  background: white;
+  border-radius: 2px;
+  animation: loading-bar-animation 3s infinite linear;
+}
+
 /* 进度条按钮容器 */
 .process-buttons {
   position: absolute;
diff --git a/plugin/lib/dialog/view.html b/plugin/lib/dialog/view.html
index 3bd9c3e1..b4c8ad3a 100644
--- a/plugin/lib/dialog/view.html
+++ b/plugin/lib/dialog/view.html
@@ -60,7 +60,7 @@ <h1 class="title-text" id="title-text">对话框</h1>
           </div>
           <div class="process-text" id="process-text"></div>
           <div class="process-bar">
-            <div class="process-bar-inner" id="process-bar-inner"></div>
+            <div id="process-bar-inner"></div>
           </div>
         </div>
       </div>
diff --git a/plugin/lib/quickcomposer/ai/chat.js b/plugin/lib/quickcomposer/ai/chat.js
index ee89525b..f2d18ccb 100644
--- a/plugin/lib/quickcomposer/ai/chat.js
+++ b/plugin/lib/quickcomposer/ai/chat.js
@@ -105,8 +105,27 @@ async function chat(apiConfig, content) {
       throw new Error("不支持的模型类型");
     }
 
+    const loadingBar = await quickcommand.showLoadingBar({
+      text: "AI思考中...",
+      onClose: () => {
+        // 取消请求
+        if (source) {
+          source.cancel("操作已取消");
+        }
+      },
+    });
+
+    // 创建取消令牌
+    const CancelToken = axios.CancelToken;
+    const source = CancelToken.source();
+
     // 发送请求
-    const response = await axios.post(url, requestData, config);
+    const response = await axios.post(url, requestData, {
+      ...config,
+      cancelToken: source.token,
+    });
+
+    loadingBar.close();
 
     // 解析不同模型的响应
     let result;
@@ -129,6 +148,14 @@ async function chat(apiConfig, content) {
       result,
     };
   } catch (error) {
+    // 如果是用户取消的请求，返回特定的错误信息
+    if (axios.isCancel(error)) {
+      return {
+        success: false,
+        error: "请求已取消",
+        cancelled: true,
+      };
+    }
     return {
       success: false,
       error: error.response?.data?.error?.message || error.message,
diff --git a/plugin/lib/quickcomposer/video/ffmpeg.js b/plugin/lib/quickcomposer/video/ffmpeg.js
index 2402d91d..efb3ef75 100644
--- a/plugin/lib/quickcomposer/video/ffmpeg.js
+++ b/plugin/lib/quickcomposer/video/ffmpeg.js
@@ -18,7 +18,6 @@ async function runFFmpeg(args, options = {}) {
     return;
   }
   const {
-    title = "FFmpeg处理",
     text = "处理中...",
     position = "bottom-right",
     onPause,
@@ -31,7 +30,6 @@ async function runFFmpeg(args, options = {}) {
   // 显示进度条
   const processBar = isShowProcessBar
     ? await quickcommand.showProcessBar({
-        title,
         text,
         value: 0,
         position,
diff --git a/plugin/lib/quickcomposer/windows/monitor.js b/plugin/lib/quickcomposer/windows/monitor.js
index 97189042..f896a6c0 100644
--- a/plugin/lib/quickcomposer/windows/monitor.js
+++ b/plugin/lib/quickcomposer/windows/monitor.js
@@ -1,13 +1,29 @@
 const { runCsharpFeature } = require("../../csharp");
+const child_process = require("child_process");
+
+const stopMonitor = () => {
+  child_process.exec("taskkill /f /im monitor.exe");
+};
 
 // 监控剪贴板变化
 const watchClipboard = async function () {
   const args = ["-type", "clipboard", "-once"];
-  const result = await runCsharpFeature("monitor", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  const loadingBar = await quickcommand.showLoadingBar({
+    text: "等待剪贴板变化...",
+    onClose: () => {
+      stopMonitor();
+    },
+  });
+  try {
+    const result = await runCsharpFeature("monitor", args);
+    loadingBar.close();
+    if (result && result.startsWith("Error:")) {
+      throw new Error(result.substring(7));
+    }
+    return JSON.parse(result);
+  } catch (error) {
+    return {};
   }
-  return JSON.parse(result);
 };
 
 // 监控文件系统变化
@@ -28,11 +44,23 @@ const watchFileSystem = async function (watchPath, options = {}) {
     args.push("-recursive", "false");
   }
 
-  const result = await runCsharpFeature("monitor", args);
-  if (result && result.startsWith("Error:")) {
-    throw new Error(result.substring(7));
+  const loadingBar = await quickcommand.showLoadingBar({
+    text: "等待文件变化...",
+    onClose: () => {
+      stopMonitor();
+    },
+  });
+
+  try {
+    const result = await runCsharpFeature("monitor", args);
+    loadingBar.close();
+    if (result && result.startsWith("Error:")) {
+      throw new Error(result.substring(7));
+    }
+    return JSON.parse(result);
+  } catch (error) {
+    return {};
   }
-  return JSON.parse(result);
 };
 
 module.exports = {
diff --git a/src/App.vue b/src/App.vue
index 947306ea..35272e2e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,6 @@ export default defineComponent({
       commandManager: useCommandManager(),
       setCssVar: setCssVar,
       programs: programmings,
-      isRunningCommand: false,
       profile: defaultProfile.common,
       nativeProfile: defaultProfile.native,
       utools: utoolsFull,
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 77563739..2cc41991 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -126,7 +126,6 @@ export default {
       if (command.program === "quickcomposer") {
         command.cmd = generateFlowsCode(command.flows);
       }
-      this.$root.isRunningCommand = true;
       this.needTempPayload && (await this.getTempPayload(command));
       // 如果命令包含子输入框，则设置子输入框
       if (command.cmd.includes("{{subinput")) return this.setSubInput(command);
@@ -292,7 +291,6 @@ export default {
       };
     },
     handleResult(stdout, stderr, options) {
-      this.$root.isRunningCommand = false;
       if (stderr) {
         return options.earlyExit
           ? alert(stderr)
@@ -302,7 +300,6 @@ export default {
     },
     // 显示运行结果
     async showRunResult(content, isSuccess) {
-      this.$root.isRunningCommand = false;
       content = await this.handleContent(content);
       this.runResultStatus = isSuccess;
       this.runResult = this.runResult.concat(content);
diff --git a/src/components/composer/CommandComposer.vue b/src/components/composer/CommandComposer.vue
index 148c36b7..da1ff659 100644
--- a/src/components/composer/CommandComposer.vue
+++ b/src/components/composer/CommandComposer.vue
@@ -17,9 +17,6 @@
         />
       </div>
     </div>
-    <q-inner-loading :showing="hasCommandNeedLoading && $root.isRunningCommand">
-      <q-spinner-cube size="50px" color="primary" />
-    </q-inner-loading>
   </div>
 </template>
 
@@ -38,7 +35,6 @@ export default defineComponent({
   data() {
     return {
       availableCommands,
-      hasCommandNeedLoading: false,
     };
   },
   props: {
@@ -57,16 +53,6 @@ export default defineComponent({
       // 直接转发事件和代码
       this.$emit("action", actionType, actionData);
     },
-    findCommandNeedLoading(flow) {
-      // 暂时只在运行单独命令时显示载入界面，因为运行整个命令流时，如果不打印输出，是无法判断什么时候运行结束的，
-      // 运行单独命令时，添加了打印流程，且showLoading参数可控
-      if (!flow) return;
-      return flow.some(
-        (cmd) =>
-          cmd.showLoading ||
-          cmd.subCommands?.find((c) => c.value === cmd.value)?.showLoading
-      );
-    },
   },
 });
 </script>
diff --git a/src/js/composer/commands/aiCommands.js b/src/js/composer/commands/aiCommands.js
index ead3afe7..ca2b4521 100644
--- a/src/js/composer/commands/aiCommands.js
+++ b/src/js/composer/commands/aiCommands.js
@@ -11,7 +11,6 @@ export const aiCommands = {
       desc: "获取API支持的模型列表",
       asyncMode: "await",
       icon: "list",
-      showLoading: true,
       config: [
         {
           label: "API配置",
@@ -74,7 +73,6 @@ export const aiCommands = {
       desc: "与AI助手进行对话",
       asyncMode: "await",
       icon: "chat",
-      showLoading: true,
       config: [
         {
           label: "API配置",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index f90e857d..29813510 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -440,26 +440,21 @@ export const uiCommands = {
         {
           component: "OptionEditor",
           options: {
-            title: {
-              label: "标题",
-              component: "VariableInput",
-              width: 6,
-            },
             text: {
               label: "文本",
               component: "VariableInput",
-              width: 6,
+              width: 4,
             },
             value: {
               label: "初始进度值",
               component: "VariableInput",
               disableToggleType: true,
-              width: 3,
+              width: 4,
             },
             position: {
               label: "位置",
               component: "QSelect",
-              width: 3,
+              width: 4,
               options: [
                 { label: "屏幕左上角", value: "top-left" },
                 { label: "屏幕右上角", value: "top-right" },
@@ -471,20 +466,20 @@ export const uiCommands = {
               label: "关闭按钮回调函数",
               component: "VariableInput",
               disableToggleType: true,
-              width: 6,
+              width: 4,
             },
             onPause: {
               label: "暂停按钮回调函数",
               component: "VariableInput",
               disableToggleType: true,
-              width: 6,
+              width: 4,
               placeholder: "必须和恢复回调一起配置",
             },
             onResume: {
               label: "恢复按钮回调函数",
               component: "VariableInput",
               disableToggleType: true,
-              width: 6,
+              width: 4,
               placeholder: "必须和暂停回调一起配置",
             },
           },
@@ -542,6 +537,65 @@ export const uiCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.showLoadingBar",
+      label: "显示载入界面",
+      neverHasOutput: true,
+      asyncMode: "await",
+      config: [
+        {
+          component: "OptionEditor",
+          options: {
+            text: {
+              label: "文本",
+              component: "VariableInput",
+              width: 4,
+            },
+            position: {
+              label: "位置",
+              component: "QSelect",
+              width: 4,
+              options: [
+                { label: "屏幕左上角", value: "top-left" },
+                { label: "屏幕右上角", value: "top-right" },
+                { label: "屏幕左下角", value: "bottom-left" },
+                { label: "屏幕右下角", value: "bottom-right" },
+              ],
+            },
+            onClose: {
+              label: "关闭按钮回调函数",
+              component: "VariableInput",
+              disableToggleType: true,
+              width: 4,
+            },
+          },
+          defaultValue: {
+            text: newVarInputVal("str", "加载中..."),
+            position: "bottom-right",
+            onClose: newVarInputVal("var"),
+          },
+        },
+      ],
+      outputs: {
+        label: "载入条对象",
+        suggestName: "loadingBar",
+      },
+    },
+    {
+      value: "quickcommand.closeLoadingBar",
+      label: "关闭载入界面",
+      neverHasOutput: true,
+      config: [
+        {
+          label: "载入条对象",
+          component: "VariableInput",
+          placeholder: "不传则关闭最近的载入条",
+          width: 12,
+          defaultValue: newVarInputVal("var"),
+          disableToggleType: true,
+        },
+      ],
+    },
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index c9acd114..88ed67f3 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -933,7 +933,6 @@ export const windowsCommands = {
       label: "剪贴板/文件监控",
       icon: "monitor_heart",
       asyncMode: "await",
-      showLoading: true,
       subCommands: [
         {
           value: "quickcomposer.windows.monitor.watchClipboard",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 428fdfe9..0701d54f 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -724,7 +724,6 @@ interface quickcommandApi {
   /**
    * 显示一个带有暂停、恢复、关闭回调功能的进度条，支持动态更新进度
    * @param {object} options - 配置选项
-   * @param {string} [options.title="进度"] - 对话框标题
    * @param {string} [options.text="处理中..."] - 进度条上方的文本
    * @param {number} [options.value=0] - 初始进度值(0-100)
    * @param {string} [options.position="bottom-right"] - 进度条位置，可选值：top-left, top-right, bottom-left, bottom-right
@@ -736,7 +735,6 @@ interface quickcommandApi {
    * ```js
    * // 基本使用
    * const processBar = await quickcommand.showProcessBar({
-   *   title: "下载进度",
    *   text: "正在下载文件...",
    *   value: 0,
    *   position: "bottom-right"
@@ -745,7 +743,6 @@ interface quickcommandApi {
    * // 带暂停/恢复，关闭回调功能
    * let isPaused = false;
    * const processBar = await quickcommand.showProcessBar({
-   *   title: "下载进度",
    *   text: "正在下载文件...",
    *   value: 0,
    *   onPause: () => {
@@ -839,6 +836,58 @@ interface quickcommandApi {
       close: () => void;
     }
   ): void;
+
+  /**
+   * 显示一个循环动画的加载条
+   * @param {object} options - 配置选项
+   * @param {string} [options.text="加载中..."] - 加载条上方的文本
+   * @param {string} [options.position="bottom-right"] - 加载条位置，可选值：top-left, top-right, bottom-left, bottom-right
+   * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
+   * @returns {Promise<{id: number, close: Function}>} 返回加载条对象
+   *
+   * ```js
+   * // 基本使用
+   * const loadingBar = await quickcommand.showLoadingBar({
+   *   text: "正在加载...",
+   *   position: "bottom-right"
+   * });
+   *
+   * // 带关闭回调
+   * const loadingBar = await quickcommand.showLoadingBar({
+   *   text: "正在加载...",
+   *   onClose: () => {
+   *     console.log("用户关闭了加载条");
+   *   }
+   * });
+   *
+   * // 手动关闭
+   * loadingBar.close();
+   * // 或者
+   * quickcommand.closeLoadingBar();
+   * ```
+   */
+  showLoadingBar(options?: {
+    text?: string;
+    position?: "top-left" | "top-right" | "bottom-left" | "bottom-right";
+    onClose?: () => void;
+  }): Promise<{
+    id: number;
+    close: () => void;
+  }>;
+
+  /**
+   * 关闭加载条
+   * @param {{id: number, close: Function}|undefined} loadingBar - 加载条对象，如果不传入则关闭上一次创建的加载条
+   *
+   * ```js
+   * // 关闭最近创建的加载条
+   * quickcommand.closeLoadingBar();
+   *
+   * // 关闭指定的加载条
+   * quickcommand.closeLoadingBar(loadingBar);
+   * ```
+   */
+  closeLoadingBar(loadingBar?: { id: number; close: () => void }): void;
 }
 
 declare var quickcommand: quickcommandApi;

From 9e00a082538e1569a232158ff5fb6527d6000839 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 18 Feb 2025 00:59:28 +0800
Subject: [PATCH 207/332] =?UTF-8?q?=E5=B0=86ai=E6=8E=A5=E5=8F=A3=E7=A7=BB?=
 =?UTF-8?q?=E8=87=B3quickcommand=EF=BC=8C=E6=94=AF=E6=8C=81=E5=9C=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEai=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   4 +-
 .../lib/{quickcomposer/ai/chat.js => ai.js}   |   2 +-
 plugin/lib/quickcommand.js                    |   8 +
 plugin/lib/quickcomposer.js                   |   1 -
 plugin/lib/quickcomposer/ai/index.js          |   6 -
 src/App.vue                                   |  18 +-
 src/components/composer/ai/AskAIEditor.vue    | 179 ++++++++++++++++++
 src/components/menu/index.vue                 |  15 ++
 src/components/popup/AIConfig.vue             | 113 +++++++++++
 src/js/composer/cardComponents.js             |   5 +
 src/js/composer/commands/aiCommands.js        | 145 +-------------
 .../monaco/types/quickcommand.api.d.ts        |  58 ++++++
 src/plugins/monaco/types/quickcomposer.d.ts   |  96 ----------
 13 files changed, 393 insertions(+), 257 deletions(-)
 rename plugin/lib/{quickcomposer/ai/chat.js => ai.js} (99%)
 delete mode 100644 plugin/lib/quickcomposer/ai/index.js
 create mode 100644 src/components/composer/ai/AskAIEditor.vue
 create mode 100644 src/components/popup/AIConfig.vue

diff --git a/README.md b/README.md
index 151251f6..df39f05a 100644
--- a/README.md
+++ b/README.md
@@ -157,9 +157,9 @@ JS代码注入、脚本执行（支持多种语言）、函数返回、变量管
 Windows特定功能
 窗口控制（置顶、透明度、位置）、消息发送、文件系统监控、进程管理、注册表操作、服务管理、快捷方式管理、系统设置修改...
 
-## AI对话
+## AI问答
 
-获取API支持的模型列表、AI对话...
+AI问答（自由问答、翻译、总结、生成shell代码）...
 
 ## 视频处理
 
diff --git a/plugin/lib/quickcomposer/ai/chat.js b/plugin/lib/ai.js
similarity index 99%
rename from plugin/lib/quickcomposer/ai/chat.js
rename to plugin/lib/ai.js
index f2d18ccb..17c1eb7e 100644
--- a/plugin/lib/quickcomposer/ai/chat.js
+++ b/plugin/lib/ai.js
@@ -51,7 +51,7 @@ const PRESET_PROMPTS = {
  * @param {string} content.presetPrompt - 预设提示词类型
  * @returns {Promise<Object>} 对话响应
  */
-async function chat(apiConfig, content) {
+async function chat(content, apiConfig) {
   try {
     const { modelType, apiUrl, apiToken, model } = apiConfig;
     const { prompt, presetPrompt } = content;
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index f0e1cae0..183e6f2b 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -5,6 +5,9 @@ const kill = require("tree-kill");
 const iconv = require("iconv-lite");
 const path = require("path");
 const axios = require("axios");
+const { chat, getModels } = require("./ai");
+
+window.getModelsFromAiApi = getModels;
 
 const systemDialog = require("./dialog/service");
 
@@ -184,6 +187,11 @@ const quickcommand = {
     }
     return null;
   },
+
+  askAI: async function (content, apiConfig) {
+    return await chat(content, apiConfig);
+  },
+
   ...systemDialog,
 };
 
diff --git a/plugin/lib/quickcomposer.js b/plugin/lib/quickcomposer.js
index 1dbccbca..8c05e619 100644
--- a/plugin/lib/quickcomposer.js
+++ b/plugin/lib/quickcomposer.js
@@ -13,7 +13,6 @@ const quickcomposer = {
   status: require("./quickcomposer/status"),
   browser: require("./quickcomposer/browser"),
   video: require("./quickcomposer/video"),
-  ai: require("./quickcomposer/ai"),
 };
 
 module.exports = quickcomposer;
diff --git a/plugin/lib/quickcomposer/ai/index.js b/plugin/lib/quickcomposer/ai/index.js
deleted file mode 100644
index d4af17cd..00000000
--- a/plugin/lib/quickcomposer/ai/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const { chat, getModels } = require("./chat");
-
-module.exports = {
-  chat,
-  getModels,
-};
diff --git a/src/App.vue b/src/App.vue
index 35272e2e..ff004778 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -129,19 +129,19 @@ export default defineComponent({
     },
     outPlugin() {
       // 退出时保存RunCode和RunComposer的命令
-      if (!["code", "composer"].includes(this.$route.name)) return;
+      if (["code", "composer"].includes(this.$route.name)) {
+        let currentCommand = window.lodashM.cloneDeep(
+          this.commandManager.state.currentCommand
+        );
 
-      let currentCommand = window.lodashM.cloneDeep(
-        this.commandManager.state.currentCommand
-      );
+        if (this.$route.name === "composer") {
+          currentCommand =
+            this.commandManager.getLitedComposerCommand(currentCommand);
+        }
 
-      if (this.$route.name === "composer") {
-        currentCommand =
-          this.commandManager.getLitedComposerCommand(currentCommand);
+        dbManager.putDB(currentCommand, `cfg_${this.$route.name}History`);
       }
 
-      dbManager.putDB(currentCommand, `cfg_${this.$route.name}History`);
-
       this.$router.push("/");
       this.saveProfile();
     },
diff --git a/src/components/composer/ai/AskAIEditor.vue b/src/components/composer/ai/AskAIEditor.vue
new file mode 100644
index 00000000..2436ec63
--- /dev/null
+++ b/src/components/composer/ai/AskAIEditor.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+    <div class="q-my-md">
+      <BorderLabel label="API配置">
+        <ButtonGroup
+          :model-value="argvs.apiConfig.modelType"
+          @update:modelValue="updateArgvs('apiConfig.modelType', $event)"
+          :options="modelTypeOptions"
+          height="26px"
+          class="q-mb-sm"
+        />
+        <VariableInput
+          :model-value="argvs.apiConfig.apiUrl"
+          label="API地址"
+          :placeholder="
+            argvs.apiConfig.modelType === 'openai'
+              ? '例：https://api.openai.com/v1'
+              : '例：http://localhost:11434'
+          "
+          @update:modelValue="updateArgvs('apiConfig.apiUrl', $event)"
+          class="q-mb-sm"
+        />
+        <div class="row q-gutter-sm">
+          <VariableInput
+            class="col"
+            v-if="argvs.apiConfig.modelType === 'openai'"
+            :model-value="argvs.apiConfig.apiToken"
+            @update:modelValue="updateArgvs('apiConfig.apiToken', $event)"
+            label="API密钥"
+          />
+          <VariableInput
+            class="col"
+            :model-value="argvs.apiConfig.model"
+            @update:modelValue="updateArgvs('apiConfig.model', $event)"
+            label="模型"
+            :placeholder="
+              argvs.apiConfig.modelType === 'openai'
+                ? '例：gpt-4o'
+                : '例：qwen2.5:32b'
+            "
+          />
+        </div>
+      </BorderLabel>
+    </div>
+    <ButtonGroup
+      :model-value="argvs.content.presetPrompt"
+      @update:modelValue="updateArgvs('content.presetPrompt', $event)"
+      :options="presetPromptOptions"
+      height="26px"
+      class="q-mb-sm"
+    />
+    <VariableInput
+      :model-value="argvs.content.prompt"
+      @update:modelValue="updateArgvs('content.prompt', $event)"
+      label="提示词"
+      type="textarea"
+      autogrow
+    />
+  </div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import BorderLabel from "components/composer/common/BorderLabel.vue";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+import { newVarInputVal } from "js/composer/varInputValManager";
+import VariableInput from "components/composer/common/VariableInput.vue";
+import { parseFunction, stringifyArgv } from "js/composer/formatString";
+
+export default defineComponent({
+  name: "AskAIEditor",
+  props: {
+    modelValue: Object,
+  },
+  components: {
+    VariableInput,
+    BorderLabel,
+    ButtonGroup,
+  },
+  emits: ["update:modelValue"],
+  data() {
+    return {
+      defaultArgvs: {
+        content: {
+          prompt: newVarInputVal("str"),
+          presetPrompt: "",
+        },
+        apiConfig: {},
+      },
+      presetPromptOptions: [
+        { label: "自由问答", value: "" },
+        { label: "翻译", value: "translate" },
+        { label: "总结", value: "summarize" },
+        { label: "执行shell命令", value: "shell" },
+      ],
+      modelTypeOptions: [
+        { label: "OpenAI", value: "openai" },
+        { label: "Ollama", value: "ollama" },
+      ],
+    };
+  },
+  computed: {
+    argvs() {
+      return (
+        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+      );
+    },
+  },
+  methods: {
+    parseCodeToArgvs(code) {
+      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
+      if (!code) return argvs;
+      try {
+        const variableFormatPaths = [
+          "arg0.prompt",
+          "arg1.apiUrl",
+          "arg1.apiToken",
+          "arg1.model",
+        ];
+        const params = parseFunction(code, { variableFormatPaths });
+        return {
+          content: params.argvs[0],
+          apiConfig: params.argvs[1],
+        };
+      } catch (e) {
+        console.error("解析参数失败:", e);
+      }
+      return argvs;
+    },
+    generateCode(argvs = this.argvs) {
+      return `${this.modelValue.value}(${stringifyArgv(
+        argvs.content
+      )}, ${stringifyArgv(argvs.apiConfig)})`;
+    },
+    getSummary(argvs) {
+      return "问AI：" + argvs.content.prompt;
+    },
+    updateArgvs(keyPath, newValue) {
+      const newArgvs = { ...this.argvs };
+      const keys = keyPath.split(".");
+      const lastKey = keys.pop();
+      const target = keys.reduce((obj, key) => obj[key], newArgvs);
+      target[lastKey] = newValue;
+      this.updateModelValue(newArgvs);
+    },
+    updateModelValue(argvs) {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        summary: this.getSummary(argvs),
+        argvs,
+        code: this.generateCode(argvs),
+      });
+    },
+  },
+  mounted() {
+    const aiConfig = this.$root.profile.aiConfig || {};
+    console.log("aiConfig", aiConfig);
+    this.defaultArgvs.apiConfig = {
+      modelType: aiConfig.modelType || "openai",
+      apiUrl: newVarInputVal("str", aiConfig.apiUrl || ""),
+      apiToken: newVarInputVal("str", aiConfig.apiToken || ""),
+      model: newVarInputVal("str", aiConfig.model || ""),
+    };
+
+    const argvs = this.modelValue.argvs || this.defaultArgvs;
+    if (!this.modelValue.code) {
+      this.updateModelValue(argvs);
+    }
+  },
+});
+</script>
+
+<style scoped>
+.return-label {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index fdad1e53..6ac56e5b 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -51,6 +51,14 @@
           <PersonalizeMenu />
         </q-item>
 
+        <!-- AI配置 -->
+        <q-item clickable v-close-popup @click="showAIConfig = true">
+          <q-item-section side>
+            <q-icon name="keyboard_arrow_left" />
+          </q-item-section>
+          <q-item-section>AI配置</q-item-section>
+        </q-item>
+
         <!-- 收藏 -->
         <q-item
           v-if="activatedQuickPanels.includes(currentTag)"
@@ -99,6 +107,10 @@
     <q-dialog v-model="showUserData">
       <UserData :showInsertBtn="false" />
     </q-dialog>
+
+    <q-dialog v-model="showAIConfig">
+      <AIConfig />
+    </q-dialog>
   </div>
 </template>
 
@@ -110,6 +122,7 @@ import CommandManageMenu from "components/menu/CommandManageMenu.vue";
 import UtilityFeaturesMenu from "components/menu/UtilityFeaturesMenu.vue";
 import EnvConfigMenu from "components/menu/EnvConfigMenu.vue";
 import PersonalizeMenu from "components/menu/PersonalizeMenu.vue";
+import AIConfig from "components/popup/AIConfig.vue";
 import UserData from "components/popup/UserData.vue";
 import { utoolsFull } from "js/utools.js";
 import { useCommandManager } from "js/commandManager";
@@ -125,6 +138,7 @@ export default {
     EnvConfigMenu,
     PersonalizeMenu,
     UserData,
+    AIConfig,
   },
   data() {
     return {
@@ -132,6 +146,7 @@ export default {
       showAbout: false,
       showPanelConf: false,
       showUserData: false,
+      showAIConfig: false,
       utools: utoolsFull,
     };
   },
diff --git a/src/components/popup/AIConfig.vue b/src/components/popup/AIConfig.vue
new file mode 100644
index 00000000..522957b8
--- /dev/null
+++ b/src/components/popup/AIConfig.vue
@@ -0,0 +1,113 @@
+<template>
+  <q-card style="width: 600px" class="q-pa-md">
+    <q-card-section class="text-h5"> API配置 </q-card-section>
+    <q-card-section>
+      <ButtonGroup
+        v-model="modelType"
+        :options="[
+          { label: 'OPENAI', value: 'openai' },
+          { label: 'OLLAMA', value: 'ollama' },
+        ]"
+      />
+    </q-card-section>
+    <q-card-section class="q-gutter-sm column">
+      <q-input outlined dense v-model="apiUrl">
+        <template v-slot:prepend>
+          <q-badge
+            color="primary"
+            text-color="black"
+            label="API地址"
+            class="q-pa-xs"
+          />
+        </template>
+      </q-input>
+      <q-input outlined dense v-model="apiToken" v-if="modelType === 'openai'">
+        <template v-slot:prepend>
+          <q-badge
+            color="primary"
+            text-color="black"
+            label="API令牌"
+            class="q-pa-xs"
+          />
+        </template>
+      </q-input>
+      <q-select
+        outlined
+        dense
+        v-model="model"
+        :options="models"
+        @focus="getModels"
+      >
+        <template v-slot:prepend>
+          <q-badge
+            color="primary"
+            text-color="black"
+            label="模型名称"
+            class="q-pa-xs"
+          />
+        </template>
+      </q-select>
+    </q-card-section>
+    <q-card-section class="flex justify-end q-gutter-sm">
+      <q-btn flat color="grey" label="取消" v-close-popup />
+      <q-btn
+        flat
+        color="primary"
+        label="保存"
+        v-close-popup
+        @click="saveConfig"
+      />
+    </q-card-section>
+  </q-card>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+
+export default defineComponent({
+  name: "AIConfig",
+  components: {
+    ButtonGroup,
+  },
+  data() {
+    return {
+      modelType: "openai",
+      apiUrl: "",
+      apiToken: "",
+      model: "",
+      models: [],
+    };
+  },
+  methods: {
+    async getModels() {
+      try {
+        const { success, result } = await window.getModelsFromAiApi({
+          modelType: this.modelType,
+          apiUrl: this.apiUrl,
+          apiToken: this.apiToken,
+        });
+        this.models = success ? result : [];
+      } catch (_) {
+        this.models = [];
+      }
+    },
+    saveConfig() {
+      this.$root.profile.aiConfig = {
+        modelType: this.modelType,
+        apiUrl: this.apiUrl,
+        apiToken: this.apiToken,
+        model: this.model,
+      };
+      console.log("saveConfig", this.$root.profile.aiConfig);
+    },
+  },
+  mounted() {
+    const aiConfig = this.$root.profile.aiConfig || {};
+    this.modelType = aiConfig.modelType || "openai";
+    this.apiUrl = aiConfig.apiUrl || "";
+    this.apiToken = aiConfig.apiToken || "";
+    this.model = aiConfig.model || "";
+  },
+});
+</script>
diff --git a/src/js/composer/cardComponents.js b/src/js/composer/cardComponents.js
index 6d6fd87e..e94af63d 100644
--- a/src/js/composer/cardComponents.js
+++ b/src/js/composer/cardComponents.js
@@ -59,3 +59,8 @@ export const ReturnEditor = defineAsyncComponent(() =>
 export const ScriptEditor = defineAsyncComponent(() =>
   import("components/composer/script/ScriptEditor.vue")
 );
+
+// AI组件
+export const AskAIEditor = defineAsyncComponent(() =>
+  import("src/components/composer/ai/AskAIEditor.vue")
+);
diff --git a/src/js/composer/commands/aiCommands.js b/src/js/composer/commands/aiCommands.js
index ca2b4521..ead4cb0f 100644
--- a/src/js/composer/commands/aiCommands.js
+++ b/src/js/composer/commands/aiCommands.js
@@ -6,150 +6,11 @@ export const aiCommands = {
   defaultOpened: false,
   commands: [
     {
-      value: "quickcomposer.ai.getModels",
-      label: "获取可用模型",
-      desc: "获取API支持的模型列表",
-      asyncMode: "await",
-      icon: "list",
-      config: [
-        {
-          label: "API配置",
-          component: "OptionEditor",
-          icon: "settings",
-          width: 12,
-          options: {
-            modelType: {
-              component: "ButtonGroup",
-              width: 12,
-              height: "26px",
-              options: [
-                { label: "OpenAI", value: "openai" },
-                { label: "Ollama", value: "ollama" },
-              ],
-            },
-            apiUrl: {
-              label: "API地址",
-              component: "VariableInput",
-              icon: "link",
-              width: 12,
-              placeholder: "输入API地址",
-            },
-            apiToken: {
-              label: "API令牌",
-              component: "VariableInput",
-              icon: "key",
-              width: 12,
-              placeholder: "ollama 则留空",
-            },
-          },
-          defaultValue: {
-            modelType: "openai",
-            apiUrl: newVarInputVal("str", "https://api.openai.com/v1/models"),
-          },
-        },
-      ],
-      outputs: {
-        label: "获取模型列表结果",
-        suggestName: "modelListResult",
-        structure: {
-          success: {
-            label: "是否成功",
-            suggestName: "isSuccess",
-          },
-          result: {
-            label: "模型列表",
-            suggestName: "modelList",
-          },
-          error: {
-            label: "错误信息",
-            suggestName: "resultErrorInfo",
-          },
-        },
-      },
-    },
-    {
-      value: "quickcomposer.ai.chat",
-      label: "AI对话",
-      desc: "与AI助手进行对话",
+      value: "quickcommand.askAI",
+      label: "AI问答",
       asyncMode: "await",
       icon: "chat",
-      config: [
-        {
-          label: "API配置",
-          component: "OptionEditor",
-          icon: "settings",
-          width: 12,
-          options: {
-            modelType: {
-              component: "ButtonGroup",
-              width: 12,
-              height: "26px",
-              options: [
-                { label: "OpenAI", value: "openai" },
-                { label: "Ollama", value: "ollama" },
-              ],
-            },
-            apiUrl: {
-              label: "API地址",
-              component: "VariableInput",
-              icon: "link",
-              width: 12,
-              placeholder: "输入API地址",
-            },
-            apiToken: {
-              label: "API令牌",
-              component: "VariableInput",
-              icon: "key",
-              width: 6,
-              placeholder: "ollama 则留空",
-            },
-            model: {
-              label: "模型名称",
-              component: "VariableInput",
-              icon: "smart_toy",
-              width: 6,
-              placeholder: "如 gpt-3.5-turbo",
-            },
-          },
-          defaultValue: {
-            modelType: "openai",
-            apiUrl: newVarInputVal(
-              "str",
-              "https://api.openai.com/v1/chat/completions"
-            ),
-            model: newVarInputVal("str", "gpt-3.5-turbo"),
-          },
-        },
-        {
-          label: "对话内容",
-          component: "OptionEditor",
-          icon: "chat",
-          width: 12,
-          options: {
-            presetPrompt: {
-              component: "ButtonGroup",
-              width: 12,
-              height: "26px",
-              options: [
-                { label: "自由对话", value: "" },
-                { label: "翻译", value: "translate" },
-                { label: "总结", value: "summarize" },
-                { label: "生成SHELL命令", value: "shell" },
-              ],
-            },
-            prompt: {
-              label: "提示词",
-              component: "VariableInput",
-              icon: "edit",
-              width: 12,
-              placeholder: "输入要询问AI的内容",
-            },
-          },
-          defaultValue: {
-            presetPrompt: "",
-          },
-        },
-      ],
+      component: "AskAIEditor",
       outputs: {
         label: "AI响应",
         suggestName: "aiResponse",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 0701d54f..01c93fc4 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -888,6 +888,64 @@ interface quickcommandApi {
    * ```
    */
   closeLoadingBar(loadingBar?: { id: number; close: () => void }): void;
+
+  /**
+   * 与 AI 进行问答
+   * @param content 对话内容
+   * @param apiConfig API配置
+   * @example
+   * // OpenAI 示例
+   * const response = await quickcommand.askAI(
+   *   {
+   *     prompt: "你好",
+   *     presetPrompt: ""  // 使用预设提示词：translate/shell/summarize
+   *   },
+   *   {
+   *     modelType: "openai",
+   *     apiUrl: "https://api.openai.com/v1/chat/completions",
+   *     apiToken: "your-api-token",
+   *     model: "gpt-3.5-turbo"
+   *   }
+   * );
+   *
+   * // Ollama 示例
+   * const response = await quickcommand.askAI(
+   *   {
+   *     prompt: "查找进程名为chrome的进程并关闭",
+   *     presetPrompt: "shell"
+   *   },
+   *   {
+   *     modelType: "ollama",
+   *     apiUrl: "http://localhost:11434/api/generate",
+   *     model: "qwen2.5:32b"
+   *   }
+   * );
+   */
+  askAI(
+    content: {
+      /** 提示词 */
+      prompt: string;
+      /** 预设提示词类型 */
+      presetPrompt?: "" | "translate" | "shell" | "summarize";
+    },
+    apiConfig: {
+      /** 模型类型：openai/ollama */
+      modelType: "openai" | "ollama";
+      /** API地址 */
+      apiUrl: string;
+      /** API令牌（仅 OpenAI 需要） */
+      apiToken?: string;
+      /** 模型名称 */
+      model: string;
+    }
+  ): Promise<{
+    /** 是否成功 */
+    success: boolean;
+    /** AI 响应内容 */
+    result?: string;
+    /** 错误信息 */
+    error?: string;
+  }>;
 }
 
 declare var quickcommand: quickcommandApi;
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index fcb5dc7c..30022082 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -2512,100 +2512,4 @@ interface quickcomposerApi {
      */
     waitForElement(selector: string, timeout?: number): Promise<void>;
   };
-
-  /**
-   * AI 相关功能
-   */
-  ai: {
-    /**
-     * 与 AI 进行对话
-     * @param apiConfig API配置
-     * @param content 对话内容
-     * @example
-     * // OpenAI 示例
-     * const response = await quickcomposer.ai.chat(
-     *   {
-     *     modelType: "openai",
-     *     apiUrl: "https://api.openai.com/v1/chat/completions",
-     *     apiToken: "your-api-token",
-     *     model: "gpt-3.5-turbo"
-     *   },
-     *   {
-     *     prompt: "你好",
-     *     presetPrompt: ""  // 使用预设提示词：translate/shell/summarize
-     *   }
-     * );
-     *
-     * // Ollama 示例
-     * const response = await quickcomposer.ai.chat(
-     *   {
-     *     modelType: "ollama",
-     *     apiUrl: "http://localhost:11434/api/generate",
-     *     model: "qwen2.5:32b"
-     *   },
-     *   {
-     *     prompt: "查找进程名为chrome的进程并关闭",
-     *     presetPrompt: "shell"
-     *   }
-     * );
-     */
-    chat(
-      apiConfig: {
-        /** 模型类型：openai/ollama */
-        modelType: "openai" | "ollama";
-        /** API地址 */
-        apiUrl: string;
-        /** API令牌（仅 OpenAI 需要） */
-        apiToken?: string;
-        /** 模型名称 */
-        model: string;
-      },
-      content: {
-        /** 提示词 */
-        prompt: string;
-        /** 预设提示词类型 */
-        presetPrompt?: "" | "translate" | "shell" | "summarize";
-      }
-    ): Promise<{
-      /** 是否成功 */
-      success: boolean;
-      /** AI 响应内容 */
-      result?: string;
-      /** 错误信息 */
-      error?: string;
-    }>;
-
-    /**
-     * 获取 API 支持的模型列表
-     * @param apiConfig API配置
-     * @example
-     * // OpenAI 示例
-     * const models = await quickcomposer.ai.getModels({
-     *   modelType: "openai",
-     *   apiUrl: "https://api.openai.com/v1/models",
-     *   apiToken: "your-api-token"
-     * });
-     *
-     * // Ollama 示例
-     * const models = await quickcomposer.ai.getModels({
-     *   modelType: "ollama",
-     *   apiUrl: "http://localhost:11434/"
-     * });
-     */
-    getModels(apiConfig: {
-      /** 模型类型：openai/ollama */
-      modelType: "openai" | "ollama";
-      /** API地址 */
-      apiUrl: string;
-      /** API令牌（仅 OpenAI 需要） */
-      apiToken?: string;
-    }): Promise<{
-      /** 是否成功 */
-      success: boolean;
-      /** 模型名称列表 */
-      result?: string[];
-      /** 错误信息 */
-      error?: string;
-    }>;
-  };
 }

From 2217685072292bb8f967d5b20e879818c0c61eeb Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 18 Feb 2025 17:51:20 +0800
Subject: [PATCH 208/332] =?UTF-8?q?=E5=B0=86=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8C=89=E9=92=AE=E7=A7=BB=E8=87=B3=E9=A1=B6?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue              |  72 ++++--
 src/components/editor/CommandActions.vue      | 207 ++++++++++++++++++
 ...andLanguageBar.vue => CommandLanguage.vue} | 163 ++------------
 src/components/editor/EditorTools.vue         |  49 -----
 src/components/popup/EditorHistory.vue        |  89 +-------
 5 files changed, 278 insertions(+), 302 deletions(-)
 create mode 100644 src/components/editor/CommandActions.vue
 rename src/components/editor/{CommandLanguageBar.vue => CommandLanguage.vue} (60%)
 delete mode 100644 src/components/editor/EditorTools.vue

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 0a5dc51b..d815fdba 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -1,11 +1,20 @@
 <template>
   <div class="command-editor">
-    <!-- 编程语言栏 -->
-    <CommandLanguageBar
-      v-model="commandManager.state.currentCommand"
-      :canCommandSave="canCommandSave"
-      @action="http://github.com/handleAction"
-    />
+    <div class="command-editor-header">
+      <!-- 语言选择器及相关配置 -->
+      <CommandLanguage
+        v-model="commandManager.state.currentCommand"
+        @action="http://github.com/handleAction"
+      />
+
+      <!-- 操作按钮 -->
+      <CommandActions
+        ref="editorActions"
+        :command-code="currentCommand.features?.code || 'temp'"
+        :can-command-save="canCommandSave"
+        @action="http://github.com/handleAction"
+      />
+    </div>
 
     <!-- 命令设置栏 -->
     <CommandConfig
@@ -30,14 +39,6 @@
     />
   </div>
 
-  <!-- 编辑器工具按钮组 -->
-  <EditorTools
-    ref="editorTools"
-    v-show="!isConfigExpanded"
-    :commandCode="currentCommand.features?.code || 'temp'"
-    @restore="restoreHistory"
-  />
-
   <!-- 可视化编排 -->
   <q-dialog v-model="showComposer" maximized>
     <CommandComposer
@@ -53,12 +54,12 @@
 </template>
 
 <script>
-import { defineAsyncComponent, ref, computed } from "vue";
+import { defineAsyncComponent, computed } from "vue";
 import CommandConfig from "components/editor/CommandConfig.vue";
-import CommandLanguageBar from "components/editor/CommandLanguageBar";
-import EditorTools from "components/editor/EditorTools";
 import CommandRunResult from "components/CommandRunResult";
 import CommandComposer from "components/composer/CommandComposer.vue";
+import CommandLanguage from "components/editor/CommandLanguage";
+import CommandActions from "components/editor/CommandActions";
 import programs from "js/options/programs.js";
 import { useCommandManager } from "js/commandManager.js";
 
@@ -86,9 +87,9 @@ export default {
     CodeEditor,
     CommandConfig,
     CommandRunResult,
-    CommandLanguageBar,
+    CommandLanguage,
+    CommandActions,
     CommandComposer,
-    EditorTools,
   },
   emits: ["editorEvent"],
   data() {
@@ -187,12 +188,15 @@ export default {
         case "insert-text":
           this.$refs.editor.repacleEditorSelection(data);
           break;
+        case "restore":
+          this.restoreHistory(data);
+          break;
         default:
           break;
       }
     },
     saveToHistory() {
-      this.$refs.editorTools.tryToSave(
+      this.$refs.editorActions.tryToSave(
         this.currentCommand.cmd,
         this.currentCommand.program
       );
@@ -254,6 +258,34 @@ export default {
   background-color: #1e1e1e;
 }
 
+.command-editor-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 30px;
+}
+
+.command-editor-header :deep(.q-btn) {
+  padding: 0 5px;
+}
+
+.command-editor-header :deep(.q-btn__content) {
+  font-size: 12px;
+}
+
+.command-editor-header :deep(.q-btn-dropdown__arrow) {
+  margin-left: 0;
+}
+
+.command-editor-header :deep(.q-focus-helper) {
+  display: none;
+}
+
+.command-editor-header :deep(.q-btn:hover) {
+  filter: brightness(1.2);
+  transition: all 0.2s ease;
+}
+
 .codeEditor {
   flex: 1;
   min-height: 0;
diff --git a/src/components/editor/CommandActions.vue b/src/components/editor/CommandActions.vue
new file mode 100644
index 00000000..d4c9036c
--- /dev/null
+++ b/src/components/editor/CommandActions.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="command-actions">
+    <q-btn
+      label="历史"
+      class="action-btn"
+      dense
+      flat
+      stretch
+      color="primary"
+      :icon="isSaving ? 'check_circle' : 'history'"
+      :class="{ 'saving-animation': isSaving }"
+      @click="$refs.history.open()"
+    ></q-btn>
+    <q-btn-dropdown
+      class="special-var-btn"
+      dense
+      flat
+      stretch
+      label="变量"
+      color="primary"
+      icon="data_object"
+    >
+      <q-list>
+        <q-item
+          v-for="(item, index) in Object.values(specialVars)"
+          :key="index"
+          clickable
+          v-close-popup
+          @click="handleSpecialVarClick(item)"
+        >
+          <q-item-section>
+            <q-item-label class="row items-center justify-between">
+              <div v-text="item.label" />
+              <div v-if="item.onlyCmdTypes" class="row">
+                <q-badge color="grey-9" class="q-ml-xs"> 仅 </q-badge>
+                <q-badge
+                  v-for="type in item.onlyCmdTypes"
+                  :key="type"
+                  class="q-ml-xs"
+                  v-text="commandTypes[type].label"
+                  color="grey-9"
+                />
+              </div>
+            </q-item-label>
+            <q-tooltip v-if="item.tooltip">
+              {{ item.tooltip }}
+            </q-tooltip>
+            <q-item-label caption>{{ item.desc }}</q-item-label>
+          </q-item-section>
+        </q-item>
+      </q-list>
+    </q-btn-dropdown>
+    <q-separator vertical class="q-my-xs" />
+    <q-btn
+      v-if="!isRunCodePage"
+      class="action-btn run-btn"
+      dense
+      flat
+      stretch
+      color="primary"
+      icon="arrow_back"
+      label="退出"
+      @click="$emit('action', 'back')"
+    ></q-btn>
+    <q-btn
+      class="action-btn run-btn"
+      dense
+      flat
+      color="primary"
+      icon="play_arrow"
+      :label="`运行(${ctrlKey}B)`"
+      @click="$emit('action', 'run')"
+    ></q-btn>
+    <q-btn
+      v-if="!isRunCodePage"
+      :disable="!canCommandSave"
+      :color="canCommandSave ? 'primary' : 'grey'"
+      class="action-btn save-btn"
+      flat
+      dense
+      icon="save"
+      :label="`保存(${ctrlKey}S)`"
+      @click="$emit('action', 'save')"
+    ></q-btn>
+
+    <q-dialog v-model="showUserData">
+      <UserData
+        @insertText="
+          insertSpecialVar($event);
+          showUserData = false;
+        "
+        :showInsertBtn="true"
+      />
+    </q-dialog>
+
+    <!-- 历史记录组件 -->
+    <EditorHistory
+      ref="history"
+      :command-code="commandCode"
+      @restore="$emit('action', 'restore', $event)"
+    />
+  </div>
+</template>
+
+<script>
+import UserData from "components/popup/UserData.vue";
+import commandTypes from "js/options/commandTypes.js";
+import specialVars from "js/options/specialVars.js";
+import EditorHistory from "components/popup/EditorHistory.vue";
+
+export default {
+  name: "CommandActions",
+  components: {
+    UserData,
+    EditorHistory,
+  },
+  props: {
+    canCommandSave: {
+      type: Boolean,
+      default: true,
+    },
+    commandCode: {
+      type: String,
+      default: "temp",
+    },
+  },
+  emits: ["action"],
+  data() {
+    return {
+      ctrlKey: window.utools.isMacOS() ? "⌘" : "⌃",
+      commandTypes,
+      specialVars,
+      showUserData: false,
+      isSaving: false,
+    };
+  },
+  computed: {
+    isRunCodePage() {
+      return this.$route.name === "code";
+    },
+  },
+  methods: {
+    handleSpecialVarClick(item) {
+      if (item.label === "{{usr:}}") this.showUserData = true;
+      else this.insertSpecialVar(item.label);
+    },
+    insertSpecialVar(text) {
+      if (!text) return;
+      this.$emit("action", "insert-text", `"${text}"`);
+    },
+    tryToSave(content, program) {
+      const saved = this.$refs.history.tryToSave(content, program);
+      if (saved) this.showSaveAnimation();
+    },
+    showSaveAnimation() {
+      this.isSaving = true;
+      setTimeout(() => {
+        this.isSaving = false;
+      }, 2000);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.command-actions {
+  display: flex;
+  align-items: center;
+}
+
+/* 保存动画 */
+@keyframes saving {
+  0% {
+    transform: scale(1);
+    opacity: 1;
+  }
+  30% {
+    transform: scale(1.4);
+    opacity: 0.8;
+  }
+  60% {
+    transform: scale(0.8);
+    opacity: 0.6;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+}
+
+.saving-animation :deep(.q-icon) {
+  animation: saving 2s cubic-bezier(0.4, 0, 0.2, 1);
+  will-change: transform, opacity;
+}
+
+/* 运行按钮动画 */
+.run-btn:hover :deep(.q-icon) {
+  display: inline-block;
+  animation: leftRight 1.5s infinite;
+}
+
+/* 保存按钮动画 */
+.save-btn:not([disabled]):hover :deep(.q-icon) {
+  display: inline-block;
+  animation: upDown 1.2s infinite;
+}
+</style>
diff --git a/src/components/editor/CommandLanguageBar.vue b/src/components/editor/CommandLanguage.vue
similarity index 60%
rename from src/components/editor/CommandLanguageBar.vue
rename to src/components/editor/CommandLanguage.vue
index 3f35a210..228f083c 100644
--- a/src/components/editor/CommandLanguageBar.vue
+++ b/src/components/editor/CommandLanguage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="command-language-bar">
+  <div class="command-language">
     <q-select
       class="q-pl-xs"
       dense
@@ -39,46 +39,10 @@
         </q-item>
       </template>
     </q-select>
-    <q-btn-group unelevated class="button-group">
-      <q-btn-dropdown
-        class="special-var-btn"
-        dense
-        flat
-        label="变量"
-        color="primary"
-        icon="data_object"
-      >
-        <q-list>
-          <q-item
-            v-for="(item, index) in Object.values(specialVars)"
-            :key="index"
-            clickable
-            v-close-popup
-            @click="handleSpecialVarClick(item)"
-          >
-            <q-item-section>
-              <q-item-label class="row items-center justify-between">
-                <div v-text="item.label" />
-                <div v-if="item.onlyCmdTypes" class="row">
-                  <q-badge color="grey-9" class="q-ml-xs"> 仅 </q-badge>
-                  <q-badge
-                    v-for="type in item.onlyCmdTypes"
-                    :key="type"
-                    class="q-ml-xs"
-                    v-text="commandTypes[type].label"
-                    color="grey-9"
-                  />
-                </div>
-              </q-item-label>
-              <q-tooltip v-if="item.tooltip">
-                {{ item.tooltip }}
-              </q-tooltip>
-              <q-item-label caption>{{ item.desc }}</q-item-label>
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
 
+    <q-space />
+
+    <q-btn-group unelevated class="button-group">
       <template v-if="currentCommand.program === 'quickcommand'">
         <q-btn
           v-for="(item, index) in ['help_center', 'view_timeline']"
@@ -177,80 +141,26 @@
           </q-item>
         </q-list>
       </q-btn-dropdown>
-      <q-separator vertical inset />
-      <q-btn
-        v-if="!isRunCodePage"
-        class="action-btn run-btn"
-        dense
-        flat
-        color="primary"
-        icon="arrow_back"
-        label="退出"
-        @click="$emit('action', 'back')"
-      ></q-btn>
-      <q-btn
-        class="action-btn run-btn"
-        dense
-        flat
-        color="primary"
-        icon="play_arrow"
-        :label="`运行(${ctrlKey}B)`"
-        @click="$emit('action', 'run')"
-      ></q-btn>
-      <q-btn
-        v-if="!isRunCodePage"
-        :disable="!canCommandSave"
-        :color="canCommandSave ? 'primary' : 'grey'"
-        class="action-btn save-btn"
-        flat
-        dense
-        icon="save"
-        :label="`保存(${ctrlKey}S)`"
-        @click="$emit('action', 'save')"
-      ></q-btn>
     </q-btn-group>
-    <q-dialog v-model="showUserData">
-      <UserData
-        @insertText="
-          insertSpecialVar($event);
-          showUserData = false;
-        "
-        :showInsertBtn="true"
-      />
-    </q-dialog>
   </div>
 </template>
 
 <script>
 import programs from "js/options/programs.js";
-import specialVars from "js/options/specialVars.js";
-import commandTypes from "js/options/commandTypes.js";
-import UserData from "components/popup/UserData.vue";
 
 export default {
-  name: "CommandLanguageBar",
+  name: "CommandLanguage",
   props: {
     modelValue: {
       type: Object,
       required: true,
     },
-    canCommandSave: {
-      type: Boolean,
-      default: true,
-    },
   },
   emits: ["update:modelValue", "action"],
-  components: {
-    UserData,
-  },
   data() {
     return {
       programs,
-      specialVars,
-      commandTypes,
       isSettingsVisible: false,
-      showUserData: false,
-      ctrlKey: window.utools.isMacOS() ? "⌘" : "⌃",
     };
   },
   computed: {
@@ -269,10 +179,8 @@ export default {
         this.isSettingsVisible = true;
       }
       if (newProgram === "html") {
-        // 如果是html命令，则设置output为html
         newCommand.output = "html";
       } else if (this.isRunCodePage) {
-        // 否则，运行代码页面，恢复output为text
         newCommand.output = "text";
       }
       const featuresIcon = this.currentCommand.features.icon || "";
@@ -299,69 +207,24 @@ export default {
     showHelp() {
       window.showUb.docs();
     },
-    handleSpecialVarClick(item) {
-      if (item.label === "{{usr:}}") this.showUserData = true;
-      else this.insertSpecialVar(item.label);
-    },
-    insertSpecialVar(text) {
-      if (!text) return;
-      this.$emit("action", "insert-text", `"${text}"`);
-    },
   },
 };
 </script>
 
 <style scoped>
-.button-group {
-  padding: 0 5px;
-}
-
-.button-group :deep(.q-focus-helper) {
-  display: none;
-}
-
-.button-group :deep(.q-btn__content) {
-  font-size: 12px;
-}
-
-.button-group :deep(.q-btn-dropdown__arrow) {
-  margin-left: 0;
-}
-
-.button-group .q-btn:hover {
-  filter: brightness(1.2);
-  transition: all 0.2s ease;
-}
-
-/* 运行按钮动画 */
-.run-btn:hover :deep(.q-icon) {
-  display: inline-block;
-  animation: leftRight 1.5s infinite;
+.command-language {
+  flex: 1;
 }
 
-/* 保存按钮动画 */
-.save-btn:not([disabled]):hover :deep(.q-icon) {
-  display: inline-block;
-  animation: upDown 1.2s infinite;
+.command-language :deep(.q-field__control),
+.command-language :deep(.q-field__control > *),
+.command-language :deep(.q-field__native) {
+  max-height: 30px;
+  min-height: 30px;
 }
 
-.command-language-bar {
-  background-color: #fffffe;
-  height: 30px;
-  margin-bottom: 2px;
+.command-language {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-}
-
-.body--dark .command-language-bar {
-  background-color: #1e1e1e;
-}
-
-.command-language-bar :deep(.q-field__control),
-.command-language-bar :deep(.q-field__control > *),
-.command-language-bar :deep(.q-field__native) {
-  max-height: 30px;
-  min-height: 30px;
 }
 </style>
diff --git a/src/components/editor/EditorTools.vue b/src/components/editor/EditorTools.vue
deleted file mode 100644
index d65e97e8..00000000
--- a/src/components/editor/EditorTools.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div class="editor-tools">
-    <!-- 历史记录组件 -->
-    <EditorHistory
-      ref="history"
-      :commandCode="commandCode"
-      @restore="$emit('restore', $event)"
-    />
-  </div>
-</template>
-
-<script>
-import EditorHistory from "components/popup/EditorHistory.vue";
-
-export default {
-  name: "EditorTools",
-  components: {
-    EditorHistory,
-  },
-  props: {
-    commandCode: {
-      type: String,
-      default: "temp",
-    },
-  },
-  emits: ["restore"],
-  methods: {
-    showHistory() {
-      this.$refs.history.open();
-    },
-    tryToSave(content, program) {
-      this.$refs.history.tryToSave(content, program);
-    },
-  },
-};
-</script>
-
-<style scoped>
-.editor-tools {
-  position: fixed;
-  right: 24px;
-  bottom: 24px;
-  z-index: 500;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
-}
-</style>
diff --git a/src/components/popup/EditorHistory.vue b/src/components/popup/EditorHistory.vue
index 77ca1118..f19bda79 100644
--- a/src/components/popup/EditorHistory.vue
+++ b/src/components/popup/EditorHistory.vue
@@ -1,20 +1,5 @@
 <template>
   <div class="editor-history-container">
-    <!-- 渲染默认插槽内容(历史按钮) -->
-    <q-btn
-      round
-      dense
-      class="history-btn"
-      :class="{ saving: isSaving }"
-      icon="history"
-      @click="showHistory"
-    >
-      <div class="save-overlay">
-        <q-icon name="check" />
-      </div>
-      <q-tooltip>历史记录</q-tooltip>
-    </q-btn>
-
     <q-dialog
       v-model="show"
       position="right"
@@ -36,7 +21,11 @@
               enter-active-class="fade-in"
               leave-active-class="fade-out"
             >
-              <div v-if="selectedIndex !== null" class="preview-content" :key="selectedIndex">
+              <div
+                v-if="selectedIndex !== null"
+                class="preview-content"
+                :key="selectedIndex"
+              >
                 <pre>{{ historyList[selectedIndex]?.content || "" }}</pre>
               </div>
               <div v-else class="preview-placeholder" key="placeholder">
@@ -142,8 +131,6 @@ export default {
       historyList: [],
       maxHistoryItems: 50,
       storagePrefix: "editor_history_",
-      isSaving: false,
-      saveTimer: null,
       selectedIndex: null,
       showClearConfirm: false,
     };
@@ -175,21 +162,7 @@ export default {
         return false;
       }
 
-      const saved = this.saveHistory(content, program);
-      if (saved) {
-        this.showSaveAnimation();
-      }
-      return true;
-    },
-
-    showSaveAnimation() {
-      if (this.saveTimer) {
-        clearTimeout(this.saveTimer);
-      }
-      this.isSaving = true;
-      this.saveTimer = setTimeout(() => {
-        this.isSaving = false;
-      }, 1500);
+      return this.saveHistory(content, program);
     },
 
     showHistory() {
@@ -497,56 +470,6 @@ export default {
   opacity: 0.3;
 }
 
-.history-btn {
-  color: #666;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 3px 3px rgba(0, 0, 0, 0.2);
-  position: relative;
-  overflow: hidden;
-}
-
-.history-btn:hover {
-  transform: translateY(-1px);
-}
-
-.save-overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: var(--q-positive);
-  transform: translateY(100%);
-  transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-}
-
-.save-overlay i {
-  color: white;
-  font-size: 1.2em;
-}
-
-.history-btn.saving {
-  pointer-events: none;
-}
-
-.history-btn.saving .save-overlay {
-  transform: translateY(0);
-}
-
-/* 暗色模式适配 */
-.body--dark .history-btn {
-  color: #bbb;
-  background: rgba(255, 255, 255, 0.1);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-}
-
-.body--dark .history-btn:hover {
-  background: #505050;
-}
-
 /* 确认对话框样式 */
 .confirm-dialog {
   min-width: 300px;

From 1be095fec2bdf13d418577d082be153526aa1b0a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 18 Feb 2025 20:58:12 +0800
Subject: [PATCH 209/332] =?UTF-8?q?=E9=87=8D=E6=9E=84AI=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ai/AskAIEditor.vue |  99 ++++-----
 src/components/editor/CommandConfig.vue    |   2 +-
 src/components/popup/AIConfig.vue          | 241 ++++++++++++++-------
 src/css/app.css                            |  68 ++++++
 src/css/composer.css                       |  68 ------
 5 files changed, 271 insertions(+), 207 deletions(-)

diff --git a/src/components/composer/ai/AskAIEditor.vue b/src/components/composer/ai/AskAIEditor.vue
index 2436ec63..1b8a9594 100644
--- a/src/components/composer/ai/AskAIEditor.vue
+++ b/src/components/composer/ai/AskAIEditor.vue
@@ -1,47 +1,28 @@
 <template>
   <div>
-    <div class="q-my-md">
-      <BorderLabel label="API配置">
-        <ButtonGroup
-          :model-value="argvs.apiConfig.modelType"
-          @update:modelValue="updateArgvs('apiConfig.modelType', $event)"
-          :options="modelTypeOptions"
-          height="26px"
-          class="q-mb-sm"
-        />
-        <VariableInput
-          :model-value="argvs.apiConfig.apiUrl"
-          label="API地址"
-          :placeholder="
-            argvs.apiConfig.modelType === 'openai'
-              ? '例：https://api.openai.com/v1'
-              : '例：http://localhost:11434'
-          "
-          @update:modelValue="updateArgvs('apiConfig.apiUrl', $event)"
-          class="q-mb-sm"
-        />
-        <div class="row q-gutter-sm">
-          <VariableInput
-            class="col"
-            v-if="argvs.apiConfig.modelType === 'openai'"
-            :model-value="argvs.apiConfig.apiToken"
-            @update:modelValue="updateArgvs('apiConfig.apiToken', $event)"
-            label="API密钥"
-          />
-          <VariableInput
-            class="col"
-            :model-value="argvs.apiConfig.model"
-            @update:modelValue="updateArgvs('apiConfig.model', $event)"
-            label="模型"
-            :placeholder="
-              argvs.apiConfig.modelType === 'openai'
-                ? '例：gpt-4o'
-                : '例：qwen2.5:32b'
-            "
-          />
+    <q-select
+      v-if="apiOptions.length > 0"
+      :model-value="argvs.apiConfig"
+      @update:model-value="updateArgvs('apiConfig', $event)"
+      :options="apiOptions"
+      map-options
+      emit-value
+      dense
+      options-dense
+      filled
+      label="API模型"
+      class="q-mb-sm"
+    />
+    <q-field filled dense v-else class="q-mb-sm">
+      <template #control>
+        <div class="flex items-center justify-center full-width text-warning">
+          <q-icon name="warning" class="q-mr-sm" />
+          <div>
+            未配置API模型，配置方法：命令配置界面-右下角菜单按钮-API配置
+          </div>
         </div>
-      </BorderLabel>
-    </div>
+      </template>
+    </q-field>
     <ButtonGroup
       :model-value="argvs.content.presetPrompt"
       @update:modelValue="updateArgvs('content.presetPrompt', $event)"
@@ -61,11 +42,11 @@
 
 <script>
 import { defineComponent } from "vue";
-import BorderLabel from "components/composer/common/BorderLabel.vue";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { dbManager } from "js/utools.js";
 
 export default defineComponent({
   name: "AskAIEditor",
@@ -74,7 +55,6 @@ export default defineComponent({
   },
   components: {
     VariableInput,
-    BorderLabel,
     ButtonGroup,
   },
   emits: ["update:modelValue"],
@@ -87,6 +67,7 @@ export default defineComponent({
         },
         apiConfig: {},
       },
+      apiOptions: [],
       presetPromptOptions: [
         { label: "自由问答", value: "" },
         { label: "翻译", value: "translate" },
@@ -111,17 +92,9 @@ export default defineComponent({
       const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
       if (!code) return argvs;
       try {
-        const variableFormatPaths = [
-          "arg0.prompt",
-          "arg1.apiUrl",
-          "arg1.apiToken",
-          "arg1.model",
-        ];
+        const variableFormatPaths = ["arg0.prompt"];
         const params = parseFunction(code, { variableFormatPaths });
-        return {
-          content: params.argvs[0],
-          apiConfig: params.argvs[1],
-        };
+        return params;
       } catch (e) {
         console.error("解析参数失败:", e);
       }
@@ -130,7 +103,7 @@ export default defineComponent({
     generateCode(argvs = this.argvs) {
       return `${this.modelValue.value}(${stringifyArgv(
         argvs.content
-      )}, ${stringifyArgv(argvs.apiConfig)})`;
+      )}, ${JSON.stringify(argvs.apiConfig)})`;
     },
     getSummary(argvs) {
       return "问AI：" + argvs.content.prompt;
@@ -153,14 +126,16 @@ export default defineComponent({
     },
   },
   mounted() {
-    const aiConfig = this.$root.profile.aiConfig || {};
-    console.log("aiConfig", aiConfig);
-    this.defaultArgvs.apiConfig = {
-      modelType: aiConfig.modelType || "openai",
-      apiUrl: newVarInputVal("str", aiConfig.apiUrl || ""),
-      apiToken: newVarInputVal("str", aiConfig.apiToken || ""),
-      model: newVarInputVal("str", aiConfig.model || ""),
-    };
+    const apiConfigs = dbManager.getStorage("cfg_aiConfigs");
+    this.apiOptions = apiConfigs
+      ? apiConfigs.map((config) => {
+          return {
+            label: config.name,
+            value: config,
+          };
+        })
+      : [];
+    this.defaultArgvs.apiConfig = apiConfigs?.[0] || {};
 
     const argvs = this.modelValue.argvs || this.defaultArgvs;
     if (!this.modelValue.code) {
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index 5cb6251e..bbc971c8 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -2,7 +2,7 @@
   <q-expansion-item
     v-model="isExpanded"
     @update:model-value="$emit('update:is-expanded', $event)"
-    class="command-composer command-config"
+    class="command-config"
     expand-icon-toggle
   >
     <template v-slot:header>
diff --git a/src/components/popup/AIConfig.vue b/src/components/popup/AIConfig.vue
index 522957b8..85c9dad1 100644
--- a/src/components/popup/AIConfig.vue
+++ b/src/components/popup/AIConfig.vue
@@ -1,54 +1,122 @@
 <template>
-  <q-card style="width: 600px" class="q-pa-md">
-    <q-card-section class="text-h5"> API配置 </q-card-section>
-    <q-card-section>
-      <ButtonGroup
-        v-model="modelType"
-        :options="[
-          { label: 'OPENAI', value: 'openai' },
-          { label: 'OLLAMA', value: 'ollama' },
-        ]"
-      />
-    </q-card-section>
-    <q-card-section class="q-gutter-sm column">
-      <q-input outlined dense v-model="apiUrl">
-        <template v-slot:prepend>
-          <q-badge
-            color="primary"
-            text-color="black"
-            label="API地址"
-            class="q-pa-xs"
-          />
-        </template>
-      </q-input>
-      <q-input outlined dense v-model="apiToken" v-if="modelType === 'openai'">
-        <template v-slot:prepend>
-          <q-badge
-            color="primary"
-            text-color="black"
-            label="API令牌"
-            class="q-pa-xs"
-          />
-        </template>
-      </q-input>
-      <q-select
-        outlined
-        dense
-        v-model="model"
-        :options="models"
-        @focus="getModels"
+  <q-card style="width: 800px" class="q-pa-sm">
+    <div class="text-h5 q-my-md q-px-sm">API配置</div>
+    <div>
+      <div class="flex q-mb-md q-px-sm" style="height: 26px">
+        <ButtonGroup
+          v-model="modelToAdd"
+          class="col"
+          :options="[
+            { label: 'OPENAI', value: 'openai' },
+            { label: 'OLLAMA', value: 'ollama' },
+          ]"
+          height="26px"
+        />
+        <q-icon
+          name="add_box"
+          @click="addModel"
+          color="primary"
+          size="26px"
+          class="cursor-pointer q-ml-sm"
+        />
+      </div>
+      <q-scroll-area
+        :style="`height: ${getConfigListHeight()}px;`"
+        class="q-px-sm"
+        :vertical-thumb-style="{
+          width: '2px',
+        }"
       >
-        <template v-slot:prepend>
-          <q-badge
-            color="primary"
-            text-color="black"
-            label="模型名称"
-            class="q-pa-xs"
-          />
-        </template>
-      </q-select>
-    </q-card-section>
-    <q-card-section class="flex justify-end q-gutter-sm">
+        <div class="config-list">
+          <div
+            v-for="(aiConfig, index) in aiConfigs"
+            :key="index"
+            class="config-item"
+          >
+            <div class="row q-col-gutter-sm">
+              <q-input
+                filled
+                dense
+                v-model="aiConfig.name"
+                class="col"
+                placeholder="请输入名称"
+              >
+                <template v-slot:prepend>
+                  <q-badge
+                    color="primary"
+                    text-color="black"
+                    label="名称"
+                    class="q-pa-xs"
+                  />
+                </template>
+                <template v-slot:append>
+                  <q-icon
+                    color="grey"
+                    name="remove_circle"
+                    @click="deleteModel(index)"
+                    size="16px"
+                    class="cursor-pointer"
+                  />
+                </template>
+              </q-input>
+              <q-input
+                filled
+                dense
+                v-model="aiConfig.apiUrl"
+                class="col-8"
+                :placeholder="`${aiConfig.modelType} API地址`"
+              >
+                <template v-slot:prepend>
+                  <q-badge
+                    color="primary"
+                    text-color="black"
+                    label="接口"
+                    class="q-pa-xs"
+                  />
+                </template>
+              </q-input>
+            </div>
+            <div class="row q-col-gutter-sm">
+              <q-select
+                filled
+                dense
+                v-model="aiConfig.model"
+                :options="models"
+                @focus="getModels(aiConfig)"
+                class="col"
+              >
+                <template v-slot:prepend>
+                  <q-badge
+                    color="primary"
+                    text-color="black"
+                    label="模型"
+                    class="q-pa-xs"
+                  />
+                </template>
+              </q-select>
+              <q-input
+                filled
+                dense
+                v-model="aiConfig.apiToken"
+                v-if="aiConfig.modelType === 'openai'"
+                type="password"
+                class="col-8"
+              >
+                <template v-slot:prepend>
+                  <q-badge
+                    color="primary"
+                    text-color="black"
+                    label="令牌"
+                    class="q-pa-xs"
+                  />
+                </template>
+              </q-input>
+            </div>
+          </div>
+        </div>
+      </q-scroll-area>
+    </div>
+    <div class="flex justify-end q-gutter-sm q-px-sm">
       <q-btn flat color="grey" label="取消" v-close-popup />
       <q-btn
         flat
@@ -57,12 +125,13 @@
         v-close-popup
         @click="saveConfig"
       />
-    </q-card-section>
+    </div>
   </q-card>
 </template>
 
 <script>
 import { defineComponent } from "vue";
+import { dbManager } from "js/utools.js";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 
 export default defineComponent({
@@ -72,42 +141,62 @@ export default defineComponent({
   },
   data() {
     return {
-      modelType: "openai",
-      apiUrl: "",
-      apiToken: "",
-      model: "",
+      modelToAdd: "openai",
+      aiConfigs: [],
       models: [],
     };
   },
   methods: {
-    async getModels() {
-      try {
-        const { success, result } = await window.getModelsFromAiApi({
-          modelType: this.modelType,
-          apiUrl: this.apiUrl,
-          apiToken: this.apiToken,
-        });
-        this.models = success ? result : [];
-      } catch (_) {
-        this.models = [];
+    async getModels(aiConfig) {
+      const { success, result, error } = await window.getModelsFromAiApi(
+        aiConfig
+      );
+      if (!success) {
+        quickcommand.showMessageBox(error, "error");
+        return;
       }
+      this.models = result;
     },
     saveConfig() {
-      this.$root.profile.aiConfig = {
-        modelType: this.modelType,
-        apiUrl: this.apiUrl,
-        apiToken: this.apiToken,
-        model: this.model,
-      };
-      console.log("saveConfig", this.$root.profile.aiConfig);
+      dbManager.setStorage(
+        "cfg_aiConfigs",
+        window.lodashM.cloneDeep(this.aiConfigs)
+      );
+    },
+    deleteModel(index) {
+      this.aiConfigs.splice(index, 1);
+    },
+    addModel() {
+      this.aiConfigs.push({
+        modelType: this.modelToAdd,
+        apiUrl: "",
+        apiToken: "",
+        model: "",
+        name: "",
+      });
+    },
+    getConfigListHeight() {
+      const counts = Math.min(this.aiConfigs.length, 3);
+      return counts * 100 + (counts - 1) * 8;
     },
   },
   mounted() {
-    const aiConfig = this.$root.profile.aiConfig || {};
-    this.modelType = aiConfig.modelType || "openai";
-    this.apiUrl = aiConfig.apiUrl || "";
-    this.apiToken = aiConfig.apiToken || "";
-    this.model = aiConfig.model || "";
+    this.aiConfigs = dbManager.getStorage("cfg_aiConfigs") || [];
   },
 });
 </script>
+
+<style scoped>
+.config-list,
+.config-item {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.config-item {
+  border: 1px solid var(--q-primary);
+  border-radius: 4px;
+  padding: 8px;
+}
+</style>
diff --git a/src/css/app.css b/src/css/app.css
index 8a782b3c..7bb4d1f2 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -368,3 +368,71 @@ body.body--dark.glass-effect-menu .q-menu {
     transform: rotate(10deg);
   }
 }
+
+/* q-field--filled 布局更加紧凑 */
+/* 输入框高度及字体 */
+.q-field--filled:not(.q-textarea) .q-field__control,
+.q-field--filled:not(.q-textarea) .q-field__control>*,
+.q-field--filled:not(.q-field--labeled):not(.q-textarea) .q-field__native {
+  max-height: 36px !important;
+  min-height: 36px !important;
+}
+
+.q-field--filled .q-field__control,
+.q-field--filled .q-field__control>*,
+.q-field--filled .q-field__native {
+  border-radius: 5px;
+  font-size: 12px;
+}
+
+.q-field--filled.q-select--with-chips .q-field__control .q-chip {
+  margin: 0 4px;
+}
+
+/* 输入框图标大小 */
+.q-field--filled .q-field__control .q-icon {
+  font-size: 18px;
+}
+
+/* 输入框标签字体大小，占位时的位置 */
+.q-field--filled .q-field__label {
+  font-size: 11px;
+  top: 11px;
+}
+
+/* 输入框标签悬浮的位置 */
+.q-field--filled.q-field--dense.q-field--float .q-field__label {
+  transform: translateY(-50%) scale(0.75);
+}
+
+/* 去除filled输入框边框 */
+.q-field--filled .q-field__control:before {
+  border: none;
+}
+
+/* 去除filled输入框下划线 */
+.q-field--filled .q-field__control:after {
+  height: 0;
+  border-bottom: none;
+}
+
+/* 输入框背景颜色及内边距 */
+.q-field--filled .q-field__control {
+  background: rgba(0, 0, 0, 0.03);
+  padding: 0 8px;
+}
+
+/* 输入框聚焦时的背景颜色 */
+.q-field--filled.q-field--highlighted .q-field__control {
+  background: rgba(0, 0, 0, 0.03);
+}
+
+/* 暗黑模式下的输入框背景颜色 */
+.body--dark .q-field--filled .q-field__control {
+  background: rgba(255, 255, 255, 0.04);
+}
+
+/* 暗黑模式下输入框聚焦时的背景颜色 */
+.body--dark .q-field--filled.q-field--highlighted .q-field__control {
+  background: rgba(255, 255, 255, 0.08);
+}
diff --git a/src/css/composer.css b/src/css/composer.css
index cc133eb1..705d66f5 100644
--- a/src/css/composer.css
+++ b/src/css/composer.css
@@ -9,74 +9,6 @@
   opacity: 0.8;
 }
 
-/* 布局更加紧凑 */
-/* 输入框高度及字体 */
-.command-composer .q-field--filled:not(.q-textarea) .q-field__control,
-.command-composer .q-field--filled:not(.q-textarea) .q-field__control>*,
-.command-composer .q-field--filled:not(.q-field--labeled):not(.q-textarea) .q-field__native {
-  max-height: 36px !important;
-  min-height: 36px !important;
-}
-
-.command-composer .q-field--filled .q-field__control,
-.command-composer .q-field--filled .q-field__control>*,
-.command-composer .q-field--filled .q-field__native {
-  border-radius: 5px;
-  font-size: 12px;
-}
-
-.command-composer .q-field--filled.q-select--with-chips .q-field__control .q-chip {
-  margin: 0 4px;
-}
-
-/* 输入框图标大小 */
-.command-composer .q-field--filled .q-field__control .q-icon {
-  font-size: 18px;
-}
-
-/* 输入框标签字体大小，占位时的位置 */
-.command-composer .q-field--filled .q-field__label {
-  font-size: 11px;
-  top: 11px;
-}
-
-/* 输入框标签悬浮的位置 */
-.command-composer .q-field--filled.q-field--dense.q-field--float .q-field__label {
-  transform: translateY(-50%) scale(0.75);
-}
-
-/* 去除filled输入框边框 */
-.command-composer .q-field--filled .q-field__control:before {
-  border: none;
-}
-
-/* 去除filled输入框下划线 */
-.command-composer .q-field--filled .q-field__control:after {
-  height: 0;
-  border-bottom: none;
-}
-
-/* 输入框背景颜色及内边距 */
-.command-composer .q-field--filled .q-field__control {
-  background: rgba(0, 0, 0, 0.03);
-  padding: 0 8px;
-}
-
-/* 输入框聚焦时的背景颜色 */
-.command-composer .q-field--filled.q-field--highlighted .q-field__control {
-  background: rgba(0, 0, 0, 0.03);
-}
-
-/* 暗黑模式下的输入框背景颜色 */
-.body--dark .command-composer .q-field--filled .q-field__control {
-  background: rgba(255, 255, 255, 0.04);
-}
-
-/* 暗黑模式下输入框聚焦时的背景颜色 */
-.body--dark .command-composer .q-field--filled.q-field--highlighted .q-field__control {
-  background: rgba(255, 255, 255, 0.08);
-}
-
 /* checkbox/toggle大小及字体 */
 .command-composer .q-checkbox__label,
 .command-composer .q-toggle__label {

From a419a3c1d5ce9a3df2bf435452e6030433fadb93 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 19 Feb 2025 23:19:35 +0800
Subject: [PATCH 210/332] =?UTF-8?q?=E5=88=86=E5=89=B2=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quasar.config.js     |   8 ++-
 src/css/app.css      | 120 -------------------------------------------
 src/css/markdown.css |  76 +++++++++++++++++++++++++++
 src/css/monaco.css   |  51 ++++++++++++++++++
 src/css/qinput.css   |  67 ++++++++++++++++++++++++
 5 files changed, 201 insertions(+), 121 deletions(-)
 create mode 100644 src/css/markdown.css
 create mode 100644 src/css/monaco.css
 create mode 100644 src/css/qinput.css

diff --git a/quasar.config.js b/quasar.config.js
index bd1efa69..5385d16d 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,13 @@ module.exports = configure(function (ctx) {
     boot: [],
 
     // https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-css
-    css: ["app.css", "composer.css"],
+    css: [
+      "app.css",
+      "composer.css",
+      "markdown.css",
+      "monaco.css",
+      "qinput.css",
+    ],
 
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
diff --git a/src/css/app.css b/src/css/app.css
index 7bb4d1f2..49256e24 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -22,58 +22,6 @@ body {
   color: var(--utools-font-color);
 }
 
-/* Monaco Editor 调整行号栏样式 */
-.monaco-editor .margin {
-  width: 40px !important;
-}
-
-.monaco-editor .line-numbers {
-  text-align: center !important;
-  width: 40px !important;
-  padding-right: 5px !important;
-  left: 0 !important;
-}
-
-/* Monaco Editor 当前行高亮样式 */
-.monaco-editor .current-line {
-  border: none !important;
-  background-color: transparent !important;
-}
-
-.monaco-editor .line-numbers {
-  color: rgba(0, 0, 0, 0.5) !important;
-}
-
-.body--dark .monaco-editor .line-numbers {
-  color: rgba(255, 255, 255, 0.5) !important;
-}
-
-.monaco-editor .current-line~.line-numbers {
-  color: var(--q-primary) !important;
-}
-
-.monaco-editor .margin-view-overlays .current-line {
-  background-color: transparent !important;
-}
-
-/* Monaco Editor 滚动条样式 */
-.monaco-editor .scrollbar {
-  width: 5px !important;
-  height: 5px !important;
-}
-
-.monaco-editor .scrollbar.vertical .slider {
-  width: 5px !important;
-  border-radius: 2px !important;
-  background: rgba(0, 0, 0, 0.2) !important;
-}
-
-.monaco-editor .scrollbar.horizontal .slider {
-  height: 5px !important;
-  border-radius: 2px !important;
-  background: rgba(0, 0, 0, 0.2) !important;
-}
-
 /* 标签样式 */
 .q-chip {
   background: #e3e3e39a;
@@ -368,71 +316,3 @@ body.body--dark.glass-effect-menu .q-menu {
     transform: rotate(10deg);
   }
 }
-
-/* q-field--filled 布局更加紧凑 */
-/* 输入框高度及字体 */
-.q-field--filled:not(.q-textarea) .q-field__control,
-.q-field--filled:not(.q-textarea) .q-field__control>*,
-.q-field--filled:not(.q-field--labeled):not(.q-textarea) .q-field__native {
-  max-height: 36px !important;
-  min-height: 36px !important;
-}
-
-.q-field--filled .q-field__control,
-.q-field--filled .q-field__control>*,
-.q-field--filled .q-field__native {
-  border-radius: 5px;
-  font-size: 12px;
-}
-
-.q-field--filled.q-select--with-chips .q-field__control .q-chip {
-  margin: 0 4px;
-}
-
-/* 输入框图标大小 */
-.q-field--filled .q-field__control .q-icon {
-  font-size: 18px;
-}
-
-/* 输入框标签字体大小，占位时的位置 */
-.q-field--filled .q-field__label {
-  font-size: 11px;
-  top: 11px;
-}
-
-/* 输入框标签悬浮的位置 */
-.q-field--filled.q-field--dense.q-field--float .q-field__label {
-  transform: translateY(-50%) scale(0.75);
-}
-
-/* 去除filled输入框边框 */
-.q-field--filled .q-field__control:before {
-  border: none;
-}
-
-/* 去除filled输入框下划线 */
-.q-field--filled .q-field__control:after {
-  height: 0;
-  border-bottom: none;
-}
-
-/* 输入框背景颜色及内边距 */
-.q-field--filled .q-field__control {
-  background: rgba(0, 0, 0, 0.03);
-  padding: 0 8px;
-}
-
-/* 输入框聚焦时的背景颜色 */
-.q-field--filled.q-field--highlighted .q-field__control {
-  background: rgba(0, 0, 0, 0.03);
-}
-
-/* 暗黑模式下的输入框背景颜色 */
-.body--dark .q-field--filled .q-field__control {
-  background: rgba(255, 255, 255, 0.04);
-}
-
-/* 暗黑模式下输入框聚焦时的背景颜色 */
-.body--dark .q-field--filled.q-field--highlighted .q-field__control {
-  background: rgba(255, 255, 255, 0.08);
-}
diff --git a/src/css/markdown.css b/src/css/markdown.css
new file mode 100644
index 00000000..34af6b9c
--- /dev/null
+++ b/src/css/markdown.css
@@ -0,0 +1,76 @@
+/* Markdown 样式支持 */
+.markdown p {
+  margin: 0;
+}
+
+.markdown pre {
+  background-color: #f6f8fa;
+  padding: 1em;
+  border-radius: 6px;
+  overflow-x: auto;
+  margin: 2px 0;
+}
+
+.markdown code {
+  font-family: monospace;
+  padding: 0 4px;
+  background-color: #f6f8fa;
+  border-radius: 3px;
+}
+
+.markdown pre code {
+  padding: 0;
+  background-color: transparent;
+}
+
+.markdown ul,
+.markdown ol {
+  margin: 2px 0;
+  padding-left: 1.5em;
+}
+
+.markdown blockquote {
+  color: #8b8b8b;
+  display: block;
+  border-left: 4px solid #8b8b8b;
+  padding-left: 10px;
+}
+
+.markdown h1,
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  margin: 2px 0;
+  font-weight: 600;
+}
+
+.markdown h1 {
+  font-size: 18px;
+}
+
+.markdown h2 {
+  font-size: 16px;
+}
+
+.markdown h3 {
+  font-size: 15px;
+}
+
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  font-size: 14px;
+}
+
+/* 暗色模式适配 */
+.body--dark .markdown pre,
+.body--dark .markdown code {
+  background-color: #1a1a1a;
+}
+
+.body--dark .markdown blockquote {
+  border-left-color: #444;
+  color: #999;
+}
diff --git a/src/css/monaco.css b/src/css/monaco.css
new file mode 100644
index 00000000..3363757c
--- /dev/null
+++ b/src/css/monaco.css
@@ -0,0 +1,51 @@
+/* Monaco Editor 调整行号栏样式 */
+.monaco-editor .margin {
+  width: 40px !important;
+}
+
+.monaco-editor .line-numbers {
+  text-align: center !important;
+  width: 40px !important;
+  padding-right: 5px !important;
+  left: 0 !important;
+}
+
+/* Monaco Editor 当前行高亮样式 */
+.monaco-editor .current-line {
+  border: none !important;
+  background-color: transparent !important;
+}
+
+.monaco-editor .line-numbers {
+  color: rgba(0, 0, 0, 0.5) !important;
+}
+
+.body--dark .monaco-editor .line-numbers {
+  color: rgba(255, 255, 255, 0.5) !important;
+}
+
+.monaco-editor .current-line~.line-numbers {
+  color: var(--q-primary) !important;
+}
+
+.monaco-editor .margin-view-overlays .current-line {
+  background-color: transparent !important;
+}
+
+/* Monaco Editor 滚动条样式 */
+.monaco-editor .scrollbar {
+  width: 5px !important;
+  height: 5px !important;
+}
+
+.monaco-editor .scrollbar.vertical .slider {
+  width: 5px !important;
+  border-radius: 2px !important;
+  background: rgba(0, 0, 0, 0.2) !important;
+}
+
+.monaco-editor .scrollbar.horizontal .slider {
+  height: 5px !important;
+  border-radius: 2px !important;
+  background: rgba(0, 0, 0, 0.2) !important;
+}
diff --git a/src/css/qinput.css b/src/css/qinput.css
new file mode 100644
index 00000000..b461523a
--- /dev/null
+++ b/src/css/qinput.css
@@ -0,0 +1,67 @@
+/* q-field--filled 布局更加紧凑 */
+/* 输入框高度及字体 */
+.q-field--filled:not(.q-textarea) .q-field__control,
+.q-field--filled:not(.q-textarea) .q-field__control>*,
+.q-field--filled:not(.q-field--labeled):not(.q-textarea) .q-field__native {
+  max-height: 36px !important;
+  min-height: 36px !important;
+}
+
+.q-field--filled .q-field__control,
+.q-field--filled .q-field__control>*,
+.q-field--filled .q-field__native {
+  border-radius: 5px;
+  font-size: 12px;
+}
+
+.q-field--filled.q-select--with-chips .q-field__control .q-chip {
+  margin: 0 4px;
+}
+
+/* 输入框图标大小 */
+.q-field--filled .q-field__control .q-icon {
+  font-size: 18px;
+}
+
+/* 输入框标签字体大小，占位时的位置 */
+.q-field--filled .q-field__label {
+  font-size: 11px;
+  top: 11px;
+}
+
+/* 输入框标签悬浮的位置 */
+.q-field--filled.q-field--dense.q-field--float .q-field__label {
+  transform: translateY(-50%) scale(0.75);
+}
+
+/* 去除filled输入框边框 */
+.q-field--filled .q-field__control:before {
+  border: none;
+}
+
+/* 去除filled输入框下划线 */
+.q-field--filled .q-field__control:after {
+  height: 0;
+  border-bottom: none;
+}
+
+/* 输入框背景颜色及内边距 */
+.q-field--filled .q-field__control {
+  background: rgba(0, 0, 0, 0.03);
+  padding: 0 8px;
+}
+
+/* 输入框聚焦时的背景颜色 */
+.q-field--filled.q-field--highlighted .q-field__control {
+  background: rgba(0, 0, 0, 0.03);
+}
+
+/* 暗黑模式下的输入框背景颜色 */
+.body--dark .q-field--filled .q-field__control {
+  background: rgba(255, 255, 255, 0.04);
+}
+
+/* 暗黑模式下输入框聚焦时的背景颜色 */
+.body--dark .q-field--filled.q-field--highlighted .q-field__control {
+  background: rgba(255, 255, 255, 0.08);
+}

From ac19d06845c18cef7bbafbf43034012ec52f355c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 19 Feb 2025 23:20:16 +0800
Subject: [PATCH 211/332] =?UTF-8?q?=E6=96=B0=E5=A2=9Emarked=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 18 ++++++++++++++++++
 package.json      |  1 +
 2 files changed, 19 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 9c1c1f47..f465e1f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
         "@quasar/extras": "^1.14.0",
         "core-js": "^3.6.5",
         "croner": "^4.3.9",
+        "marked": "^15.0.7",
         "monaco-editor": "^0.33.0",
         "monaco-editor-webpack-plugin": "^7.0.1",
         "picture-compressor": "^1.1.0",
@@ -7006,6 +7007,18 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "node_modules/marked": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
+      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -16265,6 +16278,11 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "marked": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
+      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg=="
+    },
     "math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
diff --git a/package.json b/package.json
index 63937ba3..8d94576f 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@quasar/extras": "^1.14.0",
     "core-js": "^3.6.5",
     "croner": "^4.3.9",
+    "marked": "^15.0.7",
     "monaco-editor": "^0.33.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "picture-compressor": "^1.1.0",

From d82c735cfedbb78427f44713263870c08ce6d477 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 01:04:11 +0800
Subject: [PATCH 212/332] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0AI=E5=8A=A9=E6=89=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81AI=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |  31 ++
 package.json                                  |   1 +
 plugin/lib/ai.js                              | 422 +++++++++++-------
 plugin/lib/quickcommand.js                    |   4 +-
 src/components/CommandEditor.vue              |   2 -
 src/components/ai/AISelector.vue              |  90 ++++
 src/components/composer/ai/AskAIEditor.vue    |  91 ++--
 src/components/editor/AIAssistantDialog.vue   | 404 +++++++++++++++++
 src/components/editor/CodeEditor.vue          |  35 ++
 src/components/editor/CommandConfig.vue       |   4 +-
 src/components/popup/AIConfig.vue             | 232 ++++++----
 src/css/markdown.css                          |  11 +
 src/js/composer/commands/aiCommands.js        |   2 -
 .../monaco/types/quickcommand.api.d.ts        |  25 +-
 14 files changed, 1031 insertions(+), 323 deletions(-)
 create mode 100644 src/components/ai/AISelector.vue
 create mode 100644 src/components/editor/AIAssistantDialog.vue

diff --git a/package-lock.json b/package-lock.json
index f465e1f2..94198f74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
         "@quasar/extras": "^1.14.0",
         "core-js": "^3.6.5",
         "croner": "^4.3.9",
+        "dompurify": "^3.2.4",
         "marked": "^15.0.7",
         "monaco-editor": "^0.33.0",
         "monaco-editor-webpack-plugin": "^7.0.1",
@@ -2488,6 +2489,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/@types/webpack-bundle-analyzer": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
@@ -4625,6 +4633,15 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
+    "node_modules/dompurify": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -13085,6 +13102,12 @@
         "@types/node": "*"
       }
     },
+    "@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "optional": true
+    },
     "@types/webpack-bundle-analyzer": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
@@ -14597,6 +14620,14 @@
         "domelementtype": "^2.2.0"
       }
     },
+    "dompurify": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "requires": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
     "domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
diff --git a/package.json b/package.json
index 8d94576f..c5437be8 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@quasar/extras": "^1.14.0",
     "core-js": "^3.6.5",
     "croner": "^4.3.9",
+    "dompurify": "^3.2.4",
     "marked": "^15.0.7",
     "monaco-editor": "^0.33.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 17c1eb7e..6eb3cd78 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -1,155 +1,303 @@
-const axios = require("axios");
-
 // 支持的模型类型
-const MODEL_TYPES = {
+const API_TYPES = {
   OPENAI: "openai",
   OLLAMA: "ollama",
 };
 
-// 预设提示词
-const PRESET_PROMPTS = {
+// 角色提示词
+const ROLE_PROMPTS = {
   // 翻译
-  translate: `请将以下内容翻译成地道的中文，要求：
-1. 保持原文的专业性和准确性
-2. 符合中文的表达习惯
-3. 对于专业术语保留英文原文，并在括号中给出中文翻译
-4. 保持原文的段落格式
-
-原文：`,
+  translate: `你是一名翻译专家，请将我给你的内容进行翻译，要求：
+1. 无论给的内容长短，请直接翻译，不要进行任何解释
+2. 提供中文时，翻译成地道的英文，符合英文的表达习惯
+3. 提供英文时，翻译成地道的中文，符合中文的表达习惯
+4. 保持原文的专业性和准确性
+5. 对于专业术语保留原文，并在括号中给出对应的中文翻译
+6. 保持原文的段落格式
+`,
 
   // 生成SHELL命令
-  shell: `请根据以下描述生成一个 shell 命令，要求：
+  shell: `你是一名shell命令专家，请根据我的描述生成 shell 命令，要求：
 1. 命令应当简洁高效
 2. 优先使用常见的命令行工具
 3. 确保命令的安全性和可靠性
 4. 对于复杂操作，添加注释说明
 5. 如果需要多个命令，使用 && 连接或使用脚本格式
 6. 直接输出命令，不要输出任何解释，不要使用markdown格式
-
-需求描述：`,
+`,
 
   // 总结
-  summarize: `请总结以下内容的要点，要求：
+  summarize: `你是一名总结专家，请总结我给你的内容的要点，要求：
 1. 提取最重要和最有价值的信息
 2. 使用简洁的语言
 3. 按重要性排序
 4. 保持逻辑性和连贯性
 5. 如果有专业术语，保留并解释
+`,
+};
 
-原文：`,
+// API URL 处理
+const API_ENDPOINTS = {
+  [API_TYPES.OPENAI]: {
+    chat: "/v1/chat/completions",
+    models: "/v1/models",
+  },
+  [API_TYPES.OLLAMA]: {
+    chat: "/api/chat",
+    models: "/api/tags",
+  },
 };
 
+// 构建API URL
+function buildApiUrl(baseUrl, endpoint) {
+  if (!baseUrl.endsWith(endpoint)) {
+    return baseUrl.replace(/\/?$/, endpoint);
+  }
+  return baseUrl;
+}
+
+// 构建请求配置
+function buildRequestConfig(apiConfig) {
+  const config = {
+    headers: {
+      "Content-Type": "application/json",
+    },
+  };
+
+  if (apiConfig.apiType === API_TYPES.OPENAI && apiConfig.apiToken) {
+    config.headers["Authorization"] = `Bearer ${apiConfig.apiToken}`;
+  }
+
+  return config;
+}
+
+// 构建请求数据
+function buildRequestData(content, apiConfig, stream = false) {
+  const { model } = apiConfig;
+  const { prompt, role, context = [] } = content;
+  const rolePrompt = ROLE_PROMPTS[role] || role;
+
+  const roleMessage = rolePrompt
+    ? [
+        {
+          role: "user",
+          content: rolePrompt,
+        },
+      ]
+    : [];
+
+  // 统一的消息格式处理
+  const messages = [
+    // 添加系统角色消息（如果有）
+    ...roleMessage,
+    // 添加上下文消息
+    ...context.map((msg) => ({
+      role: msg.role || "user",
+      content: msg.content,
+    })),
+    // 添加当前用户消息
+    {
+      role: "user",
+      content: prompt,
+    },
+  ];
+
+  return {
+    model,
+    messages,
+    stream,
+  };
+}
+
+// 处理普通响应
+function parseResponse(response, apiType) {
+  if (apiType === API_TYPES.OPENAI) {
+    if (!response.data.choices || !response.data.choices[0]) {
+      throw new Error("OpenAI 响应格式错误");
+    }
+    return response.data.choices[0].message.content;
+  } else {
+    if (!response.data.message) {
+      throw new Error("Ollama 响应格式错误");
+    }
+    return response.data.message.content;
+  }
+}
+
+// 处理模型列表响应
+function parseModelsResponse(response, apiType) {
+  if (apiType === API_TYPES.OPENAI) {
+    if (!response.data.data) {
+      throw new Error("OpenAI 响应格式错误");
+    }
+    return response.data.data.map((model) => model.id);
+  } else {
+    if (!response.data.models) {
+      throw new Error("Ollama 响应格式错误");
+    }
+    return response.data.models.map((model) => model.name);
+  }
+}
+
+// 处理 OpenAI 流式响应
+async function handleOpenAIStreamResponse(line, controller, onStream) {
+  if (line.startsWith("data: ")) {
+    const jsonStr = line.replace(/^data: /, "");
+    if (jsonStr === "[DONE]") {
+      onStream("", controller, true);
+      return;
+    }
+    const json = JSON.parse(jsonStr);
+    const content = json.choices[0]?.delta?.content;
+    if (content) {
+      onStream(content, controller, false);
+    }
+  }
+}
+
+// 处理 Ollama 流式响应
+async function handleOllamaStreamResponse(line, controller, onStream) {
+  const json = JSON.parse(line);
+  if (json.done) {
+    onStream("", controller, true);
+    return;
+  }
+  if (json.message?.content) {
+    onStream(json.message.content, controller, false);
+  }
+}
+
+// 处理流式响应
+async function handleStreamResponse(response, apiConfig, controller, onStream) {
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+
+  try {
+    while (true) {
+      const { value, done } = await reader.read();
+      if (done) break;
+
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
+
+      for (const line of lines) {
+        if (line.trim()) {
+          try {
+            if (apiConfig.apiType === API_TYPES.OPENAI) {
+              await handleOpenAIStreamResponse(line, controller, onStream);
+            } else {
+              await handleOllamaStreamResponse(line, controller, onStream);
+            }
+          } catch (e) {
+            console.error("解析响应失败:", e);
+          }
+        }
+      }
+    }
+
+    // 处理剩余的缓冲区
+    if (buffer.trim()) {
+      try {
+        if (apiConfig.apiType === API_TYPES.OPENAI) {
+          await handleOpenAIStreamResponse(buffer, controller, onStream);
+        } else {
+          await handleOllamaStreamResponse(buffer, controller, onStream);
+        }
+      } catch (e) {
+        console.error("解析剩余响应失败:", e);
+      }
+    }
+  } catch (error) {
+    if (error.name === "AbortError") {
+      return {
+        success: false,
+        error: "请求已取消",
+        cancelled: true,
+      };
+    }
+    throw error;
+  } finally {
+    reader.releaseLock();
+  }
+
+  return { success: true, result: "流式请求完成" };
+}
+
 /**
  * AI对话功能
- * @param {Object} apiConfig - API配置参数
- * @param {string} apiConfig.modelType - 模型类型(openai/ollama)
- * @param {string} apiConfig.apiUrl - API地址
- * @param {string} apiConfig.apiToken - API令牌
- * @param {string} apiConfig.model - 模型名称
  * @param {Object} content - 对话内容参数
- * @param {string} content.prompt - 用户输入的提示词
- * @param {string} content.presetPrompt - 预设提示词类型
+ * @param {Object} apiConfig - API配置参数
+ * @param {Object} options - 其他选项
  * @returns {Promise<Object>} 对话响应
  */
-async function chat(content, apiConfig) {
+async function chat(content, apiConfig, options = {}) {
   try {
-    const { modelType, apiUrl, apiToken, model } = apiConfig;
-    const { prompt, presetPrompt } = content;
+    const { showLoadingBar = true, stream = false, onStream } = options;
 
     // 验证必要参数
-    if (!apiUrl || !prompt || !model) {
+    if (!apiConfig.apiUrl || !content.prompt || !apiConfig.model) {
       throw new Error("API地址、模型名称和提示词不能为空");
     }
 
-    // 构建完整提示词
-    const fullPrompt = presetPrompt
-      ? `${PRESET_PROMPTS[presetPrompt]}\n${prompt}`
-      : prompt;
-
-    // 准备请求配置
-    const config = {
-      headers: {
-        "Content-Type": "application/json",
-      },
-    };
-
-    let requestData;
-    let url = apiUrl;
-
-    // 根据不同的模型类型构建请求数据
-    if (modelType === MODEL_TYPES.OPENAI) {
-      // OpenAI API
-      config.headers["Authorization"] = `Bearer ${apiToken}`;
-      requestData = {
-        model: model,
-        messages: [
-          {
-            role: "user",
-            content: fullPrompt,
-          },
-        ],
-      };
-    } else if (modelType === MODEL_TYPES.OLLAMA) {
-      // Ollama API
-      // 如果用户没有指定完整的 API 路径，添加 /api/generate
-      if (!url.endsWith("/api/generate")) {
-        url = url.replace(/\/?$/, "/api/generate");
-      }
-
-      requestData = {
-        model: model,
-        prompt: fullPrompt,
-        stream: false,
-      };
-    } else {
-      throw new Error("不支持的模型类型");
+    if (stream && !onStream) {
+      throw new Error("使用流式请求时必须提供onStream回调函数");
     }
 
-    const loadingBar = await quickcommand.showLoadingBar({
-      text: "AI思考中...",
-      onClose: () => {
-        // 取消请求
-        if (source) {
-          source.cancel("操作已取消");
-        }
-      },
-    });
+    // 构建请求URL和配置
+    const url = buildApiUrl(
+      apiConfig.apiUrl,
+      API_ENDPOINTS[apiConfig.apiType].chat
+    );
+    const config = buildRequestConfig(apiConfig, stream);
+    const requestData = buildRequestData(content, apiConfig, stream);
 
-    // 创建取消令牌
-    const CancelToken = axios.CancelToken;
-    const source = CancelToken.source();
+    // 显示加载条
+    const loadingBar = showLoadingBar
+      ? await quickcommand.showLoadingBar({
+          text: "AI思考中...",
+          onClose: () => {
+            if (controller) {
+              controller.abort();
+            }
+          },
+        })
+      : null;
 
-    // 发送请求
-    const response = await axios.post(url, requestData, {
-      ...config,
-      cancelToken: source.token,
+    // 统一使用 fetch 处理请求
+    const controller = new AbortController();
+    const response = await fetch(url, {
+      method: "POST",
+      headers: config.headers,
+      body: JSON.stringify(requestData),
+      signal: controller.signal,
     });
 
-    loadingBar.close();
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
 
-    // 解析不同模型的响应
     let result;
-    if (modelType === MODEL_TYPES.OPENAI) {
-      // OpenAI 响应格式
-      if (!response.data.choices || !response.data.choices[0]) {
-        throw new Error("OpenAI 响应格式错误");
-      }
-      result = response.data.choices[0].message.content;
+    if (stream) {
+      result = await handleStreamResponse(
+        response,
+        apiConfig,
+        controller,
+        onStream
+      );
     } else {
-      // Ollama 响应格式
-      if (!response.data.response) {
-        throw new Error("Ollama 响应格式错误");
-      }
-      result = response.data.response;
+      const responseData = await response.json();
+      result = {
+        success: true,
+        result: parseResponse({ data: responseData }, apiConfig.apiType),
+      };
     }
 
-    return {
-      success: true,
-      result,
-    };
+    loadingBar?.close();
+    return result;
   } catch (error) {
-    // 如果是用户取消的请求，返回特定的错误信息
-    if (axios.isCancel(error)) {
+    if (error.name === "AbortError") {
       return {
         success: false,
         error: "请求已取消",
@@ -166,69 +314,33 @@ async function chat(content, apiConfig) {
 /**
  * 获取API支持的模型列表
  * @param {Object} apiConfig - API配置参数
- * @param {string} apiConfig.modelType - 模型类型(openai/ollama)
- * @param {string} apiConfig.apiUrl - API地址
- * @param {string} apiConfig.apiToken - API令牌
  * @returns {Promise<Object>} 模型列表响应
  */
 async function getModels(apiConfig) {
   try {
-    const { modelType, apiUrl, apiToken } = apiConfig;
-
-    // 验证必要参数
-    if (!apiUrl) {
+    if (!apiConfig.apiUrl) {
       throw new Error("API地址不能为空");
     }
 
-    // 准备请求配置
-    const config = {
-      headers: {
-        "Content-Type": "application/json",
-      },
-    };
-
-    let url = apiUrl;
+    const url = buildApiUrl(
+      apiConfig.apiUrl,
+      API_ENDPOINTS[apiConfig.apiType].models
+    );
+    const config = buildRequestConfig(apiConfig);
 
-    // 根据不同的模型类型构建请求
-    if (modelType === MODEL_TYPES.OPENAI) {
-      // OpenAI API
-      config.headers["Authorization"] = `Bearer ${apiToken}`;
-      // OpenAI的模型列表接口是 /v1/models
-      if (!url.endsWith("/models")) {
-        url = "https://api.openai.com/v1/models";
-      }
-    } else if (modelType === MODEL_TYPES.OLLAMA) {
-      // Ollama API
-      // Ollama的模型列表接口是 /api/tags
-      if (!url.endsWith("/api/tags")) {
-        url = url.replace(/\/?$/, "/api/tags");
-      }
-    } else {
-      throw new Error("不支持的模型类型");
-    }
-
-    // 发送请求
-    const response = await axios.get(url, config);
+    const response = await fetch(url, {
+      method: "GET",
+      headers: config.headers,
+    });
 
-    // 解析不同模型的响应
-    let models;
-    if (modelType === MODEL_TYPES.OPENAI) {
-      // OpenAI 响应格式
-      if (!response.data.data) {
-        throw new Error("OpenAI 响应格式错误");
-      }
-      models = response.data.data.map((model) => model.id);
-    } else {
-      // Ollama 响应格式
-      if (!response.data.models) {
-        throw new Error("Ollama 响应格式错误");
-      }
-      models = response.data.models.map((model) => model.name);
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
     }
 
+    const responseData = await response.json();
     return {
       success: true,
-      result: models,
+      result: parseModelsResponse({ data: responseData }, apiConfig.apiType),
     };
   } catch (error) {
     return {
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 183e6f2b..66384b37 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -188,8 +188,8 @@ const quickcommand = {
     return null;
   },
 
-  askAI: async function (content, apiConfig) {
-    return await chat(content, apiConfig);
+  askAI: async function (content, apiConfig, options) {
+    return await chat(content, apiConfig, options);
   },
 
   ...systemDialog,
diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index d815fdba..a480fdc5 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -21,7 +21,6 @@
       v-if="!isRunCodePage"
       v-model="commandManager.state.currentCommand"
       from="quickcommand"
-      @update:is-expanded="isConfigExpanded = $event"
       :expand-on-focus="true"
       class="command-config"
     />
@@ -97,7 +96,6 @@ export default {
       programLanguages: Object.keys(programs),
       showComposer: false,
       listener: null,
-      isConfigExpanded: false,
       composerInfo: {
         program: "quickcomposer",
       },
diff --git a/src/components/ai/AISelector.vue b/src/components/ai/AISelector.vue
new file mode 100644
index 00000000..01e8836d
--- /dev/null
+++ b/src/components/ai/AISelector.vue
@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <q-select
+      v-if="apiOptions.length > 0"
+      :model-value="modelValue"
+      @update:model-value="updateModelValue($event)"
+      :options="apiOptions"
+      map-options
+      emit-value
+      dense
+      options-dense
+      filled
+    >
+      <template v-slot:prepend>
+        <q-badge color="primary" text-color="white" class="q-mr-sm q-pa-xs">
+          模型
+        </q-badge>
+      </template>
+      <template v-slot:append>
+        <q-btn icon="settings" dense flat @click.stop="showAIConfig = true" />
+      </template>
+    </q-select>
+    <q-btn
+      dense
+      color="primary"
+      class="full-width q-px-sm"
+      icon="settings"
+      label="配置AI接口"
+      unelevated
+      v-else
+      @click="showAIConfig = true"
+    />
+    <q-dialog v-model="showAIConfig">
+      <AIConfig @save="onAIConfigSave" />
+    </q-dialog>
+  </div>
+</template>
+
+<script>
+import AIConfig from "components/popup/AIConfig.vue";
+import { dbManager } from "js/utools.js";
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  components: { AIConfig },
+  emits: ["update:modelValue"],
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showAIConfig: false,
+      apiOptions: [],
+    };
+  },
+  methods: {
+    onAIConfigSave() {
+      this.apiOptions = this.getApiOptions();
+      const newApiConfig = this.apiOptions.find(
+        (option) => option.value.id === this.modelValue.id
+      );
+      const newModelValue =
+        newApiConfig?.value || this.apiOptions[0].value || {};
+      this.updateModelValue({ ...newModelValue });
+    },
+    updateModelValue(value) {
+      this.$emit("update:modelValue", value);
+    },
+    getApiOptions() {
+      const apiConfigs = dbManager.getStorage("cfg_aiConfigs");
+      if (!apiConfigs) return [];
+      return apiConfigs.map((config) => {
+        return {
+          label: config.name,
+          value: config,
+        };
+      });
+    },
+  },
+  mounted() {
+    this.apiOptions = this.getApiOptions();
+    if (!this.modelValue.id) {
+      this.updateModelValue(this.apiOptions[0]?.value || {});
+    }
+  },
+});
+</script>
diff --git a/src/components/composer/ai/AskAIEditor.vue b/src/components/composer/ai/AskAIEditor.vue
index 1b8a9594..b4da6a01 100644
--- a/src/components/composer/ai/AskAIEditor.vue
+++ b/src/components/composer/ai/AskAIEditor.vue
@@ -1,42 +1,26 @@
 <template>
   <div>
-    <q-select
-      v-if="apiOptions.length > 0"
-      :model-value="argvs.apiConfig"
-      @update:model-value="updateArgvs('apiConfig', $event)"
-      :options="apiOptions"
-      map-options
-      emit-value
-      dense
-      options-dense
-      filled
-      label="API模型"
-      class="q-mb-sm"
-    />
-    <q-field filled dense v-else class="q-mb-sm">
-      <template #control>
-        <div class="flex items-center justify-center full-width text-warning">
-          <q-icon name="warning" class="q-mr-sm" />
-          <div>
-            未配置API模型，配置方法：命令配置界面-右下角菜单按钮-API配置
-          </div>
-        </div>
-      </template>
-    </q-field>
-    <ButtonGroup
-      :model-value="argvs.content.presetPrompt"
-      @update:modelValue="updateArgvs('content.presetPrompt', $event)"
-      :options="presetPromptOptions"
-      height="26px"
-      class="q-mb-sm"
-    />
-    <VariableInput
-      :model-value="argvs.content.prompt"
-      @update:modelValue="updateArgvs('content.prompt', $event)"
-      label="提示词"
-      type="textarea"
-      autogrow
-    />
+    <div class="q-pt-sm">
+      <AISelector
+        :model-value="argvs.apiConfig"
+        @update:modelValue="updateArgvs('apiConfig', $event)"
+        class="q-mb-sm"
+      />
+      <ButtonGroup
+        :model-value="argvs.content.role"
+        @update:modelValue="updateArgvs('content.role', $event)"
+        :options="roleOptions"
+        height="26px"
+        class="q-mb-sm"
+      />
+      <VariableInput
+        :model-value="argvs.content.prompt"
+        @update:modelValue="updateArgvs('content.prompt', $event)"
+        label="提示词"
+        type="textarea"
+        autogrow
+      />
+    </div>
   </div>
 </template>
 
@@ -46,8 +30,7 @@ import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
-import { dbManager } from "js/utools.js";
-
+import AISelector from "components/ai/AISelector.vue";
 export default defineComponent({
   name: "AskAIEditor",
   props: {
@@ -56,25 +39,26 @@ export default defineComponent({
   components: {
     VariableInput,
     ButtonGroup,
+    AISelector,
   },
   emits: ["update:modelValue"],
   data() {
     return {
+      showAIConfig: false,
       defaultArgvs: {
         content: {
           prompt: newVarInputVal("str"),
-          presetPrompt: "",
+          role: "",
         },
         apiConfig: {},
       },
-      apiOptions: [],
-      presetPromptOptions: [
-        { label: "自由问答", value: "" },
+      roleOptions: [
+        { label: "无", value: "" },
         { label: "翻译", value: "translate" },
         { label: "总结", value: "summarize" },
-        { label: "执行shell命令", value: "shell" },
+        { label: "生成shell命令", value: "shell" },
       ],
-      modelTypeOptions: [
+      apiTypeOptions: [
         { label: "OpenAI", value: "openai" },
         { label: "Ollama", value: "ollama" },
       ],
@@ -125,23 +109,6 @@ export default defineComponent({
       });
     },
   },
-  mounted() {
-    const apiConfigs = dbManager.getStorage("cfg_aiConfigs");
-    this.apiOptions = apiConfigs
-      ? apiConfigs.map((config) => {
-          return {
-            label: config.name,
-            value: config,
-          };
-        })
-      : [];
-    this.defaultArgvs.apiConfig = apiConfigs?.[0] || {};
-
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
-  },
 });
 </script>
 
diff --git a/src/components/editor/AIAssistantDialog.vue b/src/components/editor/AIAssistantDialog.vue
new file mode 100644
index 00000000..c70a3546
--- /dev/null
+++ b/src/components/editor/AIAssistantDialog.vue
@@ -0,0 +1,404 @@
+<template>
+  <q-card class="ai-dialog">
+    <div class="header q-px-md q-py-sm">
+      <q-icon name="smart_toy" size="24px" />
+      <div class="text-h6">AI 助手</div>
+      <AISelector v-model="selectedApi" />
+      <q-space />
+      <q-btn icon="close" flat round dense v-close-popup size="md" />
+    </div>
+
+    <!-- 聊天记录区域 -->
+    <q-scroll-area
+      ref="scrollArea"
+      class="chat-container"
+      :vertical-thumb-style="{
+        width: '5px',
+      }"
+    >
+      <div class="chat-history q-px-md">
+        <div
+          v-for="(message, index) in chatHistory"
+          :key="index"
+          class="chat-message-wrapper"
+        >
+          <div :class="['chat-message', message.role]">
+            <div class="avatar">
+              <q-avatar size="28px">
+                <q-icon
+                  :name="message.role === 'user' ? 'person' : 'smart_toy'"
+                  :color="message.role === 'user' ? 'white' : 'primary'"
+                  size="20px"
+                />
+              </q-avatar>
+            </div>
+            <div class="message-bubble">
+              <div
+                v-if="message.role === 'assistant'"
+                class="message-content markdown"
+                v-html="getTrimContent(message.content)"
+              />
+              <div v-else class="message-content" v-text="message.content" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </q-scroll-area>
+
+    <!-- 输入区域 -->
+    <div class="input-container q-px-md q-py-sm">
+      <q-input
+        v-model="prompt"
+        type="textarea"
+        filled
+        dense
+        autogrow
+        autofocus
+        :max-rows="3"
+        placeholder="请描述你的需求，Enter 发送，Shift+Enter 换行"
+        @keydown.enter.exact.prevent="handleSubmit"
+        @keydown.shift.enter.prevent="prompt += '\n'"
+      >
+        <template v-slot:append>
+          <div class="row items-center q-gutter-x-md">
+            <q-btn
+              flat
+              icon="delete_sweep"
+              size="sm"
+              dense
+              :disable="chatHistory.length === 0"
+              @click="clearHistory"
+            >
+              <q-tooltip>清空对话</q-tooltip>
+            </q-btn>
+            <q-btn
+              @click="autoUpdateCode = !autoUpdateCode"
+              :color="autoUpdateCode ? 'primary' : 'grey'"
+              icon="auto_fix_high"
+              size="sm"
+              dense
+              flat
+            >
+              <q-tooltip>
+                {{
+                  autoUpdateCode
+                    ? "自动更新代码(已开启)"
+                    : "自动更新代码(已关闭)"
+                }}
+              </q-tooltip>
+            </q-btn>
+            <q-btn
+              :color="streamingResponse ? 'negative' : 'primary'"
+              :icon="streamingResponse ? 'stop' : 'send'"
+              size="sm"
+              dense
+              flat
+              @click="handleSubmit"
+            />
+          </div>
+        </template>
+      </q-input>
+    </div>
+  </q-card>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import AISelector from "components/ai/AISelector.vue";
+import { marked } from "marked";
+import DOMPurify from "dompurify";
+
+const quickcommandApi =
+  require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`)
+    .default.replace(/\/\*[\s\S]*?\*\//g, "")
+    .replace(/\n/g, "");
+const uToolsApi = require(`!raw-loader!plugins/monaco/types/utools.api.d.ts`)
+  .default.replace(/\/\*[\s\S]*?\*\//g, "")
+  .replace(/\n/g, "");
+
+export default defineComponent({
+  name: "AIAssistantDialog",
+  components: {
+    AISelector,
+  },
+  data() {
+    return {
+      prompt: "",
+      selectedApi: {},
+      streamingResponse: false,
+      chatHistory: [],
+      currentRequest: null,
+      autoUpdateCode: true,
+      scrollToBottomDebounce: null,
+    };
+  },
+  props: {
+    code: {
+      type: String,
+      default: "",
+    },
+    language: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update-code"],
+  methods: {
+    scrollToBottom() {
+      // 清除之前的定时器
+      if (this.scrollToBottomDebounce) {
+        clearTimeout(this.scrollToBottomDebounce);
+      }
+
+      // 设置新的定时器，延迟执行滚动
+      this.scrollToBottomDebounce = setTimeout(() => {
+        const scrollArea = this.$refs.scrollArea;
+        if (scrollArea) {
+          const scrollTarget = scrollArea.getScrollTarget();
+          scrollArea.setScrollPosition(
+            "vertical",
+            scrollTarget.scrollHeight,
+            300
+          );
+        }
+      }, 100);
+    },
+    async handleSubmit() {
+      if (this.streamingResponse) {
+        this.stopStreaming();
+        return;
+      }
+
+      const promptText = this.prompt.trim();
+      if (!promptText || !this.selectedApi) return;
+
+      // 添加用户消息到历史记录
+      this.chatHistory.push(
+        {
+          role: "user",
+          content: promptText,
+        },
+        {
+          role: "assistant",
+          content: "",
+        }
+      );
+
+      // 添加消息后立即滚动到底部
+      this.$nextTick(() => {
+        this.scrollToBottom();
+      });
+
+      this.streamingResponse = true;
+      this.prompt = ""; // 清空输入框
+
+      try {
+        const response = await window.quickcommand.askAI(
+          {
+            prompt: promptText,
+            role: this.getRolePrompt(this.language),
+            context: this.chatHistory.slice(0, -2),
+          },
+          this.selectedApi,
+          {
+            showLoadingBar: false,
+            stream: true,
+            onStream: (text, controller, done) => {
+              this.currentRequest = controller;
+              if (text) {
+                this.chatHistory[this.chatHistory.length - 1].content += text;
+                this.$nextTick(() => {
+                  this.scrollToBottom();
+                });
+              }
+
+              if (done) {
+                this.streamingResponse = false;
+                if (this.autoUpdateCode) {
+                  const response =
+                    this.chatHistory[this.chatHistory.length - 1].content;
+                  const code = response.match(
+                    /```[a-z]*\n([\s\S]*?)\n```/
+                  )?.[1];
+
+                  if (!code) return;
+
+                  this.$emit("update-code", code);
+                }
+              }
+            },
+          }
+        );
+
+        if (!response.success && !response.cancelled) {
+          window.quickcommand.showMessageBox(response.error, "error");
+        }
+      } catch (error) {
+        window.quickcommand.showMessageBox(error.message, "error");
+        this.streamingResponse = false;
+      }
+    },
+    stopStreaming() {
+      this.streamingResponse = false;
+      if (this.currentRequest) {
+        this.currentRequest.abort();
+        this.currentRequest = null;
+      }
+    },
+    clearHistory() {
+      this.chatHistory = [];
+    },
+    getTrimContent(content) {
+      const markedContent = marked(content.trim());
+      // 解决think标签被错误地包裹在<p>标签中
+      const processedContent = markedContent
+        .replace("<p><think>", "<think><p>")
+        .replace("</think></p>", "</p></think>")
+        // 去除空的think标签
+        .replace("<think>\n\n</think>", "");
+      const purifiedContent = DOMPurify.sanitize(processedContent, {
+        ADD_TAGS: ["think"],
+      });
+      return purifiedContent;
+    },
+    getRolePrompt(language) {
+      const languageMap = {
+        quickcommand: "NodeJS",
+        javascript: "NodeJS",
+      };
+      const commonInstructions = `请作为一名专业的开发专家，根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
+   - 编写简洁、可读性强的代码
+   - 遵循${language}最佳实践和设计模式
+   - 使用恰当的命名规范和代码组织
+   - 添加必要的错误处理和边界检查
+   - 保持中文注释的准确性和专业性
+   - 提供必要的使用说明
+   `;
+
+      // 针对不同语言的特殊提示
+      let languageSpecific = {
+        javascript: `- 优先使用现代ES6+特性
+   - 使用NodeJS原生API和模块`,
+        python: `- 遵循PEP8规范`,
+      };
+      languageSpecific.quickcommand = `${languageSpecific.javascript}
+    - 支持使用以下uTools接口： ${uToolsApi}
+    - 支持使用以下quickcommand接口： ${quickcommandApi}`;
+
+      // 获取语言特定的提示，如果没有则使用空字符串
+      const specificInstructions =
+        languageSpecific[language.toLowerCase()] || "";
+
+      const lastInstructions =
+        "\n请直接生成代码，任何情况下都不需要做解释和说明";
+
+      return commonInstructions + specificInstructions + lastInstructions;
+    },
+  },
+});
+</script>
+
+<style scoped>
+.ai-dialog {
+  width: 800px;
+  max-width: 90vw;
+  height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.chat-container {
+  flex: 1 1 auto;
+}
+
+.chat-message-wrapper {
+  margin-bottom: 1rem;
+  animation: fadeIn 0.3s ease-in-out;
+}
+
+.chat-message {
+  display: flex;
+  gap: 8px;
+  max-width: 85%;
+}
+
+.chat-message.user {
+  margin-left: auto;
+  flex-direction: row-reverse;
+}
+
+.chat-message .avatar {
+  background: var(--q-primary);
+  border-radius: 50%;
+  padding: 2px;
+  width: 32px;
+  height: 32px;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.chat-message.assistant .avatar {
+  background: var(--transparent-bg-color);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.chat-message.user .avatar {
+  background: var(--q-primary);
+}
+
+.message-bubble {
+  padding: 8px 12px;
+  border-radius: 12px;
+  position: relative;
+}
+
+.message-content :deep(think) {
+  color: #8b8b8b;
+  display: block;
+  border-left: 4px solid #8b8b8b;
+  padding-left: 10px;
+  margin-bottom: 8px;
+  font-size: 12px;
+}
+
+.chat-message.user .message-bubble {
+  background-color: var(--q-primary);
+  color: white;
+  border-top-right-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+.chat-message.assistant .message-bubble {
+  background-color: var(--transparent-bg-color);
+  border-top-left-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.message-content {
+  font-size: 13px;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+/* 暗色模式适配 */
+.body--dark .chat-message.assistant .message-bubble {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+}
+</style>
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 06a94b8d..3ee6ff55 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -6,6 +6,26 @@
         {{ placeholder }}
       </div>
     </div>
+    <!-- AI助手按钮 -->
+    <div class="ai-button-wrapper">
+      <q-btn
+        round
+        dense
+        color="primary"
+        icon="smart_toy"
+        @click="showAIDialog = true"
+      >
+        <q-tooltip>AI 助手</q-tooltip>
+      </q-btn>
+    </div>
+    <!-- AI对话框 -->
+    <q-dialog v-model="showAIDialog" position="right" seamless>
+      <AIAssistantDialog
+        :code="modelValue"
+        :language="language"
+        @update-code="setEditorValue"
+      />
+    </q-dialog>
   </div>
 </template>
 
@@ -13,6 +33,7 @@
 import * as monaco from "monaco-editor";
 import importAll from "js/common/importAll.js";
 import { defineComponent } from "vue";
+import AIAssistantDialog from "./AIAssistantDialog.vue";
 
 // 批量导入关键字补全
 let languageCompletions = importAll(
@@ -39,6 +60,9 @@ const typeDefinitions = {
 
 export default defineComponent({
   name: "CodeEditor",
+  components: {
+    AIAssistantDialog,
+  },
   props: {
     // v-model 绑定值
     modelValue: {
@@ -134,6 +158,7 @@ export default defineComponent({
         // 光标样式
         cursorStyle: "line",
       },
+      showAIDialog: false,
     };
   },
   watch: {
@@ -394,6 +419,9 @@ export default defineComponent({
     formatDocument() {
       editor.getAction("editor.action.formatDocument").run();
     },
+    setEditorValue(value) {
+      editor.setValue(value);
+    },
   },
   computed: {
     showPlaceholder() {
@@ -431,4 +459,11 @@ export default defineComponent({
   user-select: none;
   opacity: 0.4;
 }
+
+.ai-button-wrapper {
+  position: absolute;
+  right: 30px;
+  bottom: 30px;
+  z-index: 500;
+}
 </style>
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index bbc971c8..47abd9e6 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -1,7 +1,6 @@
 <template>
   <q-expansion-item
     v-model="isExpanded"
-    @update:model-value="$emit('update:is-expanded', $event)"
     class="command-config"
     expand-icon-toggle
   >
@@ -188,7 +187,7 @@ export default defineComponent({
       default: "quickcommand",
     },
   },
-  emits: ["update:modelValue", "update:is-expanded"],
+  emits: ["update:modelValue"],
   data() {
     return {
       commandManager: useCommandManager(),
@@ -303,7 +302,6 @@ export default defineComponent({
     },
     updateExpanded(value) {
       this.isExpanded = value;
-      this.$emit("update:is-expanded", value);
     },
   },
 });
diff --git a/src/components/popup/AIConfig.vue b/src/components/popup/AIConfig.vue
index 85c9dad1..f282864a 100644
--- a/src/components/popup/AIConfig.vue
+++ b/src/components/popup/AIConfig.vue
@@ -4,7 +4,7 @@
     <div>
       <div class="flex q-mb-md q-px-sm" style="height: 26px">
         <ButtonGroup
-          v-model="modelToAdd"
+          v-model="apiToAdd"
           class="col"
           :options="[
             { label: 'OPENAI', value: 'openai' },
@@ -27,93 +27,122 @@
           width: '2px',
         }"
       >
-        <div class="config-list">
-          <div
-            v-for="(aiConfig, index) in aiConfigs"
-            :key="index"
-            class="config-item"
-          >
-            <div class="row q-col-gutter-sm">
-              <q-input
-                filled
-                dense
-                v-model="aiConfig.name"
-                class="col"
-                placeholder="请输入名称"
-              >
-                <template v-slot:prepend>
-                  <q-badge
-                    color="primary"
-                    text-color="black"
-                    label="名称"
-                    class="q-pa-xs"
-                  />
-                </template>
-                <template v-slot:append>
-                  <q-icon
-                    color="grey"
-                    name="remove_circle"
-                    @click="deleteModel(index)"
-                    size="16px"
-                    class="cursor-pointer"
-                  />
-                </template>
-              </q-input>
-              <q-input
-                filled
-                dense
-                v-model="aiConfig.apiUrl"
-                class="col-8"
-                :placeholder="`${aiConfig.modelType} API地址`"
-              >
-                <template v-slot:prepend>
-                  <q-badge
-                    color="primary"
-                    text-color="black"
-                    label="接口"
-                    class="q-pa-xs"
-                  />
-                </template>
-              </q-input>
+        <draggable
+          v-model="aiConfigs"
+          item-key="name"
+          handle=".drag-handle"
+          :animation="200"
+          class="config-list"
+        >
+          <template #item="{ element: aiConfig, index }">
+            <div class="config-item">
+              <div class="config-item-side-bar">
+                <q-icon
+                  name="drag_indicator"
+                  class="drag-handle cursor-move"
+                  size="20px"
+                />
+              </div>
+              <div class="config-item-content">
+                <div class="row q-col-gutter-sm">
+                  <q-input
+                    filled
+                    dense
+                    v-model="aiConfig.name"
+                    class="col"
+                    placeholder="请输入名称"
+                  >
+                    <template v-slot:prepend>
+                      <q-badge
+                        color="primary"
+                        text-color="white"
+                        label="名称"
+                        class="q-pa-xs"
+                      />
+                    </template>
+                    <template v-slot:append>
+                      <q-icon
+                        color="grey"
+                        name="remove_circle"
+                        @click="deleteModel(index)"
+                        size="16px"
+                        class="cursor-pointer"
+                      />
+                    </template>
+                  </q-input>
+                  <q-input
+                    filled
+                    dense
+                    v-model="aiConfig.apiUrl"
+                    class="col-7"
+                    :placeholder="`${aiConfig.apiType} API地址`"
+                  >
+                    <template v-slot:prepend>
+                      <q-badge
+                        color="primary"
+                        text-color="white"
+                        label="接口"
+                        class="q-pa-xs"
+                      />
+                    </template>
+                  </q-input>
+                </div>
+                <div class="row q-col-gutter-sm">
+                  <q-input filled dense v-model="aiConfig.model" class="col">
+                    <template v-slot:prepend>
+                      <q-badge
+                        color="primary"
+                        text-color="white"
+                        label="模型"
+                        class="q-pa-xs"
+                      />
+                    </template>
+                    <template v-slot:append>
+                      <q-btn-dropdown
+                        flat
+                        @click="getModels(aiConfig)"
+                        dense
+                        dropdown-icon="refresh"
+                      >
+                        <q-list>
+                          <q-item
+                            v-for="model in models"
+                            :key="model"
+                            clickable
+                            v-close-popup
+                            @click="aiConfig.model = model"
+                          >
+                            <q-item-section>
+                              {{ model }}
+                            </q-item-section>
+                          </q-item>
+                        </q-list>
+                      </q-btn-dropdown>
+                      <q-tooltip>获取模型</q-tooltip>
+                    </template>
+                  </q-input>
+                  <q-input
+                    filled
+                    dense
+                    v-model="aiConfig.apiToken"
+                    v-if="aiConfig.apiType === 'openai'"
+                    type="password"
+                    class="col-7"
+                  >
+                    <template v-slot:prepend>
+                      <q-badge
+                        color="primary"
+                        text-color="white"
+                        label="令牌"
+                        class="q-pa-xs"
+                      />
+                    </template>
+                  </q-input>
+                </div>
+              </div>
             </div>
-            <div class="row q-col-gutter-sm">
-              <q-select
-                filled
-                dense
-                v-model="aiConfig.model"
-                :options="models"
-                @focus="getModels(aiConfig)"
-                class="col"
-              >
-                <template v-slot:prepend>
-                  <q-badge
-                    color="primary"
-                    text-color="black"
-                    label="模型"
-                    class="q-pa-xs"
-                  />
-                </template>
-              </q-select>
-              <q-input
-                filled
-                dense
-                v-model="aiConfig.apiToken"
-                v-if="aiConfig.modelType === 'openai'"
-                type="password"
-                class="col-8"
-              >
-                <template v-slot:prepend>
-                  <q-badge
-                    color="primary"
-                    text-color="black"
-                    label="令牌"
-                    class="q-pa-xs"
-                  />
-                </template>
-              </q-input>
-            </div>
-          </div>
-        </div>
+          </template>
+        </draggable>
       </q-scroll-area>
     </div>
     <div class="flex justify-end q-gutter-sm q-px-sm">
@@ -133,19 +162,23 @@
 import { defineComponent } from "vue";
 import { dbManager } from "js/utools.js";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+import draggable from "vuedraggable";
+import { getUniqueId } from "js/common/uuid.js";
 
 export default defineComponent({
   name: "AIConfig",
   components: {
     ButtonGroup,
+    draggable,
   },
   data() {
     return {
-      modelToAdd: "openai",
+      apiToAdd: "openai",
       aiConfigs: [],
       models: [],
     };
   },
+  emits: ["save"],
   methods: {
     async getModels(aiConfig) {
       const { success, result, error } = await window.getModelsFromAiApi(
@@ -153,6 +186,7 @@ export default defineComponent({
       );
       if (!success) {
         quickcommand.showMessageBox(error, "error");
+        this.models = [];
         return;
       }
       this.models = result;
@@ -162,17 +196,19 @@ export default defineComponent({
         "cfg_aiConfigs",
         window.lodashM.cloneDeep(this.aiConfigs)
       );
+      this.$emit("save");
     },
     deleteModel(index) {
       this.aiConfigs.splice(index, 1);
     },
     addModel() {
       this.aiConfigs.push({
-        modelType: this.modelToAdd,
+        apiType: this.apiToAdd,
         apiUrl: "",
         apiToken: "",
         model: "",
         name: "",
+        id: getUniqueId(),
       });
     },
     getConfigListHeight() {
@@ -188,7 +224,7 @@ export default defineComponent({
 
 <style scoped>
 .config-list,
-.config-item {
+.config-item-content {
   display: flex;
   flex-direction: column;
   gap: 8px;
@@ -198,5 +234,21 @@ export default defineComponent({
   border: 1px solid var(--q-primary);
   border-radius: 4px;
   padding: 8px;
+  display: flex;
+}
+
+.config-item-side-bar {
+  width: 20px;
+  padding-top: 8px;
+}
+
+.config-item-content {
+  flex: 1;
+}
+
+.drag-handle {
+  cursor: move;
+  color: var(--q-primary);
+  margin-right: 4px;
 }
 </style>
diff --git a/src/css/markdown.css b/src/css/markdown.css
index 34af6b9c..86def04c 100644
--- a/src/css/markdown.css
+++ b/src/css/markdown.css
@@ -9,6 +9,8 @@
   border-radius: 6px;
   overflow-x: auto;
   margin: 2px 0;
+  overflow-x: auto;
+  max-width: 100%;
 }
 
 .markdown code {
@@ -74,3 +76,12 @@
   border-left-color: #444;
   color: #999;
 }
+
+.markdown code ::-webkit-scrollbar {
+  height: 5px;
+}
+
+.markdown a {
+  color: #007bff;
+  text-decoration: none;
+}
diff --git a/src/js/composer/commands/aiCommands.js b/src/js/composer/commands/aiCommands.js
index ead4cb0f..8f7893d0 100644
--- a/src/js/composer/commands/aiCommands.js
+++ b/src/js/composer/commands/aiCommands.js
@@ -1,5 +1,3 @@
-import { newVarInputVal } from "js/composer/varInputValManager";
-
 export const aiCommands = {
   label: "AI操作",
   icon: "smart_toy",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 01c93fc4..1626a572 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -892,16 +892,23 @@ interface quickcommandApi {
   /**
    * 与 AI 进行问答
    * @param content 对话内容
+   * @param content.prompt 提示词
+   * @param content.role 预设角色
    * @param apiConfig API配置
+   * @param apiConfig.apiType 模型类型：openai/ollama
+   * @param apiConfig.apiUrl API地址
+   * @param apiConfig.apiToken API令牌（仅 OpenAI 需要）
+   * @param apiConfig.model 模型名称
+   * @param options 其他选项
+   * @param options.showLoadingBar 是否显示加载条
    * @example
    * // OpenAI 示例
    * const response = await quickcommand.askAI(
    *   {
    *     prompt: "你好",
-   *     presetPrompt: ""  // 使用预设提示词：translate/shell/summarize
    *   },
    *   {
-   *     modelType: "openai",
+   *     apiType: "openai",
    *     apiUrl: "https://api.openai.com/v1/chat/completions",
    *     apiToken: "your-api-token",
    *     model: "gpt-3.5-turbo"
@@ -912,10 +919,10 @@ interface quickcommandApi {
    * const response = await quickcommand.askAI(
    *   {
    *     prompt: "查找进程名为chrome的进程并关闭",
-   *     presetPrompt: "shell"
+   *     role: "shell"
    *   },
    *   {
-   *     modelType: "ollama",
+   *     apiType: "ollama",
    *     apiUrl: "http://localhost:11434/api/generate",
    *     model: "qwen2.5:32b"
    *   }
@@ -925,18 +932,22 @@ interface quickcommandApi {
     content: {
       /** 提示词 */
       prompt: string;
-      /** 预设提示词类型 */
-      presetPrompt?: "" | "translate" | "shell" | "summarize";
+      /** 预设角色 */
+      role?: "translate" | "shell" | "summarize";
     },
     apiConfig: {
       /** 模型类型：openai/ollama */
-      modelType: "openai" | "ollama";
+      apiType: "openai" | "ollama";
       /** API地址 */
       apiUrl: string;
       /** API令牌（仅 OpenAI 需要） */
       apiToken?: string;
       /** 模型名称 */
       model: string;
+    },
+    options?: {
+      /** 是否显示加载条, 默认 true */
+      showLoadingBar?: boolean;
     }
   ): Promise<{
     /** 是否成功 */

From 4f5ef89558227acbb4c225e60978ab86f575cb53 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 08:52:10 +0800
Subject: [PATCH 213/332] =?UTF-8?q?=E8=B0=83=E6=95=B4AI=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/{editor => ai}/AIAssistantDialog.vue | 0
 src/components/{popup => ai}/AIConfig.vue           | 0
 src/components/ai/AISelector.vue                    | 2 +-
 src/components/editor/CodeEditor.vue                | 2 +-
 src/components/menu/index.vue                       | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename src/components/{editor => ai}/AIAssistantDialog.vue (100%)
 rename src/components/{popup => ai}/AIConfig.vue (100%)

diff --git a/src/components/editor/AIAssistantDialog.vue b/src/components/ai/AIAssistantDialog.vue
similarity index 100%
rename from src/components/editor/AIAssistantDialog.vue
rename to src/components/ai/AIAssistantDialog.vue
diff --git a/src/components/popup/AIConfig.vue b/src/components/ai/AIConfig.vue
similarity index 100%
rename from src/components/popup/AIConfig.vue
rename to src/components/ai/AIConfig.vue
diff --git a/src/components/ai/AISelector.vue b/src/components/ai/AISelector.vue
index 01e8836d..1e054890 100644
--- a/src/components/ai/AISelector.vue
+++ b/src/components/ai/AISelector.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import AIConfig from "components/popup/AIConfig.vue";
+import AIConfig from "components/ai/AIConfig.vue";
 import { dbManager } from "js/utools.js";
 import { defineComponent } from "vue";
 
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 3ee6ff55..ead80c1f 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -33,7 +33,7 @@
 import * as monaco from "monaco-editor";
 import importAll from "js/common/importAll.js";
 import { defineComponent } from "vue";
-import AIAssistantDialog from "./AIAssistantDialog.vue";
+import AIAssistantDialog from "components/ai/AIAssistantDialog.vue";
 
 // 批量导入关键字补全
 let languageCompletions = importAll(
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 6ac56e5b..e6e8d6e9 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -122,7 +122,7 @@ import CommandManageMenu from "components/menu/CommandManageMenu.vue";
 import UtilityFeaturesMenu from "components/menu/UtilityFeaturesMenu.vue";
 import EnvConfigMenu from "components/menu/EnvConfigMenu.vue";
 import PersonalizeMenu from "components/menu/PersonalizeMenu.vue";
-import AIConfig from "components/popup/AIConfig.vue";
+import AIConfig from "components/ai/AIConfig.vue";
 import UserData from "components/popup/UserData.vue";
 import { utoolsFull } from "js/utools.js";
 import { useCommandManager } from "js/commandManager";

From 196d54a993013f8083311950aec60ffef387642f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 19:40:29 +0800
Subject: [PATCH 214/332] =?UTF-8?q?=E8=B0=83=E6=95=B4AI=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=BA=E8=BE=B9=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue         |   8 +-
 src/components/ai/AIAssistantDialog.vue  | 404 -----------------------
 src/components/ai/AIAssistantSideBar.vue | 312 +++++++++++++++++
 src/components/ai/AIChatHistory.vue      | 281 ++++++++++++++++
 src/components/ai/AIConfig.vue           |  13 +-
 src/components/ai/AISelector.vue         |  69 +++-
 src/components/editor/CodeEditor.vue     | 162 +++++----
 src/components/popup/EditorHistory.vue   |   6 +-
 src/css/markdown.css                     |   6 +-
 src/css/qinput.css                       |   4 +-
 src/js/options/editorOptions.js          |  54 +++
 11 files changed, 819 insertions(+), 500 deletions(-)
 delete mode 100644 src/components/ai/AIAssistantDialog.vue
 create mode 100644 src/components/ai/AIAssistantSideBar.vue
 create mode 100644 src/components/ai/AIChatHistory.vue
 create mode 100644 src/js/options/editorOptions.js

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index a480fdc5..56323139 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -18,7 +18,7 @@
 
     <!-- 命令设置栏 -->
     <CommandConfig
-      v-if="!isRunCodePage"
+      v-if="!isRunCodePage && showCommandConfig"
       v-model="commandManager.state.currentCommand"
       from="quickcommand"
       :expand-on-focus="true"
@@ -32,6 +32,8 @@
         commandManager.state.currentCommand.cursorPosition
       "
       :language="getLanguage()"
+      @saveHistory="saveToHistory"
+      @request-full-screen="requestFullScreen"
       placeholder="请输入代码"
       class="codeEditor"
       ref="editor"
@@ -95,6 +97,7 @@ export default {
     return {
       programLanguages: Object.keys(programs),
       showComposer: false,
+      showCommandConfig: true,
       listener: null,
       composerInfo: {
         program: "quickcomposer",
@@ -236,6 +239,9 @@ export default {
           break;
       }
     },
+    requestFullScreen(value) {
+      this.showCommandConfig = !value;
+    },
   },
 };
 </script>
diff --git a/src/components/ai/AIAssistantDialog.vue b/src/components/ai/AIAssistantDialog.vue
deleted file mode 100644
index c70a3546..00000000
--- a/src/components/ai/AIAssistantDialog.vue
+++ /dev/null
@@ -1,404 +0,0 @@
-<template>
-  <q-card class="ai-dialog">
-    <div class="header q-px-md q-py-sm">
-      <q-icon name="smart_toy" size="24px" />
-      <div class="text-h6">AI 助手</div>
-      <AISelector v-model="selectedApi" />
-      <q-space />
-      <q-btn icon="close" flat round dense v-close-popup size="md" />
-    </div>
-
-    <!-- 聊天记录区域 -->
-    <q-scroll-area
-      ref="scrollArea"
-      class="chat-container"
-      :vertical-thumb-style="{
-        width: '5px',
-      }"
-    >
-      <div class="chat-history q-px-md">
-        <div
-          v-for="(message, index) in chatHistory"
-          :key="index"
-          class="chat-message-wrapper"
-        >
-          <div :class="['chat-message', message.role]">
-            <div class="avatar">
-              <q-avatar size="28px">
-                <q-icon
-                  :name="message.role === 'user' ? 'person' : 'smart_toy'"
-                  :color="message.role === 'user' ? 'white' : 'primary'"
-                  size="20px"
-                />
-              </q-avatar>
-            </div>
-            <div class="message-bubble">
-              <div
-                v-if="message.role === 'assistant'"
-                class="message-content markdown"
-                v-html="getTrimContent(message.content)"
-              />
-              <div v-else class="message-content" v-text="message.content" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </q-scroll-area>
-
-    <!-- 输入区域 -->
-    <div class="input-container q-px-md q-py-sm">
-      <q-input
-        v-model="prompt"
-        type="textarea"
-        filled
-        dense
-        autogrow
-        autofocus
-        :max-rows="3"
-        placeholder="请描述你的需求，Enter 发送，Shift+Enter 换行"
-        @keydown.enter.exact.prevent="handleSubmit"
-        @keydown.shift.enter.prevent="prompt += '\n'"
-      >
-        <template v-slot:append>
-          <div class="row items-center q-gutter-x-md">
-            <q-btn
-              flat
-              icon="delete_sweep"
-              size="sm"
-              dense
-              :disable="chatHistory.length === 0"
-              @click="clearHistory"
-            >
-              <q-tooltip>清空对话</q-tooltip>
-            </q-btn>
-            <q-btn
-              @click="autoUpdateCode = !autoUpdateCode"
-              :color="autoUpdateCode ? 'primary' : 'grey'"
-              icon="auto_fix_high"
-              size="sm"
-              dense
-              flat
-            >
-              <q-tooltip>
-                {{
-                  autoUpdateCode
-                    ? "自动更新代码(已开启)"
-                    : "自动更新代码(已关闭)"
-                }}
-              </q-tooltip>
-            </q-btn>
-            <q-btn
-              :color="streamingResponse ? 'negative' : 'primary'"
-              :icon="streamingResponse ? 'stop' : 'send'"
-              size="sm"
-              dense
-              flat
-              @click="handleSubmit"
-            />
-          </div>
-        </template>
-      </q-input>
-    </div>
-  </q-card>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import AISelector from "components/ai/AISelector.vue";
-import { marked } from "marked";
-import DOMPurify from "dompurify";
-
-const quickcommandApi =
-  require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`)
-    .default.replace(/\/\*[\s\S]*?\*\//g, "")
-    .replace(/\n/g, "");
-const uToolsApi = require(`!raw-loader!plugins/monaco/types/utools.api.d.ts`)
-  .default.replace(/\/\*[\s\S]*?\*\//g, "")
-  .replace(/\n/g, "");
-
-export default defineComponent({
-  name: "AIAssistantDialog",
-  components: {
-    AISelector,
-  },
-  data() {
-    return {
-      prompt: "",
-      selectedApi: {},
-      streamingResponse: false,
-      chatHistory: [],
-      currentRequest: null,
-      autoUpdateCode: true,
-      scrollToBottomDebounce: null,
-    };
-  },
-  props: {
-    code: {
-      type: String,
-      default: "",
-    },
-    language: {
-      type: String,
-      default: "",
-    },
-  },
-  emits: ["update-code"],
-  methods: {
-    scrollToBottom() {
-      // 清除之前的定时器
-      if (this.scrollToBottomDebounce) {
-        clearTimeout(this.scrollToBottomDebounce);
-      }
-
-      // 设置新的定时器，延迟执行滚动
-      this.scrollToBottomDebounce = setTimeout(() => {
-        const scrollArea = this.$refs.scrollArea;
-        if (scrollArea) {
-          const scrollTarget = scrollArea.getScrollTarget();
-          scrollArea.setScrollPosition(
-            "vertical",
-            scrollTarget.scrollHeight,
-            300
-          );
-        }
-      }, 100);
-    },
-    async handleSubmit() {
-      if (this.streamingResponse) {
-        this.stopStreaming();
-        return;
-      }
-
-      const promptText = this.prompt.trim();
-      if (!promptText || !this.selectedApi) return;
-
-      // 添加用户消息到历史记录
-      this.chatHistory.push(
-        {
-          role: "user",
-          content: promptText,
-        },
-        {
-          role: "assistant",
-          content: "",
-        }
-      );
-
-      // 添加消息后立即滚动到底部
-      this.$nextTick(() => {
-        this.scrollToBottom();
-      });
-
-      this.streamingResponse = true;
-      this.prompt = ""; // 清空输入框
-
-      try {
-        const response = await window.quickcommand.askAI(
-          {
-            prompt: promptText,
-            role: this.getRolePrompt(this.language),
-            context: this.chatHistory.slice(0, -2),
-          },
-          this.selectedApi,
-          {
-            showLoadingBar: false,
-            stream: true,
-            onStream: (text, controller, done) => {
-              this.currentRequest = controller;
-              if (text) {
-                this.chatHistory[this.chatHistory.length - 1].content += text;
-                this.$nextTick(() => {
-                  this.scrollToBottom();
-                });
-              }
-
-              if (done) {
-                this.streamingResponse = false;
-                if (this.autoUpdateCode) {
-                  const response =
-                    this.chatHistory[this.chatHistory.length - 1].content;
-                  const code = response.match(
-                    /```[a-z]*\n([\s\S]*?)\n```/
-                  )?.[1];
-
-                  if (!code) return;
-
-                  this.$emit("update-code", code);
-                }
-              }
-            },
-          }
-        );
-
-        if (!response.success && !response.cancelled) {
-          window.quickcommand.showMessageBox(response.error, "error");
-        }
-      } catch (error) {
-        window.quickcommand.showMessageBox(error.message, "error");
-        this.streamingResponse = false;
-      }
-    },
-    stopStreaming() {
-      this.streamingResponse = false;
-      if (this.currentRequest) {
-        this.currentRequest.abort();
-        this.currentRequest = null;
-      }
-    },
-    clearHistory() {
-      this.chatHistory = [];
-    },
-    getTrimContent(content) {
-      const markedContent = marked(content.trim());
-      // 解决think标签被错误地包裹在<p>标签中
-      const processedContent = markedContent
-        .replace("<p><think>", "<think><p>")
-        .replace("</think></p>", "</p></think>")
-        // 去除空的think标签
-        .replace("<think>\n\n</think>", "");
-      const purifiedContent = DOMPurify.sanitize(processedContent, {
-        ADD_TAGS: ["think"],
-      });
-      return purifiedContent;
-    },
-    getRolePrompt(language) {
-      const languageMap = {
-        quickcommand: "NodeJS",
-        javascript: "NodeJS",
-      };
-      const commonInstructions = `请作为一名专业的开发专家，根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
-   - 编写简洁、可读性强的代码
-   - 遵循${language}最佳实践和设计模式
-   - 使用恰当的命名规范和代码组织
-   - 添加必要的错误处理和边界检查
-   - 保持中文注释的准确性和专业性
-   - 提供必要的使用说明
-   `;
-
-      // 针对不同语言的特殊提示
-      let languageSpecific = {
-        javascript: `- 优先使用现代ES6+特性
-   - 使用NodeJS原生API和模块`,
-        python: `- 遵循PEP8规范`,
-      };
-      languageSpecific.quickcommand = `${languageSpecific.javascript}
-    - 支持使用以下uTools接口： ${uToolsApi}
-    - 支持使用以下quickcommand接口： ${quickcommandApi}`;
-
-      // 获取语言特定的提示，如果没有则使用空字符串
-      const specificInstructions =
-        languageSpecific[language.toLowerCase()] || "";
-
-      const lastInstructions =
-        "\n请直接生成代码，任何情况下都不需要做解释和说明";
-
-      return commonInstructions + specificInstructions + lastInstructions;
-    },
-  },
-});
-</script>
-
-<style scoped>
-.ai-dialog {
-  width: 800px;
-  max-width: 90vw;
-  height: 80vh;
-  display: flex;
-  flex-direction: column;
-}
-
-.header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.chat-container {
-  flex: 1 1 auto;
-}
-
-.chat-message-wrapper {
-  margin-bottom: 1rem;
-  animation: fadeIn 0.3s ease-in-out;
-}
-
-.chat-message {
-  display: flex;
-  gap: 8px;
-  max-width: 85%;
-}
-
-.chat-message.user {
-  margin-left: auto;
-  flex-direction: row-reverse;
-}
-
-.chat-message .avatar {
-  background: var(--q-primary);
-  border-radius: 50%;
-  padding: 2px;
-  width: 32px;
-  height: 32px;
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.chat-message.assistant .avatar {
-  background: var(--transparent-bg-color);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.chat-message.user .avatar {
-  background: var(--q-primary);
-}
-
-.message-bubble {
-  padding: 8px 12px;
-  border-radius: 12px;
-  position: relative;
-}
-
-.message-content :deep(think) {
-  color: #8b8b8b;
-  display: block;
-  border-left: 4px solid #8b8b8b;
-  padding-left: 10px;
-  margin-bottom: 8px;
-  font-size: 12px;
-}
-
-.chat-message.user .message-bubble {
-  background-color: var(--q-primary);
-  color: white;
-  border-top-right-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-}
-
-.chat-message.assistant .message-bubble {
-  background-color: var(--transparent-bg-color);
-  border-top-left-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.message-content {
-  font-size: 13px;
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-    transform: translateY(10px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-/* 暗色模式适配 */
-.body--dark .chat-message.assistant .message-bubble {
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
-}
-</style>
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
new file mode 100644
index 00000000..2067a71f
--- /dev/null
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -0,0 +1,312 @@
+<template>
+  <q-card class="ai-assistant">
+    <div class="row items-center justify-between q-pa-xs no-wrap">
+      <div class="row items-center q-gutter-x-xs no-wrap">
+        <q-icon name="smart_toy" size="20px" />
+        <div class="text-subtitle1">AI 助手</div>
+        <AISelector v-model="selectedApi" :dense="true" />
+      </div>
+      <q-btn icon="close" size="sm" flat dense @click.stop="$emit('close')" />
+    </div>
+
+    <!-- 聊天记录区域 -->
+    <AIChatHistory
+      :messages="chatHistory"
+      @update-code="$emit('update-code', ...$event)"
+    />
+
+    <!-- 输入区域 -->
+    <div class="input-container q-px-sm q-py-xs">
+      <div class="prompt-input">
+        <q-input
+          v-model="prompt"
+          type="textarea"
+          borderless
+          dense
+          autogrow
+          autofocus
+          placeholder="请描述需求，Enter 发送，Shift+Enter 换行"
+          @keydown.enter.exact.prevent="handleSubmit"
+          @keydown.shift.enter.prevent="prompt += '\n'"
+        />
+      </div>
+      <div class="row items-center justify-between q-gutter-x-xs">
+        <div class="row items-center q-gutter-x-xs">
+          <q-btn flat dense size="sm" icon="delete_sweep" @click="clearHistory">
+            <q-tooltip>清空对话</q-tooltip>
+          </q-btn>
+          <q-btn
+            flat
+            dense
+            size="sm"
+            icon="code"
+            :color="sendCode ? 'primary' : 'grey'"
+            @click="sendCode = !sendCode"
+          >
+            <q-tooltip>
+              {{
+                sendCode
+                  ? "将当前代码提交给AI(已开启)"
+                  : "将当前代码提交给AI(已关闭)"
+              }}
+            </q-tooltip>
+          </q-btn>
+          <q-btn
+            flat
+            dense
+            size="sm"
+            icon="auto_fix_high"
+            :color="autoUpdateCode ? 'primary' : 'grey'"
+            @click="toggleAutoUpdate"
+          >
+            <q-tooltip>
+              {{
+                autoUpdateCode ? "自动更新代码(已开启)" : "自动更新代码(已关闭)"
+              }}
+            </q-tooltip>
+          </q-btn>
+        </div>
+        <q-btn
+          flat
+          dense
+          size="sm"
+          :color="streamingResponse ? 'negative' : 'primary'"
+          :icon="streamingResponse ? 'stop' : 'send'"
+          @click="handleSubmit"
+        />
+      </div>
+    </div>
+  </q-card>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import AISelector from "components/ai/AISelector.vue";
+import AIChatHistory from "components/ai/AIChatHistory.vue";
+import { marked } from "marked";
+import DOMPurify from "dompurify";
+
+const quickcommandApi =
+  require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`)
+    .default.replace(/\/\*[\s\S]*?\*\//g, "")
+    .replace(/\n/g, "");
+const uToolsApi = require(`!raw-loader!plugins/monaco/types/utools.api.d.ts`)
+  .default.replace(/\/\*[\s\S]*?\*\//g, "")
+  .replace(/\n/g, "");
+
+export default defineComponent({
+  name: "AIAssistantSideBar",
+  components: {
+    AISelector,
+    AIChatHistory,
+  },
+  data() {
+    return {
+      prompt: "",
+      selectedApi: {},
+      streamingResponse: false,
+      chatHistory: [],
+      currentRequest: null,
+      autoUpdateCode: localStorage.getItem("ai_auto_update") !== "false",
+      sendCode: false,
+    };
+  },
+  props: {
+    code: {
+      type: String,
+      default: "",
+    },
+    language: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update-code", "close"],
+  methods: {
+    async handleSubmit() {
+      const sendCode = this.sendCode;
+      this.sendCode = false;
+
+      if (this.streamingResponse) {
+        this.stopStreaming();
+        return;
+      }
+
+      const code = this.code
+        ? `这是当前代码：\n-----代码开始-----\n${this.code}\n-----代码结束-----\n`
+        : "";
+
+      const promptText = sendCode
+        ? code + this.prompt.trim()
+        : this.prompt.trim();
+
+      if (!promptText || !this.selectedApi) return;
+
+      this.chatHistory.push(
+        {
+          role: "user",
+          content: promptText,
+        },
+        {
+          role: "assistant",
+          content: "",
+        }
+      );
+
+      this.streamingResponse = true;
+      this.prompt = "";
+
+      try {
+        const response = await window.quickcommand.askAI(
+          {
+            prompt: promptText,
+            role: this.getRolePrompt(this.language),
+            context: this.chatHistory.slice(0, -2),
+          },
+          this.selectedApi,
+          {
+            showLoadingBar: false,
+            stream: true,
+            onStream: (text, controller, done) => {
+              this.currentRequest = controller;
+              if (text) {
+                this.chatHistory[this.chatHistory.length - 1].content += text;
+              }
+
+              if (done) {
+                this.streamingResponse = false;
+                if (this.autoUpdateCode) {
+                  const response =
+                    this.chatHistory[this.chatHistory.length - 1].content;
+                  const code = response.match(
+                    /```[a-z]*\n([\s\S]*?)\n```/
+                  )?.[1];
+
+                  if (!code) return;
+
+                  this.$emit("update-code", "replace", code);
+                }
+              }
+            },
+          }
+        );
+
+        if (!response.success && !response.cancelled) {
+          window.quickcommand.showMessageBox(response.error, "error");
+        }
+      } catch (error) {
+        window.quickcommand.showMessageBox(error.message, "error");
+        this.streamingResponse = false;
+      }
+    },
+    stopStreaming() {
+      this.streamingResponse = false;
+      if (this.currentRequest) {
+        this.currentRequest.abort();
+        this.currentRequest = null;
+      }
+    },
+    clearHistory() {
+      if (this.chatHistory.length === 0) return;
+      this.chatHistory = [];
+      localStorage.removeItem("ai_chat_history");
+    },
+    saveChatHistory() {
+      localStorage.setItem("ai_chat_history", JSON.stringify(this.chatHistory));
+    },
+    loadChatHistory() {
+      const history = localStorage.getItem("ai_chat_history");
+      if (history) {
+        try {
+          this.chatHistory = JSON.parse(history);
+        } catch (e) {
+          console.error("Failed to parse chat history:", e);
+          this.chatHistory = [];
+        }
+      }
+    },
+    toggleAutoUpdate() {
+      this.autoUpdateCode = !this.autoUpdateCode;
+      localStorage.setItem("ai_auto_update", this.autoUpdateCode);
+    },
+    getTrimContent(content) {
+      const markedContent = marked(content.trim());
+      // 解决think标签被错误地包裹在<p>标签中
+      const processedContent = markedContent
+        .replace("<p><think>", "<think><p>")
+        .replace("</think></p>", "</p></think>")
+        // 去除空的think标签
+        .replace("<think>\n\n</think>", "");
+      const purifiedContent = DOMPurify.sanitize(processedContent, {
+        ADD_TAGS: ["think"],
+      });
+      return purifiedContent;
+    },
+    getRolePrompt(language) {
+      const languageMap = {
+        quickcommand: "NodeJS",
+        javascript: "NodeJS",
+        cmd: "bat",
+      };
+      const commonInstructions = `请作为一名专业的开发专家，根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
+   - 编写简洁、可读性强的代码
+   - 遵循${language}最佳实践和设计模式
+   - 使用恰当的命名规范和代码组织
+   - 添加必要的错误处理和边界检查
+   - 保持中文注释的准确性和专业性
+   - 提供必要的使用说明
+   `;
+
+      // 针对不同语言的特殊提示
+      let languageSpecific = {
+        javascript: `- 优先使用现代ES6+特性
+   - 使用NodeJS原生API和模块`,
+        python: `- 遵循PEP8规范`,
+      };
+      languageSpecific.quickcommand = `${languageSpecific.javascript}
+    - 支持使用以下uTools接口： ${uToolsApi}
+    - 支持使用以下quickcommand接口： ${quickcommandApi}`;
+
+      // 获取语言特定的提示，如果没有则使用空字符串
+      const specificInstructions =
+        languageSpecific[language.toLowerCase()] || "";
+
+      const lastInstructions =
+        "\n请直接生成代码，任何情况下都不需要做解释和说明";
+
+      return commonInstructions + specificInstructions + lastInstructions;
+    },
+  },
+  mounted() {
+    setTimeout(this.loadChatHistory);
+  },
+  beforeUnmount() {
+    setTimeout(this.saveChatHistory);
+  },
+});
+</script>
+
+<style scoped>
+.ai-assistant {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 5px;
+}
+
+.input-container {
+  flex-shrink: 0;
+  background: var(--utools-bg-color);
+  border-radius: 8px;
+}
+
+.prompt-input {
+  max-height: 120px;
+  overflow-y: auto;
+}
+
+.prompt-input :deep(textarea) {
+  font-size: 13px;
+  padding: 2px 4px !important;
+}
+</style>
diff --git a/src/components/ai/AIChatHistory.vue b/src/components/ai/AIChatHistory.vue
new file mode 100644
index 00000000..ebe0bc9b
--- /dev/null
+++ b/src/components/ai/AIChatHistory.vue
@@ -0,0 +1,281 @@
+<template>
+  <q-scroll-area
+    ref="scrollArea"
+    class="chat-container"
+    :vertical-thumb-style="{
+      width: '5px',
+    }"
+    :horizontal-thumb-style="{
+      height: '5px',
+    }"
+  >
+    <div class="chat-history">
+      <div
+        v-for="(message, index) in messages"
+        :key="index"
+        class="chat-message-wrapper"
+      >
+        <div :class="['chat-message', message.role]">
+          <div class="message-bubble">
+            <div
+              v-if="message.role === 'assistant'"
+              class="message-content markdown"
+              v-html="getAssistantMsg(message.content)"
+            />
+            <div
+              v-else
+              class="message-content"
+              v-text="getUserMsg(message.content)"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </q-scroll-area>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import { marked } from "marked";
+import DOMPurify from "dompurify";
+
+export default defineComponent({
+  name: "AIChatHistory",
+  props: {
+    messages: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ["update-code"],
+  data() {
+    return {
+      timeoutId: null,
+    };
+  },
+  methods: {
+    debounce(fn) {
+      if (this.timeoutId) {
+        clearTimeout(this.timeoutId);
+      }
+      this.timeoutId = setTimeout(fn, 500);
+    },
+
+    scrollToBottom() {
+      const scrollArea = this.$refs.scrollArea;
+      if (scrollArea) {
+        const scrollTarget = scrollArea.getScrollTarget();
+        scrollArea.setScrollPosition(
+          "vertical",
+          scrollTarget.scrollHeight,
+          300
+        );
+      }
+    },
+
+    getAssistantMsg(content) {
+      const markedContent = marked(content.trim());
+      const processedContent = markedContent
+        .replace("<p><think>", "<think><p>")
+        .replace("</think></p>", "</p></think>")
+        .replace("<think>\n\n</think>", "");
+      const purifiedContent = DOMPurify.sanitize(processedContent, {
+        ADD_TAGS: ["think"],
+      });
+      return purifiedContent;
+    },
+
+    getUserMsg(content) {
+      content = content.replace(
+        /这是当前代码：\n-----代码开始-----([\s\S]*?)-----代码结束-----\n/g,
+        "这是当前代码：(代码已隐藏)\n"
+      );
+      return content;
+    },
+
+    setupMessageActions() {
+      const codeBlocks = document.querySelectorAll(".message-content pre");
+      codeBlocks.forEach((codeBlock) => {
+        if (codeBlock.querySelector(".code-actions")) return;
+
+        const actionGroup = document.createElement("div");
+        actionGroup.className = "code-actions";
+
+        const copyBtn = document.createElement("button");
+        copyBtn.innerHTML = '<i class="material-icons">content_copy</i>';
+        copyBtn.title = "复制代码";
+        copyBtn.onclick = () => {
+          navigator.clipboard.writeText(codeBlock.textContent);
+          window.quickcommand.showNotification("代码已复制到剪贴板");
+        };
+
+        const insertBtn = document.createElement("button");
+        insertBtn.innerHTML = '<i class="material-icons">read_more</i>';
+        insertBtn.title = "插入到光标位置";
+        insertBtn.onclick = () => {
+          this.$emit("update-code", "insert", codeBlock.textContent);
+        };
+
+        const applyBtn = document.createElement("button");
+        applyBtn.innerHTML = '<i class="material-icons">done_all</i>';
+        applyBtn.title = "替换当前代码";
+        applyBtn.onclick = () => {
+          this.$emit("update-code", "replace", codeBlock.textContent);
+        };
+
+        actionGroup.appendChild(copyBtn);
+        actionGroup.appendChild(insertBtn);
+        actionGroup.appendChild(applyBtn);
+        codeBlock.appendChild(actionGroup);
+      });
+
+      const links = document.querySelectorAll(".message-content a");
+      links.forEach((link) => {
+        if (link.hasAttribute("data-processed")) return;
+
+        const href = link.getAttribute("href");
+        if (href) {
+          link.onclick = (e) => {
+            e.preventDefault();
+            window.utools.shellOpenExternal(href);
+          };
+          link.setAttribute("data-processed", "true");
+        }
+      });
+    },
+
+    updateView() {
+      this.scrollToBottom();
+      this.debounce(this.setupMessageActions);
+    },
+  },
+  watch: {
+    messages: {
+      handler() {
+        this.$nextTick(() => {
+          this.updateView();
+        });
+      },
+      deep: true,
+    },
+  },
+  beforeUnmount() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId);
+    }
+  },
+});
+</script>
+
+<style scoped>
+.chat-container {
+  flex: 1;
+  overflow: hidden;
+}
+
+.chat-container :deep(.q-scrollarea__content) {
+  width: 100%;
+}
+
+.chat-history {
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.chat-message-wrapper {
+  padding: 4px;
+  border-bottom: 1px solid var(--border-color);
+}
+
+.chat-message {
+  display: block;
+  max-width: 100%;
+}
+
+.chat-message.user {
+  margin-left: 0;
+  flex-direction: column;
+}
+
+.chat-message.user .message-bubble {
+  color: var(--q-primary);
+  word-break: break-all;
+  white-space: pre-wrap;
+}
+
+.message-content {
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+/* 代码块样式优化 */
+.message-content :deep(pre) {
+  margin: 4px 0;
+  border-radius: 4px;
+  padding: 4px 8px;
+  max-width: 100%;
+  overflow-x: auto;
+  position: relative;
+}
+
+.message-content :deep(pre::-webkit-scrollbar) {
+  height: 3px;  /* 与 markdown.css 保持一致 */
+}
+
+.message-content :deep(code) {
+  font-size: 12px;
+  white-space: pre;
+}
+
+/* 代码块按钮样式 */
+.message-content :deep(.code-actions) {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  display: flex;
+  gap: 4px;
+  opacity: 0;
+  transition: opacity 0.2s;
+  padding: 2px;
+  border-radius: 4px;
+}
+
+.message-content :deep(pre:hover .code-actions) {
+  opacity: 1;
+}
+
+.message-content :deep(.code-actions button) {
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: none;
+  background: transparent;
+  color: var(--q-primary);
+  background-color: var(--utools-bg-color);
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 2px;
+  transition: background-color 0.2s;
+}
+
+.message-content :deep(.code-actions button:hover) {
+  filter: brightness(0.9);
+}
+
+.message-content :deep(.code-actions button i) {
+  font-size: 14px;
+}
+
+/* 链接样式 */
+.message-content :deep(a) {
+  color: var(--q-primary);
+  text-decoration: none;
+}
+
+.message-content :deep(a:hover) {
+  text-decoration: underline;
+}
+</style>
diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index f282864a..8748dd9f 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -29,7 +29,7 @@
       >
         <draggable
           v-model="aiConfigs"
-          item-key="name"
+          item-key="id"
           handle=".drag-handle"
           :animation="200"
           class="config-list"
@@ -104,7 +104,7 @@
                         dense
                         dropdown-icon="refresh"
                       >
-                        <q-list>
+                        <q-list dense>
                           <q-item
                             v-for="model in models"
                             :key="model"
@@ -203,12 +203,12 @@ export default defineComponent({
     },
     addModel() {
       this.aiConfigs.push({
+        id: getUniqueId(),
         apiType: this.apiToAdd,
         apiUrl: "",
         apiToken: "",
         model: "",
         name: "",
-        id: getUniqueId(),
       });
     },
     getConfigListHeight() {
@@ -217,7 +217,12 @@ export default defineComponent({
     },
   },
   mounted() {
-    this.aiConfigs = dbManager.getStorage("cfg_aiConfigs") || [];
+    this.aiConfigs = (dbManager.getStorage("cfg_aiConfigs") || []).map(
+      (config) => ({
+        ...config,
+        id: config.id || getUniqueId(),
+      })
+    );
   },
 });
 </script>
diff --git a/src/components/ai/AISelector.vue b/src/components/ai/AISelector.vue
index 1e054890..cbd4fb18 100644
--- a/src/components/ai/AISelector.vue
+++ b/src/components/ai/AISelector.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="selector-wrapper">
     <q-select
       v-if="apiOptions.length > 0"
       :model-value="modelValue"
@@ -10,15 +10,25 @@
       dense
       options-dense
       filled
+      class="ai-selector"
+      :class="{ 'ai-selector--dense': dense }"
     >
       <template v-slot:prepend>
-        <q-badge color="primary" text-color="white" class="q-mr-sm q-pa-xs">
+        <q-badge
+          color="primary"
+          text-color="white"
+          class="q-mr-sm q-pa-xs"
+          v-if="!dense"
+        >
           模型
         </q-badge>
       </template>
       <template v-slot:append>
         <q-btn icon="settings" dense flat @click.stop="showAIConfig = true" />
       </template>
+      <template v-slot:selected-item="scope">
+        <div class="ellipsis">{{ scope.opt.label }}</div>
+      </template>
     </q-select>
     <q-btn
       dense
@@ -26,6 +36,7 @@
       class="full-width q-px-sm"
       icon="settings"
       label="配置AI接口"
+      :size="dense ? 'xs' : 'md'"
       unelevated
       v-else
       @click="showAIConfig = true"
@@ -49,6 +60,10 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    dense: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -82,9 +97,57 @@ export default defineComponent({
   },
   mounted() {
     this.apiOptions = this.getApiOptions();
-    if (!this.modelValue.id) {
+    if (!this.modelValue?.id) {
       this.updateModelValue(this.apiOptions[0]?.value || {});
     }
   },
 });
 </script>
+
+<style scoped>
+.selector-wrapper {
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+}
+
+.ai-selector {
+  width: 100%;
+}
+
+.ai-selector--dense {
+  font-size: 12px;
+}
+
+:deep(.q-field__native) {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+.ai-selector--dense :deep(.q-field__control) {
+  padding: 0;
+}
+
+.ai-selector--dense :deep(.q-field__control),
+.ai-selector--dense :deep(.q-field__control > *),
+.ai-selector--dense :deep(.q-field__native) {
+  max-height: 26px !important;
+  min-height: 26px !important;
+}
+
+.ai-selector--dense :deep(.q-field__native) {
+  padding: 0 0 0 5px;
+}
+
+.ai-selector--dense :deep(.q-field__append) {
+  padding: 0;
+}
+</style>
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index ead80c1f..701f1150 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -1,11 +1,29 @@
 <template>
   <div class="code-editor" :style="{ height: height }">
-    <div ref="editorContainer" class="editor-container" />
-    <div class="placeholder-wrapper" v-show="showPlaceholder">
-      <div class="placeholder">
-        {{ placeholder }}
+    <div
+      class="editor-container"
+      :class="{ 'with-assistant': showAIAssistant }"
+    >
+      <div ref="editorContainer" class="monaco-container" />
+      <div class="placeholder-wrapper" v-show="showPlaceholder">
+        <div class="placeholder">
+          {{ placeholder }}
+        </div>
       </div>
     </div>
+
+    <!-- AI助手侧边栏 -->
+    <Transition name="slide">
+      <AIAssistantSideBar
+        v-if="showAIAssistant"
+        class="ai-assistant-panel"
+        :code="modelValue"
+        :language="language"
+        @close="toggleAIAssistant(false)"
+        @update-code="updateEditorValue"
+      />
+    </Transition>
+
     <!-- AI助手按钮 -->
     <div class="ai-button-wrapper">
       <q-btn
@@ -13,19 +31,11 @@
         dense
         color="primary"
         icon="smart_toy"
-        @click="showAIDialog = true"
+        @click="toggleAIAssistant(true)"
+        v-if="!showAIAssistant"
       >
-        <q-tooltip>AI 助手</q-tooltip>
       </q-btn>
     </div>
-    <!-- AI对话框 -->
-    <q-dialog v-model="showAIDialog" position="right" seamless>
-      <AIAssistantDialog
-        :code="modelValue"
-        :language="language"
-        @update-code="setEditorValue"
-      />
-    </q-dialog>
   </div>
 </template>
 
@@ -33,7 +43,8 @@
 import * as monaco from "monaco-editor";
 import importAll from "js/common/importAll.js";
 import { defineComponent } from "vue";
-import AIAssistantDialog from "components/ai/AIAssistantDialog.vue";
+import AIAssistantSideBar from "components/ai/AIAssistantSideBar.vue";
+import editorOptions from "js/options/editorOptions.js";
 
 // 批量导入关键字补全
 let languageCompletions = importAll(
@@ -61,7 +72,7 @@ const typeDefinitions = {
 export default defineComponent({
   name: "CodeEditor",
   components: {
-    AIAssistantDialog,
+    AIAssistantSideBar,
   },
   props: {
     // v-model 绑定值
@@ -100,65 +111,16 @@ export default defineComponent({
       default: () => ({}),
     },
   },
-  emits: ["update:modelValue", "update:cursorPosition"],
+  emits: [
+    "update:modelValue",
+    "update:cursorPosition",
+    "saveHistory",
+    "requestFullScreen",
+  ],
   data() {
     return {
       resizeTimeout: null,
-      defaultOptions: {
-        value: "",
-        // 自动布局
-        automaticLayout: true,
-        // 折叠策略
-        foldingStrategy: "indentation",
-        // 自动关闭括号
-        autoClosingBrackets: true,
-        // 制表符大小
-        tabSize: 2,
-        // 最小化
-        minimap: {
-          enabled: false,
-        },
-        // 自动格式化
-        formatOnType: true,
-        // 自动格式化
-        formatOnPaste: true,
-        // 自动缩进
-        autoIndent: "full",
-        // 滚动超出最后一行
-        scrollBeyondLastLine: false,
-        // 字体大小
-        fontSize: 14,
-        // 行号
-        lineNumbers: "on",
-        // 行号最小字符数
-        lineNumbersMinChars: 3,
-        // 行号
-        renderLineNumbers: "on",
-        // 行装饰宽度
-        lineDecorationsWidth: 0,
-        // 圆角
-        roundedSelection: false,
-        // 行高亮
-        renderLineHighlight: "all",
-        // 仅在聚焦时高亮行
-        renderLineHighlightOnlyWhenFocus: true,
-        // 隐藏光标
-        hideCursorInOverviewRuler: true,
-        // 隐藏概览边框
-        overviewRulerBorder: false,
-        // 隐藏概览线
-        overviewRulerLanes: 0,
-        // 滚动条
-        scrollBars: {
-          vertical: "visible",
-          horizontal: "visible",
-        },
-        // 只读
-        readOnly: false,
-        // 光标样式
-        cursorStyle: "line",
-      },
-      showAIDialog: false,
+      showAIAssistant: false,
     };
   },
   watch: {
@@ -212,7 +174,7 @@ export default defineComponent({
       const language = this.getHighlighter(this.language);
 
       const options = {
-        ...this.defaultOptions,
+        ...editorOptions,
         ...this.options,
         value: this.modelValue || "",
         language,
@@ -419,8 +381,17 @@ export default defineComponent({
     formatDocument() {
       editor.getAction("editor.action.formatDocument").run();
     },
-    setEditorValue(value) {
-      editor.setValue(value);
+    updateEditorValue(type, value) {
+      if (type === "replace") {
+        editor.setValue(value);
+      } else if (type === "insert") {
+        this.repacleEditorSelection(value);
+      }
+      this.$emit("saveHistory", value);
+    },
+    toggleAIAssistant(value) {
+      this.showAIAssistant = value;
+      this.$emit("requestFullScreen", value);
     },
   },
   computed: {
@@ -437,13 +408,47 @@ export default defineComponent({
   overflow: hidden;
   position: relative;
   border-radius: 4px;
+  display: flex;
 }
 
 .editor-container {
+  flex: 1;
+  height: 100%;
+  transition: width 0.3s ease;
+}
+
+.editor-container.with-assistant {
+  width: 55%;
+}
+
+.monaco-container {
   width: 100%;
   height: 100%;
 }
 
+.ai-assistant-panel {
+  width: 45%;
+  height: 100%;
+  transition: transform 0.3s ease;
+}
+
+.slide-enter-active,
+.slide-leave-active {
+  transition: transform 0.3s ease;
+}
+
+.slide-enter-from,
+.slide-leave-to {
+  transform: translateX(100%);
+}
+
+.ai-button-wrapper {
+  position: absolute;
+  right: 30px;
+  bottom: 30px;
+  z-index: 500;
+}
+
 .placeholder-wrapper {
   position: absolute;
   top: 0;
@@ -459,11 +464,4 @@ export default defineComponent({
   user-select: none;
   opacity: 0.4;
 }
-
-.ai-button-wrapper {
-  position: absolute;
-  right: 30px;
-  bottom: 30px;
-  z-index: 500;
-}
 </style>
diff --git a/src/components/popup/EditorHistory.vue b/src/components/popup/EditorHistory.vue
index f19bda79..8df3b99d 100644
--- a/src/components/popup/EditorHistory.vue
+++ b/src/components/popup/EditorHistory.vue
@@ -43,7 +43,11 @@
               <div class="text-h6">历史记录</div>
               <q-icon name="help_outline" class="q-ml-sm">
                 <q-tooltip>
-                  在初次进入编辑器、点击运行、保存按钮以及在此处进行恢复操作后，会自动保存当时的命令，方便进行回溯。<br />
+                  以下操作会自动保存历史记录：<br />
+                  1.初次进入编辑器；<br />
+                  2.点击运行、保存按钮；<br />
+                  3.在此处进行恢复操作。<br />
+                  4.AI助手自动提交代码后。<br />
                   注意：<br />
                   1.超过5k的内容不会保存；<br />
                   2.数据是临时保存的，且不会多端同步；<br />
diff --git a/src/css/markdown.css b/src/css/markdown.css
index 86def04c..971576df 100644
--- a/src/css/markdown.css
+++ b/src/css/markdown.css
@@ -7,7 +7,6 @@
   background-color: #f6f8fa;
   padding: 1em;
   border-radius: 6px;
-  overflow-x: auto;
   margin: 2px 0;
   overflow-x: auto;
   max-width: 100%;
@@ -46,6 +45,7 @@
 .markdown h6 {
   margin: 2px 0;
   font-weight: 600;
+  line-height: 1.5rem;
 }
 
 .markdown h1 {
@@ -77,8 +77,8 @@
   color: #999;
 }
 
-.markdown code ::-webkit-scrollbar {
-  height: 5px;
+.markdown pre::-webkit-scrollbar {
+  height: 3px;
 }
 
 .markdown a {
diff --git a/src/css/qinput.css b/src/css/qinput.css
index b461523a..40e3a2b8 100644
--- a/src/css/qinput.css
+++ b/src/css/qinput.css
@@ -3,8 +3,8 @@
 .q-field--filled:not(.q-textarea) .q-field__control,
 .q-field--filled:not(.q-textarea) .q-field__control>*,
 .q-field--filled:not(.q-field--labeled):not(.q-textarea) .q-field__native {
-  max-height: 36px !important;
-  min-height: 36px !important;
+  max-height: 36px;
+  min-height: 36px;
 }
 
 .q-field--filled .q-field__control,
diff --git a/src/js/options/editorOptions.js b/src/js/options/editorOptions.js
new file mode 100644
index 00000000..24318e6e
--- /dev/null
+++ b/src/js/options/editorOptions.js
@@ -0,0 +1,54 @@
+export default {
+  value: "",
+  // 自动布局
+  automaticLayout: true,
+  // 折叠策略
+  foldingStrategy: "indentation",
+  // 自动关闭括号
+  autoClosingBrackets: true,
+  // 制表符大小
+  tabSize: 2,
+  // 最小化
+  minimap: {
+    enabled: false,
+  },
+  // 自动格式化
+  formatOnType: true,
+  // 自动格式化
+  formatOnPaste: true,
+  // 自动缩进
+  autoIndent: "full",
+  // 滚动超出最后一行
+  scrollBeyondLastLine: false,
+  // 字体大小
+  fontSize: 14,
+  // 行号
+  lineNumbers: "on",
+  // 行号最小字符数
+  lineNumbersMinChars: 3,
+  // 行号
+  renderLineNumbers: "on",
+  // 行装饰宽度
+  lineDecorationsWidth: 0,
+  // 圆角
+  roundedSelection: false,
+  // 行高亮
+  renderLineHighlight: "all",
+  // 仅在聚焦时高亮行
+  renderLineHighlightOnlyWhenFocus: true,
+  // 隐藏光标
+  hideCursorInOverviewRuler: true,
+  // 隐藏概览边框
+  overviewRulerBorder: false,
+  // 隐藏概览线
+  overviewRulerLanes: 0,
+  // 滚动条
+  scrollBars: {
+    vertical: "visible",
+    horizontal: "visible",
+  },
+  // 只读
+  readOnly: false,
+  // 光标样式
+  cursorStyle: "line",
+};

From 60ac9fbc815dd0458832b009e8f47e5aae967980 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 20:38:51 +0800
Subject: [PATCH 215/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0quickcommand.markdown?=
 =?UTF-8?q?Parse=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=94=AF=E6=8C=81=E8=A7=A3=E6=9E=90markdown?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 18 ---------------
 package.json                                  |  1 -
 plugin/lib/quickcommand.js                    |  6 +++++
 plugin/package-lock.json                      | 18 +++++++++++++++
 plugin/package.json                           |  1 +
 plugin/preload.js                             |  1 +
 src/components/ai/AIAssistantSideBar.vue      | 15 ------------
 src/components/ai/AIChatHistory.vue           |  3 +--
 src/js/composer/commands/dataCommands.js      | 23 +++++++++++++++++--
 .../monaco/types/quickcommand.api.d.ts        | 12 ++++++++++
 10 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 94198f74..97401d13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,6 @@
         "core-js": "^3.6.5",
         "croner": "^4.3.9",
         "dompurify": "^3.2.4",
-        "marked": "^15.0.7",
         "monaco-editor": "^0.33.0",
         "monaco-editor-webpack-plugin": "^7.0.1",
         "picture-compressor": "^1.1.0",
@@ -7024,18 +7023,6 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
-    "node_modules/marked": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
-      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
-      "license": "MIT",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -16309,11 +16296,6 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
-    "marked": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
-      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg=="
-    },
     "math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
diff --git a/package.json b/package.json
index c5437be8..1c9cb74b 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
     "core-js": "^3.6.5",
     "croner": "^4.3.9",
     "dompurify": "^3.2.4",
-    "marked": "^15.0.7",
     "monaco-editor": "^0.33.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "picture-compressor": "^1.1.0",
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 66384b37..2cb45ad9 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -5,6 +5,7 @@ const kill = require("tree-kill");
 const iconv = require("iconv-lite");
 const path = require("path");
 const axios = require("axios");
+const marked = require("marked");
 const { chat, getModels } = require("./ai");
 
 window.getModelsFromAiApi = getModels;
@@ -84,6 +85,11 @@ const quickcommand = {
     return new DOMParser().parseFromString(html, "text/html");
   },
 
+  // markdown 解析
+  markdownParse: function (markdown) {
+    return marked.parse(markdown);
+  },
+
   // 下载文件
   downloadFile: function (url, file) {
     return new Promise((reslove, reject) => {
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 6a50566b..5647d684 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -10,6 +10,7 @@
         "crypto-js": "^4.2.0",
         "exif-reader": "^2.0.1",
         "iconv-lite": "^0.6.3",
+        "marked": "^15.0.7",
         "node-forge": "^1.3.1",
         "png2icons": "^2.0.1",
         "ses": "^1.10.0",
@@ -141,6 +142,18 @@
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
       "license": "MIT"
     },
+    "node_modules/marked": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
+      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -324,6 +337,11 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
     },
+    "marked": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-15.0.7.tgz",
+      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg=="
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index d1ef758e..e1f3af21 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -5,6 +5,7 @@
     "crypto-js": "^4.2.0",
     "exif-reader": "^2.0.1",
     "iconv-lite": "^0.6.3",
+    "marked": "^15.0.7",
     "node-forge": "^1.3.1",
     "png2icons": "^2.0.1",
     "ses": "^1.10.0",
diff --git a/plugin/preload.js b/plugin/preload.js
index f8b63c59..1dbf2ba0 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -11,6 +11,7 @@ const http = require("http");
 const https = require("https");
 const url = require("url");
 const crypto = require("crypto");
+
 require("ses");
 const md5 = (input) => {
   return crypto.createHash("md5").update(input, "utf8").digest("hex");
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 2067a71f..70a65121 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -83,8 +83,6 @@
 import { defineComponent } from "vue";
 import AISelector from "components/ai/AISelector.vue";
 import AIChatHistory from "components/ai/AIChatHistory.vue";
-import { marked } from "marked";
-import DOMPurify from "dompurify";
 
 const quickcommandApi =
   require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`)
@@ -229,19 +227,6 @@ export default defineComponent({
       this.autoUpdateCode = !this.autoUpdateCode;
       localStorage.setItem("ai_auto_update", this.autoUpdateCode);
     },
-    getTrimContent(content) {
-      const markedContent = marked(content.trim());
-      // 解决think标签被错误地包裹在<p>标签中
-      const processedContent = markedContent
-        .replace("<p><think>", "<think><p>")
-        .replace("</think></p>", "</p></think>")
-        // 去除空的think标签
-        .replace("<think>\n\n</think>", "");
-      const purifiedContent = DOMPurify.sanitize(processedContent, {
-        ADD_TAGS: ["think"],
-      });
-      return purifiedContent;
-    },
     getRolePrompt(language) {
       const languageMap = {
         quickcommand: "NodeJS",
diff --git a/src/components/ai/AIChatHistory.vue b/src/components/ai/AIChatHistory.vue
index ebe0bc9b..d7d7fbc4 100644
--- a/src/components/ai/AIChatHistory.vue
+++ b/src/components/ai/AIChatHistory.vue
@@ -36,7 +36,6 @@
 
 <script>
 import { defineComponent } from "vue";
-import { marked } from "marked";
 import DOMPurify from "dompurify";
 
 export default defineComponent({
@@ -74,7 +73,7 @@ export default defineComponent({
     },
 
     getAssistantMsg(content) {
-      const markedContent = marked(content.trim());
+      const markedContent = quickcommand.markdownParse(content.trim());
       const processedContent = markedContent
         .replace("<p><think>", "<think><p>")
         .replace("</think></p>", "</p></think>")
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 647708f3..b8c7afc0 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -813,14 +813,14 @@ export const dataCommands = {
           width: 12,
         },
         {
-          label: "CSS选择器",
+          label: "CSS选择器（可选）",
           component: "VariableInput",
           icon: "css",
           placeholder: "例如：.class",
           width: 7,
         },
         {
-          label: "属性",
+          label: "属性（可选）",
           component: "VariableInput",
           icon: "colorize",
           options: {
@@ -837,6 +837,25 @@ export const dataCommands = {
         },
       ],
     },
+    {
+      value: "quickcommand.markdownParse",
+      label: "Markdown解析",
+      icon: "file_download",
+      config: [
+        {
+          label: "要解析的Markdown",
+          component: "VariableInput",
+          icon: "file_download",
+          width: 12,
+        },
+      ],
+      outputs: [
+        {
+          label: "解析后的HTML",
+          suggestName: "parsedHtml",
+        },
+      ],
+    },
     {
       value: "JSON.stringify",
       label: "JSON处理",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 1626a572..47509a70 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -260,6 +260,18 @@ interface quickcommandApi {
    */
   htmlParse(html: string): object;
 
+  /**
+   * 将给定的markdown字符串解析为html字符串
+   *
+   * @param markdown 需要解析的markdown文本
+   * ```js
+   * quickcommand.markdownParse("# 这是一个标题").then(html => {
+   *   console.log(html)
+   * })
+   * ```
+   */
+  markdownParse(markdown: string): string;
+
   /**
    * 下载文件，并返回文件的 Buffer，可选直接下载到指定路径，或者弹出对话框选择下载路径
    *

From cf374117177bbe2db55572d0274a77170dc96632 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 21:57:53 +0800
Subject: [PATCH 216/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0setTimeout=E5=92=8Ccl?=
 =?UTF-8?q?earTimeout=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                     | 16 +++++++++-------
 plugin/preload.js                              |  3 +++
 src/plugins/monaco/types/common.d.ts           |  3 +++
 src/plugins/monaco/types/quickcommand.api.d.ts | 13 +++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 2cb45ad9..b8a371dd 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -42,7 +42,6 @@ const quickcommand = {
 
   // setTimout 不能在 vm2 中使用，同时在 electron 中有 bug
   sleep: function (ms) {
-    var start = new Date().getTime();
     try {
       // node 16.13.1
       child_process.execSync(getSleepCodeByShell(ms), {
@@ -50,23 +49,26 @@ const quickcommand = {
         windowsHide: true,
       });
     } catch (ex) {}
-    var end = new Date().getTime();
-    return end - start;
+    return;
   },
 
   // 重写 setTimeout
   setTimeout: function (callback, ms) {
-    var start = new Date().getTime();
-    child_process.exec(
+    const child = child_process.exec(
       getSleepCodeByShell(ms),
       {
         timeout: ms,
       },
       () => {
-        var end = new Date().getTime();
-        callback(end - start);
+        if (child.signalCode === "SIGKILL") return;
+        callback();
       }
     );
+    return child.pid;
+  },
+
+  clearTimeout: function (pid) {
+    kill(pid, "SIGKILL");
   },
 
   asyncSleep: async function (ms) {
diff --git a/plugin/preload.js b/plugin/preload.js
index 1dbf2ba0..614cf722 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -137,6 +137,9 @@ let getSandboxFuns = () => {
     os,
     child_process,
     quickcomposer,
+    // timeout
+    setTimeout: quickcommand.setTimeout,
+    clearTimeout: quickcommand.clearTimeout,
   };
   Object.keys(shortCodes).forEach((f) => {
     sandbox[f] = shortCodes[f];
diff --git a/src/plugins/monaco/types/common.d.ts b/src/plugins/monaco/types/common.d.ts
index 3bc0b64f..e254b834 100644
--- a/src/plugins/monaco/types/common.d.ts
+++ b/src/plugins/monaco/types/common.d.ts
@@ -88,3 +88,6 @@ declare var console: {
   log(message?: any): void,
   error(message?: any): void
 }
+
+declare var setTimeout: (callback: () => void, ms: number) => number;
+declare var clearTimeout: (timeoutId: number) => void;
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 47509a70..684ff6ef 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -235,6 +235,19 @@ interface quickcommandApi {
    */
   setTimeout(callback: () => void, ms);
 
+  /**
+   * 清除异步等待
+   *
+   * @param timeoutId 等待的timeoutId
+   * ```js
+   * const timeoutId = quickcommand.setTimeout(()=>{
+   *   console.log('这条内容不会被打印')
+   * }, 2000)
+   * quickcommand.clearTimeout(timeoutId)
+   * ```
+   */
+  clearTimeout(timeoutId: number): void;
+
   /**
    * async 等待
    *

From 0de026b870c0b4dd40a24a094fe3755c9cc559b7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Feb 2025 23:57:45 +0800
Subject: [PATCH 217/332] =?UTF-8?q?=E4=BC=98=E5=8C=96quickcommand=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E6=8F=90=E7=A4=BA=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   1 +
 src/components/ai/AIAssistantSideBar.vue      | 154 ++++++++++++++----
 src/components/ai/AIChatHistory.vue           |  16 +-
 .../monaco/types/quickcommand.api.d.ts        |   4 +-
 4 files changed, 139 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index df39f05a..6f9d2274 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ quasar build
 
 ## ① 编写脚本
 
+- AI加持：支持AI编写脚本并自动更新代码
 - 快速执行命令：如打开文件夹、软件、网址等
 - 快速运行脚本：如批处理、`shell`、`python` 等
 - 直接编写网页：可以直接编写简单的 `html` 页面
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 70a65121..77f2478f 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -1,6 +1,6 @@
 <template>
   <q-card class="ai-assistant">
-    <div class="row items-center justify-between q-pa-xs no-wrap">
+    <div class="header">
       <div class="row items-center q-gutter-x-xs no-wrap">
         <q-icon name="smart_toy" size="20px" />
         <div class="text-subtitle1">AI 助手</div>
@@ -12,7 +12,7 @@
     <!-- 聊天记录区域 -->
     <AIChatHistory
       :messages="chatHistory"
-      @update-code="$emit('update-code', ...$event)"
+      @update-code="(...event) => $emit('update-code', ...event)"
     />
 
     <!-- 输入区域 -->
@@ -25,14 +25,14 @@
           dense
           autogrow
           autofocus
-          placeholder="请描述需求，Enter 发送，Shift+Enter 换行"
+          :placeholder="`请描述需求，AI 将生成 ${language} 代码`"
           @keydown.enter.exact.prevent="handleSubmit"
           @keydown.shift.enter.prevent="prompt += '\n'"
         />
       </div>
       <div class="row items-center justify-between q-gutter-x-xs">
         <div class="row items-center q-gutter-x-xs">
-          <q-btn flat dense size="sm" icon="delete_sweep" @click="clearHistory">
+          <q-btn flat dense size="sm" icon="clear_all" @click="clearHistory">
             <q-tooltip>清空对话</q-tooltip>
           </q-btn>
           <q-btn
@@ -44,11 +44,8 @@
             @click="sendCode = !sendCode"
           >
             <q-tooltip>
-              {{
-                sendCode
-                  ? "将当前代码提交给AI(已开启)"
-                  : "将当前代码提交给AI(已关闭)"
-              }}
+              将当前代码提交给AI<br />
+              状态：{{ sendCode ? "已开启" : "已关闭" }}
             </q-tooltip>
           </q-btn>
           <q-btn
@@ -60,9 +57,27 @@
             @click="toggleAutoUpdate"
           >
             <q-tooltip>
-              {{
-                autoUpdateCode ? "自动更新代码(已开启)" : "自动更新代码(已关闭)"
-              }}
+              自动更新代码<br />
+              状态：{{ autoUpdateCode ? "已开启" : "已关闭" }}
+            </q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="language === 'quickcommand'"
+            flat
+            dense
+            size="sm"
+            icon="receipt_long"
+            :color="submitDocs ? 'primary' : 'grey'"
+            @click="submitDocs = !submitDocs"
+          >
+            <q-tooltip>
+              让AI学习uTools和QuickCommand的文档<br />
+              状态：{{ submitDocs ? "已开启" : "已关闭" }}<br />
+              <span style="font-weight: bolder">注意：</span><br />
+              1. 开启后，AI会生成功能更贴切的代码<br />
+              2. 但会大幅提升上下文长度，增加代码生成时间<br />
+              3. 能力较低的模型，可能无法正确处理<br />
+              4. 计费的接口，会消耗 更多token<br />
             </q-tooltip>
           </q-btn>
         </div>
@@ -70,10 +85,14 @@
           flat
           dense
           size="sm"
+          :label="streamingResponse ? '停止' : '发送'"
+          :disable="!streamingResponse && !prompt"
           :color="streamingResponse ? 'negative' : 'primary'"
           :icon="streamingResponse ? 'stop' : 'send'"
           @click="handleSubmit"
-        />
+        >
+          <q-tooltip> Enter 发送，Shift+Enter 换行 </q-tooltip>
+        </q-btn>
       </div>
     </div>
   </q-card>
@@ -107,6 +126,7 @@ export default defineComponent({
       currentRequest: null,
       autoUpdateCode: localStorage.getItem("ai_auto_update") !== "false",
       sendCode: false,
+      submitDocs: true,
     };
   },
   props: {
@@ -122,23 +142,22 @@ export default defineComponent({
   emits: ["update-code", "close"],
   methods: {
     async handleSubmit() {
-      const sendCode = this.sendCode;
-      this.sendCode = false;
-
       if (this.streamingResponse) {
         this.stopStreaming();
         return;
       }
 
+      this.prompt = this.prompt.trim();
+
+      if (!this.prompt || !this.selectedApi) return;
+
       const code = this.code
         ? `这是当前代码：\n-----代码开始-----\n${this.code}\n-----代码结束-----\n`
         : "";
 
-      const promptText = sendCode
-        ? code + this.prompt.trim()
-        : this.prompt.trim();
+      const promptText = this.sendCode ? code + this.prompt : this.prompt;
 
-      if (!promptText || !this.selectedApi) return;
+      this.sendCode = false;
 
       this.chatHistory.push(
         {
@@ -154,12 +173,13 @@ export default defineComponent({
       this.streamingResponse = true;
       this.prompt = "";
 
+      const presetContext = this.getPresetContext();
+
       try {
         const response = await window.quickcommand.askAI(
           {
             prompt: promptText,
-            role: this.getRolePrompt(this.language),
-            context: this.chatHistory.slice(0, -2),
+            context: [...presetContext, ...this.chatHistory.slice(0, -2)],
           },
           this.selectedApi,
           {
@@ -227,19 +247,18 @@ export default defineComponent({
       this.autoUpdateCode = !this.autoUpdateCode;
       localStorage.setItem("ai_auto_update", this.autoUpdateCode);
     },
-    getRolePrompt(language) {
+    getLanguagePrompt(language) {
       const languageMap = {
         quickcommand: "NodeJS",
         javascript: "NodeJS",
         cmd: "bat",
       };
-      const commonInstructions = `请作为一名专业的开发专家，根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
+      const commonInstructions = `请根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
    - 编写简洁、可读性强的代码
    - 遵循${language}最佳实践和设计模式
    - 使用恰当的命名规范和代码组织
    - 添加必要的错误处理和边界检查
    - 保持中文注释的准确性和专业性
-   - 提供必要的使用说明
    `;
 
       // 针对不同语言的特殊提示
@@ -248,19 +267,75 @@ export default defineComponent({
    - 使用NodeJS原生API和模块`,
         python: `- 遵循PEP8规范`,
       };
-      languageSpecific.quickcommand = `${languageSpecific.javascript}
-    - 支持使用以下uTools接口： ${uToolsApi}
-    - 支持使用以下quickcommand接口： ${quickcommandApi}`;
+
+      languageSpecific.quickcommand = languageSpecific.javascript;
 
       // 获取语言特定的提示，如果没有则使用空字符串
       const specificInstructions =
         languageSpecific[language.toLowerCase()] || "";
 
       const lastInstructions =
-        "\n请直接生成代码，任何情况下都不需要做解释和说明";
+        "\n请直接给我代码，任何情况下都不需要做解释和说明";
 
       return commonInstructions + specificInstructions + lastInstructions;
     },
+    getLanguageDocs(language) {
+      if (language !== "quickcommand") return [];
+      return [
+        {
+          name: "uTools",
+          api: uToolsApi,
+        },
+        {
+          name: "quickcommand",
+          api: quickcommandApi,
+        },
+      ];
+    },
+    getPresetContext() {
+      const languagePrompt = this.getLanguagePrompt(this.language);
+
+      let presetContext = [
+        {
+          role: "user",
+          content: languagePrompt,
+        },
+        {
+          role: "assistant",
+          content: "好的，我会严格按照你的要求编写代码。",
+        },
+      ];
+
+      if (this.submitDocs) {
+        const docs = this.getLanguageDocs(this.language);
+
+        presetContext.push(
+          {
+            role: "user",
+            content: `你现在使用的是一种特殊的环境，支持uTools和quickcommand两种特殊的接口，请优先使用uTools和quickcommand接口解决需求`,
+          },
+          {
+            role: "assistant",
+            content: "好的，我会注意。",
+          }
+        );
+
+        docs.forEach((doc) => {
+          presetContext.push(
+            {
+              role: "user",
+              content: `这是${doc.name}的API文档：\n${doc.api}`,
+            },
+            {
+              role: "assistant",
+              content: "好的，我会认真学习并记住这些接口。",
+            }
+          );
+        });
+      }
+
+      return presetContext;
+    },
   },
   mounted() {
     setTimeout(this.loadChatHistory);
@@ -279,10 +354,27 @@ export default defineComponent({
   padding: 5px;
 }
 
-.input-container {
+.body--dark .ai-assistant {
+  background-color: #1e1e1e;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
+}
+
+.ai-assistant .header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 4px 8px;
+  border-bottom: 1px solid #e0e0e0;
+}
+
+.body--dark .ai-assistant .header {
+  border-bottom: 1px solid #333;
+}
+
+.ai-assistant .input-container {
   flex-shrink: 0;
   background: var(--utools-bg-color);
-  border-radius: 8px;
+  border-radius: 4px;
 }
 
 .prompt-input {
diff --git a/src/components/ai/AIChatHistory.vue b/src/components/ai/AIChatHistory.vue
index d7d7fbc4..269d36f4 100644
--- a/src/components/ai/AIChatHistory.vue
+++ b/src/components/ai/AIChatHistory.vue
@@ -93,7 +93,7 @@ export default defineComponent({
     },
 
     setupMessageActions() {
-      const codeBlocks = document.querySelectorAll(".message-content pre");
+      const codeBlocks = document.querySelectorAll(".message-content pre code");
       codeBlocks.forEach((codeBlock) => {
         if (codeBlock.querySelector(".code-actions")) return;
 
@@ -125,7 +125,7 @@ export default defineComponent({
         actionGroup.appendChild(copyBtn);
         actionGroup.appendChild(insertBtn);
         actionGroup.appendChild(applyBtn);
-        codeBlock.appendChild(actionGroup);
+        codeBlock.parentNode.appendChild(actionGroup);
       });
 
       const links = document.querySelectorAll(".message-content a");
@@ -219,7 +219,7 @@ export default defineComponent({
 }
 
 .message-content :deep(pre::-webkit-scrollbar) {
-  height: 3px;  /* 与 markdown.css 保持一致 */
+  height: 3px; /* 与 markdown.css 保持一致 */
 }
 
 .message-content :deep(code) {
@@ -277,4 +277,14 @@ export default defineComponent({
 .message-content :deep(a:hover) {
   text-decoration: underline;
 }
+
+.message-content :deep(think) {
+  display: block;
+  color: #8b8b8b;
+  display: block;
+  border-left: 4px solid #8b8b8b;
+  padding-left: 10px;
+  font-size: 12px;
+  margin-bottom: 5px;
+}
 </style>
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 684ff6ef..2f66d6f7 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -934,7 +934,7 @@ interface quickcommandApi {
    *   },
    *   {
    *     apiType: "openai",
-   *     apiUrl: "https://api.openai.com/v1/chat/completions",
+   *     apiUrl: "https://api.openai.com/",
    *     apiToken: "your-api-token",
    *     model: "gpt-3.5-turbo"
    *   }
@@ -948,7 +948,7 @@ interface quickcommandApi {
    *   },
    *   {
    *     apiType: "ollama",
-   *     apiUrl: "http://localhost:11434/api/generate",
+   *     apiUrl: "http://localhost:11434/",
    *     model: "qwen2.5:32b"
    *   }
    * );

From 35b372a9bba3da7b1a5789f4f4bb43e65c6ddeb8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 00:01:55 +0800
Subject: [PATCH 218/332] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=AA=E6=80=A7?=
 =?UTF-8?q?=E5=8C=96=E8=AE=BE=E7=BD=AE=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/UserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/popup/UserInfo.vue b/src/components/popup/UserInfo.vue
index 3754e276..926c3013 100644
--- a/src/components/popup/UserInfo.vue
+++ b/src/components/popup/UserInfo.vue
@@ -196,7 +196,7 @@ export default {
       });
     },
     showHelp() {
-      window.showUb.help("#yiSRi");
+      window.showUb.help("#W8cuz");
     },
   },
 };

From f1d8ba08eff93dbfda6d6f61c6172ee1496ffdc8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 00:04:48 +0800
Subject: [PATCH 219/332] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6f9d2274..7bdf2f0d 100644
--- a/README.md
+++ b/README.md
@@ -189,8 +189,8 @@ Shell脚本执行、Python脚本执行、Node.js脚本执行、PowerShell脚本
 >配置界面
 ![xb2g30.png](https://files.catbox.moe/xb2g30.png)
 
->脚本编辑界面
-![d2bcmu.png](https://files.catbox.moe/d2bcmu.png)
+>AI代码生成
+![ax8yzo.png](https://files.catbox.moe/ax8yzo.png)
 
 >可视化编排界面
 ![5mbyoa.png](https://files.catbox.moe/5mbyoa.png)

From 79a004e6a4204577afd79b255bf8ab839d7c80ba Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 00:09:06 +0800
Subject: [PATCH 220/332] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7bdf2f0d..2508fa92 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,7 @@ Shell脚本执行、Python脚本执行、Node.js脚本执行、PowerShell脚本
 ![5mbyoa.png](https://files.catbox.moe/5mbyoa.png)
 
 >浏览器自动化
-![cgibo6.png](https://files.catbox.moe/cgibo6.png)
+![nq4q0c.png](https://files.catbox.moe/nq4q0c.png)
 
 >后台服务
 ![iiv1jv.png](https://files.catbox.moe/iiv1jv.png)

From 7b40094bbb22953b7cc2b4111cafc9289b0e6dee Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 00:29:22 +0800
Subject: [PATCH 221/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 701f1150..6284411a 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -121,6 +121,7 @@ export default defineComponent({
     return {
       resizeTimeout: null,
       showAIAssistant: false,
+      wordWrap: "off",
     };
   },
   watch: {
@@ -179,6 +180,7 @@ export default defineComponent({
         value: this.modelValue || "",
         language,
         theme: this.theme,
+        wordWrap: this.wordWrap,
       };
 
       editor = monaco.editor.create(this.$refs.editorContainer, options);
@@ -354,9 +356,11 @@ export default defineComponent({
     },
     bindKeys() {
       // alt + z 换行
-      const revWordWrap = this.wordWrap === "on" ? "off" : "on";
       editor.addCommand(monaco.KeyMod.Alt | monaco.KeyCode.KeyZ, () => {
-        editor.updateOptions({ wordWrap: revWordWrap });
+        this.wordWrap = this.wordWrap === "on" ? "off" : "on";
+        editor.updateOptions({
+          wordWrap: this.wordWrap,
+        });
       });
     },
     // 替换选中的文本，供外部调用

From e6afc60f4936bc2cea9382022e817771b5157698 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 00:55:22 +0800
Subject: [PATCH 222/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/TagBar.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/config/TagBar.vue b/src/components/config/TagBar.vue
index 02cb6909..87629b4b 100644
--- a/src/components/config/TagBar.vue
+++ b/src/components/config/TagBar.vue
@@ -78,16 +78,20 @@ export default {
   data() {
     return {
       commandManager: useCommandManager(),
-      savedTagOrder: null, // 缓存标签顺序
+      savedTagOrder: [], // 缓存标签顺序
     };
   },
-  created() {
-    // 初始化时读取一次数据库
-    this.savedTagOrder = dbManager.getDB(TAG_ORDER_KEY);
-    if (!this.savedTagOrder.length) {
-      this.savedTagOrder = this.allQuickCommandTags;
-    }
-    this.currentTag = this.savedTagOrder[0];
+  mounted() {
+    this.$nextTick(() => {
+      // 初始化时读取一次数据库
+      const savedTagOrder = dbManager.getDB(TAG_ORDER_KEY);
+      if (savedTagOrder.length) {
+        this.savedTagOrder = savedTagOrder;
+        this.commandManager.changeCurrentTag(this.savedTagOrder[0]);
+      } else {
+        this.commandManager.changeCurrentTag(this.allQuickCommandTags[0]);
+      }
+    });
   },
   computed: {
     currentTag: {

From a6c4016831f80fe42309e0d8a14d0e54855644e9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 08:51:42 +0800
Subject: [PATCH 223/332] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/script/ScriptEditor.vue          | 26 ++++++++++++++++---
 src/js/composer/commands/scriptCommands.js    | 13 +++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index 392ee429..36cf9c41 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -11,11 +11,11 @@
       <q-select
         :model-value="argvs.language"
         @update:modelValue="updateArgvs('language', $event)"
-        :options="Object.keys(programs).slice(2, -1)"
+        :options="programOptions"
         label="编程语言"
         filled
         dense
-        class="col-6"
+        class="col"
       >
         <template v-slot:append>
           <q-avatar size="sm" square>
@@ -39,6 +39,7 @@
         class="col-3"
         filled
         dense
+        v-if="!isCodeSnippet"
         :model-value="argvs.scriptCode"
         @update:modelValue="updateArgvs('scriptCode', $event)"
         label="脚本文件编码"
@@ -50,6 +51,7 @@
         class="col-3"
         filled
         dense
+        v-if="!isCodeSnippet"
         :model-value="argvs.outputCode"
         @update:modelValue="updateArgvs('outputCode', $event)"
         label="命令行输出编码"
@@ -59,7 +61,7 @@
       />
     </div>
 
-    <div class="row q-col-gutter-sm">
+    <div class="row q-col-gutter-sm" v-if="!isCodeSnippet">
       <div class="col-6">
         <ArrayEditor
           topLabel="脚本参数"
@@ -176,10 +178,23 @@ export default defineComponent({
         this.defaultArgvs
       );
     },
+    isCodeSnippet() {
+      return this.modelValue.value === "createCodeSnippet";
+    },
+    programOptions() {
+      const startIndex = this.isCodeSnippet ? 1 : 2;
+      return Object.keys(programs).slice(startIndex, -1);
+    },
   },
   methods: {
     parseCodeToArgvs(code) {
       if (!code) return this.defaultArgvs;
+      if (this.isCodeSnippet) {
+        const result = parseFunction(code);
+        return {
+          code: quickcomposer.coding.base64Decode(result.argvs?.[0]),
+        };
+      }
       try {
         const variableFormatPaths = ["arg1.args[*]"];
         const result = parseFunction(code, { variableFormatPaths });
@@ -196,6 +211,11 @@ export default defineComponent({
       }
     },
     generateCode(argvs = this.argvs) {
+      if (this.isCodeSnippet) {
+        return `quickcomposer.coding.base64Decode("${quickcomposer.coding.base64Encode(
+          argvs.code
+        )}")`;
+      }
       const options = {
         language: argvs.language,
       };
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index 80cb2e31..f7aeb3be 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -23,7 +23,7 @@ export const scriptCommands = {
       value: "quickcommand.runCode",
       label: "运行脚本",
       component: "ScriptEditor",
-      desc: "运行各种编程语言的代码",
+      description: "运行各种编程语言的代码，需要预安装对应的执行环境",
       asyncMode: "await",
       outputs: {
         label: "运行结果",
@@ -31,6 +31,17 @@ export const scriptCommands = {
         typeName: "字符串",
       },
     },
+    {
+      value: "createCodeSnippet",
+      label: "新建代码片段",
+      component: "ScriptEditor",
+      description: "单纯将代码片段赋值到变量中，不会执行",
+      outputs: {
+        label: "代码片段",
+        suggestName: "codeSnippet",
+        typeName: "字符串",
+      },
+    },
     {
       value: "return",
       label: "函数返回",

From f606c34ecaa4343cf6d150333b1807deefa4f3d3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 08:59:31 +0800
Subject: [PATCH 224/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=89=AF=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/ControlButtons.vue | 14 ++++++++++++++
 src/js/commandManager.js               |  8 ++++++++
 src/pages/ConfigurationPage.vue        |  7 +++++++
 3 files changed, 29 insertions(+)

diff --git a/src/components/card/ControlButtons.vue b/src/components/card/ControlButtons.vue
index 00332278..3c3bfc3d 100644
--- a/src/components/card/ControlButtons.vue
+++ b/src/components/card/ControlButtons.vue
@@ -59,6 +59,13 @@
               <q-item-section>复制到剪贴板</q-item-section>
             </q-item>
 
+            <q-item clickable v-close-popup @click="createCommandCopy">
+              <q-item-section side>
+                <q-icon name="file_copy" />
+              </q-item-section>
+              <q-item-section>创建命令副本</q-item-section>
+            </q-item>
+
             <q-item clickable @click="shareCommand" v-close-popup>
               <q-item-section side>
                 <q-icon name="share" />
@@ -189,6 +196,13 @@ export default {
           `「${this.commandInfo.features.explain}」已复制到剪贴板`
         );
     },
+    // 创建命令副本
+    createCommandCopy() {
+      this.$emit("commandChanged", {
+        type: "createCopy",
+        data: this.featureCode,
+      });
+    },
     // 导出到文件
     exportCommandFile() {
       window.saveFile(JSON.stringify(this.getRawCommand()), {
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 306cf225..003d4e75 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -210,6 +210,13 @@ export function useCommandManager() {
     return parsedData.qc;
   };
 
+  // 创建命令副本
+  const createCommandCopy = (code) => {
+    const command = window.lodashM.cloneDeep(state.allQuickCommands[code]);
+    command.features.code = getFeatureCode(command.features.cmds);
+    saveCommand(command);
+  };
+
   // 是否为默认命令
   const isDefaultCommand = (code) => {
     return code.slice(0, 8) === "default_";
@@ -349,6 +356,7 @@ export function useCommandManager() {
     enableCommand,
     disableCommand,
     importCommand,
+    createCommandCopy,
     isDefaultCommand,
     exportAllCommands,
     getActivatedFeatures,
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 438ec0f4..b89e48a2 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -132,6 +132,9 @@ export default {
         case "run":
           this.runCommand(event.data);
           return;
+        case "createCopy":
+          this.createCommandCopy(event.data);
+          return;
         default:
           return;
       }
@@ -157,6 +160,10 @@ export default {
         this.changeCurrentTag("默认");
       }
     },
+    // 创建命令副本
+    createCommandCopy(code) {
+      this.commandManager.createCommandCopy(code);
+    },
     // 编辑命令
     editCommand(commandOrCode) {
       // 即可传入 code，也可直接传入 command

From 00904421015bc4f934b344b96227e27773f927b4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 09:44:10 +0800
Subject: [PATCH 225/332] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=88=87=E6=8D=A2=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/CommandPanels.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/config/CommandPanels.vue b/src/components/config/CommandPanels.vue
index cc7e4c16..125ecdf2 100644
--- a/src/components/config/CommandPanels.vue
+++ b/src/components/config/CommandPanels.vue
@@ -7,8 +7,7 @@
       left: tabBarWidth,
     }"
     v-model="currentTag"
-    transition-prev="jump-down"
-    transition-next="jump-up"
+    transition-duration="0"
   >
     <q-tab-panel
       style="padding: 0"
@@ -73,7 +72,7 @@ export default {
   components: {
     CommandCard,
     draggable,
-  },  
+  },
   data() {
     return {
       commandManager: useCommandManager(),

From 1e5a4c1ff50f506ed896fce098569715fe7e713a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 11:31:45 +0800
Subject: [PATCH 226/332] =?UTF-8?q?quickcommand.askAI=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B5=81=E5=BC=8F=E5=93=8D=E5=BA=94=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4api=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js                              |  83 +++++++-----
 plugin/lib/dialog/service.js                  | 110 ++--------------
 plugin/lib/quickcommand.js                    |   5 +
 plugin/lib/quickcomposer/windows/monitor.js   |   4 +-
 src/components/ai/AIAssistantSideBar.vue      |  16 +--
 src/js/composer/commands/uiCommands.js        |  69 +---------
 .../monaco/types/quickcommand.api.d.ts        | 119 ++++++++----------
 7 files changed, 142 insertions(+), 264 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 6eb3cd78..8b59b46a 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -72,7 +72,7 @@ function buildRequestConfig(apiConfig) {
 }
 
 // 构建请求数据
-function buildRequestData(content, apiConfig, stream = false) {
+function buildRequestData(content, apiConfig) {
   const { model } = apiConfig;
   const { prompt, role, context = [] } = content;
   const rolePrompt = ROLE_PROMPTS[role] || role;
@@ -105,7 +105,7 @@ function buildRequestData(content, apiConfig, stream = false) {
   return {
     model,
     messages,
-    stream,
+    stream: true,
   };
 }
 
@@ -222,7 +222,7 @@ async function handleStreamResponse(response, apiConfig, controller, onStream) {
     reader.releaseLock();
   }
 
-  return { success: true, result: "流式请求完成" };
+  return { success: true };
 }
 
 /**
@@ -234,28 +234,24 @@ async function handleStreamResponse(response, apiConfig, controller, onStream) {
  */
 async function chat(content, apiConfig, options = {}) {
   try {
-    const { showLoadingBar = true, stream = false, onStream } = options;
+    const { showProcessBar = true, onStream = () => {} } = options;
 
     // 验证必要参数
     if (!apiConfig.apiUrl || !content.prompt || !apiConfig.model) {
       throw new Error("API地址、模型名称和提示词不能为空");
     }
 
-    if (stream && !onStream) {
-      throw new Error("使用流式请求时必须提供onStream回调函数");
-    }
-
     // 构建请求URL和配置
     const url = buildApiUrl(
       apiConfig.apiUrl,
       API_ENDPOINTS[apiConfig.apiType].chat
     );
-    const config = buildRequestConfig(apiConfig, stream);
-    const requestData = buildRequestData(content, apiConfig, stream);
+    const config = buildRequestConfig(apiConfig);
+    const requestData = buildRequestData(content, apiConfig);
 
-    // 显示加载条
-    const loadingBar = showLoadingBar
-      ? await quickcommand.showLoadingBar({
+    // 显示进度条
+    const processBar = showProcessBar
+      ? await quickcommand.showProcessBar({
           text: "AI思考中...",
           onClose: () => {
             if (controller) {
@@ -265,6 +261,26 @@ async function chat(content, apiConfig, options = {}) {
         })
       : null;
 
+    // 用于收集完整响应
+    let fullResponse = "";
+
+    // 包装 onStream 回调以收集完整响应并更新进度条
+    const streamHandler = (chunk, controller, isDone) => {
+      if (!isDone) {
+        fullResponse += chunk;
+        // 更新进度条显示最新的响应内容
+        if (processBar) {
+          quickcommand.updateProcessBar(
+            {
+              text: fullResponse, // 只显示最后100个字符，避免内容过长
+            },
+            processBar
+          );
+        }
+      }
+      onStream(chunk, controller, isDone);
+    };
+
     // 统一使用 fetch 处理请求
     const controller = new AbortController();
     const response = await fetch(url, {
@@ -278,24 +294,35 @@ async function chat(content, apiConfig, options = {}) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
 
-    let result;
-    if (stream) {
-      result = await handleStreamResponse(
-        response,
-        apiConfig,
-        controller,
-        onStream
+    const result = await handleStreamResponse(
+      response,
+      apiConfig,
+      controller,
+      streamHandler
+    );
+
+    // 如果请求被取消，返回取消状态
+    if (!result.success) {
+      processBar?.close();
+      return result;
+    }
+
+    // 完成时更新进度条并关闭
+    if (processBar) {
+      quickcommand.updateProcessBar(
+        {
+          text: "AI响应完成",
+          complete: true,
+        },
+        processBar
       );
-    } else {
-      const responseData = await response.json();
-      result = {
-        success: true,
-        result: parseResponse({ data: responseData }, apiConfig.apiType),
-      };
     }
 
-    loadingBar?.close();
-    return result;
+    // 返回完整的响应内容
+    return {
+      success: true,
+      result: fullResponse,
+    };
   } catch (error) {
     if (error.name === "AbortError") {
       return {
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 836aaf17..ed25cade 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -305,7 +305,7 @@ let lastProcessBar = null;
  * @param {object} options - 配置选项
  * @param {string} [options.title="进度"] - 对话框标题
  * @param {string} [options.text="处理中..."] - 进度条上方的文本
- * @param {number} [options.value=0] - 初始进度值(0-100)
+ * @param {number} [options.value] - 初始进度值(0-100)，不传则显示加载动画
  * @param {string} [options.position="bottom-right"] - 进度条位置，可选值：top-left, top-right, bottom-left, bottom-right
  * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
  * @param {Function} [options.onPause] - 暂停按钮点击时的回调函数
@@ -316,7 +316,7 @@ let lastProcessBar = null;
 const showProcessBar = async (options = {}) => {
   const {
     text = "处理中...",
-    value = 0,
+    value,
     position = "bottom-right",
     onClose,
     onPause,
@@ -328,7 +328,7 @@ const showProcessBar = async (options = {}) => {
     throw new Error("onPause 和 onResume 必须同时配置");
   }
 
-  const windowWidth = 350;
+  const windowWidth = 250;
   const windowHeight = 60;
 
   // 计算窗口位置
@@ -357,10 +357,11 @@ const showProcessBar = async (options = {}) => {
         ipcRenderer.sendTo(windowId, "dialog-config", {
           type: "process",
           text,
-          value,
+          value: value === undefined ? 0 : value,
           isDark: utools.isDarkColors(),
           platform: process.platform,
           showPause: Boolean(onPause && onResume),
+          isLoading: value === undefined, // 当不传value时显示加载动画
         });
 
         // 监听窗口准备就绪
@@ -410,7 +411,7 @@ const showProcessBar = async (options = {}) => {
 /**
  * 更新进度条的进度
  * @param {object} options - 配置选项
- * @param {number} options.value - 新的进度值(0-100)
+ * @param {number} [options.value] - 新的进度值(0-100)，不传则显示加载动画
  * @param {string} [options.text] - 新的进度文本
  * @param {boolean} [options.complete] - 是否完成并关闭进度条
  * @param {{id: number, close: Function}|undefined} processBar - 进度条对象, 如果不传入则使用上一次创建的进度条
@@ -433,7 +434,11 @@ const updateProcessBar = (options = {}, processBar = null) => {
   }
 
   const { value, text, complete } = options;
-  ipcRenderer.sendTo(processBar.id, "update-process", { value, text });
+  ipcRenderer.sendTo(processBar.id, "update-process", {
+    value,
+    text,
+    isLoading: value === undefined,
+  });
 
   if (complete) {
     setTimeout(() => {
@@ -442,97 +447,6 @@ const updateProcessBar = (options = {}, processBar = null) => {
   }
 };
 
-let lastLoadingBar = null;
-
-/**
- * 显示一个加载条对话框
- * @param {object} options - 配置选项
- * @param {string} [options.text="加载中..."] - 加载条上方的文本
- * @param {string} [options.position="bottom-right"] - 加载条位置，可选值：top-left, top-right, bottom-left, bottom-right
- * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
- * @returns {Promise<{id: number, close: Function}>} 返回加载条窗口ID和关闭函数
- */
-const showLoadingBar = async (options = {}) => {
-  const { text = "加载中...", position = "bottom-right", onClose } = options;
-
-  const windowWidth = 250;
-  const windowHeight = 60;
-
-  // 计算窗口位置
-  const { x, y } = calculateWindowPosition({
-    position,
-    width: windowWidth,
-    height: windowHeight,
-  });
-
-  return new Promise((resolve) => {
-    const UBrowser = createBrowserWindow(
-      dialogPath,
-      {
-        width: windowWidth,
-        height: windowHeight,
-        x,
-        y,
-        opacity: 0,
-        focusable: false,
-        ...commonBrowserWindowOptions,
-      },
-      () => {
-        const windowId = UBrowser.webContents.id;
-
-        // 发送配置到子窗口
-        ipcRenderer.sendTo(windowId, "dialog-config", {
-          type: "process",
-          text,
-          value: 0,
-          isDark: utools.isDarkColors(),
-          platform: process.platform,
-          isLoading: true, // 标记为加载条模式
-        });
-
-        // 监听窗口准备就绪
-        ipcRenderer.once("dialog-ready", () => {
-          UBrowser.setOpacity(1);
-        });
-
-        // 监听对话框结果
-        ipcRenderer.once("dialog-result", (event, result) => {
-          if (result === "close" && typeof onClose === "function") {
-            onClose();
-          }
-          UBrowser.destroy();
-        });
-
-        const loadingBar = {
-          id: windowId,
-          close: () => {
-            if (typeof onClose === "function") {
-              onClose();
-            }
-            lastLoadingBar = null;
-            UBrowser.destroy();
-          },
-        };
-
-        lastLoadingBar = loadingBar;
-
-        // 返回窗口ID和关闭函数
-        resolve(loadingBar);
-      }
-    );
-  });
-};
-
-const closeLoadingBar = (loadingBar) => {
-  if (!loadingBar) {
-    if (!lastLoadingBar) {
-      throw new Error("没有找到已创建的加载条");
-    }
-    loadingBar = lastLoadingBar;
-  }
-  loadingBar.close();
-};
-
 module.exports = {
   showSystemMessageBox,
   showSystemInputBox,
@@ -543,6 +457,4 @@ module.exports = {
   showSystemWaitButton,
   showProcessBar,
   updateProcessBar,
-  showLoadingBar,
-  closeLoadingBar,
 };
diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index b8a371dd..9ad93239 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -8,6 +8,8 @@ const axios = require("axios");
 const marked = require("marked");
 const { chat, getModels } = require("./ai");
 
+const { dbStorage } = utools;
+
 window.getModelsFromAiApi = getModels;
 
 const systemDialog = require("./dialog/service");
@@ -197,6 +199,9 @@ const quickcommand = {
   },
 
   askAI: async function (content, apiConfig, options) {
+    if (window.lodashM.isEmpty(apiConfig)) {
+      apiConfig = dbStorage.getItem("cfg_aiConfigs")?.[0] || {};
+    }
     return await chat(content, apiConfig, options);
   },
 
diff --git a/plugin/lib/quickcomposer/windows/monitor.js b/plugin/lib/quickcomposer/windows/monitor.js
index f896a6c0..f7b50c9d 100644
--- a/plugin/lib/quickcomposer/windows/monitor.js
+++ b/plugin/lib/quickcomposer/windows/monitor.js
@@ -8,7 +8,7 @@ const stopMonitor = () => {
 // 监控剪贴板变化
 const watchClipboard = async function () {
   const args = ["-type", "clipboard", "-once"];
-  const loadingBar = await quickcommand.showLoadingBar({
+  const loadingBar = await quickcommand.showProcessBar({
     text: "等待剪贴板变化...",
     onClose: () => {
       stopMonitor();
@@ -44,7 +44,7 @@ const watchFileSystem = async function (watchPath, options = {}) {
     args.push("-recursive", "false");
   }
 
-  const loadingBar = await quickcommand.showLoadingBar({
+  const loadingBar = await quickcommand.showProcessBar({
     text: "等待文件变化...",
     onClose: () => {
       stopMonitor();
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 77f2478f..7a1f0ed0 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -91,7 +91,9 @@
           :icon="streamingResponse ? 'stop' : 'send'"
           @click="handleSubmit"
         >
-          <q-tooltip> Enter 发送，Shift+Enter 换行 </q-tooltip>
+          <q-tooltip v-if="!streamingResponse">
+            Enter 发送，Shift+Enter 换行
+          </q-tooltip>
         </q-btn>
       </div>
     </div>
@@ -183,8 +185,7 @@ export default defineComponent({
           },
           this.selectedApi,
           {
-            showLoadingBar: false,
-            stream: true,
+            showProcessBar: false,
             onStream: (text, controller, done) => {
               this.currentRequest = controller;
               if (text) {
@@ -251,7 +252,8 @@ export default defineComponent({
       const languageMap = {
         quickcommand: "NodeJS",
         javascript: "NodeJS",
-        cmd: "bat",
+        cmd: "windows 批处理脚本",
+        shell: "liunx shell脚本",
       };
       const commonInstructions = `请根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
    - 编写简洁、可读性强的代码
@@ -275,7 +277,7 @@ export default defineComponent({
         languageSpecific[language.toLowerCase()] || "";
 
       const lastInstructions =
-        "\n请直接给我代码，任何情况下都不需要做解释和说明";
+        "\n请直接给我MARKDOWN格式的代码，任何情况下都不需要做解释和说明";
 
       return commonInstructions + specificInstructions + lastInstructions;
     },
@@ -306,13 +308,13 @@ export default defineComponent({
         },
       ];
 
-      if (this.submitDocs) {
+      if (this.submitDocs && this.language === "quickcommand") {
         const docs = this.getLanguageDocs(this.language);
 
         presetContext.push(
           {
             role: "user",
-            content: `你现在使用的是一种特殊的环境，支持uTools和quickcommand两种特殊的接口，请优先使用uTools和quickcommand接口解决需求`,
+            content: `你现在使用的是一种特殊的环境，支持uTools和quickcommand两种特殊的接口，请优先使用uTools和quickcommand接口解决需求，然后再使用当前语言通用的解决方案`,
           },
           {
             role: "assistant",
diff --git a/src/js/composer/commands/uiCommands.js b/src/js/composer/commands/uiCommands.js
index 29813510..413727a0 100644
--- a/src/js/composer/commands/uiCommands.js
+++ b/src/js/composer/commands/uiCommands.js
@@ -446,8 +446,9 @@ export const uiCommands = {
               width: 4,
             },
             value: {
-              label: "初始进度值",
+              label: "初始进度值(0-100)",
               component: "VariableInput",
+              placeholder: "留空则显示加载动画",
               disableToggleType: true,
               width: 4,
             },
@@ -486,7 +487,7 @@ export const uiCommands = {
           defaultValue: {
             title: newVarInputVal("str", "进度"),
             text: newVarInputVal("str", "处理中..."),
-            value: newVarInputVal("var", "0"),
+            value: newVarInputVal("var"),
             position: "bottom-right",
             onClose: newVarInputVal("var"),
             onPause: newVarInputVal("var"),
@@ -504,8 +505,9 @@ export const uiCommands = {
           component: "OptionEditor",
           options: {
             value: {
-              label: "进度值",
+              label: "进度值(0-100)",
               component: "VariableInput",
+              placeholder: "留空则显示加载动画",
               width: 4,
               disableToggleType: true,
             },
@@ -522,7 +524,7 @@ export const uiCommands = {
             },
           },
           defaultValue: {
-            value: newVarInputVal("var", "0"),
+            value: newVarInputVal("var", "100"),
             text: newVarInputVal("str"),
             complete: false,
           },
@@ -537,65 +539,6 @@ export const uiCommands = {
         },
       ],
     },
-    {
-      value: "quickcommand.showLoadingBar",
-      label: "显示载入界面",
-      neverHasOutput: true,
-      asyncMode: "await",
-      config: [
-        {
-          component: "OptionEditor",
-          options: {
-            text: {
-              label: "文本",
-              component: "VariableInput",
-              width: 4,
-            },
-            position: {
-              label: "位置",
-              component: "QSelect",
-              width: 4,
-              options: [
-                { label: "屏幕左上角", value: "top-left" },
-                { label: "屏幕右上角", value: "top-right" },
-                { label: "屏幕左下角", value: "bottom-left" },
-                { label: "屏幕右下角", value: "bottom-right" },
-              ],
-            },
-            onClose: {
-              label: "关闭按钮回调函数",
-              component: "VariableInput",
-              disableToggleType: true,
-              width: 4,
-            },
-          },
-          defaultValue: {
-            text: newVarInputVal("str", "加载中..."),
-            position: "bottom-right",
-            onClose: newVarInputVal("var"),
-          },
-        },
-      ],
-      outputs: {
-        label: "载入条对象",
-        suggestName: "loadingBar",
-      },
-    },
-    {
-      value: "quickcommand.closeLoadingBar",
-      label: "关闭载入界面",
-      neverHasOutput: true,
-      config: [
-        {
-          label: "载入条对象",
-          component: "VariableInput",
-          placeholder: "不传则关闭最近的载入条",
-          width: 12,
-          defaultValue: newVarInputVal("var"),
-          disableToggleType: true,
-        },
-      ],
-    },
     {
       value: "utools.showOpenDialog",
       label: "文件选择框",
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 2f66d6f7..76eeb171 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -750,7 +750,7 @@ interface quickcommandApi {
    * 显示一个带有暂停、恢复、关闭回调功能的进度条，支持动态更新进度
    * @param {object} options - 配置选项
    * @param {string} [options.text="处理中..."] - 进度条上方的文本
-   * @param {number} [options.value=0] - 初始进度值(0-100)
+   * @param {number} [options.value] - 初始进度值(0-100)，不传则显示加载动画
    * @param {string} [options.position="bottom-right"] - 进度条位置，可选值：top-left, top-right, bottom-left, bottom-right
    * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
    * @param {Function} [options.onPause] - 暂停按钮点击时的回调函数，必须和onResume一起配置
@@ -758,13 +758,19 @@ interface quickcommandApi {
    * @returns {Promise<{id: number, close: Function}>} 返回进度条对象
    *
    * ```js
-   * // 基本使用
+   * // 显示进度条
    * const processBar = await quickcommand.showProcessBar({
    *   text: "正在下载文件...",
    *   value: 0,
    *   position: "bottom-right"
    * });
    *
+   * // 显示加载动画
+   * const processBar = await quickcommand.showProcessBar({
+   *   text: "正在加载...",
+   *   position: "bottom-right"
+   * });
+   *
    * // 带暂停/恢复，关闭回调功能
    * let isPaused = false;
    * const processBar = await quickcommand.showProcessBar({
@@ -824,18 +830,23 @@ interface quickcommandApi {
   /**
    * 更新进度条的进度
    * @param {object} options - 配置选项
-   * @param {number} options.value - 新的进度值(0-100)
+   * @param {number} [options.value] - 新的进度值(0-100)，不传则显示加载动画
    * @param {string} [options.text] - 新的进度文本
    * @param {boolean} [options.complete] - 是否完成并关闭进度条
    * @param {{id: number, close: Function}|undefined} processBar - 进度条对象，如果不传入则使用上一次创建的进度条
    *
    * ```js
-   * // 使用最近创建的进度条
+   * // 更新进度
    * quickcommand.updateProcessBar({
    *   value: 50,
    *   text: "已完成50%"
    * });
    *
+   * // 切换为加载动画
+   * quickcommand.updateProcessBar({
+   *   text: "正在加载..."
+   * });
+   *
    * // 使用指定的进度条
    * quickcommand.updateProcessBar({
    *   value: 50,
@@ -852,7 +863,7 @@ interface quickcommandApi {
    */
   updateProcessBar(
     options: {
-      value: number;
+      value?: number;
       text?: string;
       complete?: boolean;
     },
@@ -862,71 +873,29 @@ interface quickcommandApi {
     }
   ): void;
 
-  /**
-   * 显示一个循环动画的加载条
-   * @param {object} options - 配置选项
-   * @param {string} [options.text="加载中..."] - 加载条上方的文本
-   * @param {string} [options.position="bottom-right"] - 加载条位置，可选值：top-left, top-right, bottom-left, bottom-right
-   * @param {Function} [options.onClose] - 关闭按钮点击时的回调函数
-   * @returns {Promise<{id: number, close: Function}>} 返回加载条对象
-   *
-   * ```js
-   * // 基本使用
-   * const loadingBar = await quickcommand.showLoadingBar({
-   *   text: "正在加载...",
-   *   position: "bottom-right"
-   * });
-   *
-   * // 带关闭回调
-   * const loadingBar = await quickcommand.showLoadingBar({
-   *   text: "正在加载...",
-   *   onClose: () => {
-   *     console.log("用户关闭了加载条");
-   *   }
-   * });
-   *
-   * // 手动关闭
-   * loadingBar.close();
-   * // 或者
-   * quickcommand.closeLoadingBar();
-   * ```
-   */
-  showLoadingBar(options?: {
-    text?: string;
-    position?: "top-left" | "top-right" | "bottom-left" | "bottom-right";
-    onClose?: () => void;
-  }): Promise<{
-    id: number;
-    close: () => void;
-  }>;
-
-  /**
-   * 关闭加载条
-   * @param {{id: number, close: Function}|undefined} loadingBar - 加载条对象，如果不传入则关闭上一次创建的加载条
-   *
-   * ```js
-   * // 关闭最近创建的加载条
-   * quickcommand.closeLoadingBar();
-   *
-   * // 关闭指定的加载条
-   * quickcommand.closeLoadingBar(loadingBar);
-   * ```
-   */
-  closeLoadingBar(loadingBar?: { id: number; close: () => void }): void;
-
   /**
    * 与 AI 进行问答
    * @param content 对话内容
    * @param content.prompt 提示词
    * @param content.role 预设角色
-   * @param apiConfig API配置
+   * @param apiConfig API配置，不传或传入null则使用用户配置的第一个API配置
    * @param apiConfig.apiType 模型类型：openai/ollama
    * @param apiConfig.apiUrl API地址
    * @param apiConfig.apiToken API令牌（仅 OpenAI 需要）
    * @param apiConfig.model 模型名称
    * @param options 其他选项
-   * @param options.showLoadingBar 是否显示加载条
-   * @example
+   * @param options.showProcessBar 是否显示进度条
+   * @param options.onStream 流式请求回调
+   *
+   *
+   * ```js
+   * // 不传apiConfig时，需在配置页面-右下角菜单-AI配置中进行配置
+   * const response = await quickcommand.askAI(
+   *   {
+   *     prompt: "你好",
+   *   }
+   * );
+   *
    * // OpenAI 示例
    * const response = await quickcommand.askAI(
    *   {
@@ -939,9 +908,10 @@ interface quickcommandApi {
    *     model: "gpt-3.5-turbo"
    *   }
    * );
+   * console.log(response);
    *
-   * // Ollama 示例
-   * const response = await quickcommand.askAI(
+   * // Ollama 示例 (流式回调)
+   * await quickcommand.askAI(
    *   {
    *     prompt: "查找进程名为chrome的进程并关闭",
    *     role: "shell"
@@ -950,8 +920,20 @@ interface quickcommandApi {
    *     apiType: "ollama",
    *     apiUrl: "http://localhost:11434/",
    *     model: "qwen2.5:32b"
+   *   },
+   *   {
+   *     onStream: (chunk, controller, isDone) => {
+   *       console.log(chunk);
+   *       if (某个特定条件，中断请求) {
+   *         controller.abort();
+   *       }
+   *       if (isDone) {
+   *         console.log("流式请求完成");
+   *       }
+   *     }
    *   }
    * );
+   * ```
    */
   askAI(
     content: {
@@ -960,7 +942,8 @@ interface quickcommandApi {
       /** 预设角色 */
       role?: "translate" | "shell" | "summarize";
     },
-    apiConfig: {
+    /** API配置，不传或传入null则使用用户配置的第一个API配置 */
+    apiConfig?: {
       /** 模型类型：openai/ollama */
       apiType: "openai" | "ollama";
       /** API地址 */
@@ -971,8 +954,14 @@ interface quickcommandApi {
       model: string;
     },
     options?: {
-      /** 是否显示加载条, 默认 true */
-      showLoadingBar?: boolean;
+      /** 是否显示进度条, 默认 true */
+      showProcessBar?: boolean;
+      /** 流式请求回调 */
+      onStream?: (
+        chunk: string,
+        controller: AbortController,
+        isDone: boolean
+      ) => void;
     }
   ): Promise<{
     /** 是否成功 */

From 7635f1ac648c39921856d51fcd257410e3e5de75 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 16:05:24 +0800
Subject: [PATCH 227/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js                |  2 +-
 plugin/lib/dialog/controller.js |  9 +++++++--
 plugin/lib/dialog/service.js    | 24 +++++++++++++++++++----
 plugin/lib/dialog/style.css     | 34 +++++++++++----------------------
 4 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 8b59b46a..ff1a5682 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -272,7 +272,7 @@ async function chat(content, apiConfig, options = {}) {
         if (processBar) {
           quickcommand.updateProcessBar(
             {
-              text: fullResponse, // 只显示最后100个字符，避免内容过长
+              text: fullResponse,
             },
             processBar
           );
diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index a1e84be8..580899f9 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -409,7 +409,10 @@ document.addEventListener("DOMContentLoaded", () => {
       processBarInner.style.width = `${value}%`;
     }
     if (text) {
-      document.getElementById("process-text").textContent = text;
+      const processText = document.getElementById("process-text");
+      processText.innerHTML = text;
+      processText.scrollTop = processText.scrollHeight;
+      ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
     }
   });
 
@@ -425,9 +428,11 @@ document.addEventListener("DOMContentLoaded", () => {
       (buttonBar.style.display !== "none" ? buttonBar.offsetHeight : 0);
 
     const maxHeight = dialogType === "select" ? 620 : 520;
+    // 进度条的最大高度通过.process-text的max-height限制
+    const minHeight = dialogType === "process" ? 60 : 100;
 
     // 确保高度在最小值和最大值之间
-    return Math.min(Math.max(totalHeight, 100), maxHeight);
+    return Math.min(Math.max(totalHeight, minHeight), maxHeight);
   };
 
   // 确定按钮点击事件
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index ed25cade..71b375b7 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -328,7 +328,7 @@ const showProcessBar = async (options = {}) => {
     throw new Error("onPause 和 onResume 必须同时配置");
   }
 
-  const windowWidth = 250;
+  const windowWidth = 350;
   const windowHeight = 60;
 
   // 计算窗口位置
@@ -364,10 +364,25 @@ const showProcessBar = async (options = {}) => {
           isLoading: value === undefined, // 当不传value时显示加载动画
         });
 
-        // 监听窗口准备就绪
-        ipcRenderer.once("dialog-ready", () => {
+        const dialogReadyHandler = (event, height) => {
+          // 获取当前窗口位置
+          const bounds = UBrowser.getBounds();
+          // 调整y坐标，保持窗口底部不变
+          const y = Math.round(bounds.y - (height - bounds.height));
+          // 确保坐标和尺寸都是有效的整数
+          const newBounds = {
+            x: Math.round(bounds.x),
+            y: Math.max(0, y), // 确保不会超出屏幕顶部
+            width: windowWidth,
+            height: Math.round(height),
+          };
+          // 设置新的位置和大小
+          UBrowser.setBounds(newBounds);
           UBrowser.setOpacity(1);
-        });
+        };
+
+        // 监听子窗口返回的计算高度
+        ipcRenderer.on("dialog-ready", dialogReadyHandler);
 
         // 监听对话框结果
         ipcRenderer.once("dialog-result", (event, result) => {
@@ -395,6 +410,7 @@ const showProcessBar = async (options = {}) => {
               onClose();
             }
             lastProcessBar = null;
+            ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
             UBrowser.destroy();
           },
         };
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index fc1ca30a..b34bbfff 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -78,6 +78,7 @@ body {
 ::-webkit-scrollbar-thumb {
   background: var(--scrollbar-thumb);
   transition: background-color 0.3s;
+  border-radius: 6px;
 }
 
 /* 悬浮时显示滚动条 */
@@ -584,6 +585,9 @@ textarea:focus {
   padding: 0;
   background: var(--button-bg);
   color: white;
+  min-height: auto;
+  height: auto;
+  overflow: visible;
 }
 
 #process {
@@ -596,16 +600,14 @@ textarea:focus {
 .process-text {
   font-size: 13px;
   margin-bottom: 8px;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
-  scrollbar-width: none;
-  width: calc(100% - 30px);
+  white-space: pre-wrap;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 2px;
+  width: calc(100% - 15px);
   box-sizing: border-box;
-}
-
-.process-text::-webkit-scrollbar {
-  display: none;
+  max-height: 250px;
+  -webkit-app-region: no-drag;
 }
 
 .process-bar {
@@ -655,20 +657,6 @@ textarea:focus {
   z-index: 1;
 }
 
-/* 添加按钮区域的渐变遮罩 */
-.process-buttons::before {
-  content: "";
-  position: absolute;
-  right: -8px;
-  /* 对应#process的padding-right */
-  top: -6px;
-  /* 对应#process的padding-top */
-  width: 80px;
-  height: 30px;
-  background: linear-gradient(to right, transparent, var(--button-bg) 60%);
-  pointer-events: none;
-}
-
 /* 进度条关闭按钮 */
 .process-close-btn {
   width: 16px;

From 3c0c7b7117caa44807ff195042bb33c430e750ce Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 16:23:02 +0800
Subject: [PATCH 228/332] =?UTF-8?q?AI=E6=96=B0=E5=A2=9E=E6=B6=A6=E8=89=B2?=
 =?UTF-8?q?=E5=92=8C=E6=89=A9=E5=86=99=E7=9A=84=E9=A2=84=E8=AE=BE=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 plugin/lib/ai.js                              | 33 +++++++++++++++++--
 src/components/composer/ai/AskAIEditor.vue    |  2 ++
 .../monaco/types/quickcommand.api.d.ts        |  6 ++--
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2508fa92..35ede405 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,7 @@ Windows特定功能
 
 ## AI问答
 
-AI问答（自由问答、翻译、总结、生成shell代码）...
+AI问答（自由问答、翻译、总结、润色、扩写、生成shell代码）...
 
 ## 视频处理
 
diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index ff1a5682..cf105683 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -12,8 +12,9 @@ const ROLE_PROMPTS = {
 2. 提供中文时，翻译成地道的英文，符合英文的表达习惯
 3. 提供英文时，翻译成地道的中文，符合中文的表达习惯
 4. 保持原文的专业性和准确性
-5. 对于专业术语保留原文，并在括号中给出对应的中文翻译
-6. 保持原文的段落格式
+5. 保持原文的段落格式
+6. 不要输出原文
+7. 不要使用markdown格式，请直接输出翻译后的内容
 `,
 
   // 生成SHELL命令
@@ -32,7 +33,33 @@ const ROLE_PROMPTS = {
 2. 使用简洁的语言
 3. 按重要性排序
 4. 保持逻辑性和连贯性
-5. 如果有专业术语，保留并解释
+5. 请将所有内容放在一个段落内
+6. 不要输出原文
+7. 不要使用markdown格式
+`,
+
+  // 润色
+  polish: `你是一名文字润色专家，请对我给你的内容进行润色，要求：
+1. 保持原文的核心意思不变
+2. 使用更优美、专业的表达方式
+3. 改善语言流畅度和可读性
+4. 纠正语法错误和不恰当的表达
+5. 保持原文的语言风格（中文/英文）
+6. 保持原文的段落格式
+7. 直接输出润色后的内容，不要解释修改原因
+8. 不要使用markdown格式
+`,
+
+  // 扩写
+  expand: `你是一名文字扩写专家，请对我给你的内容进行扩写，要求：
+1. 在保持原意的基础上扩充内容
+2. 添加相关的细节和例子
+3. 使用生动的描述和丰富的表达
+4. 确保扩写内容逻辑连贯
+5. 适度扩写，避免过度冗长
+6. 保持语言风格的一致性
+7. 直接输出扩写后的内容，不要解释扩写原因
+8. 不要使用markdown格式
 `,
 };
 
diff --git a/src/components/composer/ai/AskAIEditor.vue b/src/components/composer/ai/AskAIEditor.vue
index b4da6a01..eaeb35e2 100644
--- a/src/components/composer/ai/AskAIEditor.vue
+++ b/src/components/composer/ai/AskAIEditor.vue
@@ -56,6 +56,8 @@ export default defineComponent({
         { label: "无", value: "" },
         { label: "翻译", value: "translate" },
         { label: "总结", value: "summarize" },
+        { label: "润色", value: "polish" },
+        { label: "扩写", value: "expand" },
         { label: "生成shell命令", value: "shell" },
       ],
       apiTypeOptions: [
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index 76eeb171..f428688e 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -877,7 +877,7 @@ interface quickcommandApi {
    * 与 AI 进行问答
    * @param content 对话内容
    * @param content.prompt 提示词
-   * @param content.role 预设角色
+   * @param content.role 预设角色: translate|shell|summarize|polish|expand
    * @param apiConfig API配置，不传或传入null则使用用户配置的第一个API配置
    * @param apiConfig.apiType 模型类型：openai/ollama
    * @param apiConfig.apiUrl API地址
@@ -939,8 +939,8 @@ interface quickcommandApi {
     content: {
       /** 提示词 */
       prompt: string;
-      /** 预设角色 */
-      role?: "translate" | "shell" | "summarize";
+      /** 预设角色: 翻译、shell命令生成、总结、润色、扩写 */
+      role?: "translate" | "shell" | "summarize" | "polish" | "expand";
     },
     /** API配置，不传或传入null则使用用户配置的第一个API配置 */
     apiConfig?: {

From ce098f5d75fd74505e2cb191bddaac6b8b866306 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 18:18:01 +0800
Subject: [PATCH 229/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E5=BC=B9=E7=AA=97=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E7=A1=AE=E9=94=80=E6=AF=81=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/service.js | 78 ++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 71b375b7..da0bd7d0 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -52,7 +52,6 @@ const createDialog = (config, customDialogOptions = {}) => {
       const dialogResultHandler = (event, result) => {
         resolve(result);
         // 移除监听器
-        ipcRenderer.removeListener("dialog-result", dialogResultHandler);
         UBrowser.destroy();
       };
 
@@ -71,15 +70,14 @@ const createDialog = (config, customDialogOptions = {}) => {
         // 设置新的位置和大小
         UBrowser.setBounds(newBounds);
         UBrowser.setOpacity(1);
-        ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
       };
 
       // 监听子窗口返回的计算高度, 等待按钮有自己的计算逻辑
       config.type !== "wait-button" &&
-        ipcRenderer.on("dialog-ready", dialogReadyHandler);
+        ipcRenderer.once("dialog-ready", dialogReadyHandler);
 
       // 监听子窗口返回的返回值
-      ipcRenderer.on("dialog-result", dialogResultHandler);
+      ipcRenderer.once("dialog-result", dialogResultHandler);
 
       // 发送配置到子窗口
       ipcRenderer.sendTo(UBrowser.webContents.id, "dialog-config", {
@@ -331,7 +329,6 @@ const showProcessBar = async (options = {}) => {
   const windowWidth = 350;
   const windowHeight = 60;
 
-  // 计算窗口位置
   const { x, y } = calculateWindowPosition({
     position,
     width: windowWidth,
@@ -352,56 +349,65 @@ const showProcessBar = async (options = {}) => {
       },
       () => {
         const windowId = UBrowser.webContents.id;
+        let dialogReadyHandler;
+        let processPauseHandler;
 
-        // 发送配置到子窗口
-        ipcRenderer.sendTo(windowId, "dialog-config", {
-          type: "process",
-          text,
-          value: value === undefined ? 0 : value,
-          isDark: utools.isDarkColors(),
-          platform: process.platform,
-          showPause: Boolean(onPause && onResume),
-          isLoading: value === undefined, // 当不传value时显示加载动画
-        });
-
-        const dialogReadyHandler = (event, height) => {
-          // 获取当前窗口位置
+        // 创建事件处理器
+        dialogReadyHandler = (event, height) => {
+          if (event.senderId !== windowId) return;
           const bounds = UBrowser.getBounds();
-          // 调整y坐标，保持窗口底部不变
           const y = Math.round(bounds.y - (height - bounds.height));
-          // 确保坐标和尺寸都是有效的整数
           const newBounds = {
             x: Math.round(bounds.x),
-            y: Math.max(0, y), // 确保不会超出屏幕顶部
+            y: Math.max(0, y),
             width: windowWidth,
             height: Math.round(height),
           };
-          // 设置新的位置和大小
           UBrowser.setBounds(newBounds);
           UBrowser.setOpacity(1);
         };
 
+        // 监听暂停/恢复事件
+        if (onPause && onResume) {
+          processPauseHandler = (event, isPaused) => {
+            if (event.senderId !== windowId) return;
+            if (isPaused) {
+              onPause();
+            } else {
+              onResume();
+            }
+          };
+          ipcRenderer.on("process-pause", processPauseHandler);
+        }
+
         // 监听子窗口返回的计算高度
         ipcRenderer.on("dialog-ready", dialogReadyHandler);
 
         // 监听对话框结果
         ipcRenderer.once("dialog-result", (event, result) => {
+          if (event.senderId !== windowId) return;
           if (result === "close" && typeof onClose === "function") {
             onClose();
           }
+          // 清理所有事件监听器
+          ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
+          if (processPauseHandler) {
+            ipcRenderer.removeListener("process-pause", processPauseHandler);
+          }
+          lastProcessBar = null;
           UBrowser.destroy();
         });
 
-        // 监听暂停/恢复事件
-        if (onPause && onResume) {
-          ipcRenderer.on("process-pause", (event, isPaused) => {
-            if (isPaused) {
-              onPause();
-            } else {
-              onResume();
-            }
-          });
-        }
+        // 发送配置到子窗口
+        ipcRenderer.sendTo(windowId, "dialog-config", {
+          type: "process",
+          text,
+          value: value === undefined ? 0 : value,
+          isDark: utools.isDarkColors(),
+          platform: process.platform,
+          showPause: Boolean(onPause && onResume),
+          isLoading: value === undefined,
+        });
 
         const processBar = {
           id: windowId,
@@ -409,15 +415,17 @@ const showProcessBar = async (options = {}) => {
             if (typeof onClose === "function") {
               onClose();
             }
-            lastProcessBar = null;
+            // 清理所有事件监听器
             ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
+            if (processPauseHandler) {
+              ipcRenderer.removeListener("process-pause", processPauseHandler);
+            }
+            lastProcessBar = null;
             UBrowser.destroy();
           },
         };
 
         lastProcessBar = processBar;
-
-        // 返回窗口ID和关闭函数
         resolve(processBar);
       }
     );

From 3f9b4fc642274c9fcbe46c1a4a4aaacb455fc4cf Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 18:18:30 +0800
Subject: [PATCH 230/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E5=AF=B9=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=85=B7=E6=9C=89=E8=BE=93=E5=87=BA=E5=8F=98=E9=87=8F=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/generateCode.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 036c763d..2ce5b107 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -49,8 +49,9 @@ export function generateCode(flow) {
 
     let cmdCode = cmd.code;
     // 处理输出变量
-    if (cmd.outputVariable) {
-      const { name, details } = cmd.outputVariable;
+    const outputVariable = cmd.outputVariable || {};
+    const { name, details } = outputVariable;
+    if (name || !window.lodashM.isEmpty(details)) {
       if (cmd.asyncMode === "then") {
         // 使用回调函数模式
         if (cmd.callbackFunc) {
@@ -136,7 +137,5 @@ export function generateCode(flow) {
 
 export function generateFlowsCode(flows) {
   const [mainFlow, ...subFlows] = flows;
-  return [...subFlows, mainFlow]
-    .map((flow) => generateCode(flow))
-    .join("\n\n");
+  return [...subFlows, mainFlow].map((flow) => generateCode(flow)).join("\n\n");
 }

From ded2a546a5d77cb223aa47717a2884e47c211fdd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 18:18:59 +0800
Subject: [PATCH 231/332] =?UTF-8?q?=E6=94=B9=E8=BF=9BAI=E9=97=AE=E7=AD=94?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/aiCommands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/composer/commands/aiCommands.js b/src/js/composer/commands/aiCommands.js
index 8f7893d0..b7a1bb3f 100644
--- a/src/js/composer/commands/aiCommands.js
+++ b/src/js/composer/commands/aiCommands.js
@@ -10,7 +10,7 @@ export const aiCommands = {
       icon: "chat",
       component: "AskAIEditor",
       outputs: {
-        label: "AI响应",
+        label: "结果对象",
         suggestName: "aiResponse",
         structure: {
           success: {

From 89a493e62670a9490b83a4c7b8cbce2e9b15d4ea Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 18:36:17 +0800
Subject: [PATCH 232/332] =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81enterData.type=E5=92=8CenterData.payload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue          | 52 +++++++++++++++++--
 .../composer/card/output/OutputField.vue      |  1 +
 .../composer/common/VariableInput.vue         |  1 +
 .../composer/common/varinput/VariableList.vue | 40 ++++++++++++--
 src/components/composer/flow/FlowManager.vue  | 41 +++++++++++++++
 src/js/composer/commands/utoolsCommand.js     | 23 --------
 6 files changed, 126 insertions(+), 32 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 2d1a0fa7..297e64f9 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -93,6 +93,7 @@
         @update-flow="updateFlows(flow)"
         :is-main-flow="flow.id === 'main'"
         :output-variables="outputVariables"
+        :global-variables="pluginGlobalVariables"
         class="variable-panel"
       />
     </div>
@@ -101,6 +102,7 @@
 
 <script>
 import { defineComponent, provide, ref, computed } from "vue";
+import { useRoute } from "vue-router";
 import draggable from "vuedraggable";
 import ComposerFlow from "components/composer/ComposerFlow.vue";
 import ComposerButtons from "components/composer/flow/ComposerButtons.vue";
@@ -197,6 +199,49 @@ export default defineComponent({
       return flows.value.find((flow) => flow.id === activeTab.value);
     };
 
+    const route = useRoute();
+
+    const isRunComposerPage = computed(() => {
+      return route.name === "composer";
+    });
+
+    const pluginGlobalVariables = computed(() => {
+      if (isRunComposerPage.value) return [];
+      return [
+        {
+          name: "quickcommand.enterData.type",
+          sourceCommand: {
+            label: "匹配模式",
+          },
+          description:
+            "以什么模式进入插件，可能的值：\n" +
+            "关键字：text\n" +
+            "正则匹配：regex\n" +
+            "所有文本：over\n" +
+            "图片匹配：img\n" +
+            "文件匹配：files\n" +
+            "窗口匹配：window",
+          type: "global",
+        },
+
+        {
+          name: "quickcommand.enterData.payload",
+          sourceCommand: {
+            label: "匹配内容",
+          },
+          description:
+            "根据不同的匹配模式，返回不同的内容：\n" +
+            "关键字(text)：返回进入插件的关键字\n" +
+            "正则(regex)：返回匹配的文本\n" +
+            "所有文本(over)：返回匹配的文本\n" +
+            "窗口(window)：返回匹配的窗口信息(对象)\n" +
+            "文件(files)：返回匹配的文件信息(数组)\n" +
+            "图片(img)：返回匹配的图片信息(dataURL)",
+          type: "global",
+        },
+      ];
+    });
+
     // 获取当前函数所有输出变量
     const getOutputVariables = (flow = getCurrentFlow()) => {
       const variables = [];
@@ -251,7 +296,7 @@ export default defineComponent({
           label: v.type === "param" ? "函数参数" : "局部变量",
         },
       }));
-      return [...customVariables, ...variables];
+      return [...pluginGlobalVariables.value, ...customVariables, ...variables];
     };
 
     provide("getCurrentVariables", getCurrentVariables);
@@ -263,8 +308,10 @@ export default defineComponent({
       commandConfig,
       activeTab,
       getOutputVariables,
+      pluginGlobalVariables,
       updateFlows,
       clearFlows,
+      isRunComposerPage,
     };
   },
   data() {
@@ -275,9 +322,6 @@ export default defineComponent({
     };
   },
   computed: {
-    isRunComposerPage() {
-      return this.$route.name === "composer";
-    },
     showCommandConfig() {
       return !this.isRunComposerPage && this.commandConfig.features;
     },
diff --git a/src/components/composer/card/output/OutputField.vue b/src/components/composer/card/output/OutputField.vue
index 74c6f7b2..c7c82e62 100644
--- a/src/components/composer/card/output/OutputField.vue
+++ b/src/components/composer/card/output/OutputField.vue
@@ -31,6 +31,7 @@
       <VariableList
         :show-variable-list="showVariableList"
         :show-function-list="showFunctionList"
+        :show-global-variables="false"
         @emit-value="updateValBySelect"
         class="variable-list-btn"
       />
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index 1c2e89b2..d2eea329 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -51,6 +51,7 @@
         @emit-value="updateValBySelect"
         :show-variable-list="true"
         :show-function-list="true"
+        :show-global-variables="true"
         class="prepend-btn variable-list-btn"
       />
     </template>
diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index 3a27ce8f..214761ae 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -30,10 +30,27 @@
               <q-item-label class="variable-name">
                 {{ variable.name }}
               </q-item-label>
-              <q-item-label caption class="variable-source">
-                来自: {{ variable.sourceCommand.label }}
+              <q-item-label
+                caption
+                class="variable-source"
+                v-if="variable.sourceCommand"
+              >
+                <span>
+                  {{ variable.type === "global" ? "全局变量：" : "来自：" }}
+                </span>
+                <span>{{ variable.sourceCommand.label }}</span>
               </q-item-label>
             </q-item-section>
+            <q-tooltip
+              anchor="center left"
+              self="center end"
+              v-if="variable.description"
+            >
+              <div
+                v-text="variable.description"
+                class="variable-description"
+              ></div>
+            </q-tooltip>
           </q-item>
         </div>
         <div v-if="functions.length && showFunctionList">
@@ -56,7 +73,7 @@
               <q-item-label class="variable-name">
                 {{ func.name }}
               </q-item-label>
-              <q-item-label caption class="variable-source">
+              <q-item-label caption class="row item">
                 {{ func.label }}
               </q-item-label>
             </q-item-section>
@@ -138,12 +155,15 @@ import { defineComponent, inject } from "vue";
 export default defineComponent({
   name: "VariableList",
   emits: ["emitValue"],
-  setup() {
+  setup(props) {
     const getCurrentVariables = inject("getCurrentVariables");
     const commandIndex = inject("commandIndex", null);
 
     const getAvailableVariables = () => {
-      const variables = getCurrentVariables();
+      let variables = getCurrentVariables();
+      if (!props.showGlobalVariables) {
+        variables = variables.filter((variable) => variable.type !== "global");
+      }
       const usableVariables = variables.filter((variable) =>
         // 输出变量只显示在当前命令之前的
         variable.type === "output"
@@ -192,6 +212,10 @@ export default defineComponent({
     },
   },
   props: {
+    showGlobalVariables: {
+      type: Boolean,
+      default: true,
+    },
     showVariableList: {
       type: Boolean,
       default: true,
@@ -321,4 +345,10 @@ export default defineComponent({
 .empty-tip .q-separator {
   opacity: 0.2;
 }
+
+.variable-description {
+  word-break: break-all;
+  white-space: pre-wrap;
+  font-size: 11px;
+}
 </style>
diff --git a/src/components/composer/flow/FlowManager.vue b/src/components/composer/flow/FlowManager.vue
index 091212e4..7ca79bf1 100644
--- a/src/components/composer/flow/FlowManager.vue
+++ b/src/components/composer/flow/FlowManager.vue
@@ -92,6 +92,31 @@
         </div>
       </div>
 
+      <div class="section">
+        <div class="section-header">
+          <div class="section-title">
+            <q-icon name="data_object" size="16px" class="text-primary" />
+            <span>全局变量</span>
+          </div>
+        </div>
+        <div class="var-list">
+          <div
+            v-for="(variable, index) in globalVariables"
+            :key="index"
+            class="var-item"
+          >
+            <div class="global-var-name">{{ variable.name }}</div>
+            <q-tooltip
+              v-if="variable.description"
+              anchor="center left"
+              self="center end"
+            >
+              <div class="var-description">{{ variable.description }}</div>
+            </q-tooltip>
+          </div>
+        </div>
+      </div>
+
       <!-- 手动变量管理部分 -->
       <div class="section">
         <div class="section-header">
@@ -203,6 +228,11 @@ export default defineComponent({
       required: true,
       default: () => [],
     },
+    globalVariables: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
   },
   emits: ["update:modelValue", "update:flow"],
   computed: {
@@ -410,12 +440,23 @@ export default defineComponent({
   font-weight: 500;
 }
 
+.global-var-name {
+  font-size: 11px;
+  opacity: 0.7;
+}
+
 .var-source {
   margin-left: auto;
   font-size: 11px;
   opacity: 0.7;
 }
 
+.var-description {
+  word-break: break-all;
+  white-space: pre-wrap;
+  font-size: 11px;
+}
+
 .section-content {
   padding: 8px;
 }
diff --git a/src/js/composer/commands/utoolsCommand.js b/src/js/composer/commands/utoolsCommand.js
index cdc9f9d2..d912e368 100644
--- a/src/js/composer/commands/utoolsCommand.js
+++ b/src/js/composer/commands/utoolsCommand.js
@@ -4,29 +4,6 @@ export const utoolsCommands = {
   label: "uTools功能",
   icon: "insights",
   commands: [
-    {
-      value: "quickcommand.enterData.valueOf",
-      label: "获取匹配数据",
-      icon: "visibility_off",
-      outputs: {
-        label: "匹配数据",
-        suggestName: "enterData",
-        placeholder: "返回 {code, type, payload, from}",
-        structure: {
-          type: {
-            label: "匹配类型",
-            suggestName: "enterType",
-            placeholder:
-              '返回 "text" | "img" | "file" | "regex" | "over" | "window"',
-          },
-          payload: {
-            label: "匹配的数据",
-            suggestName: "enterPayload",
-            placeholder: "返回 string | MatchFile[] | MatchWindow",
-          },
-        },
-      },
-    },
     {
       value: "utools.hideMainWindow",
       label: "隐藏主窗口",

From d3795cd133f86df907f435dd24e40619952c9c8e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 19:23:01 +0800
Subject: [PATCH 233/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=BB=99AI=E5=8A=A9=E6=89=8B=E7=9A=84=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91=E9=95=BF=E5=BA=A6=E5=B9=B6=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E9=80=82=E5=BD=93=E4=B8=AD=E6=96=87=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                |  2 +-
 src/components/ai/AIAssistantSideBar.vue | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 35ede405..50b7e27a 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ Shell脚本执行、Python脚本执行、Node.js脚本执行、PowerShell脚本
 ![xb2g30.png](https://files.catbox.moe/xb2g30.png)
 
 >AI代码生成
-![ax8yzo.png](https://files.catbox.moe/ax8yzo.png)
+![4kcqh9.png](https://files.catbox.moe/4kcqh9.png)
 
 >可视化编排界面
 ![5mbyoa.png](https://files.catbox.moe/5mbyoa.png)
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 7a1f0ed0..eb418abd 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -105,13 +105,22 @@ import { defineComponent } from "vue";
 import AISelector from "components/ai/AISelector.vue";
 import AIChatHistory from "components/ai/AIChatHistory.vue";
 
-const quickcommandApi =
-  require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`)
-    .default.replace(/\/\*[\s\S]*?\*\//g, "")
-    .replace(/\n/g, "");
-const uToolsApi = require(`!raw-loader!plugins/monaco/types/utools.api.d.ts`)
-  .default.replace(/\/\*[\s\S]*?\*\//g, "")
-  .replace(/\n/g, "");
+const compressApi = (api) => {
+  return api
+    .replace(/\/\*[\s\S]*?\*\//g, (match) => {
+      // 只替换包含2个以上换行符的注释
+      return match.split("\n").length > 2 ? "" : match;
+    })
+    .replace(/\n/g, "")
+    .replace(/\s+/g, " ");
+};
+
+const quickcommandApi = compressApi(
+  require(`!raw-loader!plugins/monaco/types/quickcommand.api.d.ts`).default
+);
+const uToolsApi = compressApi(
+  require(`!raw-loader!plugins/monaco/types/utools.api.d.ts`).default
+);
 
 export default defineComponent({
   name: "AIAssistantSideBar",

From 84c47db7e0858d39ccf21680b5663abedb5993a4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 21:11:16 +0800
Subject: [PATCH 234/332] =?UTF-8?q?=E4=BF=AE=E6=94=B9pinyin-match=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=8Epreload=E4=B8=AD?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                            | 42 +-------------------
 package.json                                 |  1 -
 plugin/package-lock.json                     | 12 ++++++
 plugin/package.json                          |  1 +
 plugin/preload.js                            |  1 +
 src/components/composer/ComposerList.vue     |  7 ++--
 src/components/config/CommandPanels.vue      |  3 +-
 src/components/quickcommandUI/SelectList.vue | 10 ++---
 8 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97401d13..c507db2e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,6 @@
         "monaco-editor": "^0.33.0",
         "monaco-editor-webpack-plugin": "^7.0.1",
         "picture-compressor": "^1.1.0",
-        "pinyin-match": "^1.2.2",
         "quasar": "^2.7.0",
         "raw-loader": "^4.0.2",
         "vue": "^3.0.0",
@@ -5795,6 +5794,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -7837,14 +7837,6 @@
       "resolved": "https://registry.npmmirror.com/picture-compressor/-/picture-compressor-1.1.0.tgz",
       "integrity": "sha512-yJNpdb97h1KXGxGh1JPav1wYXDEPtuCVryt2VIb74i7WGZu4RyU+gr8u2nmLf24MjwgT4oo3US+yxUCGeadRgg=="
     },
-    "node_modules/pinyin-match": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/pinyin-match/-/pinyin-match-1.2.2.tgz",
-      "integrity": "sha512-C0yOq4LkToJMkDHiQFKOY69El2GRcwdS2lVEjgWjIV8go3wE4mloGFNkVicGHFGYHDg523m2/lKzW8Hh+JR9nw==",
-      "dependencies": {
-        "rollup": "^2.44.0"
-      }
-    },
     "node_modules/pkg-dir": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
@@ -9031,21 +9023,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rollup": {
-      "version": "2.79.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
-      "license": "MIT",
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/rtlcss": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
@@ -15433,6 +15410,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -16840,14 +16818,6 @@
       "resolved": "https://registry.npmmirror.com/picture-compressor/-/picture-compressor-1.1.0.tgz",
       "integrity": "sha512-yJNpdb97h1KXGxGh1JPav1wYXDEPtuCVryt2VIb74i7WGZu4RyU+gr8u2nmLf24MjwgT4oo3US+yxUCGeadRgg=="
     },
-    "pinyin-match": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/pinyin-match/-/pinyin-match-1.2.2.tgz",
-      "integrity": "sha512-C0yOq4LkToJMkDHiQFKOY69El2GRcwdS2lVEjgWjIV8go3wE4mloGFNkVicGHFGYHDg523m2/lKzW8Hh+JR9nw==",
-      "requires": {
-        "rollup": "^2.44.0"
-      }
-    },
     "pkg-dir": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
@@ -17592,14 +17562,6 @@
         "glob": "^7.1.3"
       }
     },
-    "rollup": {
-      "version": "2.79.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "rtlcss": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
diff --git a/package.json b/package.json
index 1c9cb74b..5abd32fa 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "monaco-editor": "^0.33.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "picture-compressor": "^1.1.0",
-    "pinyin-match": "^1.2.2",
     "quasar": "^2.7.0",
     "raw-loader": "^4.0.2",
     "vue": "^3.0.0",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 5647d684..f47bf9f3 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -12,6 +12,7 @@
         "iconv-lite": "^0.6.3",
         "marked": "^15.0.7",
         "node-forge": "^1.3.1",
+        "pinyin-match": "^1.2.6",
         "png2icons": "^2.0.1",
         "ses": "^1.10.0",
         "sm-crypto": "^0.3.13",
@@ -184,6 +185,12 @@
         "node": ">= 6.13.0"
       }
     },
+    "node_modules/pinyin-match": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.6.tgz",
+      "integrity": "sha512-d9fMSwZujH7UlMu+FO8MGXrgUYv0CwJtzpf3fQ8xgLJy1qfXlzOZsnQuL7Ej7msAiEtt37U7bE4dkVmyWaFfwA==",
+      "license": "SATA"
+    },
     "node_modules/png2icons": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
@@ -360,6 +367,11 @@
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
+    "pinyin-match": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.6.tgz",
+      "integrity": "sha512-d9fMSwZujH7UlMu+FO8MGXrgUYv0CwJtzpf3fQ8xgLJy1qfXlzOZsnQuL7Ej7msAiEtt37U7bE4dkVmyWaFfwA=="
+    },
     "png2icons": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/png2icons/-/png2icons-2.0.1.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index e1f3af21..ef0946bf 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -7,6 +7,7 @@
     "iconv-lite": "^0.6.3",
     "marked": "^15.0.7",
     "node-forge": "^1.3.1",
+    "pinyin-match": "^1.2.6",
     "png2icons": "^2.0.1",
     "ses": "^1.10.0",
     "sm-crypto": "^0.3.13",
diff --git a/plugin/preload.js b/plugin/preload.js
index 614cf722..77b7947a 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -18,6 +18,7 @@ const md5 = (input) => {
 };
 
 window.lodashM = require("./lib/lodashMini");
+window.pinyinMatch = require("pinyin-match");
 
 const createTerminalCommand = require("./lib/createTerminalCommand");
 const shortCodes = require("./lib/shortCodes");
diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index bb91324f..0d48115c 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -72,7 +72,6 @@
 <script>
 import { defineComponent } from "vue";
 import { commandCategories } from "js/composer/composerConfig";
-import pinyinMatch from "pinyin-match";
 
 export default defineComponent({
   name: "ComposerList",
@@ -107,8 +106,8 @@ export default defineComponent({
           commands: this.commands
             .filter(
               (cmd) =>
-                (cmd.label && pinyinMatch.match(cmd.label, query)) ||
-                (cmd.value && pinyinMatch.match(cmd.value, query))
+                (cmd.label && window.pinyinMatch.match(cmd.label, query)) ||
+                (cmd.value && window.pinyinMatch.match(cmd.value, query))
             )
             .filter((cmd) => cmd.type === category.label),
         }))
@@ -151,7 +150,7 @@ export default defineComponent({
     highlightText(text) {
       if (!this.searchQuery) return text;
 
-      const matches = pinyinMatch.match(text, this.searchQuery);
+      const matches = window.pinyinMatch.match(text, this.searchQuery);
       if (!matches) return text;
 
       const [start, end] = matches;
diff --git a/src/components/config/CommandPanels.vue b/src/components/config/CommandPanels.vue
index 125ecdf2..5e3f73a8 100644
--- a/src/components/config/CommandPanels.vue
+++ b/src/components/config/CommandPanels.vue
@@ -63,7 +63,6 @@
 <script>
 import CommandCard from "components/CommandCard.vue";
 import draggable from "vuedraggable";
-import pinyinMatch from "pinyin-match";
 import { useCommandManager } from "js/commandManager.js";
 import { dbManager } from "js/utools.js";
 
@@ -153,7 +152,7 @@ export default {
           commands.forEach((cmd) => {
             // 拼音搜索
             let explain = cmd.features.explain;
-            let matchedWordPositions = pinyinMatch.match(
+            let matchedWordPositions = window.pinyinMatch.match(
               explain,
               this.commandSearchKeyword
             );
diff --git a/src/components/quickcommandUI/SelectList.vue b/src/components/quickcommandUI/SelectList.vue
index 5fc99182..27dd9d3b 100644
--- a/src/components/quickcommandUI/SelectList.vue
+++ b/src/components/quickcommandUI/SelectList.vue
@@ -86,8 +86,6 @@
 </template>
 
 <script>
-import pinyinMatch from "pinyin-match";
-
 export default {
   data() {
     return {
@@ -116,12 +114,12 @@ export default {
 
       return this.items.filter((x) => {
         if (this.is.json) {
-          const titleMatch = pinyinMatch.match(x.title, this.searchWords);
+          const titleMatch = window.pinyinMatch.match(x.title, this.searchWords);
           const descMatch =
-            x.description && pinyinMatch.match(x.description, this.searchWords);
+            x.description && window.pinyinMatch.match(x.description, this.searchWords);
           return titleMatch || descMatch;
         } else {
-          return pinyinMatch.match(x, this.searchWords);
+          return window.pinyinMatch.match(x, this.searchWords);
         }
       });
     },
@@ -237,7 +235,7 @@ export default {
     highlightText(text) {
       if (!text || !this.searchWords) return text;
 
-      const matchInfo = pinyinMatch.match(text, this.searchWords);
+      const matchInfo = window.pinyinMatch.match(text, this.searchWords);
       if (!matchInfo) return text;
 
       let result = text;

From eb17456d4deacb59c6814d9b320f0a70ab2f6cc6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 23:45:22 +0800
Subject: [PATCH 235/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=97=B6=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84BUG=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8C=B9=E9=85=8D=E7=95=8C=E9=9D=A2=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E7=9A=84=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CommandConfig.vue   |  7 +++----
 src/components/editor/MatchRuleEditor.vue | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index 47abd9e6..9f8a6c50 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -29,7 +29,6 @@
           :model-value="currentCommand.tags"
           @update:model-value="updateModelValue('tags', $event)"
           :options="allQuickCommandTags"
-          @focus="expandOnFocus && updateExpanded(true)"
           dense
           options-dense
           filled
@@ -281,9 +280,9 @@ export default defineComponent({
       // 如果面板已经折叠，不需要处理
       if (!this.isExpanded) return;
 
-      // 检查点击是否在标签选择框的弹出菜单内
-      const tagPopup = document.querySelector(".command-tag-popup");
-      if (tagPopup?.contains(event.target)) return;
+      // 检查点击是否在标签选择框或文件类型选择框的弹出菜单内
+      const popupMenu = document.querySelector(".command-tag-popup,.file-type-popup");
+      if (popupMenu?.contains(event.target)) return;
 
       // 检查点击是否在组件内部
       const componentEl = this.$el;
diff --git a/src/components/editor/MatchRuleEditor.vue b/src/components/editor/MatchRuleEditor.vue
index 4553e69f..26b28cec 100644
--- a/src/components/editor/MatchRuleEditor.vue
+++ b/src/components/editor/MatchRuleEditor.vue
@@ -187,6 +187,7 @@
                   emit-value
                   map-options
                   class="col-2"
+                  popup-content-class="file-type-popup"
                 />
                 <q-input
                   v-model.number="rule.minLength"
@@ -304,13 +305,12 @@ export default defineComponent({
 
   data() {
     return {
-      ruleTypeOptions: Object.values(commandTypes)
-        .map((type) => ({
-          label: type.label,
-          value: type.name,
-          icon: type.icon,
-          color: type.color,
-        })),
+      ruleTypeOptions: Object.values(commandTypes).map((type) => ({
+        label: type.label,
+        value: type.name,
+        icon: type.icon,
+        color: type.color,
+      })),
       commandTypes,
       isHovering: {},
     };

From 07cb22ff0e1e743eb24eb42fab87ff33c37a9e11 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 21 Feb 2025 23:45:54 +0800
Subject: [PATCH 236/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DmainHide=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=9C=AA=E6=AD=A3=E7=A1=AE=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/commandManager.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index 003d4e75..ebef0a21 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -56,9 +56,7 @@ const getValidCommand = (command) => {
   command.features.cmds = getLabeledCmds(cmds, explain);
 
   // 不需要显示输入框的输入类型，添加mainHide属性
-  if (outputTypes[command.output].outPlugin) {
-    command.features.mainHide = true;
-  }
+  command.features.mainHide = outputTypes[command.output].outPlugin || false;
 
   // 生成唯一code
   if (!command.features.code) {

From 77709b39d67a26ecd37062b268c1fc520731ecf8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 00:39:00 +0800
Subject: [PATCH 237/332] =?UTF-8?q?=E7=BB=99=E5=A4=A7=E9=83=A8=E5=88=86q-s?=
 =?UTF-8?q?elect=E6=B7=BB=E5=8A=A0options-dense=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/coding/AsymmetricCryptoEditor.vue       |  4 ++++
 .../composer/coding/SymmetricCryptoEditor.vue        |  5 +++++
 src/components/composer/file/FileOperationEditor.vue | 12 ++++++++++++
 .../composer/network/AxiosConfigEditor.vue           |  1 +
 src/components/composer/script/ScriptEditor.vue      |  1 +
 .../composer/system/SystemCommandEditor.vue          |  1 +
 src/components/composer/ui/SelectListEditor.vue      |  1 +
 src/components/editor/CommandLanguage.vue            |  9 +++++----
 src/components/popup/PanelSetting.vue                |  1 +
 9 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/components/composer/coding/AsymmetricCryptoEditor.vue b/src/components/composer/coding/AsymmetricCryptoEditor.vue
index f4f2c5a5..fa366129 100644
--- a/src/components/composer/coding/AsymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/AsymmetricCryptoEditor.vue
@@ -49,6 +49,7 @@
         label="加密算法"
         dense
         filled
+        options-dense
         class="col-grow"
         emit-value
         map-options
@@ -63,6 +64,7 @@
         dense
         filled
         class="col-grow"
+        options-dense
         emit-value
         map-options
       />
@@ -81,6 +83,7 @@
         class="col-grow"
         emit-value
         map-options
+        options-dense
       />
       <!-- 格式选择 -->
       <q-select
@@ -93,6 +96,7 @@
         class="col-grow"
         emit-value
         map-options
+        options-dense
       />
     </div>
 
diff --git a/src/components/composer/coding/SymmetricCryptoEditor.vue b/src/components/composer/coding/SymmetricCryptoEditor.vue
index 1f137a62..c9f47bde 100644
--- a/src/components/composer/coding/SymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/SymmetricCryptoEditor.vue
@@ -44,6 +44,7 @@
         :options="argvs.operation === 'encrypt' ? outputFormats : inputFormats"
         :label="argvs.operation === 'encrypt' ? '输出格式' : '输入格式'"
         dense
+        options-dense
         filled
         class="col-4"
         emit-value
@@ -60,6 +61,7 @@
         label="加密算法"
         dense
         filled
+        options-dense
         class="col-select"
         emit-value
         map-options
@@ -80,6 +82,7 @@
         class="col-select"
         emit-value
         map-options
+        options-dense
       />
       <!-- 模式选择 -->
       <q-select
@@ -92,6 +95,7 @@
         class="col-select"
         emit-value
         map-options
+        options-dense
       />
       <!-- Padding选择 -->
       <q-select
@@ -104,6 +108,7 @@
         class="col-select"
         emit-value
         map-options
+        options-dense
       />
     </div>
 
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index 450636d0..7c79e8ed 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -81,6 +81,7 @@
           :options="encodingOptions"
           label="编码"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -92,6 +93,7 @@
           :options="readModeOptions"
           label="读取模式"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -103,6 +105,7 @@
           :options="readFlagOptions"
           label="读取标志"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -136,6 +139,7 @@
           :options="encodingOptions"
           label="编码"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -147,6 +151,7 @@
           :options="writeModeOptions"
           label="写入模式"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -158,6 +163,7 @@
           :options="writeFlagOptions"
           label="文件权限"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -194,6 +200,7 @@
           label="目标类型"
           dense
           filled
+          options-dense
           class="col-grow"
           emit-value
           map-options
@@ -225,6 +232,7 @@
           :options="targetTypeOptions"
           label="目标类型"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -236,6 +244,7 @@
           :options="manageOperationOptions"
           label="管理操作"
           dense
+          options-dense
           filled
           class="col-grow"
           emit-value
@@ -265,6 +274,7 @@
             :options="writeFlagOptions"
             label="文件权限"
             dense
+            options-dense
             filled
             class="col-grow"
             emit-value
@@ -349,6 +359,7 @@
           label="目标类型"
           dense
           filled
+          options-dense
           class="col-grow"
           emit-value
           map-options
@@ -360,6 +371,7 @@
           label="检查类型"
           dense
           filled
+          options-dense
           class="col-grow"
           emit-value
           map-options
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index 03e25f96..3a9aa69e 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -12,6 +12,7 @@
             filled
             emit-value
             map-options
+            options-dense
             @update:model-value="updateArgvs('method', $event)"
           >
             <template v-slot:prepend>
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index 36cf9c41..cc022332 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -15,6 +15,7 @@
         label="编程语言"
         filled
         dense
+        options-dense
         class="col"
       >
         <template v-slot:append>
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 5a129c27..9e9c73fe 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -105,6 +105,7 @@
                   filled
                   emit-value
                   map-options
+                  options-dense
                 >
                   <template v-slot:prepend>
                     <q-icon name="code" />
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index b0979ef2..0ccb53dd 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -42,6 +42,7 @@
             filled
             emit-value
             map-options
+            options-dense
             option-value="value"
             option-label="label"
           >
diff --git a/src/components/editor/CommandLanguage.vue b/src/components/editor/CommandLanguage.vue
index 228f083c..49ac7884 100644
--- a/src/components/editor/CommandLanguage.vue
+++ b/src/components/editor/CommandLanguage.vue
@@ -68,7 +68,7 @@
         color="primary"
         icon="settings"
       >
-        <q-list>
+        <q-list dense>
           <!-- 自定义解释器 -->
           <q-item
             v-for="(item, index) in Object.keys(currentCommand.customOptions)"
@@ -79,7 +79,7 @@
               stack-label
               autofocus
               dense
-              outlined
+              filled
               class="full-width"
               :label="
                 [
@@ -103,7 +103,7 @@
             <q-input
               dense
               stack-label
-              outlined
+              filled
               label="脚本参数"
               class="full-width"
               :model-value="currentCommand.scptarg"
@@ -122,8 +122,9 @@
           >
             <q-select
               dense
-              outlined
+              filled
               stack-label
+              options-dense
               clearable
               class="full-width"
               :label="['脚本编码', '输出编码'][index]"
diff --git a/src/components/popup/PanelSetting.vue b/src/components/popup/PanelSetting.vue
index 08274028..15eca907 100644
--- a/src/components/popup/PanelSetting.vue
+++ b/src/components/popup/PanelSetting.vue
@@ -19,6 +19,7 @@
             placeholder="键入后回车"
             use-input
             use-chips
+            options-dense
             multiple
             new-value-mode="add-unique"
             input-debounce="0"

From cfb3ab32fe868ddb4740eb908fac892787c9ea3e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 09:59:46 +0800
Subject: [PATCH 238/332] =?UTF-8?q?AI=E5=8A=A9=E6=89=8B=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=9B=BA=E5=AE=9A=E5=AE=BD=E5=BA=A6=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E7=99=BE=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIAssistantSideBar.vue |  1 +
 src/components/editor/CodeEditor.vue     | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index eb418abd..3773c2ce 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -261,6 +261,7 @@ export default defineComponent({
       const languageMap = {
         quickcommand: "NodeJS",
         javascript: "NodeJS",
+        webjavascript: "前端JavaScript",
         cmd: "windows 批处理脚本",
         shell: "liunx shell脚本",
       };
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 6284411a..802755d9 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -2,7 +2,9 @@
   <div class="code-editor" :style="{ height: height }">
     <div
       class="editor-container"
-      :class="{ 'with-assistant': showAIAssistant }"
+      :style="{
+        width: showAIAssistant ? `calc(100% - ${aiAssistantWidth}px)` : '100%',
+      }"
     >
       <div ref="editorContainer" class="monaco-container" />
       <div class="placeholder-wrapper" v-show="showPlaceholder">
@@ -15,8 +17,9 @@
     <!-- AI助手侧边栏 -->
     <Transition name="slide">
       <AIAssistantSideBar
-        v-if="showAIAssistant"
+        v-if="showAIAssistant && hasAIAssistant"
         class="ai-assistant-panel"
+        :style="{ width: aiAssistantWidth + 'px' }"
         :code="modelValue"
         :language="language"
         @close="toggleAIAssistant(false)"
@@ -25,7 +28,7 @@
     </Transition>
 
     <!-- AI助手按钮 -->
-    <div class="ai-button-wrapper">
+    <div class="ai-button-wrapper" v-if="hasAIAssistant">
       <q-btn
         round
         dense
@@ -110,6 +113,14 @@ export default defineComponent({
       type: Object,
       default: () => ({}),
     },
+    hasAIAssistant: {
+      type: Boolean,
+      default: true,
+    },
+    aiAssistantWidth: {
+      type: Number,
+      default: 320,
+    },
   },
   emits: [
     "update:modelValue",
@@ -421,19 +432,14 @@ export default defineComponent({
   transition: width 0.3s ease;
 }
 
-.editor-container.with-assistant {
-  width: 55%;
-}
-
 .monaco-container {
   width: 100%;
   height: 100%;
 }
 
 .ai-assistant-panel {
-  width: 45%;
   height: 100%;
-  transition: transform 0.3s ease;
+  transition: width 0.3s ease;
 }
 
 .slide-enter-active,

From 1fe478f373aaf00fa61e08c92d0aea8e52c15582 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 10:10:05 +0800
Subject: [PATCH 239/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=84=E7=B1=BB?=
 =?UTF-8?q?=E5=B8=AE=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIAssistantSideBar.vue |  9 +++++++
 src/components/editor/CommandConfig.vue  | 31 +++++++++++-------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 3773c2ce..29ecc790 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -4,6 +4,12 @@
       <div class="row items-center q-gutter-x-xs no-wrap">
         <q-icon name="smart_toy" size="20px" />
         <div class="text-subtitle1">AI 助手</div>
+        <q-icon
+          name="help"
+          size="12px"
+          @click="openAIAssistantHelp"
+          class="cursor-pointer"
+        />
         <AISelector v-model="selectedApi" :dense="true" />
       </div>
       <q-btn icon="close" size="sm" flat dense @click.stop="$emit('close')" />
@@ -348,6 +354,9 @@ export default defineComponent({
 
       return presetContext;
     },
+    openAIAssistantHelp() {
+      window.showUb.help("#KUCwm");
+    },
   },
   mounted() {
     setTimeout(this.loadChatHistory);
diff --git a/src/components/editor/CommandConfig.vue b/src/components/editor/CommandConfig.vue
index 9f8a6c50..3f19efa8 100644
--- a/src/components/editor/CommandConfig.vue
+++ b/src/components/editor/CommandConfig.vue
@@ -57,12 +57,9 @@
           <span class="q-ml-sm">匹配规则</span>
           <q-icon
             name="help"
-            size="16px"
-            class="q-ml-sm cursor-pointer"
-            @click="showMatchRuleHelp"
-          >
-            <q-tooltip>查看帮助</q-tooltip>
-          </q-icon>
+            class="q-ml-xs cursor-pointer"
+            @click.stop="showHelp('#fa11f8c0')"
+          />
           <q-icon
             name="data_object"
             size="16px"
@@ -92,6 +89,11 @@
             <div class="section-title">
               <q-icon name="output" size="16px" />
               <span class="q-ml-sm">输出</span>
+              <q-icon
+                name="help"
+                class="q-ml-xs cursor-pointer"
+                @click.stop="showHelp('#aT67a')"
+              />
             </div>
             <ButtonGroup
               :model-value="currentCommand.output"
@@ -115,7 +117,7 @@
               <q-icon
                 name="help"
                 class="cursor-pointer"
-                @click.stop="showMainPushHelp"
+                @click.stop="showHelp('#YYcxD')"
               />
             </div>
             <ButtonGroup
@@ -266,22 +268,17 @@ export default defineComponent({
       if (!inputValue) return;
       ref.add(inputValue, true);
     },
-    showMainPushHelp() {
-      window.showUb.help("#u0e9f1430");
-    },
-    showMatchRuleHelp() {
-      utools.ubrowser
-        .goto(
-          "https://www.u-tools.cn/docs/developer/information/plugin-json.html#%E5%8A%9F%E8%83%BD%E6%8C%87%E4%BB%A4"
-        )
-        .run();
+    showHelp(id) {
+      window.showUb.help(id);
     },
     handleOutsideClick(event) {
       // 如果面板已经折叠，不需要处理
       if (!this.isExpanded) return;
 
       // 检查点击是否在标签选择框或文件类型选择框的弹出菜单内
-      const popupMenu = document.querySelector(".command-tag-popup,.file-type-popup");
+      const popupMenu = document.querySelector(
+        ".command-tag-popup,.file-type-popup"
+      );
       if (popupMenu?.contains(event.target)) return;
 
       // 检查点击是否在组件内部

From d9bc4b4f34a0f975b7ccb904d56a287539a923e2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 11:03:26 +0800
Subject: [PATCH 240/332] =?UTF-8?q?=E6=96=B0=E5=A2=9EEVAL=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue       |  6 ++---
 src/js/composer/commands/scriptCommands.js | 27 +++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 802755d9..2a46a7e2 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="code-editor" :style="{ height: height }">
+  <div class="code-editor" :style="{ height: height + 'px' }">
     <div
       class="editor-container"
       :style="{
@@ -90,8 +90,8 @@ export default defineComponent({
     },
     // 编辑器高度
     height: {
-      type: String,
-      default: "300px",
+      type: Number,
+      default: 300,
     },
     // 编辑器主题
     theme: {
diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index f7aeb3be..bdb01801 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -4,21 +4,42 @@ export const scriptCommands = {
   commands: [
     {
       value: "injectJs",
-      label: "注入JS代码",
+      label: "注入代码",
       icon: "script",
+      description: "注入的代码（js）将在流程对应的位置直接运行。",
       neverHasOutput: true,
       isExpression: true,
       config: [
         {
-          label: "JS脚本",
           component: "CodeEditor",
           language: "quickcommand",
           placeholder:
-            "共享当前上下文，支持utools，quickcommand，quickcomposer等接口",
+            "和当前流程共享上下文（变量、函数等），支持utools、quickcommand、quickcomposer、nodejs的接口",
           width: 12,
         },
       ],
     },
+    {
+      value: `((code) => {return new Function("return " + code)()})`,
+      label: "eval代码",
+      description: "eval代码（js），并返回结果",
+      config: [
+        {
+          component: "CodeEditor",
+          language: "quickcommand",
+          height: 40,
+          hasAIAssistant: false,
+          placeholder:
+            "和当前流程共享上下文（变量、函数等），支持utools、quickcommand、quickcomposer、nodejs的接口。",
+          width: 12,
+        },
+      ],
+      outputs: {
+        label: "结果",
+        suggestName: "evalResult",
+        typeName: "字符串",
+      },
+    },
     {
       value: "quickcommand.runCode",
       label: "运行脚本",

From e97ec5963a83a64db4e3cd3242290104dafd8b76 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 11:22:59 +0800
Subject: [PATCH 241/332] =?UTF-8?q?=E5=9C=A8=E7=BB=84=E4=BB=B6=E5=86=85?=
 =?UTF-8?q?=E8=80=8C=E9=9D=9E=E5=85=A8=E5=B1=80=E5=88=9B=E5=BB=BAeditor?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E5=8F=98=E9=87=8F=EF=BC=8C=E4=BD=86=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=8B=E4=BA=88=E5=93=8D=E5=BA=94=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue | 63 +++++++++++++++-------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index 2a46a7e2..e1667402 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -55,7 +55,6 @@ let languageCompletions = importAll(
 );
 
 let monacoCompletionProviders = {};
-let editor = null;
 
 // 声明文件映射
 const typeDefinitions = {
@@ -140,19 +139,19 @@ export default defineComponent({
     modelValue: {
       immediate: true,
       handler(newValue) {
-        if (!editor || editor.getValue() === newValue) return;
-        editor.setValue(newValue || "");
+        if (!this.codeEditor || this.codeEditor.getValue() === newValue) return;
+        this.codeEditor.setValue(newValue || "");
       },
     },
     cursorPosition: {
       immediate: true,
       handler(newValue) {
-        if (!editor) return;
+        if (!this.codeEditor) return;
         const { lineNumber, column } = newValue;
         if (!lineNumber || !column) return;
-        const pos = editor.getPosition();
+        const pos = this.codeEditor.getPosition();
         if (pos.lineNumber === lineNumber && pos.column === column) return;
-        editor.setPosition(newValue);
+        this.codeEditor.setPosition(newValue);
       },
     },
     "$q.dark.isActive": {
@@ -164,9 +163,9 @@ export default defineComponent({
     language: {
       immediate: true,
       handler(newValue) {
-        if (!editor) return;
+        if (!this.codeEditor) return;
         const language = this.getHighlighter(newValue);
-        monaco.editor.setModelLanguage(editor.getModel(), language);
+        monaco.editor.setModelLanguage(this.codeEditor.getModel(), language);
         this.loadTypes();
       },
     },
@@ -194,7 +193,10 @@ export default defineComponent({
         wordWrap: this.wordWrap,
       };
 
-      editor = monaco.editor.create(this.$refs.editorContainer, options);
+      this.codeEditor = monaco.editor.create(
+        this.$refs.editorContainer,
+        options
+      );
       this.listenEditorValue();
       this.loadTypes();
       this.registerLanguage();
@@ -207,13 +209,13 @@ export default defineComponent({
     },
     // 监听编辑器值变化
     listenEditorValue() {
-      editor.focus();
-      editor.onDidChangeModelContent(() => {
-        this.$emit("update:modelValue", editor.getValue());
+      this.codeEditor.focus();
+      this.codeEditor.onDidChangeModelContent(() => {
+        this.$emit("update:modelValue", this.codeEditor.getValue());
       });
 
       // 监听光标位置变化
-      editor.onDidChangeCursorPosition((e) => {
+      this.codeEditor.onDidChangeCursorPosition((e) => {
         this.$emit("update:cursorPosition", e.position);
       });
     },
@@ -223,19 +225,19 @@ export default defineComponent({
         clearTimeout(this.resizeTimeout);
       }
       this.resizeTimeout = setTimeout(() => {
-        editor.layout();
+        this.codeEditor.layout();
       }, 50);
     },
     // 销毁编辑器
     destroyEditor() {
       window.removeEventListener("resize", this.resizeEditor);
-      if (!editor) return;
-      editor.dispose();
-      editor = null;
+      if (!this.codeEditor) return;
+      this.codeEditor.dispose();
+      this.codeEditor = null;
     },
     // 聚焦编辑器
     focus() {
-      editor && editor.focus();
+      this.codeEditor && this.codeEditor.focus();
     },
     registerLanguage() {
       const identifierPattern = "([a-zA-Z_]\\w*)";
@@ -363,20 +365,23 @@ export default defineComponent({
     },
     setCursorPosition(position) {
       if (!position.lineNumber || !position.column) return;
-      editor.setPosition(position);
+      this.codeEditor.setPosition(position);
     },
     bindKeys() {
       // alt + z 换行
-      editor.addCommand(monaco.KeyMod.Alt | monaco.KeyCode.KeyZ, () => {
-        this.wordWrap = this.wordWrap === "on" ? "off" : "on";
-        editor.updateOptions({
-          wordWrap: this.wordWrap,
-        });
-      });
+      this.codeEditor.addCommand(
+        monaco.KeyMod.Alt | monaco.KeyCode.KeyZ,
+        () => {
+          this.wordWrap = this.wordWrap === "on" ? "off" : "on";
+          this.codeEditor.updateOptions({
+            wordWrap: this.wordWrap,
+          });
+        }
+      );
     },
     // 替换选中的文本，供外部调用
     repacleEditorSelection(text) {
-      var selection = editor.getSelection();
+      var selection = this.codeEditor.getSelection();
       var range = new monaco.Range(
         selection.startLineNumber,
         selection.startColumn,
@@ -390,15 +395,15 @@ export default defineComponent({
         text: text,
         forceMoveMarkers: true,
       };
-      editor.executeEdits("my-source", [op]);
+      this.codeEditor.executeEdits("my-source", [op]);
     },
     // 格式化文档，供外部调用
     formatDocument() {
-      editor.getAction("editor.action.formatDocument").run();
+      this.codeEditor.getAction("editor.action.formatDocument").run();
     },
     updateEditorValue(type, value) {
       if (type === "replace") {
-        editor.setValue(value);
+        this.codeEditor.setValue(value);
       } else if (type === "insert") {
         this.repacleEditorSelection(value);
       }

From 61ce3ebd222ceecd765a8056611cf2289ee93a0d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 12:13:07 +0800
Subject: [PATCH 242/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A05.0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/options/changeLog.js     | 18 -----------------
 src/markdown/CHANGELOG.md       | 34 +++++++++++++++++++++++++++++++++
 src/pages/ConfigurationPage.vue | 27 +++++++++++++-------------
 3 files changed, 47 insertions(+), 32 deletions(-)
 delete mode 100644 src/js/options/changeLog.js
 create mode 100644 src/markdown/CHANGELOG.md

diff --git a/src/js/options/changeLog.js b/src/js/options/changeLog.js
deleted file mode 100644
index 7dfd161f..00000000
--- a/src/js/options/changeLog.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const changeLog = [
-  {
-    version: "4.1.2",
-    log: `一、功能调整、新增
-① 现在会自动对特殊变量里的单、双、反引号、反斜杠、换行符等特殊符号进行转义。这意味用户不再需要手动处理这些特殊情况，比如在js中使用反引号(\`)或者在 python中 使用三引号(''')来解决换行的问题。
-<b style="color: #e60012">【 ! ! ! 】</b>需要注意，如果之前在js中使用了 String.raw 或者在 python 中使用了 r 来对反斜杠进行处理的话，现在需要去掉这些符号，比如之前是 String.raw\`{{input}}\`,现在则需要改回 "{{input}}"
-② 添加 quickcommand.runAppleScript 和 quickcommand.runPowerShell 两个方法
-③ quickcommand.showConfirmBox 现在支持渲染html以及设置宽度
-④ Mac下环境变量顺序调整为 /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/local/sbin:$PATH
-二、BUG 修复
-① 修复某些情况下调整页面大小报错的 BUG
-② 修复非 quickcommand 环境自动补全重复出现的 BUG
-③ 修复 alt+z 无法换行的 BUG
-④ 更新内置命令-网址二维码中 qrcode 的引用地址`,
-  },
-];
-
-export default changeLog;
diff --git a/src/markdown/CHANGELOG.md b/src/markdown/CHANGELOG.md
new file mode 100644
index 00000000..19de540e
--- /dev/null
+++ b/src/markdown/CHANGELOG.md
@@ -0,0 +1,34 @@
+# 5.0.0
+## 一、界面升级
+1. 代码编辑器界面、命令卡片界面优化调整，显示更多内容。
+2. 命令卡片、标签支持拖拽排序。
+3. 二列卡片视布局优化调整，显示更多内容。
+4. 运行结果界面支持将符合条件的对象转JSON字符串或表格字符串展示。
+5. 支持为整个配置页面设置背景图片，支持设置毛玻璃效果。
+
+## 二、可视化编排
+1. 新增**可视化编排**，支持拖拽编排命令，实时预览、运行，实现自动化流程处理。
+2. 包含：文件操作、网络操作、系统操作、音频操作、图片操作、视频操作、uTools功能、Mac自动化、Window自动化、浏览器控制、数据处理、编码加密、流程控制、编程相关、用户交互、AI对话、模拟操作、获取状态、数学计算、用户数据、显示器、输出消息等20种以上不同类型命令，100项以上实用功能。
+
+## 三、代码编辑器（AI功能）
+1. 新增**AI**功能，可以直接告诉AI你的需求来生成对应环境的代码，并支持自动插入生成的代码到编辑器，对于`quickcommand`环境，可选择让AI学习`utools`和`quickcommand`的文档，提升ai生成代码能力。
+2. 编辑器添加历史记录的功能，在首次进入编辑界面、执行运行、保存操作及应用`AI`代码时会自动保存代码，并支持恢复到指定代码。
+3. 更新utools api声明文件到6.0。
+4. quickcommand接口新增showSystemMessageBox等多个系统级弹窗接口，showSystemWaitButton等待操作按钮，showProcessBar进度条，askAI AI问答、clearTimeout 清除计时器
+
+5. 新增quickcomposer接口及声明文件
+
+> 注意quickcomposer接口主要是作为可视化编排的后端接口，虽然也可以在quickcommand环境中调用，但可能随时会更改调整，相比quickcommand接口，无法保证版本迭代后对旧版本接口的兼容性。
+>
+
+6. 现在代码编辑器没有获得焦点时，也可以通过快捷键执行保存和运行操作。
+
+## 四、优化调整
+1. 匹配模式去掉专业模式选项，现在支持图形化配置多种匹配模式，支持匹配文件夹。
+2. 选择隐藏类型的输出时，不再会主动显示utools搜索框。
+3. 命令卡片的选项菜单中新增“创建命令副本”功能
+4. 大量代码重构、优化调整。
+
+## 五、BUG修复
+1. 修复json格式运行结果复制错误的bug，运行结果支持保存
+2. 修复 Windows 下 Bash 脚本执行失败问题
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index b89e48a2..05373328 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -32,14 +32,13 @@
 <script>
 import { defineAsyncComponent } from "vue";
 import { useCommandManager } from "js/commandManager.js";
-import changeLog from "js/options/changeLog.js";
 import { utoolsFull } from "js/utools.js";
 import CommandEditor from "components/CommandEditor";
 import ComposerEditor from "components/ComposerEditor";
-import FooterBar from "src/components/config/FooterBar.vue";
-import TagBar from "src/components/config/TagBar.vue";
-import BackgroundLayer from "src/components/config/BackgroundLayer.vue";
-import CommandPanels from "src/components/config/CommandPanels.vue";
+import FooterBar from "components/config/FooterBar.vue";
+import TagBar from "components/config/TagBar.vue";
+import BackgroundLayer from "components/config/BackgroundLayer.vue";
+import CommandPanels from "components/config/CommandPanels.vue";
 const CommandRunResult = defineAsyncComponent(() =>
   import("components/CommandRunResult.vue")
 );
@@ -232,22 +231,22 @@ export default {
       }
     },
     showChangeLog() {
-      let lastNeedLogEvent = changeLog[changeLog.length - 1];
+      const changeLog = require("raw-loader!src/markdown/CHANGELOG.md").default;
+      const lastVersion = changeLog.split("\n")[0].split(" ")[1];
       let loggedVersion =
         this.utools.dbStorage.getItem("cfg_loggedVersion") || "0.0.0";
-      if (loggedVersion < lastNeedLogEvent.version) {
+      if (loggedVersion < lastVersion) {
         quickcommand.showConfirmBox(
-          '<pre style="white-space: pre-wrap;word-wrap: break-word;">' +
-            lastNeedLogEvent.log +
-            "</pre>",
+          `
+          <div class="markdown">
+            ${quickcommand.markdownParse(changeLog)}
+          </div>
+          `,
           "更新日志",
           true,
           700
         );
-        this.utools.dbStorage.setItem(
-          "cfg_loggedVersion",
-          lastNeedLogEvent.version
-        );
+        this.utools.dbStorage.setItem("cfg_loggedVersion", lastVersion);
       }
     },
   },

From 245fdcea78b32c08971fe259ac25fefb6f6f5ce7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 14:55:41 +0800
Subject: [PATCH 243/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=AE=E5=8A=A9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/flow/ComposerButtons.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/composer/flow/ComposerButtons.vue b/src/components/composer/flow/ComposerButtons.vue
index b4211303..1b67cbb2 100644
--- a/src/components/composer/flow/ComposerButtons.vue
+++ b/src/components/composer/flow/ComposerButtons.vue
@@ -36,7 +36,7 @@
         v-if="isDev"
       >
       </q-btn>
-      <q-btn flat dense icon="help" @click="showHelp" v-if="isDev">
+      <q-btn flat dense icon="help" @click="showHelp">
         <q-tooltip>帮助</q-tooltip>
       </q-btn>
       <q-btn

From d2906124925cb4ad01fde36c8b60b2db04e240b3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 15:09:58 +0800
Subject: [PATCH 244/332] =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8dense?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/ControlButtons.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/card/ControlButtons.vue b/src/components/card/ControlButtons.vue
index 3c3bfc3d..60493d5f 100644
--- a/src/components/card/ControlButtons.vue
+++ b/src/components/card/ControlButtons.vue
@@ -44,7 +44,7 @@
           transition-hide="jump-up"
           @hide="hideMenu"
         >
-          <q-list style="min-width: 100px">
+          <q-list style="min-width: 100px" dense>
             <q-item clickable v-close-popup @click="exportCommandFile">
               <q-item-section side>
                 <q-icon name="save" />

From 857948a1052731bb342e8f5f5b3877475380c3b3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 15:16:02 +0800
Subject: [PATCH 245/332] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/CommandPanels.vue | 4 ----
 src/css/app.css                         | 1 +
 src/pages/ConfigurationPage.vue         | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/config/CommandPanels.vue b/src/components/config/CommandPanels.vue
index 5e3f73a8..7642f1b0 100644
--- a/src/components/config/CommandPanels.vue
+++ b/src/components/config/CommandPanels.vue
@@ -212,10 +212,6 @@ export default {
 </script>
 
 <style scoped>
-.q-tab-panels {
-  background: transparent;
-}
-
 /* 面板过渡效果 */
 .q-tab-panel {
   transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1),
diff --git a/src/css/app.css b/src/css/app.css
index 49256e24..177c570c 100644
--- a/src/css/app.css
+++ b/src/css/app.css
@@ -255,6 +255,7 @@ body.body--dark.glass-effect-menu .q-menu {
   font-size: 12px;
 }
 
+.q-tab-panels,
 .body--dark .q-tab-panels {
   background-color: transparent;
 }
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 05373328..41d400c9 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -261,10 +261,6 @@ export default {
   overflow: hidden;
 }
 
-.q-tab-panels {
-  background: transparent;
-}
-
 .editor-container {
   color: var(--utools-font-color);
   overflow: hidden;

From b8578a4baa821586308fc2a3ac4fdc2be909b705 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 15:21:35 +0800
Subject: [PATCH 246/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=B0=86dataUrl=E8=BD=AC=E4=B8=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E6=97=B6=EF=BC=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E8=B6=85=E5=87=BA=E8=BE=93=E5=87=BA=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=AE=BD=E5=BA=A6=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/ResultMenu.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index a1442c6a..d920950a 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -56,7 +56,7 @@ export default {
     runResult: Array,
     selectText: String,
   },
-  emits: ["updateResult"],
+  emits: ["updateResult", "showImg"],
   computed: {
     /**
      * 处理运行结果数据，同时完成以下任务：
@@ -146,7 +146,9 @@ export default {
       const imagePattern = /data:image\/.*?;base64,.*/g;
       const imageUrls = this.getFormattedContent()
         .match(imagePattern)
-        ?.map((dataUrl) => `<img src="http://github.com/$%7BdataUrl%7D"><br>`);
+        ?.map(
+          (dataUrl) => `<img src="http://github.com/$%7BdataUrl%7D" style="max-width: 100%;"><br>`
+        );
 
       if (!imageUrls) {
         return quickcommand.showMessageBox("dataUrl 格式不正确！");

From feca112f07da07616f0df122aa3ead267e074d8e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 15:46:57 +0800
Subject: [PATCH 247/332] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/CommandPanels.vue |  7 ++++++-
 src/components/config/FooterBar.vue     | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/config/CommandPanels.vue b/src/components/config/CommandPanels.vue
index 7642f1b0..c087c270 100644
--- a/src/components/config/CommandPanels.vue
+++ b/src/components/config/CommandPanels.vue
@@ -28,7 +28,7 @@
           @update:model-value="handleCommandsReorder"
           :component-data="{
             type: 'div',
-            class: 'row center q-pa-xs',
+            class: 'row center command-items',
           }"
           item-key="features.code"
           handle=".q-card"
@@ -218,6 +218,11 @@ export default {
     opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 }
 
+.command-items {
+  padding-right: 4px;
+  margin-left: -4px;
+}
+
 .command-item {
   transition: all 0.5s;
 }
diff --git a/src/components/config/FooterBar.vue b/src/components/config/FooterBar.vue
index 0fe5c4ac..c7c23eb4 100644
--- a/src/components/config/FooterBar.vue
+++ b/src/components/config/FooterBar.vue
@@ -5,7 +5,7 @@
   >
     <div class="row">
       <!-- 搜索栏 -->
-      <div class="col">
+      <div class="col search-input">
         <q-input
           :model-value="commandSearchKeyword"
           @update:model-value="updateSearch"
@@ -22,7 +22,7 @@
       </div>
       <!-- 按钮组 -->
       <div class="col-auto justify-end flex">
-        <q-btn-group>
+        <q-btn-group class="btn-group">
           <!-- 暗色模式切换按钮 -->
           <q-btn
             flat
@@ -266,4 +266,18 @@ export default {
   font-family: monospace;
   line-height: 0;
 }
+
+.search-input {
+  margin-left: 4px;
+}
+
+.search-input :deep(.q-field--filled .q-field__control),
+.search-input :deep(.q-field--filled .q-field__control *) {
+  border-radius: 5px 0 0 5px;
+  min-height: 40px;
+}
+
+.btn-group {
+  border-radius: 0;
+}
 </style>

From 09b201907d53eb8014018fa5da0e4435c83e04bd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 17:41:48 +0800
Subject: [PATCH 248/332] =?UTF-8?q?=E4=BC=98=E5=8C=96AI=E7=BB=84=E6=89=8B?=
 =?UTF-8?q?=E9=A2=84=E7=BD=AE=E6=8F=90=E7=A4=BA=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIAssistantSideBar.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 29ecc790..b0224827 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -271,9 +271,10 @@ export default defineComponent({
         cmd: "windows 批处理脚本",
         shell: "liunx shell脚本",
       };
-      const commonInstructions = `请根据我的需求编写${languageMap[language]}代码，并请遵循以下原则：
+      const languageName = languageMap[language] || language;
+      const commonInstructions = `接下来我所有的对话中的需求都请通过编写${languageName}代码来实现，并请遵循以下原则：
    - 编写简洁、可读性强的代码
-   - 遵循${language}最佳实践和设计模式
+   - 遵循${languageName}最佳实践和设计模式
    - 使用恰当的命名规范和代码组织
    - 添加必要的错误处理和边界检查
    - 保持中文注释的准确性和专业性
@@ -289,8 +290,7 @@ export default defineComponent({
       languageSpecific.quickcommand = languageSpecific.javascript;
 
       // 获取语言特定的提示，如果没有则使用空字符串
-      const specificInstructions =
-        languageSpecific[language.toLowerCase()] || "";
+      const specificInstructions = languageSpecific[language] || "";
 
       const lastInstructions =
         "\n请直接给我MARKDOWN格式的代码，任何情况下都不需要做解释和说明";

From a7b441894542956a7e4e117648bbe6b20bbaee6d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 22 Feb 2025 17:42:17 +0800
Subject: [PATCH 249/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9EJS=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=97=A0=E8=A1=A5=E5=85=A8BUG=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0applescript=E8=AF=AD=E6=B3=95=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue          | 42 +++++++++++--------
 src/plugins/monaco/completions/applescript.js | 41 +++++++++++++++---
 2 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index e1667402..ce470a83 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -250,10 +250,10 @@ export default defineComponent({
         }
         return Array.from(new Set(tokens));
       };
-      let createDependencyProposals = (range, keyWords, editor, curWord) => {
+      let createDependencyProposals = (range, completions, curWord) => {
         let keys = [];
         // fix getValue of undefined
-        const tokens = getTokens(editor.getModel()?.getValue());
+        const tokens = getTokens(this.codeEditor.getModel()?.getValue());
         // 自定义变量、字符串
         for (const item of tokens) {
           if (item != curWord.word) {
@@ -267,8 +267,9 @@ export default defineComponent({
           }
         }
         // 关键字、函数
-        Object.keys(keyWords).forEach((ItemKind) => {
-          keyWords[ItemKind].forEach((item) => {
+        Object.keys(completions).forEach((ItemKind) => {
+          if (!Array.isArray(completions[ItemKind])) return;
+          completions[ItemKind].forEach((item) => {
             keys.push({
               label: item,
               kind: monaco.languages.CompletionItemKind[ItemKind],
@@ -288,6 +289,7 @@ export default defineComponent({
       Object.keys(languageCompletions).forEach((language) => {
         // 防止自动补全被多次注册
         if (monacoCompletionProviders[language]) return;
+        const completions = languageCompletions[language].default;
         monaco.languages.registerCompletionItemProvider(language, {
           provideCompletionItems: function (model, position) {
             var word = model.getWordUntilPosition(position);
@@ -298,15 +300,22 @@ export default defineComponent({
               endColumn: word.endColumn,
             };
             return {
-              suggestions: createDependencyProposals(
-                range,
-                languageCompletions[language].default,
-                editor,
-                word
-              ),
+              suggestions: createDependencyProposals(range, completions, word),
             };
           },
         });
+        if (language === "applescript") {
+          const { Keyword, Tokenizer, Operator, Symbol } = completions;
+          // applescript 需要再添加语法高亮定义
+          monaco.languages.setMonarchTokensProvider("applescript", {
+            defaultToken: "",
+            tokenPostfix: ".applescript",
+            keywords: Keyword,
+            operators: Operator,
+            symbols: Symbol,
+            tokenizer: Tokenizer,
+          });
+        }
         monacoCompletionProviders[language] = true;
       });
     },
@@ -355,13 +364,12 @@ export default defineComponent({
       }
     },
     getHighlighter(language) {
-      if (["quickcommand", "javascript", "webjavascript"].includes(language)) {
-        return "javascript";
-      }
-      if (language === "cmd") {
-        return "bat";
-      }
-      return language;
+      const highLightLanguageDict = {
+        quickcommand: "javascript",
+        webjavascript: "javascript",
+        cmd: "bat",
+      };
+      return highLightLanguageDict[language] || language;
     },
     setCursorPosition(position) {
       if (!position.lineNumber || !position.column) return;
diff --git a/src/plugins/monaco/completions/applescript.js b/src/plugins/monaco/completions/applescript.js
index c9ab1865..05f73ac9 100644
--- a/src/plugins/monaco/completions/applescript.js
+++ b/src/plugins/monaco/completions/applescript.js
@@ -1,8 +1,37 @@
-var Text = ["AppleScript", "false", "linefeed", "return", "pi", "quote", "result", "space", "tab", "true", ];
-var Keyword = ["about", "above", "after", "against", "and", "around", "as", "at", "back", "before", "beginning", "behind", "below", "beneath", "beside", "between", "but", "by", "considering", "contain", "contains", "continue", "copy", "div", "does", "eighth", "else", "end", "equal", "equals", "error", "every", "exit", "fifth", "first", "for", "fourth", "from", "front", "get", "given", "global", "if", "ignoring", "in", "into", "is", "it", "its", "last", "local", "me", "middle", "mod", "my", "ninth", "not", "of", "on", "onto", "or", "over", "prop", "property", "put", "ref", "reference", "repeat", "returning", "script", "second", "set", "seventh", "since", "sixth", "some", "tell", "tenth", "that", "the", "then", "third", "through", "thru", "timeout", "times", "to", "transaction", "try", "until", "where", "while", "whose", "with", "without", "alias", "application", "boolean", "class", "constant", "date", "file", "integer", "list", "number", "real", "record", "string", "text", "character", "characters", "contents", "day", "frontmost", "id", "item", "length", "month", "name", "paragraph", "paragraphs", "rest", "reverse", "running", "time", "version", "weekday", "word", "words", "year"];
-var Function = ["activate", "beep", "count", "delay", "launch", "log", "offset", "read", "round", "run", "say", "summarize", "write", "clipboard info", "the clipboard", "info for", "list disks", "list folder", "mount volume", "path to", "close for access", "open for access", "get eof", "set eof", "current date", "do shell script", "get volume settings", "random number", "set volume", "system attribute", "system info", "time to GMT", "load script", "run script", "store script", "scripting components", "ASCII character", "ASCII number", "localized string", "folder", "from list", "remote application", "URL", "display alert", "display dialog", ];
+const Text = [ "AppleScript", "false", "linefeed", "return", "pi", "quote", "result", "space", "tab", "true", ];
+const Keyword = [ "about", "above", "after", "against", "and", "around", "as", "at", "back", "before", "beginning", "behind", "below", "beneath", "beside", "between", "but", "by", "considering", "contain", "contains", "continue", "copy", "div", "does", "eighth", "else", "end", "equal", "equals", "error", "every", "exit", "fifth", "first", "for", "fourth", "from", "front", "get", "given", "global", "if", "ignoring", "in", "into", "is", "it", "its", "last", "local", "me", "middle", "mod", "my", "ninth", "not", "of", "on", "onto", "or", "over", "prop", "property", "put", "ref", "reference", "repeat", "returning", "script", "second", "set", "seventh", "since", "sixth", "some", "tell", "tenth", "that", "the", "then", "third", "through", "thru", "timeout", "times", "to", "transaction", "try", "until", "where", "while", "whose", "with", "without", "alias", "application", "boolean", "class", "constant", "date", "file", "integer", "list", "number", "real", "record", "string", "text", "character", "characters", "contents", "day", "frontmost", "id", "item", "length", "month", "name", "paragraph", "paragraphs", "rest", "reverse", "running", "time", "version", "weekday", "word", "words", "year", ];
+const Function = [ "activate", "beep", "count", "delay", "launch", "log", "offset", "read", "round", "run", "say", "summarize", "write", "clipboard info", "the clipboard", "info for", "list disks", "list folder", "mount volume", "path to", "close for access", "open for access", "get eof", "set eof", "current date", "do shell script", "get volume settings", "random number", "set volume", "system attribute", "system info", "time to GMT", "load script", "run script", "store script", "scripting components", "ASCII character", "ASCII number", "localized string", "folder", "from list", "remote application", "URL", "display alert", "display dialog", ];
+const Operator = [ "=", "≠", "≤", "≥", "&", "+", "-", "*", "/", "div", "mod", "^", "contains", "equals", "is", "is not", "isnt", "less than", "greater than", "and", "or", "not", ];
+const Symbol = /[=><!~?:&|+\-*\/\^%]+/;
+const Tokenizer = {
+  root: [
+    [
+      /[a-zA-Z_]\w*/,
+      {
+        cases: {
+          "@keywords": "keyword",
+          "@operators": "operator",
+          "@default": "identifier",
+        },
+      },
+    ],
+    [/--.*$/, "comment"],
+    [/"/, { token: "string.quote", next: "@string" }],
+    [/\d+/, "number"],
+    [/@symbols/, "operator"],
+  ],
+
+  string: [
+    [/[^\"]+/, "string"],
+    [/\"/, { token: "string.quote", next: "@pop" }],
+  ],
+};
+
 export default {
-    Keyword,
-    Function,
-    Text,
+  Keyword,
+  Function,
+  Text,
+  Operator,
+  Symbol,
+  Tokenizer,
 };

From 6a1ed8a13fb350137d1e801efa52469724aed2d2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 00:13:23 +0800
Subject: [PATCH 250/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DcodeEditor=E4=B8=BAnu?=
 =?UTF-8?q?ll=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index ce470a83..f6f76834 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -253,7 +253,7 @@ export default defineComponent({
       let createDependencyProposals = (range, completions, curWord) => {
         let keys = [];
         // fix getValue of undefined
-        const tokens = getTokens(this.codeEditor.getModel()?.getValue());
+        const tokens = getTokens(this.codeEditor?.getModel()?.getValue());
         // 自定义变量、字符串
         for (const item of tokens) {
           if (item != curWord.word) {

From d9e542d4f23ab2ef84495a5a9b45a2bf7911acd3 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 00:13:34 +0800
Subject: [PATCH 251/332] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=99=90=E5=88=B6eva?=
 =?UTF-8?q?l=E5=91=BD=E4=BB=A4=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/scriptCommands.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/js/composer/commands/scriptCommands.js b/src/js/composer/commands/scriptCommands.js
index bdb01801..40ba1b48 100644
--- a/src/js/composer/commands/scriptCommands.js
+++ b/src/js/composer/commands/scriptCommands.js
@@ -27,8 +27,6 @@ export const scriptCommands = {
         {
           component: "CodeEditor",
           language: "quickcommand",
-          height: 40,
-          hasAIAssistant: false,
           placeholder:
             "和当前流程共享上下文（变量、函数等），支持utools、quickcommand、quickcomposer、nodejs的接口。",
           width: 12,

From 37f5ee216031862bad24b8e58051f95b99a6c554 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 00:53:21 +0800
Subject: [PATCH 252/332] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=BB=BA=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=95=E5=85=A5=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandEditor.vue              |  2 +-
 .../composer/script/ScriptEditor.vue          | 36 ++++++++++++++++---
 src/components/editor/CodeEditor.vue          |  4 +--
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/components/CommandEditor.vue b/src/components/CommandEditor.vue
index 56323139..3d3dceb9 100644
--- a/src/components/CommandEditor.vue
+++ b/src/components/CommandEditor.vue
@@ -187,7 +187,7 @@ export default {
           this.showComposer = true;
           break;
         case "insert-text":
-          this.$refs.editor.repacleEditorSelection(data);
+          this.$refs.editor.replaceEditorSelection(data);
           break;
         case "restore":
           this.restoreHistory(data);
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index cc022332..60b6a72e 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -2,6 +2,7 @@
   <div class="script-editor">
     <!-- 代码编辑器 -->
     <CodeEditor
+      ref="codeEditor"
       :model-value="argvs.code"
       @update:modelValue="updateArgvs('code', $event)"
       :language="argvs.language"
@@ -34,6 +35,19 @@
           </q-item>
         </template>
       </q-select>
+      <q-field filled dense class="col-auto">
+        <template v-slot:control>
+          <div class="variable-label">插入变量</div>
+        </template>
+        <template v-slot:append>
+          <VariableList
+            :show-variable-list="true"
+            :show-function-list="false"
+            :show-global-variables="true"
+            @emit-value="insertVariable"
+          />
+        </template>
+      </q-field>
 
       <!-- 编码设置 -->
       <q-select
@@ -137,6 +151,7 @@ import BorderLabel from "components/composer/common/BorderLabel.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
 import { parseFunction, stringifyArgv } from "js/composer/formatString";
 import programs from "js/options/programs";
+import VariableList from "components/composer/common/varinput/VariableList.vue";
 
 export default defineComponent({
   name: "ScriptEditor",
@@ -146,6 +161,7 @@ export default defineComponent({
     ArrayEditor,
     BorderLabel,
     CheckButton,
+    VariableList,
   },
   props: {
     modelValue: Object,
@@ -212,10 +228,19 @@ export default defineComponent({
       }
     },
     generateCode(argvs = this.argvs) {
+      const variables = argvs.code.match(/___([^_]+?)___/g);
+      const replaceStr =
+        variables
+          ?.map((variable) => {
+            return `.replace("${variable}", ${variable.slice(3, -3)})`;
+          })
+          .join("") || "";
       if (this.isCodeSnippet) {
-        return `quickcomposer.coding.base64Decode("${quickcomposer.coding.base64Encode(
-          argvs.code
-        )}")`;
+        return (
+          `quickcomposer.coding.base64Decode("${quickcomposer.coding.base64Encode(
+            argvs.code
+          )}")` + replaceStr
+        );
       }
       const options = {
         language: argvs.language,
@@ -239,7 +264,7 @@ export default defineComponent({
 
       return `${this.modelValue.value}(${stringifyArgv(
         argvs.code
-      )}, ${stringifyArgv(options)})`;
+      )}${replaceStr}, ${stringifyArgv(options)})`;
     },
     getSummary(argvs) {
       return `运行${argvs.language}代码`;
@@ -268,6 +293,9 @@ export default defineComponent({
         argvs,
       });
     },
+    insertVariable(_, variable) {
+      this.$refs.codeEditor.replaceEditorSelection("___" + variable + "___");
+    },
   },
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;
diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index f6f76834..c015e473 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -388,7 +388,7 @@ export default defineComponent({
       );
     },
     // 替换选中的文本，供外部调用
-    repacleEditorSelection(text) {
+    replaceEditorSelection(text) {
       var selection = this.codeEditor.getSelection();
       var range = new monaco.Range(
         selection.startLineNumber,
@@ -413,7 +413,7 @@ export default defineComponent({
       if (type === "replace") {
         this.codeEditor.setValue(value);
       } else if (type === "insert") {
-        this.repacleEditorSelection(value);
+        this.replaceEditorSelection(value);
       }
       this.$emit("saveHistory", value);
     },

From 9ad3d6ed6a2e1322ee484fb23cd7ac7d68770696 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 09:00:06 +0800
Subject: [PATCH 253/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=AC=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A2=AB=E8=87=AA=E5=8A=A8=E6=8D=95=E6=8D=89?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/preload.js                   | 1 +
 src/components/CommandRunResult.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/preload.js b/plugin/preload.js
index 77b7947a..53460f69 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -151,6 +151,7 @@ let getSandboxFuns = () => {
 // 简化报错信息
 let liteErr = (e) => {
   if (!e) return;
+  if (typeof e === "string") return e;
   return e.error
     ? e.error.stack.replace(/([ ] +at.+)|(.+\.js:\d+)/g, "").trim()
     : e.message;
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 2cc41991..100fc09c 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -296,7 +296,7 @@ export default {
           ? alert(stderr)
           : this.showRunResult(stderr, false);
       }
-      !options.action(stdout.toString()) || this.showRunResult(stdout, true);
+      !options.action(stdout?.toString()) || this.showRunResult(stdout, true);
     },
     // 显示运行结果
     async showRunResult(content, isSuccess) {

From b541eee3979e44eeddefdcb33ed8ed014c62d5f2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 10:26:53 +0800
Subject: [PATCH 254/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=92=8C=E6=96=B0=E5=BB=BA=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=89=87=E6=AE=B5=E5=BC=95=E5=85=A5=E5=8F=98=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E5=92=8C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/common/varinput/VariableList.vue |  9 ++++
 .../composer/script/ScriptEditor.vue          | 52 +++++++++++++------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/components/composer/common/varinput/VariableList.vue b/src/components/composer/common/varinput/VariableList.vue
index 214761ae..ffbb3675 100644
--- a/src/components/composer/common/varinput/VariableList.vue
+++ b/src/components/composer/common/varinput/VariableList.vue
@@ -8,6 +8,11 @@
     :no-icon-animation="icon !== 'arrow_drop_down'"
     @click="({ variables, functions } = getAvailableVariablesAndFunctions())"
   >
+    <template #label>
+      <div class="variable-label" v-if="!!label">
+        <span>{{ label }}</span>
+      </div>
+    </template>
     <q-list class="variable-list">
       <template v-if="variables.length || functions.length">
         <div v-if="variables.length && showVariableList">
@@ -228,6 +233,10 @@ export default defineComponent({
       type: String,
       default: "arrow_drop_down",
     },
+    label: {
+      type: String,
+      default: "",
+    },
   },
 });
 </script>
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index 60b6a72e..bef3d964 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -35,18 +35,21 @@
           </q-item>
         </template>
       </q-select>
-      <q-field filled dense class="col-auto">
-        <template v-slot:control>
-          <div class="variable-label">插入变量</div>
-        </template>
-        <template v-slot:append>
-          <VariableList
-            :show-variable-list="true"
-            :show-function-list="false"
-            :show-global-variables="true"
-            @emit-value="insertVariable"
-          />
-        </template>
+      <q-field filled dense class="col-auto variable-list-field">
+        <VariableList
+          label="插入变量"
+          :show-variable-list="true"
+          :show-function-list="false"
+          :show-global-variables="true"
+          @emit-value="insertVariable"
+        />
+        <q-tooltip>
+          <div>引入当前流程的变量到代码中</div>
+          <div class="text-primary" v-if="!isCodeSnippet">
+            注意，所有变量的值都是以<span class="text-weight-bold">字符串</span
+            >的形式传入，不要删除两边的引号
+          </div>
+        </q-tooltip>
       </q-field>
 
       <!-- 编码设置 -->
@@ -54,6 +57,7 @@
         class="col-3"
         filled
         dense
+        options-dense
         v-if="!isCodeSnippet"
         :model-value="argvs.scriptCode"
         @update:modelValue="updateArgvs('scriptCode', $event)"
@@ -66,6 +70,7 @@
         class="col-3"
         filled
         dense
+        options-dense
         v-if="!isCodeSnippet"
         :model-value="argvs.outputCode"
         @update:modelValue="updateArgvs('outputCode', $event)"
@@ -115,6 +120,7 @@
                     label="Windows终端"
                     filled
                     dense
+                    options-dense
                     emit-value
                     map-options
                     class="col-6"
@@ -127,6 +133,7 @@
                     label="macOS终端"
                     filled
                     dense
+                    options-dense
                     emit-value
                     map-options
                     class="col-6"
@@ -228,11 +235,18 @@ export default defineComponent({
       }
     },
     generateCode(argvs = this.argvs) {
-      const variables = argvs.code.match(/___([^_]+?)___/g);
+      const variables = argvs.code.match(/"?___([^_]+?)___"?/g);
       const replaceStr =
         variables
           ?.map((variable) => {
-            return `.replace("${variable}", ${variable.slice(3, -3)})`;
+            if (variable.startsWith('"') && variable.endsWith('"')) {
+              return `.replace('${variable}', JSON.stringify(${variable.slice(
+                4,
+                -4
+              )}))`;
+            } else {
+              return `.replace('${variable}', ${variable.slice(3, -3)})`;
+            }
           })
           .join("") || "";
       if (this.isCodeSnippet) {
@@ -294,7 +308,10 @@ export default defineComponent({
       });
     },
     insertVariable(_, variable) {
-      this.$refs.codeEditor.replaceEditorSelection("___" + variable + "___");
+      const replaceVar = this.isCodeSnippet
+        ? "___" + variable + "___"
+        : '"___' + variable + '___"';
+      this.$refs.codeEditor.replaceEditorSelection(replaceVar);
     },
   },
   mounted() {
@@ -312,4 +329,9 @@ export default defineComponent({
   flex-direction: column;
   gap: 8px;
 }
+
+.variable-list-field :deep(.q-field__control) {
+  padding: 0;
+  color: var(--utools-font-color);
+}
 </style>

From d70a04f549ee9a925cb8f79ba6985a15d10ec496 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 10:44:48 +0800
Subject: [PATCH 255/332] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B1=95=E5=BC=80AI?=
 =?UTF-8?q?=E5=8A=A9=E6=89=8B=E6=97=B6ResizeObserver=20loop=20limit=20exce?=
 =?UTF-8?q?eded=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/editor/CodeEditor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/editor/CodeEditor.vue b/src/components/editor/CodeEditor.vue
index c015e473..666ba44f 100644
--- a/src/components/editor/CodeEditor.vue
+++ b/src/components/editor/CodeEditor.vue
@@ -442,7 +442,6 @@ export default defineComponent({
 .editor-container {
   flex: 1;
   height: 100%;
-  transition: width 0.3s ease;
 }
 
 .monaco-container {

From 0e43a3eac8f0e8b1b6aac5cb29bce3c2a3a8602a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 12:47:08 +0800
Subject: [PATCH 256/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=AD=90=E5=91=BD=E4=BB=A4=E6=97=B6=EF=BC=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E8=A2=AB=E9=94=99=E8=AF=AF=E7=BD=AE=E4=B8=BAnull?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue          | 2 ++
 src/components/composer/common/VariableInput.vue | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index b765c35e..a9cb9ad9 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -98,6 +98,8 @@ export default defineComponent({
 
       // 使用新选择的函数独有配置的默认值
       this.getSelectSubCommand(value)?.config?.forEach((config, index) => {
+        // 有默认值时才更新
+        if (!config.defaultValue) return;
         newArgvs[this.commonConfig.length + index] = config.defaultValue;
       });
 
diff --git a/src/components/composer/common/VariableInput.vue b/src/components/composer/common/VariableInput.vue
index d2eea329..55247866 100644
--- a/src/components/composer/common/VariableInput.vue
+++ b/src/components/composer/common/VariableInput.vue
@@ -205,7 +205,7 @@ export default defineComponent({
   computed: {
     isString: {
       get() {
-        return this.modelValue.isString;
+        return this.modelValue?.isString;
       },
       set(value) {
         this.$emit("update:modelValue", {
@@ -225,7 +225,7 @@ export default defineComponent({
 
     inputValue: {
       get() {
-        return this.modelValue.value;
+        return this.modelValue?.value;
       },
       set(value) {
         this.$emit("update:modelValue", {

From 28b7225c4d578e2249630f88d8aa3dfa83f90639 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 13:12:02 +0800
Subject: [PATCH 257/332] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=AE=9E=E4=BE=8B=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/browser/client.js  |  2 ++
 src/js/composer/commands/browserCommands.js | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugin/lib/quickcomposer/browser/client.js b/plugin/lib/quickcomposer/browser/client.js
index 38a402c7..df5451df 100644
--- a/plugin/lib/quickcomposer/browser/client.js
+++ b/plugin/lib/quickcomposer/browser/client.js
@@ -119,6 +119,7 @@ const startClient = async (options) => {
     proxy = null,
     browserPath = getBrowserPath(browserType),
     windowSize = null,
+    windowPosition = null,
     incognito = false,
     headless = false,
     disableExtensions = false,
@@ -150,6 +151,7 @@ const startClient = async (options) => {
 
   const optionArgs = [
     windowSize ? `--window-size=${windowSize}` : "--start-maximized",
+    windowPosition ? `--window-position=${windowPosition}` : "",
     proxy ? `--proxy-server=${proxy}` : "",
     incognito ? incognitoArg[browserType] : "",
     headless ? "--headless" : "",
diff --git a/src/js/composer/commands/browserCommands.js b/src/js/composer/commands/browserCommands.js
index 79e76557..fae45564 100644
--- a/src/js/composer/commands/browserCommands.js
+++ b/src/js/composer/commands/browserCommands.js
@@ -81,11 +81,18 @@ export const browserCommands = {
                   width: 3,
                 },
                 windowSize: {
-                  label: "窗口尺寸",
+                  label: "窗口尺寸(格式:宽,高)",
                   component: "VariableInput",
                   icon: "window",
                   width: 6,
-                  placeholder: "如1920x1080，不设置则最大化",
+                  placeholder: "如「1280,720」不设置则最大化",
+                },
+                windowPosition: {
+                  label: "窗口位置(格式:x,y)",
+                  component: "VariableInput",
+                  icon: "location_on",
+                  width: 6,
+                  placeholder: "如「160,120」不设置为0,0",
                 },
                 proxy: {
                   label: "代理",
@@ -98,7 +105,7 @@ export const browserCommands = {
                   label: "浏览器路径",
                   component: "VariableInput",
                   icon: "folder",
-                  width: 12,
+                  width: 6,
                   options: {
                     dialog: {
                       type: "open",

From c2cf787ef331766775c877cc0f00d3f6a3ffd5f5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 13:40:58 +0800
Subject: [PATCH 258/332] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E5=B8=AE=E5=8A=A9=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ComposerEditor.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index 2a4142b3..4d8c7714 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -14,10 +14,26 @@
 import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
 import { useCommandManager } from "js/commandManager.js";
+import { dbManager } from "js/utools";
 
 export default {
   components: { CommandComposer, CommandRunResult },
   setup() {
+    const hasRunComposer = dbManager.getStorage("st_hasRunComposer");
+
+    if (!hasRunComposer) {
+      quickcommand.showConfirmBox(
+        `<div>👏🏻 欢迎使用可视化编排，由于编排功能众多，推荐先查看教程再使用</div>
+        <div>查看教程<a href="/service/javascript:void(0)" onclick="utools.ubrowser.goto('https://www.yuque.com/fofolee/qcdocs3/bg31vl#TMtYg').run({width: 1280, height: 720})">戳我</a></div>
+        <div>或者看一个<a href="/service/javascript:void(0)" onclick="utools.ubrowser.goto('https://www.yuque.com/fofolee/qcdocs3/bg31vl#JqM2f').run({width: 1280, height: 720})">浏览器控制典型案例</a>快速入门</div>
+        <div>你随时可以点击右上角的<span style="font-weight: bolder;">帮助</span>按钮（图标为问号），再次查看教程</div>`,
+        "帮助",
+        true,
+        600
+      );
+      dbManager.setStorage("st_hasRunComposer", true);
+    }
+
     const commandManager = useCommandManager();
 
     const defaultCommand = commandManager.getDefaultCommand("quickcomposer");

From ddee4a501726fc46b95a931cdf91f5987ee4f475 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 18:50:56 +0800
Subject: [PATCH 259/332] =?UTF-8?q?=E9=9D=9E=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E7=9A=84cmd.label=E5=9D=87=E4=BD=BF=E7=94=A8explain?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/commandManager.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index ebef0a21..a1ce18a4 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -42,7 +42,8 @@ const getLabeledCmds = (cmds, explain) => {
     }
     return {
       ...cmd,
-      label: cmd.label || explain,
+      // 非关键字的cmd.label均使用explain
+      label: explain,
     };
   });
 };
@@ -52,7 +53,7 @@ const getValidCommand = (command) => {
   if (!explain) throw "名称不能为空";
   if (!Array.isArray(cmds)) throw "匹配规则格式错误";
 
-  // 未配置label或关键字时，直接使用名称
+  // 根据explain设置label和关键字
   command.features.cmds = getLabeledCmds(cmds, explain);
 
   // 不需要显示输入框的输入类型，添加mainHide属性

From 7d3074b5983cccf758858d8ba8491c8304a59cd0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 20:50:11 +0800
Subject: [PATCH 260/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E3=80=81=E4=BF=9D=E5=AD=98=E5=92=8C?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickFeatures/FavFile.vue      | 25 ++---
 src/components/quickFeatures/FavUrl.vue       | 64 +++++--------
 .../quickFeatures/PluginNickName.vue          | 20 ++--
 src/js/commandManager.js                      | 58 ++++++++---
 src/js/common/quickcommandParser.js           | 28 +++---
 src/js/options/quickFeatures.js               | 96 ++++++++++---------
 src/pages/ConfigurationPage.vue               | 46 ++-------
 src/pages/FeaturesPage.vue                    | 14 ---
 8 files changed, 168 insertions(+), 183 deletions(-)

diff --git a/src/components/quickFeatures/FavFile.vue b/src/components/quickFeatures/FavFile.vue
index c855161b..f4b0fd2f 100644
--- a/src/components/quickFeatures/FavFile.vue
+++ b/src/components/quickFeatures/FavFile.vue
@@ -1,9 +1,19 @@
+<template>
+  <div></div>
+</template>
+
 <script>
+import { useCommandManager } from "js/commandManager";
+import { getUniqueId } from "js/common/uuid.js";
+
 export default {
   mounted() {
+    const commandManager = useCommandManager();
     utools.setExpendHeight(0);
     this.$root.enterData.payload.forEach((file) => {
-      let uid = this.getUid();
+      let uid = getUniqueId({
+        short: true,
+      });
       let fileInfo = window.getFileInfo({
         type: "file",
         argvs: file.path,
@@ -17,24 +27,17 @@ export default {
           icon: utools.getFileIcon(file.path),
           platform: [window.processPlatform],
           code: `key_${uid}`,
+          mainHide: true,
         },
         program: "quickcommand",
-        cmd: `open(\"${file.path.replace(/\\/g, "\\\\")}\")`,
+        cmd: `utools.shellOpenPath(\"${file.path.replace(/\\/g, "\\\\")}\")`,
         output: "ignore",
         tags: [this.$root.profile.quickFileTag],
       };
-      this.importCommand(command);
+      this.commandManager.importCommand(JSON.stringify(command));
     });
     utools.showNotification("操作成功！");
     utools.outPlugin();
   },
-  methods: {
-    getUid() {
-      return this.$parent.getUid();
-    },
-    importCommand(command) {
-      this.$parent.importCommand(command);
-    },
-  },
 };
 </script>
diff --git a/src/components/quickFeatures/FavUrl.vue b/src/components/quickFeatures/FavUrl.vue
index ff9a4b38..a44225a6 100644
--- a/src/components/quickFeatures/FavUrl.vue
+++ b/src/components/quickFeatures/FavUrl.vue
@@ -1,76 +1,60 @@
+<template>
+  <div></div>
+</template>
+
 <script>
+import { getUniqueId } from "js/common/uuid.js";
+import { useCommandManager } from "js/commandManager";
+
 export default {
-  data() {
-    return {
-      cmdCtrlKey: window.processPlatform === "darwin" ? "command" : "control",
-    };
-  },
   async mounted() {
+    const commandManager = useCommandManager();
     utools.setExpendHeight(0);
     utools.hideMainWindow();
-    // getCurrentBrowserUrl 似乎失效了
-    // let url = utools.getCurrentBrowserUrl();
-    utools.simulateKeyboardTap("l", this.cmdCtrlKey);
-    await this.wait(50);
-    utools.simulateKeyboardTap("c", this.cmdCtrlKey);
-    await this.wait(50);
-    let url = window.clipboardReadText();
+    let url = utools.getCurrentBrowserUrl();
     if (!/^http/.test(url)) {
-      utools.showMainWindow();
-      utools.setExpendHeight(550);
-      let choise = await quickcommand.showButtonBox(
+      const choise = await quickcommand.showSystemButtonBox(
         ["http", "https"],
         "当前浏览器网址显示不完整，请问访问的页面是哪一种？"
       );
       url = choise.text + "://" + url;
     }
-    let title = this.$root.enterData.payload.title
+    const title = this.$root.enterData.payload.title
       .replace(/和另外 \d+ 个页面.*/, "")
       .replace(/[-|—] .*?[Edge|Firefox|Chrome].*/, "")
       .trim();
     // let req = await axios(url)
     // let title = quickcommand.htmlParse(req.data).querySelector('title').innerText
-    let base = /(http(s){0,1}:\/\/.*?(:\d+){0,1})(\/|$).*/.exec(url)[1];
-    let iconUrl = base + "/favicon.ico";
-    let iconPath = window.joinPath(
+    const base = /(http(s){0,1}:\/\/.*?(:\d+){0,1})(\/|$).*/.exec(url)[1];
+    const iconUrl = base + "/favicon.ico";
+    const iconPath = window.joinPath(
       utools.getPath("temp"),
       "quickcommandfavicon.ico"
     );
-    let uid = this.getUid();
-    let command = {
+    const uid = getUniqueId({
+      short: true,
+    });
+    const command = {
       features: {
         explain: title,
         cmds: [title],
         platform: ["linux", "win32", "darwin"],
         code: `key_${uid}`,
+        mainHide: true,
+        icon: "features/fav.png",
       },
       program: "quickcommand",
-      cmd: `visit(\"${url}\")\n`,
+      cmd: `utools.shellOpenExternal(\"${url}\")\n`,
       output: "ignore",
       tags: [this.$root.profile.quickUrlTag],
     };
     try {
-      let res = await quickcommand.downloadFile(iconUrl, iconPath);
+      const res = await quickcommand.downloadFile(iconUrl, iconPath);
       if (res) command.features.icon = window.resolveFileToBase64(iconPath);
-    } catch (e) {}
-    this.importCommand(command);
+    } catch (_) {}
+    commandManager.importCommand(JSON.stringify(command));
     utools.showNotification("操作成功！");
     utools.outPlugin();
   },
-  methods: {
-    wait(ms) {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve();
-        }, ms);
-      });
-    },
-    getUid() {
-      return this.$parent.getUid();
-    },
-    importCommand(command) {
-      this.$parent.importCommand(command);
-    },
-  },
 };
 </script>
diff --git a/src/components/quickFeatures/PluginNickName.vue b/src/components/quickFeatures/PluginNickName.vue
index 89d151a2..f5a82731 100644
--- a/src/components/quickFeatures/PluginNickName.vue
+++ b/src/components/quickFeatures/PluginNickName.vue
@@ -85,6 +85,9 @@
 </template>
 
 <script>
+import { useCommandManager } from "js/commandManager";
+import { getUniqueId } from "js/common/uuid.js";
+
 export default {
   data() {
     return {
@@ -113,10 +116,13 @@ export default {
   },
   methods: {
     addPluNickName() {
+      const commandManager = useCommandManager();
       if (!this.nickName.length)
         return quickcommand.showMessageBox("请填写别名", "warning");
-      let uid = this.getUid();
-      let command = {
+      const uid = getUniqueId({
+        short: true,
+      });
+      const command = {
         features: {
           cmds: this.nickName,
           explain: this.feature.explain,
@@ -129,16 +135,12 @@ export default {
         output: "ignore",
         tags: [this.$root.profile.pluNickNameTag],
       };
-      this.importCommand(command);
+      commandManager.importCommand(JSON.stringify(command), {
+        showMessage: false,
+      });
       this.nickName = [];
       quickcommand.showMessageBox("添加成功！");
     },
-    getUid() {
-      return this.$parent.getUid();
-    },
-    importCommand(command) {
-      this.$parent.importCommand(command);
-    },
   },
 };
 </script>
diff --git a/src/js/commandManager.js b/src/js/commandManager.js
index a1ce18a4..11bd6154 100644
--- a/src/js/commandManager.js
+++ b/src/js/commandManager.js
@@ -109,11 +109,13 @@ export function useCommandManager() {
   };
 
   // 保存命令
-  const saveCommand = (command) => {
+  const saveCommand = (command, options = {}) => {
+    const { showMessage = true } = options;
     try {
       command = getValidCommand(command);
     } catch (e) {
-      return quickcommand.showMessageBox(e.toString(), "error");
+      showMessage && quickcommand.showMessageBox(e.toString(), "error");
+      return false;
     }
     const code = command.features.code;
     state.allQuickCommands[code] = command;
@@ -130,6 +132,9 @@ export function useCommandManager() {
     }
 
     getAllQuickCommandTags();
+
+    locateToCommand(command.tags, code);
+    showMessage && quickcommand.showMessageBox("保存成功！");
     return code;
   };
 
@@ -175,45 +180,76 @@ export function useCommandManager() {
   };
 
   // 导入命令
-  const importCommand = async (quickCommandInfo) => {
+  const importCommand = async (quickCommandInfo, options = {}) => {
+    const { showMessage = true } = options;
     if (!quickCommandInfo) {
-      quickcommand.showMessageBox("导入未完成！", "warning");
+      showMessage && quickcommand.showMessageBox("导入未完成！", "warning");
       return false;
     }
 
     let parsedData = await quickcommandParser(quickCommandInfo);
     if (!parsedData) {
-      quickcommand.showMessageBox("格式错误", "error");
+      showMessage && quickcommand.showMessageBox("格式错误", "error");
       return false;
     }
 
     let dataToPushed = {};
     if (parsedData.single) {
-      if (isDefaultCommand(parsedData.qc.features.code)) {
-        quickcommand.showMessageBox("默认命令不能导入！", "error");
+      const { code } = parsedData.qc.features;
+      if (isDefaultCommand(code)) {
+        showMessage &&
+          quickcommand.showMessageBox("默认命令不能导入！", "error");
         return false;
       }
-      dataToPushed[parsedData.qc.features.code] = parsedData.qc;
+      dataToPushed[code] = parsedData.qc;
     } else {
       dataToPushed = parsedData.qc;
     }
 
-    for (var code of Object.keys(dataToPushed)) {
+    for (const code of Object.keys(dataToPushed)) {
       if (isDefaultCommand(code)) continue;
       dbManager.putDB(dataToPushed[code], "qc_" + code);
     }
 
     Object.assign(state.allQuickCommands, dataToPushed);
     getAllQuickCommandTags();
-    quickcommand.showMessageBox("导入成功！");
+    if (parsedData.single) {
+      const { tags, features } = parsedData.qc;
+      locateToCommand(tags, features.code);
+      enableCommand(features.code);
+    }
+    showMessage && quickcommand.showMessageBox("导入成功！");
     return parsedData.qc;
   };
 
+  // 定位命令, 包含changeCurrentTag
+  const locateToCommand = (tags = ["默认"], code) => {
+    state.currentTag = !tags || !tags.length ? "未分类" : tags[0];
+    if (!code) return;
+    // 等待 dom 渲染
+    nextTick(() => {
+      let el = document.getElementById(code);
+      if (!el) return;
+      el.scrollIntoViewIfNeeded();
+      el.querySelector(".q-card").style.boxShadow =
+        "0 1px 5px var(--q-primary), 0 2px 2px var(--q-primary), 0 3px 1px -2px var(--q-primary)";
+      setTimeout(() => {
+        el.querySelector(".q-card").style.boxShadow = "";
+      }, 5000);
+      // 跳转标签
+      document
+        .querySelector(".q-tab--active")
+        .scrollIntoView({ behavior: "smooth" });
+    });
+  };
+
   // 创建命令副本
   const createCommandCopy = (code) => {
     const command = window.lodashM.cloneDeep(state.allQuickCommands[code]);
     command.features.code = getFeatureCode(command.features.cmds);
-    saveCommand(command);
+    saveCommand(command, {
+      showMessage: false,
+    });
   };
 
   // 是否为默认命令
diff --git a/src/js/common/quickcommandParser.js b/src/js/common/quickcommandParser.js
index 24ce36d3..9f088ac0 100644
--- a/src/js/common/quickcommandParser.js
+++ b/src/js/common/quickcommandParser.js
@@ -4,15 +4,13 @@
 
 // 是否含有 quickcommand 键值
 let isJsonQc = (obj, strict = true) => {
-  var keys = strict
-    ? ["features", "program", "output"]
-    : ["program"];
-  if (keys.filter((x) => typeof obj[x] == "undefined").length) return false;
+  const keys = strict ? ["features", "program", "output"] : ["program"];
+  if (keys.find((x) => !obj[x])) return false;
   return true;
 };
 
 let payloadParser = async (payload) => {
-  let [, format, value] = payload.split("/");
+  const [, format, value] = payload.split("/");
   if (format === "base64") return window.base64Decode(value);
   else if (format === "id") return await window.getSharedQcById(value);
   else throw new Error("不支持的格式");
@@ -21,15 +19,17 @@ let payloadParser = async (payload) => {
 // 判断是否为可导入的快捷命令
 let quickcommandParser = async (payload, strict = true) => {
   try {
-    if (payload.slice(0, 3) === "qc/") payload = await payloadParser(payload);
-    var qc = JSON.parse(payload);
-  } catch (error) {
-    return false;
-  }
-  if (isJsonQc(qc, strict)) return { single: true, qc: qc };
-  else if (!Object.values(qc).filter((q) => !isJsonQc(q, strict)).length)
-    return { single: false, qc: qc };
-  else return false;
+    if (payload.slice(0, 3) === "qc/") {
+      payload = await payloadParser(payload);
+    }
+    const qc = JSON.parse(payload);
+    if (isJsonQc(qc, strict)) {
+      return { single: true, qc };
+    } else if (!Object.values(qc).find((q) => !isJsonQc(q, strict))) {
+      return { single: false, qc };
+    }
+  } catch (_) {}
+  return false;
 };
 
 export default quickcommandParser;
diff --git a/src/js/options/quickFeatures.js b/src/js/options/quickFeatures.js
index 1a031d3f..e99076f1 100644
--- a/src/js/options/quickFeatures.js
+++ b/src/js/options/quickFeatures.js
@@ -1,48 +1,52 @@
 const quickFeatures = {
-    favFile: {
-        code: "feature_favFile",
-        explain: "快速将选中的文件收藏到快捷命令当中",
-        cmds: [{
-            label: "收藏文件",
-            type: "files",
-            match: "/.*+/i",
-        }, ],
-        icon: "features/fav.png",
-        platform: ["win32", "darwin", "linux"],
+  favFile: {
+    code: "feature_favFile",
+    explain: "快速将选中的文件收藏到快捷命令当中",
+    cmds: [
+      {
+        label: "收藏文件",
+        type: "files",
+        match: "/.*+/i",
+      },
+    ],
+    icon: "features/fav.png",
+    platform: ["win32", "darwin", "linux"],
+    mainHide: true,
+  },
+  favUrl: {
+    code: "feature_favUrl",
+    explain: "快速将选中的网址收藏到快捷命令当中",
+    mainHide: true,
+    cmds: [
+      {
+        label: "收藏网址",
+        type: "window",
+        match: {
+          app: [
+            "chrome.exe",
+            "firefox.exe",
+            "MicrosoftEdge.exe",
+            "iexplore.exe",
+            "msedge.exe",
+            "Google Chrome.app",
+            "Safari.app",
+            "Microsoft Edge.app",
+            "chrome",
+            "firefox",
+          ],
+        },
+      },
+    ],
+    icon: "features/fav.png",
+    platform: ["win32", "darwin", "linux"],
+  },
+  pluNickName: {
+    code: "feature_pluNickName",
+    explain: "为插件设置别名",
+    cmds: ["插件别名"],
+    icon: "features/plugin.png",
+    platform: ["win32", "darwin", "linux"],
+  },
+};
 
-    },
-    favUrl: {
-        code: "feature_favUrl",
-        explain: "快速将选中的网址收藏到快捷命令当中",
-        cmds: [{
-            label: "收藏网址",
-            type: "window",
-            match: {
-                app: [
-                    "chrome.exe",
-                    "firefox.exe",
-                    "MicrosoftEdge.exe",
-                    "iexplore.exe",
-                    "msedge.exe",
-                    "Google Chrome.app",
-                    "Safari.app",
-                    "Microsoft Edge.app",
-                    "chrome",
-                    "firefox",
-                ],
-            },
-        }, ],
-        icon: "features/fav.png",
-        platform: ["win32", "darwin", "linux"],
-
-    },
-    pluNickName: {
-        code: "feature_pluNickName",
-        explain: "为插件设置别名",
-        cmds: ["插件别名"],
-        icon: "features/plugin.png",
-        platform: ["win32", "darwin", "linux"],
-    }
-}
-
-export default quickFeatures
+export default quickFeatures;
diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index 41d400c9..c2ef357f 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -96,11 +96,13 @@ export default {
   methods: {
     // 初始化
     initPage() {
-      // newcommand 直接新建命令
-      if (this.fromNewCommand) this.addNewCommand();
-      // importcommand 导入命令
-      else if (this.fromImportCommand)
-        this.importCommand(this.$root.enterData.payload);
+      if (this.fromNewCommand) {
+        // newcommand 直接新建命令
+        this.addNewCommand();
+      } else if (this.fromImportCommand) {
+        // importcommand 导入命令
+        this.commandManager.importCommand(this.$root.enterData.payload);
+      }
       this.$router.push("/configuration");
       if (this.$route.params.tags) {
         this.changeCurrentTag(window.hexDecode(this.$route.params.tags));
@@ -178,32 +180,6 @@ export default {
         window.lodashM.cloneDeep(command);
       this.isEditorShow = true;
     },
-    // 导入命令
-    async importCommand(command) {
-      const result = await this.commandManager.importCommand(command);
-      if (result) {
-        this.locateToCommand(result.tags, result.features?.code);
-      }
-    },
-    // 定位命令, 包含changeCurrentTag
-    locateToCommand(tags = ["默认"], code) {
-      this.currentTag = !tags || !tags.length ? "未分类" : tags[0];
-      if (!code) return;
-      // 等待 dom 渲染
-      this.$nextTick(() => {
-        let el = document.getElementById(code);
-        el.scrollIntoViewIfNeeded();
-        el.querySelector(".q-card").style.boxShadow =
-          "0px 1px var(--q-primary)";
-        setTimeout(() => {
-          el.querySelector(".q-card").style.boxShadow = "";
-        }, 5000);
-        // 跳转标签
-        document
-          .querySelector(".q-tab--active")
-          .scrollIntoView({ behavior: "smooth" });
-      });
-    },
     // 新建命令
     addNewCommand(program = "quickcommand") {
       this.editorComponent =
@@ -212,16 +188,10 @@ export default {
         this.commandManager.getDefaultCommand(program);
       this.isEditorShow = true;
     },
-    saveCommand(command) {
-      const code = this.commandManager.saveCommand(command);
-      if (!code) return;
-      this.locateToCommand(command.tags, code);
-      quickcommand.showMessageBox("保存成功！");
-    },
     handleEditorEvent(event, data) {
       switch (event) {
         case "save":
-          this.saveCommand(data);
+          this.commandManager.saveCommand(data);
           break;
         case "back":
           this.isEditorShow = false;
diff --git a/src/pages/FeaturesPage.vue b/src/pages/FeaturesPage.vue
index c7fbf403..1152a2cd 100644
--- a/src/pages/FeaturesPage.vue
+++ b/src/pages/FeaturesPage.vue
@@ -7,7 +7,6 @@ import PluginNickName from "components/quickFeatures/PluginNickName";
 import FavFile from "components/quickFeatures/FavFile";
 import FavUrl from "components/quickFeatures/FavUrl";
 import { markRaw } from "vue";
-import { utoolsFull, dbManager } from "js/utools.js";
 
 export default {
   components: {
@@ -17,21 +16,8 @@ export default {
   },
   data() {
     return {
-      utools: utoolsFull,
       currentComponent: this.$route.params.featuretype,
     };
   },
-  methods: {
-    importCommand(command) {
-      command = window.lodashM.cloneDeep(command);
-      dbManager.putDB(command, "qc_" + command.features.code);
-      this.utools.setFeature(command.features);
-    },
-    getUid() {
-      return Number(
-        Math.random().toString().substr(3, 3) + Date.now()
-      ).toString(36);
-    },
-  },
 };
 </script>

From b27248bdb02bf33a060a61dfcd2bdbf44b98447c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 21:08:00 +0800
Subject: [PATCH 261/332] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/ControlButtons.vue      | 1 +
 src/components/card/layouts/DenseLayout.vue | 2 +-
 src/components/card/layouts/ListLayout.vue  | 5 +++--
 src/components/card/layouts/MiniLayout.vue  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/card/ControlButtons.vue b/src/components/card/ControlButtons.vue
index 60493d5f..4e952e57 100644
--- a/src/components/card/ControlButtons.vue
+++ b/src/components/card/ControlButtons.vue
@@ -242,6 +242,7 @@ export default {
   opacity: 1;
   transform: translateY(0);
   visibility: visible;
+  backdrop-filter: blur(1px);
 }
 
 /* 按钮悬浮效果 */
diff --git a/src/components/card/layouts/DenseLayout.vue b/src/components/card/layouts/DenseLayout.vue
index ab9d0d72..924e3a51 100644
--- a/src/components/card/layouts/DenseLayout.vue
+++ b/src/components/card/layouts/DenseLayout.vue
@@ -19,7 +19,7 @@
     <div class="row justify-end">
       <div
         class="text-ellipsis"
-        v-html="commandInfo.features.explain.trim() || '<br/>'"
+        v-text="commandInfo.features.explain"
       />
     </div>
 
diff --git a/src/components/card/layouts/ListLayout.vue b/src/components/card/layouts/ListLayout.vue
index 351aad75..7a0293e1 100644
--- a/src/components/card/layouts/ListLayout.vue
+++ b/src/components/card/layouts/ListLayout.vue
@@ -13,11 +13,11 @@
       >
         <img :src="http://github.com/commandInfo.features.icon" />
       </q-avatar>
-      <div class="column">
+      <div class="col">
         <!-- 名称 -->
         <div
           class="text-ellipsis"
-          v-html="commandInfo.features.explain.trim() || '<br/>'"
+          v-text="commandInfo.features.explain"
         />
         <!-- 匹配模式 -->
         <CommandTypeTag
@@ -96,5 +96,6 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
   font-size: 14px;
+  max-width: 100%;
 }
 </style>
diff --git a/src/components/card/layouts/MiniLayout.vue b/src/components/card/layouts/MiniLayout.vue
index adf21b62..100da5e4 100644
--- a/src/components/card/layouts/MiniLayout.vue
+++ b/src/components/card/layouts/MiniLayout.vue
@@ -18,7 +18,7 @@
     <div class="row justify-center w-100">
       <div
         class="text-ellipsis text-center"
-        v-html="commandInfo.features.explain.trim() || '<br/>'"
+        v-text="commandInfo.features.explain"
       />
     </div>
 

From 94bffd0375e9f52f91532da1e7760f1a801a7db2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Feb 2025 21:26:02 +0800
Subject: [PATCH 262/332] =?UTF-8?q?=E5=AE=8C=E5=96=84api=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=ADapi=E5=9C=B0=E5=9D=80=E7=9A=84=E5=8D=A0=E4=BD=8D?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index 8748dd9f..abfdf9f6 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -75,7 +75,11 @@
                     dense
                     v-model="aiConfig.apiUrl"
                     class="col-7"
-                    :placeholder="`${aiConfig.apiType} API地址`"
+                    :placeholder="
+                      aiConfig.apiType === 'openai'
+                        ? '例：https://api.openai.com'
+                        : '例：http://localhost:11434'
+                    "
                   >
                     <template v-slot:prepend>
                       <q-badge

From 23c5cb77af6f93711ebdddf7c50951fc0f8593d5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 19:57:46 +0800
Subject: [PATCH 263/332] =?UTF-8?q?=E8=B0=83=E6=95=B4quickcommand.askAI?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?onFetch=E8=BF=94=E5=9B=9Econtroller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js                              | 36 +++++++++++--------
 src/components/ai/AIAssistantSideBar.vue      |  4 ++-
 .../monaco/types/quickcommand.api.d.ts        | 22 +++++++-----
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index cf105683..46bbbd1a 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -167,35 +167,35 @@ function parseModelsResponse(response, apiType) {
 }
 
 // 处理 OpenAI 流式响应
-async function handleOpenAIStreamResponse(line, controller, onStream) {
+async function handleOpenAIStreamResponse(line, onStream) {
   if (line.startsWith("data: ")) {
     const jsonStr = line.replace(/^data: /, "");
     if (jsonStr === "[DONE]") {
-      onStream("", controller, true);
+      onStream("", true);
       return;
     }
     const json = JSON.parse(jsonStr);
     const content = json.choices[0]?.delta?.content;
     if (content) {
-      onStream(content, controller, false);
+      onStream(content, false);
     }
   }
 }
 
 // 处理 Ollama 流式响应
-async function handleOllamaStreamResponse(line, controller, onStream) {
+async function handleOllamaStreamResponse(line, onStream) {
   const json = JSON.parse(line);
   if (json.done) {
-    onStream("", controller, true);
+    onStream("", true);
     return;
   }
   if (json.message?.content) {
-    onStream(json.message.content, controller, false);
+    onStream(json.message.content, false);
   }
 }
 
 // 处理流式响应
-async function handleStreamResponse(response, apiConfig, controller, onStream) {
+async function handleStreamResponse(response, apiConfig, onStream) {
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
@@ -213,9 +213,9 @@ async function handleStreamResponse(response, apiConfig, controller, onStream) {
         if (line.trim()) {
           try {
             if (apiConfig.apiType === API_TYPES.OPENAI) {
-              await handleOpenAIStreamResponse(line, controller, onStream);
+              await handleOpenAIStreamResponse(line, onStream);
             } else {
-              await handleOllamaStreamResponse(line, controller, onStream);
+              await handleOllamaStreamResponse(line, onStream);
             }
           } catch (e) {
             console.error("解析响应失败:", e);
@@ -228,9 +228,9 @@ async function handleStreamResponse(response, apiConfig, controller, onStream) {
     if (buffer.trim()) {
       try {
         if (apiConfig.apiType === API_TYPES.OPENAI) {
-          await handleOpenAIStreamResponse(buffer, controller, onStream);
+          await handleOpenAIStreamResponse(buffer, onStream);
         } else {
-          await handleOllamaStreamResponse(buffer, controller, onStream);
+          await handleOllamaStreamResponse(buffer, onStream);
         }
       } catch (e) {
         console.error("解析剩余响应失败:", e);
@@ -261,7 +261,11 @@ async function handleStreamResponse(response, apiConfig, controller, onStream) {
  */
 async function chat(content, apiConfig, options = {}) {
   try {
-    const { showProcessBar = true, onStream = () => {} } = options;
+    const {
+      showProcessBar = true,
+      onStream = () => {},
+      onFetch = () => {},
+    } = options;
 
     // 验证必要参数
     if (!apiConfig.apiUrl || !content.prompt || !apiConfig.model) {
@@ -292,7 +296,7 @@ async function chat(content, apiConfig, options = {}) {
     let fullResponse = "";
 
     // 包装 onStream 回调以收集完整响应并更新进度条
-    const streamHandler = (chunk, controller, isDone) => {
+    const streamHandler = (chunk, isDone) => {
       if (!isDone) {
         fullResponse += chunk;
         // 更新进度条显示最新的响应内容
@@ -305,11 +309,14 @@ async function chat(content, apiConfig, options = {}) {
           );
         }
       }
-      onStream(chunk, controller, isDone);
+      onStream(chunk, isDone);
     };
 
     // 统一使用 fetch 处理请求
     const controller = new AbortController();
+
+    onFetch(controller);
+
     const response = await fetch(url, {
       method: "POST",
       headers: config.headers,
@@ -324,7 +331,6 @@ async function chat(content, apiConfig, options = {}) {
     const result = await handleStreamResponse(
       response,
       apiConfig,
-      controller,
       streamHandler
     );
 
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index b0224827..096e035d 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -201,8 +201,10 @@ export default defineComponent({
           this.selectedApi,
           {
             showProcessBar: false,
-            onStream: (text, controller, done) => {
+            onFetch: (controller) => {
               this.currentRequest = controller;
+            },
+            onStream: (text, done) => {
               if (text) {
                 this.chatHistory[this.chatHistory.length - 1].content += text;
               }
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index f428688e..c4ae9db9 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -886,6 +886,7 @@ interface quickcommandApi {
    * @param options 其他选项
    * @param options.showProcessBar 是否显示进度条
    * @param options.onStream 流式请求回调
+   * @param options.onFetch 发起请求回调
    *
    *
    * ```js
@@ -922,14 +923,19 @@ interface quickcommandApi {
    *     model: "qwen2.5:32b"
    *   },
    *   {
-   *     onStream: (chunk, controller, isDone) => {
+   *     onStream: (chunk, isDone) => {
+   *       // 获取流式响应
    *       console.log(chunk);
-   *       if (某个特定条件，中断请求) {
-   *         controller.abort();
-   *       }
    *       if (isDone) {
    *         console.log("流式请求完成");
    *       }
+   *     },
+   *     onFetch: (controller) => {
+   *       console.log("请求开始");
+   *       // 某个特定条件，中断请求
+   *       if (某个特定条件) {
+   *         controller.abort();
+   *       }
    *     }
    *   }
    * );
@@ -956,12 +962,10 @@ interface quickcommandApi {
     options?: {
       /** 是否显示进度条, 默认 true */
       showProcessBar?: boolean;
+      /** 请求开始回调 */
+      onFetch?: (controller: AbortController) => void;
       /** 流式请求回调 */
-      onStream?: (
-        chunk: string,
-        controller: AbortController,
-        isDone: boolean
-      ) => void;
+      onStream?: (chunk: string, isDone: boolean) => void;
     }
   ): Promise<{
     /** 是否成功 */

From 775132df8fad102cde0015742c8e3173a4ed8414 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 20:02:26 +0800
Subject: [PATCH 264/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E9=81=8D=E5=8E=86=E6=95=B0=E7=BB=84=E9=94=99=E8=AF=AF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=85=83=E7=B4=A0=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/controlCommands.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 3ff5ad71..97efe522 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -132,16 +132,16 @@ export const controlCommands = {
           config: [
             {
               name: "indexVar",
-              label: "元素",
+              label: "索引",
               component: "ControlInput",
-              defaultValue: "item",
+              defaultValue: "index",
               width: 4,
             },
             {
-              name: "indexVar",
-              label: "索引",
+              name: "itemVar",
+              label: "元素",
               component: "ControlInput",
-              defaultValue: "i",
+              defaultValue: "item",
               width: 4,
             },
             {

From b9005cbe88575cbdef0b6da439ec9dd741bf05c4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 20:08:19 +0800
Subject: [PATCH 265/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=AD=A3=E7=A1=AE=E6=8F=90=E7=A4=BA=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?uTools=E7=89=88=E6=9C=AC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/video/ffmpeg.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugin/lib/quickcomposer/video/ffmpeg.js b/plugin/lib/quickcomposer/video/ffmpeg.js
index efb3ef75..bee3c07c 100644
--- a/plugin/lib/quickcomposer/video/ffmpeg.js
+++ b/plugin/lib/quickcomposer/video/ffmpeg.js
@@ -1,3 +1,11 @@
+const checkFFmpeg = () => {
+  if (!utools.runFFmpeg) {
+    quickcommand.showSystemMessageBox("请先升级uTools到6.1.0及以上版本");
+    return false;
+  }
+  return true;
+};
+
 /**
  * 运行FFmpeg命令并显示进度条
  * @param {string[]} args FFmpeg命令参数
@@ -11,12 +19,8 @@
  * @returns {Promise} 返回Promise
  */
 async function runFFmpeg(args, options = {}) {
-  if (!utools.runFFmpeg) {
-    quickcommand.showSystemMessageBox(
-      "请先升级uTools到6.1.0及以上版本"
-    );
-    return;
-  }
+  if (!checkFFmpeg()) return;
+
   const {
     text = "处理中...",
     position = "bottom-right",
@@ -234,6 +238,8 @@ async function extractAudio(input, output, options = {}) {
  * utools接口目前好像有问题，无法结束录制
  */
 async function recordScreen(output, options = {}) {
+  if (!checkFFmpeg()) return;
+
   const { fps = 30, overwrite = false } = options;
 
   const args = [];
@@ -456,6 +462,7 @@ async function addWatermark(input, watermark, output, options = {}) {
  * @param {boolean} options.overwrite 是否覆盖已存在的文件
  */
 async function mergeVideos(inputs, output, options = {}) {
+  if (!checkFFmpeg()) return;
   const { overwrite = false } = options;
 
   // 先获取第一个视频的分辨率

From 15ab5227382afb07cbd59c094d39f752fce0f010 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 20:47:33 +0800
Subject: [PATCH 266/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E5=A4=84=E7=90=86=EF=BC=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E5=B8=B8=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/data/array.js   | 145 +++------
 plugin/lib/quickcomposer/data/string.js  |   5 -
 src/js/composer/commands/dataCommands.js | 362 ++++++++++-------------
 3 files changed, 187 insertions(+), 325 deletions(-)

diff --git a/plugin/lib/quickcomposer/data/array.js b/plugin/lib/quickcomposer/data/array.js
index 42a3c668..92e4e2e8 100644
--- a/plugin/lib/quickcomposer/data/array.js
+++ b/plugin/lib/quickcomposer/data/array.js
@@ -81,8 +81,9 @@ const array = {
   },
 
   // 数组排序
-  sort: function (array, key, order = "asc") {
+  sort: function (array, order = "asc", key) {
     if (!Array.isArray(array)) return [];
+    if (order === "shuffle") return this.shuffle(array);
     return [...array].sort((a, b) => {
       const valueA = key ? a[key] : a;
       const valueB = key ? b[key] : b;
@@ -97,63 +98,10 @@ const array = {
     });
   },
 
-  // 数组分组
-  group: function (array, key) {
-    if (!Array.isArray(array) || !key) return {};
-    return array.reduce((groups, item) => {
-      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
-      if (value !== undefined) {
-        if (!groups[value]) {
-          groups[value] = [];
-        }
-        groups[value].push(item);
-      }
-      return groups;
-    }, {});
-  },
-
   // 数组去重
-  unique: function (array, key) {
+  unique: function (array) {
     if (!Array.isArray(array)) return [];
-    if (!key) {
-      return [...new Set(array)];
-    }
-    const seen = new Set();
-    return array.filter((item) => {
-      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
-      if (value === undefined || seen.has(value)) {
-        return false;
-      }
-      seen.add(value);
-      return true;
-    });
-  },
-
-  // 数组聚合
-  aggregate: function (array, operation, key) {
-    if (!Array.isArray(array)) return null;
-    const values = key
-      ? array.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
-      : array;
-    const validNumbers = values.filter((v) => !isNaN(v));
-
-    switch (operation) {
-      case "sum":
-        return validNumbers.reduce((sum, val) => sum + val, 0);
-      case "avg":
-        return validNumbers.length
-          ? validNumbers.reduce((sum, val) => sum + val, 0) /
-              validNumbers.length
-          : 0;
-      case "max":
-        return validNumbers.length ? Math.max(...validNumbers) : null;
-      case "min":
-        return validNumbers.length ? Math.min(...validNumbers) : null;
-      case "count":
-        return array.length;
-      default:
-        return null;
-    }
+    return [...new Set(array)];
   },
 
   // 数组切片
@@ -168,70 +116,49 @@ const array = {
     return array.flat(depth);
   },
 
-  // 数组差集
-  diff: function (array1, array2, key) {
-    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
-    if (!key) {
-      return array1.filter((item) => !array2.includes(item));
+  // 数组随机排序
+  shuffle: function (array) {
+    if (!Array.isArray(array)) return [];
+    const result = [...array];
+    for (let i = result.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [result[i], result[j]] = [result[j], result[i]];
     }
-    const set2 = new Set(
-      array2.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
-    );
-    return array1.filter(
-      (item) => !set2.has(key.split(".").reduce((obj, k) => obj?.[k], item))
-    );
+    return result;
   },
 
-  // 数组交集
-  intersect: function (array1, array2, key) {
-    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
-    if (!key) {
-      return array1.filter((item) => array2.includes(item));
+  // 数组添加元素
+  push: function (array, element, index) {
+    if (!Array.isArray(array)) return [];
+    if (index === undefined) {
+      array.push(element);
+    } else {
+      if (typeof index !== "number" || index < 0 || index > array.length) {
+        throw new Error("位置参数错误");
+      }
+      array.splice(index, 0, element);
     }
-    const set2 = new Set(
-      array2.map((item) => key.split(".").reduce((obj, k) => obj?.[k], item))
-    );
-    return array1.filter((item) =>
-      set2.has(key.split(".").reduce((obj, k) => obj?.[k], item))
-    );
+    return array;
   },
 
-  // 数组并集
-  union: function (array1, array2, key) {
-    if (!Array.isArray(array1) || !Array.isArray(array2)) return [];
-    if (!key) {
-      return [...new Set([...array1, ...array2])];
-    }
-    const seen = new Set();
-    return [...array1, ...array2].filter((item) => {
-      const value = key.split(".").reduce((obj, k) => obj?.[k], item);
-      if (value === undefined || seen.has(value)) {
-        return false;
-      }
-      seen.add(value);
-      return true;
-    });
+  // 数组删除元素
+  splice: function (array, start, deleteCount) {
+    if (!Array.isArray(array)) return [];
+    array.splice(start, deleteCount);
+    return array;
   },
 
-  // 数组分块
-  chunk: function (array, size = 1) {
-    if (!Array.isArray(array) || size < 1) return [];
-    const chunks = [];
-    for (let i = 0; i < array.length; i += size) {
-      chunks.push(array.slice(i, i + size));
-    }
-    return chunks;
+  // 数组连接
+  join: function (array, separator) {
+    if (!Array.isArray(array)) return "";
+    return array.join(separator);
   },
 
-  // 数组随机排序
-  shuffle: function (array) {
+  // 数组设置元素
+  set: function (array, index, value) {
     if (!Array.isArray(array)) return [];
-    const result = [...array];
-    for (let i = result.length - 1; i > 0; i--) {
-      const j = Math.floor(Math.random() * (i + 1));
-      [result[i], result[j]] = [result[j], result[i]];
-    }
-    return result;
+    array[index] = value;
+    return array;
   },
 };
 
diff --git a/plugin/lib/quickcomposer/data/string.js b/plugin/lib/quickcomposer/data/string.js
index d285314a..8ac4c446 100644
--- a/plugin/lib/quickcomposer/data/string.js
+++ b/plugin/lib/quickcomposer/data/string.js
@@ -93,11 +93,6 @@ const string = {
     return text.split(separator);
   },
 
-  // 数组合并
-  join: function (array, separator = ",") {
-    return Array.isArray(array) ? array.join(separator) : String(array);
-  },
-
   // 字符串重复
   repeat: function (text, count = 1) {
     return text.repeat(Math.max(0, count));
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index b8c7afc0..544ffa9c 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -226,31 +226,6 @@ export const dataCommands = {
             typeName: "字符串",
           },
         },
-        {
-          value: "quickcomposer.data.string.join",
-          label: "数组合并",
-          icon: "merge",
-          config: [
-            {
-              label: "字符串数组",
-              component: "VariableInput",
-              icon: "view_list",
-              width: 8,
-            },
-            {
-              label: "连接符",
-              component: "VariableInput",
-              icon: "space_bar",
-              width: 4,
-              defaultValue: newVarInputVal("str", ","),
-            },
-          ],
-          outputs: {
-            label: "合并结果",
-            suggestName: "joinedString",
-            typeName: "字符串",
-          },
-        },
         {
           value: "quickcomposer.data.string.repeat",
           label: "字符串重复",
@@ -909,197 +884,158 @@ export const dataCommands = {
       ],
     },
     {
-      value: "quickcomposer.data.array.filter",
+      value: "Array.from",
       label: "数组处理",
       icon: "view_list",
       subCommands: [
         {
-          value: "quickcomposer.data.array.filter",
-          label: "数组过滤",
-          icon: "filter_alt",
+          value: "Array.from",
+          label: "创建数组",
           config: [
             {
-              label: "原始数组",
-              component: "VariableInput",
+              component: "ArrayEditor",
               icon: "view_list",
               width: 12,
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              placeholder:
-                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
+          ],
+          outputs: [
             {
-              label: "过滤条件",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "age > 18",
+              label: "创建的数组",
+              suggestName: "newArray",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.map",
-          label: "数组映射",
-          icon: "transform",
+          value: "quickcomposer.data.array.push",
+          label: "添加元素",
+          icon: "add",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 12,
-              placeholder:
-                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 4,
+              placeholder: "[1,2,3]",
             },
             {
-              label: "转换函数",
+              label: "要添加的元素",
               component: "VariableInput",
-              icon: "code",
-              placeholder: "name",
-              width: 12,
+              icon: "input",
+              width: 4,
+              placeholder: "4",
+            },
+            {
+              label: "位置(可选)",
+              component: "VariableInput",
+              icon: "first_page",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              width: 4,
+              placeholder: "留空则添加到末尾",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.sort",
-          label: "数组排序",
-          icon: "sort",
+          value: "quickcomposer.data.array.splice",
+          label: "删除元素",
+          icon: "delete",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
               width: 12,
-              placeholder:
-                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+              placeholder: "[1,2,3,4,5]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
             {
-              label: "排序字段",
+              label: "起始位置",
               component: "VariableInput",
-              icon: "key",
+              icon: "first_page",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
               width: 6,
-              placeholder: "age",
+              placeholder: "1",
             },
             {
-              label: "排序方式",
-              component: "QSelect",
-              icon: "sort",
-              options: [
-                { label: "升序", value: "asc" },
-                { label: "降序", value: "desc" },
-              ],
-              defaultValue: "asc",
+              label: "删除数量",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "delete",
               width: 6,
+              placeholder: "1",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.group",
-          label: "数组分组",
-          icon: "group_work",
+          value: "quickcomposer.data.array.join",
+          label: "连接数组(join)",
+          icon: "join_right",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
               width: 8,
-              placeholder:
-                '[{"id":1,"name":"张三","dept":"技术"},{"id":2,"name":"李四","dept":"技术"}]',
+              placeholder: "[1,2,3,4,5]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
             {
-              label: "分组字段",
+              label: "连接符",
               component: "VariableInput",
-              icon: "key",
+              icon: "swap_horiz",
               width: 4,
-              placeholder: "dept",
+              defaultValue: newVarInputVal("str", ","),
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.unique",
-          label: "数组去重",
-          icon: "filter_1",
+          value: "quickcomposer.data.array.set",
+          label: "设置元素",
+          icon: "edit",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 8,
-              placeholder: '[{"id":1,"dept":"技术"},{"id":2,"dept":"技术"}]',
-            },
-            {
-              label: "去重字段",
-              component: "VariableInput",
-              icon: "key",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 4,
-              placeholder: "dept",
             },
-          ],
-        },
-        {
-          value: "quickcomposer.data.array.find",
-          label: "查找元素",
-          icon: "search",
-          config: [
             {
-              label: "原始数组",
+              label: "位置",
               component: "VariableInput",
-              icon: "view_list",
-              width: 12,
-              placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
-            },
-            {
-              label: "查找条件",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "id === 1",
-            },
-          ],
-        },
-        {
-          value: "quickcomposer.data.array.aggregate",
-          label: "数组聚合",
-          icon: "functions",
-          config: [
-            {
-              label: "原始数组",
-              component: "VariableInput",
-              icon: "view_list",
-              width: 12,
-              placeholder: '[{"id":1,"amount":100},{"id":2,"amount":200}]',
-            },
-            {
-              label: "聚合操作",
-              component: "QSelect",
-              icon: "functions",
-              options: [
-                { label: "求和", value: "sum" },
-                { label: "平均值", value: "avg" },
-                { label: "最大值", value: "max" },
-                { label: "最小值", value: "min" },
-                { label: "计数", value: "count" },
-              ],
-              defaultValue: "sum",
-              width: 6,
+              icon: "first_page",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              width: 4,
+              placeholder: "1",
             },
             {
-              label: "聚合字段",
+              label: "值",
               component: "VariableInput",
-              icon: "key",
-              width: 6,
-              placeholder: "amount",
+              icon: "input",
+              width: 4,
+              placeholder: "4",
             },
           ],
         },
         {
           value: "quickcomposer.data.array.slice",
-          label: "数组切片",
+          label: "切片(slice)",
           icon: "content_cut",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 12,
               placeholder: "[1,2,3,4,5]",
             },
@@ -1124,145 +1060,149 @@ export const dataCommands = {
           ],
         },
         {
-          value: "quickcomposer.data.array.flatten",
-          label: "数组扁平化",
-          icon: "unfold_less",
+          value: "quickcomposer.data.array.filter",
+          label: "过滤(filter)",
+          icon: "filter_alt",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 8,
-              placeholder: "[[1,2],[3,4],[[5,6]]]",
+              width: 12,
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              label: "扁平化深度",
+              label: "过滤条件",
               component: "VariableInput",
-              icon: "format_indent_decrease",
-              disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
-              width: 4,
+              icon: "code",
+              width: 12,
+              placeholder: "age > 18",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.diff",
-          label: "数组差集",
-          icon: "difference",
+          value: "quickcomposer.data.array.map",
+          label: "映射(map)",
+          icon: "transform",
           config: [
             {
-              label: "数组1",
-              component: "VariableInput",
-              icon: "view_list",
-              width: 6,
-              placeholder: "[1,2,3,4]",
-            },
-            {
-              label: "数组2",
+              label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 6,
-              placeholder: "[3,4,5,6]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              label: "比较字段",
+              label: "转换函数",
               component: "VariableInput",
-              icon: "key",
+              icon: "code",
+              placeholder: "name",
               width: 12,
-              placeholder: "对象数组时使用，如: id",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.intersect",
-          label: "数组交集",
-          icon: "join_full",
+          value: "quickcomposer.data.array.find",
+          label: "查找元素(find)",
+          icon: "search",
           config: [
             {
-              label: "数组1",
-              component: "VariableInput",
-              icon: "view_list",
-              width: 6,
-              placeholder: "[1,2,3,4]",
-            },
-            {
-              label: "数组2",
+              label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 6,
-              placeholder: "[3,4,5,6]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+              placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
             },
             {
-              label: "比较字段",
+              label: "查找条件",
               component: "VariableInput",
-              icon: "key",
+              icon: "code",
               width: 12,
-              placeholder: "对象数组时使用，如: id",
+              placeholder: "id === 1",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.union",
-          label: "数组并集",
-          icon: "join_inner",
+          value: "quickcomposer.data.array.flatten",
+          label: "扁平化(flat)",
+          icon: "unfold_less",
           config: [
             {
-              label: "数组1",
-              component: "VariableInput",
-              icon: "view_list",
-              width: 6,
-              placeholder: "[1,2,3,4]",
-            },
-            {
-              label: "数组2",
+              label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 6,
-              placeholder: "[3,4,5,6]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 8,
+              placeholder: "[[1,2],[3,4],[[5,6]]]",
             },
             {
-              label: "比较字段",
+              label: "扁平化深度",
               component: "VariableInput",
-              icon: "key",
-              width: 12,
-              placeholder: "对象数组时使用，如: id",
+              icon: "format_indent_decrease",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              width: 4,
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.chunk",
-          label: "数组分块",
-          icon: "grid_view",
+          value: "quickcomposer.data.array.unique",
+          label: "去重",
+          icon: "filter_1",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 8,
-              placeholder: "[1,2,3,4,5,6]",
-            },
-            {
-              label: "块大小",
-              component: "VariableInput",
-              icon: "straighten",
-              disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              width: 4,
+              disableToggleType: true,
+              width: 12,
+              placeholder: "[1,2,3,1,2]",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.shuffle",
-          label: "数组随机排序",
-          icon: "shuffle",
+          value: "quickcomposer.data.array.sort",
+          label: "排序",
+          icon: "sort",
           config: [
             {
               label: "原始数组",
               component: "VariableInput",
               icon: "view_list",
-              width: 12,
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 4,
               placeholder: "[1,2,3,4,5]",
             },
+            {
+              label: "排序方向",
+              component: "QSelect",
+              icon: "swap_vert",
+              width: 4,
+              options: [
+                { label: "升序", value: "asc" },
+                { label: "降序", value: "desc" },
+                { label: "乱序", value: "shuffle" },
+              ],
+              defaultValue: "asc",
+            },
+            {
+              label: "排序字段(可选)",
+              component: "VariableInput",
+              icon: "key",
+              width: 4,
+              placeholder: "dept",
+            },
           ],
         },
       ],

From 4cd05732a95e21d218e9f9f8faeb928a77ff4cb9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 21:11:19 +0800
Subject: [PATCH 267/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/data/array.js   |    6 +
 plugin/lib/quickcomposer/data/index.js   |    2 +
 plugin/lib/quickcomposer/data/object.js  |   72 ++
 src/js/composer/commands/dataCommands.js | 1307 ++++++++++++++--------
 4 files changed, 894 insertions(+), 493 deletions(-)
 create mode 100644 plugin/lib/quickcomposer/data/object.js

diff --git a/plugin/lib/quickcomposer/data/array.js b/plugin/lib/quickcomposer/data/array.js
index 92e4e2e8..0a1bdff5 100644
--- a/plugin/lib/quickcomposer/data/array.js
+++ b/plugin/lib/quickcomposer/data/array.js
@@ -160,6 +160,12 @@ const array = {
     array[index] = value;
     return array;
   },
+
+  // 获取数组长度
+  length: function (array) {
+    if (!Array.isArray(array)) return 0;
+    return array.length;
+  },
 };
 
 module.exports = array;
diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index f99859c2..671ccf05 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -3,6 +3,7 @@ const buffer = require("./buffer");
 const zlib = require("./zlib");
 const { htmlParser } = require("./htmlParser");
 const array = require("./array");
+const object = require("./object");
 const time = require("./time");
 const { regexTransform } = require("./regexTransform");
 
@@ -12,6 +13,7 @@ module.exports = {
   buffer,
   zlib,
   array,
+  object,
   time,
   regexTransform,
 };
diff --git a/plugin/lib/quickcomposer/data/object.js b/plugin/lib/quickcomposer/data/object.js
new file mode 100644
index 00000000..b1b1fef4
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/object.js
@@ -0,0 +1,72 @@
+const object = {
+  // 获取对象属性值
+  get: function (obj, key) {
+    if (!obj || typeof obj !== "object") return undefined;
+    return key.split(".").reduce((o, k) => o?.[k], obj);
+  },
+
+  // 设置对象属性值
+  set: function (obj, key, value) {
+    if (!obj || typeof obj !== "object") return obj;
+    const keys = key.split(".");
+    const lastKey = keys.pop();
+    const target = keys.reduce((o, k) => {
+      if (!o[k] || typeof o[k] !== "object") {
+        o[k] = {};
+      }
+      return o[k];
+    }, obj);
+    target[lastKey] = value;
+    return obj;
+  },
+
+  // 删除对象属性
+  delete: function (obj, key) {
+    if (!obj || typeof obj !== "object") return obj;
+    const keys = key.split(".");
+    const lastKey = keys.pop();
+    const target = keys.reduce((o, k) => o?.[k], obj);
+    if (target && typeof target === "object") {
+      delete target[lastKey];
+    }
+    return obj;
+  },
+
+  // 合并对象
+  merge: function (target, ...sources) {
+    if (!target || typeof target !== "object") return target;
+    return Object.assign(target, ...sources);
+  },
+
+  // 获取对象所有键
+  keys: function (obj) {
+    if (!obj || typeof obj !== "object") return [];
+    return Object.keys(obj);
+  },
+
+  // 获取对象所有值
+  values: function (obj) {
+    if (!obj || typeof obj !== "object") return [];
+    return Object.values(obj);
+  },
+
+  // 获取对象键值对
+  entries: function (obj) {
+    if (!obj || typeof obj !== "object") return [];
+    return Object.entries(obj);
+  },
+
+  // 检查属性是否存在
+  has: function (obj, key) {
+    if (!obj || typeof obj !== "object") return false;
+    return key.split(".").reduce((o, k) => o?.[k] !== undefined, true);
+  },
+
+  // 深拷贝对象
+  clone: function (obj) {
+    if (!obj || typeof obj !== "object") return obj;
+    return JSON.parse(JSON.stringify(obj));
+  },
+};
+
+module.exports = object;
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index 544ffa9c..e4ca27d6 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -389,819 +389,1140 @@ export const dataCommands = {
       ],
     },
     {
-      value: "quickcomposer.data.regexTransform",
-      label: "正则提取/替换",
-      component: "RegexEditor",
-      componentProps: {
-        inputLabel: "要处理的文本",
-      },
-    },
-    {
-      value: "quickcomposer.data.buffer.from",
-      label: "Buffer操作",
-      config: [],
-      icon: "memory",
+      value: "Array.from",
+      label: "数组处理",
+      icon: "view_list",
       subCommands: [
         {
-          value: "quickcomposer.data.buffer.from",
-          label: "创建Buffer",
-          icon: "add_box",
+          value: "Array.from",
+          label: "创建数组",
           config: [
             {
-              label: "数据",
-              component: "VariableInput",
-              icon: "text_fields",
-              width: 9,
+              component: "ArrayEditor",
+              icon: "view_list",
+              width: 12,
             },
+          ],
+          outputs: [
             {
-              label: "编码",
-              component: "QSelect",
-              icon: "code",
-              options: [
-                { label: "UTF-8", value: "utf8" },
-                { label: "UTF-16LE", value: "utf16le" },
-                { label: "Latin1", value: "latin1" },
-                { label: "Base64", value: "base64" },
-                { label: "Hex", value: "hex" },
-                { label: "ASCII", value: "ascii" },
-                { label: "Binary", value: "binary" },
-                { label: "UCS-2", value: "ucs2" },
-              ],
-              defaultValue: "utf8",
-              width: 3,
+              label: "创建的数组",
+              suggestName: "newArray",
             },
           ],
         },
         {
-          value: "quickcomposer.data.buffer.toString",
-          label: "转换字符串",
-          icon: "text_fields",
+          value: "quickcomposer.data.array.length",
+          label: "获取长度",
+          icon: "straighten",
           config: [
             {
-              label: "Buffer",
+              label: "数组",
               component: "VariableInput",
-              icon: "memory",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 12,
             },
+          ],
+          outputs: {
+            label: "数组长度",
+            suggestName: "arrayLength",
+            typeName: "数字",
+          },
+        },
+        {
+          value: "quickcomposer.data.array.push",
+          label: "添加元素",
+          icon: "add",
+          config: [
             {
-              label: "编码",
-              component: "QSelect",
-              icon: "code",
-              options: [
-                { label: "UTF-8", value: "utf8" },
-                { label: "UTF-16LE", value: "utf16le" },
-                { label: "Latin1", value: "latin1" },
-                { label: "Base64", value: "base64" },
-                { label: "Hex", value: "hex" },
-                { label: "ASCII", value: "ascii" },
-                { label: "Binary", value: "binary" },
-                { label: "UCS-2", value: "ucs2" },
-              ],
-              defaultValue: "utf8",
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 4,
+              placeholder: "[1,2,3]",
             },
             {
-              label: "起始位置",
+              label: "要添加的元素",
               component: "VariableInput",
-              disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
-              icon: "first_page",
+              icon: "input",
               width: 4,
+              placeholder: "4",
             },
             {
-              label: "结束位置",
+              label: "位置(可选)",
               component: "VariableInput",
+              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "last_page",
               width: 4,
+              placeholder: "留空则添加到末尾",
             },
           ],
+          outputs: {
+            label: "添加后的数组",
+            suggestName: "addedArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.write",
-          label: "写入数据",
-          icon: "edit",
+          value: "quickcomposer.data.array.splice",
+          label: "删除元素",
+          icon: "delete",
           config: [
             {
-              label: "Buffer",
-              component: "VariableInput",
-              icon: "memory",
-              width: 6,
-            },
-            {
-              label: "要写入的字符串",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "edit",
-              width: 6,
+              icon: "view_list",
+              width: 12,
+              placeholder: "[1,2,3,4,5]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
             {
-              label: "偏移量",
+              label: "起始位置",
               component: "VariableInput",
+              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
-              width: 4,
+              width: 6,
+              placeholder: "1",
             },
             {
-              label: "长度",
+              label: "删除数量",
               component: "VariableInput",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "straighten",
-              width: 4,
-            },
-            {
-              label: "编码",
-              component: "QSelect",
-              icon: "code",
-              options: [
-                { label: "UTF-8", value: "utf8" },
-                { label: "UTF-16LE", value: "utf16le" },
-                { label: "Latin1", value: "latin1" },
-                { label: "Base64", value: "base64" },
-                { label: "Hex", value: "hex" },
-                { label: "ASCII", value: "ascii" },
-                { label: "Binary", value: "binary" },
-                { label: "UCS-2", value: "ucs2" },
-              ],
-              defaultValue: "utf8",
-              width: 4,
+              icon: "delete",
+              width: 6,
+              placeholder: "1",
             },
           ],
+          outputs: {
+            label: "删除后的数组",
+            suggestName: "deletedArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.fill",
-          label: "填充数据",
-          icon: "format_color_fill",
+          value: "quickcomposer.data.array.join",
+          label: "连接数组(join)",
+          icon: "join_right",
           config: [
             {
-              label: "Buffer",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "memory",
-              width: 6,
+              icon: "view_list",
+              width: 8,
+              placeholder: "[1,2,3,4,5]",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
             {
-              label: "填充值",
+              label: "连接符",
               component: "VariableInput",
-              icon: "format_color_fill",
-              width: 6,
+              icon: "swap_horiz",
+              width: 4,
+              defaultValue: newVarInputVal("str", ","),
             },
+          ],
+          outputs: {
+            label: "连接后的数组",
+            suggestName: "joinedArray",
+            typeName: "数组",
+          },
+        },
+        {
+          value: "quickcomposer.data.array.set",
+          label: "设置元素",
+          icon: "edit",
+          config: [
             {
-              label: "起始位置",
+              label: "原始数组",
               component: "VariableInput",
-              disableToggleType: true,
+              icon: "view_list",
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
+              disableToggleType: true,
               width: 4,
             },
             {
-              label: "结束位置",
+              label: "位置",
               component: "VariableInput",
+              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "last_page",
               width: 4,
+              placeholder: "1",
             },
             {
-              label: "编码",
-              component: "QSelect",
-              icon: "code",
-              options: [
-                { label: "UTF-8", value: "utf8" },
-                { label: "UTF-16LE", value: "utf16le" },
-                { label: "Latin1", value: "latin1" },
-                { label: "Base64", value: "base64" },
-                { label: "Hex", value: "hex" },
-                { label: "ASCII", value: "ascii" },
-                { label: "Binary", value: "binary" },
-                { label: "UCS-2", value: "ucs2" },
-              ],
-              defaultValue: "utf8",
+              label: "值",
+              component: "VariableInput",
+              icon: "input",
               width: 4,
+              placeholder: "4",
             },
           ],
+          outputs: {
+            label: "设置后的数组",
+            suggestName: "newArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.copy",
-          label: "复制数据",
-          icon: "content_copy",
+          value: "quickcomposer.data.array.slice",
+          label: "切片(slice)",
+          icon: "content_cut",
           config: [
             {
-              label: "源Buffer",
-              component: "VariableInput",
-              icon: "content_copy",
-              width: 6,
-            },
-            {
-              label: "目标Buffer",
-              component: "VariableInput",
-              icon: "save",
-              width: 6,
-            },
-            {
-              label: "目标起始位置",
+              label: "原始数组",
               component: "VariableInput",
-              disableToggleType: true,
+              icon: "view_list",
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
-              width: 4,
+              disableToggleType: true,
+              width: 12,
+              placeholder: "[1,2,3,4,5]",
             },
             {
-              label: "源起始位置",
+              label: "起始位置",
               component: "VariableInput",
+              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
-              width: 4,
+              width: 6,
+              placeholder: "1",
             },
             {
-              label: "源结束位置",
+              label: "结束位置",
               component: "VariableInput",
+              icon: "last_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "last_page",
-              width: 4,
+              width: 6,
+              placeholder: "3",
             },
           ],
+          outputs: {
+            label: "切片后的数组",
+            suggestName: "slicedArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.compare",
-          label: "比较数据",
-          icon: "compare",
+          value: "quickcomposer.data.array.filter",
+          label: "过滤(filter)",
+          icon: "filter_alt",
           config: [
             {
-              label: "Buffer 1",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "memory",
-              width: 6,
+              icon: "view_list",
+              width: 12,
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              label: "Buffer 2",
+              label: "过滤条件",
               component: "VariableInput",
-              icon: "memory",
-              width: 6,
+              icon: "code",
+              width: 12,
+              placeholder: "age > 18",
             },
           ],
+          outputs: {
+            label: "过滤后的数组",
+            suggestName: "filteredArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.concat",
-          label: "连接Buffer",
-          icon: "merge",
+          value: "quickcomposer.data.array.map",
+          label: "映射(map)",
+          icon: "transform",
           config: [
             {
-              label: "Buffer",
-              component: "ArrayEditor",
-              icon: "memory",
-              width: 12,
-              defaultValue: [newVarInputVal("var")],
-              defaultRowValue: newVarInputVal("var"),
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
               disableToggleType: true,
+              width: 12,
+              placeholder:
+                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              label: "总长度（可选）",
+              label: "转换函数",
               component: "VariableInput",
-              disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
-              icon: "straighten",
+              icon: "code",
+              placeholder: "name",
               width: 12,
             },
           ],
+          outputs: {
+            label: "映射后的数组",
+            suggestName: "mappedArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.slice",
-          label: "切片数据",
-          icon: "content_cut",
+          value: "quickcomposer.data.array.find",
+          label: "查找元素(find)",
+          icon: "search",
           config: [
             {
-              label: "Buffer",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "memory",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 12,
+              placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
             },
             {
-              label: "起始位置",
+              label: "查找条件",
               component: "VariableInput",
-              disableToggleType: true,
+              icon: "code",
+              width: 12,
+              placeholder: "id === 1",
+            },
+          ],
+          outputs: {
+            label: "查找的元素",
+            suggestName: "foundElement",
+            typeName: "对象",
+          },
+        },
+        {
+          value: "quickcomposer.data.array.flatten",
+          label: "扁平化(flat)",
+          icon: "unfold_less",
+          config: [
+            {
+              label: "原始数组",
+              component: "VariableInput",
+              icon: "view_list",
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
-              width: 6,
+              disableToggleType: true,
+              width: 8,
+              placeholder: "[[1,2],[3,4],[[5,6]]]",
             },
             {
-              label: "结束位置",
+              label: "扁平化深度",
               component: "VariableInput",
+              icon: "format_indent_decrease",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "last_page",
-              width: 6,
+              width: 4,
             },
           ],
+          outputs: {
+            label: "扁平化后的数组",
+            suggestName: "flattenedArray",
+            typeName: "数组",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.indexOf",
-          label: "查找数据",
-          icon: "search",
+          value: "quickcomposer.data.array.unique",
+          label: "去重",
+          icon: "filter_1",
           config: [
             {
-              label: "Buffer",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "memory",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 12,
+              placeholder: "[1,2,3,1,2]",
             },
+          ],
+          outputs: {
+            label: "去重后的数组",
+            suggestName: "uniqueArray",
+            typeName: "数组",
+          },
+        },
+        {
+          value: "quickcomposer.data.array.sort",
+          label: "排序",
+          icon: "sort",
+          config: [
             {
-              label: "要查找的值",
+              label: "原始数组",
               component: "VariableInput",
-              icon: "search",
+              icon: "view_list",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
               width: 4,
+              placeholder: "[1,2,3,4,5]",
             },
             {
-              label: "起始位置",
+              label: "排序方向",
+              component: "QSelect",
+              icon: "swap_vert",
+              width: 4,
+              options: [
+                { label: "升序", value: "asc" },
+                { label: "降序", value: "desc" },
+                { label: "乱序", value: "shuffle" },
+              ],
+              defaultValue: "asc",
+            },
+            {
+              label: "排序字段(可选)",
               component: "VariableInput",
-              disableToggleType: true,
+              icon: "key",
+              width: 4,
+              placeholder: "dept",
+            },
+          ],
+          outputs: {
+            label: "排序后的数组",
+            suggestName: "sortedArray",
+            typeName: "数组",
+          },
+        },
+      ],
+    },
+    {
+      value: "new Object",
+      label: "对象处理",
+      icon: "data_object",
+      subCommands: [
+        {
+          value: "new Object",
+          label: "新建对象",
+          icon: "key",
+          config: [
+            {
+              component: "DictEditor",
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "新建的对象",
+            suggestName: "newObject",
+            typeName: "对象",
+          },
+        },
+        {
+          value: "quickcomposer.data.object.get",
+          label: "获取属性",
+          icon: "key",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
               defaultValue: newVarInputVal("var"),
-              icon: "first_page",
+              disableToggleType: true,
+              width: 8,
+            },
+            {
+              label: "属性",
+              component: "VariableInput",
+              icon: "key",
               width: 4,
+              placeholder: "name 或 user.name",
             },
+          ],
+          outputs: {
+            label: "获取的属性",
+            suggestName: "getProperty",
+            typeName: "字符串",
+          },
+        },
+        {
+          value: "quickcomposer.data.object.set",
+          label: "设置属性",
+          icon: "edit",
+          config: [
             {
-              label: "编码",
-              component: "QSelect",
-              icon: "code",
-              options: [
-                { label: "UTF-8", value: "utf8" },
-                { label: "UTF-16LE", value: "utf16le" },
-                { label: "Latin1", value: "latin1" },
-                { label: "Base64", value: "base64" },
-                { label: "Hex", value: "hex" },
-                { label: "ASCII", value: "ascii" },
-                { label: "Binary", value: "binary" },
-                { label: "UCS-2", value: "ucs2" },
-              ],
-              defaultValue: "utf8",
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+            {
+              label: "属性",
+              component: "VariableInput",
+              icon: "key",
+              width: 6,
+              placeholder: "name 或 user.name",
+            },
+            {
+              label: "值",
+              component: "VariableInput",
+              icon: "edit",
+              width: 6,
+            },
+          ],
+          outputs: {
+            label: "设置后的对象",
+            suggestName: "newObject",
+            typeName: "对象",
+          },
+        },
+        {
+          value: "quickcomposer.data.object.delete",
+          label: "删除属性",
+          icon: "delete",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 8,
+            },
+            {
+              label: "属性",
+              component: "VariableInput",
+              icon: "key",
               width: 4,
+              placeholder: "name 或 user.name",
             },
           ],
+          outputs: {
+            label: "删除后的对象",
+            suggestName: "newObject",
+            typeName: "对象",
+          },
         },
         {
-          value: "quickcomposer.data.buffer.swap",
-          label: "交换字节序",
-          icon: "swap_horiz",
+          value: "quickcomposer.data.object.merge",
+          label: "合并对象",
+          icon: "merge",
           config: [
             {
-              label: "Buffer",
+              label: "目标对象",
               component: "VariableInput",
-              icon: "memory",
-              width: 9,
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
             },
             {
-              label: "字节大小",
-              component: "QSelect",
-              icon: "memory",
-              options: [
-                { label: "16位", value: 16 },
-                { label: "32位", value: 32 },
-                { label: "64位", value: 64 },
-              ],
-              defaultValue: 16,
-              width: 3,
+              label: "源对象列表",
+              component: "ArrayEditor",
+              icon: "data_object",
+              width: 12,
+              defaultValue: [newVarInputVal("var")],
+              defaultRowValue: newVarInputVal("var"),
+              disableToggleType: true,
             },
           ],
+          outputs: {
+            label: "合并后的对象",
+            suggestName: "newObject",
+            typeName: "对象",
+          },
         },
-      ],
-    },
-    {
-      value: "quickcomposer.data.zlib",
-      label: "数据压缩解压",
-      component: "ZlibEditor",
-      icon: "compress",
-      asyncMode: "await",
-    },
-    {
-      value: "quickcomposer.data.htmlParser",
-      label: "HTML解析",
-      icon: "html",
-      config: [
         {
-          label: "要解析的 HTML",
-          component: "VariableInput",
-          icon: "html",
-          placeholder: "例如：<div>Hello, World!</div>",
-          width: 12,
+          value: "quickcomposer.data.object.has",
+          label: "检查属性",
+          icon: "check_circle",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 8,
+            },
+            {
+              label: "属性",
+              component: "VariableInput",
+              icon: "key",
+              width: 4,
+              placeholder: "name 或 user.name",
+            },
+          ],
+          outputs: {
+            label: "检查结果",
+            suggestName: "checkResult",
+            typeName: "布尔",
+          },
         },
         {
-          label: "CSS选择器（可选）",
-          component: "VariableInput",
-          icon: "css",
-          placeholder: "例如：.class",
-          width: 7,
+          value: "quickcomposer.data.object.keys",
+          label: "获取所有键",
+          icon: "key",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "获取的键",
+            suggestName: "objectKeys",
+            typeName: "数组",
+          },
         },
         {
-          label: "属性（可选）",
-          component: "VariableInput",
-          icon: "colorize",
-          options: {
-            items: [
-              { label: "innerText", value: "innerText" },
-              { label: "innerHTML", value: "innerHTML" },
-              { label: "href", value: "href" },
-              { label: "src", value: "src" },
-              { label: "value", value: "value" },
-            ],
+          value: "quickcomposer.data.object.values",
+          label: "获取所有值",
+          icon: "view_list",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "获取的值",
+            suggestName: "objectValues",
+            typeName: "数组",
           },
-          defaultValue: newVarInputVal("str"),
-          width: 5,
         },
-      ],
-    },
-    {
-      value: "quickcommand.markdownParse",
-      label: "Markdown解析",
-      icon: "file_download",
-      config: [
         {
-          label: "要解析的Markdown",
-          component: "VariableInput",
-          icon: "file_download",
-          width: 12,
+          value: "quickcomposer.data.object.entries",
+          label: "获取键值对",
+          icon: "view_list",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "获取的键值对",
+            suggestName: "objectEntries",
+            typeName: "数组",
+          },
         },
-      ],
-      outputs: [
         {
-          label: "解析后的HTML",
-          suggestName: "parsedHtml",
+          value: "quickcomposer.data.object.clone",
+          label: "深拷贝对象",
+          icon: "content_copy",
+          config: [
+            {
+              label: "原始对象",
+              component: "VariableInput",
+              icon: "data_object",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "深拷贝后的对象",
+            suggestName: "newObject",
+            typeName: "对象",
+          },
         },
       ],
     },
     {
-      value: "JSON.stringify",
-      label: "JSON处理",
-      icon: "data_object",
+      value: "quickcomposer.data.regexTransform",
+      label: "正则提取/替换",
+      component: "RegexEditor",
+      componentProps: {
+        inputLabel: "要处理的文本",
+      },
+    },
+    {
+      value: "quickcomposer.data.buffer.from",
+      label: "Buffer操作",
+      config: [],
+      icon: "memory",
       subCommands: [
         {
-          value: "JSON.stringify",
-          label: "JSON序列化",
-          icon: "data_object",
+          value: "quickcomposer.data.buffer.from",
+          label: "创建Buffer",
+          icon: "add_box",
+          config: [
+            {
+              label: "数据",
+              component: "VariableInput",
+              icon: "text_fields",
+              width: 9,
+            },
+            {
+              label: "编码",
+              component: "QSelect",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 3,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.toString",
+          label: "转换字符串",
+          icon: "text_fields",
           config: [
             {
-              label: "要序列化的对象",
+              label: "Buffer",
               component: "VariableInput",
-              icon: "input",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
+              icon: "memory",
               width: 12,
             },
             {
-              label: "替换函数/指定属性",
-              component: "VariableInput",
-              icon: "swap_horiz",
-              defaultValue: newVarInputVal("var", "null"),
-              disableToggleType: true,
-              width: 6,
+              label: "编码",
+              component: "QSelect",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
             },
             {
-              label: "缩进",
-              component: "NumberInput",
-              icon: "format_indent_increase",
-              defaultValue: 2,
-              step: 1,
-              min: 0,
-              width: 6,
+              label: "起始位置",
+              component: "VariableInput",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "first_page",
+              width: 4,
             },
-          ],
-        },
-        {
-          value: "JSON.parse",
-          label: "JSON反序列化",
-          icon: "text_fields",
-          config: [
             {
-              label: "要反序列化的JSON字符串",
+              label: "结束位置",
               component: "VariableInput",
-              icon: "input",
-              width: 12,
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "last_page",
+              width: 4,
             },
           ],
         },
-      ],
-    },
-    {
-      value: "Array.from",
-      label: "数组处理",
-      icon: "view_list",
-      subCommands: [
         {
-          value: "Array.from",
-          label: "创建数组",
+          value: "quickcomposer.data.buffer.write",
+          label: "写入数据",
+          icon: "edit",
           config: [
             {
-              component: "ArrayEditor",
-              icon: "view_list",
-              width: 12,
+              label: "Buffer",
+              component: "VariableInput",
+              icon: "memory",
+              width: 6,
             },
-          ],
-          outputs: [
             {
-              label: "创建的数组",
-              suggestName: "newArray",
+              label: "要写入的字符串",
+              component: "VariableInput",
+              icon: "edit",
+              width: 6,
             },
-          ],
-        },
-        {
-          value: "quickcomposer.data.array.push",
-          label: "添加元素",
-          icon: "add",
-          config: [
             {
-              label: "原始数组",
+              label: "偏移量",
               component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
               disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "first_page",
               width: 4,
-              placeholder: "[1,2,3]",
             },
             {
-              label: "要添加的元素",
+              label: "长度",
               component: "VariableInput",
-              icon: "input",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "straighten",
               width: 4,
-              placeholder: "4",
             },
             {
-              label: "位置(可选)",
-              component: "VariableInput",
-              icon: "first_page",
-              disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
+              label: "编码",
+              component: "QSelect",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
               width: 4,
-              placeholder: "留空则添加到末尾",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.splice",
-          label: "删除元素",
-          icon: "delete",
+          value: "quickcomposer.data.buffer.fill",
+          label: "填充数据",
+          icon: "format_color_fill",
           config: [
             {
-              label: "原始数组",
+              label: "Buffer",
               component: "VariableInput",
-              icon: "view_list",
-              width: 12,
-              placeholder: "[1,2,3,4,5]",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
+              icon: "memory",
+              width: 6,
+            },
+            {
+              label: "填充值",
+              component: "VariableInput",
+              icon: "format_color_fill",
+              width: 6,
             },
             {
               label: "起始位置",
               component: "VariableInput",
-              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              width: 6,
-              placeholder: "1",
+              icon: "first_page",
+              width: 4,
             },
             {
-              label: "删除数量",
+              label: "结束位置",
               component: "VariableInput",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
-              icon: "delete",
-              width: 6,
-              placeholder: "1",
+              icon: "last_page",
+              width: 4,
+            },
+            {
+              label: "编码",
+              component: "QSelect",
+              icon: "code",
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.join",
-          label: "连接数组(join)",
-          icon: "join_right",
+          value: "quickcomposer.data.buffer.copy",
+          label: "复制数据",
+          icon: "content_copy",
           config: [
             {
-              label: "原始数组",
+              label: "源Buffer",
               component: "VariableInput",
-              icon: "view_list",
-              width: 8,
-              placeholder: "[1,2,3,4,5]",
+              icon: "content_copy",
+              width: 6,
+            },
+            {
+              label: "目标Buffer",
+              component: "VariableInput",
+              icon: "save",
+              width: 6,
+            },
+            {
+              label: "目标起始位置",
+              component: "VariableInput",
+              disableToggleType: true,
               defaultValue: newVarInputVal("var"),
+              icon: "first_page",
+              width: 4,
+            },
+            {
+              label: "源起始位置",
+              component: "VariableInput",
               disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "first_page",
+              width: 4,
             },
             {
-              label: "连接符",
+              label: "源结束位置",
               component: "VariableInput",
-              icon: "swap_horiz",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "last_page",
               width: 4,
-              defaultValue: newVarInputVal("str", ","),
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.set",
-          label: "设置元素",
-          icon: "edit",
+          value: "quickcomposer.data.buffer.compare",
+          label: "比较数据",
+          icon: "compare",
           config: [
             {
-              label: "原始数组",
+              label: "Buffer 1",
               component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              width: 4,
+              icon: "memory",
+              width: 6,
             },
             {
-              label: "位置",
+              label: "Buffer 2",
               component: "VariableInput",
-              icon: "first_page",
+              icon: "memory",
+              width: 6,
+            },
+          ],
+        },
+        {
+          value: "quickcomposer.data.buffer.concat",
+          label: "连接Buffer",
+          icon: "merge",
+          config: [
+            {
+              label: "Buffer",
+              component: "ArrayEditor",
+              icon: "memory",
+              width: 12,
+              defaultValue: [newVarInputVal("var")],
+              defaultRowValue: newVarInputVal("var"),
               disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
-              width: 4,
-              placeholder: "1",
             },
             {
-              label: "值",
+              label: "总长度（可选）",
               component: "VariableInput",
-              icon: "input",
-              width: 4,
-              placeholder: "4",
+              disableToggleType: true,
+              defaultValue: newVarInputVal("var"),
+              icon: "straighten",
+              width: 12,
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.slice",
-          label: "切片(slice)",
+          value: "quickcomposer.data.buffer.slice",
+          label: "切片数据",
           icon: "content_cut",
           config: [
             {
-              label: "原始数组",
+              label: "Buffer",
               component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
+              icon: "memory",
               width: 12,
-              placeholder: "[1,2,3,4,5]",
             },
             {
               label: "起始位置",
               component: "VariableInput",
-              icon: "first_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
+              icon: "first_page",
               width: 6,
-              placeholder: "1",
             },
             {
               label: "结束位置",
               component: "VariableInput",
-              icon: "last_page",
               disableToggleType: true,
               defaultValue: newVarInputVal("var"),
+              icon: "last_page",
               width: 6,
-              placeholder: "3",
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.filter",
-          label: "过滤(filter)",
-          icon: "filter_alt",
+          value: "quickcomposer.data.buffer.indexOf",
+          label: "查找数据",
+          icon: "search",
           config: [
             {
-              label: "原始数组",
+              label: "Buffer",
               component: "VariableInput",
-              icon: "view_list",
+              icon: "memory",
               width: 12,
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              placeholder:
-                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
             },
             {
-              label: "过滤条件",
+              label: "要查找的值",
               component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "age > 18",
+              icon: "search",
+              width: 4,
             },
-          ],
-        },
-        {
-          value: "quickcomposer.data.array.map",
-          label: "映射(map)",
-          icon: "transform",
-          config: [
             {
-              label: "原始数组",
+              label: "起始位置",
               component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
               disableToggleType: true,
-              width: 12,
-              placeholder:
-                '[{"id":1,"name":"张三","age":20},{"id":2,"name":"李四","age":18}]',
+              defaultValue: newVarInputVal("var"),
+              icon: "first_page",
+              width: 4,
             },
             {
-              label: "转换函数",
-              component: "VariableInput",
+              label: "编码",
+              component: "QSelect",
               icon: "code",
-              placeholder: "name",
-              width: 12,
+              options: [
+                { label: "UTF-8", value: "utf8" },
+                { label: "UTF-16LE", value: "utf16le" },
+                { label: "Latin1", value: "latin1" },
+                { label: "Base64", value: "base64" },
+                { label: "Hex", value: "hex" },
+                { label: "ASCII", value: "ascii" },
+                { label: "Binary", value: "binary" },
+                { label: "UCS-2", value: "ucs2" },
+              ],
+              defaultValue: "utf8",
+              width: 4,
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.find",
-          label: "查找元素(find)",
-          icon: "search",
+          value: "quickcomposer.data.buffer.swap",
+          label: "交换字节序",
+          icon: "swap_horiz",
           config: [
             {
-              label: "原始数组",
+              label: "Buffer",
               component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              width: 12,
-              placeholder: '[{"id":1,"name":"张三"},{"id":2,"name":"李四"}]',
+              icon: "memory",
+              width: 9,
             },
             {
-              label: "查找条件",
-              component: "VariableInput",
-              icon: "code",
-              width: 12,
-              placeholder: "id === 1",
+              label: "字节大小",
+              component: "QSelect",
+              icon: "memory",
+              options: [
+                { label: "16位", value: 16 },
+                { label: "32位", value: 32 },
+                { label: "64位", value: 64 },
+              ],
+              defaultValue: 16,
+              width: 3,
             },
           ],
         },
+      ],
+    },
+    {
+      value: "quickcomposer.data.zlib",
+      label: "数据压缩解压",
+      component: "ZlibEditor",
+      icon: "compress",
+      asyncMode: "await",
+    },
+    {
+      value: "quickcomposer.data.htmlParser",
+      label: "HTML解析",
+      icon: "html",
+      config: [
         {
-          value: "quickcomposer.data.array.flatten",
-          label: "扁平化(flat)",
-          icon: "unfold_less",
+          label: "要解析的 HTML",
+          component: "VariableInput",
+          icon: "html",
+          placeholder: "例如：<div>Hello, World!</div>",
+          width: 12,
+        },
+        {
+          label: "CSS选择器（可选）",
+          component: "VariableInput",
+          icon: "css",
+          placeholder: "例如：.class",
+          width: 7,
+        },
+        {
+          label: "属性（可选）",
+          component: "VariableInput",
+          icon: "colorize",
+          options: {
+            items: [
+              { label: "innerText", value: "innerText" },
+              { label: "innerHTML", value: "innerHTML" },
+              { label: "href", value: "href" },
+              { label: "src", value: "src" },
+              { label: "value", value: "value" },
+            ],
+          },
+          defaultValue: newVarInputVal("str"),
+          width: 5,
+        },
+      ],
+    },
+    {
+      value: "quickcommand.markdownParse",
+      label: "Markdown解析",
+      icon: "file_download",
+      config: [
+        {
+          label: "要解析的Markdown",
+          component: "VariableInput",
+          icon: "file_download",
+          width: 12,
+        },
+      ],
+      outputs: [
+        {
+          label: "解析后的HTML",
+          suggestName: "parsedHtml",
+        },
+      ],
+    },
+    {
+      value: "JSON.stringify",
+      label: "JSON处理",
+      icon: "data_object",
+      subCommands: [
+        {
+          value: "JSON.stringify",
+          label: "JSON序列化",
+          icon: "data_object",
           config: [
             {
-              label: "原始数组",
+              label: "要序列化的对象",
               component: "VariableInput",
-              icon: "view_list",
+              icon: "input",
               defaultValue: newVarInputVal("var"),
               disableToggleType: true,
-              width: 8,
-              placeholder: "[[1,2],[3,4],[[5,6]]]",
+              width: 12,
             },
             {
-              label: "扁平化深度",
+              label: "替换函数/指定属性",
               component: "VariableInput",
-              icon: "format_indent_decrease",
+              icon: "swap_horiz",
+              defaultValue: newVarInputVal("var", "null"),
               disableToggleType: true,
-              defaultValue: newVarInputVal("var"),
-              width: 4,
+              width: 6,
             },
-          ],
-        },
-        {
-          value: "quickcomposer.data.array.unique",
-          label: "去重",
-          icon: "filter_1",
-          config: [
             {
-              label: "原始数组",
-              component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              width: 12,
-              placeholder: "[1,2,3,1,2]",
+              label: "缩进",
+              component: "NumberInput",
+              icon: "format_indent_increase",
+              defaultValue: 2,
+              step: 1,
+              min: 0,
+              width: 6,
             },
           ],
         },
         {
-          value: "quickcomposer.data.array.sort",
-          label: "排序",
-          icon: "sort",
+          value: "JSON.parse",
+          label: "JSON反序列化",
+          icon: "text_fields",
           config: [
             {
-              label: "原始数组",
-              component: "VariableInput",
-              icon: "view_list",
-              defaultValue: newVarInputVal("var"),
-              disableToggleType: true,
-              width: 4,
-              placeholder: "[1,2,3,4,5]",
-            },
-            {
-              label: "排序方向",
-              component: "QSelect",
-              icon: "swap_vert",
-              width: 4,
-              options: [
-                { label: "升序", value: "asc" },
-                { label: "降序", value: "desc" },
-                { label: "乱序", value: "shuffle" },
-              ],
-              defaultValue: "asc",
-            },
-            {
-              label: "排序字段(可选)",
+              label: "要反序列化的JSON字符串",
               component: "VariableInput",
-              icon: "key",
-              width: 4,
-              placeholder: "dept",
+              icon: "input",
+              width: 12,
             },
           ],
         },

From aff275fa7fb99f6c44acad31740eb3f7e752981c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Feb 2025 21:17:41 +0800
Subject: [PATCH 268/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/data/index.js   |  2 +
 plugin/lib/quickcomposer/data/type.js    | 12 ++++++
 src/js/composer/commands/dataCommands.js | 54 ++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 plugin/lib/quickcomposer/data/type.js

diff --git a/plugin/lib/quickcomposer/data/index.js b/plugin/lib/quickcomposer/data/index.js
index 671ccf05..61b74249 100644
--- a/plugin/lib/quickcomposer/data/index.js
+++ b/plugin/lib/quickcomposer/data/index.js
@@ -4,6 +4,7 @@ const zlib = require("./zlib");
 const { htmlParser } = require("./htmlParser");
 const array = require("./array");
 const object = require("./object");
+const type = require("./type");
 const time = require("./time");
 const { regexTransform } = require("./regexTransform");
 
@@ -15,5 +16,6 @@ module.exports = {
   array,
   object,
   time,
+  type,
   regexTransform,
 };
diff --git a/plugin/lib/quickcomposer/data/type.js b/plugin/lib/quickcomposer/data/type.js
new file mode 100644
index 00000000..ef04920e
--- /dev/null
+++ b/plugin/lib/quickcomposer/data/type.js
@@ -0,0 +1,12 @@
+const get = (value) => {
+  return typeof value;
+};
+
+const check = (value, type) => {
+  return typeof value === type;
+};
+
+module.exports = {
+  get,
+  check,
+};
diff --git a/src/js/composer/commands/dataCommands.js b/src/js/composer/commands/dataCommands.js
index e4ca27d6..60d100eb 100644
--- a/src/js/composer/commands/dataCommands.js
+++ b/src/js/composer/commands/dataCommands.js
@@ -5,6 +5,60 @@ export const dataCommands = {
   icon: "format_color_text",
   defaultOpened: false,
   commands: [
+    {
+      value: "typeof",
+      label: "类型检查",
+      icon: "check_circle",
+      subCommands: [
+        {
+          value: "quickcomposer.data.type.get",
+          label: "获取类型",
+          icon: "text_fields",
+          outputs: {
+            label: "类型",
+            suggestName: "valueType",
+            typeName: "字符串",
+          },
+        },
+        {
+          value: "quickcomposer.data.type.check",
+          label: "判断类型",
+          icon: "text_fields",
+          config: [
+            {
+              component: "QSelect",
+              icon: "text_fields",
+              options: [
+                { label: "字符串", value: "string" },
+                { label: "数字", value: "number" },
+                { label: "布尔", value: "boolean" },
+                { label: "数组", value: "array" },
+                { label: "对象", value: "object" },
+                { label: "函数", value: "function" },
+                { label: "空", value: "null" },
+                { label: "未定义", value: "undefined" },
+                { label: "Buffer", value: "buffer" },
+              ],
+              width: 12,
+            },
+          ],
+          outputs: {
+            label: "判断结果",
+            suggestName: "isType",
+            typeName: "布尔",
+          },
+        },
+      ],
+      config: [
+        {
+          label: "要检查的值",
+          component: "VariableInput",
+          defaultValue: newVarInputVal("var"),
+          icon: "text_fields",
+          width: 12,
+        },
+      ],
+    },
     {
       value: "quickcomposer.data.string.reverse",
       label: "字符串处理",

From 9f9494a600c2e1d33d6c48f15af971b7161d2aee Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 28 Feb 2025 09:08:00 +0800
Subject: [PATCH 269/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E5=92=8C?=
 =?UTF-8?q?utools=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 100fc09c..f94bf387 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -13,6 +13,7 @@
           width: fromUtools ? '100%' : '700px',
           overflow: 'hidden',
         }"
+        class="command-run-result"
       >
         <div
           v-if="!(enableHtml && fromUtools)"
@@ -384,3 +385,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.command-run-result {
+  background-color: var(--utools-bg-color);
+}
+</style>

From 70a2fb68bb66cee4b48b8633d1389900a0c05509 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 28 Feb 2025 09:35:55 +0800
Subject: [PATCH 270/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0console.clear?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/preload.js                    | 3 +++
 src/components/CommandRunResult.vue  | 8 ++++++--
 src/plugins/monaco/types/common.d.ts | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugin/preload.js b/plugin/preload.js
index 53460f69..d5ce1289 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -179,6 +179,9 @@ window.runCodeInSandbox = (code, callback, addVars = {}) => {
     error: (...stderr) => {
       callback(null, stderr);
     },
+    clear: () => {
+      callback({ __clearQuickcommandRunResult: true }, null);
+    },
   };
   let sandboxWithAD = Object.assign(addVars, sandbox);
   sandboxWithAD.quickcommand = window.lodashM.cloneDeep(quickcommand);
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index f94bf387..a8c58561 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -301,9 +301,13 @@ export default {
     },
     // 显示运行结果
     async showRunResult(content, isSuccess) {
-      content = await this.handleContent(content);
+      if (content.__clearQuickcommandRunResult) {
+        this.runResult = [];
+      } else {
+        content = await this.handleContent(content);
+        this.runResult = this.runResult.concat(content);
+      }
       this.runResultStatus = isSuccess;
-      this.runResult = this.runResult.concat(content);
       // 刷新组件
       this.isResultShow
         ? (this.timeStamp = new Date().getTime())
diff --git a/src/plugins/monaco/types/common.d.ts b/src/plugins/monaco/types/common.d.ts
index e254b834..26864a8f 100644
--- a/src/plugins/monaco/types/common.d.ts
+++ b/src/plugins/monaco/types/common.d.ts
@@ -86,7 +86,8 @@ declare function fetch(
 // console
 declare var console: {
   log(message?: any): void,
-  error(message?: any): void
+  error(message?: any): void,
+  clear(): void,
 }
 
 declare var setTimeout: (callback: () => void, ms: number) => number;

From 2ae602d416268c0d96eb2d3c33f52df2f59e6a32 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 28 Feb 2025 17:21:10 +0800
Subject: [PATCH 271/332] =?UTF-8?q?window=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E5=99=A8?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/csharp/explorer.cs                | 161 +++++++++++++++++++
 plugin/lib/quickcomposer/windows/explorer.js |  49 ++++++
 plugin/lib/quickcomposer/windows/index.js    |   2 +
 src/js/composer/commands/windowsCommands.js  |  64 ++++++++
 src/plugins/monaco/types/quickcomposer.d.ts  |  26 +++
 5 files changed, 302 insertions(+)
 create mode 100644 plugin/lib/csharp/explorer.cs
 create mode 100644 plugin/lib/quickcomposer/windows/explorer.js

diff --git a/plugin/lib/csharp/explorer.cs b/plugin/lib/csharp/explorer.cs
new file mode 100644
index 00000000..8e868f1e
--- /dev/null
+++ b/plugin/lib/csharp/explorer.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Script.Serialization;
+
+public class ExplorerManager
+{
+  public static void Main(string[] args)
+  {
+    if (args.Length == 0 || args[0] == "-h" || args[0] == "--help")
+    {
+      ShowHelp();
+      return;
+    }
+
+    try
+    {
+      string type = GetArgumentValue(args, "-type");
+      if (string.IsNullOrEmpty(type))
+      {
+        throw new Exception("必须指定操作类型 (-type)");
+      }
+
+      switch (type.ToLower())
+      {
+        case "list":
+          ListExplorerWindows();
+          break;
+
+        case "navigate":
+          string handle = GetArgumentValue(args, "-handle");
+          string path = GetArgumentValue(args, "-path");
+          if (string.IsNullOrEmpty(handle) || string.IsNullOrEmpty(path))
+          {
+            throw new Exception("必须指定窗口句柄和目标路径");
+          }
+          NavigateToPath(long.Parse(handle), path);
+          break;
+
+        default:
+          throw new Exception(string.Format("不支持的操作类型: {0}", type));
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+    }
+  }
+
+  private static void ListExplorerWindows()
+  {
+    var explorerWindows = new List<Dictionary<string, object>>();
+
+    try
+    {
+      dynamic shellApp = Activator.CreateInstance(Type.GetTypeFromProgID("Shell.Application"));
+      dynamic windows = shellApp.Windows();
+
+      foreach (dynamic window in windows)
+      {
+        try
+        {
+          string locationUrl = window.LocationURL;
+          if (string.IsNullOrEmpty(locationUrl)) continue;
+
+          string path = new Uri(locationUrl).LocalPath;
+          explorerWindows.Add(new Dictionary<string, object>
+                    {
+                        { "handle", window.HWND },
+                        { "title", window.LocationName },
+                        { "path", path },
+                        { "class", "CabinetWClass" }
+                    });
+        }
+        catch
+        {
+          // 忽略获取信息失败的窗口
+        }
+      }
+    }
+    catch (Exception ex)
+    {
+      Console.Error.WriteLine(string.Format("Error: {0}", ex.Message));
+      return;
+    }
+
+    var serializer = new JavaScriptSerializer();
+    Console.WriteLine(serializer.Serialize(explorerWindows));
+  }
+
+  private static void NavigateToPath(long handle, string path)
+  {
+    try
+    {
+      dynamic shellApp = Activator.CreateInstance(Type.GetTypeFromProgID("Shell.Application"));
+      dynamic windows = shellApp.Windows();
+
+      foreach (dynamic window in windows)
+      {
+        try
+        {
+          if (window.HWND == handle)
+          {
+            window.Navigate(path);
+            Console.WriteLine("true");
+            return;
+          }
+        }
+        catch
+        {
+          // 忽略单个窗口的错误
+        }
+      }
+      throw new Exception("未找到指定的窗口");
+    }
+    catch (Exception ex)
+    {
+      throw new Exception(string.Format("导航失败: {0}", ex.Message));
+    }
+  }
+
+  private static string GetArgumentValue(string[] args, string key)
+  {
+    int index = Array.IndexOf(args, key);
+    if (index >= 0 && index < args.Length - 1)
+    {
+      return args[index + 1];
+    }
+    return null;
+  }
+
+  private static void ShowHelp()
+  {
+    Console.WriteLine(@"
+Windows 资源管理器工具使用说明
+==========================
+
+基本语法:
+explorer.exe -type <操作类型> [参数...]
+
+操作类型:
+--------
+1. list      - 列出所有打开的资源管理器窗口
+2. navigate  - 导航到指定路径
+   参数:
+   -handle   窗口句柄
+   -path     目标路径
+
+返回值:
+------
+list: JSON格式的窗口信息数组
+navigate: true表示成功
+
+使用示例:
+--------
+1. 列出所有资源管理器窗口：
+   explorer.exe -type list
+2. 导航到指定路径：
+   explorer.exe -type navigate -handle 12345 -path ""C:\Windows""
+");
+  }
+}
diff --git a/plugin/lib/quickcomposer/windows/explorer.js b/plugin/lib/quickcomposer/windows/explorer.js
new file mode 100644
index 00000000..9b2847a6
--- /dev/null
+++ b/plugin/lib/quickcomposer/windows/explorer.js
@@ -0,0 +1,49 @@
+const { runCsharpFeature } = require("../../csharp");
+
+/**
+ * 执行资源管理器操作
+ * @param {string} type - 操作类型, 可选值: "list"|"navigate"
+ * @param {Object} params - 参数对象
+ * @returns {Promise<Object[]|boolean>} - 操作结果
+ */
+async function runExplorer(type, params = {}) {
+  const args = ["-type", type];
+
+  // 添加导航相关参数
+  if (type === "navigate") {
+    if (!params.handle || !params.path) {
+      throw new Error("导航操作需要指定窗口句柄和目标路径");
+    }
+    args.push("-handle", params.handle.toString());
+    args.push("-path", params.path);
+  }
+
+  try {
+    const result = await runCsharpFeature("explorer", args);
+    if (result) {
+      if (result.trim() === "true") return true;
+      return JSON.parse(result);
+    }
+  } catch (err) {
+    console.error(err);
+    return type === "list" ? [] : false;
+  }
+
+  return type === "list" ? [] : false;
+}
+
+module.exports = {
+  /**
+   * 获取所有打开的资源管理器窗口信息
+   * @returns {Promise<Array>} 资源管理器窗口信息数组
+   */
+  list: () => runExplorer("list"),
+
+  /**
+   * 导航到指定路径
+   * @param {number} handle - 窗口句柄
+   * @param {string} path - 目标路径
+   * @returns {Promise<boolean>} 是否成功
+   */
+  navigate: (handle, path) => runExplorer("navigate", { handle, path }),
+};
diff --git a/plugin/lib/quickcomposer/windows/index.js b/plugin/lib/quickcomposer/windows/index.js
index 2efecb4e..3e4e8316 100644
--- a/plugin/lib/quickcomposer/windows/index.js
+++ b/plugin/lib/quickcomposer/windows/index.js
@@ -8,6 +8,7 @@ const software = require("./software");
 const utils = require("./utils");
 const automation = require("./automation");
 const browser = require("./browser");
+const explorer = require("./explorer");
 
 module.exports = {
   window,
@@ -20,4 +21,5 @@ module.exports = {
   utils,
   automation,
   browser,
+  explorer,
 };
diff --git a/src/js/composer/commands/windowsCommands.js b/src/js/composer/commands/windowsCommands.js
index 88ed67f3..3aea94bf 100644
--- a/src/js/composer/commands/windowsCommands.js
+++ b/src/js/composer/commands/windowsCommands.js
@@ -472,6 +472,70 @@ export const windowsCommands = {
       ],
       asyncMode: "await",
     },
+    // 资源管理器
+    {
+      value: "quickcomposer.windows.explorer.list",
+      label: "资源管理器操作",
+      icon: "folder",
+      asyncMode: "await",
+      subCommands: [
+        {
+          value: "quickcomposer.windows.explorer.list",
+          label: "获取所有已打开路径",
+          icon: "folder",
+          outputs: {
+            label: "已打开路径列表",
+            suggestName: "explorerList",
+            structure: [
+              {
+                handle: { label: "窗口句柄", suggestName: "windowHandle" },
+                title: { label: "窗口标题", suggestName: "windowTitle" },
+                path: { label: "当前路径", suggestName: "windowPath" },
+                class: { label: "窗口类名", suggestName: "windowClass" },
+              },
+            ],
+          },
+        },
+        {
+          value: "quickcomposer.windows.explorer.navigate",
+          label: "导航到指定路径",
+          icon: "folder",
+          config: [
+            {
+              component: "VariableInput",
+              label: "窗口句柄",
+              icon: "window",
+              width: 12,
+              placeholder: "输入要导航的窗口句柄",
+              defaultValue: newVarInputVal("var"),
+              disableToggleType: true,
+              width: 4,
+            },
+            {
+              component: "VariableInput",
+              label: "路径",
+              icon: "folder",
+              options: {
+                dialog: {
+                  type: "open",
+                  options: {
+                    title: "选择路径",
+                    properties: ["openDirectory"],
+                  },
+                },
+              },
+              width: 8,
+              placeholder: "输入要导航的路径",
+            },
+          ],
+          outputs: {
+            label: "是否成功",
+            suggestName: "isSuccess",
+            typeName: "布尔值",
+          },
+        },
+      ],
+    },
     // automation
     {
       value: "quickcomposer.windows.automation.click",
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index 30022082..906f3235 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -1721,6 +1721,32 @@ interface quickcomposerApi {
       ): Promise<{ success: boolean; error?: string }>;
     };
 
+    /**
+     * 资源管理器操作功能
+     */
+    explorer: {
+      /**
+       * 获取所有打开的资源管理器窗口信息
+       * @returns 资源管理器窗口信息数组
+       */
+      list(): Promise<
+        {
+          handle: number; // 窗口句柄
+          title: string; // 窗口标题
+          path: string; // 当前路径
+          class: string; // 窗口类名
+        }[]
+      >;
+
+      /**
+       * 导航到指定路径
+       * @param handle 窗口句柄
+       * @param path 目标路径
+       * @returns 是否成功
+       */
+      navigate(handle: number, path: string): Promise<boolean>;
+    };
+
     /**
      * 进程管理功能
      */

From 01977ea8739e48884a16cb6b9e4708c16d500220 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 10:51:29 +0800
Subject: [PATCH 272/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/layouts/DenseLayout.vue | 8 +++++++-
 src/components/card/layouts/ListLayout.vue  | 8 +++++++-
 src/components/card/layouts/MiniLayout.vue  | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/card/layouts/DenseLayout.vue b/src/components/card/layouts/DenseLayout.vue
index 924e3a51..08918d22 100644
--- a/src/components/card/layouts/DenseLayout.vue
+++ b/src/components/card/layouts/DenseLayout.vue
@@ -19,7 +19,7 @@
     <div class="row justify-end">
       <div
         class="text-ellipsis"
-        v-text="commandInfo.features.explain"
+        v-html="purify(commandInfo.features.explain)"
       />
     </div>
 
@@ -56,6 +56,7 @@
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
 import programs from "js/options/programs.js";
+import DOMPurify from "dompurify";
 
 export default {
   name: "DenseLayout",
@@ -87,6 +88,11 @@ export default {
       return this.program.shortName ?? this.program.name;
     },
   },
+  methods: {
+    purify(content) {
+      return DOMPurify.sanitize(content);
+    },
+  },
 };
 </script>
 
diff --git a/src/components/card/layouts/ListLayout.vue b/src/components/card/layouts/ListLayout.vue
index 7a0293e1..426e0035 100644
--- a/src/components/card/layouts/ListLayout.vue
+++ b/src/components/card/layouts/ListLayout.vue
@@ -17,7 +17,7 @@
         <!-- 名称 -->
         <div
           class="text-ellipsis"
-          v-text="commandInfo.features.explain"
+          v-html="purify(commandInfo.features.explain)"
         />
         <!-- 匹配模式 -->
         <CommandTypeTag
@@ -51,6 +51,7 @@
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
 import programs from "js/options/programs.js";
+import DOMPurify from "dompurify";
 
 export default {
   name: "ListLayout",
@@ -79,6 +80,11 @@ export default {
       return this.programs[this.commandInfo.program];
     },
   },
+  methods: {
+    purify(content) {
+      return DOMPurify.sanitize(content);
+    },
+  },
 };
 </script>
 
diff --git a/src/components/card/layouts/MiniLayout.vue b/src/components/card/layouts/MiniLayout.vue
index 100da5e4..0ade557f 100644
--- a/src/components/card/layouts/MiniLayout.vue
+++ b/src/components/card/layouts/MiniLayout.vue
@@ -18,7 +18,7 @@
     <div class="row justify-center w-100">
       <div
         class="text-ellipsis text-center"
-        v-text="commandInfo.features.explain"
+        v-html="purify(commandInfo.features.explain)"
       />
     </div>
 
@@ -35,6 +35,7 @@
 <script>
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
+import DOMPurify from "dompurify";
 
 export default {
   name: "MiniLayout",
@@ -49,6 +50,11 @@ export default {
       platformTypes,
     };
   },
+  methods: {
+    purify(content) {
+      return DOMPurify.sanitize(content);
+    },
+  },
 };
 </script>
 

From 770fd469c73fb0db3fe7bdab60e22652e42ed390 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 10:56:48 +0800
Subject: [PATCH 273/332] =?UTF-8?q?=E6=8F=90=E5=8D=87openai=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 46bbbd1a..ad8879d9 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -168,8 +168,8 @@ function parseModelsResponse(response, apiType) {
 
 // 处理 OpenAI 流式响应
 async function handleOpenAIStreamResponse(line, onStream) {
-  if (line.startsWith("data: ")) {
-    const jsonStr = line.replace(/^data: /, "");
+  if (line.startsWith("data:")) {
+    const jsonStr = line.replace(/^data:[ ]*/, "");
     if (jsonStr === "[DONE]") {
       onStream("", true);
       return;

From 04b08be60b9d1a025b2feff872c26985eb54b99e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 11:09:53 +0800
Subject: [PATCH 274/332] =?UTF-8?q?=E4=BC=98=E5=8C=96ai=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index ad8879d9..edb7d1d7 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -325,6 +325,7 @@ async function chat(content, apiConfig, options = {}) {
     });
 
     if (!response.ok) {
+      processBar?.close();
       throw new Error(`HTTP error! status: ${response.status}`);
     }
 

From a27e928cc4617849d0acdd4601a5a6e1410df267 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 11:23:58 +0800
Subject: [PATCH 275/332] =?UTF-8?q?ai=E7=BB=84=E6=89=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=B8=B2=E6=9F=93md=E4=B8=BAhtml=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIAssistantSideBar.vue | 49 ++++++++++++++++--------
 src/components/ai/AIChatHistory.vue      | 20 ++++++++--
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 096e035d..7f1f7584 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -19,6 +19,7 @@
     <AIChatHistory
       :messages="chatHistory"
       @update-code="(...event) => $emit('update-code', ...event)"
+      :render-md="renderMd"
     />
 
     <!-- 输入区域 -->
@@ -38,8 +39,18 @@
       </div>
       <div class="row items-center justify-between q-gutter-x-xs">
         <div class="row items-center q-gutter-x-xs">
-          <q-btn flat dense size="sm" icon="clear_all" @click="clearHistory">
-            <q-tooltip>清空对话</q-tooltip>
+          <q-btn
+            flat
+            dense
+            size="sm"
+            icon="html"
+            :color="renderMd ? 'primary' : 'grey'"
+            @click="renderMd = !renderMd"
+          >
+            <q-tooltip>
+              是否渲染md为html<br />
+              状态：{{ renderMd ? "已开启" : "已关闭" }}
+            </q-tooltip>
           </q-btn>
           <q-btn
             flat
@@ -87,20 +98,25 @@
             </q-tooltip>
           </q-btn>
         </div>
-        <q-btn
-          flat
-          dense
-          size="sm"
-          :label="streamingResponse ? '停止' : '发送'"
-          :disable="!streamingResponse && !prompt"
-          :color="streamingResponse ? 'negative' : 'primary'"
-          :icon="streamingResponse ? 'stop' : 'send'"
-          @click="handleSubmit"
-        >
-          <q-tooltip v-if="!streamingResponse">
-            Enter 发送，Shift+Enter 换行
-          </q-tooltip>
-        </q-btn>
+        <div class="row items-center q-gutter-x-xs">
+          <q-btn flat dense size="sm" icon="clear_all" @click="clearHistory">
+            <q-tooltip>清空对话</q-tooltip>
+          </q-btn>
+          <q-btn
+            flat
+            dense
+            size="sm"
+            :label="streamingResponse ? '停止' : '发送'"
+            :disable="!streamingResponse && !prompt"
+            :color="streamingResponse ? 'negative' : 'primary'"
+            :icon="streamingResponse ? 'stop' : 'send'"
+            @click="handleSubmit"
+          >
+            <q-tooltip v-if="!streamingResponse">
+              Enter 发送，Shift+Enter 换行
+            </q-tooltip>
+          </q-btn>
+        </div>
       </div>
     </div>
   </q-card>
@@ -144,6 +160,7 @@ export default defineComponent({
       autoUpdateCode: localStorage.getItem("ai_auto_update") !== "false",
       sendCode: false,
       submitDocs: true,
+      renderMd: true,
     };
   },
   props: {
diff --git a/src/components/ai/AIChatHistory.vue b/src/components/ai/AIChatHistory.vue
index 269d36f4..e9665870 100644
--- a/src/components/ai/AIChatHistory.vue
+++ b/src/components/ai/AIChatHistory.vue
@@ -18,13 +18,18 @@
         <div :class="['chat-message', message.role]">
           <div class="message-bubble">
             <div
-              v-if="message.role === 'assistant'"
+              v-if="message.role === 'assistant' && renderMd"
               class="message-content markdown"
               v-html="getAssistantMsg(message.content)"
             />
+            <div
+              v-else-if="message.role === 'assistant' && !renderMd"
+              class="message-content pre-text"
+              v-text="message.content"
+            />
             <div
               v-else
-              class="message-content"
+              class="message-content pre-text"
               v-text="getUserMsg(message.content)"
             />
           </div>
@@ -45,6 +50,10 @@ export default defineComponent({
       type: Array,
       default: () => [],
     },
+    renderMd: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ["update-code"],
   data() {
@@ -199,8 +208,6 @@ export default defineComponent({
 
 .chat-message.user .message-bubble {
   color: var(--q-primary);
-  word-break: break-all;
-  white-space: pre-wrap;
 }
 
 .message-content {
@@ -208,6 +215,11 @@ export default defineComponent({
   line-height: 1.5;
 }
 
+.message-content.pre-text {
+  word-break: break-all;
+  white-space: pre-wrap;
+}
+
 /* 代码块样式优化 */
 .message-content :deep(pre) {
   margin: 4px 0;

From bc6141f150bd8d93cf051063a5df6f3ec4ee714e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 11:31:00 +0800
Subject: [PATCH 276/332] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/UserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/popup/UserInfo.vue b/src/components/popup/UserInfo.vue
index 926c3013..e7a706d1 100644
--- a/src/components/popup/UserInfo.vue
+++ b/src/components/popup/UserInfo.vue
@@ -146,7 +146,7 @@ export default {
       },
       levelDetail: levelDetail,
       showPayPage: false,
-      memberPrice: 2,
+      memberPrice: 12,
       isPluginVIP: false,
       isUtoolsVIP: false,
       isDoubleVIP: false,

From dd7fca3b6286994d1ca3286836aae7ead3909a2d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 13:24:41 +0800
Subject: [PATCH 277/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=97=B6=E5=91=BD=E4=BB=A4=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/ControlButtons.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/card/ControlButtons.vue b/src/components/card/ControlButtons.vue
index 4e952e57..8376f8ad 100644
--- a/src/components/card/ControlButtons.vue
+++ b/src/components/card/ControlButtons.vue
@@ -191,10 +191,12 @@ export default {
     },
     // 导出到剪贴板
     exportCommandRaw() {
+      const commandName = this.commandInfo.features.explain.replace(
+        /<strong style=".*?">|<\/strong>/g,
+        ""
+      );
       utools.copyText(JSON.stringify(this.getRawCommand(), null, 4)) &&
-        utools.showNotification(
-          `「${this.commandInfo.features.explain}」已复制到剪贴板`
-        );
+        utools.showNotification(`「${commandName}」已复制到剪贴板`);
     },
     // 创建命令副本
     createCommandCopy() {

From 2fce45e13bde022edf2c03a68e6ac67978f1af9c Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 13:25:26 +0800
Subject: [PATCH 278/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E9=AB=98=E5=BA=A6=E5=9C=A8=E5=A2=9E=E9=95=BF=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=81=A2=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js | 33 ++++++++++++++++++++-------------
 plugin/lib/dialog/service.js    | 24 ++++++++++++------------
 plugin/lib/dialog/style.css     |  1 +
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index 580899f9..fc045bac 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -7,7 +7,7 @@ document.addEventListener("DOMContentLoaded", () => {
   let dialogType = null;
 
   // 监听父窗口发来的对话框配置
-  ipcRenderer.on("dialog-config", (event, config) => {
+  ipcRenderer.on("window-config", (event, config) => {
     parentId = event.senderId;
     dialogType = config.type;
 
@@ -79,7 +79,7 @@ document.addEventListener("DOMContentLoaded", () => {
           const button = document.createElement("button");
           button.textContent = btn;
           button.onclick = () => {
-            ipcRenderer.sendTo(parentId, "dialog-result", {
+            ipcRenderer.sendTo(parentId, "window-response", {
               id: index,
               text: btn,
             });
@@ -137,7 +137,7 @@ document.addEventListener("DOMContentLoaded", () => {
                     text: item,
                   }
                 : item;
-            ipcRenderer.sendTo(parentId, "dialog-result", result);
+            ipcRenderer.sendTo(parentId, "window-response", result);
           };
 
           // 鼠标移入事件
@@ -339,7 +339,7 @@ document.addEventListener("DOMContentLoaded", () => {
         waitBtn.id = "wait-btn";
         waitBtn.textContent = config.text;
         waitBtn.onclick = () => {
-          ipcRenderer.sendTo(parentId, "dialog-result", true);
+          ipcRenderer.sendTo(parentId, "window-response", true);
         };
 
         buttonGroup.appendChild(waitBtn);
@@ -350,7 +350,7 @@ document.addEventListener("DOMContentLoaded", () => {
           cancelBtn.id = "wait-cancel-btn";
           cancelBtn.innerHTML = "&#x2715;"; // 使用 × 符号
           cancelBtn.onclick = () => {
-            ipcRenderer.sendTo(parentId, "dialog-result", false);
+            ipcRenderer.sendTo(parentId, "window-response", false);
           };
           buttonGroup.appendChild(cancelBtn);
         }
@@ -390,11 +390,11 @@ document.addEventListener("DOMContentLoaded", () => {
 
         // 添加关闭按钮点击事件
         document.getElementById("process-close-btn").onclick = () => {
-          ipcRenderer.sendTo(parentId, "dialog-result", "close");
+          ipcRenderer.sendTo(parentId, "window-response", "close");
         };
         break;
     }
-    ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
+    ipcRenderer.sendTo(parentId, "window-resize", calculateHeight());
   });
 
   // 监听进度条更新事件
@@ -412,7 +412,7 @@ document.addEventListener("DOMContentLoaded", () => {
       const processText = document.getElementById("process-text");
       processText.innerHTML = text;
       processText.scrollTop = processText.scrollHeight;
-      ipcRenderer.sendTo(parentId, "dialog-ready", calculateHeight());
+      ipcRenderer.sendTo(parentId, "window-resize", calculateHeight());
     }
   });
 
@@ -420,16 +420,23 @@ document.addEventListener("DOMContentLoaded", () => {
     const titleBar = document.querySelector(".title-bar");
     const buttonBar = document.querySelector(".button-bar");
     const contentWrapper = document.querySelector(".content-wrapper");
+    const processText = document.getElementById("process-text");
 
-    // 计算总高度
+    // 对于进度条对话框，特殊处理高度计算
+    if (dialogType === "process") {
+      const processTextHeight = processText ? processText.scrollHeight : 0;
+      const totalHeight = Math.max(60, processTextHeight + 40);
+      return Math.min(totalHeight, 290); // 限制最大高度
+    }
+
+    // 其他对话框的高度计算保持不变
     const totalHeight =
       titleBar.offsetHeight +
       contentWrapper.scrollHeight +
       (buttonBar.style.display !== "none" ? buttonBar.offsetHeight : 0);
 
     const maxHeight = dialogType === "select" ? 620 : 520;
-    // 进度条的最大高度通过.process-text的max-height限制
-    const minHeight = dialogType === "process" ? 60 : 100;
+    const minHeight = 100;
 
     // 确保高度在最小值和最大值之间
     return Math.min(Math.max(totalHeight, minHeight), maxHeight);
@@ -458,7 +465,7 @@ document.addEventListener("DOMContentLoaded", () => {
         break;
     }
 
-    ipcRenderer.sendTo(parentId, "dialog-result", result);
+    ipcRenderer.sendTo(parentId, "window-response", result);
   };
 
   const cancelDialog = () => {
@@ -482,7 +489,7 @@ document.addEventListener("DOMContentLoaded", () => {
       default:
         result = null;
     }
-    ipcRenderer.sendTo(parentId, "dialog-result", result);
+    ipcRenderer.sendTo(parentId, "window-response", result);
   };
 
   // 取消按钮点击事件
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index da0bd7d0..0ea342d7 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -49,13 +49,13 @@ const createDialog = (config, customDialogOptions = {}) => {
 
     // 创建窗口
     const UBrowser = createBrowserWindow(dialogPath, dialogOptions, () => {
-      const dialogResultHandler = (event, result) => {
+      const windowResponseHandler = (event, result) => {
         resolve(result);
         // 移除监听器
         UBrowser.destroy();
       };
 
-      const dialogReadyHandler = (event, height) => {
+      const windowResizeHandler = (event, height) => {
         // 获取当前窗口位置
         const bounds = UBrowser.getBounds();
         // 调整y坐标，保持窗口中心点不变
@@ -74,13 +74,13 @@ const createDialog = (config, customDialogOptions = {}) => {
 
       // 监听子窗口返回的计算高度, 等待按钮有自己的计算逻辑
       config.type !== "wait-button" &&
-        ipcRenderer.once("dialog-ready", dialogReadyHandler);
+        ipcRenderer.once("window-resize", windowResizeHandler);
 
       // 监听子窗口返回的返回值
-      ipcRenderer.once("dialog-result", dialogResultHandler);
+      ipcRenderer.once("window-response", windowResponseHandler);
 
       // 发送配置到子窗口
-      ipcRenderer.sendTo(UBrowser.webContents.id, "dialog-config", {
+      ipcRenderer.sendTo(UBrowser.webContents.id, "window-config", {
         ...config,
         isDark: utools.isDarkColors(),
         platform,
@@ -349,11 +349,11 @@ const showProcessBar = async (options = {}) => {
       },
       () => {
         const windowId = UBrowser.webContents.id;
-        let dialogReadyHandler;
+        let windowResizeHandler;
         let processPauseHandler;
 
         // 创建事件处理器
-        dialogReadyHandler = (event, height) => {
+        windowResizeHandler = (event, height) => {
           if (event.senderId !== windowId) return;
           const bounds = UBrowser.getBounds();
           const y = Math.round(bounds.y - (height - bounds.height));
@@ -381,16 +381,16 @@ const showProcessBar = async (options = {}) => {
         }
 
         // 监听子窗口返回的计算高度
-        ipcRenderer.on("dialog-ready", dialogReadyHandler);
+        ipcRenderer.on("window-resize", windowResizeHandler);
 
         // 监听对话框结果
-        ipcRenderer.once("dialog-result", (event, result) => {
+        ipcRenderer.once("window-response", (event, result) => {
           if (event.senderId !== windowId) return;
           if (result === "close" && typeof onClose === "function") {
             onClose();
           }
           // 清理所有事件监听器
-          ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
+          ipcRenderer.removeListener("window-resize", windowResizeHandler);
           if (processPauseHandler) {
             ipcRenderer.removeListener("process-pause", processPauseHandler);
           }
@@ -399,7 +399,7 @@ const showProcessBar = async (options = {}) => {
         });
 
         // 发送配置到子窗口
-        ipcRenderer.sendTo(windowId, "dialog-config", {
+        ipcRenderer.sendTo(windowId, "window-config", {
           type: "process",
           text,
           value: value === undefined ? 0 : value,
@@ -416,7 +416,7 @@ const showProcessBar = async (options = {}) => {
               onClose();
             }
             // 清理所有事件监听器
-            ipcRenderer.removeListener("dialog-ready", dialogReadyHandler);
+            ipcRenderer.removeListener("window-resize", windowResizeHandler);
             if (processPauseHandler) {
               ipcRenderer.removeListener("process-pause", processPauseHandler);
             }
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index b34bbfff..30ebdd64 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -606,6 +606,7 @@ textarea:focus {
   padding-right: 2px;
   width: calc(100% - 15px);
   box-sizing: border-box;
+  /* 290 - 40 的 padding*/
   max-height: 250px;
   -webkit-app-region: no-drag;
 }

From 07babda68e3ca867b125b76226329aa8f1fcd8a2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 14:12:58 +0800
Subject: [PATCH 279/332] =?UTF-8?q?askAi=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81markdown?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                            | 31 --------
 package.json                                 |  1 -
 plugin/lib/ai.js                             | 18 ++++-
 plugin/lib/dialog/style.css                  | 84 +++++++++++++++++++-
 plugin/package-lock.json                     | 31 ++++++++
 plugin/package.json                          |  1 +
 plugin/preload.js                            |  2 +
 src/components/ai/AIChatHistory.vue          | 11 +--
 src/components/card/layouts/DenseLayout.vue  |  3 +-
 src/components/card/layouts/ListLayout.vue   |  3 +-
 src/components/card/layouts/MiniLayout.vue   |  3 +-
 src/components/quickcommandUI/ConfirmBox.vue |  5 +-
 src/css/markdown.css                         |  5 ++
 13 files changed, 146 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c507db2e..083c2e21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,6 @@
         "@quasar/extras": "^1.14.0",
         "core-js": "^3.6.5",
         "croner": "^4.3.9",
-        "dompurify": "^3.2.4",
         "monaco-editor": "^0.33.0",
         "monaco-editor-webpack-plugin": "^7.0.1",
         "picture-compressor": "^1.1.0",
@@ -2487,13 +2486,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/@types/webpack-bundle-analyzer": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
@@ -4631,15 +4623,6 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/dompurify": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
-      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
-      "license": "(MPL-2.0 OR Apache-2.0)",
-      "optionalDependencies": {
-        "@types/trusted-types": "^2.0.7"
-      }
-    },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -13066,12 +13049,6 @@
         "@types/node": "*"
       }
     },
-    "@types/trusted-types": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "optional": true
-    },
     "@types/webpack-bundle-analyzer": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
@@ -14584,14 +14561,6 @@
         "domelementtype": "^2.2.0"
       }
     },
-    "dompurify": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
-      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
-      "requires": {
-        "@types/trusted-types": "^2.0.7"
-      }
-    },
     "domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
diff --git a/package.json b/package.json
index 5abd32fa..8aa174a4 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "@quasar/extras": "^1.14.0",
     "core-js": "^3.6.5",
     "croner": "^4.3.9",
-    "dompurify": "^3.2.4",
     "monaco-editor": "^0.33.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "picture-compressor": "^1.1.0",
diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index edb7d1d7..0f5e6939 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -1,3 +1,18 @@
+const DOMPurify = require("dompurify");
+const marked = require("marked");
+
+window.aiResponseParser = (content) => {
+  const markedContent = marked.parse(content.trim());
+  const processedContent = markedContent
+    .replace("<p><think>", "<think><p>")
+    .replace("</think></p>", "</p></think>")
+    .replace("<think>\n\n</think>", "");
+  const purifiedContent = DOMPurify.sanitize(processedContent, {
+    ADD_TAGS: ["think"],
+  });
+  return purifiedContent;
+};
+
 // 支持的模型类型
 const API_TYPES = {
   OPENAI: "openai",
@@ -303,7 +318,7 @@ async function chat(content, apiConfig, options = {}) {
         if (processBar) {
           quickcommand.updateProcessBar(
             {
-              text: fullResponse,
+              text: window.aiResponseParser(fullResponse),
             },
             processBar
           );
@@ -410,5 +425,4 @@ async function getModels(apiConfig) {
     };
   }
 }
-
 module.exports = { chat, getModels };
diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 30ebdd64..46a8fd5e 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -600,7 +600,6 @@ textarea:focus {
 .process-text {
   font-size: 13px;
   margin-bottom: 8px;
-  white-space: pre-wrap;
   overflow-y: auto;
   overflow-x: hidden;
   padding-right: 2px;
@@ -748,3 +747,86 @@ textarea:focus {
 .show-pause .process-pause-btn {
   display: flex;
 }
+
+/* markdown */
+#process p {
+  margin: 0;
+  line-height: 1.5;
+}
+
+#process pre {
+  background-color: rgba(255, 255, 255, 0.1);
+  padding: 8px 10px;
+  border-radius: 4px;
+  margin: 4px 0;
+  overflow-x: auto;
+  max-width: 100%;
+  font-size: 12px;
+}
+
+#process code {
+  font-family: Monaco, Consolas, Liberation Mono, monospace;
+  padding: 2px 4px;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 3px;
+  font-size: 12px;
+}
+
+#process pre code {
+  padding: 0;
+  background-color: transparent;
+}
+
+#process ul,
+#process ol {
+  margin: 4px 0;
+  padding-left: 1.2em;
+}
+
+#process h1,
+#process h2,
+#process h3,
+#process h4,
+#process h5,
+#process h6 {
+  margin: 6px 0 4px 0;
+  font-weight: 600;
+  line-height: 1.3;
+}
+
+#process h1 {
+  font-size: 16px;
+}
+
+#process h2 {
+  font-size: 15px;
+}
+
+#process h3 {
+  font-size: 14px;
+}
+
+#process h4,
+#process h5,
+#process h6 {
+  font-size: 13px;
+}
+
+#process pre::-webkit-scrollbar {
+  height: 3px;
+}
+
+#process think,
+#process blockquote {
+  display: block;
+  color: rgba(255, 255, 255, 0.7);
+  border-left: 3px solid rgba(255, 255, 255, 0.3);
+  padding: 2px 0 2px 8px;
+  font-size: 12px;
+  margin: 4px 0;
+}
+
+#process hr {
+  border-style: solid;
+  border-width: 0.5px;
+}
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index f47bf9f3..96c70711 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -8,6 +8,7 @@
         "axios": "^1.7.9",
         "chrome-remote-interface": "^0.33.2",
         "crypto-js": "^4.2.0",
+        "dompurify": "^3.2.4",
         "exif-reader": "^2.0.1",
         "iconv-lite": "^0.6.3",
         "marked": "^15.0.7",
@@ -25,6 +26,13 @@
       "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg==",
       "license": "Apache-2.0"
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -86,6 +94,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/dompurify": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
     "node_modules/exif-reader": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
@@ -264,6 +281,12 @@
       "resolved": "https://registry.npmjs.org/@endo/env-options/-/env-options-1.1.8.tgz",
       "integrity": "sha512-Xtxw9n33I4guo8q0sDyZiRuxlfaopM454AKiELgU7l3tqsylCut6IBZ0fPy4ltSHsBib7M3yF7OEMoIuLwzWVg=="
     },
+    "@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "optional": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -311,6 +334,14 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
+    "dompurify": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "requires": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
     "exif-reader": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/exif-reader/-/exif-reader-2.0.1.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index ef0946bf..a9be277a 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -3,6 +3,7 @@
     "axios": "^1.7.9",
     "chrome-remote-interface": "^0.33.2",
     "crypto-js": "^4.2.0",
+    "dompurify": "^3.2.4",
     "exif-reader": "^2.0.1",
     "iconv-lite": "^0.6.3",
     "marked": "^15.0.7",
diff --git a/plugin/preload.js b/plugin/preload.js
index d5ce1289..d99ca423 100644
--- a/plugin/preload.js
+++ b/plugin/preload.js
@@ -11,6 +11,7 @@ const http = require("http");
 const https = require("https");
 const url = require("url");
 const crypto = require("crypto");
+const DOMPurify = require("dompurify");
 
 require("ses");
 const md5 = (input) => {
@@ -19,6 +20,7 @@ const md5 = (input) => {
 
 window.lodashM = require("./lib/lodashMini");
 window.pinyinMatch = require("pinyin-match");
+window.DOMPurify = DOMPurify;
 
 const createTerminalCommand = require("./lib/createTerminalCommand");
 const shortCodes = require("./lib/shortCodes");
diff --git a/src/components/ai/AIChatHistory.vue b/src/components/ai/AIChatHistory.vue
index e9665870..78937fd9 100644
--- a/src/components/ai/AIChatHistory.vue
+++ b/src/components/ai/AIChatHistory.vue
@@ -41,7 +41,6 @@
 
 <script>
 import { defineComponent } from "vue";
-import DOMPurify from "dompurify";
 
 export default defineComponent({
   name: "AIChatHistory",
@@ -82,15 +81,7 @@ export default defineComponent({
     },
 
     getAssistantMsg(content) {
-      const markedContent = quickcommand.markdownParse(content.trim());
-      const processedContent = markedContent
-        .replace("<p><think>", "<think><p>")
-        .replace("</think></p>", "</p></think>")
-        .replace("<think>\n\n</think>", "");
-      const purifiedContent = DOMPurify.sanitize(processedContent, {
-        ADD_TAGS: ["think"],
-      });
-      return purifiedContent;
+      return window.aiResponseParser(content);
     },
 
     getUserMsg(content) {
diff --git a/src/components/card/layouts/DenseLayout.vue b/src/components/card/layouts/DenseLayout.vue
index 08918d22..a1b54bcc 100644
--- a/src/components/card/layouts/DenseLayout.vue
+++ b/src/components/card/layouts/DenseLayout.vue
@@ -56,7 +56,6 @@
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
 import programs from "js/options/programs.js";
-import DOMPurify from "dompurify";
 
 export default {
   name: "DenseLayout",
@@ -90,7 +89,7 @@ export default {
   },
   methods: {
     purify(content) {
-      return DOMPurify.sanitize(content);
+      return window.DOMPurify.sanitize(content);
     },
   },
 };
diff --git a/src/components/card/layouts/ListLayout.vue b/src/components/card/layouts/ListLayout.vue
index 426e0035..359b2078 100644
--- a/src/components/card/layouts/ListLayout.vue
+++ b/src/components/card/layouts/ListLayout.vue
@@ -51,7 +51,6 @@
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
 import programs from "js/options/programs.js";
-import DOMPurify from "dompurify";
 
 export default {
   name: "ListLayout",
@@ -82,7 +81,7 @@ export default {
   },
   methods: {
     purify(content) {
-      return DOMPurify.sanitize(content);
+      return window.DOMPurify.sanitize(content);
     },
   },
 };
diff --git a/src/components/card/layouts/MiniLayout.vue b/src/components/card/layouts/MiniLayout.vue
index 0ade557f..b6a59eb6 100644
--- a/src/components/card/layouts/MiniLayout.vue
+++ b/src/components/card/layouts/MiniLayout.vue
@@ -35,7 +35,6 @@
 <script>
 import CommandTypeTag from "../CommandTypeTag.vue";
 import platformTypes from "js/options/platformTypes.js";
-import DOMPurify from "dompurify";
 
 export default {
   name: "MiniLayout",
@@ -52,7 +51,7 @@ export default {
   },
   methods: {
     purify(content) {
-      return DOMPurify.sanitize(content);
+      return window.DOMPurify.sanitize(content);
     },
   },
 };
diff --git a/src/components/quickcommandUI/ConfirmBox.vue b/src/components/quickcommandUI/ConfirmBox.vue
index 6a5930dd..e13db361 100644
--- a/src/components/quickcommandUI/ConfirmBox.vue
+++ b/src/components/quickcommandUI/ConfirmBox.vue
@@ -11,7 +11,7 @@
     </q-card-section>
     <q-card-section
       v-if="options.isHtml"
-      v-html="options.message"
+      v-html="purify(options.message)"
       class="content"
     />
     <q-card-section v-else v-text="options.message" class="content" />
@@ -32,6 +32,9 @@ export default {
       this.$emit("clickOK", true);
       this.hide();
     },
+    purify(html) {
+      return window.DOMPurify.sanitize(html);
+    },
   },
   props: {
     options: Object,
diff --git a/src/css/markdown.css b/src/css/markdown.css
index 971576df..7f27ab8b 100644
--- a/src/css/markdown.css
+++ b/src/css/markdown.css
@@ -85,3 +85,8 @@
   color: #007bff;
   text-decoration: none;
 }
+
+.markdown hr {
+  border-style: solid;
+  border-width: 0.5px;
+}

From e02977b732f3849d6cc96b5a6cd475edbe53e7d9 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 14:25:03 +0800
Subject: [PATCH 280/332] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/lib/dialog/style.css b/plugin/lib/dialog/style.css
index 46a8fd5e..466967c0 100644
--- a/plugin/lib/dialog/style.css
+++ b/plugin/lib/dialog/style.css
@@ -262,6 +262,7 @@ body {
   line-height: 1.4;
   font-size: 13px;
   user-select: text;
+  white-space: pre-wrap;
 }
 
 .button-bar {

From 43a7fa927e17fb02b6756acce75602a56cd54cdd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 14:56:28 +0800
Subject: [PATCH 281/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js | 29 ++++++++++++-------
 plugin/lib/dialog/service.js    | 51 ++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index fc045bac..337a27d4 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -10,6 +10,7 @@ document.addEventListener("DOMContentLoaded", () => {
   ipcRenderer.on("window-config", (event, config) => {
     parentId = event.senderId;
     dialogType = config.type;
+    windowId = config.windowId;
 
     // 设置主题
     document.documentElement.setAttribute(
@@ -79,7 +80,7 @@ document.addEventListener("DOMContentLoaded", () => {
           const button = document.createElement("button");
           button.textContent = btn;
           button.onclick = () => {
-            ipcRenderer.sendTo(parentId, "window-response", {
+            ipcRenderer.sendTo(parentId, `window-response-${windowId}`, {
               id: index,
               text: btn,
             });
@@ -137,7 +138,7 @@ document.addEventListener("DOMContentLoaded", () => {
                     text: item,
                   }
                 : item;
-            ipcRenderer.sendTo(parentId, "window-response", result);
+            ipcRenderer.sendTo(parentId, `window-response-${windowId}`, result);
           };
 
           // 鼠标移入事件
@@ -339,7 +340,7 @@ document.addEventListener("DOMContentLoaded", () => {
         waitBtn.id = "wait-btn";
         waitBtn.textContent = config.text;
         waitBtn.onclick = () => {
-          ipcRenderer.sendTo(parentId, "window-response", true);
+          ipcRenderer.sendTo(parentId, `window-response-${windowId}`, true);
         };
 
         buttonGroup.appendChild(waitBtn);
@@ -350,7 +351,7 @@ document.addEventListener("DOMContentLoaded", () => {
           cancelBtn.id = "wait-cancel-btn";
           cancelBtn.innerHTML = "&#x2715;"; // 使用 × 符号
           cancelBtn.onclick = () => {
-            ipcRenderer.sendTo(parentId, "window-response", false);
+            ipcRenderer.sendTo(parentId, `window-response-${windowId}`, false);
           };
           buttonGroup.appendChild(cancelBtn);
         }
@@ -384,17 +385,21 @@ document.addEventListener("DOMContentLoaded", () => {
           pauseBtn.onclick = () => {
             isPaused = !isPaused;
             pauseBtn.classList.toggle("paused", isPaused);
-            ipcRenderer.sendTo(parentId, "process-pause", isPaused);
+            ipcRenderer.sendTo(parentId, `process-pause-${windowId}`, isPaused);
           };
         }
 
         // 添加关闭按钮点击事件
         document.getElementById("process-close-btn").onclick = () => {
-          ipcRenderer.sendTo(parentId, "window-response", "close");
+          ipcRenderer.sendTo(parentId, `process-close-${windowId}`);
         };
         break;
     }
-    ipcRenderer.sendTo(parentId, "window-resize", calculateHeight());
+    ipcRenderer.sendTo(
+      parentId,
+      `window-resize-${windowId}`,
+      calculateHeight()
+    );
   });
 
   // 监听进度条更新事件
@@ -412,7 +417,11 @@ document.addEventListener("DOMContentLoaded", () => {
       const processText = document.getElementById("process-text");
       processText.innerHTML = text;
       processText.scrollTop = processText.scrollHeight;
-      ipcRenderer.sendTo(parentId, "window-resize", calculateHeight());
+      ipcRenderer.sendTo(
+        parentId,
+        `window-resize-${windowId}`,
+        calculateHeight()
+      );
     }
   });
 
@@ -465,7 +474,7 @@ document.addEventListener("DOMContentLoaded", () => {
         break;
     }
 
-    ipcRenderer.sendTo(parentId, "window-response", result);
+    ipcRenderer.sendTo(parentId, `window-response-${windowId}`, result);
   };
 
   const cancelDialog = () => {
@@ -489,7 +498,7 @@ document.addEventListener("DOMContentLoaded", () => {
       default:
         result = null;
     }
-    ipcRenderer.sendTo(parentId, "window-response", result);
+    ipcRenderer.sendTo(parentId, `window-response-${windowId}`, result);
   };
 
   // 取消按钮点击事件
diff --git a/plugin/lib/dialog/service.js b/plugin/lib/dialog/service.js
index 0ea342d7..48e3fa4a 100644
--- a/plugin/lib/dialog/service.js
+++ b/plugin/lib/dialog/service.js
@@ -49,9 +49,10 @@ const createDialog = (config, customDialogOptions = {}) => {
 
     // 创建窗口
     const UBrowser = createBrowserWindow(dialogPath, dialogOptions, () => {
+      const windowId = UBrowser.webContents.id;
+
       const windowResponseHandler = (event, result) => {
         resolve(result);
-        // 移除监听器
         UBrowser.destroy();
       };
 
@@ -74,16 +75,17 @@ const createDialog = (config, customDialogOptions = {}) => {
 
       // 监听子窗口返回的计算高度, 等待按钮有自己的计算逻辑
       config.type !== "wait-button" &&
-        ipcRenderer.once("window-resize", windowResizeHandler);
+        ipcRenderer.once(`window-resize-${windowId}`, windowResizeHandler);
 
       // 监听子窗口返回的返回值
-      ipcRenderer.once("window-response", windowResponseHandler);
+      ipcRenderer.once(`window-response-${windowId}`, windowResponseHandler);
 
       // 发送配置到子窗口
-      ipcRenderer.sendTo(UBrowser.webContents.id, "window-config", {
+      ipcRenderer.sendTo(windowId, `window-config`, {
         ...config,
         isDark: utools.isDarkColors(),
         platform,
+        windowId,
       });
     });
   });
@@ -354,7 +356,6 @@ const showProcessBar = async (options = {}) => {
 
         // 创建事件处理器
         windowResizeHandler = (event, height) => {
-          if (event.senderId !== windowId) return;
           const bounds = UBrowser.getBounds();
           const y = Math.round(bounds.y - (height - bounds.height));
           const newBounds = {
@@ -370,32 +371,40 @@ const showProcessBar = async (options = {}) => {
         // 监听暂停/恢复事件
         if (onPause && onResume) {
           processPauseHandler = (event, isPaused) => {
-            if (event.senderId !== windowId) return;
             if (isPaused) {
               onPause();
             } else {
               onResume();
             }
           };
-          ipcRenderer.on("process-pause", processPauseHandler);
+          ipcRenderer.on(`process-pause-${windowId}`, processPauseHandler);
         }
 
         // 监听子窗口返回的计算高度
-        ipcRenderer.on("window-resize", windowResizeHandler);
+        ipcRenderer.on(`window-resize-${windowId}`, windowResizeHandler);
 
-        // 监听对话框结果
-        ipcRenderer.once("window-response", (event, result) => {
-          if (event.senderId !== windowId) return;
-          if (result === "close" && typeof onClose === "function") {
+        const closeProcessBar = () => {
+          if (typeof onClose === "function") {
             onClose();
           }
           // 清理所有事件监听器
-          ipcRenderer.removeListener("window-resize", windowResizeHandler);
+          ipcRenderer.removeListener(
+            `window-resize-${windowId}`,
+            windowResizeHandler
+          );
           if (processPauseHandler) {
-            ipcRenderer.removeListener("process-pause", processPauseHandler);
+            ipcRenderer.removeListener(
+              `process-pause-${windowId}`,
+              processPauseHandler
+            );
           }
           lastProcessBar = null;
           UBrowser.destroy();
+        };
+
+        // 监听对话框结果
+        ipcRenderer.once(`process-close-${windowId}`, () => {
+          closeProcessBar();
         });
 
         // 发送配置到子窗口
@@ -407,22 +416,12 @@ const showProcessBar = async (options = {}) => {
           platform: process.platform,
           showPause: Boolean(onPause && onResume),
           isLoading: value === undefined,
+          windowId,
         });
 
         const processBar = {
           id: windowId,
-          close: () => {
-            if (typeof onClose === "function") {
-              onClose();
-            }
-            // 清理所有事件监听器
-            ipcRenderer.removeListener("window-resize", windowResizeHandler);
-            if (processPauseHandler) {
-              ipcRenderer.removeListener("process-pause", processPauseHandler);
-            }
-            lastProcessBar = null;
-            UBrowser.destroy();
-          },
+          close: closeProcessBar,
         };
 
         lastProcessBar = processBar;

From 8284895f2e49001f79beba55665db7fe4d170cab Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 14:56:44 +0800
Subject: [PATCH 282/332] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=8A=A00.0?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/plugin.json b/plugin/plugin.json
index 09e9b6b5..55c7c387 100644
--- a/plugin/plugin.json
+++ b/plugin/plugin.json
@@ -4,7 +4,7 @@
   "main": "index.html",
   "homepage": "https://github.com/fofolee/uTools-quickcommand",
   "publishPage": "https://yuanliao.info/d/424",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "development": {
     "main": "http://127.0.0.1:8080/"
   },

From f61fe17c6ae3c28454aa69767e784be1ae35315d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 06:57:46 +0000
Subject: [PATCH 283/332] Bump axios from 1.7.9 to 1.8.2 in /plugin

Bumps [axios](https://github.com/axios/axios) from 1.7.9 to 1.8.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.9...v1.8.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 plugin/package-lock.json | 14 +++++++-------
 plugin/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 96c70711..38b13c0a 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "axios": "^1.7.9",
+        "axios": "^1.8.2",
         "chrome-remote-interface": "^0.33.2",
         "crypto-js": "^4.2.0",
         "dompurify": "^3.2.4",
@@ -40,9 +40,9 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+      "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -293,9 +293,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+      "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
diff --git a/plugin/package.json b/plugin/package.json
index a9be277a..1524515b 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
     "chrome-remote-interface": "^0.33.2",
     "crypto-js": "^4.2.0",
     "dompurify": "^3.2.4",

From 504121166df781cb2e8c2efa10bb9e92f5d77168 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 19:40:39 +0800
Subject: [PATCH 284/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=89=87=E6=AE=B5summary=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/script/ScriptEditor.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index bef3d964..9a79e8ec 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -281,7 +281,9 @@ export default defineComponent({
       )}${replaceStr}, ${stringifyArgv(options)})`;
     },
     getSummary(argvs) {
-      return `运行${argvs.language}代码`;
+      return this.isCodeSnippet
+        ? `${argvs.language}代码片段`
+        : `运行${argvs.language}代码`;
     },
     updateArgvs(key, value) {
       const newArgvs = { ...this.argvs, [key]: value };

From 6241ed18b5551074b6da90492227fb10eb405d8d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 15 Mar 2025 19:40:59 +0800
Subject: [PATCH 285/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D=E5=9C=A8=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/OutputEditor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/composer/card/OutputEditor.vue b/src/components/composer/card/OutputEditor.vue
index 07b1e9eb..9f204f88 100644
--- a/src/components/composer/card/OutputEditor.vue
+++ b/src/components/composer/card/OutputEditor.vue
@@ -270,7 +270,7 @@ export default defineComponent({
 
       if (this.currentOutputs) {
         const flatVars = {};
-        Object.entries(this.outputVars).forEach(([path, value]) => {
+        Object.entries(this.outputVars || {}).forEach(([path, value]) => {
           if (!value) return; // 跳过空值
           flatVars[path] = value;
         });

From 75c7d1ec504211fc03107cbcb3454b0610952374 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 18 Mar 2025 19:28:12 +0800
Subject: [PATCH 286/332] =?UTF-8?q?=E7=BC=96=E6=8E=92http=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=94=AF=E6=8C=81raw=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/network/AxiosConfigEditor.vue    | 88 +++++++------------
 1 file changed, 33 insertions(+), 55 deletions(-)

diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index 3a9aa69e..ea754b0d 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -118,10 +118,29 @@
           name="data"
           class="q-pa-none q-pt-sm"
         >
-          <DictEditor
-            v-model="argvs.data"
-            @update:model-value="updateArgvs('data', $event)"
-          />
+          <div class="row q-col-gutter-sm">
+            <div class="col-auto">
+              <span class="text-caption">RAW</span>
+              <q-toggle
+                v-model="argvs.isReqDataRaw"
+                @update:model-value="handleReqRawUpdate"
+              />
+            </div>
+            <div class="col">
+              <VariableInput
+                v-model="argvs.data"
+                v-if="argvs.isReqDataRaw"
+                label="原始请求体"
+                icon="text_fields"
+                @update:model-value="updateArgvs('data', $event)"
+              />
+              <DictEditor
+                v-model="argvs.data"
+                @update:model-value="updateArgvs('data', $event)"
+                v-else
+              />
+            </div>
+          </div>
         </q-tab-panel>
 
         <q-tab-panel name="params" class="q-pa-none q-pt-sm">
@@ -160,7 +179,7 @@ import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import DictEditor from "components/composer/common/DictEditor.vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import {
   userAgent,
   commonHeaders,
@@ -203,6 +222,7 @@ export default defineComponent({
         otherHeaders: {},
         params: {},
         data: {},
+        isReqDataRaw: false,
         timeout: 0,
         maxRedirects: 5,
         responseType: "json",
@@ -362,9 +382,7 @@ export default defineComponent({
   },
   computed: {
     argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
+      return this.modelValue.argvs;
     },
     hasRequestData() {
       return ["PUT", "POST", "PATCH"].includes(this.argvs.method);
@@ -374,55 +392,10 @@ export default defineComponent({
     },
   },
   methods: {
-    // 解析代码为参数
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      const method = code.match(/axios\.(\w+)/)?.[1].toUpperCase();
-      const hasData = ["PUT", "POST", "PATCH"].includes(method);
-      // 有请求体时，config 是第三个参数
-      const configIndex = hasData ? 2 : 1;
-      try {
-        // 定义需要使用 variableInput 格式的路径
-        const variableFormatPaths = [
-          "arg0", // url参数
-          `arg${configIndex}.params.**`, // 所有params对象下的字段
-          `arg${configIndex}.headers.**`, // 所有headers对象下的字段
-          `arg${configIndex}.auth.**`, // 所有认证相关字段
-          `arg${configIndex}.proxy.host`, // 代理主机
-          `arg${configIndex}.proxy.auth.**`, // 代理认证字段
-          `!arg${configIndex}.headers.Content-Type`, // ontent-Type
-        ];
-        if (hasData) variableFormatPaths.push(`arg1.**`);
-        // 返回所有解析出来的参数组成的数组
-        const result = parseFunction(code, {
-          variableFormatPaths,
-        });
-        if (!result) {
-          console.warn("axios 参数解析失败:", code);
-          return argvs;
-        }
-        const url = result.argvs[0] || "";
-        const data = hasData ? result.argvs[1] : {};
-        const config = result.argvs[hasData ? 2 : 1] || {};
-        const {
-          "Content-Type": contentType,
-          "User-Agent": userAgent,
-          ...otherHeaders
-        } = config.headers;
-        config.headers = {
-          "Content-Type": contentType,
-          "User-Agent": userAgent,
-        };
-        Object.assign(argvs, { url, data, method, otherHeaders, ...config });
-      } catch (e) {
-        console.warn("axios 参数解析失败:", code);
-      }
-      return argvs;
-    },
     // 从参数生成代码
     generateCode(argvs = this.argvs) {
-      const { url, method, data, otherHeaders, ...restConfig } = argvs;
+      const { url, method, data, isReqDataRaw, otherHeaders, ...restConfig } =
+        argvs;
       restConfig.headers = {
         ...restConfig.headers,
         ...otherHeaders,
@@ -497,6 +470,11 @@ export default defineComponent({
         code: this.generateCode(argvs),
       });
     },
+    handleReqRawUpdate(isRaw) {
+      isRaw
+        ? this.updateArgvs("data", newVarInputVal("str"))
+        : this.updateArgvs("data", {});
+    },
   },
   mounted() {
     const argvs = this.modelValue.argvs || this.defaultArgvs;

From 3cec2f94f23d8f59497cc7693e8be2598d522bbf Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 20 Mar 2025 10:33:58 +0800
Subject: [PATCH 287/332] =?UTF-8?q?=E5=AE=8C=E5=96=84quickcomposer.browser?=
 =?UTF-8?q?=E7=9A=84=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/monaco/types/quickcomposer.d.ts | 197 +++++++++++++++-----
 1 file changed, 154 insertions(+), 43 deletions(-)

diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index 906f3235..40884b56 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -2401,81 +2401,113 @@ interface quickcomposerApi {
      * 截图功能
      * @param tab 标签页配置
      * @param options 截图选项
+     * @param options.format 图片格式
+     * @param options.quality 图片质量(仅jpeg)
+     * @param options.savePath 保存路径
+     * @param options.selector 元素选择器
      */
     captureScreenshot(
-      tab: {
-        by?: "active" | "url" | "title" | "id";
-        searchValue?: string;
-      },
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
       options?: {
-        type?: "png" | "jpeg"; // 图片类型
-        quality?: number; // 图片质量(仅jpeg)
-        fullPage?: boolean; // 是否截取完整页面
-        clip?: {
-          // 裁剪区域
-          x: number;
-          y: number;
-          width: number;
-          height: number;
-        };
-        encoding?: "base64" | "binary"; // 编码方式
-        path?: string; // 保存路径
+        format?: "png" | "jpeg";
+        quality?: number;
+        savePath?: string;
+        selector?: string;
       }
     ): Promise<string>;
 
     /**
      * 获取当前URL
+     * @param tab 标签页配置
      */
-    getUrl(): Promise<string>;
+    getUrl(tab: {
+      by?: "active" | "url" | "title" | "id";
+      searchValue?: string;
+    }): Promise<string>;
 
     /**
      * 设置URL
+     * @param tab 标签页配置
      * @param url 要设置的URL
      */
-    setUrl(url: string): Promise<void>;
+    setUrl(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      url: string
+    ): Promise<void>;
 
     /**
      * 执行JavaScript代码
+     * @param tab 标签页配置
      * @param script 要执行的JavaScript代码
+     * @param args 脚本参数
      */
-    executeScript(script: string): Promise<any>;
+    executeScript(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      script: string,
+      args?: Record<string, any>
+    ): Promise<any>;
 
     /**
      * 点击元素
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    clickElement(selector: string): Promise<void>;
+    clickElement(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<void>;
 
     /**
      * 输入文本
+     * @param tab 标签页配置
      * @param selector CSS选择器
      * @param text 要输入的文本
      */
-    inputText(selector: string, text: string): Promise<void>;
+    inputText(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string,
+      text: string
+    ): Promise<void>;
 
     /**
      * 获取文本内容
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    getText(selector: string): Promise<string>;
+    getText(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<string>;
 
     /**
      * 获取HTML内容
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    getHtml(selector: string): Promise<string>;
+    getHtml(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<string>;
 
     /**
      * 隐藏元素
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    hideElement(selector: string): Promise<void>;
+    hideElement(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<void>;
 
     /**
      * 显示元素
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    showElement(selector: string): Promise<void>;
+    showElement(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<void>;
 
     /**
      * 注入CSS样式
@@ -2485,57 +2517,136 @@ interface quickcomposerApi {
 
     /**
      * 设置Cookie
-     * @param name Cookie名称
-     * @param value Cookie值
+     * @param tab 标签页配置
+     * @param cookies Cookie配置数组
+     * @param options Cookie选项
      */
-    setCookie(name: string, value: string): Promise<void>;
+    setCookie(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      cookies: Array<{ name: string; value: string }>,
+      options?: {
+        domain?: string;
+        path?: string;
+        secure?: boolean;
+        expires?: number;
+      }
+    ): Promise<void>;
 
     /**
      * 获取Cookie
-     * @param name Cookie名称
-     */
-    getCookie(name: string): Promise<string>;
+     * @param tab 标签页配置
+     * @param name Cookie名称，不传则返回所有Cookie
+     */
+    getCookie(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      name?: string
+    ): Promise<
+      | { name: string; value: string; domain: string; path: string }[]
+      | { name: string; value: string; domain: string; path: string }
+    >;
 
     /**
      * 删除Cookie
+     * @param tab 标签页配置
      * @param name Cookie名称
      */
-    deleteCookie(name: string): Promise<void>;
+    deleteCookie(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      name: string
+    ): Promise<void>;
 
     /**
      * 滚动到指定位置
+     * @param tab 标签页配置
      * @param x X坐标
      * @param y Y坐标
      */
-    scrollTo(x: number, y: number): Promise<void>;
+    scrollTo(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      x: number,
+      y: number
+    ): Promise<void>;
 
     /**
      * 滚动到指定元素
+     * @param tab 标签页配置
      * @param selector CSS选择器
      */
-    scrollToElement(selector: string): Promise<void>;
+    scrollToElement(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string
+    ): Promise<void>;
 
     /**
      * 获取滚动位置
+     * @param tab 标签页配置
      */
-    getScrollPosition(): Promise<{
-      x: number; // X坐标
-      y: number; // Y坐标
-    }>;
+    getScrollPosition(tab: {
+      by?: "active" | "url" | "title" | "id";
+      searchValue?: string;
+    }): Promise<{ x: number; y: number }>;
 
     /**
      * 获取页面尺寸
+     * @param tab 标签页配置
      */
-    getPageSize(): Promise<{
-      width: number; // 页面宽度
-      height: number; // 页面高度
-    }>;
+    getPageSize(tab: {
+      by?: "active" | "url" | "title" | "id";
+      searchValue?: string;
+    }): Promise<{ width: number; height: number }>;
 
     /**
      * 等待元素出现
+     * @param tab 标签页配置
      * @param selector CSS选择器
      * @param timeout 超时时间(毫秒)
      */
-    waitForElement(selector: string, timeout?: number): Promise<void>;
+    waitForElement(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      selector: string,
+      timeout?: number
+    ): Promise<void>;
+
+    /**
+     * 注入CSS样式
+     * @param tab 标签页配置
+     * @param css CSS样式代码
+     */
+    injectCSS(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      css: string
+    ): Promise<void>;
+
+    /**
+     * 提交表单
+     * @param tab 标签页配置
+     * @param buttonSelector 提交按钮的CSS选择器
+     * @param inputSelectors 输入字段配置数组
+     */
+    submitForm(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      buttonSelector: string,
+      inputSelectors: Array<{ selector: string; value: string }>
+    ): Promise<void>;
+
+    /**
+     * 注入远程脚本
+     * @param tab 标签页配置
+     * @param url 脚本URL
+     */
+    injectRemoteScript(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      url: string
+    ): Promise<boolean>;
+
+    /**
+     * 注入本地脚本
+     * @param tab 标签页配置
+     * @param filePath 脚本文件路径
+     */
+    injectLocalScript(
+      tab: { by?: "active" | "url" | "title" | "id"; searchValue?: string },
+      filePath: string
+    ): Promise<boolean>;
   };
 }

From 9bcea1e575311d0bb047484318ab032650ff80b7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 23 Mar 2025 13:49:17 +0800
Subject: [PATCH 288/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/file/archive.js      |   4 +-
 plugin/lib/quickcomposer/file/operation.js    | 229 ++++++-----
 .../composer/file/FileOperationEditor.vue     | 354 ++++++------------
 .../composer/network/AxiosConfigEditor.vue    |   2 +-
 src/plugins/monaco/types/quickcomposer.d.ts   | 135 +++----
 5 files changed, 278 insertions(+), 446 deletions(-)

diff --git a/plugin/lib/quickcomposer/file/archive.js b/plugin/lib/quickcomposer/file/archive.js
index a4457bbc..036eb189 100644
--- a/plugin/lib/quickcomposer/file/archive.js
+++ b/plugin/lib/quickcomposer/file/archive.js
@@ -126,6 +126,4 @@ async function archive(
   });
 }
 
-module.exports = {
-  archive,
-};
+module.exports = archive;
diff --git a/plugin/lib/quickcomposer/file/operation.js b/plugin/lib/quickcomposer/file/operation.js
index c09b8790..fb561c30 100644
--- a/plugin/lib/quickcomposer/file/operation.js
+++ b/plugin/lib/quickcomposer/file/operation.js
@@ -7,23 +7,22 @@ const path = require("path");
  * @param {string} config.filePath 文件路径
  * @param {string} config.encoding 编码方式
  * @param {string} config.readMode 读取模式
- * @param {string} config.flag 读取标志
  * @param {number} [config.start] 起始位置
  * @param {number} [config.length] 读取长度
  * @returns {Promise<string|Buffer>} 文件内容
  */
 async function read(config) {
-  const { filePath, encoding, readMode, flag, start, length } = config;
+  const { filePath, encoding, readMode, start, length } = config;
 
   if (readMode === "all") {
-    return await fs.readFile(filePath, { encoding, flag });
+    return await fs.readFile(filePath, { encoding });
   } else if (
     readMode === "start" &&
     typeof start === "number" &&
     typeof length === "number"
   ) {
     // 指定位置读取
-    const fileHandle = await fs.open(filePath, flag || "r");
+    const fileHandle = await fs.open(filePath, "r");
     try {
       const buffer = Buffer.alloc(length);
       const { bytesRead } = await fileHandle.read(buffer, 0, length, start);
@@ -39,12 +38,11 @@ async function read(config) {
     // 按行读取，暂时使用全部读取然后分行的方式
     const content = await fs.readFile(filePath, {
       encoding: encoding || "utf8",
-      flag,
     });
     return content.split(/\r?\n/);
   } else {
     // 默认使用全部读取
-    return await fs.readFile(filePath, { encoding, flag });
+    return await fs.readFile(filePath, { encoding });
   }
 }
 
@@ -85,20 +83,12 @@ async function write(config) {
  * 文件删除操作
  */
 async function remove(config) {
-  const { filePath, recursive, force, targetType } = config;
+  const { filePath, recursive, force } = config;
 
   // 检查文件是否存在
   try {
     const stats = await fs.lstat(filePath);
 
-    // 检查目标类型
-    if (targetType === "file" && !stats.isFile()) {
-      throw new Error("目标不是文件");
-    }
-    if (targetType === "directory" && !stats.isDirectory()) {
-      throw new Error("目标不是目录");
-    }
-
     // 执行删除操作
     if (stats.isDirectory()) {
       await fs.rm(filePath, { recursive, force });
@@ -115,39 +105,16 @@ async function remove(config) {
 }
 
 /**
- * 文件管理操作
+ * 文件权限操作
  */
-async function manage(config) {
-  const {
-    filePath,
-    manageOperation,
-    newPath,
-    mode,
-    uid,
-    gid,
-    recursive,
-    targetType,
-  } = config;
-
-  // 检查文件是否存在
-  const stats = await fs.lstat(filePath);
-
-  // 检查目标类型
-  if (targetType === "file" && !stats.isFile()) {
-    throw new Error("目标不是文件");
-  }
-  if (targetType === "directory" && !stats.isDirectory()) {
-    throw new Error("目标不是目录");
-  }
+async function permission(config) {
+  const { filePath, operationType, mode, uid, gid, recursive } = config;
 
-  switch (manageOperation) {
-    case "rename":
-      // 确保目标目录存在
-      await fs.mkdir(path.dirname(newPath), { recursive: true });
-      await fs.rename(filePath, newPath);
-      break;
+  try {
+    // 检查文件是否存在
+    const stats = await fs.lstat(filePath);
 
-    case "chmod":
+    if (operationType === "chmod") {
       if (recursive && stats.isDirectory()) {
         const walk = async (dir) => {
           const files = await fs.readdir(dir);
@@ -166,9 +133,7 @@ async function manage(config) {
       } else {
         await fs.chmod(filePath, parseInt(mode, 8));
       }
-      break;
-
-    case "chown":
+    } else if (operationType === "chown") {
       if (recursive && stats.isDirectory()) {
         await fs.chown(filePath, uid, gid);
         const walk = async (dir) => {
@@ -188,10 +153,71 @@ async function manage(config) {
       } else {
         await fs.chown(filePath, uid, gid);
       }
-      break;
+    } else {
+      throw new Error(`不支持的操作类型: ${operationType}`);
+    }
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      throw new Error("文件或目录不存在");
+    }
+    throw error;
+  }
+}
 
-    default:
-      throw new Error(`不支持的操作类型: ${manageOperation}`);
+/**
+ * 文件复制移动操作
+ */
+async function transfer(config) {
+  const { filePath, transferOperation, newPath } = config;
+
+  // 检查文件是否存在
+  try {
+    const stats = await fs.lstat(filePath);
+
+    // 确保目标目录存在
+    await fs.mkdir(path.dirname(newPath), { recursive: true });
+    if (transferOperation === "copy") {
+      const processBar = await quickcommand.showProcessBar({
+        text: "复制中...",
+      });
+      if (stats.isDirectory()) {
+        // 复制目录
+        const copyDir = async (src, dest) => {
+          await fs.mkdir(dest, { recursive: true });
+          const entries = await fs.readdir(src);
+          for (const entry of entries) {
+            const srcPath = path.join(src, entry);
+            const destPath = path.join(dest, entry);
+            const entryStat = await fs.lstat(srcPath);
+            if (entryStat.isDirectory()) {
+              await copyDir(srcPath, destPath);
+            } else {
+              await fs.copyFile(srcPath, destPath);
+            }
+            quickcommand.updateProcessBar({ text: entry }, processBar);
+          }
+        };
+        await copyDir(filePath, newPath);
+      } else {
+        // 复制文件
+        await fs.copyFile(filePath, newPath);
+      }
+      processBar.close();
+    } else if (transferOperation === "rename") {
+      const processBar = await quickcommand.showProcessBar({
+        text: "处理中...",
+      });
+      await fs.rename(filePath, newPath);
+      processBar.close();
+    } else {
+      throw new Error(`不支持的操作类型: ${transferOperation}`);
+    }
+  } catch (error) {
+    processBar?.close();
+    if (error.code === "ENOENT") {
+      throw new Error("文件或目录不存在");
+    }
+    throw error;
   }
 }
 
@@ -246,69 +272,49 @@ async function list(config) {
   }
 }
 
+/**
+ * 格式化文件大小
+ * @param {number} bytes 字节数
+ * @returns {string} 格式化后的文件大小
+ */
+function formatBytes(bytes) {
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let unitIndex = 0;
+  while (bytes >= 1024 && unitIndex < units.length - 1) {
+    bytes /= 1024;
+    unitIndex++;
+  }
+  return `${bytes.toFixed(2)} ${units[unitIndex]}`;
+}
+
 /**
  * 获取文件或目录状态
  * @param {Object} config 配置对象
  * @param {string} config.filePath 路径
- * @param {string} config.targetType 目标类型
- * @param {string} config.statMode 检查类型
  * @param {boolean} [config.followSymlinks] 是否跟随符号链接
  * @returns {Promise<Object>} 状态信息
  */
 async function stat(config) {
-  const { filePath, targetType, statMode, followSymlinks } = config;
+  const { filePath, followSymlinks } = config;
 
   try {
     const statFn = followSymlinks ? fs.stat : fs.lstat;
     const stats = await statFn(filePath);
 
-    // 检查目标类型是否匹配
-    if (targetType === "file" && !stats.isFile()) {
-      throw new Error("目标不是文件");
-    }
-    if (targetType === "directory" && !stats.isDirectory()) {
-      throw new Error("目标不是目录");
-    }
-
-    // 根据检查类型返回不同的信息
-    if (statMode === "exists") {
-      return {
-        exists: true,
-        isFile: stats.isFile(),
-        isDirectory: stats.isDirectory(),
-      };
-    } else if (statMode === "status") {
-      return {
-        exists: true,
-        isFile: stats.isFile(),
-        isDirectory: stats.isDirectory(),
-        isSymbolicLink: stats.isSymbolicLink(),
-        size: stats.size,
-        mode: stats.mode,
-        uid: stats.uid,
-        gid: stats.gid,
-        accessTime: stats.atime,
-        modifyTime: stats.mtime,
-        changeTime: stats.ctime,
-        birthTime: stats.birthtime,
-      };
-    } else {
-      // 默认返回基本信息
-      return {
-        exists: true,
-        isFile: stats.isFile(),
-        isDirectory: stats.isDirectory(),
-        isSymbolicLink: stats.isSymbolicLink(),
-      };
-    }
+    return {
+      exists: true,
+      isFile: stats.isFile(),
+      isDirectory: stats.isDirectory(),
+      isSymbolicLink: stats.isSymbolicLink(),
+      humanReadSize: formatBytes(stats.size),
+      ...stats,
+    };
   } catch (error) {
     if (error.code === "ENOENT") {
       return {
         exists: false,
-        ...(statMode === "exists" && {
-          isFile: false,
-          isDirectory: false,
-        }),
+        isFile: false,
+        isDirectory: false,
       };
     }
     throw error;
@@ -319,39 +325,28 @@ async function stat(config) {
  * 统一的文件操作入口
  */
 async function operation(config) {
-  if (!config || typeof config !== "object") {
-    throw new Error("配置参数必须是一个对象");
-  }
-
-  const { operation } = config;
-  if (!operation) {
-    throw new Error("缺少必要的 operation 参数");
-  }
+  const { operation: op } = config;
 
-  switch (operation) {
+  switch (op) {
     case "read":
       return await read(config);
     case "write":
       return await write(config);
     case "list":
       return await list(config);
-    case "stat":
-      return await stat(config);
     case "delete":
       return await remove(config);
-    case "manage":
-      return await manage(config);
+    case "stat":
+      return await stat(config);
+    case "permission":
+      return await permission(config);
+    case "transfer":
+      return await transfer(config);
     default:
-      throw new Error(`不支持的操作类型: ${operation}`);
+      throw new Error(`不支持的操作类型: ${op}`);
   }
 }
 
 module.exports = {
-  read,
-  write,
-  list,
-  stat,
-  remove,
-  manage,
   operation,
 };
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index 7c79e8ed..e9bc16c9 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -43,10 +43,16 @@
             <div class="q-ml-xs">删除</div>
           </div>
         </q-tab>
-        <q-tab name="manage" no-caps>
+        <q-tab name="transfer" no-caps>
           <div class="row items-center no-wrap">
-            <q-icon name="settings" size="16px" />
-            <div class="q-ml-xs">管理</div>
+            <q-icon name="drive_file_move" size="16px" />
+            <div class="q-ml-xs">复制移动</div>
+          </div>
+        </q-tab>
+        <q-tab name="permission" no-caps>
+          <div class="row items-center no-wrap">
+            <q-icon name="security" size="16px" />
+            <div class="q-ml-xs">权限</div>
           </div>
         </q-tab>
       </q-tabs>
@@ -64,10 +70,7 @@
         dialog: {
           options: {
             title: '选择文件',
-            properties: [
-              shouldSelectDirectory ? 'openDirectory' : 'openFile',
-              'showHiddenFiles',
-            ],
+            properties: ['openDirectory', 'openFile', 'showHiddenFiles'],
           },
         },
       }"
@@ -100,25 +103,13 @@
           map-options
           @update:model-value="updateArgvs('readMode', $event)"
         />
-        <q-select
-          v-model="argvs.readFlag"
-          :options="readFlagOptions"
-          label="读取标志"
-          dense
-          options-dense
-          filled
-          class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('readFlag', $event)"
-        />
         <NumberInput
           v-if="argvs.readMode === 'start'"
           :model-value="argvs.start"
           @update:model-value="updateArgvs('start', $event)"
           label="起始位置"
           icon="first_page"
-          class="col-grow"
+          class="col"
         />
         <NumberInput
           v-if="argvs.readMode === 'start'"
@@ -126,7 +117,7 @@
           @update:model-value="updateArgvs('length', $event)"
           label="读取长度"
           icon="last_page"
-          class="col-grow"
+          class="col"
         />
       </div>
     </template>
@@ -186,7 +177,7 @@
           @update:model-value="updateArgvs('content', $event)"
           label="写入内容"
           icon="edit"
-          class="col-12"
+          class="col-grow"
         />
       </div>
     </template>
@@ -194,80 +185,87 @@
     <!-- 删除操作配置 -->
     <template v-if="argvs.operation === 'delete'">
       <div class="row q-gutter-sm">
-        <q-select
-          v-model="argvs.targetType"
-          :options="targetTypeOptions"
-          label="目标类型"
-          dense
-          filled
-          options-dense
-          class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('targetType', $event)"
-        />
-        <q-checkbox
+        <CheckButton
           v-model="argvs.recursive"
           label="递归删除"
-          v-if="argvs.targetType === 'directory'"
-          dense
-          class="col-grow"
+          class="col"
           @update:model-value="updateArgvs('recursive', $event)"
         />
-        <q-checkbox
+        <CheckButton
           v-model="argvs.force"
           label="强制删除"
-          dense
-          class="col-grow"
+          class="col"
           @update:model-value="updateArgvs('force', $event)"
         />
       </div>
     </template>
 
-    <!-- 管理操作配置 -->
-    <template v-if="argvs.operation === 'manage'">
+    <!-- 列目录操作配置 -->
+    <template v-if="argvs.operation === 'list'">
       <div class="row q-gutter-sm">
-        <q-select
-          v-model="argvs.targetType"
-          :options="targetTypeOptions"
-          label="目标类型"
-          dense
-          options-dense
-          filled
-          class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('targetType', $event)"
+        <CheckButton
+          v-model="argvs.recursive"
+          label="递归列出子目录"
+          class="col"
+          @update:model-value="updateArgvs('recursive', $event)"
         />
-        <q-select
-          v-model="argvs.manageOperation"
-          :options="manageOperationOptions"
-          label="管理操作"
-          dense
-          options-dense
-          filled
+        <CheckButton
+          v-model="argvs.showHidden"
+          label="显示隐藏文件"
+          class="col"
+          @update:model-value="updateArgvs('showHidden', $event)"
+        />
+      </div>
+    </template>
+
+    <!-- 状态操作配置 -->
+    <template v-if="argvs.operation === 'stat'">
+      <div class="row q-gutter-sm">
+        <CheckButton
+          v-model="argvs.followSymlinks"
+          label="跟随符号链接"
+          @update:model-value="updateArgvs('followSymlinks', $event)"
           class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('manageOperation', $event)"
         />
       </div>
+    </template>
 
-      <!-- 重命名操作 -->
-      <template v-if="argvs.manageOperation === 'rename'">
-        <div class="row q-gutter-sm">
+    <!-- 复制移动操作配置 -->
+    <template v-if="argvs.operation === 'transfer'">
+      <div class="row q-gutter-sm">
+        <div class="col-6">
           <VariableInput
             :model-value="argvs.newPath"
             @update:model-value="updateArgvs('newPath', $event)"
-            label="新路径"
+            label="目标路径"
             icon="drive_file_rename_outline"
-            class="col-grow"
+            class="col-6"
           />
         </div>
-      </template>
+        <div class="col">
+          <ButtonGroup
+            v-model="argvs.transferOperation"
+            :options="transferOperationOptions"
+            height="36px"
+            @update:model-value="updateArgvs('transferOperation', $event)"
+          />
+        </div>
+      </div>
+    </template>
+
+    <!-- 权限操作配置 -->
+    <template v-if="argvs.operation === 'permission'">
+      <div class="row q-gutter-sm">
+        <ButtonGroup
+          v-model="argvs.operationType"
+          class="col"
+          :options="operationTypeOptions"
+          @update:model-value="updateArgvs('operationType', $event)"
+        />
+      </div>
 
       <!-- 修改权限操作 -->
-      <template v-if="argvs.manageOperation === 'chmod'">
+      <template v-if="argvs.operationType === 'chmod'">
         <div class="row q-gutter-sm">
           <q-select
             v-model="argvs.mode"
@@ -290,11 +288,9 @@
               </q-item>
             </template>
           </q-select>
-          <q-checkbox
+          <CheckButton
             v-model="argvs.recursive"
             label="递归修改"
-            v-if="argvs.targetType === 'directory'"
-            dense
             class="col-grow"
             @update:model-value="updateArgvs('recursive', $event)"
           />
@@ -302,7 +298,7 @@
       </template>
 
       <!-- 修改所有者操作 -->
-      <template v-if="argvs.manageOperation === 'chown'">
+      <template v-if="argvs.operationType === 'chown'">
         <div class="row q-gutter-sm">
           <NumberInput
             :model-value="argvs.uid"
@@ -318,75 +314,15 @@
             icon="group"
             class="col-grow"
           />
-          <q-checkbox
+          <CheckButton
             v-model="argvs.recursive"
             label="递归修改"
-            v-if="argvs.targetType === 'directory'"
-            dense
             class="col-grow"
             @update:model-value="updateArgvs('recursive', $event)"
           />
         </div>
       </template>
     </template>
-
-    <!-- 列目录操作配置 -->
-    <template v-if="argvs.operation === 'list'">
-      <div class="row q-gutter-sm q-px-xs">
-        <q-checkbox
-          v-model="argvs.recursive"
-          label="递归列出子目录"
-          dense
-          class="col-grow"
-          @update:model-value="updateArgvs('recursive', $event)"
-        />
-        <q-checkbox
-          v-model="argvs.showHidden"
-          label="显示隐藏文件"
-          dense
-          class="col-grow"
-          @update:model-value="updateArgvs('showHidden', $event)"
-        />
-      </div>
-    </template>
-
-    <!-- 状态操作配置 -->
-    <template v-if="argvs.operation === 'stat'">
-      <div class="row q-gutter-sm">
-        <q-select
-          v-model="argvs.targetType"
-          :options="targetTypeOptions"
-          label="目标类型"
-          dense
-          filled
-          options-dense
-          class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('targetType', $event)"
-        />
-        <q-select
-          v-model="argvs.statMode"
-          :options="statModeOptions"
-          label="检查类型"
-          dense
-          filled
-          options-dense
-          class="col-grow"
-          emit-value
-          map-options
-          @update:model-value="updateArgvs('statMode', $event)"
-        />
-        <q-checkbox
-          v-model="argvs.followSymlinks"
-          label="跟随符号链接"
-          v-if="argvs.statMode === 'status'"
-          @update:model-value="updateArgvs('followSymlinks', $event)"
-          dense
-          class="col-grow"
-        />
-      </div>
-    </template>
   </div>
 </template>
 
@@ -394,7 +330,9 @@
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import ButtonGroup from "components/composer/common/ButtonGroup.vue";
+import CheckButton from "components/composer/common/CheckButton.vue";
+import { stringifyArgv } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 
 // 静态选项数据
@@ -418,11 +356,6 @@ const READ_MODE_OPTIONS = [
   { label: "按行读取", value: "line" },
 ];
 
-const READ_FLAG_OPTIONS = [
-  { label: "同步读取", value: "sync" },
-  { label: "异步读取", value: "async" },
-];
-
 const WRITE_MODE_OPTIONS = [
   { label: "覆盖写入", value: "write" },
   { label: "追加写入", value: "append" },
@@ -435,20 +368,19 @@ const WRITE_FLAG_OPTIONS = [
   { label: "777", value: "777", hint: "所有人读写执行" },
 ];
 
-const STAT_MODE_OPTIONS = [
-  { label: "检查存在", value: "exists" },
-  { label: "完整状态", value: "status" },
-];
-
 const TARGET_TYPE_OPTIONS = [
   { label: "文件", value: "file" },
   { label: "目录", value: "directory" },
 ];
 
-const MANAGE_OPERATION_OPTIONS = [
-  { label: "重命名", value: "rename" },
-  { label: "修改权限", value: "chmod" },
-  { label: "修改所有者", value: "chown" },
+const OPERATION_TYPE_OPTIONS = [
+  { label: "修改权限", value: "chmod", icon: "lock" },
+  { label: "修改所有者", value: "chown", icon: "person" },
+];
+
+const TRANSFER_OPERATION_OPTIONS = [
+  { label: "移动/重命名", value: "rename", icon: "drive_file_rename_outline" },
+  { label: "复制", value: "copy", icon: "content_copy" },
 ];
 
 export default defineComponent({
@@ -456,6 +388,8 @@ export default defineComponent({
   components: {
     VariableInput,
     NumberInput,
+    ButtonGroup,
+    CheckButton,
   },
   props: {
     modelValue: {
@@ -468,44 +402,34 @@ export default defineComponent({
     return {
       encodingOptions: ENCODING_OPTIONS,
       readModeOptions: READ_MODE_OPTIONS,
-      readFlagOptions: READ_FLAG_OPTIONS,
       writeModeOptions: WRITE_MODE_OPTIONS,
       writeFlagOptions: WRITE_FLAG_OPTIONS,
-      statModeOptions: STAT_MODE_OPTIONS,
       targetTypeOptions: TARGET_TYPE_OPTIONS,
-      manageOperationOptions: MANAGE_OPERATION_OPTIONS,
+      operationTypeOptions: OPERATION_TYPE_OPTIONS,
+      transferOperationOptions: TRANSFER_OPERATION_OPTIONS,
       defaultArgvs: {
         operation: "read",
         filePath: newVarInputVal("str"),
         encoding: "utf8",
         readMode: "all",
-        readFlag: "async",
         start: 0,
         length: 100,
         targetType: "file",
         writeMode: "write",
         writeFlag: "644",
-        statMode: "exists",
-        followSymlinks: false,
+        followSymlinks: true,
+        mode: "644",
         recursive: false,
         force: false,
         showHidden: false,
-        manageOperation: "rename",
+        operationType: "chmod",
+        transferOperation: "rename",
       },
     };
   },
   computed: {
     argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
-    },
-    shouldSelectDirectory() {
-      return (
-        this.argvs.operation === "list" ||
-        (this.argvs.targetType === "directory" &&
-          ["delete", "manage", "stat"].includes(this.argvs.operation))
-      );
+      return this.modelValue.argvs || this.defaultArgvs;
     },
   },
   methods: {
@@ -519,7 +443,6 @@ export default defineComponent({
       switch (argvs.operation) {
         case "read":
           params.encoding = argvs.encoding;
-          params.readFlag = argvs.readFlag;
           params.readMode = argvs.readMode;
           if (argvs.readMode === "start") {
             params.start = Number(argvs.start) || 0;
@@ -537,31 +460,32 @@ export default defineComponent({
         case "list":
           params.targetType = "directory";
           params.recursive = argvs.recursive;
+          params.showHidden = argvs.showHidden;
           break;
 
         case "delete":
-          params.targetType = argvs.targetType;
           params.force = argvs.force;
-          params.recursive =
-            argvs.recursive && argvs.targetType === "directory";
+          params.recursive = argvs.recursive;
           break;
 
-        case "manage":
-          params.targetType = argvs.targetType;
-          params.manageOperation = argvs.manageOperation;
-          if (argvs.manageOperation === "rename") {
-            params.newPath = argvs.newPath;
+        case "stat":
+          params.followSymlinks = argvs.followSymlinks;
+          break;
+
+        case "permission":
+          params.operationType = argvs.operationType;
+          if (argvs.operationType === "chmod") {
+            params.mode = argvs.mode;
           } else {
-            if (argvs.mode) params.mode = argvs.mode;
-            if (argvs.uid) params.uid = argvs.uid;
-            if (argvs.gid) params.gid = argvs.gid;
+            params.uid = argvs.uid;
+            params.gid = argvs.gid;
           }
+          params.recursive = argvs.recursive;
           break;
 
-        case "stat":
-          params.targetType = argvs.targetType;
-          params.statMode = argvs.statMode;
-          params.followSymlinks = argvs.followSymlinks;
+        case "transfer":
+          params.transferOperation = argvs.transferOperation;
+          params.newPath = argvs.newPath;
           break;
       }
 
@@ -610,52 +534,6 @@ export default defineComponent({
       this.argvs.mode = `${ownerValue}${groupValue}${otherValue}`;
       this.updateArgvs();
     },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      try {
-        const variableFormatPaths = [
-          "arg0.filePath",
-          "arg0.content",
-          "arg0.newPath",
-        ];
-        const result = parseFunction(code, { variableFormatPaths });
-        let params = result.argvs[0];
-
-        // 根据不同操作类型处理特定参数
-        switch (params.operation) {
-          case "read":
-            if (params.readMode === "start") {
-              params.start = Number(params.start) || 0;
-              params.length = Number(params.length) || 100;
-            }
-            break;
-
-          case "write":
-            // 将 flag 转换回 writeMode
-            params.writeMode = params.flag === "a" ? "append" : "write";
-            // 将 mode 转换回 writeFlag
-            params.writeFlag = params.mode;
-            break;
-
-          case "list":
-            params.targetType = "directory";
-            break;
-
-          case "delete":
-          case "manage":
-          case "stat":
-            // 这些操作的参数可以直接使用
-            break;
-        }
-
-        return params;
-      } catch (e) {
-        console.error("解析文件操作参数失败:", e);
-      }
-      return argvs;
-    },
     updateModelValue(argvs) {
       this.$emit("update:modelValue", {
         ...this.modelValue,
@@ -670,19 +548,11 @@ export default defineComponent({
         write: "写入",
         list: "列目录",
         delete: "删除",
-        manage: "管理",
-        stat: "状态",
-      };
-      const findOptionsLabel = (options, value) => {
-        return options.find((option) => option.value === value)?.label || value;
+        stat: "获取状态",
+        transfer: "复制移动",
+        permission: "设置权限",
       };
-      let operationInfo =
-        argvs.operation === "manage"
-          ? findOptionsLabel(MANAGE_OPERATION_OPTIONS, argvs.manageOperation) +
-            " "
-          : argvs.operation === "stat"
-          ? findOptionsLabel(STAT_MODE_OPTIONS, argvs.statMode) + " "
-          : operationDict[argvs.operation] + " ";
+      let operationInfo = operationDict[argvs.operation] + " ";
       return operationInfo + argvs.filePath.value;
     },
   },
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index ea754b0d..ff4aced6 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -382,7 +382,7 @@ export default defineComponent({
   },
   computed: {
     argvs() {
-      return this.modelValue.argvs;
+      return this.modelValue.argvs || this.defaultArgvs;
     },
     hasRequestData() {
       return ["PUT", "POST", "PATCH"].includes(this.argvs.method);
diff --git a/src/plugins/monaco/types/quickcomposer.d.ts b/src/plugins/monaco/types/quickcomposer.d.ts
index 40884b56..3a65df7c 100644
--- a/src/plugins/monaco/types/quickcomposer.d.ts
+++ b/src/plugins/monaco/types/quickcomposer.d.ts
@@ -507,89 +507,58 @@ interface quickcomposerApi {
   file: {
     /**
      * 文件操作
-     */
-    operation: {
-      /**
-       * 统一的文件操作入口
-       * @param config 操作配置
-       */
-      operation(config: {
-        /** 操作类型：read-读取，write-写入，list-列表，stat-状态，delete-删除，manage-管理 */
-        operation: "read" | "write" | "list" | "stat" | "delete" | "manage";
-        /** 文件路径 */
-        filePath: string;
-        /** 读取操作配置 */
-        readOptions?: {
-          /** 编码方式 */
-          encoding?: BufferEncoding;
-          /** 起始位置 */
-          start?: number;
-          /** 结束位置 */
-          end?: number;
-        };
-        /** 写入操作配置 */
-        writeOptions?: {
-          /** 写入内容 */
-          content: string;
-          /** 编码方式 */
-          encoding?: BufferEncoding;
-          /** 写入模式：overwrite-覆盖，append-追加 */
-          writeMode?: "overwrite" | "append";
-          /** 文件权限 */
-          writeFlag?: string;
-        };
-        /** 列表操作配置 */
-        listOptions?: {
-          /** 是否递归 */
-          recursive?: boolean;
-          /** 是否包含隐藏文件 */
-          includeHidden?: boolean;
-        };
-        /** 管理操作配置 */
-        manageOptions?: {
-          /** 目标类型：file-文件，directory-目录 */
-          targetType?: "file" | "directory";
-          /** 管理操作类型：rename-重命名，chmod-修改权限，chown-修改所有者 */
-          manageOperation?: "rename" | "chmod" | "chown";
-          /** 新路径(重命名时使用) */
-          newPath?: string;
-          /** 权限模式(chmod时使用) */
-          mode?: string | number;
-          /** 用户ID(chown时使用) */
-          uid?: number;
-          /** 组ID(chown时使用) */
-          gid?: number;
-          /** 是否递归操作 */
-          recursive?: boolean;
-        };
-      }): Promise<any>;
-    };
-
-    /**
-     * 文件归档
-     */
-    archive: {
-      /**
-       * 文件归档操作
-       * @param config 归档配置
-       */
-      archive(config: {
-        /** 操作类型：compress-压缩，extract-解压 */
-        operation: "compress" | "extract";
-        /** 归档格式：zip, tar, gzip */
-        format: "zip" | "tar" | "gzip";
-        /** 源文件/文件夹路径 */
-        sourcePath: string | string[];
-        /** 目标路径 */
-        targetPath: string;
-        /** 压缩级别(1-9) */
-        level?: number;
-        /** 是否保持目录结构 */
-        preserveStructure?: boolean;
-        /** 密码保护(仅zip格式支持) */
-        password?: string;
-      }): Promise<void>;
-    };
+     * @param config 操作配置
+     */
+    operation(config: {
+      /** 操作类型：read-读取，write-写入，list-列表，stat-状态，delete-删除，permission-权限，transfer-复制移动 */
+      operation:
+        | "read"
+        | "write"
+        | "list"
+        | "stat"
+        | "delete"
+        | "permission"
+        | "transfer";
+      /** 文件路径 */
+      filePath: string;
+      /** 读取操作配置 */
+      encoding?: BufferEncoding;
+      readMode?: "all" | "start" | "line";
+      start?: number;
+      length?: number;
+      /** 写入操作配置 */
+      content?: string;
+      flag?: "w" | "a";
+      mode?: string | number;
+      /** 列表操作配置 */
+      recursive?: boolean;
+      showHidden?: boolean;
+      /** 权限操作配置 */
+      operationType?: "chmod" | "chown";
+      uid?: number;
+      gid?: number;
+      /** 复制移动操作配置 */
+      transferOperation?: "copy" | "rename";
+      newPath?: string;
+      /** 删除操作配置 */
+      force?: boolean;
+      /** 状态操作配置 */
+      followSymlinks?: boolean;
+    }): Promise<any>;
+
+    /**
+     * 文件归档操作
+     * @param operation 操作类型：compress-压缩，extract-解压
+     * @param format 归档格式：zip, tar, gzip
+     * @param source 源文件/文件夹路径
+     * @param destination 目标路径
+     */
+    archive(
+      operation: "compress" | "extract",
+      format: "zip" | "tar" | "gzip",
+      source: string | string[],
+      destination: string
+    ): Promise<void>;
   };
   system: {
     /**

From dc674c06a1a4af22f83ba30516ab46a3573e81d1 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 23 Mar 2025 17:48:11 +0800
Subject: [PATCH 289/332] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8hideMainWindowPasteText?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=9D=E6=8C=81=E6=9B=B4=E5=A5=BD=E7=9A=84=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/shortCodes.js                    | 2 +-
 src/components/popup/ResultMenu.vue         | 2 +-
 src/js/options/outputTypes.js               | 2 +-
 src/plugins/monaco/types/shortcode.api.d.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/lib/shortCodes.js b/plugin/lib/shortCodes.js
index 203bd31f..86727350 100644
--- a/plugin/lib/shortCodes.js
+++ b/plugin/lib/shortCodes.js
@@ -28,7 +28,7 @@ const shortCodes = {
     electron.clipboard.writeText(text);
   },
   send: (text) => {
-    window.utools.hideMainWindowTypeString(text);
+    window.utools.hideMainWindowPasteText(text);
   },
 };
 
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index d920950a..f70cc796 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -138,7 +138,7 @@ export default {
       quickcommand.showMessageBox("已复制到剪贴板");
     },
     sendResult() {
-      window.utools.hideMainWindowTypeString(
+      window.utools.hideMainWindowPasteText(
         this.selectText || this.getFormattedContent()
       );
     },
diff --git a/src/js/options/outputTypes.js b/src/js/options/outputTypes.js
index 1e7625e4..d8cd6eb6 100644
--- a/src/js/options/outputTypes.js
+++ b/src/js/options/outputTypes.js
@@ -48,7 +48,7 @@ const outputTypes = {
         label: "发送到活动窗口",
         icon: "web_asset",
         outPlugin: true,
-        action: result => window.utools.hideMainWindowTypeString(result)
+        action: result => window.utools.hideMainWindowPasteText(result)
     },
     notice: {
         name: "notice",
diff --git a/src/plugins/monaco/types/shortcode.api.d.ts b/src/plugins/monaco/types/shortcode.api.d.ts
index 80bf9c87..629e999b 100644
--- a/src/plugins/monaco/types/shortcode.api.d.ts
+++ b/src/plugins/monaco/types/shortcode.api.d.ts
@@ -73,7 +73,7 @@ declare function copyTo(text: string): void;
  *
  * ```js
  * // 等同于
- * utools.hideMainWindowTypeString(text)
+ * utools.hideMainWindowPasteText(text)
  * ```
  */
 declare function send(text: string): void;

From d8a61ae5ec919b8c357595e1c49c4f50adaa9f14 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Mar 2025 17:30:29 +0800
Subject: [PATCH 290/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerCard.vue     |  1 +
 src/components/composer/card/CommandHead.vue | 57 +++++++++++++++++---
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/components/composer/ComposerCard.vue b/src/components/composer/ComposerCard.vue
index 1d308cd6..8854ab91 100644
--- a/src/components/composer/ComposerCard.vue
+++ b/src/components/composer/ComposerCard.vue
@@ -36,6 +36,7 @@
         <CommandHead
           :command="localCommand"
           @update:outputVariable="handleOutputVariableUpdate"
+          @update:summary="localCommand.userComments = $event"
           @toggle-collapse="handleToggleCollapse"
           @run="runCommand"
           @remove="$emit('remove')"
diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 4defdd1f..cfd84897 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -20,15 +20,29 @@
     </div>
 
     <!-- 标题 -->
-    <div class="drag-handle command-label">
-      <div class="text-subtitle2 command-label-text">
+    <div class="command-label">
+      <div class="drag-handle text-subtitle2 command-label-text">
         {{ command.label }}
       </div>
       <div
-        class="text-caption text-grey command-summary"
-        v-if="command.summary && isCollapsed"
+        v-if="isCollapsed && !isControlFlow"
+        class="summary-container"
+        @click.stop="isEditingSummary = true"
       >
-        {{ command.summary }}
+        <div class="command-summary" v-if="!isEditingSummary">
+          {{ commandSummary || "添加描述" }}
+          <q-tooltip v-if="commandSummary"> 单击修改描述 </q-tooltip>
+        </div>
+        <q-input
+          v-else
+          borderless
+          class="summary-input"
+          :model-value="commandSummary"
+          @update:model-value="$emit('update:summary', $event)"
+          @blur="isEditingSummary = false"
+          autofocus
+          placeholder="描述"
+        />
       </div>
     </div>
 
@@ -70,13 +84,24 @@ export default {
   components: {
     CommandButtons,
   },
+  data() {
+    return {
+      isEditingSummary: false,
+    };
+  },
   props: {
     command: {
       type: Object,
       required: true,
     },
   },
-  emits: ["update:outputVariable", "run", "remove", "toggle-collapse"],
+  emits: [
+    "update:outputVariable",
+    "update:summary",
+    "run",
+    "remove",
+    "toggle-collapse",
+  ],
   computed: {
     contentClass() {
       return {
@@ -100,6 +125,9 @@ export default {
     isCollapsed() {
       return this.command.isCollapsed;
     },
+    commandSummary() {
+      return this.command.userComments || this.command.summary;
+    },
   },
 };
 </script>
@@ -142,14 +170,29 @@ export default {
 }
 
 .command-summary {
-  max-width: 200px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  color: gray;
+  font-size: 11px;
+}
+
+.summary-container {
+  cursor: text;
+  width: 200px;
 }
 
 .info-icon {
   opacity: 0.6;
   font-size: 12px;
 }
+
+.summary-input :deep(.q-field__control),
+.summary-input :deep(.q-field__native),
+.summary-input :deep(.q-field__marginal) {
+  height: 20px !important;
+  min-height: 20px;
+  font-size: 11px;
+  color: gray;
+}
 </style>

From 3ba9593d971d7715d450d601797b041305d44b1f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Mar 2025 17:56:37 +0800
Subject: [PATCH 291/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=88=86=E7=B1=BB=E7=9A=84=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerList.vue | 184 +++++++++++++----------
 1 file changed, 102 insertions(+), 82 deletions(-)

diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index 0d48115c..0fb511be 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -18,21 +18,16 @@
 
     <q-scroll-area class="command-scroll">
       <div>
-        <q-list separator class="rounded-borders">
+        <div class="category-list">
           <template
             v-for="category in filteredCategories"
             :key="category.label"
           >
-            <q-expansion-item
-              :label="category.label"
-              :icon="category.icon"
-              :model-value="isExpanded(category)"
-              @update:model-value="updateExpanded(category, $event)"
-              dense-toggle
-              class="category-item"
-              header-class="category-header"
-            >
-              <template v-slot:header>
+            <div class="category-item">
+              <div
+                class="category-header"
+                @click="updateExpanded(category, !isExpanded(category))"
+              >
                 <div class="category-header-content">
                   <q-icon
                     :name="category.icon"
@@ -41,29 +36,46 @@
                     class="category-icon"
                   />
                   <span class="text-weight-medium">{{ category.label }}</span>
+                  <q-icon
+                    :name="isExpanded(category) ? 'expand_less' : 'expand_more'"
+                    class="expand-icon"
+                    size="16px"
+                    color="grey"
+                  />
                 </div>
-              </template>
-
-              <q-item
-                v-for="command in getCategoryCommands(category)"
-                :key="command.value"
-                class="command-item"
-                draggable="true"
-                @dragstart="onDragStart($event, command)"
+              </div>
+
+              <div
+                class="category-content-wrapper"
+                :class="{ expanded: isExpanded(category) }"
               >
-                <div class="drag-icon-left">
-                  <q-icon name="drag_indicator" color="grey-6" size="16px" />
+                <div class="category-content">
+                  <q-item
+                    v-for="command in getCategoryCommands(category)"
+                    :key="command.value"
+                    class="command-item"
+                    draggable="true"
+                    @dragstart="onDragStart($event, command)"
+                  >
+                    <div class="drag-icon-left">
+                      <q-icon
+                        name="drag_indicator"
+                        color="grey-6"
+                        size="16px"
+                      />
+                    </div>
+                    <q-item-section>
+                      <q-item-label
+                        class="text-weight-medium q-px-lg"
+                        v-html="highlightText(command.label)"
+                      />
+                    </q-item-section>
+                  </q-item>
                 </div>
-                <q-item-section>
-                  <q-item-label
-                    class="text-weight-medium q-px-lg"
-                    v-html="highlightText(command.label)"
-                  />
-                </q-item-section>
-              </q-item>
-            </q-expansion-item>
+              </div>
+            </div>
           </template>
-        </q-list>
+        </div>
       </div>
     </q-scroll-area>
   </div>
@@ -219,52 +231,41 @@ export default defineComponent({
   height: 100%;
 }
 
-.composer-list :deep(.q-expansion-item) {
-  margin: 0;
-  border: none;
-}
-
-.composer-list :deep(.q-expansion-item .q-item) {
-  justify-content: space-between;
-}
-
 .body--dark .composer-list {
   background-color: #232323;
 }
 
+.category-list {
+  padding: 4px 0;
+}
+
 .category-item {
-  margin: 4px 0;
   border-radius: 4px;
   overflow: hidden;
 }
 
-:deep(.q-item.category-header) {
+.category-header {
   min-height: 30px;
   margin: 0 8px;
   padding: 0 4px;
   border-radius: 4px;
   transition: background-color 0.3s ease;
-  position: relative;
-  display: flex;
-  align-items: center;
+  cursor: pointer;
 }
 
-:deep(.q-item.category-header .q-item__section--side) {
-  position: absolute;
-  right: 4px;
-  padding: 0;
-  height: 100%;
-  display: flex;
-  align-items: center;
+.category-header:hover {
+  background-color: rgba(0, 0, 0, 0.03);
+}
+
+.body--dark .category-header:hover {
+  background-color: rgba(255, 255, 255, 0.03);
 }
 
 .category-header-content {
-  position: absolute;
-  left: 0;
-  right: 0;
-  height: 100%;
+  height: 30px;
   display: flex;
   align-items: center;
+  position: relative;
 }
 
 .category-icon {
@@ -282,12 +283,32 @@ export default defineComponent({
   line-height: 1;
 }
 
-:deep(.q-expansion-item__toggle-icon) {
-  font-size: 1.2em;
-  line-height: 1;
+.expand-icon {
+  position: absolute;
+  right: 4px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  opacity: 0.8;
+}
+
+.category-content-wrapper {
+  display: grid;
+  grid-template-rows: 0fr;
+  transition: grid-template-rows 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 }
 
-.command-item.q-item-type {
+.category-content-wrapper.expanded {
+  grid-template-rows: 1fr;
+}
+
+.category-content {
+  min-height: 0;
+  overflow: hidden;
+}
+
+.command-item {
   border: 1px solid rgba(0, 0, 0, 0.05);
   border-radius: 4px;
   margin: 4px 8px;
@@ -302,18 +323,7 @@ export default defineComponent({
   position: relative;
 }
 
-.command-item.q-item-type :deep(.q-item__section) {
-  padding: 0;
-  min-height: unset;
-  flex: 1;
-}
-
-.command-item.q-item-type :deep(.q-item__label) {
-  line-height: 1;
-  text-align: center;
-}
-
-.command-item.q-item-type:hover {
+.command-item:hover {
   transform: translateX(3px);
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
@@ -323,8 +333,23 @@ export default defineComponent({
   transform: scale(0.95);
 }
 
-.body--dark .section-header {
-  border-bottom-color: rgba(255, 255, 255, 0.05);
+.drag-icon-left {
+  position: absolute;
+  left: 8px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.command-item :deep(.q-item__section) {
+  padding: 0;
+  min-height: unset;
+  flex: 1;
+}
+
+.command-item :deep(.q-item__label) {
+  line-height: 1;
+  text-align: center;
 }
 
 .command-item :deep(.highlight) {
@@ -334,16 +359,11 @@ export default defineComponent({
   border-radius: 2px;
 }
 
-.drag-icon-left {
-  position: absolute;
-  left: 8px;
-  height: 100%;
-  display: flex;
-  align-items: center;
+.body--dark .command-item {
+  border-color: rgba(255, 255, 255, 0.05);
 }
 
-.section-header .q-field--focused .q-field__prepend .q-icon {
-  animation: shake 0.8s ease;
-  color: var(--q-primary);
+.body--dark .command-item:hover {
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 </style>

From 97ce5fa96572707db2bea403e74158ba2b1f1405 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 24 Mar 2025 18:10:10 +0800
Subject: [PATCH 292/332] =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/file/FileOperationEditor.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index e9bc16c9..47261cc7 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -70,7 +70,10 @@
         dialog: {
           options: {
             title: '选择文件',
-            properties: ['openDirectory', 'openFile', 'showHiddenFiles'],
+            properties: [
+              argvs.operation === 'list' ? 'openDirectory' : 'openFile',
+              'showHiddenFiles',
+            ],
           },
         },
       }"

From 2259a61fa1779d91e8a3130a9b852fc4f2408179 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Mar 2025 17:00:34 +0800
Subject: [PATCH 293/332] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=90=E8=A1=8C=E7=BC=96=E6=8E=92=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ComposerEditor.vue | 48 ++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/components/ComposerEditor.vue b/src/components/ComposerEditor.vue
index 4d8c7714..938d22ae 100644
--- a/src/components/ComposerEditor.vue
+++ b/src/components/ComposerEditor.vue
@@ -6,6 +6,37 @@
     :disabled-control-buttons="disabledControlButtons"
     class="fixed-full"
   />
+  <q-dialog v-model="showHelpDialog">
+    <q-card style="width: 450px">
+      <div class="q-pa-md">
+        <div class="text-h6 q-mb-md">👏🏻 欢迎使用可视化编排</div>
+        <div class="q-mb-sm">由于编排功能众多，推荐先查看教程再使用</div>
+        <div class="q-mb-sm">
+          <q-btn dense color="primary" flat @click="showHelp('#TMtYg')">
+            完整教程
+          </q-btn>
+        </div>
+        <div class="q-mb-sm">
+          <q-btn dense color="primary" flat @click="showHelp('#JqM2f')">
+            快速入门：浏览器控制典型案例
+          </q-btn>
+        </div>
+        <div class="row items-center">
+          <div>你随时可以点击右上角的</div>
+          <q-icon name="help" class="q-ml-xs" size="13px" />
+          <div>帮助按钮，再次查看教程</div>
+        </div>
+      </div>
+      <div class="flex justify-end q-pa-sm">
+        <q-btn
+          flat
+          dense
+          label="我知道了"
+          @click="showHelpDialog = false"
+        />
+      </div>
+    </q-card>
+  </q-dialog>
   <!-- 运行结果 -->
   <CommandRunResult ref="result"></CommandRunResult>
 </template>
@@ -15,22 +46,15 @@ import CommandComposer from "components/composer/CommandComposer.vue";
 import CommandRunResult from "components/CommandRunResult";
 import { useCommandManager } from "js/commandManager.js";
 import { dbManager } from "js/utools";
+import { ref } from "vue";
 
 export default {
   components: { CommandComposer, CommandRunResult },
   setup() {
     const hasRunComposer = dbManager.getStorage("st_hasRunComposer");
-
+    const showHelpDialog = ref(false);
     if (!hasRunComposer) {
-      quickcommand.showConfirmBox(
-        `<div>👏🏻 欢迎使用可视化编排，由于编排功能众多，推荐先查看教程再使用</div>
-        <div>查看教程<a href="/service/javascript:void(0)" onclick="utools.ubrowser.goto('https://www.yuque.com/fofolee/qcdocs3/bg31vl#TMtYg').run({width: 1280, height: 720})">戳我</a></div>
-        <div>或者看一个<a href="/service/javascript:void(0)" onclick="utools.ubrowser.goto('https://www.yuque.com/fofolee/qcdocs3/bg31vl#JqM2f').run({width: 1280, height: 720})">浏览器控制典型案例</a>快速入门</div>
-        <div>你随时可以点击右上角的<span style="font-weight: bolder;">帮助</span>按钮（图标为问号），再次查看教程</div>`,
-        "帮助",
-        true,
-        600
-      );
+      showHelpDialog.value = true;
       dbManager.setStorage("st_hasRunComposer", true);
     }
 
@@ -47,6 +71,7 @@ export default {
 
     return {
       commandManager,
+      showHelpDialog,
     };
   },
   emits: ["editorEvent"],
@@ -76,6 +101,9 @@ export default {
     runCurrentCommand(command) {
       this.$refs.result.runCurrentCommand(command);
     },
+    showHelp(id) {
+      window.showUb.help(id);
+    },
   },
 };
 </script>

From 49d56502e09ce2430a2e1ee0353f8dd4441ea9bd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 25 Mar 2025 17:19:35 +0800
Subject: [PATCH 294/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0=E6=8F=90=E7=A4=BA=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandHead.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index cfd84897..c2a0dcb8 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -31,7 +31,13 @@
       >
         <div class="command-summary" v-if="!isEditingSummary">
           {{ commandSummary || "添加描述" }}
-          <q-tooltip v-if="commandSummary"> 单击修改描述 </q-tooltip>
+          <q-tooltip
+            anchor="bottom left"
+            self="top start"
+            v-if="commandSummary"
+          >
+            单击修改描述
+          </q-tooltip>
         </div>
         <q-input
           v-else

From abcb672d7056b22559ce64ac400d7632f52b46b1 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 26 Mar 2025 17:13:04 +0800
Subject: [PATCH 295/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DshowMessageBox?=
 =?UTF-8?q?=E5=9C=A8=E4=BC=A0=E5=85=A5=E6=95=B0=E5=AD=97=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/QuickCommand.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 18f50211..8c0a9ff4 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -141,7 +141,7 @@ export default {
        * @param position 消息显示位置，默认为"top"
        */
       showMessageBox: (message, icon = "success", time, position = "top") => {
-        message = window.lodashM.truncate(message, { length: 1200 });
+        message = window.lodashM.truncate(message.toString(), { length: 1200 });
         if (icon === "success") icon = "positive";
         if (icon === "error") icon = "negative";
         if (typeof time === "undefined")

From 32f8fad362a27793780addcddabeb487169ecd57 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 26 Mar 2025 21:46:45 +0800
Subject: [PATCH 296/332] =?UTF-8?q?quickcommand.loadRemoteScript=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9=EF=BC=8C=E6=94=AF=E6=8C=81=E5=B0=86?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=BC=93=E5=AD=98=E5=88=B0=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=BF=85=E6=AF=8F=E6=AC=A1=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcommand.js                    | 37 ++++++++++++-------
 .../monaco/types/quickcommand.api.d.ts        |  4 +-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/plugin/lib/quickcommand.js b/plugin/lib/quickcommand.js
index 9ad93239..30f87a24 100644
--- a/plugin/lib/quickcommand.js
+++ b/plugin/lib/quickcommand.js
@@ -14,7 +14,10 @@ window.getModelsFromAiApi = getModels;
 
 const systemDialog = require("./dialog/service");
 
-const { getQuickcommandTempFile } = require("./getQuickcommandFile");
+const {
+  getQuickcommandTempFile,
+  getQuickcommandFolderFile,
+} = require("./getQuickcommandFile");
 
 const createTerminalCommand = require("./createTerminalCommand");
 
@@ -153,18 +156,26 @@ const quickcommand = {
   },
 
   // 载入在线资源
-  loadRemoteScript: async function (url) {
-    if (
-      !/^((ht|f)tps?):\/\/([\w\-]+(\.[\w\-]+)*\/)*[\w\-]+(\.[\w\-]+)*\/?(\?([\w\-\.,@?^=%&:\/~\+#]*)+)?/.test(
-        url
-      )
-    )
-      throw "url 不合法";
-    let local = getQuickcommandTempFile("js");
-    await this.downloadFile(url, local);
-    let source = require(local);
-    fs.unlinkSync(local);
-    return source;
+  loadRemoteScript: async function (url, options) {
+    const urlReg =
+      /^((ht|f)tps?):\/\/([\w\-]+(\.[\w\-]+)*\/)*[\w\-]+(\.[\w\-]+)*\/?(\?([\w\-\.,@?^=%&:\/~\+#]*)+)?/;
+    if (!urlReg.test(url)) throw "url 不合法";
+    const { useCache = false } = options;
+    if (useCache) {
+      const urlHash = quickcomposer.coding.md5Hash(url);
+      const fileName = path.basename(url, ".js") + "." + urlHash.slice(8, -8);
+      const local = getQuickcommandFolderFile(fileName, "js");
+      if (!fs.existsSync(local)) {
+        await this.downloadFile(url, local);
+      }
+      return require(local);
+    } else {
+      const local = getQuickcommandTempFile("js");
+      await this.downloadFile(url, local);
+      let source = require(local);
+      fs.unlinkSync(local);
+      return source;
+    }
   },
 
   // 唤醒 uTools
diff --git a/src/plugins/monaco/types/quickcommand.api.d.ts b/src/plugins/monaco/types/quickcommand.api.d.ts
index c4ae9db9..2c00f8d2 100644
--- a/src/plugins/monaco/types/quickcommand.api.d.ts
+++ b/src/plugins/monaco/types/quickcommand.api.d.ts
@@ -346,8 +346,10 @@ interface quickcommandApi {
    * ```
    *
    * @param url 脚本地址
+   * @param options 选项
+   * @param options.useCache 使用缓存，默认为假。为真时会将远程脚本缓存到本地的utools.getPath("userData")/quickcommand目录，否则每次都会下载脚本
    */
-  loadRemoteScript(url: string): Promise<object>;
+  loadRemoteScript(url: string, options?: { useCache?: boolean }): Promise<object>;
 
   /**
    * 将 signal 发送给 pid 标识的进程 , 默认为关闭进程

From c32b08758acbf169bfdcc7b680231e04456abd56 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 19:54:26 +0800
Subject: [PATCH 297/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=91=BD=E4=BB=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=8F=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/FlowTabs.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/composer/FlowTabs.vue b/src/components/composer/FlowTabs.vue
index 297e64f9..b1b7b1ca 100644
--- a/src/components/composer/FlowTabs.vue
+++ b/src/components/composer/FlowTabs.vue
@@ -323,7 +323,7 @@ export default defineComponent({
   },
   computed: {
     showCommandConfig() {
-      return !this.isRunComposerPage && this.commandConfig.features;
+      return !this.isRunComposerPage && !!this.commandConfig.features;
     },
   },
   methods: {
@@ -590,14 +590,23 @@ export default defineComponent({
 .flow-container {
   flex: 1;
   position: relative;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
   overflow: hidden;
 }
 
+.command-config-panel {
+  flex-shrink: 0;
+  padding: 8px;
+  z-index: 1;
+}
+
 .flow-wrapper {
   flex: 1;
+  min-height: 0;
   position: relative;
   overflow: hidden;
-  height: 100%;
 }
 
 .variable-panel {
@@ -624,8 +633,4 @@ export default defineComponent({
   border-bottom: 2px solid var(--q-primary);
   transition: all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
-
-.command-config-panel {
-  padding: 8px;
-}
 </style>

From c6d03a1a989f3ac48d7963bc90f6329cab3b5594 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 20:35:14 +0800
Subject: [PATCH 298/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=BC=96=E6=8E=92=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerFlow.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/composer/ComposerFlow.vue b/src/components/composer/ComposerFlow.vue
index 3e327ab1..28e12903 100644
--- a/src/components/composer/ComposerFlow.vue
+++ b/src/components/composer/ComposerFlow.vue
@@ -2,7 +2,7 @@
   <div class="composer-flow">
     <ChainStyles ref="chainStyles" :commands="commands" />
 
-    <q-scroll-area class="command-scroll">
+    <q-scroll-area class="command-scroll" ref="scrollArea">
       <div
         class="command-flow-container"
         @dragover.prevent="onDragOver"
@@ -541,6 +541,12 @@ export default defineComponent({
       this.$emit("update:modelValue", newCommands);
     },
   },
+  mounted() {
+    // 当高度超过1000时，会出现非预期的自动滚动，暂时找不到原因，先强制滚动到顶部
+    this.$nextTick(() => {
+      this.$refs.scrollArea.setScrollPosition("vertical", 0);
+    });
+  },
 });
 </script>
 

From 6e19a5c8ee0849dbf165e91967a2d3e8fde407e2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 20:38:59 +0800
Subject: [PATCH 299/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E9=83=A8=E5=88=86=E4=B8=8D=E5=8C=B9=E9=85=8D=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ComposerList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/composer/ComposerList.vue b/src/components/composer/ComposerList.vue
index 0fb511be..78d7e37b 100644
--- a/src/components/composer/ComposerList.vue
+++ b/src/components/composer/ComposerList.vue
@@ -117,9 +117,7 @@ export default defineComponent({
           ...category,
           commands: this.commands
             .filter(
-              (cmd) =>
-                (cmd.label && window.pinyinMatch.match(cmd.label, query)) ||
-                (cmd.value && window.pinyinMatch.match(cmd.value, query))
+              (cmd) => cmd.label && window.pinyinMatch.match(cmd.label, query)
             )
             .filter((cmd) => cmd.type === category.label),
         }))

From 01f5becfb61828a6ffbcd35c684d877d80ceba18 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 21:07:04 +0800
Subject: [PATCH 300/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=A0=87=E7=AD=BE=E5=90=8E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/config/TagBar.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/config/TagBar.vue b/src/components/config/TagBar.vue
index 87629b4b..b59cd742 100644
--- a/src/components/config/TagBar.vue
+++ b/src/components/config/TagBar.vue
@@ -87,9 +87,11 @@ export default {
       const savedTagOrder = dbManager.getDB(TAG_ORDER_KEY);
       if (savedTagOrder.length) {
         this.savedTagOrder = savedTagOrder;
-        this.commandManager.changeCurrentTag(this.savedTagOrder[0]);
-      } else {
-        this.commandManager.changeCurrentTag(this.allQuickCommandTags[0]);
+      }
+      if (!this.commandManager.state.currentTag) {
+        this.commandManager.changeCurrentTag(
+          this.savedTagOrder[0] || this.allQuickCommandTags[0]
+        );
       }
     });
   },

From 8ea4bad14da5c440feea0f25baa0a909e1d0465e Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 21:44:01 +0800
Subject: [PATCH 301/332] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E6=8E=92htt?=
 =?UTF-8?q?p=E8=AF=B7=E6=B1=82=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/networkCommands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/composer/commands/networkCommands.js b/src/js/composer/commands/networkCommands.js
index 407d7119..d0942be4 100644
--- a/src/js/composer/commands/networkCommands.js
+++ b/src/js/composer/commands/networkCommands.js
@@ -28,6 +28,7 @@ export const networkCommands = {
         label: "HTTP请求结果",
         suggestName: "responseResult",
         structure: {
+          data: { label: "响应数据", suggestName: "responseData" },
           status: { label: "HTTP状态码", suggestName: "responseStatus" },
           statusText: {
             label: "HTTP状态信息",
@@ -36,7 +37,6 @@ export const networkCommands = {
           headers: { label: "服务器响应头", suggestName: "responseHeaders" },
           config: { label: "请求配置信息", suggestName: "requestConfig" },
           request: { label: "发送的请求", suggestName: "request" },
-          data: { label: "响应数据", suggestName: "responseData" },
         },
       },
     },

From 2e94f7897c12706b6a1576ba848d41bf1e7ed67f Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 22:34:19 +0800
Subject: [PATCH 302/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E7=BC=96=E6=8E=92=E4=B8=AD=E4=BB=A5=E4=B8=8B=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E6=8F=8F=E8=BF=B0=EF=BC=9AAI?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E3=80=81=E6=A8=A1=E6=8B=9F=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E5=91=BD=E4=BB=A4=E3=80=81ubrowser?=
 =?UTF-8?q?=E3=80=81=E6=8C=89=E9=94=AE=E5=BA=8F=E5=88=97=E3=80=81=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/ai/AskAIEditor.vue    | 18 +-----
 .../composer/simulate/KeyEditor.vue           | 61 +++++--------------
 .../composer/simulate/KeySequenceEditor.vue   | 55 +++++------------
 .../composer/system/SystemCommandEditor.vue   | 39 ++----------
 .../composer/ubrowser/UBrowserEditor.vue      |  6 +-
 5 files changed, 41 insertions(+), 138 deletions(-)

diff --git a/src/components/composer/ai/AskAIEditor.vue b/src/components/composer/ai/AskAIEditor.vue
index eaeb35e2..b58d1112 100644
--- a/src/components/composer/ai/AskAIEditor.vue
+++ b/src/components/composer/ai/AskAIEditor.vue
@@ -29,7 +29,7 @@ import { defineComponent } from "vue";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
-import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import AISelector from "components/ai/AISelector.vue";
 export default defineComponent({
   name: "AskAIEditor",
@@ -69,30 +69,18 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
   },
   methods: {
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      try {
-        const variableFormatPaths = ["arg0.prompt"];
-        const params = parseFunction(code, { variableFormatPaths });
-        return params;
-      } catch (e) {
-        console.error("解析参数失败:", e);
-      }
-      return argvs;
-    },
     generateCode(argvs = this.argvs) {
       return `${this.modelValue.value}(${stringifyArgv(
         argvs.content
       )}, ${JSON.stringify(argvs.apiConfig)})`;
     },
     getSummary(argvs) {
-      return "问AI：" + argvs.content.prompt;
+      return "问AI：" + stringifyArgv(argvs.content.prompt);
     },
     updateArgvs(keyPath, newValue) {
       const newArgvs = { ...this.argvs };
diff --git a/src/components/composer/simulate/KeyEditor.vue b/src/components/composer/simulate/KeyEditor.vue
index 6ff60ff6..a4896f51 100644
--- a/src/components/composer/simulate/KeyEditor.vue
+++ b/src/components/composer/simulate/KeyEditor.vue
@@ -438,7 +438,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     mainKeyDisplay() {
@@ -622,44 +622,7 @@ export default defineComponent({
         ...this.argvs,
         ...argv,
       };
-      this.$emit("update:modelValue", {
-        ...this.modelValue,
-        argvs: newArgvs,
-        code: this.generateCode(newArgvs),
-      });
-    },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      try {
-        const result = parseFunction(code);
-        if (!result || !result.argvs || !result.argvs[0]) return argvs;
-
-        const keys = result.argvs[0];
-        const options = result.argvs[1] || {};
-
-        if (keys.length > 0) {
-          argvs.mainKey = keys[0];
-          Object.keys(argvs.modifiers).forEach((key) => {
-            // 在非 Mac 系统上，将 meta 转换为 command
-            const modKey = !isMac && key === "command" ? "meta" : key;
-            argvs.modifiers[key] = keys.slice(1).includes(modKey);
-          });
-        }
-
-        // 解析选项对象
-        if (options) {
-          if (options.repeatCount) argvs.repeatCount = options.repeatCount;
-          if (options.repeatInterval)
-            argvs.repeatInterval = options.repeatInterval;
-          if (options.keyDelay) argvs.keyDelay = options.keyDelay;
-        }
-
-        return argvs;
-      } catch (e) {
-        console.error("Failed to parse key string:", e);
-        return argvs;
-      }
+      this.updateModelValue(newArgvs);
     },
     handleKeyInput(val) {
       let newMainKey;
@@ -703,16 +666,24 @@ export default defineComponent({
         .join(" + ");
       return `${modifiers} + ${shortcut.mainKey}`;
     },
-  },
-  mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
+    getSummary(argvs) {
+      const modifiers = Object.entries(argvs.modifiers)
+        .filter(([_, active]) => active)
+        .map(([key]) => this.modifierLabels[key])
+        .join(" + ");
+      return modifiers ? `${modifiers} + ${argvs.mainKey}` : argvs.mainKey;
+    },
+    updateModelValue(argvs) {
       this.$emit("update:modelValue", {
         ...this.modelValue,
-        argvs,
+        argvs: argvs,
         code: this.generateCode(argvs),
+        summary: this.getSummary(argvs),
       });
-    }
+    },
+  },
+  mounted() {
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/simulate/KeySequenceEditor.vue b/src/components/composer/simulate/KeySequenceEditor.vue
index 99cd59e4..cdd37efa 100644
--- a/src/components/composer/simulate/KeySequenceEditor.vue
+++ b/src/components/composer/simulate/KeySequenceEditor.vue
@@ -459,7 +459,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
   },
@@ -608,15 +608,26 @@ export default defineComponent({
       }
       return `${this.modelValue.value}(${JSON.stringify(keySequence)})`;
     },
-    updateValue(newArgvs) {
+    updateValue(newArgvs = this.argvs) {
       const updatedModelValue = {
         ...this.modelValue,
-        argvs: newArgvs || this.argvs,
-        code: this.generateCode(newArgvs || this.argvs),
+        argvs: newArgvs,
+        code: this.generateCode(newArgvs),
+        summary: this.getSummary(newArgvs),
       };
 
       this.$emit("update:modelValue", updatedModelValue);
     },
+    getSingleSummary(item) {
+      const modifiers = Object.entries(item.modifiers)
+        .filter(([_, active]) => active)
+        .map(([key]) => this.modifierLabels[key])
+        .join(" + ");
+      return modifiers ? `${modifiers} + ${item.mainKey}` : item.mainKey;
+    },
+    getSummary(argvs) {
+      return argvs.sequence.map(this.getSingleSummary).join("; ");
+    },
     appendSequence(newSequence) {
       const startId = Date.now();
       this.argvs.sequence.push(
@@ -627,37 +638,6 @@ export default defineComponent({
       );
       this.updateValue();
     },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      try {
-        const match = code.match(/\((.*)\)/s);
-        if (match) {
-          const args = eval(`[${match[1]}]`);
-          if (Array.isArray(args[0])) {
-            argvs.sequence = args[0].map((keys) => {
-              const mainKey = keys[0];
-              const modifiers = {
-                control: keys.includes("control"),
-                alt: keys.includes("alt"),
-                shift: keys.includes("shift"),
-                command:
-                  !isMac && keys.includes("meta")
-                    ? true
-                    : keys.includes("command"),
-              };
-              return { mainKey, modifiers, id: Date.now() + Math.random() };
-            });
-            if (args[1] && args[1].interval) {
-              argvs.interval = args[1].interval;
-            }
-          }
-        }
-      } catch (e) {
-        console.error("Failed to parse existing code:", e);
-      }
-      return argvs;
-    },
     toggleModifier(index, key) {
       // 创建新的 argvs 对象
       const newArgvs = {
@@ -678,10 +658,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateValue(argvs);
-    }
+    this.updateValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index 9e9c73fe..b3cd7990 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -132,7 +132,7 @@
 
 <script>
 import { defineComponent } from "vue";
-import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
@@ -182,9 +182,7 @@ export default defineComponent({
     argvs: {
       get() {
         return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) ||
-          this.defaultArgvs
+          this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
         );
       },
       set(value) {
@@ -193,32 +191,6 @@ export default defineComponent({
     },
   },
   methods: {
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      // 定义需要使用variable格式的路径
-      const variableFormatPaths = [
-        "arg0", // 命令字符串
-        "arg1.cwd", // 工作目录
-        "arg1.env.**", // 环境变量
-      ];
-
-      // 解析代码
-      const result = parseFunction(code, { variableFormatPaths });
-      if (!result) return this.defaultArgvs;
-
-      // 返回解析结果
-      const [command, options = {}] = result.argvs;
-      return {
-        command: command || this.defaultArgvs.command,
-        options: {
-          ...this.defaultArgvs.options,
-          ...options,
-          cwd: options.cwd || this.defaultArgvs.options.cwd,
-          env: options.env || this.defaultArgvs.options.env,
-        },
-      };
-    },
     generateCode(argvs) {
       const args = [];
 
@@ -260,7 +232,7 @@ export default defineComponent({
       }
     },
     getSummary(argvs) {
-      return argvs.command.value;
+      return stringifyArgv(argvs.command);
     },
     updateModelValue(argvs) {
       this.$emit("update:modelValue", {
@@ -272,10 +244,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/ubrowser/UBrowserEditor.vue b/src/components/composer/ubrowser/UBrowserEditor.vue
index 8ca5f053..f562476e 100644
--- a/src/components/composer/ubrowser/UBrowserEditor.vue
+++ b/src/components/composer/ubrowser/UBrowserEditor.vue
@@ -50,6 +50,7 @@ import UBrowserBasic from "components/composer/ubrowser/UBrowserBasic.vue";
 import UBrowserOperations from "components/composer/ubrowser/UBrowserOperations.vue";
 import UBrowserRun from "components/composer/ubrowser/UBrowserRun.vue";
 import { generateUBrowserCode } from "js/composer/generateUBrowserCode";
+import { stringifyArgv } from "src/js/composer/formatString";
 
 export default {
   name: "UBrowserEditor",
@@ -83,7 +84,7 @@ export default {
       return this.modelValue.argvs || this.defaultArgvs;
     },
     summary() {
-      const goto = this.argvs.goto?.url || "";
+      const goto = stringifyArgv(this.argvs.goto?.url || "");
       return `访问 ${goto}`;
     },
   },
@@ -112,9 +113,6 @@ export default {
         code: this.generateCode(),
       });
     },
-    parseCodeToArgvs(code) {
-      // TODO: 实现代码解析逻辑
-    },
   },
 };
 </script>

From efb2ed933c76311d4d2c006f4ee20bee17739204 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 27 Mar 2025 22:34:40 +0800
Subject: [PATCH 303/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E4=B8=AD=E6=8F=8F=E8=BF=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue       | 45 ++-------------
 .../coding/AsymmetricCryptoEditor.vue         | 21 +------
 .../composer/coding/SymmetricCryptoEditor.vue | 21 +------
 .../composer/control/ControlCommand.vue       | 43 +--------------
 src/components/composer/data/ZlibEditor.vue   | 55 +------------------
 .../composer/data/regex/RegexEditor.vue       | 33 +----------
 .../composer/script/ReturnEditor.vue          | 28 ++--------
 .../composer/script/ScriptEditor.vue          | 34 +-----------
 .../composer/simulate/ImageSearchEditor.vue   | 36 +-----------
 .../composer/simulate/KeyEditor.vue           |  1 -
 .../composer/ui/SelectListEditor.vue          | 37 ++-----------
 11 files changed, 30 insertions(+), 324 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index a9cb9ad9..10138bd9 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -14,7 +14,7 @@
 import { defineComponent } from "vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
 import ParamInput from "components/composer/param/ParamInput.vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import {
   newVarInputVal,
   isVarInputVal,
@@ -68,7 +68,7 @@ export default defineComponent({
     },
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     hasSubCommands() {
@@ -143,42 +143,6 @@ export default defineComponent({
 
       return `${subCommand}(${finalArgvs.join(",")})`;
     },
-    parseCodeToArgvs(code) {
-      let argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      if (this.localCommand.isExpression) {
-        return [code];
-      }
-
-      const variableFormatPaths = [];
-
-      const addVariableFormatPath = (prefix, config) => {
-        if (config.component === "VariableInput") {
-          variableFormatPaths.push(prefix);
-        } else if (config.component === "ArrayEditor") {
-          variableFormatPaths.push(`${prefix}[*].**`, `${prefix}[*]`);
-        } else if (config.component === "DictEditor") {
-          variableFormatPaths.push(`${prefix}.**`);
-        }
-      };
-
-      this.localConfig.forEach((item, index) => {
-        if (item.component === "OptionEditor") {
-          Object.entries(item.options).forEach(([key, config]) => {
-            addVariableFormatPath(`arg${index}.${key}`, config);
-          });
-        } else {
-          addVariableFormatPath(`arg${index}`, item);
-        }
-      });
-      try {
-        argvs = parseFunction(code, { variableFormatPaths }).argvs;
-      } catch (e) {
-        console.log("解析参数失败:", e);
-      }
-      return argvs;
-    },
     getAllInputValues(argvs) {
       const flatArgvs = [];
       if (!argvs) return flatArgvs;
@@ -237,9 +201,8 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code && Array.isArray(argvs)) {
-      this.updateModelValue(this.subCommand, argvs);
+    if (Array.isArray(this.argvs)) {
+      this.updateModelValue(this.subCommand, this.argvs);
     }
   },
 });
diff --git a/src/components/composer/coding/AsymmetricCryptoEditor.vue b/src/components/composer/coding/AsymmetricCryptoEditor.vue
index fa366129..93cea479 100644
--- a/src/components/composer/coding/AsymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/AsymmetricCryptoEditor.vue
@@ -189,7 +189,7 @@
 <script>
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 export default defineComponent({
   name: "AsymmetricCryptoEditor",
@@ -224,7 +224,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     algorithms() {
@@ -261,18 +261,6 @@ export default defineComponent({
     },
   },
   methods: {
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      try {
-        const variableFormatPaths = ["arg0.text"];
-        const params = parseFunction(code, { variableFormatPaths });
-        return params.argvs[0];
-      } catch (e) {
-        console.error("解析加密参数失败:", e);
-      }
-      return argvs;
-    },
     generateCode(argvs = this.argvs) {
       return `${this.modelValue.value}(${stringifyArgv({
         text: argvs.text,
@@ -321,10 +309,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/coding/SymmetricCryptoEditor.vue b/src/components/composer/coding/SymmetricCryptoEditor.vue
index c9f47bde..9f83ad1b 100644
--- a/src/components/composer/coding/SymmetricCryptoEditor.vue
+++ b/src/components/composer/coding/SymmetricCryptoEditor.vue
@@ -190,7 +190,7 @@
 <script>
 import { defineComponent } from "vue";
 import VariableInput from "components/composer/common/VariableInput.vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
@@ -226,7 +226,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     keyCodecs() {
@@ -324,18 +324,6 @@ export default defineComponent({
 
       this.updateModelValue(argvs);
     },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      try {
-        const variableFormatPaths = ["arg0.text"];
-        const params = parseFunction(code, { variableFormatPaths });
-        return params.argvs[0];
-      } catch (e) {
-        console.error("解析加密参数失败:", e);
-      }
-      return argvs;
-    },
     getSummary(argvs) {
       const text = window.lodashM.truncate(argvs.text.value, {
         length: 30,
@@ -355,10 +343,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
index 981ed294..208209c2 100644
--- a/src/components/composer/control/ControlCommand.vue
+++ b/src/components/composer/control/ControlCommand.vue
@@ -87,7 +87,7 @@ export default defineComponent({
     },
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
   },
@@ -123,44 +123,7 @@ export default defineComponent({
 
       return code;
     },
-    parseCodeToArgvs(code) {
-      if (!code) return this.defaultArgvs;
-      if (!this.currentFunction?.codeTemplate) return {};
 
-      const template = this.currentFunction.codeTemplate;
-      const argvs = {};
-
-      // 如果没有变量模板，直接返回空对象
-      if (!template.includes("${")) return {};
-
-      // 将模板转换为正则表达式
-      const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-      let pattern = escapeRegExp(template);
-
-      // 收集所有变量名
-      const variables = [];
-      const variablePattern = /\${(\w+)}/g;
-      let match;
-
-      while ((match = variablePattern.exec(template)) !== null) {
-        variables.push(match[1]);
-        pattern = pattern.replace(escapeRegExp(`\${${match[1]}}`), "([^}]*?)");
-      }
-
-      // 创建正则表达式并匹配代码
-      const regex = new RegExp(`^${pattern}$`);
-      const matches = code.match(regex);
-
-      if (matches) {
-        // 从第二个元素开始，依次赋值给变量
-        variables.forEach((variable, index) => {
-          argvs[variable] = matches[index + 1] || "";
-        });
-        return argvs;
-      }
-
-      return this.defaultArgvs;
-    },
     updateModelValue(argvs) {
       const code = this.generateCode(argvs);
 
@@ -180,9 +143,7 @@ export default defineComponent({
     }
   },
   mounted() {
-    if (!this.modelValue.code) {
-      this.updateModelValue(this.defaultArgvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/data/ZlibEditor.vue b/src/components/composer/data/ZlibEditor.vue
index 9806e3f7..c306f8b8 100644
--- a/src/components/composer/data/ZlibEditor.vue
+++ b/src/components/composer/data/ZlibEditor.vue
@@ -128,7 +128,7 @@
 
 <script>
 import { defineComponent } from "vue";
-import { stringifyArgv, parseFunction } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import VariableInput from "components/composer/common/VariableInput.vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
@@ -208,10 +208,7 @@ export default defineComponent({
     argvs: {
       get() {
         return (
-          this.modelValue.argvs ||
-          this.parseCodeToArgvs(this.modelValue.code) || {
-            ...this.defaultArgvs,
-          }
+          this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
         );
       },
       set(value) {
@@ -234,49 +231,6 @@ export default defineComponent({
         argvs.data
       )}, "${argvs.method}", ${stringifyArgv(options)})`;
     },
-    parseCodeToArgvs(code) {
-      if (!code) return null;
-
-      try {
-        // 定义需要使用variable格式的路径
-        const variableFormatPaths = [
-          "arg0", // 数据参数
-        ];
-
-        // 使用 parseFunction 解析代码
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const operation = result.name.split(".").pop();
-        const [data, method, options] = result.argvs;
-
-        const newArgvs = {
-          ...this.defaultArgvs,
-          operation,
-          data,
-          method: method?.value || "gzip",
-        };
-
-        if (options) {
-          if (method?.value === "brotli") {
-            newArgvs.options = {
-              params: options.params || this.defaultArgvs.options.params,
-            };
-          } else {
-            newArgvs.options = {
-              level: options.level ?? this.defaultArgvs.options.level,
-              memLevel: options.memLevel ?? this.defaultArgvs.options.memLevel,
-              strategy: options.strategy ?? this.defaultArgvs.options.strategy,
-            };
-          }
-        }
-
-        return newArgvs;
-      } catch (e) {
-        console.error("解析Zlib参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
     updateArgvs(key, value) {
       this.argvs = {
         ...this.argvs,
@@ -300,10 +254,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/data/regex/RegexEditor.vue b/src/components/composer/data/regex/RegexEditor.vue
index a1ec7f6b..106986b0 100644
--- a/src/components/composer/data/regex/RegexEditor.vue
+++ b/src/components/composer/data/regex/RegexEditor.vue
@@ -97,7 +97,6 @@ import VariableInput from "components/composer/common/VariableInput.vue";
 import RegexInput from "./RegexInput.vue";
 import RegexBuilder from "./RegexBuilder.vue";
 import RegexTester from "./RegexTester.vue";
-import { parseToHasType } from "js/composer/formatString";
 import { newVarInputVal } from "js/composer/varInputValManager";
 
 export default defineComponent({
@@ -141,7 +140,7 @@ export default defineComponent({
     },
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
   },
@@ -230,31 +229,6 @@ export default defineComponent({
         this.updateArgvs("regexValue", newContent);
       }
     },
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      const match = code.match(/^.*?\((.*)\)$/);
-      if (!match) return argvs;
-      const params = match[1];
-      const parts = params.split(",");
-      const text = parts[0];
-      const regexPart = parts[1];
-      const replace = parts[2];
-      if (regexPart) {
-        const [_, pattern, flags] = regexPart.match(/\/(.*?)\/(.*)/) || [];
-        return {
-          textValue: parseToHasType(text),
-          regexValue: pattern,
-          replaceValue: parseToHasType(replace),
-          flags: {
-            ignoreCase: flags.includes("i"),
-            multiline: flags.includes("m"),
-            global: flags.includes("g"),
-          },
-          isReplace: !!replace,
-        };
-      }
-    },
     getSummary(argvs) {
       return argvs.isReplace
         ? argvs.textValue.value +
@@ -274,10 +248,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/script/ReturnEditor.vue b/src/components/composer/script/ReturnEditor.vue
index 03fa298f..469917f8 100644
--- a/src/components/composer/script/ReturnEditor.vue
+++ b/src/components/composer/script/ReturnEditor.vue
@@ -14,7 +14,7 @@
 import { defineComponent } from "vue";
 import { newVarInputVal } from "js/composer/varInputValManager";
 import VariableInput from "components/composer/common/VariableInput.vue";
-import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 
 export default defineComponent({
   name: "ReturnEditor",
@@ -34,32 +34,15 @@ export default defineComponent({
   },
   computed: {
     argvs() {
-      return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
-      );
+      return this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs);
     },
   },
   methods: {
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-      code = code.trim().replace(/^return\s(.*)/, "tempFunc($1)");
-      try {
-        const variableFormatPaths = ["arg0"];
-        const params = parseFunction(code, { variableFormatPaths });
-        return {
-          returnValue: params.argvs[0],
-        };
-      } catch (e) {
-        console.error("解析参数失败:", e);
-      }
-      return argvs;
-    },
     generateCode(argvs = this.argvs) {
       return `${this.modelValue.value} ${stringifyArgv(argvs.returnValue)}`;
     },
     getSummary(argvs) {
-      return "返回" + " " + argvs.returnValue.value;
+      return "返回" + " " + stringifyArgv(argvs.returnValue);
     },
     updateArgvs(key, newValue) {
       this.argvs[key] = newValue;
@@ -75,10 +58,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/script/ScriptEditor.vue b/src/components/composer/script/ScriptEditor.vue
index 9a79e8ec..6ec9373f 100644
--- a/src/components/composer/script/ScriptEditor.vue
+++ b/src/components/composer/script/ScriptEditor.vue
@@ -156,7 +156,7 @@ import VariableInput from "components/composer/common/VariableInput.vue";
 import ArrayEditor from "components/composer/common/ArrayEditor.vue";
 import BorderLabel from "components/composer/common/BorderLabel.vue";
 import CheckButton from "components/composer/common/CheckButton.vue";
-import { parseFunction, stringifyArgv } from "js/composer/formatString";
+import { stringifyArgv } from "js/composer/formatString";
 import programs from "js/options/programs";
 import VariableList from "components/composer/common/varinput/VariableList.vue";
 
@@ -197,9 +197,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs ||
-        this.parseCodeToArgvs(this.modelValue.code) ||
-        this.defaultArgvs
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     isCodeSnippet() {
@@ -211,29 +209,6 @@ export default defineComponent({
     },
   },
   methods: {
-    parseCodeToArgvs(code) {
-      if (!code) return this.defaultArgvs;
-      if (this.isCodeSnippet) {
-        const result = parseFunction(code);
-        return {
-          code: quickcomposer.coding.base64Decode(result.argvs?.[0]),
-        };
-      }
-      try {
-        const variableFormatPaths = ["arg1.args[*]"];
-        const result = parseFunction(code, { variableFormatPaths });
-        if (!result) return this.defaultArgvs;
-
-        const [scriptCode, options] = result.argvs;
-        return {
-          code: scriptCode,
-          ...options,
-        };
-      } catch (e) {
-        console.error("解析参数失败:", e);
-        return this.defaultArgvs;
-      }
-    },
     generateCode(argvs = this.argvs) {
       const variables = argvs.code.match(/"?___([^_]+?)___"?/g);
       const replaceStr =
@@ -317,10 +292,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/simulate/ImageSearchEditor.vue b/src/components/composer/simulate/ImageSearchEditor.vue
index 8249b4a3..6f2d39ea 100644
--- a/src/components/composer/simulate/ImageSearchEditor.vue
+++ b/src/components/composer/simulate/ImageSearchEditor.vue
@@ -132,7 +132,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
   },
@@ -208,35 +208,6 @@ export default defineComponent({
       return `${this.modelValue.value}("data:image/png;base64,${config.imageData}", { threshold: ${config.threshold}, mouseAction: "${config.mouseAction}" })`;
     },
 
-    parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
-      if (!code) return argvs;
-
-      // 从代码字符串解析配置
-      try {
-        const imageDataMatch = code.match(/"data:image\/png;base64,([^"]+)"/);
-        const thresholdMatch = code.match(/threshold:\s*([\d.]+)/);
-        const mouseActionMatch = code.match(/mouseAction:\s*"([^"]+)"/);
-        let { imagePreview, threshold, mouseAction } = argvs;
-
-        if (imageDataMatch) {
-          imagePreview = `data:image/png;base64,${imageDataMatch[1]}`;
-        }
-        if (thresholdMatch) {
-          threshold = parseFloat(thresholdMatch[1]);
-        }
-        if (mouseActionMatch) {
-          mouseAction = mouseActionMatch[1];
-        }
-        return {
-          imagePreview,
-          threshold,
-          mouseAction,
-        };
-      } catch (e) {
-        return argvs;
-      }
-    },
     updateModelValue(argvs) {
       this.$emit("update:modelValue", {
         ...this.modelValue,
@@ -246,10 +217,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>
diff --git a/src/components/composer/simulate/KeyEditor.vue b/src/components/composer/simulate/KeyEditor.vue
index a4896f51..268116c9 100644
--- a/src/components/composer/simulate/KeyEditor.vue
+++ b/src/components/composer/simulate/KeyEditor.vue
@@ -150,7 +150,6 @@
 <script>
 import { defineComponent } from "vue";
 import NumberInput from "components/composer/common/NumberInput.vue";
-import { parseFunction } from "js/composer/formatString";
 
 // 检测操作系统
 const isMac = window.utools.isMacOs();
diff --git a/src/components/composer/ui/SelectListEditor.vue b/src/components/composer/ui/SelectListEditor.vue
index 0ccb53dd..2b3fb7e2 100644
--- a/src/components/composer/ui/SelectListEditor.vue
+++ b/src/components/composer/ui/SelectListEditor.vue
@@ -152,8 +152,8 @@ import VariableInput from "components/composer/common/VariableInput.vue";
 import ArrayEditor from "components/composer/common/ArrayEditor.vue";
 import OperationCard from "components/composer/common/OperationCard.vue";
 import BorderLabel from "components/composer/common/BorderLabel.vue";
-import { parseFunction, stringifyArgv } from "js/composer/formatString";
-import { newVarInputVal, isVarInputVal } from "js/composer/varInputValManager";
+import { stringifyArgv } from "js/composer/formatString";
+import { newVarInputVal } from "js/composer/varInputValManager";
 
 const jsonDefaultSelects = new Array(3).fill().map((_, index) => ({
   id: newVarInputVal("var", index),
@@ -235,7 +235,7 @@ export default defineComponent({
   computed: {
     argvs() {
       return (
-        this.modelValue.argvs || this.parseCodeToArgvs(this.modelValue.code)
+        this.modelValue.argvs || window.lodashM.cloneDeep(this.defaultArgvs)
       );
     },
     optionTypes() {
@@ -310,32 +310,6 @@ export default defineComponent({
         Object.keys(options).length ? `, ${stringifyArgv(options)}` : ""
       })`;
     },
-    parseCodeToArgvs(code) {
-      if (!code) return this.defaultArgvs;
-
-      try {
-        const result = parseFunction(code, {
-          variableFormatPaths: ["arg0", "arg0[*]", "arg1.placeholder"],
-        });
-
-        if (!result) return this.defaultArgvs;
-
-        const subCommand = result.name;
-
-        const [selects, options = {}] = result.argvs;
-        const inputMode = isVarInputVal(selects) ? "variable" : "manual";
-        return {
-          ...this.defaultArgvs,
-          inputMode,
-          selects,
-          subCommand,
-          ...options,
-        };
-      } catch (e) {
-        console.warn("选择列表参数解析失败:" + e, code);
-        return this.defaultArgvs;
-      }
-    },
     getSummary(argvs) {
       const count = Array.isArray(argvs.selects) ? argvs.selects.length : "?";
       return `显示${count}个${
@@ -390,10 +364,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    const argvs = this.modelValue.argvs || this.defaultArgvs;
-    if (!this.modelValue.code) {
-      this.updateModelValue(argvs);
-    }
+    this.updateModelValue(this.argvs);
   },
 });
 </script>

From 05402fed3d450b58aee09226d2a5efe0d713d1a7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 28 Mar 2025 23:53:15 +0800
Subject: [PATCH 304/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E4=BB=B6=E5=A4=8D=E5=88=B6=E3=80=81=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/quickcomposer/file/operation.js    | 281 +++++++++++++++---
 .../composer/file/FileOperationEditor.vue     |  10 +-
 2 files changed, 248 insertions(+), 43 deletions(-)

diff --git a/plugin/lib/quickcomposer/file/operation.js b/plugin/lib/quickcomposer/file/operation.js
index fb561c30..57d62bbf 100644
--- a/plugin/lib/quickcomposer/file/operation.js
+++ b/plugin/lib/quickcomposer/file/operation.js
@@ -1,4 +1,5 @@
 const fs = require("fs").promises;
+const fsSync = require("fs");
 const path = require("path");
 
 /**
@@ -164,63 +165,259 @@ async function permission(config) {
   }
 }
 
+async function mkdir(targetDir) {
+  // 在 Windows 上，在根目录上使用 fs.mkdir() （即使使用递归参数）也会导致错误
+  // 所以还是要先检查目录是否存在
+  if (fsSync.existsSync(targetDir)) return;
+  await fs.mkdir(targetDir, { recursive: true });
+}
+
 /**
- * 文件复制移动操作
+ * 格式化速度显示
+ * @param {number} bytesPerSecond 每秒字节数
+ * @returns {string} 格式化后的速度字符串
  */
-async function transfer(config) {
-  const { filePath, transferOperation, newPath } = config;
+function formatSpeed(bytesPerSecond) {
+  if (bytesPerSecond >= 1024 * 1024) {
+    return `${(bytesPerSecond / (1024 * 1024)).toFixed(2)} MB/s`;
+  } else if (bytesPerSecond >= 1024) {
+    return `${(bytesPerSecond / 1024).toFixed(2)} KB/s`;
+  }
+  return `${bytesPerSecond.toFixed(2)} B/s`;
+}
 
-  // 检查文件是否存在
-  try {
-    const stats = await fs.lstat(filePath);
+/**
+ * 获取目录下所有文件的总大小和文件数
+ * @param {string} dir 目录路径
+ * @returns {Promise<{totalSize: number, fileCount: number}>}
+ */
+async function getDirStats(dir) {
+  let totalSize = 0;
+  let fileCount = 0;
 
-    // 确保目标目录存在
-    await fs.mkdir(path.dirname(newPath), { recursive: true });
-    if (transferOperation === "copy") {
-      const processBar = await quickcommand.showProcessBar({
-        text: "复制中...",
-      });
-      if (stats.isDirectory()) {
-        // 复制目录
-        const copyDir = async (src, dest) => {
-          await fs.mkdir(dest, { recursive: true });
-          const entries = await fs.readdir(src);
-          for (const entry of entries) {
-            const srcPath = path.join(src, entry);
-            const destPath = path.join(dest, entry);
-            const entryStat = await fs.lstat(srcPath);
-            if (entryStat.isDirectory()) {
-              await copyDir(srcPath, destPath);
-            } else {
-              await fs.copyFile(srcPath, destPath);
-            }
-            quickcommand.updateProcessBar({ text: entry }, processBar);
-          }
-        };
-        await copyDir(filePath, newPath);
+  async function walk(currentDir) {
+    const entries = await fs.readdir(currentDir);
+    for (const entry of entries) {
+      const fullPath = path.join(currentDir, entry);
+      const stat = await fs.lstat(fullPath);
+      if (stat.isDirectory()) {
+        await walk(fullPath);
       } else {
-        // 复制文件
-        await fs.copyFile(filePath, newPath);
+        totalSize += stat.size;
+        fileCount++;
       }
-      processBar.close();
-    } else if (transferOperation === "rename") {
-      const processBar = await quickcommand.showProcessBar({
-        text: "处理中...",
+    }
+  }
+
+  await walk(dir);
+  return { totalSize, fileCount };
+}
+
+/**
+ * 使用流复制文件，支持进度显示
+ * @param {string} src 源文件路径
+ * @param {string} dest 目标文件路径
+ * @param {Object} progressInfo 进度信息
+ * @returns {Promise<void>}
+ */
+async function copyFileWithProgress(src, dest, progressInfo) {
+  const {
+    processBar,
+    totalSize,
+    fileCount,
+    processedFiles,
+    startTime,
+    signal, // AbortController 的 signal
+  } = progressInfo;
+
+  return new Promise(async (resolve, reject) => {
+    try {
+      let currentCopiedSize = 0;
+      let lastUpdate = Date.now();
+      let lastCopiedSize = 0;
+
+      const readStream = fsSync.createReadStream(src);
+      const writeStream = fsSync.createWriteStream(dest);
+
+      // 监听中止信号
+      signal.addEventListener("abort", () => {
+        readStream.destroy();
+        writeStream.destroy();
+        fs.unlink(dest).catch(() => {});
+        reject(new Error("操作已取消"));
       });
-      await fs.rename(filePath, newPath);
-      processBar.close();
+
+      readStream.on("data", (chunk) => {
+        currentCopiedSize += chunk.length;
+        progressInfo.copiedSize += chunk.length;
+        const now = Date.now();
+
+        if (now - lastUpdate >= 100) {
+          const progress = Math.round(
+            (progressInfo.copiedSize / totalSize) * 100
+          );
+          const timeSpent = (now - lastUpdate) / 1000;
+          const bytesCopied = currentCopiedSize - lastCopiedSize;
+          const speed = bytesCopied / timeSpent;
+
+          quickcommand.updateProcessBar(
+            {
+              value: progress,
+              text:
+                `[${processedFiles}/${fileCount}][${formatBytes(
+                  progressInfo.copiedSize
+                )}/${formatBytes(totalSize)}] ${formatSpeed(speed)}<br/>` +
+                `${path.basename(src)}`,
+            },
+            processBar
+          );
+
+          lastUpdate = now;
+          lastCopiedSize = currentCopiedSize;
+        }
+      });
+
+      writeStream.on("finish", () => {
+        progressInfo.processedFiles++;
+        resolve();
+      });
+
+      writeStream.on("error", reject);
+      readStream.on("error", reject);
+
+      readStream.pipe(writeStream);
+    } catch (error) {
+      reject(error);
+    }
+  });
+}
+
+async function copyDirWithProcess(src, dest, progressInfo) {
+  await mkdir(dest);
+  const entries = await fs.readdir(src);
+
+  for (const entry of entries) {
+    // 检查是否已中止
+    if (progressInfo.signal.aborted) {
+      throw new Error("操作已取消");
+    }
+
+    const srcPath = path.join(src, entry);
+    const destPath = path.join(dest, entry);
+    const entryStat = await fs.lstat(srcPath);
+
+    if (entryStat.isDirectory()) {
+      await copyDirWithProcess(srcPath, destPath, progressInfo);
+    } else {
+      await copyFileWithProgress(srcPath, destPath, progressInfo);
+    }
+  }
+}
+
+async function copy(filePath, newPath) {
+  const controller = new AbortController();
+  let isCompleted = false; // 添加完成标志
+
+  const processBar = await quickcommand.showProcessBar({
+    text: "正在计算文件大小...",
+    value: 0,
+    onClose: () => {
+      // 只有在未完成时才触发取消
+      if (!isCompleted) {
+        controller.abort();
+      }
+    },
+  });
+
+  try {
+    let totalSize = 0;
+    let fileCount = 0;
+    const stat = await fs.stat(filePath);
+
+    if (stat.isDirectory()) {
+      const stats = await getDirStats(filePath);
+      totalSize = stats.totalSize;
+      fileCount = stats.fileCount;
     } else {
-      throw new Error(`不支持的操作类型: ${transferOperation}`);
+      totalSize = stat.size;
+      fileCount = 1;
     }
+
+    const progressInfo = {
+      processBar,
+      totalSize,
+      copiedSize: 0,
+      fileCount,
+      processedFiles: 0,
+      startTime: Date.now(),
+      signal: controller.signal,
+    };
+
+    if (stat.isDirectory()) {
+      await copyDirWithProcess(filePath, newPath, progressInfo);
+    } else {
+      await copyFileWithProgress(filePath, newPath, progressInfo);
+    }
+
+    const totalTime = (Date.now() - progressInfo.startTime) / 1000;
+    const averageSpeed = totalSize / totalTime;
+
+    isCompleted = true; // 标记为已完成
+    quickcommand.updateProcessBar(
+      {
+        value: 100,
+        text:
+          `总大小: ${formatBytes(totalSize)} - 文件数: ${fileCount} <br/>` +
+          `平均速度: ${formatSpeed(averageSpeed)} - 用时: ${totalTime.toFixed(
+            1
+          )}s`,
+        complete: true,
+      },
+      processBar
+    );
   } catch (error) {
-    processBar?.close();
-    if (error.code === "ENOENT") {
-      throw new Error("文件或目录不存在");
+    if (error.message === "操作已取消") {
+      // 清理目标文件/目录
+      fs.rm(newPath, { recursive: true }).catch(() => {});
     }
     throw error;
   }
 }
 
+async function move(filePath, newPath) {
+  try {
+    // rename 不支持跨驱动器
+    await fs.rename(filePath, newPath);
+  } catch (error) {
+    try {
+      await copy(filePath, newPath);
+      if (!fsSync.existsSync(newPath)) return;
+      await fs.rm(filePath, { recursive: true });
+    } catch (error) {
+      throw error;
+    }
+  }
+}
+
+/**
+ * 文件复制移动操作
+ */
+async function transfer(config) {
+  const { filePath, transferOperation, newPath } = config;
+
+  // 检查文件是否存在
+  if (!fsSync.existsSync(filePath)) throw "文件或目录不存在!";
+  // 确保目标目录存在
+  await mkdir(path.dirname(newPath));
+  if (transferOperation === "copy") {
+    await copy(filePath, newPath);
+  } else if (transferOperation === "rename") {
+    await move(filePath, newPath);
+  } else {
+    throw new Error(`不支持的操作类型: ${transferOperation}`);
+  }
+}
+
 /**
  * 列出目录内容
  * @param {Object} config 配置对象
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index 47261cc7..37134b77 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -240,8 +240,16 @@
           <VariableInput
             :model-value="argvs.newPath"
             @update:model-value="updateArgvs('newPath', $event)"
-            label="目标路径"
+            label="目标路径（含被复制/移动的文件名）"
             icon="drive_file_rename_outline"
+            :options="{
+              dialog: {
+                options: {
+                  title: '选择文件',
+                  properties: ['openFile', 'showHiddenFiles'],
+                },
+              },
+            }"
             class="col-6"
           />
         </div>

From 4c2f835222b1b0a07cde0fcfdbef436b54bf8f1b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 29 Mar 2025 00:10:46 +0800
Subject: [PATCH 305/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=8F=8C=E5=87=BB=E4=B8=A4=E6=AC=A1=E5=91=BD=E4=BB=A4=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=88=96=E8=80=85=E6=96=B0=E5=BB=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E5=91=BD=E4=BB=A4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ConfigurationPage.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/ConfigurationPage.vue b/src/pages/ConfigurationPage.vue
index c2ef357f..8a76044d 100644
--- a/src/pages/ConfigurationPage.vue
+++ b/src/pages/ConfigurationPage.vue
@@ -167,6 +167,8 @@ export default {
     },
     // 编辑命令
     editCommand(commandOrCode) {
+      // 防止多次触发
+      if (this.isEditorShow) return;
       // 即可传入 code，也可直接传入 command
       const command =
         typeof commandOrCode === "string"
@@ -182,6 +184,8 @@ export default {
     },
     // 新建命令
     addNewCommand(program = "quickcommand") {
+      // 防止多次触发
+      if (this.isEditorShow) return;
       this.editorComponent =
         program === "quickcomposer" ? "ComposerEditor" : "CommandEditor";
       this.commandManager.state.currentCommand =

From 0ab029a5b3b646805a8a8970f5453ea3010498b8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 29 Mar 2025 16:37:12 +0800
Subject: [PATCH 306/332] =?UTF-8?q?=E7=BC=96=E6=8E=92-=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B7=BB=E5=8A=A0break?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/controlCommands.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 97efe522..65b11871 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -305,6 +305,12 @@ export const controlCommands = {
             },
           ],
         },
+        {
+          label: "中断",
+          value: "break",
+          icon: "stop",
+          codeTemplate: "break;",
+        },
         {
           label: "默认分支",
           value: "default",

From 7f26c0f1768cf09e25a6ef8b83fac14a9da33a0a Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 29 Mar 2025 16:42:55 +0800
Subject: [PATCH 307/332] =?UTF-8?q?=E7=BC=96=E6=8E=92=E7=95=A5=E5=BE=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=98=E5=8F=A0=E6=8C=89=E9=92=AE=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E7=9A=84=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandHead.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index c2a0dcb8..6d45e362 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -143,6 +143,7 @@ export default {
 .chain-icon {
   display: flex;
   align-items: center;
+  margin-right: 2px;
   transition: all 0.2s ease;
 }
 

From 1da46e8dc5e40f85e02f00f9b1f871d2e634e55d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 29 Mar 2025 21:34:07 +0800
Subject: [PATCH 308/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8E=A7=E5=88=B6=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E4=B8=8D=E5=90=8C=E5=88=86=E6=94=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=90=8C=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandHead.vue  | 24 ++++++++++++++-----
 .../composer/control/ControlCommand.vue       | 10 ++++++--
 src/js/composer/commands/controlCommands.js   | 20 ++++++++--------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 6d45e362..38505db4 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -16,16 +16,16 @@
       <q-icon name="linear_scale" size="xs" />
     </div>
     <div v-else class="chain-icon">
-      <q-icon name="fork_left" size="xs" />
+      <q-icon :name="getChianIcon()" size="xs" />
     </div>
 
     <!-- 标题 -->
-    <div class="command-label">
+    <div class="command-label" v-if="!isControlFlow">
       <div class="drag-handle text-subtitle2 command-label-text">
         {{ command.label }}
       </div>
       <div
-        v-if="isCollapsed && !isControlFlow"
+        v-if="isCollapsed"
         class="summary-container"
         @click.stop="isEditingSummary = true"
       >
@@ -135,6 +135,15 @@ export default {
       return this.command.userComments || this.command.summary;
     },
   },
+  methods: {
+    getChianIcon() {
+      return (
+        this.command?.subCommands?.find(
+          (command) => command.value === this.command.commandType
+        )?.icon || "fork_left"
+      );
+    },
+  },
 };
 </script>
 
@@ -163,15 +172,18 @@ export default {
 .command-label {
   user-select: none;
   pointer-events: all;
-  cursor: grab;
-  transition: all 0.3s ease;
   display: flex;
   align-items: center;
   gap: 8px;
   margin-right: 8px;
 }
 
-.command-label:hover {
+.command-label-text {
+  cursor: grab;
+  transition: all 0.3s ease;
+}
+
+.command-label-text:hover {
   color: var(--q-primary);
   transition: all 0.3s ease;
 }
diff --git a/src/components/composer/control/ControlCommand.vue b/src/components/composer/control/ControlCommand.vue
index 208209c2..98e37789 100644
--- a/src/components/composer/control/ControlCommand.vue
+++ b/src/components/composer/control/ControlCommand.vue
@@ -2,7 +2,7 @@
   <div class="control-command-wrapper">
     <div class="control-command">
       <!-- 类型标签 -->
-      <div class="control-type-label">
+      <div class="control-type-label drag-handle">
         {{ currentFunction?.label || modelValue.commandType }}
       </div>
 
@@ -25,7 +25,7 @@
         no-icon-animation
         class="control-btn"
       >
-        <q-list>
+        <q-list dense>
           <q-item
             v-for="func in branchOptions"
             :key="func.value"
@@ -168,6 +168,12 @@ export default defineComponent({
   opacity: 0.9;
   user-select: none;
   flex-shrink: 0;
+  transition: all 0.3s ease;
+}
+
+.control-type-label:hover {
+  color: var(--q-primary) !important;
+  transition: all 0.3s ease;
 }
 
 .control-settings {
diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 65b11871..1cb4f83c 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -23,16 +23,10 @@ export const controlCommands = {
             },
           ],
         },
-        {
-          label: "否则",
-          value: "else",
-          icon: "fork_left",
-          codeTemplate: "} else {",
-        },
         {
           label: "否则满足",
           value: "else if",
-          icon: "fork_left",
+          icon: "fork_right",
           codeTemplate: "} else if (${condition}) {",
           config: [
             {
@@ -43,6 +37,12 @@ export const controlCommands = {
             },
           ],
         },
+        {
+          label: "否则",
+          value: "else",
+          icon: "airline_stops",
+          codeTemplate: "} else {",
+        },
         {
           label: "结束",
           value: "end",
@@ -295,7 +295,7 @@ export const controlCommands = {
         {
           label: "匹配分支",
           value: "case",
-          icon: "check",
+          icon: "fork_right",
           codeTemplate: "case ${value}:",
           config: [
             {
@@ -314,7 +314,7 @@ export const controlCommands = {
         {
           label: "默认分支",
           value: "default",
-          icon: "last_page",
+          icon: "airline_stops",
           codeTemplate: "default:",
         },
         {
@@ -340,7 +340,7 @@ export const controlCommands = {
         {
           label: "捕获异常",
           value: "catch",
-          icon: "error",
+          icon: "priority_high",
           codeTemplate: "} catch (${errorVar}) {",
           config: [
             {

From 65936e7d0ddfdf0a04906e3107cd4fe5d471f790 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 30 Mar 2025 10:57:31 +0800
Subject: [PATCH 309/332] =?UTF-8?q?AI=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84token=E6=94=AF=E6=8C=81=E5=88=87=E6=8D=A2=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index abfdf9f6..ee2cee3d 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -130,7 +130,7 @@
                     dense
                     v-model="aiConfig.apiToken"
                     v-if="aiConfig.apiType === 'openai'"
-                    type="password"
+                    :type="tokenInputTypes[index] || 'password'"
                     class="col-7"
                   >
                     <template v-slot:prepend>
@@ -141,6 +141,22 @@
                         class="q-pa-xs"
                       />
                     </template>
+                    <template v-slot:append>
+                      <q-icon
+                        name="visibility_off"
+                        @click="tokenInputTypes[index] = 'password'"
+                        size="16px"
+                        class="cursor-pointer"
+                        v-if="tokenInputTypes[index] === 'text'"
+                      />
+                      <q-icon
+                        name="visibility"
+                        @click="tokenInputTypes[index] = 'text'"
+                        size="16px"
+                        class="cursor-pointer"
+                        v-else
+                      />
+                    </template>
                   </q-input>
                 </div>
               </div>
@@ -180,6 +196,7 @@ export default defineComponent({
       apiToAdd: "openai",
       aiConfigs: [],
       models: [],
+      tokenInputTypes: [],
     };
   },
   emits: ["save"],

From f9e0c29c0877d6c625a29756da90a3da3cfad81b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 30 Mar 2025 10:58:20 +0800
Subject: [PATCH 310/332] =?UTF-8?q?=E4=BC=98=E5=8C=96AI=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=8D=EF=BC=8C=E8=A7=A3=E5=86=B3deepseek-?=
 =?UTF-8?q?v3=E8=BF=94=E5=9B=9E```markdown=E5=BC=80=E5=A4=B4=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIAssistantSideBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index 7f1f7584..db6c2512 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -312,7 +312,7 @@ export default defineComponent({
       const specificInstructions = languageSpecific[language] || "";
 
       const lastInstructions =
-        "\n请直接给我MARKDOWN格式的代码，任何情况下都不需要做解释和说明";
+        "\n请直接给我MARKDOWN格式的代码（以```脚本语言开头，以```结尾），任何情况下都不需要做解释和说明";
 
       return commonInstructions + specificInstructions + lastInstructions;
     },

From 34230fa140ab6fdfa997a72f15f084784d8b8ee7 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 30 Mar 2025 11:28:18 +0800
Subject: [PATCH 311/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=BE=93=E5=85=A5=E6=A1=86=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/card/CommandHead.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/composer/card/CommandHead.vue b/src/components/composer/card/CommandHead.vue
index 38505db4..aee47d0f 100644
--- a/src/components/composer/card/CommandHead.vue
+++ b/src/components/composer/card/CommandHead.vue
@@ -78,6 +78,8 @@
       @update:outputVariable="$emit('update:outputVariable', $event)"
       @run="$emit('run')"
       @remove="$emit('remove')"
+      @add-print="$emit('add-print')"
+      @copy="$emit('copy')"
     />
   </div>
 </template>
@@ -107,6 +109,8 @@ export default {
     "run",
     "remove",
     "toggle-collapse",
+    "copy",
+    "add-print",
   ],
   computed: {
     contentClass() {

From 71375e2c864d3aceb04e5156a2856473cb553507 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 31 Mar 2025 12:01:59 +0800
Subject: [PATCH 312/332] =?UTF-8?q?=E7=BB=9F=E4=B8=80memberPrice=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/UserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/popup/UserInfo.vue b/src/components/popup/UserInfo.vue
index e7a706d1..ac311cd2 100644
--- a/src/components/popup/UserInfo.vue
+++ b/src/components/popup/UserInfo.vue
@@ -28,7 +28,7 @@
         size="xs"
         label="插件会员"
         @click="showPayPage = true"
-        ><q-tooltip>2元解锁本插件所有会员特权</q-tooltip></q-btn
+        ><q-tooltip>{{ memberPrice }}元解锁本插件所有会员特权</q-tooltip></q-btn
       >
     </div>
     <q-separator vertical inset class="q-mx-lg" />

From fcf3d5912e943099545c8290e3ccd35e0bd5c218 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 9 Apr 2025 10:04:41 +0800
Subject: [PATCH 313/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96=E7=BC=96=E6=8E=92=E7=9A=84=E5=91=BD=E4=BB=A4=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=92=8C=E4=B8=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=8E=A8=E9=80=81=E5=A4=B1=E6=95=88=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ff004778..aea84fd8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,6 +16,8 @@ import programmings from "./js/options/programs.js";
 import defaultProfile from "./js/options/defaultProfile.js";
 import Cron from "croner";
 import QuickCommand from "components/quickcommandUI/QuickCommand";
+import { generateFlowsCode } from "js/composer/generateCode";
+
 // import autoDetach from "./js/autoDetach.js";
 
 export default defineComponent({
@@ -157,10 +159,13 @@ export default defineComponent({
             reslove([`超过${timeout}ms未响应`]);
           }, timeout);
         let command = dbManager.getDB("qc_" + featureCode);
-        let commandCode = command.cmd;
+        let commandCode =
+          command.program === "quickcomposer"
+            ? generateFlowsCode(command.flows)
+            : command.cmd;
         if (mainInput)
           commandCode = commandCode.replace(/\{\{input\}\}/g, mainInput);
-        if (command.program === "quickcommand") {
+        if (["quickcommand", "quickcomposer"].includes(command.program)) {
           window.runCodeInSandbox(commandCode, (stdout, stderr) => {
             stderr && reslove([stderr.toString()]);
             reslove(stdout);

From 823a95079ada5b03dbb79fa1f1af9eb774899674 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 9 Apr 2025 10:43:30 +0800
Subject: [PATCH 314/332] =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84Code=EF=BC=8C=E4=B8=BA=E6=AF=8F?=
 =?UTF-8?q?=E6=AE=B5=E4=BB=A3=E7=A0=81=E6=B7=BB=E5=8A=A0=E9=80=97=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92eval=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/generateCode.js | 41 ++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 2ce5b107..4eeefdfd 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -4,13 +4,13 @@ export function generateCode(flow) {
   // 获取变量赋值代码，如果变量已经存在，则直接赋值，否则声明并赋值
   const getVarAssignCode = (varName, varValue) => {
     if (usedVarNames.includes(varName)) {
-      return `${varName} = ${varValue};`;
+      return `${varName} = ${varValue}`;
     }
     usedVarNames.push(varName);
     if (!varValue) {
-      return `let ${varName};`;
+      return `let ${varName}`;
     }
-    return `let ${varName} = ${varValue};`;
+    return `let ${varName} = ${varValue}`;
   };
 
   const getVarByPath = (name, path) => {
@@ -36,10 +36,11 @@ export function generateCode(flow) {
   );
 
   const indent = "  ";
+  const comma = ";";
 
   // 局部变量赋值
   manualVars.forEach((v) => {
-    code.push(indent + getVarAssignCode(v.name, v.value));
+    code.push(indent + getVarAssignCode(v.name, v.value) + comma);
   });
 
   commands.forEach((cmd) => {
@@ -65,7 +66,7 @@ export function generateCode(flow) {
             const extractVarCode = Object.entries(details)
               .map(
                 ([path, varName]) =>
-                  `let ${varName} = ${getVarByPath(promiseName, path)}`
+                  `let ${varName} = ${getVarByPath(promiseName, path)};`
               )
               .join("\n");
 
@@ -80,20 +81,22 @@ export function generateCode(flow) {
               })`;
           }
         }
-        code.push(indent + cmdCode);
+        code.push(indent + cmdCode + comma);
       } else if (cmd.asyncMode === "await") {
         // 使用 await 模式
         const promiseName = name || "__result";
         cmdCode = getVarAssignCode(promiseName, `await ${cmdCode}`);
-        code.push(indent + cmdCode);
+        code.push(indent + cmdCode + comma);
         // 处理详细变量
         if (details) {
           Object.entries(details).forEach(([path, varName]) => {
             code.push(
-              `${indent}${getVarAssignCode(
-                varName,
-                getVarByPath(promiseName, path)
-              )}`
+              indent +
+                `${getVarAssignCode(
+                  varName,
+                  getVarByPath(promiseName, path)
+                )}` +
+                comma
             );
           });
         }
@@ -101,15 +104,17 @@ export function generateCode(flow) {
         // 非Async命令
         const resultVarName = name || "__result";
         cmdCode = getVarAssignCode(resultVarName, `${cmdCode}`);
-        code.push(indent + cmdCode);
+        code.push(indent + cmdCode + comma);
         // 处理详细变量
         if (details) {
           Object.entries(details).forEach(([path, varName]) => {
             code.push(
-              `${indent}${getVarAssignCode(
-                varName,
-                getVarByPath(resultVarName, path)
-              )}`
+              indent +
+                `${getVarAssignCode(
+                  varName,
+                  getVarByPath(resultVarName, path)
+                )}` +
+                comma
             );
           });
         }
@@ -119,11 +124,11 @@ export function generateCode(flow) {
       if (cmd.asyncMode === "await") {
         cmdCode = `await ${cmdCode}`;
       }
-      code.push(indent + cmdCode);
+      code.push(indent + cmdCode + comma);
     }
   });
 
-  code.push("}"); // Close the function
+  code.push("};"); // Close the function
 
   // 如果是主函数，则自动执行
   if (funcName === "main") {

From f9a22595be51813a8451526ff53bce4c3658613b Mon Sep 17 00:00:00 2001
From: ITLDG <wanglong126@139.com>
Date: Thu, 10 Apr 2025 16:22:06 +0800
Subject: [PATCH 315/332] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E7=AD=9B=E9=80=89=E5=90=8E=E9=87=8D=E6=96=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4uTools=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/SelectList.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/quickcommandUI/SelectList.vue b/src/components/quickcommandUI/SelectList.vue
index 27dd9d3b..c662f2e7 100644
--- a/src/components/quickcommandUI/SelectList.vue
+++ b/src/components/quickcommandUI/SelectList.vue
@@ -114,9 +114,13 @@ export default {
 
       return this.items.filter((x) => {
         if (this.is.json) {
-          const titleMatch = window.pinyinMatch.match(x.title, this.searchWords);
+          const titleMatch = window.pinyinMatch.match(
+            x.title,
+            this.searchWords
+          );
           const descMatch =
-            x.description && window.pinyinMatch.match(x.description, this.searchWords);
+            x.description &&
+            window.pinyinMatch.match(x.description, this.searchWords);
           return titleMatch || descMatch;
         } else {
           return window.pinyinMatch.match(x, this.searchWords);
@@ -212,6 +216,7 @@ export default {
         this.searchWords = text;
         if (this.matchedItems.length < this.currentIndex + 1)
           this.currentIndex = 0;
+        this.setUtoolsHeight(this.itemHeight * this.matchedItemsSize);
       }, this.options.options.placeholder);
     },
 

From c1f86c20d2e50d5c6c2acc83d2b00874e6866b57 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 11 Apr 2025 11:00:20 +0800
Subject: [PATCH 316/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E4=B8=ADubrowser=E4=B8=8D=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=90=8C=E6=A0=B7=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../composer/ubrowser/UBrowserOperations.vue  | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/components/composer/ubrowser/UBrowserOperations.vue b/src/components/composer/ubrowser/UBrowserOperations.vue
index 37af6a4b..0dcdbe4e 100644
--- a/src/components/composer/ubrowser/UBrowserOperations.vue
+++ b/src/components/composer/ubrowser/UBrowserOperations.vue
@@ -14,12 +14,15 @@
               bordered
               class="action-card cursor-pointer"
               :class="{
-                'action-selected': selectedActionKeys.includes(actionKey),
+                'action-selected': actionCount[actionKey] > 0,
               }"
-              @click="toggleAction(actionKey)"
+              @click="addAction(actionKey)"
             >
               <div class="q-pa-xs text-caption text-wrap text-center">
                 {{ action.label }}
+                <q-badge v-if="actionCount[actionKey]" color="primary" floating>
+                  {{ actionCount[actionKey] }}
+                </q-badge>
               </div>
             </q-card>
           </div>
@@ -38,7 +41,7 @@
           <q-chip
             square
             removable
-            @remove="toggleAction(selectedActionKey)"
+            @remove="removeAction(index)"
             class="text-caption q-mb-sm"
             :style="{
               paddingLeft: '7px',
@@ -125,6 +128,13 @@ export default {
     selectedActionArgs() {
       return this.modelValue.map((x) => x.args);
     },
+    actionCount() {
+      const count = {};
+      this.selectedActionKeys.forEach((key) => {
+        count[key] = (count[key] || 0) + 1;
+      });
+      return count;
+    },
   },
   methods: {
     moveAction(index, direction) {
@@ -138,26 +148,25 @@ export default {
         this.$emit("update:model-value", newOperation);
       }
     },
-    toggleAction(actionKey) {
-      const index = this.selectedActionKeys.indexOf(actionKey);
+    addAction(actionKey) {
       let newOperation = [...this.modelValue];
-      if (index !== -1) {
-        // 移除操作
-        newOperation.splice(index, 1);
-      } else {
-        // 添加操作
-        const { config, value } = this.operationsMap[actionKey];
-        const args = config?.length
-          ? config.map((field) => field.defaultValue)
-          : [];
-
-        const newOperationItem = { value, args };
-        if (actionKey !== value) {
-          newOperationItem.key = actionKey;
-        }
-
-        newOperation.push(newOperationItem);
+      // 添加操作
+      const { config, value } = this.operationsMap[actionKey];
+      const args = config?.length
+        ? config.map((field) => field.defaultValue)
+        : [];
+
+      const newOperationItem = { value, args };
+      if (actionKey !== value) {
+        newOperationItem.key = actionKey;
       }
+
+      newOperation.push(newOperationItem);
+      this.$emit("update:model-value", newOperation);
+    },
+    removeAction(index) {
+      let newOperation = [...this.modelValue];
+      newOperation.splice(index, 1);
       this.$emit("update:model-value", newOperation);
     },
     updateActionArgs(argvIndex, argvVal, actionIndex) {
@@ -250,4 +259,11 @@ export default {
 .row.q-col-gutter-xs > * {
   padding: 2px;
 }
+
+.q-badge {
+  font-size: 10px;
+  padding: 2px 4px;
+  right: -4px;
+  top: -4px;
+}
 </style>

From 31f0d66ebce4a090b17350c4bb0f71dedef27443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:11:31 +0000
Subject: [PATCH 317/332] Bump ses from 1.10.0 to 1.12.0 in /plugin

Bumps [ses](https://github.com/endojs/endo/tree/HEAD/packages/ses) from 1.10.0 to 1.12.0.
- [Release notes](https://github.com/endojs/endo/releases)
- [Changelog](https://github.com/endojs/endo/blob/master/packages/ses/CHANGELOG.md)
- [Commits](https://github.com/endojs/endo/commits/ses@1.12.0/packages/ses)

---
updated-dependencies:
- dependency-name: ses
  dependency-version: 1.12.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 plugin/package-lock.json | 14 +++++++-------
 plugin/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 96c70711..d53c8092 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -15,7 +15,7 @@
         "node-forge": "^1.3.1",
         "pinyin-match": "^1.2.6",
         "png2icons": "^2.0.1",
-        "ses": "^1.10.0",
+        "ses": "^1.12.0",
         "sm-crypto": "^0.3.13",
         "tree-kill": "^1.2.2"
       }
@@ -229,9 +229,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/ses": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
-      "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/ses/-/ses-1.12.0.tgz",
+      "integrity": "sha512-jvmwXE2lFxIIY1j76hFjewIIhYMR9Slo3ynWZGtGl5M7VUCw3EA0wetS+JCIbl2UcSQjAT0yGAHkyxPJreuC9w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@endo/env-options": "^1.1.8"
@@ -419,9 +419,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "ses": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/ses/-/ses-1.10.0.tgz",
-      "integrity": "sha512-HXmJbNEgY/4hsQfaz5dna39vVKNyvlElRmJYk+bjTqSXSElT0Hr6NKwWVg4j0TxP6IuHp/PNMoWJKIRXzmLbAQ==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/ses/-/ses-1.12.0.tgz",
+      "integrity": "sha512-jvmwXE2lFxIIY1j76hFjewIIhYMR9Slo3ynWZGtGl5M7VUCw3EA0wetS+JCIbl2UcSQjAT0yGAHkyxPJreuC9w==",
       "requires": {
         "@endo/env-options": "^1.1.8"
       }
diff --git a/plugin/package.json b/plugin/package.json
index a9be277a..627e86bf 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -10,7 +10,7 @@
     "node-forge": "^1.3.1",
     "pinyin-match": "^1.2.6",
     "png2icons": "^2.0.1",
-    "ses": "^1.10.0",
+    "ses": "^1.12.0",
     "sm-crypto": "^0.3.13",
     "tree-kill": "^1.2.2"
   }

From ebde8999bf50e04c4e31a28310438b103729a90d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 19 Apr 2025 09:12:08 +0800
Subject: [PATCH 318/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0utools.markdown?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/ubrowserConfig.js        | 13 +++++++++++++
 src/plugins/monaco/types/utools.api.d.ts |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/src/js/composer/ubrowserConfig.js b/src/js/composer/ubrowserConfig.js
index b0d1ed88..64bd48fd 100644
--- a/src/js/composer/ubrowserConfig.js
+++ b/src/js/composer/ubrowserConfig.js
@@ -323,6 +323,19 @@ export const ubrowserOperationConfigs = {
       },
     ],
   },
+  markdown: {
+    value: "markdown",
+    label: "转markdown",
+    icon: "get_app",
+    config: [
+      {
+        label: "CSS 或 XPath 选择器，不传递则转换整个网页内容",
+        icon: "find_in_page",
+        component: "VariableInput",
+        width: 12,
+      },
+    ],
+  },
   setCookies: {
     value: "setCookies",
     label: "设置Cookie",
diff --git a/src/plugins/monaco/types/utools.api.d.ts b/src/plugins/monaco/types/utools.api.d.ts
index 0d6e3789..17789c04 100644
--- a/src/plugins/monaco/types/utools.api.d.ts
+++ b/src/plugins/monaco/types/utools.api.d.ts
@@ -138,6 +138,11 @@ interface UBrowser {
    * 配合 when 使用
    */
   end(): this;
+  /**
+   * 转为markdown
+   * @param selector CSS 或 XPath 选择器，不传递则转换整个网页内容
+   */
+  markdown(selector: string): this;
   /**
    * 单击元素
    */

From 3d2d15e177e55104732db3dc864ad19243dbefd0 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 18:58:04 +0800
Subject: [PATCH 319/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0option=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         | 8 ++++----
 src/components/CommandRunResult.vue | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index aea84fd8..6359b9ee 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -173,10 +173,10 @@ export default defineComponent({
         } else {
           let option =
             command.program === "custom"
-              ? command.customOptions
-              : this.programs[command.program];
-          option.scptarg = command.scptarg;
-          option.charset = command.charset;
+              ? command.customOptions || {}
+              : this.programs[command.program] || {};
+          option.scptarg = command.scptarg || "";
+          option.charset = command.charset || {};
           window.runCodeFile(
             commandCode,
             option,
diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index a8c58561..e24e5acf 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -170,8 +170,8 @@ export default {
     getCommandOpt(command) {
       let option =
         command.program === "custom"
-          ? command.customOptions
-          : programs[command.program];
+          ? command.customOptions || {}
+          : programs[command.program] || {};
       option.scptarg = command.scptarg || "";
       option.charset = command.charset || {};
       option.envPath = this.$root.nativeProfile.envPath.trim() || "";

From a762b87d2b85e09c672c3f8a8bac267e22afb1f5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 19:21:31 +0800
Subject: [PATCH 320/332] =?UTF-8?q?ai=E8=AE=BE=E7=BD=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0utools=E5=86=85=E7=BD=AE=E7=9A=84ai?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 47 +++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index ee2cee3d..c97ad99c 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -6,10 +6,7 @@
         <ButtonGroup
           v-model="apiToAdd"
           class="col"
-          :options="[
-            { label: 'OPENAI', value: 'openai' },
-            { label: 'OLLAMA', value: 'ollama' },
-          ]"
+          :options="aiOptions"
           height="26px"
         />
         <q-icon
@@ -78,8 +75,11 @@
                     :placeholder="
                       aiConfig.apiType === 'openai'
                         ? '例：https://api.openai.com'
-                        : '例：http://localhost:11434'
+                        : aiConfig.apiType === 'ollama'
+                        ? '例：http://localhost:11434'
+                        : '无需配置'
                     "
+                    :disable="aiConfig.apiType === 'utools'"
                   >
                     <template v-slot:prepend>
                       <q-badge
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { defineComponent } from "vue";
+import { defineComponent, ref } from "vue";
 import { dbManager } from "js/utools.js";
 import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import draggable from "vuedraggable";
@@ -191,6 +191,18 @@ export default defineComponent({
     ButtonGroup,
     draggable,
   },
+  setup() {
+    const aiOptions = ref([
+      { label: "OPENAI接口", value: "openai" },
+      { label: "OLLAMA接口", value: "ollama" },
+    ]);
+    if (utools.allAiModels) {
+      aiOptions.value.push({ label: "uTools内置", value: "utools" });
+    }
+    return {
+      aiOptions,
+    };
+  },
   data() {
     return {
       apiToAdd: "openai",
@@ -202,6 +214,19 @@ export default defineComponent({
   emits: ["save"],
   methods: {
     async getModels(aiConfig) {
+      if (aiConfig.apiType === "utools") {
+        try {
+          const models = await utools.allAiModels();
+          this.models = models.map((model) => model.id);
+        } catch (error) {
+          quickcommand.showMessageBox(
+            "获取 uTools AI 模型失败: " + error.message,
+            "error"
+          );
+          this.models = [];
+        }
+        return;
+      }
       const { success, result, error } = await window.getModelsFromAiApi(
         aiConfig
       );
@@ -223,13 +248,21 @@ export default defineComponent({
       this.aiConfigs.splice(index, 1);
     },
     addModel() {
-      this.aiConfigs.push({
+      const defaultConfig = {
         id: getUniqueId(),
         apiType: this.apiToAdd,
         apiUrl: "",
         apiToken: "",
         model: "",
         name: "",
+      };
+
+      if (this.apiToAdd === "utools") {
+        defaultConfig.apiUrl = "";
+      }
+
+      this.aiConfigs.push(defaultConfig);
+
       });
     },
     getConfigListHeight() {

From ffbae3f33f9437f7da96d187b13b8bde1b8d02e8 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 19:21:48 +0800
Subject: [PATCH 321/332] =?UTF-8?q?ai=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0a?=
 =?UTF-8?q?i=E5=90=8E=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index c97ad99c..2ee78c57 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -18,6 +18,7 @@
         />
       </div>
       <q-scroll-area
+        ref="scrollArea"
         :style="`height: ${getConfigListHeight()}px;`"
         class="q-px-sm"
         :vertical-thumb-style="{
@@ -263,6 +264,9 @@ export default defineComponent({
 
       this.aiConfigs.push(defaultConfig);
 
+      // 滚动到底部
+      this.$nextTick(() => {
+        this.$refs.scrollArea.setScrollPosition("vertical", 99999);
       });
     },
     getConfigListHeight() {

From 3fb17dcd99e579e0ecd1cfac2278344cd06fc848 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 21:28:20 +0800
Subject: [PATCH 322/332] =?UTF-8?q?=E7=AE=80=E5=8C=96ai=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 47 +++++++++++++++-------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index 2ee78c57..bdc0f04e 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -2,19 +2,16 @@
   <q-card style="width: 800px" class="q-pa-sm">
     <div class="text-h5 q-my-md q-px-sm">API配置</div>
     <div>
-      <div class="flex q-mb-md q-px-sm" style="height: 26px">
-        <ButtonGroup
-          v-model="apiToAdd"
-          class="col"
-          :options="aiOptions"
-          height="26px"
-        />
-        <q-icon
-          name="add_box"
-          @click="addModel"
+      <div class="q-pa-sm row q-gutter-sm">
+        <q-btn
+          v-for="option in aiOptions"
+          :key="option.value"
+          icon="add_link"
+          dense
           color="primary"
-          size="26px"
-          class="cursor-pointer q-ml-sm"
+          :label="option.label"
+          @click="addModel(option.value)"
+          class="col"
         />
       </div>
       <q-scroll-area
@@ -76,11 +73,9 @@
                     :placeholder="
                       aiConfig.apiType === 'openai'
                         ? '例：https://api.openai.com'
-                        : aiConfig.apiType === 'ollama'
-                        ? '例：http://localhost:11434'
-                        : '无需配置'
+                        : '例：http://localhost:11434'
                     "
-                    :disable="aiConfig.apiType === 'utools'"
+                    v-show="aiConfig.apiType !== 'utools'"
                   >
                     <template v-slot:prepend>
                       <q-badge
@@ -182,31 +177,31 @@
 <script>
 import { defineComponent, ref } from "vue";
 import { dbManager } from "js/utools.js";
-import ButtonGroup from "components/composer/common/ButtonGroup.vue";
 import draggable from "vuedraggable";
 import { getUniqueId } from "js/common/uuid.js";
 
 export default defineComponent({
   name: "AIConfig",
   components: {
-    ButtonGroup,
     draggable,
   },
   setup() {
+    const initAiOptions = utools.allAiModels
+      ? [{ label: "uTools内置AI", value: "utools" }]
+      : [];
+
     const aiOptions = ref([
-      { label: "OPENAI接口", value: "openai" },
+      ...initAiOptions,
+      { label: "OPENAI接口(需Key)", value: "openai" },
       { label: "OLLAMA接口", value: "ollama" },
     ]);
-    if (utools.allAiModels) {
-      aiOptions.value.push({ label: "uTools内置", value: "utools" });
-    }
+
     return {
       aiOptions,
     };
   },
   data() {
     return {
-      apiToAdd: "openai",
       aiConfigs: [],
       models: [],
       tokenInputTypes: [],
@@ -248,17 +243,17 @@ export default defineComponent({
     deleteModel(index) {
       this.aiConfigs.splice(index, 1);
     },
-    addModel() {
+    addModel(apiType) {
       const defaultConfig = {
         id: getUniqueId(),
-        apiType: this.apiToAdd,
+        apiType: apiType,
         apiUrl: "",
         apiToken: "",
         model: "",
         name: "",
       };
 
-      if (this.apiToAdd === "utools") {
+      if (apiType === "utools") {
         defaultConfig.apiUrl = "";
       }
 

From d1b117186f67af07da58a194ce28972daef1ba2b Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 23:09:36 +0800
Subject: [PATCH 323/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81uto?=
 =?UTF-8?q?ols.ai?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js | 127 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 100 insertions(+), 27 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 0f5e6939..34684dfb 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -17,6 +17,7 @@ window.aiResponseParser = (content) => {
 const API_TYPES = {
   OPENAI: "openai",
   OLLAMA: "ollama",
+  UTOOLS: "utools",
 };
 
 // 角色提示词
@@ -151,21 +152,6 @@ function buildRequestData(content, apiConfig) {
   };
 }
 
-// 处理普通响应
-function parseResponse(response, apiType) {
-  if (apiType === API_TYPES.OPENAI) {
-    if (!response.data.choices || !response.data.choices[0]) {
-      throw new Error("OpenAI 响应格式错误");
-    }
-    return response.data.choices[0].message.content;
-  } else {
-    if (!response.data.message) {
-      throw new Error("Ollama 响应格式错误");
-    }
-    return response.data.message.content;
-  }
-}
-
 // 处理模型列表响应
 function parseModelsResponse(response, apiType) {
   if (apiType === API_TYPES.OPENAI) {
@@ -209,8 +195,38 @@ async function handleOllamaStreamResponse(line, onStream) {
   }
 }
 
+let reasoning_content_start = false;
+// 处理 uTools AI 流式响应
+async function handleUToolsAIStreamResponse(response, onStream) {
+  if (response.reasoning_content) {
+    if (!reasoning_content_start) {
+      reasoning_content_start = true;
+      onStream("<think>", false);
+    }
+    onStream(response.reasoning_content, false);
+  }
+  if (response.content) {
+    if (reasoning_content_start) {
+      reasoning_content_start = false;
+      onStream("</think>", false);
+    }
+    onStream(response.content, false);
+  }
+}
+
 // 处理流式响应
 async function handleStreamResponse(response, apiConfig, onStream) {
+  // 处理 uTools AI 响应
+  if (apiConfig.apiType === API_TYPES.UTOOLS) {
+    try {
+      await handleUToolsAIStreamResponse(response, onStream);
+      return { success: true };
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  // 处理其他 API 的流式响应
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
@@ -283,24 +299,27 @@ async function chat(content, apiConfig, options = {}) {
     } = options;
 
     // 验证必要参数
-    if (!apiConfig.apiUrl || !content.prompt || !apiConfig.model) {
-      throw new Error("API地址、模型名称和提示词不能为空");
+    if (apiConfig.apiType === API_TYPES.UTOOLS) {
+      if (!content.prompt || !apiConfig.model) {
+        throw new Error("模型名称和提示词不能为空");
+      }
+    } else {
+      if (!apiConfig.apiUrl) {
+        throw new Error("API地址不能为空");
+      }
+      if (!apiConfig.apiUrl || !content.prompt || !apiConfig.model) {
+        throw new Error("API地址、模型名称和提示词不能为空");
+      }
     }
 
-    // 构建请求URL和配置
-    const url = buildApiUrl(
-      apiConfig.apiUrl,
-      API_ENDPOINTS[apiConfig.apiType].chat
-    );
-    const config = buildRequestConfig(apiConfig);
-    const requestData = buildRequestData(content, apiConfig);
+    let controller;
 
     // 显示进度条
     const processBar = showProcessBar
       ? await quickcommand.showProcessBar({
           text: "AI思考中...",
           onClose: () => {
-            if (controller) {
+            if (typeof controller !== "undefined") {
               controller.abort();
             }
           },
@@ -327,11 +346,65 @@ async function chat(content, apiConfig, options = {}) {
       onStream(chunk, isDone);
     };
 
-    // 统一使用 fetch 处理请求
-    const controller = new AbortController();
+    // 处理 uTools AI 请求
+    if (apiConfig.apiType === API_TYPES.UTOOLS) {
+      try {
+        const messages = buildRequestData(content, apiConfig).messages;
+        controller = utools.ai(
+          {
+            model: apiConfig.model,
+            messages: messages,
+          },
+          (chunk) => {
+            handleUToolsAIStreamResponse(chunk, streamHandler);
+          }
+        );
+        onFetch(controller);
+
+        await controller;
+
+        // 在流式响应完全结束后，发送一个空字符串表示结束
+        streamHandler("", true);
+
+        // 完成时更新进度条并关闭
+        if (processBar) {
+          quickcommand.updateProcessBar(
+            {
+              text: "AI响应完成",
+              complete: true,
+            },
+            processBar
+          );
+        }
+
+        return {
+          success: true,
+          result: fullResponse,
+        };
+      } catch (error) {
+        if (error.name === "AbortError") {
+          return {
+            success: false,
+            error: "请求已取消",
+            cancelled: true,
+          };
+        }
+        throw error;
+      }
+    }
+
+    // 统一使用 fetch 处理其他 API 请求
+    controller = new AbortController();
 
     onFetch(controller);
 
+    const url = buildApiUrl(
+      apiConfig.apiUrl,
+      API_ENDPOINTS[apiConfig.apiType].chat
+    );
+    const config = buildRequestConfig(apiConfig);
+    const requestData = (content, apiConfig);
+
     const response = await fetch(url, {
       method: "POST",
       headers: config.headers,

From d4e58e58be94d0f8f814fe6d1d87267548f84ce5 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 23 Apr 2025 23:13:45 +0800
Subject: [PATCH 324/332] =?UTF-8?q?=E8=A1=A5=E5=85=A8utools.ai=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/monaco/types/utools.api.d.ts | 128 +++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/src/plugins/monaco/types/utools.api.d.ts b/src/plugins/monaco/types/utools.api.d.ts
index 17789c04..3ed86c7a 100644
--- a/src/plugins/monaco/types/utools.api.d.ts
+++ b/src/plugins/monaco/types/utools.api.d.ts
@@ -667,6 +667,134 @@ interface UToolsApi {
   isLinux(): boolean;
 
   ubrowser: UBrowser;
+
+  /**
+   * 调用 AI 能力，支持 Function Calling
+   * @param option AI 选项
+   * @param streamCallback 流式调用函数 (可选)
+   * @returns 返回定制的 PromiseLike
+   */
+  ai(option: AiOption): PromiseLike<Message>;
+  ai(
+    option: AiOption,
+    streamCallback: (chunk: Message) => void
+  ): PromiseLike<void>;
+
+  /**
+   * 获取所有 AI 模型
+   * @returns 返回 AI 模型数组
+   */
+  allAiModels(): Promise<AiModel[]>;
+}
+
+/**
+ * AI 选项接口
+ */
+interface AiOption {
+  /**
+   * AI 模型, 为空默认使用 deepseek-v3
+   */
+  model?: string;
+  /**
+   * 消息列表
+   */
+  messages: Message[];
+  /**
+   * 工具列表
+   */
+  tools?: Tool[];
+}
+
+/**
+ * AI 消息接口
+ */
+interface Message {
+  /**
+   * 消息角色
+   * system：系统消息
+   * user：用户消息
+   * assistant：AI 消息
+   */
+  role: "system" | "user" | "assistant";
+  /**
+   * 消息内容
+   */
+  content?: string;
+  /**
+   * 消息推理内容，一般只有推理模型会返回
+   */
+  reasoning_content?: string;
+}
+
+/**
+ * AI 工具接口
+ */
+interface Tool {
+  /**
+   * 工具类型
+   * function：函数工具
+   */
+  type: "function";
+  /**
+   * 函数工具配置
+   */
+  function?: {
+    /**
+     * 函数名称
+     */
+    name: string;
+    /**
+     * 函数描述
+     */
+    description: string;
+    /**
+     * 函数参数
+     */
+    parameters: {
+      type: "object";
+      properties: Record<string, any>;
+    };
+    /**
+     * 必填参数
+     */
+    required?: string[];
+  };
+}
+
+/**
+ * AI 模型接口
+ */
+interface AiModel {
+  /**
+   * AI 模型 ID，用于 utools.ai 调用的 model 参数
+   */
+  id: string;
+  /**
+   * AI 模型名称
+   */
+  label: string;
+  /**
+   * AI 模型描述
+   */
+  description: string;
+  /**
+   * AI 模型图标
+   */
+  icon: string;
+  /**
+   * AI 模型调用消耗
+   */
+  cost: number;
+}
+
+/**
+ * Promise 扩展类型，包含 abort() 函数
+ */
+interface PromiseLike<T> extends Promise<T> {
+  /**
+   * 中止 AI 调用
+   */
+  abort(): void;
 }
 
 declare var utools: UToolsApi;

From 55516159ba19618e83f57fb9cd552faf007c7bdd Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 24 Apr 2025 00:15:49 +0800
Subject: [PATCH 325/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8ope?=
 =?UTF-8?q?nai=E6=8E=A5=E5=8F=A3=E6=97=B6reasoncontent=E6=9C=AA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E8=AF=86=E5=88=AB=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 34684dfb..8a8d167c 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -167,6 +167,24 @@ function parseModelsResponse(response, apiType) {
   }
 }
 
+let reasoning_content_start = false;
+function processContentWithReason(response, onStream) {
+  if (response.reasoning_content) {
+    if (!reasoning_content_start) {
+      reasoning_content_start = true;
+      onStream("<think>", false);
+    }
+    onStream(response.reasoning_content, false);
+  }
+  if (response.content) {
+    if (reasoning_content_start) {
+      reasoning_content_start = false;
+      onStream("</think>", false);
+    }
+    onStream(response.content, false);
+  }
+}
+
 // 处理 OpenAI 流式响应
 async function handleOpenAIStreamResponse(line, onStream) {
   if (line.startsWith("data:")) {
@@ -176,9 +194,9 @@ async function handleOpenAIStreamResponse(line, onStream) {
       return;
     }
     const json = JSON.parse(jsonStr);
-    const content = json.choices[0]?.delta?.content;
-    if (content) {
-      onStream(content, false);
+    const response = json.choices[0]?.delta;
+    if (response) {
+      processContentWithReason(response, onStream);
     }
   }
 }
@@ -190,28 +208,15 @@ async function handleOllamaStreamResponse(line, onStream) {
     onStream("", true);
     return;
   }
-  if (json.message?.content) {
-    onStream(json.message.content, false);
+  const response = json.message;
+  if (response) {
+    processContentWithReason(response, onStream);
   }
 }
 
-let reasoning_content_start = false;
 // 处理 uTools AI 流式响应
 async function handleUToolsAIStreamResponse(response, onStream) {
-  if (response.reasoning_content) {
-    if (!reasoning_content_start) {
-      reasoning_content_start = true;
-      onStream("<think>", false);
-    }
-    onStream(response.reasoning_content, false);
-  }
-  if (response.content) {
-    if (reasoning_content_start) {
-      reasoning_content_start = false;
-      onStream("</think>", false);
-    }
-    onStream(response.content, false);
-  }
+  processContentWithReason(response, onStream);
 }
 
 // 处理流式响应
@@ -403,7 +408,7 @@ async function chat(content, apiConfig, options = {}) {
       API_ENDPOINTS[apiConfig.apiType].chat
     );
     const config = buildRequestConfig(apiConfig);
-    const requestData = (content, apiConfig);
+    const requestData = buildRequestData(content, apiConfig);
 
     const response = await fetch(url, {
       method: "POST",

From 0d4f49fcf44509e484acaff83b569556dc5e1b7d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 24 Apr 2025 00:20:00 +0800
Subject: [PATCH 326/332] =?UTF-8?q?ai=E7=9A=84=E5=89=8D=E7=BD=AE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=8Drole=E5=9D=87=E8=B0=83=E6=95=B4=E4=B8=BAsyste?=
 =?UTF-8?q?m?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/ai.js                         |  2 +-
 src/components/ai/AIAssistantSideBar.vue | 46 +++++++-----------------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/plugin/lib/ai.js b/plugin/lib/ai.js
index 8a8d167c..10091d74 100644
--- a/plugin/lib/ai.js
+++ b/plugin/lib/ai.js
@@ -123,7 +123,7 @@ function buildRequestData(content, apiConfig) {
   const roleMessage = rolePrompt
     ? [
         {
-          role: "user",
+          role: "system",
           content: rolePrompt,
         },
       ]
diff --git a/src/components/ai/AIAssistantSideBar.vue b/src/components/ai/AIAssistantSideBar.vue
index db6c2512..10bf8e86 100644
--- a/src/components/ai/AIAssistantSideBar.vue
+++ b/src/components/ai/AIAssistantSideBar.vue
@@ -213,7 +213,7 @@ export default defineComponent({
         const response = await window.quickcommand.askAI(
           {
             prompt: promptText,
-            context: [...presetContext, ...this.chatHistory.slice(0, -2)],
+            context: [presetContext, ...this.chatHistory.slice(0, -2)],
           },
           this.selectedApi,
           {
@@ -291,7 +291,7 @@ export default defineComponent({
         shell: "liunx shell脚本",
       };
       const languageName = languageMap[language] || language;
-      const commonInstructions = `接下来我所有的对话中的需求都请通过编写${languageName}代码来实现，并请遵循以下原则：
+      const commonInstructions = `接下来所有的对话中的需求都请通过编写${languageName}代码来实现，并请遵循以下原则：
    - 编写简洁、可读性强的代码
    - 遵循${languageName}最佳实践和设计模式
    - 使用恰当的命名规范和代码组织
@@ -312,7 +312,7 @@ export default defineComponent({
       const specificInstructions = languageSpecific[language] || "";
 
       const lastInstructions =
-        "\n请直接给我MARKDOWN格式的代码（以```脚本语言开头，以```结尾），任何情况下都不需要做解释和说明";
+        "\n请直接提供MARKDOWN格式的代码（以```脚本语言开头，以```结尾），任何情况下都不需要做解释和说明";
 
       return commonInstructions + specificInstructions + lastInstructions;
     },
@@ -330,48 +330,26 @@ export default defineComponent({
       ];
     },
     getPresetContext() {
+      let finnalPrompt = ""
+
       const languagePrompt = this.getLanguagePrompt(this.language);
 
-      let presetContext = [
-        {
-          role: "user",
-          content: languagePrompt,
-        },
-        {
-          role: "assistant",
-          content: "好的，我会严格按照你的要求编写代码。",
-        },
-      ];
+      finnalPrompt += languagePrompt;
 
       if (this.submitDocs && this.language === "quickcommand") {
         const docs = this.getLanguageDocs(this.language);
 
-        presetContext.push(
-          {
-            role: "user",
-            content: `你现在使用的是一种特殊的环境，支持uTools和quickcommand两种特殊的接口，请优先使用uTools和quickcommand接口解决需求，然后再使用当前语言通用的解决方案`,
-          },
-          {
-            role: "assistant",
-            content: "好的，我会注意。",
-          }
-        );
+        finnalPrompt += `\n你现在使用的是一种特殊的环境，支持uTools和quickcommand两种特殊的接口，请优先使用uTools和quickcommand接口解决需求，然后再使用当前语言通用的解决方案`;
 
         docs.forEach((doc) => {
-          presetContext.push(
-            {
-              role: "user",
-              content: `这是${doc.name}的API文档：\n${doc.api}`,
-            },
-            {
-              role: "assistant",
-              content: "好的，我会认真学习并记住这些接口。",
-            }
-          );
+          finnalPrompt += `\n这是${doc.name}的API文档：\n${doc.api}`;
         });
       }
 
-      return presetContext;
+      return {
+        role: "system",
+        content: finnalPrompt,
+      };
     },
     openAIAssistantHelp() {
       window.showUb.help("#KUCwm");

From c32a5a48291354224b6bab7d5575045663c95d93 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 25 Apr 2025 11:55:56 +0800
Subject: [PATCH 327/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=E6=B5=81=E7=A8=8B=E8=A2=AB=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=B7=BB=E5=8A=A0=E5=BC=95=E5=8F=B7=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/commands/controlCommands.js | 14 +++++++-------
 src/js/composer/generateCode.js             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/js/composer/commands/controlCommands.js b/src/js/composer/commands/controlCommands.js
index 1cb4f83c..be93244b 100644
--- a/src/js/composer/commands/controlCommands.js
+++ b/src/js/composer/commands/controlCommands.js
@@ -46,7 +46,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -112,7 +112,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -169,7 +169,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -225,7 +225,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -266,7 +266,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -320,7 +320,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
@@ -360,7 +360,7 @@ export const controlCommands = {
         {
           label: "结束",
           value: "end",
-          codeTemplate: "}",
+          codeTemplate: "};",
         },
       ],
     },
diff --git a/src/js/composer/generateCode.js b/src/js/composer/generateCode.js
index 4eeefdfd..039e39c8 100644
--- a/src/js/composer/generateCode.js
+++ b/src/js/composer/generateCode.js
@@ -124,7 +124,7 @@ export function generateCode(flow) {
       if (cmd.asyncMode === "await") {
         cmdCode = `await ${cmdCode}`;
       }
-      code.push(indent + cmdCode + comma);
+      code.push(indent + cmdCode + (cmd.isControlFlow ? "" : comma));
     }
   });
 

From c2514e9f2dc555a19bade6ddbc45ae889398fdf6 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 25 Apr 2025 15:36:21 +0800
Subject: [PATCH 328/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92ubr?=
 =?UTF-8?q?owser=E8=AE=BE=E7=BD=AE=E5=80=BC=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/ubrowserConfig.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/composer/ubrowserConfig.js b/src/js/composer/ubrowserConfig.js
index 64bd48fd..34fd4706 100644
--- a/src/js/composer/ubrowserConfig.js
+++ b/src/js/composer/ubrowserConfig.js
@@ -491,13 +491,13 @@ export const ubrowserOperationConfigs = {
     ],
   },
   setValue: {
-    value: "setValue",
+    value: "value",
     label: "设置值",
     icon: "check_box",
     config: [
       {
         label: "元素选择器",
-        icon: "varInput",
+        icon: "find_in_page",
         component: "VariableInput",
         width: 6,
       },

From b400bbb48d8939fa4c9da54e3ef7221ea252b150 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 25 Apr 2025 21:50:01 +0800
Subject: [PATCH 329/332] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AI=E6=97=B6=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=B7=BB=E5=8A=A0=E5=9C=A8=E9=A6=96=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ai/AIConfig.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/ai/AIConfig.vue b/src/components/ai/AIConfig.vue
index bdc0f04e..a0203d07 100644
--- a/src/components/ai/AIConfig.vue
+++ b/src/components/ai/AIConfig.vue
@@ -257,12 +257,8 @@ export default defineComponent({
         defaultConfig.apiUrl = "";
       }
 
-      this.aiConfigs.push(defaultConfig);
+      this.aiConfigs.unshift(defaultConfig);
 
-      // 滚动到底部
-      this.$nextTick(() => {
-        this.$refs.scrollArea.setScrollPosition("vertical", 99999);
-      });
     },
     getConfigListHeight() {
       const counts = Math.min(this.aiConfigs.length, 3);

From 72abdf4524eb5b7f6fb9da2a8279dac6d7e20b19 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 30 Apr 2025 22:13:52 +0800
Subject: [PATCH 330/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E6=8E=92?=
 =?UTF-8?q?=E4=B8=ADubrowser.hide=E5=92=8Cshow=E6=9C=AA=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/composer/generateUBrowserCode.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/js/composer/generateUBrowserCode.js b/src/js/composer/generateUBrowserCode.js
index 2e7f5f6c..be1579d5 100644
--- a/src/js/composer/generateUBrowserCode.js
+++ b/src/js/composer/generateUBrowserCode.js
@@ -70,8 +70,6 @@ export function generateUBrowserCode(argvs) {
   // 添加其他操作
   if (argvs.operations?.length) {
     argvs.operations.forEach(({ value, args }) => {
-      if (!args?.length) return;
-
       const stringifiedArgs = args
         .map((arg) => stringifyArgv(arg))
         .filter(Boolean);

From 724bd9e4e7b0ba34b83c2e87f16c2f9f075bc363 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Thu, 8 May 2025 19:18:48 +0800
Subject: [PATCH 331/332] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=8F=91=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh | 4 ++++
 dev.sh   | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100755 build.sh
 create mode 100755 dev.sh

diff --git a/build.sh b/build.sh
new file mode 100755
index 00000000..f78339ce
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+git pull
+cd plugin && npm i && cd .. && npm i
+quasar build
diff --git a/dev.sh b/dev.sh
new file mode 100755
index 00000000..5c12fe53
--- /dev/null
+++ b/dev.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+git pull
+cd plugin && npm i && cd .. && npm i
+quasar dev

From 2625a255846cf1a25c4e1798ef04b5f9d6bc3379 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Wed, 11 Jun 2025 09:28:00 +0800
Subject: [PATCH 332/332] =?UTF-8?q?=E4=BF=AE=E5=A4=8DshowSystemList?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E5=9B=9E=E8=BD=A6=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=80=89=E6=8B=A9=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/lib/dialog/controller.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin/lib/dialog/controller.js b/plugin/lib/dialog/controller.js
index 337a27d4..0c2cba3d 100644
--- a/plugin/lib/dialog/controller.js
+++ b/plugin/lib/dialog/controller.js
@@ -520,6 +520,10 @@ document.addEventListener("DOMContentLoaded", () => {
       if (dialogType === "textarea" && !e.ctrlKey) {
         return;
       }
+      // select 类型有自己的键盘处理器，不需要全局处理器处理 Enter 键
+      if (dialogType === "select") {
+        return;
+      }
       document.getElementById("ok-btn").click();
     }
   });