diff --git a/README.md b/README.md index d02c3f9..dc79b7a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 快捷命令 V2.0.0 +# 快捷命令 V2.0.1 [![GitHub stars](https://img.shields.io/github/stars/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/stargazers) [![GitHub forks](https://img.shields.io/github/forks/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/network/members) [![GitHub license](https://img.shields.io/github/license/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/blob/master/LICENSE) [![version]( https://img.shields.io/badge/dynamic/json?color=f58142&label=version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Ffofolee%2FuTools-QuickerCommand%2Fmaster%2Fsrc%2Fplugin.json&style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/blob/master/src/helps/CHANGELOG.md) [![猿料](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=%2350e3c2&label=%E8%AF%84%E8%AE%BA&query=%24.data.attributes.commentsCount&url=https%3A%2F%2Fyuanliao.info%2Fapi%2Fdiscussions%2F424&style=flat-square)](https://yuanliao.info/d/424) [![下载](https://img.shields.io/badge/dynamic/json?label=%E4%B8%8B%E8%BD%BD&query=quickcommand&url=http%3A%2F%2F45.77.122.164%3A8888%2FdownloadsStatistics.php&style=flat-square)](https://yuanliao.info/d/424) diff --git a/src/README.md b/src/README.md index d02c3f9..dc79b7a 100644 --- a/src/README.md +++ b/src/README.md @@ -1,6 +1,6 @@ -# 快捷命令 V2.0.0 +# 快捷命令 V2.0.1 [![GitHub stars](https://img.shields.io/github/stars/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/stargazers) [![GitHub forks](https://img.shields.io/github/forks/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/network/members) [![GitHub license](https://img.shields.io/github/license/fofolee/uTools-QuickerCommand?style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/blob/master/LICENSE) [![version]( https://img.shields.io/badge/dynamic/json?color=f58142&label=version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Ffofolee%2FuTools-QuickerCommand%2Fmaster%2Fsrc%2Fplugin.json&style=flat-square)](https://github.com/fofolee/uTools-QuickerCommand/blob/master/src/helps/CHANGELOG.md) [![猿料](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=%2350e3c2&label=%E8%AF%84%E8%AE%BA&query=%24.data.attributes.commentsCount&url=https%3A%2F%2Fyuanliao.info%2Fapi%2Fdiscussions%2F424&style=flat-square)](https://yuanliao.info/d/424) [![下载](https://img.shields.io/badge/dynamic/json?label=%E4%B8%8B%E8%BD%BD&query=quickcommand&url=http%3A%2F%2F45.77.122.164%3A8888%2FdownloadsStatistics.php&style=flat-square)](https://yuanliao.info/d/424) diff --git a/src/assets/index.js b/src/assets/index.js index 0f49f46..1de4dc0 100644 --- a/src/assets/index.js +++ b/src/assets/index.js @@ -257,13 +257,22 @@ if (fts.program == 'simulation') fts.program = 'quickcommand'; // 旧版的 sleep if (fts.cmd.includes('await sleep')) fts.cmd = fts.cmd.replace(/await sleep/g, 'quickcommand.sleep') + // 旧版的 match.app + let type = fts.features.cmds[0].type || 'key' + if (type == 'window') { + let windowMatch = fts.features.cmds[0].match + console.log(windowMatch) + if (windowMatch && (typeof windowMatch.app == 'string')) { + console.log(fts); + fts.features.cmds[0].match.app = windowMatch.app.split(',') + } + } // 不规范的 code let code = fts.features.code if (!/^(window|key|regex|files|default)_/.test(code)) { console.log(code); utoolsFull.removeFeature(code) let uid = Number(Math.random().toString().substr(3, 3) + (Date.now() + i * 10000)).toString(36) - let type = fts.features.cmds[0].type || 'key' code = type + '_' + uid fts.features.code = code } @@ -457,6 +466,83 @@ } } + let showCommandByType = features => { + let qcType = '', rules = features.cmds[0].match + if (features.cmds[0].type == 'regex') { + if (rules.length > 14) rules = rules.slice(0, 14) + '...'; + qcType = `
正则
${rules}
`; + } else if (features.cmds[0].type == 'window') { + qcType += `
窗口
` + if (!rules) { + qcType += `所有窗口` + } else if (rules.title || rules.class) { + qcType += `${JSON.stringify(rules).slice(0, 14) + '...'}`; + } else if (rules.app) { + rules = rules.app.join(",") + if (rules.length > 14) rules = rules.slice(0, 14) + '...'; + rules.split(',').forEach(r => { + qcType += `${r}`; + }); + } + qcType += `
` + } else if (features.cmds[0].type == 'files') { + if (rules.length > 14) rules = rules.slice(0, 14) + '...'; + qcType = `
文件
${rules}
`; + } else { + rules = features.cmds.join(",") + if (rules.length > 14) rules = rules.slice(0, 14) + '...'; + qcType += `
关键字
` + rules.split(',').forEach(r => { + qcType += `${r}`; + }); + qcType += `
` + } + return qcType + } + + let getEveryFeature = (fts, currentFts, tag) => { + if (tag == "未分类") { + if (fts.tags && fts.tags.length) return '' + } else { + if (!fts.tags) return '' + if (!fts.tags.includes(tag)) return '' + } + var features = fts.features; + var qcType = showCommandByType(features); + var isChecked = ''; + for(var c of currentFts){ + if (c.code == features.code) { + isChecked = 'checked'; + break; + } + } + var platformIcons + if (features.platform) platformIcons = features.platform.map(x => ``) + else platformIcons = ['', '', ''] + return ` + + +
${features.explain}
+
+ + ● + ${fts.program} | ${platformIcons.join('')} +
+ + ${qcType} + + + + + + ${(tag == "默认" && !isDev()) ? "" : ` `} + ` + } + // 显示设置界面 let showOptions = (tag = "默认") => { $("#options").empty().fadeIn(); @@ -466,79 +552,14 @@ var featureList = `
`; - Object.values(customFts).some(fts => { - var features = fts.features; - if (fts.tags) { - fts.tags.map(t => !allTags.includes(t) && allTags.push(t)) + Object.values(customFts).forEach(fts => { + // 跳过有问题的命令 + try { + if (fts.tags) fts.tags.map(t => !allTags.includes(t) && allTags.push(t)) + featureList += getEveryFeature(fts, currentFts, tag) + } catch (e) { + console.log(e) } - if (tag == "未分类") { - if (fts.tags && fts.tags.length) return false - } else { - if (!fts.tags) return false - if (!fts.tags.includes(tag)) return false - } - var cmds = '', rules = features.cmds[0].match; - if (features.cmds[0].type == 'regex') { - if (rules.length > 14) rules = rules.slice(0, 14) + '...'; - cmds = `
正则
${rules}
`; - } else if (features.cmds[0].type == 'window') { - cmds += `
窗口
` - if (!rules) { - cmds += `所有窗口` - } else if (rules.title || rules.class) { - cmds += `${JSON.stringify(rules).slice(0, 14) + '...'}`; - } else if (rules.app) { - rules = rules.app.join(",") - if(rules.length > 14) rules = rules.slice(0, 14) + '...'; - rules.split(',').forEach(r => { - cmds += `${r}`; - }); - } - cmds += `
` - } else if (features.cmds[0].type == 'files') { - if (rules.length > 14) rules = rules.slice(0, 14) + '...'; - cmds = `
文件
${rules}
`; - } else { - rules = features.cmds.join(",") - if(rules.length > 14) rules = rules.slice(0, 14) + '...'; - cmds += `
关键字
` - rules.split(',').forEach(r => { - cmds += `${r}`; - }); - cmds += `
` - } - var isChecked = ''; - for(var c of currentFts){ - if (c.code == features.code) { - isChecked = 'checked'; - break; - } - } - var platformIcons - if (features.platform) platformIcons = features.platform.map(x => ``) - else platformIcons = ['', '', ''] - featureList += ` - - - - - ` }) featureList += `
-
${features.explain}
-
- - ● - ${fts.program} | ${platformIcons.join('')} -
- 		${cmds} - - - - ${(tag == "默认" && !isDev()) ? "" : ` `} -
` var sidebar = ` @@ -1418,7 +1439,7 @@ let redirectTag let currentTag = $('.currentTag').text() // let AllTags = Array.from($('.sidebar li')).map(x => x.innerText) - if (tags.length) { + if (tags && tags.length) { if (tags.includes(currentTag)) { redirectTag = currentTag } else { diff --git a/src/helps/CHANGELOG.html b/src/helps/CHANGELOG.html index 7cc0bcc..d913ff6 100644 --- a/src/helps/CHANGELOG.html +++ b/src/helps/CHANGELOG.html @@ -242,6 +242,6 @@ header, .context-menu, .megamenu-content, footer { font-family: var(--font-sans- -

