From 48d68e1b5120b9480a6c92a5ee71aaddfc9dea3a Mon Sep 17 00:00:00 2001 From: src48597962 <48597962@qq.com> Date: Mon, 13 Nov 2023 22:17:37 +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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SrcJuSet.js b/SrcJuSet.js index d12e8238..93fa4c27 100644 --- a/SrcJuSet.js +++ b/SrcJuSet.js @@ -909,20 +909,20 @@ function JYimport(input,ruleTitle) { let datalist3 = [];//存放待二次确认的临时接口 datalist2.forEach(data=>{ data['updatetime'] = data['updatetime'] || $.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss"); - let ii = datalist.findIndex(item => item.name == data.name && item.type==data.type); - log(ii); - xlog(ii); - if (i>-1) { - log(datalist[ii].name); + let index = datalist.findIndex(item => item.name == data.name && item.type==data.type); + if (index>-1) { + log(datalist[index].name); //存在时,做对应处理 if(Juconfig['ImportType']=="Skip"){ //跳过,啥也不做 }else if(Juconfig['ImportType']=="Confirm"){ //二次手工确认代码 - datalist3.push(data); + if(datalist[index].updatetime != data.updatetime){ + datalist3.push(data); + } }else{ //默认是覆盖已存在的 - let index = datalist.indexOf(datalist.filter(d => d.name == data.name && d.type==data.type)[0]); + //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;