utools 关键字配置

baiy · baiy · commit 02646f18d2ba · 2023-01-08T15:30:42.000+08:00
diff --git a/packages/ctool-adapter/utools/src/index.ts b/packages/ctool-adapter/utools/src/index.ts
@@ -1,6 +1,21 @@
-import {PlatformRuntime, StorageInterface, Storage, toolExists, getTool} from "ctool-config";
+import {PlatformRuntime, StorageInterface, Storage, toolExists, getTool, FeatureInterface, tools} from "ctool-config";
 import storageUtools from "./storage"
 
+type FeatureItem = { feature: FeatureInterface, cmds: string[] }
+
+const $t = (key: string): string => {
+    // @ts-ignore
+    return window['$t'](key)
+}
+
+const setFeatures = (items: any) => {
+    try {
+        window.utools.setFeature(items)
+    } catch (e) {
+
+    }
+}
+
 export const runtime = new (class implements PlatformRuntime {
     name = "utools"
 
@@ -23,11 +38,18 @@ export const runtime = new (class implements PlatformRuntime {
     entry(storage: Storage) {
         return new Promise<void>((resolve) => {
             window.utools.onPluginEnter(({code, type, payload}) => {
+                try {
+                    if (window.utools.getFeatures().length === 0) {
+                        // utools 动态关键字初始化设置
+                        this.resetFeatures()
+                    }
+                } catch (e) {
+                }
                 window.utools.showMainWindow()
                 if (!code.includes("ctool-")) {
                     return resolve()
                 }
-                const [_, _tool, _feature] = code.split('-')
+                const [, _tool, _feature] = code.split('-')
                 if (!toolExists(_tool)) {
                     return resolve()
                 }
@@ -52,4 +74,83 @@ export const runtime = new (class implements PlatformRuntime {
             })
         })
     }
+
+    getFeatures() {
+        const result = new Map<FeatureInterface, string[]>()
+        tools.forEach(tool => {
+            tool.features.forEach(feature => result.set(feature, []))
+        })
+        window.utools.getFeatures()
+            .filter(item => item.code.includes('ctool-') && item.code.includes('-customize'))
+            .forEach(item => {
+                const [, _tool, _feature] = item.code.split('-')
+                if (!toolExists(_tool)) {
+                    return null
+                }
+
+                const tool = getTool(_tool)
+                if (!tool.existFeature(_feature)) {
+                    return null
+                }
+                const feature = tool.getFeature(_feature)
+                result.set(feature, item.cmds as any)
+            })
+
+        return result
+    }
+
+    resetFeatures() {
+        let features: FeatureItem[] = []
+        tools.forEach(tool => {
+            tool.features.forEach(feature => {
+                features.push({
+                    feature: feature,
+                    cmds: [
+                        ...(
+                            new Set([
+                                    tool.name,
+                                    feature.name,
+                                    tool.isSimple() ? `ctool-${tool.name}` : `ctool-${tool.name}-${feature.name}`,
+                                    $t(`tool_${tool.name}`),
+                                    $t(`tool_${tool.name}_${feature.name}`),
+                                    ...$t(`tool_${tool.name}_${feature.name}_keywords`).split(","),
+                                    `${tool.isSimple() ? "" : $t(`tool_${tool.name}`) + " - "}${$t(`tool_${tool.name}_${feature.name}`)}`,
+                                ].map(item => item.trim().toLowerCase()).filter(item => item !== "")
+                            )
+                        )
+                    ]
+                })
+            })
+        });
+        this.setFeatures(features)
+    }
+
+    setFeatures(features: FeatureItem[]) {
+        // 默认添加
+        setFeatures({
+            "code": "Ctool",
+            "explain": "ctool - 程序开发常用工具",
+            "cmds": [
+                "Ctool"
+            ]
+        })
+
+        // 移除已有项目
+        window.utools.getFeatures().forEach(item => {
+            if (item.code.includes('ctool-') && item.code.includes('-customize')) {
+                window.utools.removeFeature(item.code)
+            }
+        })
+
+        // 添加项目
+        features.forEach(({feature, cmds}) => {
+            if (cmds.length > 0) {
+                setFeatures({
+                    "code": `ctool-${feature.getKey()}-customize`,
+                    "explain": `${feature.tool.isSimple() ? "" : $t(`tool_${feature.tool.name}`) + " - "}${$t(`tool_${feature.tool.name}_${feature.name}`)}`,
+                    "cmds": cmds
+                });
+            }
+        })
+    }
 })
diff --git a/packages/ctool-adapter/utools/src/release.ts b/packages/ctool-adapter/utools/src/release.ts
@@ -1,5 +1,5 @@
 import {copyCoreDist, release, replaceFileContent, version, getAdditionData} from "ctool-adapter-base";
-import {tools, ToolInterface, FeatureInterface,AllLocaleStructure} from "ctool-config";
+import {tools, ToolInterface, FeatureInterface, AllLocaleStructure} from "ctool-config";
 import {CustomCmd, customCmds} from "./config";
 import {join} from "path";
 import {cpSync, mkdirSync, rmSync} from "fs";
@@ -21,9 +21,6 @@ const getToolTitle = (tool: ToolInterface) => {
 const getToolFeatureTitle = (feature: FeatureInterface) => {
     return i18n.detail.zh_CN[`tool_${feature.tool.name}_${feature.name}`]?.message || ""
 }
-const getToolFeatureKeywords = (feature: FeatureInterface) => {
-    return i18n.detail.zh_CN[`tool_${feature.tool.name}_${feature.name}_keywords`]?.message || ""
-}
 
 type UtoolsFeature = {
     code: string,
@@ -40,28 +37,16 @@ tools.forEach(tool => {
     tool.features.forEach(feature => {
         const code: UtoolsFeature['code'] = `ctool-${tool.name}-${feature.name}`
         const explain: UtoolsFeature['explain'] = `${tool.isSimple() ? "" : getToolTitle(tool) + " - "}${getToolFeatureTitle(feature)}`
-        const cmds: UtoolsFeature['cmds'] = [
-            ...(
-                new Set([
-                        tool.name,
-                        feature.name,
-                        tool.isSimple() ? `ctool-${tool.name}` : `ctool-${tool.name}-${feature.name}`,
-                        getToolTitle(tool),
-                        getToolFeatureTitle(feature),
-                        explain,
-                        ...getToolFeatureKeywords(feature).split(",")
-                    ].map(item => item.trim().toLowerCase()).filter(item => item !== "")
-                )
-            )
-        ]
-
+        const cmds: UtoolsFeature['cmds'] = []
         if (customCmds.has(feature)) {
             cmds.push(...(customCmds.get(feature) as CustomCmd[]).map((item => {
                 item.label = explain
                 return item
             })))
         }
-        utoolsFeature.push({code, explain, cmds})
+        if (cmds.length > 0) {
+            utoolsFeature.push({code, explain, cmds})
+        }
     })
 });
 
diff --git a/packages/ctool-config/src/config.ts b/packages/ctool-config/src/config.ts
@@ -260,6 +260,8 @@ export interface FeatureInterface<T extends ToolType = ToolType> {
     tool: ToolInterface<T>
 
     getRouter(): string
+    
+    getKey(): string
 
     getComponentPath(): string
 
diff --git a/packages/ctool-config/src/feature.ts b/packages/ctool-config/src/feature.ts
@@ -36,4 +36,8 @@ export default class Feature<T extends ToolType = ToolType> implements FeatureIn
             ...other
         }
     }
+
+    getKey() {
+        return `${this.tool.name}-${this.name}`
+    }
 }
diff --git a/packages/ctool-core/src/block/Setting.vue b/packages/ctool-core/src/block/Setting.vue
@@ -55,8 +55,17 @@
                     @change="(value)=>storeSetting.save('auto_read_copy_filter',value)"
                 />
             </div>
+            <template v-if="platform.isUtools()">
+                <span>uTools</span>
+                <div>
+                    <Button :size="'small'" @click="openUtoolsKeyword = true" :text="`${$t(`main_ui_keyword`)}${$t(`main_ui_config`)}`" />
+                </div>
+            </template>
         </div>
     </Card>
+    <ExtendPage v-model="openUtoolsKeyword" disable-replace>
+        <UtoolsKeyword v-if="platform.isUtools()"/>
+    </ExtendPage>
 </template>
 
 <script setup lang="ts">
@@ -65,8 +74,10 @@ import {useClipboardPermission} from "@/helper/clipboard"
 import {locales, themes} from "@/types"
 import platform from "@/helper/platform"
 import {getLocaleName} from "@/i18n"
+import UtoolsKeyword from "./utools/Keyword.vue"
 
 const storeSetting = useSetting()
+let openUtoolsKeyword = $ref(false)
 
 const localeOptions = locales.map((item) => {
     return {value: item, label: getLocaleName(item) || ""}
diff --git a/packages/ctool-core/src/block/utools/Keyword.vue b/packages/ctool-core/src/block/utools/Keyword.vue
@@ -0,0 +1,77 @@
+<template>
+    <Card :title="`uTools - ${$t(`main_ui_keyword`)}${$t(`main_ui_config`)}`" height="100%">
+        <div v-row="`1-1-1-1`">
+            <Textarea
+                :height="180"
+                v-for="key in itemsKey"
+                :key="key"
+                v-model="items[key].cmds"
+                :float-text="items[key].title"
+                float-position="bottom-right"
+            />
+        </div>
+        <template #extra>
+            <Align>
+                <Button :size="'small'" @click="save" :text="$t('main_ui_save')" type="primary"/>
+                <Button :size="'small'" @click="reset" :text="$t('main_ui_reset')"/>
+                <Button :size="'small'" @click="clear" :text="$t('main_ui_clear')" type="danger"/>
+            </Align>
+        </template>
+    </Card>
+</template>
+
+<script setup lang="ts">
+import {runtime} from 'ctool-adapter-utools'
+import {FeatureInterface} from '@/config'
+import Message from "@/helper/message";
+
+type Item = {
+    feature: FeatureInterface,
+    title: string
+    cmds: string
+}
+
+const getFeatures = () => {
+    let lists: Record<string, Item> = {}
+    runtime.getFeatures().forEach((value, feature) => {
+        lists[`${feature.getKey()}`] = {
+            feature,
+            title: feature.tool.isSimple() ? $t(`tool_${feature.tool.name}`) : `${$t(`tool_${feature.tool.name}`)} - ${$t(`tool_${feature.tool.name}_${feature.name}`)}`,
+            cmds: value.join("\n")
+        }
+    })
+    return lists
+}
+
+let items = $ref(getFeatures())
+
+const itemsKey = Object.keys(items)
+
+const save = () => {
+    const features: { feature: FeatureInterface, cmds: string[] }[] = []
+    itemsKey.forEach(key => {
+        let cmds = [...(new Set(items[key].cmds.split("\n").map(item => item.trim()).filter(item => item !== "")))]
+        if (cmds.length > 0) {
+            features.push({
+                feature: items[key].feature,
+                cmds
+            })
+        }
+    })
+    runtime.setFeatures(features)
+    items = getFeatures()
+    Message.success($t('main_ui_success'))
+}
+const reset = () => {
+    runtime.resetFeatures()
+    items = getFeatures()
+    Message.success($t('main_ui_success'))
+}
+
+const clear = () => {
+    runtime.setFeatures([])
+    items = getFeatures()
+    Message.success($t('main_ui_success'))
+}
+</script>
+
diff --git a/packages/ctool-core/src/i18n/locales/en/main.i18n.json5 b/packages/ctool-core/src/i18n/locales/en/main.i18n.json5
@@ -15,6 +15,8 @@
     "ui_setting": "Settings",
     "ui_config": "Config",
     "ui_reset": "Reset",
+    "ui_save": "Save",
+    "ui_submit": "Submit",
     "ui_views": "View",
     "ui_clear": "Clear",
     "ui_more": "More",
@@ -40,6 +42,7 @@
     "ui_advanced": "Advanced",
     "ui_simple": "Simple",
     "ui_reference": "Reference",
+    "ui_keyword": "Keyword",
     // views
     "setting_language": "Language",
     "tools_lists": "Tool Lists",
diff --git a/packages/ctool-core/src/i18n/locales/zh_CN/main.i18n.json5 b/packages/ctool-core/src/i18n/locales/zh_CN/main.i18n.json5
@@ -15,6 +15,8 @@
     "ui_setting": "设置",
     "ui_config": "配置",
     "ui_reset": "重置",
+    "ui_save": "保存",
+    "ui_submit": "提交",
     "ui_views": "查看",
     "ui_clear": "清空",
     "ui_more": "更多",
@@ -40,6 +42,7 @@
     "ui_advanced": "高级",
     "ui_simple": "简单",
     "ui_reference": "参考",
+    "ui_keyword": "关键字",
     // 界面
     "setting_language": "语言",
     "tools_lists": "工具列表",

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ export default class Feature<T extends ToolType = ToolType> implements FeatureIn`
`36`	`36`	`...other`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ getKey() {`
	`41`	+ return `${this.tool.name}-${this.name}`
	`42`	`+ }`
`39`	`43`	`}`