v2.0.0

本次带来了 海量更新，请仔细看完更新日志~

更新后第一次进入插件会显示空白一段时间，是在对老版本的命令做兼容处理，属于正常现象

新增功能

分享中心

可以在线下载分享的命令

UfDkdS.png

暗黑模式

全面兼容暗黑模式

内置命令

内置文本处理，find GUI，执行 shell 命令等多个实用快捷命令，均使用新版本新增功能实现

UfrkOx.png

ap24Hg.gif

RunCode

新增一个脚本编辑器，可以直接进行脚本的编辑及测试

支持通过关键词或文件匹配方式进入

UfsGvR.png

帮助

新增一篇帮助文档

多开

分离插件后可以多开

新增特性

匹配

环境

quickcommand

UfrpY4.png

其他脚本
custom

标签

变量

输出

平台

运行

编辑器

导入导出

其他

v1.6.1

v1.6.0

v1.5.9

v1.5.8

v1.5.7

JU0UAS.png

v1.5.1

v1.5.0

JU08Xt.png

功能更新

BUG 修复

用户体验

催更

v1.1.0

v1.0.0

v0.0.2

+

v2.0.1

v2.0.0

本次带来了 海量更新，请仔细看完更新日志~

更新后第一次进入插件会显示空白一段时间，是在对老版本的命令做兼容处理，属于正常现象

