study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-06-08 14:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

分享中心添加一个退出按钮

Browse Source
This commit is contained in:
fofolee 2020-07-26 17:37:50 +08:00
parent d5b65667ea
commit fa044cd083
3 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/assets/index.js
View File

@ -1209,14 +1209,18 @@
icon: d.cover ? d.cover.replace(yuQueShareVars.yuQueImgBedBaseLink, yuQueShareVars.imgBedBaseLink) : `logo/${description.program}.png`
}
})
let choise = await quickcommand.showSelectList(docs, { optionType: 'json' })
let doc = await yuQueClient(`repos/${yuQueShareVars.releaseRepo}/docs/${choise.slug}?raw=1`)
let body = doc.data.data.body
let stringifyQc = body.match(/```json([\s\S]*)```/)[1]
let qc = JSON.parse(stringifyQc)
$('#options').show()
qc.fromShare = true
editCurrentCommand(qc)
let choise = await quickcommand.showSelectList(docs, { optionType: 'json', showCancelButton: true })
if (choise) {
let doc = await yuQueClient(`repos/${yuQueShareVars.releaseRepo}/docs/${choise.slug}?raw=1`)
let body = doc.data.data.body
let stringifyQc = body.match(/```json([\s\S]*)```/)[1]
let qc = JSON.parse(stringifyQc)
qc.fromShare = true
$('#options').show()
editCurrentCommand(qc)
} else {
$('#options').show()
}
utools.setExpendHeight(600)
}
@ -1371,23 +1375,27 @@
}
putDB(code, pushData, 'customFts');
$("#customize").animate({ top: '100%' }, () => {
// 保存后标签跳转处理
var redirectTag, currentTag = $('.currentTag').text()
if (tags.length) {
if (pushData.tags.includes(currentTag)) {
redirectTag = currentTag
} else {
redirectTag = pushData.tags[0]
}
} else {
redirectTag = "未分类"
}
showOptions(redirectTag);
location.href = '#' + code
$("#customize").empty()
let checkSwitch = $(`#${code} .checked-switch`)
checkSwitch.click()
checkSwitch.is(':checked') || checkSwitch.click()
if (extraInfo && extraInfo.fromShare) {
getSharedQCFromYuQue()
} else {
// 保存后标签跳转处理
var redirectTag, currentTag = $('.currentTag').text()
if (tags.length) {
if (pushData.tags.includes(currentTag)) {
redirectTag = currentTag
} else {
redirectTag = pushData.tags[0]
}
} else {
redirectTag = "未分类"
}
showOptions(redirectTag);
location.href = '#' + code
let checkSwitch = $(`#${code} .checked-switch`)
checkSwitch.click()
checkSwitch.is(':checked') || checkSwitch.click()
}
});
}
}
@ -1497,6 +1505,8 @@
if ($("#customize").is(":parent") && $("#featureList").is(":parent")) {
$("#customize").animate({ top: '100%' });
$("#customize").empty()
var extraInfo = $('#customize').data('extraInfo')
if (extraInfo && extraInfo.fromShare) getSharedQCFromYuQue()
}
}

27
src/assets/style/options.css
View File

@ -845,21 +845,34 @@ li.CodeMirror-hint {
border-radius: 6px;
}
#quicktextarea button {
.circleButton {
position: absolute;
border: 0;
border-radius: 50%;
color: white;
cursor: pointer;
outline: none;
}
#quicktextarea .circleButton{
right: 20px;
bottom: 20px;
height: 40px;
width: 40px;
border: 0;
border-radius: 50%;
background: #2196F3;
color: white;
cursor: pointer;
}
#quicktextarea button:hover {
background: #6ab4f0;
#quickselect .circleButton{
right: 10px;
bottom: 10px;
height: 25px;
width: 25px;
background: #db4d14;
z-index: 1060;
}
.circleButton:hover {
filter: brightness(1.2);
}
/*quicktextarea*/

23
src/preload.js
View File

@ -167,7 +167,8 @@ quickcommand = {
typeof opt.placeholder == 'undefined' && (opt.placeholder = "搜索，支持拼音")
typeof opt.enableSearch == 'undefined' && (opt.enableSearch = true)
if ($('#quickselect').length) $('#quickselect').remove()
$("body").append(`<div id="quickselect"><select id="selectBox"></select></div>`)
let cancelButton = opt.showCancelButton ? '<button class="circleButton">✕</button>' : ''
$("body").append(`<div id="quickselect"><select id="selectBox"></select>${cancelButton}</div>`)
let item, data = []
selects.forEach((s, i) => {
item = {}
@ -189,6 +190,7 @@ quickcommand = {
// data: data,
width: "100%",
dropdownParent: $("#quickselect"),
closeOnSelect: false,
// 支持无限滚动
ajax: {
transport: (params, success, failure) => {
@ -221,15 +223,22 @@ quickcommand = {
$("#quickselect .select2-search__field").val(text).trigger('input')
modWindowHeight($('.select2-results').outerHeight())
}, opt.placeholder)
$('#selectBox').on('select2:select', function (e) {
let result = $('#selectBox').data('options')[$(this).val()]
delete result.selected
// 关闭列表
let closeSelect = () => {
$('#selectBox').off('select2:select')
utools.removeSubInput()
$("#quickselect").remove()
}
$('#selectBox').on('select2:select', function (e) {
let result = $('#selectBox').data('options')[$(this).val()]
delete result.selected
closeSelect()
reslove(result)
})
$('.circleButton').click(() => {
closeSelect()
reslove(false)
})
});
},
@ -265,11 +274,11 @@ quickcommand = {
var html = `
<div id="quicktextarea">
<textarea placeholder="${placeholder}"></textarea>
<button>✔</button>
<button class="circleButton">✔</button>
</div>`
$("body").append(html)
$("#quicktextarea").addClass("fadeInUpWindow")
$("#quicktextarea > button").click(function () {
$(".circleButton").click(function () {
$("#quicktextarea").addClass("fadeOutDownWindow")
setTimeout(() => { $("#quicktextarea").remove() }, 300);
reslove($("#quicktextarea > textarea").val())