study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-12-17 08:54:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化参数值为空和传递空参数的逻辑

Browse Source
This commit is contained in:
fofolee
2025-01-07 17:50:13 +08:00
parent 5c2d9a5d89
commit a13580d53f
7 changed files with 275 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

288
src/js/composer/commands/dataCommands.js
View File

@@ -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",

37
src/js/composer/commands/simulateCommands.js
View File

@@ -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",

29
src/js/composer/formatString.js
View File

@@ -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