From 63effbdc771b67f64fb38773a92ec00020911d52 Mon Sep 17 00:00:00 2001 From: lmm214 Date: Tue, 19 Sep 2023 20:07:02 +0800 Subject: [PATCH] v0.15 --- README.md | 2 + _locales/en/messages.json | 5 +- _locales/zh_CN/messages.json | 5 +- css/main.css | 5 +- js/i18n.js | 1 + js/oper.js | 220 +++++++++++++++++++---------------- manifest.json | 2 +- popup.html | 10 ++ 8 files changed, 145 insertions(+), 105 deletions(-) diff --git a/README.md b/README.md index b0a9ba5..4dc8df8 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Chrome 应用商店:' + }); + tagDom += '' + $("#taglist").html(tagDom).slideToggle(500) } - $.each(arrData, function(i,obj){ - tagDom += '#'+obj+'' - }); - tagDom += '' - $("#taglist").html(tagDom).slideToggle(500) - }); + }) } else { $.message({ message: chrome.i18n.getMessage("placeApiUrl") @@ -294,40 +293,44 @@ $('#search').click(function () { var searchDom = "" const pattern = $("textarea[name=text]").val() if(pattern){ - $.get( info.apiUrl ,function(data){ - const options = {keys: ['content']}; - 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 ')+'
' - if(searchData[i].item.resourceList && searchData[i].item.resourceList.length > 0){ - var resourceList = searchData[i].item.resourceList; - for(var j=0;j < resourceList.length;j++){ - var restype = resourceList[j].type.slice(0,5); - var resexlink = resourceList[j].externalLink - var resLink = '',fileId='' - if(resexlink){ - resLink = resexlink - }else{ - fileId = resourceList[j].publicId || resourceList[j].filename - resLink = info.apiUrl.replace(/api\/(v1\/)?memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId - } - if(restype == 'image'){ - searchDom += '' - } - if(restype !== 'image'){ - searchDom += ''+resourceList[j].filename+'' + $.ajax({ + //memos+"api/"+apiV1+"memo?creatorId="+bbMemo.creatorId+"&content="+serchText+"&limit=20"; + url:info.apiUrl+"api/v1/memo", + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data){ + const options = {keys: ['content']}; + const fuse = new Fuse(data, 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 ')+'
' + if(searchData[i].item.resourceList && searchData[i].item.resourceList.length > 0){ + var resourceList = searchData[i].item.resourceList; + for(var j=0;j < resourceList.length;j++){ + var restype = resourceList[j].type.slice(0,5); + var resexlink = resourceList[j].externalLink + var resLink = '',fileId='' + if(resexlink){ + resLink = resexlink + }else{ + fileId = resourceList[j].publicId || resourceList[j].filename + resLink = info.apiUrl+'o/r/'+resourceList[j].id+'/'+fileId + } + if(restype == 'image'){ + searchDom += '' + } + if(restype !== 'image'){ + searchDom += ''+resourceList[j].filename+'' + } } } + searchDom += '
' } - searchDom += '
' + window.ViewImage && ViewImage.init('.random-image') + $("#randomlist").html(searchDom).slideDown(500); } - window.ViewImage && ViewImage.init('.random-image') - $("#randomlist").html(searchDom).slideDown(500); }); }else{ $.message({ @@ -348,34 +351,54 @@ $('#random').click(function () { $("#randomlist").html('').hide() var nowTag = $("textarea[name=text]").val().match(/#([^\s#]+)/) if( $("#taglist").is(':visible') && nowTag[1]){ - var tagUrl = info.apiUrl+'&rowStatus=NORMAL&tag='+nowTag[1] - $.get(tagUrl,function(data){ - var arrData = data || '' - if(data.data){ - arrData = data.data + var tagUrl = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&tag='+nowTag[1] + $.ajax({ + url:tagUrl, + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data){ + let randomNum = Math.floor(Math.random() * (data.length)); + var randomData = data[randomNum] + randDom(randomData) } - 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 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() * (arrData.length)) + 1; - var randomUrl2 = info.apiUrl+'&rowStatus=NORMAL&limit=1&offset='+randomNum - $.get(randomUrl2,function(data){ - var randomData = arrData[0] - randDom(randomData) + var randomUrl0 = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&limit=1' + $.ajax({ + url:randomUrl0, + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data0){ + var creatorId = data0[0].creatorId + var randomUrl1 = info.apiUrl+'api/v1/memo/stats?creatorId='+creatorId + $.ajax({ + url:randomUrl1, + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data1){ + let randomNum = Math.floor(Math.random() * (data1.length)) + 1; + var randomUrl2 = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&limit=1&offset='+randomNum + $.ajax({ + url:randomUrl2, + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data2){ + var randomData = data2[0] + randDom(randomData) + } + }); + } }); - }); - }); + } + }) } } else { $.message({ @@ -398,7 +421,7 @@ function randDom(randomData){ resLink = resexlink }else{ fileId = resourceList[j].publicId || resourceList[j].filename - resLink = info.apiUrl.replace(/api\/(v1\/)?memo.*/,'')+'o/r/'+resourceList[j].id+'/'+fileId + resLink = info.apiUrl+'o/r/'+resourceList[j].id+'/'+fileId } if(restype == 'image'){ randomDom += '' @@ -417,14 +440,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\/(v1\/)?memo.*/,'')+"m/"+memoId}) + chrome.tabs.create({url:info.apiUrl+"m/"+memoId}) }) }) $(document).on("click","#random-delete",function () { get_info(function (info) { var memosId = $("#random-delete").data('id'); - var deleteUrl = info.apiUrl.replace(/api\/(v1\/)?memo(.*)/,'api/$1memo/'+memosId+'$2') + var deleteUrl = info.apiUrl+'api/v1/memo/'+memosId $.ajax({ url:deleteUrl, type:"PATCH", @@ -434,6 +457,7 @@ get_info(function (info) { }), contentType:"application/json;", dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, success: function(result){ $("#randomlist").html('').hide() $.message({ @@ -518,14 +542,17 @@ function getOne(memosId){ get_info(function (info) { if (info.apiUrl) { $("#randomlist").html('').hide() - var getUrl = info.apiUrl.replace(/api\/(v1\/)?memo(.*)/,'api/$1memo/'+memosId+'$2') - $.get(getUrl,function(data){ - var arrData = data || '' - if(data.data){ - arrData = data.data + var getUrl = info.apiUrl+'api/v1/memo/'+memosId + $.ajax({ + url:getUrl, + type:"GET", + contentType:"application/json;", + dataType:"json", + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data){ + randDom(data) } - randDom(arrData) - }); + }) } else { $.message({ message: chrome.i18n.getMessage("placeApiUrl") @@ -554,7 +581,7 @@ function sendText() { } } $.ajax({ - url:info.apiUrl, + url:info.apiUrl+'api/v1/memo', type:"POST", data:JSON.stringify({ 'content': content, @@ -563,13 +590,10 @@ function sendText() { }), contentType:"application/json;", dataType:"json", - success: function(result){ + headers : {'Authorization':'Bearer ' + info.apiTokens}, + success: function(data){ //发送成功 - var arrData = result || '' - if(result.data){ - arrData = result.data - } - getOne(arrData.id) + getOne(data.id) chrome.storage.sync.set( { open_action: '', open_content: '',resourceIdList:''}, function () { diff --git a/manifest.json b/manifest.json index fb43934..1b5a37e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "__MSG_extName__", "default_locale": "zh_CN", - "version": "2023.07.17", + "version": "2023.09.19", "action": { "default_popup": "popup.html", "default_icon": "assets/logo_24x24.png", diff --git a/popup.html b/popup.html index 4b2a75e..388c9ea 100644 --- a/popup.html +++ b/popup.html @@ -27,6 +27,16 @@ placeholder="" required /> +