diff --git a/README.md b/README.md index d9577f4..b0a9ba5 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Chrome 应用商店:' }); @@ -282,7 +296,11 @@ $('#search').click(function () { if(pattern){ $.get( info.apiUrl ,function(data){ const options = {keys: ['content']}; - const fuse = new Fuse(data.data, options); + var fuseData = data || '' + if(data.data){ + fuseData = data.data + } + const fuse = new Fuse(fuseData, options); var searchData = fuse.search(pattern) for(var i=0;i < searchData.length;i++){ searchDom += '
'+dayjs(new Date(searchData[i].item.createdTs)*1000).fromNow()+'
'+searchData[i].item.content.replace(/!\[.*?\]\((.*?)\)/g,' ').replace(/\[(.*?)\]\((.*?)\)/g,' $1 ')+'
' @@ -296,7 +314,7 @@ $('#search').click(function () { resLink = resexlink }else{ fileId = resourceList[j].publicId || resourceList[j].filename - resLink = info.apiUrl.replace(/api\/memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId + resLink = info.apiUrl.replace(/api\/(v1\/)?memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId } if(restype == 'image'){ searchDom += '' @@ -332,20 +350,28 @@ $('#random').click(function () { if( $("#taglist").is(':visible') && nowTag[1]){ var tagUrl = info.apiUrl+'&rowStatus=NORMAL&tag='+nowTag[1] $.get(tagUrl,function(data){ - let randomNum = Math.floor(Math.random() * (data.data.length)); - var randomData = data.data[randomNum] + var arrData = data || '' + if(data.data){ + arrData = data.data + } + let randomNum = Math.floor(Math.random() * (arrData.length)); + var randomData = arrData[randomNum] randDom(randomData) }) }else{ var randomUrl0 = info.apiUrl+'&rowStatus=NORMAL&limit=1' $.get(randomUrl0,function(data){ - var creatorId = data.data[0].creatorId - var randomUrl1 = info.apiUrl.replace(/api\/memo.*/,'api/memo/stats?creatorId=')+creatorId + var arrData = data || '' + if(data.data){ + arrData = data.data + } + var creatorId = arrData[0].creatorId + var randomUrl1 = info.apiUrl.replace(/api\/(v1\/)?memo.*/,'api/$1memo/stats?creatorId=')+creatorId $.get(randomUrl1,function(data){ - let randomNum = Math.floor(Math.random() * (data.data.length)) + 1; + let randomNum = Math.floor(Math.random() * (arrData.length)) + 1; var randomUrl2 = info.apiUrl+'&rowStatus=NORMAL&limit=1&offset='+randomNum $.get(randomUrl2,function(data){ - var randomData = data.data[0] + var randomData = arrData[0] randDom(randomData) }); }); @@ -372,7 +398,7 @@ function randDom(randomData){ resLink = resexlink }else{ fileId = resourceList[j].publicId || resourceList[j].filename - resLink = info.apiUrl.replace(/api\/memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId + resLink = info.apiUrl.replace(/api\/(v1\/)?memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId } if(restype == 'image'){ randomDom += '' @@ -391,14 +417,14 @@ function randDom(randomData){ $(document).on("click","#random-link",function () { var memoId = $("#random-link").data('id'); get_info(function (info) { - chrome.tabs.create({url:info.apiUrl.replace(/api\/memo.*/,'')+"m/"+memoId}) + chrome.tabs.create({url:info.apiUrl.replace(/api\/(v1\/)?memo.*/,'')+"m/"+memoId}) }) }) $(document).on("click","#random-delete",function () { get_info(function (info) { var memosId = $("#random-delete").data('id'); - var deleteUrl = info.apiUrl.replace(/api\/memo(.*)/,'api/memo/'+memosId+'$1') + var deleteUrl = info.apiUrl.replace(/api\/(v1\/)?memo(.*)/,'api/$1memo/'+memosId+'$2') $.ajax({ url:deleteUrl, type:"PATCH", @@ -492,9 +518,13 @@ function getOne(memosId){ get_info(function (info) { if (info.apiUrl) { $("#randomlist").html('').hide() - var getUrl = info.apiUrl.replace(/api\/memo(.*)/,'api/memo/'+memosId+'$1') + var getUrl = info.apiUrl.replace(/api\/(v1\/)?memo(.*)/,'api/$1memo/'+memosId+'$2') $.get(getUrl,function(data){ - randDom(data.data) + var arrData = data || '' + if(data.data){ + arrData = data.data + } + randDom(arrData) }); } else { $.message({ @@ -535,7 +565,11 @@ function sendText() { dataType:"json", success: function(result){ //发送成功 - getOne(result.data.id) + var arrData = result || '' + if(result.data){ + arrData = result.data + } + getOne(arrData.id) chrome.storage.sync.set( { open_action: '', open_content: '',resourceIdList:''}, function () {