From 5ea6850bb9cc0047a6a29db45d5460b7e45eaa9d Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Mon, 6 Jan 2025 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8F=82=E6=95=B0=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/composer/MultiParams.vue                 | 9 ++++-----
 src/components/composer/data/AsymmetricCryptoEditor.vue | 2 +-
 src/components/composer/data/BufferEditor.vue           | 2 +-
 src/components/composer/data/SymmetricCryptoEditor.vue  | 2 +-
 src/components/composer/data/ZlibEditor.vue             | 2 +-
 src/components/composer/file/FileOperationEditor.vue    | 2 +-
 src/components/composer/network/AxiosConfigEditor.vue   | 6 +++---
 src/components/composer/network/DnsEditor.vue           | 2 +-
 src/components/composer/network/UrlEditor.vue           | 2 +-
 src/components/composer/system/OsEditor.vue             | 2 +-
 src/components/composer/system/PathEditor.vue           | 4 ++--
 src/components/composer/system/SystemCommandEditor.vue  | 2 +-
 src/js/composer/customComponentGuide.js                 | 2 +-
 src/js/composer/formatString.js                         | 4 ++--
 14 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/components/composer/MultiParams.vue b/src/components/composer/MultiParams.vue
index 435a482..7ede917 100644
--- a/src/components/composer/MultiParams.vue
+++ b/src/components/composer/MultiParams.vue
@@ -132,7 +132,7 @@ export default defineComponent({
       return `${funcName}(${newArgvs.join(",")})`;
     },
     parseCodeToArgvs(code) {
-      const argvs = window.lodashM.cloneDeep(this.defaultArgvs);
+      let argvs = window.lodashM.cloneDeep(this.defaultArgvs);
       if (!code) return argvs;
 
       const variableFormatPaths = [];
@@ -144,12 +144,11 @@ export default defineComponent({
         }
       });
       try {
-        const { args } = parseFunction(code, { variableFormatPaths });
-        return args;
+        argvs = parseFunction(code, { variableFormatPaths }).argvs;
       } catch (e) {
-        console.error("解析参数失败:", e);
-        return argvs;
+        console.log("解析参数失败:", e);
       }
+      return argvs;
     },
     getSummary(argvs) {
       // 虽然header里对溢出做了处理，但是这里截断主要是为了节省存储空间
diff --git a/src/components/composer/data/AsymmetricCryptoEditor.vue b/src/components/composer/data/AsymmetricCryptoEditor.vue
index 4c53161..363b3f7 100644
--- a/src/components/composer/data/AsymmetricCryptoEditor.vue
+++ b/src/components/composer/data/AsymmetricCryptoEditor.vue
@@ -267,7 +267,7 @@ export default defineComponent({
       try {
         const variableFormatPaths = ["arg0.text"];
         const params = parseFunction(code, { variableFormatPaths });
-        return params.args[0];
+        return params.argvs[0];
       } catch (e) {
         console.error("解析加密参数失败:", e);
       }
diff --git a/src/components/composer/data/BufferEditor.vue b/src/components/composer/data/BufferEditor.vue
index 59d8169..f073731 100644
--- a/src/components/composer/data/BufferEditor.vue
+++ b/src/components/composer/data/BufferEditor.vue
@@ -580,7 +580,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const operation = result.name.split(".").pop();
-        const args = result.args;
+        const args = result.argvs;
 
         const newArgvs = {
           ...this.defaultArgvs,
diff --git a/src/components/composer/data/SymmetricCryptoEditor.vue b/src/components/composer/data/SymmetricCryptoEditor.vue
index 09885a2..69c39bd 100644
--- a/src/components/composer/data/SymmetricCryptoEditor.vue
+++ b/src/components/composer/data/SymmetricCryptoEditor.vue
@@ -328,7 +328,7 @@ export default defineComponent({
       try {
         const variableFormatPaths = ["arg0.text"];
         const params = parseFunction(code, { variableFormatPaths });
-        return params.args[0];
+        return params.argvs[0];
       } catch (e) {
         console.error("解析加密参数失败:", e);
       }
diff --git a/src/components/composer/data/ZlibEditor.vue b/src/components/composer/data/ZlibEditor.vue
index 63f2b9f..803a7ca 100644
--- a/src/components/composer/data/ZlibEditor.vue
+++ b/src/components/composer/data/ZlibEditor.vue
@@ -262,7 +262,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const operation = result.name.split(".").pop();
-        const [data, method, options] = result.args;
+        const [data, method, options] = result.argvs;
 
         const newArgvs = {
           ...this.defaultArgvs,
diff --git a/src/components/composer/file/FileOperationEditor.vue b/src/components/composer/file/FileOperationEditor.vue
index cb4b919..31b8aaa 100644
--- a/src/components/composer/file/FileOperationEditor.vue
+++ b/src/components/composer/file/FileOperationEditor.vue
@@ -630,7 +630,7 @@ export default defineComponent({
           "arg0.newPath",
         ];
         const result = parseFunction(code, { variableFormatPaths });
-        let params = result.args[0];
+        let params = result.argvs[0];
 
         // 根据不同操作类型处理特定参数
         switch (params.operation) {
diff --git a/src/components/composer/network/AxiosConfigEditor.vue b/src/components/composer/network/AxiosConfigEditor.vue
index 8b3ee7c..75f3175 100644
--- a/src/components/composer/network/AxiosConfigEditor.vue
+++ b/src/components/composer/network/AxiosConfigEditor.vue
@@ -421,9 +421,9 @@ export default defineComponent({
           console.warn("axios 参数解析失败:", code);
           return argvs;
         }
-        const url = result.args[0] || "";
-        const data = hasData ? result.args[1] : {};
-        const config = result.args[hasData ? 2 : 1] || {};
+        const url = result.argvs[0] || "";
+        const data = hasData ? result.argvs[1] : {};
+        const config = result.argvs[hasData ? 2 : 1] || {};
         const {
           "Content-Type": contentType,
           "User-Agent": userAgent,
diff --git a/src/components/composer/network/DnsEditor.vue b/src/components/composer/network/DnsEditor.vue
index 0b8f669..e9914e7 100644
--- a/src/components/composer/network/DnsEditor.vue
+++ b/src/components/composer/network/DnsEditor.vue
@@ -181,7 +181,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const operation = result.name.split(".").pop();
-        const [firstArg, secondArg] = result.args;
+        const [firstArg, secondArg] = result.argvs;
 
         const newArgvs = {
           ...this.defaultArgvs,
diff --git a/src/components/composer/network/UrlEditor.vue b/src/components/composer/network/UrlEditor.vue
index 9fe270b..b844e93 100644
--- a/src/components/composer/network/UrlEditor.vue
+++ b/src/components/composer/network/UrlEditor.vue
@@ -359,7 +359,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const operation = result.name.split(".").pop();
-        const [firstArg, secondArg, thirdArg] = result.args;
+        const [firstArg, secondArg, thirdArg] = result.argvs;
 
         const newArgvs = {
           ...this.defaultArgvs,
diff --git a/src/components/composer/system/OsEditor.vue b/src/components/composer/system/OsEditor.vue
index 7a56c12..4044b5d 100644
--- a/src/components/composer/system/OsEditor.vue
+++ b/src/components/composer/system/OsEditor.vue
@@ -262,7 +262,7 @@ export default defineComponent({
 
         // 获取操作名称（方法名）
         const operation = result.name.split(".").pop();
-        const [params = {}] = result.args;
+        const [params = {}] = result.argvs;
 
         return {
           ...this.defaultArgvs,
diff --git a/src/components/composer/system/PathEditor.vue b/src/components/composer/system/PathEditor.vue
index 4cdea32..01abb13 100644
--- a/src/components/composer/system/PathEditor.vue
+++ b/src/components/composer/system/PathEditor.vue
@@ -337,7 +337,7 @@ export default defineComponent({
         if (!result) return this.defaultArgvs;
 
         const operation = result.name.split(".").pop();
-        const [firstArg, secondArg] = result.args;
+        const [firstArg, secondArg] = result.argvs;
 
         const newArgvs = {
           ...this.defaultArgvs,
@@ -362,7 +362,7 @@ export default defineComponent({
 
           case "join":
           case "resolve":
-            newArgvs.paths = result.args.map((arg) => arg);
+            newArgvs.paths = result.argvs.map((arg) => arg);
             break;
 
           case "relative":
diff --git a/src/components/composer/system/SystemCommandEditor.vue b/src/components/composer/system/SystemCommandEditor.vue
index a09252e..47b81d1 100644
--- a/src/components/composer/system/SystemCommandEditor.vue
+++ b/src/components/composer/system/SystemCommandEditor.vue
@@ -220,7 +220,7 @@ export default defineComponent({
       if (!result) return this.defaultArgvs;
 
       // 返回解析结果
-      const [command, options = {}] = result.args;
+      const [command, options = {}] = result.argvs;
       return {
         command: command || this.defaultArgvs.command,
         options: {
diff --git a/src/js/composer/customComponentGuide.js b/src/js/composer/customComponentGuide.js
index 20bdea4..b1a63c6 100644
--- a/src/js/composer/customComponentGuide.js
+++ b/src/js/composer/customComponentGuide.js
@@ -113,7 +113,7 @@ const customComponentGuide = {
                 if (!result) return this.defaultArgvs;
 
                 // 处理解析结果
-                const [url, config] = result.args;
+                const [url, config] = result.argvs;
 
                 // 返回处理后的参数对象
                 return {
diff --git a/src/js/composer/formatString.js b/src/js/composer/formatString.js
index 3668698..ba79214 100644
--- a/src/js/composer/formatString.js
+++ b/src/js/composer/formatString.js
@@ -303,13 +303,13 @@ export const parseFunction = (functionStr, options = {}) => {
       }
     };
 
-    const args = callExpression.arguments.map((arg, index) =>
+    const argvs = callExpression.arguments.map((arg, index) =>
       processNode(arg, `arg${index}`)
     );
 
     return {
       name,
-      args,
+      argvs,
     };
   } catch (e) {
     console.warn("Failed to parse function:", e);