From 06fe738a7073a9c6df723d60c7cd0122b1fc2550 Mon Sep 17 00:00:00 2001 From: src48597962 <48597962@qq.com> Date: Mon, 13 Nov 2023 21:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'SrcJuSet.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SrcJuSet.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/SrcJuSet.js b/SrcJuSet.js index f706b1bc..eef57515 100644 --- a/SrcJuSet.js +++ b/SrcJuSet.js @@ -907,25 +907,29 @@ function JYimport(input,ruleTitle) { let num = 0; datalist.reverse(); let datalist3 = [];//存放待二次确认的临时接口 - for (let i = 0; i < datalist2.length; i++) { - datalist2['updatetime'] = $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss"); - if (!datalist.some(item => item.name == datalist2[i].name && item.type==datalist2[i].type)) { - datalist.push(datalist2[i]); - num = num + 1; - }else if(Juconfig['ImportType']=="Skip"){ - //已存在的跳过,啥也不做 - }else if(Juconfig['ImportType']=="Confirm"){ - //二次手工确认代码 - datalist3.push(datalist2[i]); + datalist2.forEach(data=>{ + data['updatetime'] = data['updatetime'] || $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss"); + if (datalist.some((item,i) => item.name == data.name && item.type==data.type)) { + log(datalist[i].name); + //存在时,做对应处理 + if(Juconfig['ImportType']=="Skip"){ + //跳过,啥也不做 + }else if(Juconfig['ImportType']=="Confirm"){ + //二次手工确认代码 + datalist3.push(data); + }else{ + //默认是覆盖已存在的 + let index = datalist.indexOf(datalist.filter(d => d.name == data.name && d.type==data.type)[0]); + datalist.splice(index, 1); + datalist.push(data); + num = num + 1; + } }else{ - //默认是覆盖已存在的 - let index = datalist.indexOf(datalist.filter(d => d.name == datalist2[i].name && d.type==datalist2[i].type)[0]); - datalist.splice(index, 1); - datalist2['updatetime'] = $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss"); - datalist.push(datalist2[i]); + //不存在,则导入 + datalist.push(data); num = num + 1; } - } + }) writeFile(sourcefile, JSON.stringify(datalist)); clearMyVar('SrcJu_searchMark'); hideLoading();