Merge files

This commit is contained in:
the1812 2019-07-13 17:07:41 +08:00
parent e26e5989e3
commit b3db366fae
15 changed files with 73 additions and 32 deletions

View File

@ -286,6 +286,7 @@ declare global
defaultVideoSpeed: string,
hideCategory: boolean,
foldComment: boolean,
downloadVideoDefaultDanmaku: '无' | 'XML' | 'ASS',
latestVersionLink: string,
currentVersion: string,
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -221,6 +221,7 @@ const settings = {
defaultVideoSpeed: '1',
hideCategory: false,
foldComment: true,
downloadVideoDefaultDanmaku: '无',
cache: {},
}
const fixedSettings = {
@ -1454,9 +1455,6 @@ Resource.manifest = {
useCache: '启用缓存'
}
},
downloadVideoPanel: {
path: 'download-video-panel.min.js',
},
downloadVideo: {
path: 'download-video.min.js',
html: true,
@ -1464,7 +1462,6 @@ Resource.manifest = {
dependencies: ['title'],
displayNames: {
'downloadVideo': '下载视频',
'downloadVideoPanel': '下载视频面板',
'batchDownload': '批量下载'
}
},

View File

@ -221,6 +221,7 @@ const settings = {
defaultVideoSpeed: '1',
hideCategory: false,
foldComment: true,
downloadVideoDefaultDanmaku: '无',
cache: {},
}
const fixedSettings = {
@ -1454,9 +1455,6 @@ Resource.manifest = {
useCache: '启用缓存'
}
},
downloadVideoPanel: {
path: 'download-video-panel.min.js',
},
downloadVideo: {
path: 'download-video.min.js',
html: true,
@ -1464,7 +1462,6 @@ Resource.manifest = {
dependencies: ['title'],
displayNames: {
'downloadVideo': '下载视频',
'downloadVideoPanel': '下载视频面板',
'batchDownload': '批量下载'
}
},

View File

@ -271,9 +271,6 @@ Resource.manifest = {
useCache: '启用缓存'
}
},
downloadVideoPanel: {
path: 'download-video-panel.min.js',
},
downloadVideo: {
path: 'download-video.min.js',
html: true,
@ -281,7 +278,6 @@ Resource.manifest = {
dependencies: ['title'],
displayNames: {
'downloadVideo': '下载视频',
'downloadVideoPanel': '下载视频面板',
'batchDownload': '批量下载'
}
},

View File

@ -125,6 +125,7 @@ export const settings = {
defaultVideoSpeed: '1',
hideCategory: false,
foldComment: true,
downloadVideoDefaultDanmaku: '无',
cache: {},
}
const fixedSettings = {

View File

@ -1 +0,0 @@
(()=>{return(r,e)=>{}})();

View File

@ -1 +1 @@
<div class=download-video><div class=header><h1>下载视频</h1><i class="mdi mdi-close"></i></div><div class=tabs><div class="tab download-single active"></div><div class="tab download-batch"></div></div><div class=info><img v-bind:src=""class=cover><div class=title><span class=bold>{{title}}</span><span class=size>{{size}}</span></div></div><div class=options><div class=option-item>清晰度<v-dropdown v-bind:value=quality v-bind:items=qualityItems></v-dropdown></div><div class=option-item>弹幕<v-dropdown v-bind:value=danmaku v-bind:items=danmakuItems></v-dropdown></div></div><div class=separator></div><div v-show=downloadSingle class=direct-download>直接下载<button class="primary start-download"v-on:click=startSingleDownload>开始</button><div class=progress><div class=background></div><div class=foreground v-bind:style="{width: progressPercent + '%'}"></div><span class=percent>{{progressPercent}}%</span></div></div><div v-show=!downloadSingle class=batch-download>选集<div class=episode-list><v-checkbox v-for="ep of episodeList"class=episode-item v-bind:key=ep.title v-bind:checked=ep.checked v-bind:name=ep.title></v-checkbox></div></div><div class=separator></div><div class=exports><button class=copy-link>复制链接</button><button class=aria2-file>导出aria2</button><button class=vld-copy>复制vld数据</button><button class=vld-export>导出vld数据</button></div></div>
<div class=download-video><div class=header><h1>下载视频</h1><i class="mdi mdi-close"></i></div><div class=tabs><div class="tab download-single active"></div><div class="tab download-batch"></div></div><div class=info><img v-bind:src=coverUrl class=cover><div class=title><span class=bold>{{title}}</span><span class=size>{{size}}</span></div></div><div class=options><div class=option-item>清晰度<v-dropdown v-bind:value=quality v-bind:items=qualityItems></v-dropdown></div><div class=option-item>弹幕<v-dropdown v-bind:value=danmaku v-bind:items=danmakuItems></v-dropdown></div></div><div class=separator></div><div v-show=downloadSingle class=direct-download>直接下载<button class="primary start-download"v-on:click=startSingleDownload>开始</button><div class=progress><div class=background></div><div class=foreground v-bind:style="{width: progressPercent + '%'}"></div><span class=percent>{{progressPercent}}%</span></div></div><div v-show=!downloadSingle class=batch-download>选集<div class=episode-list><v-checkbox v-for="ep of episodeList"class=episode-item v-bind:key=ep.title v-bind:checked=ep.checked v-bind:name=ep.title></v-checkbox></div></div><div class=separator></div><div class=exports><button class=copy-link>复制链接</button><button class=aria2-file>导出aria2</button><button class=vld-copy>复制vld数据</button><button class=vld-export>导出vld数据</button></div></div>

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
<div class="tab download-batch"></div>
</div>
<div class="info">
<img v-bind:src="" class="cover">
<img v-bind:src="coverUrl" class="cover">
<div class="title">
<span class="bold">{{title}}</span>
<span class="size">{{size}}</span>

View File

@ -529,6 +529,32 @@ async function loadWidget() {
pageData.entity.addMenuClass();
checkBatch();
}
Vue.component('v-dropdown', {
template: ``
});
Vue.component('v-checkbox', {
template: ``
});
var DanmakuOption;
(function (DanmakuOption) {
DanmakuOption["None"] = "\u65E0";
DanmakuOption["Xml"] = "XML";
DanmakuOption["Ass"] = "ASS";
})(DanmakuOption || (DanmakuOption = {}));
var QualityOption;
(function (QualityOption) {
})(QualityOption || (QualityOption = {}));
const panelVM = new Vue({
el: '.download-video',
data: {
downloadSingle: true,
coverUrl: null,
quality: '',
qualityItems: [],
danmaku: settings.downloadVideoDefaultDanmaku,
danmakuItems: [],
}
});
export default {
widget: {
content: /*html*/ `

View File

@ -556,6 +556,38 @@ async function loadWidget() {
pageData.entity.addMenuClass()
checkBatch()
}
Vue.component('v-dropdown', {
template: ``
})
Vue.component('v-checkbox', {
template: ``
})
enum DanmakuOption {
None = '无',
Xml = 'XML',
Ass = 'ASS',
}
enum QualityOption {
}
interface Episode {
title: string
checked: boolean
index: number
}
const panelVM = new Vue({
el: '.download-video',
data: {
downloadSingle: true,
coverUrl: null,
quality: '',
qualityItems: [],
danmaku: settings.downloadVideoDefaultDanmaku,
danmakuItems: [],
}
})
export default {
widget:
{