新增功能

分享中心

可以在线下载分享的命令

UfDkdS.png

暗黑模式

全面兼容暗黑模式

内置命令

内置文本处理，find GUI，执行 shell 命令等多个实用快捷命令，均使用新版本新增功能实现

UfrkOx.png

ap24Hg.gif

RunCode

新增一个脚本编辑器，可以直接进行脚本的编辑及测试

支持通过关键词或文件匹配方式进入

UfsGvR.png

帮助

新增一篇帮助文档

多开

分离插件后可以多开

新增特性

匹配

环境

quickcommand

UfrpY4.png

其他脚本
custom

标签

变量

输出

平台

运行

编辑器

导入导出

其他

v1.6.1

v1.6.0

v1.5.9

v1.5.8

v1.5.7

JU0UAS.png

v1.5.1

v1.5.0

JU08Xt.png

功能更新

BUG 修复

用户体验

催更

v1.1.0

v1.0.0

v0.0.2

\ No newline at end of file diff --git a/src/helps/CHANGELOG.md b/src/helps/CHANGELOG.md index 99301b5..f31dac2 100644 --- a/src/helps/CHANGELOG.md +++ b/src/helps/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.0.1 + + - 修复当某个命令在新版本不兼容时，导致所有命令无法显示的 bug + ## v2.0.0 本次带来了 海量更新，请仔细看完更新日志~ diff --git a/src/plugin.json b/src/plugin.json index 584e756..ed2b0b9 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -4,7 +4,7 @@ "main": "index.html", "homepage": "https://github.com/fofolee/uTools-QuickerCommand", "publishPage": "https://yuanliao.info/d/424", - "version": "2.0.0", + "version": "2.0.1", "author": "云之轩", "unpack":"autopep8.py", "logo": "logo.png",