diff --git a/README.md b/README.md index da0a471..30e924c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## 更新日志 +2023.02.05 支持指定标签下的随机 Memos (算是彩蛋:标签列表点开,输入框内有且只有1个标签时,点击随机按钮) + 2023.02.04 新增随机 Memos 按钮,随时唤醒记忆。 2022.11.15 新增插入文件图片按钮,尝试修复首次安装需要点一下小锁。 diff --git a/js/oper.js b/js/oper.js index f3ef196..b4f6300 100644 --- a/js/oper.js +++ b/js/oper.js @@ -211,26 +211,25 @@ $('#random').click(function () { get_info(function (info) { if (info.status) { $("#randomlist").html('').hide() - var randomUrl1 = info.apiUrl.replace(/api\/memo/,'api/memo/amount') - var randomDom = "" - $.get(randomUrl1,function(data,status){ - let randomNum = Math.floor(Math.random() * (data.data)) + 1; - var randomUrl2 = info.apiUrl+'&rowStatus=NORMAL&limit=1&offset='+randomNum - $.get(randomUrl2,function(data){ - var randomData = data.data[0] - randomDom += '
'+dayjs(new Date(randomData.createdTs * 1000).toLocaleString()).fromNow()+'
'+randomData.content.replace(/!\[.*?\]\((.*?)\)/g,' ').replace(/\[(.*?)\]\((.*?)\)/g,' $1 ')+'
' - if(randomData.resourceList && randomData.resourceList.length > 0){ - var resourceList = randomData.resourceList; - for(var j=0;j < resourceList.length;j++){ - var restype = resourceList[j].type.slice(0,5); - if(restype == 'image'){ - randomDom += '' - } - } - } - $("#randomlist").html(randomDom).slideDown(500); + var nowTag = $("textarea[name=text]").val().replace(/#([^\s#]+)/,'$1') ; + if( $("#taglist").is(':visible') && nowTag){ + var tagUrl = info.apiUrl.replace(/api\/memo.*/,'api/memo/all?tag='+nowTag) + $.get(tagUrl,function(data){ + let randomNum = Math.floor(Math.random() * (data.data.length)); + var randomData = data.data[randomNum] + randDom(randomData) + }) + }else{ + var randomUrl1 = info.apiUrl.replace(/api\/memo/,'api/memo/amount') + $.get(randomUrl1,function(data,status){ + let randomNum = Math.floor(Math.random() * (data.data)) + 1; + var randomUrl2 = info.apiUrl+'&rowStatus=NORMAL&limit=1&offset='+randomNum + $.get(randomUrl2,function(data){ + var randomData = data.data[0] + randDom(randomData) + }); }); - }); + } } else { $.message({ message: '请先填写好 API 链接' @@ -239,6 +238,22 @@ $('#random').click(function () { }) }) +function randDom(randomData){ + get_info(function (info) { + var randomDom = '
'+dayjs(new Date(randomData.createdTs * 1000).toLocaleString()).fromNow()+'
'+randomData.content.replace(/!\[.*?\]\((.*?)\)/g,' ').replace(/\[(.*?)\]\((.*?)\)/g,' $1 ')+'
' + if(randomData.resourceList && randomData.resourceList.length > 0){ + var resourceList = randomData.resourceList; + for(var j=0;j < resourceList.length;j++){ + var restype = resourceList[j].type.slice(0,5); + if(restype == 'image'){ + randomDom += '' + } + } + } + $("#randomlist").html(randomDom).slideDown(500); + }) +} + $(document).on("click","#random-link",function () { var memoId = this.getAttribute('data-id') get_info(function (info) { diff --git a/manifest.json b/manifest.json index f4379a6..b5b478a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "__MSG_extName__", - "version": "2023.02.04", + "version": "2023.02.05", "action": { "default_popup": "popup.html", "default_icon": "assets/logo_24x24.png",