添加合成脚本

BoxJsSub/JoJo_BoxJs.json

@@ -68,6 +68,7 @@
           "name": "token",
           "val": "",
           "type": "text",
+          "placeholder": "(点击以展开说明)",
           "desc": "授权token"
         },
         {
@@ -75,6 +76,7 @@
           "name": "产品列表",
           "val": "[]",
           "type": "textarea",
+          "placeholder": "(点击以展开说明)",
           "desc": "产品列表"
         }
       ]
@@ -165,10 +167,184 @@
           "id": "lkGandartCollectionCateLst",
           "name": "产品列表",
           "val": "[]",
+          "autoGrow": true,
           "type": "textarea",
           "desc": "产品列表"
         }
       ]
+    },
+    {
+      "id": "lkGandartCompositer",
+      "name": "光予合成",
+      "author": "@jojo",
+      "repo": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartComposite.js",
+      "script": "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Scripts/gandart/gandartComposite.js",
+      "icons": [
+        "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Images/gandart.png",
+        "https://git.jojo21.cf/shawenguan/Quantumult-X/raw/master/Images/gandart.png"
+      ],
+      "keys": [
+        "lkGandartToken",
+        "lkGandartCompositeTaskId",
+        "lkGandartCompositeTaskName"
+      ],
+      "settings": [
+        {
+          "id": "lkIsEnableLogGandartOrdererCheckIn",
+          "name": "开启/关闭日志",
+          "val": true,
+          "type": "boolean",
+          "desc": "默认开启"
+        },
+        {
+          "id": "lkNotifyOnlyFailGandartOrdererCheckIn",
+          "name": "只当执行失败才通知",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkIsEnableTgNotifyGandartOrdererCheckIn",
+          "name": "开启/关闭通知",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkTgNotifyUrlGandartOrdererCheckIn",
+          "name": "通知地址",
+          "val": "",
+          "type": "text",
+          "desc": "Tg的通知地址，如：https://api.telegram.org/bot-token/sendMessage?chat_id=-100140&parse_mode=Markdown&text="
+        },
+        {
+          "id": "lkGandartCompositeFuncEnalbleList",
+          "name": "功能步骤",
+          "val": "TaskList,MateList",
+          "type": "checkboxes",
+          "desc": "功能步骤",
+          "items": [
+            {
+              "key": "TaskList",
+              "label": "获取合成任务列表"
+            },
+            {
+              "key": "MateList",
+              "label": "获取可行合成方案"
+            },
+            {
+              "key": "DecidedList",
+              "label": "生成最终合成方案"
+            },
+            {
+              "key": "ExecComposite",
+              "label": "最终执行合成任务"
+            }
+          ]
+        },
+        {
+          "id": "lkGandartCompositeTaskListStatus",
+          "name": "任务列表状态",
+          "val": "1",
+          "type": "radios",
+          "desc": "",
+          "items": [
+            {
+              "key": "0",
+              "label": "待开始"
+            },
+            {
+              "key": "1",
+              "label": "合成中"
+            },
+            {
+              "key": "2",
+              "label": "已结束"
+            },
+            {
+              "key": "3",
+              "label": "待开始与合成中"
+            }
+          ]
+        },
+        {
+          "id": "lkGandartCompositeTaskMode",
+          "name": "任务合成模式",
+          "val": "1",
+          "type": "radios",
+          "desc": "",
+          "items": [
+            {
+              "key": "0",
+              "label": "普通"
+            },
+            {
+              "key": "1",
+              "label": "预设"
+            }
+          ]
+        },
+        {
+          "id": "lkIsCompositeTaskListCache",
+          "name": "启用/弃用任务列表本地缓存",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkIsCompositeMaterialCache",
+          "name": "启用/弃用材料详情本地缓存",
+          "val": false,
+          "type": "boolean",
+          "desc": "默认关闭"
+        },
+        {
+          "id": "lkGandartCompositeTaskId",
+          "name": "合成任务ID",
+          "val": "",
+          "type": "text",
+          "desc": "合成任务ID"
+        },
+        {
+          "id": "lkGandartCompositeCountArray",
+          "name": "合成组合执行次数",
+          "val": "0#1",
+          "type": "text",
+          "desc": "合成组合执行次数，格式如：0#1,1#1"
+        },
+        {
+          "id": "lkGandartCompositeTaskMateList",
+          "name": "合成组合可行情况",
+          "val": "[]",
+          "autoGrow": true,
+          "type": "textarea",
+          "desc": "产品列表"
+        },
+        {
+          "id": "lkGandartCompositeTaskList1",
+          "name": "合成中-任务列表",
+          "val": "[]",
+          "autoGrow": true,
+          "type": "textarea",
+          "desc": "合成中的任务列表"
+        },
+        {
+          "id": "lkGandartCompositeTaskList0",
+          "name": "待开始-任务列表",
+          "val": "[]",
+          "autoGrow": true,
+          "type": "textarea",
+          "desc": "待开始的任务列表"
+        },
+        {
+          "id": "lkGandartCompositeTaskList2",
+          "name": "已结束-任务列表",
+          "val": "[]",
+          "autoGrow": true,
+          "type": "textarea",
+          "desc": "已结束的任务列表"
+        }
+      ]
     }
   ]
 }

Scripts/gandart/gandartHelper.js

@@ -45,10 +45,15 @@ const GCommonGandartHeads = {
     'token': gandartToken
 };
 
+let retBody;
 if (!lk.isExecComm) {
     if (lk.isRequest()) {
         checkHanldeRequest();
-        lk.done();
+        if (retBody) {
+            lk.done({ body: JSON.stringify(retBody) });
+        } else {
+            lk.done();
+        }
     }
 }
 
@@ -196,7 +201,6 @@ function checkFixLimitPrice(castingId, info, lastCastingId) {
     }
 }
 
-
 function isExistCollectionLocked() {
     let curCastingId = lk.getVal(GandartConstKey.CastingId);
     if (!lk.isEmpty(curCastingId)) {

Scripts/util/ToolKit.js

@@ -1023,5 +1023,19 @@ function ToolKit(scriptName, scriptId, options) {
             }
             return obj
         }
+
+
+        deepClone(obj, newObj) {
+            let newObj = newObj || {};
+            for (let key in obj) {
+                if (typeof obj[key] == 'object') {
+                    newObj[key] = (obj[key].constructor === Array) ? [] : {}
+                    this.deepClone(obj[key], newObj[key]);
+                } else {
+                    newObj[key] = obj[key]
+                }
+            }
+            return newObj;
+        }
     })(scriptName, scriptId, options)
 }