From e1d94839e9df2b1513e907c88e18b039f7dc85b2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 28 Dec 2024 17:04:55 +0800
Subject: [PATCH] =?UTF-8?q?varinput=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/composer/VariableInput.vue         | 11 ++--
 .../editor/composer/ubrowser/UBrowserRun.vue  | 52 ++++++++++---------
 src/js/composer/composerConfig.js             | 29 +++++------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/components/editor/composer/VariableInput.vue b/src/components/editor/composer/VariableInput.vue
index 5064406..9be49bc 100644
--- a/src/components/editor/composer/VariableInput.vue
+++ b/src/components/editor/composer/VariableInput.vue
@@ -86,7 +86,7 @@
       </q-btn-dropdown>
     </template>
     <template v-slot:prepend>
-      <q-icon :name="command.icon || commandIcons[command.value] || 'code'" />
+      <q-icon :name="command.icon || 'code'" />
     </template>
   </q-input>
   <!-- 强制为数字类型时，不支持切换类型 -->
@@ -100,7 +100,7 @@
     class="number-input"
   >
     <template v-slot:prepend>
-      <q-icon :name="command.icon || commandIcons[command.value] || 'code'" />
+      <q-icon v-if="command.icon" :name="command.icon" />
     </template>
     <template v-slot:append>
       <!-- <q-icon name="pin" size="xs" /> -->
@@ -130,7 +130,6 @@
 
 <script>
 import { defineComponent, inject } from "vue";
-import { commandIcons } from "js/composer/composerConfig";
 
 export default defineComponent({
   name: "VariableInput",
@@ -148,7 +147,7 @@ export default defineComponent({
 
   setup() {
     const variables = inject("composerVariables", []);
-    return { variables, commandIcons };
+    return { variables };
   },
 
   data() {
@@ -238,14 +237,14 @@ export default defineComponent({
   },
 
   watch: {
-    // 解决通过外部传入值时，无法触发字符串处理的问题
+    // 解决通过外部传入值时，无法触���字符串处理的问题
     modelValue: {
       immediate: true,
       handler(newVal) {
         // 只在有值且非变量模式且非数字类型时处理
         if (newVal && !this.hasSelectedVariable && !this.isNumber) {
           const formattedValue = this.formatValue(newVal);
-          // 只在值真正需要更新时才���发更新
+          // 只在值真正需要更新时才发更新
           if (formattedValue !== newVal) {
             this.$emit("update:modelValue", formattedValue);
           }
diff --git a/src/components/editor/composer/ubrowser/UBrowserRun.vue b/src/components/editor/composer/ubrowser/UBrowserRun.vue
index c72770e..dec0b56 100644
--- a/src/components/editor/composer/ubrowser/UBrowserRun.vue
+++ b/src/components/editor/composer/ubrowser/UBrowserRun.vue
@@ -30,42 +30,42 @@
     <div class="col-12">
       <div class="row q-col-gutter-sm">
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.width"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.width"
             label="窗口宽度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('width', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.height"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.height"
             label="窗口高度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('height', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.x"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.x"
             label="X坐标"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('x', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.y"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.y"
             label="Y坐标"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('y', $event)"
           />
         </div>
@@ -76,42 +76,42 @@
     <div class="col-12">
       <div class="row q-col-gutter-sm">
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.minWidth"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.minWidth"
             label="最小宽度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('minWidth', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.minHeight"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.minHeight"
             label="最小高度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('minHeight', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.maxWidth"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.maxWidth"
             label="最大宽度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('maxWidth', $event)"
           />
         </div>
         <div class="col-3">
-          <q-input
-            v-model.number="localConfigs.run.maxHeight"
-            type="number"
+          <VariableInput
+            v-model="localConfigs.run.maxHeight"
             label="最大高度"
             dense
             outlined
+            :command="{ inputType: 'number' }"
             @update:model-value="updateConfig('maxHeight', $event)"
           />
         </div>
@@ -186,9 +186,13 @@
 
 <script>
 import { defineComponent } from "vue";
+import VariableInput from "../VariableInput.vue";
 
 export default defineComponent({
   name: "UBrowserRun",
+  components: {
+    VariableInput,
+  },
   props: {
     configs: {
       type: Object,
diff --git a/src/js/composer/composerConfig.js b/src/js/composer/composerConfig.js
index fced8ea..4f9bf9e 100644
--- a/src/js/composer/composerConfig.js
+++ b/src/js/composer/composerConfig.js
@@ -3,22 +3,6 @@ export {
   defaultUBrowserConfigs,
 } from "./ubrowserConfig";
 
-// 定义命令图标映射
-export const commandIcons = {
-  open: "folder_open",
-  locate: "location_on",
-  visit: "language",
-  "utools.ubrowser.goto": "public",
-  system: "terminal",
-  copyTo: "content_copy",
-  message: "message",
-  alert: "warning",
-  send: "send",
-  "utools.redirect": "alt_route",
-  "quickcommand.sleep": "schedule",
-  keyTap: "keyboard",
-};
-
 // 定义命令分类
 export const commandCategories = [
   {
@@ -29,11 +13,13 @@ export const commandCategories = [
         value: "open",
         label: "打开文件/文件夹/软件",
         desc: "文件、文件夹或软件的绝对路径",
+        icon: "folder_open",
       },
       {
         value: "locate",
         label: "在文件管理器中定位文件",
         desc: "要在文件管理器里显示的文件路径",
+        icon: "location_on",
       },
     ],
   },
@@ -45,12 +31,14 @@ export const commandCategories = [
         value: "visit",
         label: "用默认浏览器打开网址",
         desc: "要访问的网址链接",
+        icon: "language",
       },
       {
         value: "utools.ubrowser.goto",
         label: "用ubrowser打开网址",
         desc: "要访问的网址链接",
         isAsync: true,
+        icon: "public",
       },
       {
         value: "ubrowser",
@@ -58,6 +46,7 @@ export const commandCategories = [
         desc: "配置UBrowser浏览器操作",
         hasUBrowserEditor: true,
         isAsync: true,
+        icon: "public",
       },
     ],
   },
@@ -69,11 +58,13 @@ export const commandCategories = [
         value: "system",
         label: "执行系统命令",
         desc: "要执行的命令行",
+        icon: "terminal",
       },
       {
         value: "copyTo",
         label: "将内容写入剪贴板",
         desc: "要写入剪切板的内容",
+        icon: "content_copy",
       },
     ],
   },
@@ -85,16 +76,19 @@ export const commandCategories = [
         value: "message",
         label: "发送系统消息",
         desc: "要发送的系统消息文本",
+        icon: "message",
       },
       {
         value: "alert",
         label: "弹窗显示消息",
         desc: "要弹窗显示的消息文本",
+        icon: "warning",
       },
       {
         value: "send",
         label: "发送文本到活动窗口",
         desc: "要发送到窗口的文本内容",
+        icon: "send",
       },
     ],
   },
@@ -106,12 +100,14 @@ export const commandCategories = [
         value: "utools.redirect",
         label: "转至指定插件",
         desc: "要跳转至的插件名称",
+        icon: "alt_route",
       },
       {
         value: "quickcommand.sleep",
         label: "添加延时",
         desc: "延迟的毫秒数",
         inputType: "number",
+        icon: "schedule",
       },
     ],
   },
@@ -124,6 +120,7 @@ export const commandCategories = [
         label: "模拟按键",
         desc: "模拟键盘按键",
         hasKeyRecorder: true,
+        icon: "keyboard",
       },
     ],
   },