优化：动作、搜索动作、匹配动作等文案优化

modstart · modstart · commit 75a5cd8c3aaf · 2025-01-09T16:56:45.000+08:00
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 - 功能设置：呼出快捷键设置、开机启动
 - 插件管理：支持插件安装、卸载、启用、禁用等操作
-- 指令管理：支持内置和插件指令快速一览和启用、禁用、打开等操作
+- 动作管理：支持内置和插件动作快速一览和启用、禁用、打开等操作
 - 文件快速启动：支持文件快速启动，快速抵达目标文件
 - 快捷键启动：支持全局快捷键启动，快速启动软件
 - 数据中心：支持文件导出同步、WebDav文件同步
diff --git a/electron/mapi/manager/system/plugin/system.ts b/electron/mapi/manager/system/plugin/system.ts
@@ -40,11 +40,11 @@ export const SystemPlugin: PluginRecord = {
         },
         {
             name: "page-action",
-            title: "指令管理",
+            title: "动作管理",
             type: ActionTypeEnum.WEB,
             icon: SystemIcons.command,
             matches: [
-                '指令管理', 'action'
+                '动作管理', 'action'
             ] as any
         },
         {
diff --git a/public/iconfont/iconfont.css b/public/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4733566 */
-  src: url('iconfont.woff2?t=1732685155412') format('woff2'),
-       url('iconfont.woff?t=1732685155412') format('woff'),
-       url('iconfont.ttf?t=1732685155412') format('truetype');
+  src: url('iconfont.woff2?t=1736411931319') format('woff2'),
+       url('iconfont.woff?t=1736411931319') format('woff'),
+       url('iconfont.ttf?t=1736411931319') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-backend:before {
+  content: "\e61c";
+}
+
+.icon-command:before {
+  content: "\e6aa";
+}
+
+.icon-view:before {
+  content: "\e6e1";
+}
+
+.icon-code:before {
+  content: "\e6b0";
+}
+
+.icon-info:before {
+  content: "\e72a";
+}
+
+.icon-success:before {
+  content: "\e72d";
+}
+
 .icon-text:before {
   content: "\e959";
 }
diff --git a/public/iconfont/iconfont.js b/public/iconfont/iconfont.js
diff --git a/public/iconfont/iconfont.json b/public/iconfont/iconfont.json
@@ -5,6 +5,48 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "38207392",
+      "name": "backend",
+      "font_class": "backend",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "35089476",
+      "name": "command",
+      "font_class": "command",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "321908",
+      "name": "view",
+      "font_class": "view",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    },
+    {
+      "icon_id": "5428337",
+      "name": "code",
+      "font_class": "code",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "19418435",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e72a",
+      "unicode_decimal": 59178
+    },
+    {
+      "icon_id": "7009016",
+      "name": "success",
+      "font_class": "success",
+      "unicode": "e72d",
+      "unicode_decimal": 59181
+    },
     {
       "icon_id": "924549",
       "name": "text",
diff --git a/public/iconfont/iconfont.ttf b/public/iconfont/iconfont.ttf
diff --git a/public/iconfont/iconfont.woff b/public/iconfont/iconfont.woff
diff --git a/public/iconfont/iconfont.woff2 b/public/iconfont/iconfont.woff2
diff --git a/src/pages/FastPanel/FastPanelSearch.vue b/src/pages/FastPanel/FastPanelSearch.vue
@@ -51,7 +51,7 @@ defineExpose({
                 </div>
             </div>
             <div v-else>
-                快捷指令
+                快捷动作
             </div>
         </div>
         <div class="right">
diff --git a/src/pages/PageSystem.vue b/src/pages/PageSystem.vue
@@ -50,7 +50,7 @@ window.focusany.onPluginReady(data => {
                      @click="tab='action'"
                      :class="tab==='action'?'bg-gray-200 dark:bg-gray-500':'hover:bg-gray-100 dark:hover:bg-gray-600'">
                     <img class="w-6 h-6 object-contain mr-2 ml-2 dark:invert" :src="SystemIcons.command"/>
-                    指令管理
+                    动作管理
                 </div>
                 <div class="flex items-center leading-10 py-1 px-1 rounded-lg cursor-pointer"
                      @click="tab='file'"
diff --git a/src/pages/System/SystemAction.vue b/src/pages/System/SystemAction.vue
@@ -11,6 +11,7 @@ import {
 import {Dialog} from "../../lib/dialog";
 import SystemActionMatchDetailDialog from "./components/SystemActionMatchDetailDialog.vue";
 import {SystemIcons} from "../../../electron/mapi/manager/system/asset/icon";
+import ActionTypeIcon from "./components/ActionTypeIcon.vue";
 
 const actionMatchDetailDialog = ref<InstanceType<typeof SystemActionMatchDetailDialog> | null>(null);
 const records = ref<PluginRecord[]>([])
@@ -100,15 +101,15 @@ const doPin = async (action: ActionRecord) => {
 
 <template>
     <div class="flex h-full">
-        <div class="w-52 flex-shrink-0 border-r border-default p-1 h-full overflow-y-auto">
+        <div class="w-56 flex-shrink-0 border-r border-default p-1 h-full overflow-y-auto">
             <div class="p-2 text-gray-400 font-bold">内置</div>
             <template v-for="(p,pIndex) in records">
                 <div
                     v-if="['system','store', 'workflow', 'app'].includes(p.name)"
                     class="flex items-center rounded-lg cursor-pointer select-none p-2 hover:bg-gray-100 dark:hover:bg-gray-600"
                     :class="pIndex===recordCurrentIndex?'bg-gray-200 dark:bg-gray-700':''"
                     @click="doActivePlugin(pIndex)">
-                    <div class="w-8 rounded-lg mr-2">
+                    <div class="w-7 rounded-lg mr-2">
                         <img :src="p.logo"
                              :class="p.type===PluginType.SYSTEM?'dark:invert':'plugin-logo-filter'"/>
                     </div>
@@ -140,13 +141,13 @@ const doPin = async (action: ActionRecord) => {
                         <a-radio value="keyword">
                             <div class="flex items-center">
                                 <img class="w-6 h-6 mr-1 object-contain dark:invert" :src="SystemIcons.searchKeyword"/>
-                                功能指令
+                                搜索动作
                             </div>
                         </a-radio>
                         <a-radio value="match">
                             <div class="flex items-center">
                                 <img class="w-6 h-6 mr-1 object-contain dark:invert" :src="SystemIcons.searchMatch"/>
-                                匹配指令
+                                匹配动作
                             </div>
                         </a-radio>
                     </a-radio-group>
@@ -161,6 +162,7 @@ const doPin = async (action: ActionRecord) => {
                                  :class="recordCurrent?.type===PluginType.SYSTEM?'dark:invert':'plugin-logo-filter'"
                                  :src="a.icon"/>
                             <div class="mr-2">{{ a.title }}</div>
+                            <ActionTypeIcon class="mr-2" :type="a.type"/>
                             <a-tooltip :content="a['_pin']?'固定到搜索框':'从搜索框取消固定'" position="left">
                                 <a href="javascript:;"
                                    class="inline-block w-6 h-6 mr-2 bg-gray-100 dark:bg-gray-600 text-center leading-6 rounded-full"
@@ -219,6 +221,7 @@ const doPin = async (action: ActionRecord) => {
                         <div class="mb-4 flex items-center">
                             <img class="w-6 h-6 object-contain mr-2" :src="a.icon"/>
                             <div class="mr-2">{{ a.title }}</div>
+                            <ActionTypeIcon class="mr-2" :type="a.type"/>
                         </div>
                         <div
                             v-for="m in a.matches.filter(m=>['image','file','regex','window','editor'].includes((m as ActionMatchBase).type))"
@@ -252,9 +255,9 @@ const doPin = async (action: ActionRecord) => {
                                               size="small">
                                         窗口
                                         <div class="inline-block max-w-32 overflow-hidden truncate">
-                                            {{(m as ActionMatchWindow).nameRegex}}
-                                            {{(m as ActionMatchWindow).titleRegex}}
-                                            {{(m as ActionMatchWindow).attrRegex}}
+                                            {{ (m as ActionMatchWindow).nameRegex }}
+                                            {{ (m as ActionMatchWindow).titleRegex }}
+                                            {{ (m as ActionMatchWindow).attrRegex }}
                                         </div>
                                     </a-button>
                                     <a-button v-else-if="(m as ActionMatchBase).type==='editor'"
@@ -264,10 +267,10 @@ const doPin = async (action: ActionRecord) => {
                                         打开文件
                                         <div class="inline-block max-w-32 overflow-hidden truncate">
                                         <span v-if="(m as ActionMatchEditor).faDataTypes">
-                                            {{(m as ActionMatchEditor).faDataTypes?.join(',')}}
+                                            {{ (m as ActionMatchEditor).faDataTypes?.join(',') }}
                                         </span>
                                             <span v-if="(m as ActionMatchEditor).extensions">
-                                            {{(m as ActionMatchEditor).extensions.join(',')}}
+                                            {{ (m as ActionMatchEditor).extensions.join(',') }}
                                         </span>
                                         </div>
                                     </a-button>
diff --git a/src/pages/System/SystemLaunch.vue b/src/pages/System/SystemLaunch.vue
@@ -34,7 +34,7 @@ const doDelete = async (index: number) => {
 const doTest = async (index: number) => {
     const record = records.value[index]
     if (!record.keyword) {
-        Dialog.tipError('请输入指令名称')
+        Dialog.tipError('请输入动作名称')
         return
     }
     focusany.redirect(record.keyword)
@@ -63,7 +63,7 @@ const doHotkeyChange = async (index: number, hotkey: any) => {
                         <HotkeyInput :value="r.hotkey" @change="doHotkeyChange(rIndex,$event)"/>
                     </div>
                     <div class="ml-3 flex-grow">
-                        <a-input v-model="r.keyword" @change="doSave()" placeholder="指令名称，如 截图"/>
+                        <a-input v-model="r.keyword" @change="doSave()" placeholder="动作名称，如 截图"/>
                     </div>
                     <div class="ml-2">
                         <a-button @click="doTest(rIndex)">
@@ -88,7 +88,7 @@ const doHotkeyChange = async (index: number, hotkey: any) => {
                     <template #icon>
                         <icon-plus/>
                     </template>
-                    增加一个启动指令
+                    增加一个启动动作
                 </a-button>
             </div>
         </div>
diff --git a/src/pages/System/SystemPlugin.vue b/src/pages/System/SystemPlugin.vue
@@ -5,7 +5,7 @@ import {
     ActionMatchKey,
     ActionMatchRegex,
     ActionMatchText, ActionMatchWindow,
-    ActionRecord,
+    ActionRecord, ActionTypeEnum,
     PluginActionRecord,
     PluginRecord,
     PluginType
@@ -14,6 +14,7 @@ import {SystemIcons} from "../../../electron/mapi/manager/system/asset/icon";
 import {Dialog} from "../../lib/dialog";
 import SystemActionMatchDetailDialog from "./components/SystemActionMatchDetailDialog.vue";
 import {mapError} from "../../lib/error";
+import ActionTypeIcon from "./components/ActionTypeIcon.vue";
 
 const actionMatchDetailDialog = ref<InstanceType<typeof SystemActionMatchDetailDialog> | null>(null);
 const records = ref<PluginRecord[]>([])
@@ -200,13 +201,13 @@ const doInstallStore = async () => {
 
 <template>
     <div class="flex h-full select-none">
-        <div class="w-52 flex-shrink-0 border-r border-default h-full flex flex-col relative">
+        <div class="w-56 flex-shrink-0 border-r border-default h-full flex flex-col relative">
             <div class="flex-grow overflow-y-auto p-1">
                 <div v-for="(r,rIndex) in recordsFilter"
                      class="flex items-center rounded-lg cursor-pointer select-none p-2 hover:bg-gray-100 dark:hover:bg-gray-600 relative"
                      @click="doActivePlugin(rIndex)"
                      :class="recordCurrent?.name===r.name?'bg-gray-200 dark:bg-gray-700':''">
-                    <div class="w-8 rounded-lg mr-2">
+                    <div class="w-7 rounded-lg mr-2">
                         <img :src="r.logo"
                              :class="r.type===PluginType.SYSTEM?'dark:invert':'plugin-logo-filter'"/>
                     </div>
@@ -290,13 +291,13 @@ const doInstallStore = async () => {
                     <a-radio value="keyword">
                         <div class="flex items-center">
                             <img class="w-6 h-6 mr-1 object-contain dark:invert" :src="SystemIcons.searchKeyword"/>
-                            功能指令
+                            搜索动作
                         </div>
                     </a-radio>
                     <a-radio value="match">
                         <div class="flex items-center">
                             <img class="w-6 h-6 mr-1 object-contain dark:invert" :src="SystemIcons.searchMatch"/>
-                            匹配指令
+                            匹配动作
                         </div>
                     </a-radio>
                 </a-radio-group>
@@ -310,8 +311,8 @@ const doInstallStore = async () => {
                         <img class="w-6 h-6 object-contain mr-2"
                              :class="recordCurrent?.type===PluginType.SYSTEM?'dark:invert':'plugin-logo-filter'"
                              :src="a.icon"/>
-                        <div class="mr-2" v-if="0">{{ a.type }}</div>
                         <div class="mr-2">{{ a.title }}</div>
+                        <ActionTypeIcon class="mr-2" :type="a.type"/>
                         <a-tooltip :content="a['_pin']?'固定到搜索框':'从搜索框取消固定'" position="left">
                             <a href="javascript:;"
                                class="inline-block w-6 h-6 mr-2 bg-gray-100 dark:bg-gray-600 text-center leading-6 rounded-full"
@@ -371,8 +372,8 @@ const doInstallStore = async () => {
                         <img class="w-6 h-6 object-contain mr-2"
                              :class="recordCurrent?.type===PluginType.SYSTEM?'dark:invert':'plugin-logo-filter'"
                              :src="a.icon"/>
-                        <div class="mr-2" v-if="0">{{ a.type }}</div>
                         <div class="mr-2">{{ a.title }}</div>
+                        <ActionTypeIcon class="mr-2" :type="a.type"/>
                     </div>
                     <div
                         v-for="m in a.matches.filter(m=>['regex','image','file','window','editor'].includes((m as ActionMatchBase).type))"
diff --git a/src/pages/System/components/ActionTypeIcon.vue b/src/pages/System/components/ActionTypeIcon.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import {computed} from "vue";
+
+const props = defineProps<{
+    type: ActionTypeEnum | undefined
+}>();
+import {ActionTypeEnum} from "../../../types/Manager";
+
+const typeTitle = computed(() => {
+    switch (props.type) {
+        case ActionTypeEnum.WEB:
+            return '网页'
+        case ActionTypeEnum.COMMAND:
+            return '命令'
+        case ActionTypeEnum.VIEW:
+            return '智能区域'
+        case ActionTypeEnum.CODE:
+            return '代码'
+        case ActionTypeEnum.BACKEND:
+            return '后端代码'
+        default:
+            return ''
+    }
+})
+</script>
+
+<template>
+    <div v-if="type!==ActionTypeEnum.WEB">
+        <a-tooltip :content="typeTitle">
+            <i class="iconfont" :class="`icon-${type}`"></i>
+        </a-tooltip>
+    </div>
+</template>
+
diff --git a/src/pages/System/components/SystemActionMatchDetailDialog.vue b/src/pages/System/components/SystemActionMatchDetailDialog.vue

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ export const SystemPlugin: PluginRecord = {`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`name: "page-action",`
`43`		`- title: "指令管理",`
	`43`	`+ title: "动作管理",`
`44`	`44`	`type: ActionTypeEnum.WEB,`
`45`	`45`	`icon: SystemIcons.command,`
`46`	`46`	`matches: [`
`47`		`- '指令管理', 'action'`
	`47`	`+ '动作管理', 'action'`
`48`	`48`	`] as any`
`49`	`49`	`},`
`50`	`50`	`{`