-
-
Save Rhilip/8dc72393c411d57b8efc45e112c2c1c3 to your computer and use it in GitHub Desktop.
vuetify2.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/debugger/index.ts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/debugger/index.ts b/src/debugger/index.ts | |
--- a/src/debugger/index.ts (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/debugger/index.ts (date 1612509306984) | |
@@ -1,6 +1,6 @@ | |
import Vue from "vue"; | |
import App from "./Index.vue"; | |
-import vuetifyService from "@/options/plugins/vuetify"; | |
+import vuetify from "@/options/plugins/vuetify"; | |
import { EModule, EAction } from "@/interface/enum"; | |
import { IRequest } from "@/interface/common"; | |
@@ -12,9 +12,8 @@ | |
private vm: any; | |
constructor() { | |
- vuetifyService.init("en"); | |
- | |
this.vm = new Vue({ | |
+ vuetify, | |
el: "#app", | |
render: h => h(App) | |
Index: src/debugger/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/debugger/Index.vue b/src/debugger/Index.vue | |
--- a/src/debugger/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/debugger/Index.vue (date 1612510400046) | |
@@ -8,7 +8,7 @@ | |
<v-spacer></v-spacer> | |
<v-toolbar-items class="hidden-xs-only"> | |
<v-btn | |
- flat | |
+ text | |
href="https://github.com/ronggang/PT-Plugin-Plus/issues" | |
target="_blank" | |
rel="noopener noreferrer nofollow" | |
@@ -95,4 +95,4 @@ | |
} | |
} | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/changelog/index.ts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/changelog/index.ts b/src/changelog/index.ts | |
--- a/src/changelog/index.ts (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/changelog/index.ts (date 1612509323629) | |
@@ -1,9 +1,9 @@ | |
import Vue from "vue"; | |
import App from "./Index.vue"; | |
-import vuetifyService from "@/options/plugins/vuetify"; | |
-vuetifyService.init("en"); | |
+import vuetify from "@/options/plugins/vuetify"; | |
new Vue({ | |
el: "#app", | |
+ vuetify, | |
render: h => h(App) | |
}); | |
Index: src/options/main.ts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/main.ts b/src/options/main.ts | |
--- a/src/options/main.ts (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/main.ts (date 1612506780106) | |
@@ -1,5 +1,5 @@ | |
import Vue from "vue"; | |
-import vuetifyService from "./plugins/vuetify"; | |
+import vuetify from './plugins/vuetify'; | |
import App from "./App.vue"; | |
import router from "./router"; | |
import store from "./store"; | |
@@ -163,7 +163,6 @@ | |
// 全局挂载 i18nService 对象 | |
window.i18nService = this.i18n; | |
- vuetifyService.init("en"); | |
} | |
/** | |
@@ -173,6 +172,7 @@ | |
this.vm = new Vue({ | |
router, | |
store, | |
+ vuetify, | |
i18n: this.i18n.vuei18n, | |
render: h => h(App) | |
}); | |
Index: src/options/App.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/App.vue b/src/options/App.vue | |
--- a/src/options/App.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/App.vue (date 1612517526330) | |
@@ -2,7 +2,7 @@ | |
<v-app id="inspire"> | |
<template v-if="initializing"> | |
<v-progress-linear :indeterminate="true" color="info" height="5" class="pa-0 ma-0"></v-progress-linear> | |
- <v-alert :value="true" type="info"> | |
+ <v-alert type="info"> | |
<div> | |
<div>{{ $t("app.initializing", "zh-CN") }}</div> | |
<div>{{ $t("app.initializing", "en") }}</div> | |
@@ -28,7 +28,6 @@ | |
</template> | |
<script> | |
-import { EAction, Options } from "../interface/common"; | |
import Navigation from "./components/Navigation.vue"; | |
import Topbar from "./components/Topbar.vue"; | |
import Footer from "./components/Footer.vue"; | |
@@ -89,4 +88,4 @@ | |
}; | |
</script> | |
-<style lang="scss" src="./assets/contextMenu.scss"></style> | |
\ No newline at end of file | |
+<style lang="scss" src="./assets/contextMenu.scss"></style> | |
Index: src/options/views/AutoSignWarning.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/AutoSignWarning.vue b/src/options/views/AutoSignWarning.vue | |
--- a/src/options/views/AutoSignWarning.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/AutoSignWarning.vue (date 1612510399673) | |
@@ -24,7 +24,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/frequently-asked-questions#%E4%B8%BA%E4%BB%80%E4%B9%88%E5%8A%A9%E6%89%8B%E6%B2%A1%E6%9C%89%E8%87%AA%E5%8A%A8%E7%AD%BE%E5%88%B0%E5%8A%9F%E8%83%BD" | |
target="_blank" | |
@@ -35,7 +35,7 @@ | |
</v-btn> | |
</v-toolbar> | |
<v-card-text style="max-height: 80vh;" class="pa-0"> | |
- <v-alert :value="true" color="warning" class="ma-0"> | |
+ <v-alert color="warning" class="ma-0"> | |
<div> | |
感谢您使用助手,抱歉这里没有自动签到功能,如果您愿意,请阅读以下内容: | |
<br /> | |
@@ -56,8 +56,8 @@ | |
<v-divider></v-divider> | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn color="success" flat @click="hideButton">不再显示该按钮</v-btn> | |
- <v-btn color="error" flat @click="dialog = false">{{ | |
+ <v-btn color="success" text @click="hideButton">不再显示该按钮</v-btn> | |
+ <v-btn color="error" text @click="dialog = false">{{ | |
$t("common.close") | |
}}</v-btn> | |
</v-card-actions> | |
Index: src/options/views/SystemLogs.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/SystemLogs.vue b/src/options/views/SystemLogs.vue | |
--- a/src/options/views/SystemLogs.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/SystemLogs.vue (date 1612515152783) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="system-logs"> | |
- <v-alert :value="true" type="info">{{ $t('systemLog.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('systemLog.title') }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="error" :disabled="selected.length==0"> | |
@@ -34,14 +34,14 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="time" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
- :rows-per-page-items="options.rowsPerPageItems" | |
+ :items-per-page-options="options.rowsPerPageItems" | |
@update:pagination="updatePagination" | |
> | |
- <template slot="items" slot-scope="props"> | |
+ <template v-slot:item="props"> | |
<tr @click="props.expanded = !props.expanded"> | |
<td style="width:20px;"> | |
<v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
@@ -55,7 +55,7 @@ | |
</td> | |
</tr> | |
</template> | |
- <template slot="expand" slot-scope="props"> | |
+ <template v-slot:expanded-item="props"> | |
<v-card flat> | |
<v-card-text>{{getErrorDetail(props.item.data)}}</v-card-text> | |
</v-card> | |
@@ -74,11 +74,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -103,9 +103,9 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: 10, | |
- sortBy: "time", | |
- descending: true | |
+ itemsPerPage: 10, | |
+ sortBy: ["time"], | |
+ sortDesc: [true] | |
}, | |
items: [], | |
dialogRemoveConfirm: false, | |
Index: src/options/views/TechnologyStack.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/TechnologyStack.vue b/src/options/views/TechnologyStack.vue | |
--- a/src/options/views/TechnologyStack.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/TechnologyStack.vue (date 1612516678871) | |
@@ -1,29 +1,31 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ $t('reference.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('reference.title') }}</v-alert> | |
<v-card> | |
<v-data-table | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
class="elevation-1" | |
- hide-actions | |
+ hide-default-footer | |
item-key="name" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td>{{ props.item.name }}</td> | |
- <td>{{ props.item.ver }}</td> | |
- <td> | |
- <a | |
- :href="props.item.url" | |
- rel="noopener noreferrer nofollow" | |
- target="_blank" | |
- >{{ props.item.url }}</a> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td>{{ props.item.name }}</td> | |
+ <td>{{ props.item.ver }}</td> | |
+ <td> | |
+ <a | |
+ :href="props.item.url" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ >{{ props.item.url }}</a> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
- <v-alert :value="true" color="grey">{{ $t("reference.thanks") }}</v-alert> | |
+ <v-alert color="grey">{{ $t("reference.thanks") }}</v-alert> | |
</div> | |
</template> | |
<script lang="ts"> | |
@@ -44,7 +46,7 @@ | |
data() { | |
return { | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
items: [ | |
...dependencies, | |
Index: src/options/views/Donate.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/Donate.vue b/src/options/views/Donate.vue | |
--- a/src/options/views/Donate.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/Donate.vue (date 1612510400005) | |
@@ -1,20 +1,20 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ words.title }}</v-alert> | |
+ <v-alert type="info">{{ words.title }}</v-alert> | |
<v-card> | |
<v-card-title primary-title> | |
<div> | |
<div>本项目由作者在业余时间完成,如果您喜欢本项目,可以通过捐助来支持作者继续开发。</div> | |
- <div class="mt-3">支付宝和微信</div> | |
- <v-img src="./assets/donate.png" max-width="300"></v-img> | |
+ <div class="mt-4">支付宝和微信</div> | |
+ <v-img src="@/../public/assets/donate.png" max-width="300"></v-img> | |
<div | |
- class="mt-3" | |
+ class="mt-4" | |
>This project is completed by the author in his spare time. You can support the author's continued development through donations.</div> | |
</div> | |
</v-card-title> | |
<v-card-actions> | |
<v-btn | |
- flat | |
+ text | |
color="orange" | |
href="https://www.paypal.me/ronggang" | |
target="_blank" | |
Index: src/options/views/History.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/History.vue b/src/options/views/History.vue | |
--- a/src/options/views/History.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/History.vue (date 1612516706659) | |
@@ -1,132 +1,136 @@ | |
<template> | |
<div class="history"> | |
- <v-alert :value="true" type="info">{{ $t("history.title") }}</v-alert> | |
+ <v-alert type="info">{{ $t("history.title") }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn | |
- color="error" | |
- :disabled="selected.length == 0" | |
- @click="removeSelected" | |
+ :disabled="selected.length == 0" | |
+ color="error" | |
+ @click="removeSelected" | |
> | |
<v-icon class="mr-2">remove</v-icon> | |
{{ $t("history.remove") }} | |
</v-btn> | |
- <v-btn color="error" @click="clear" :disabled="items.length == 0"> | |
+ <v-btn :disabled="items.length == 0" color="error" @click="clear"> | |
<v-icon class="mr-2">clear</v-icon> | |
{{ $t("history.clear") }} | |
</v-btn> | |
<v-spacer></v-spacer> | |
<v-text-field | |
- class="search" | |
- append-icon="search" | |
- label="Search" | |
- single-line | |
- hide-details | |
- v-model="filterKey" | |
+ v-model="filterKey" | |
+ append-icon="search" | |
+ class="search" | |
+ hide-details | |
+ label="Search" | |
+ single-line | |
></v-text-field> | |
</v-card-title> | |
<v-data-table | |
- :search="filterKey" | |
- v-model="selected" | |
- :headers="headers" | |
- :items="items" | |
- :pagination.sync="pagination" | |
- item-key="data.url" | |
- select-all | |
- class="elevation-1" | |
+ v-model="selected" | |
+ :headers="headers" | |
+ :items="items" | |
+ :options.sync="pagination" | |
+ :search="filterKey" | |
+ class="elevation-1" | |
+ item-key="data.url" | |
+ show-select | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox | |
- v-model="props.selected" | |
- primary | |
- hide-details | |
- ></v-checkbox> | |
- </td> | |
- <!-- 站点 --> | |
- <td style="text-align: center;"> | |
- <div v-if="!!props.item.site"> | |
- <v-avatar size="18"> | |
- <img :src="props.item.site.icon" /> | |
- </v-avatar> | |
- <br /> | |
- <span class="captionText">{{ props.item.site.name }}</span> | |
- </div> | |
- </td> | |
- <td> | |
- <a | |
- v-if="props.item.data.link" | |
- :href="props.item.data.link" | |
- target="_blank" | |
- :title="props.item.data.title" | |
- rel="noopener noreferrer nofollow" | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox | |
+ v-model="props.selected" | |
+ hide-details | |
+ primary | |
+ ></v-checkbox> | |
+ </td> | |
+ <!-- 站点 --> | |
+ <td style="text-align: center;"> | |
+ <div v-if="!!props.item.site"> | |
+ <v-avatar size="18"> | |
+ <img :src="props.item.site.icon"/> | |
+ </v-avatar> | |
+ <br/> | |
+ <span class="captionText">{{ props.item.site.name }}</span> | |
+ </div> | |
+ </td> | |
+ <td> | |
+ <a | |
+ v-if="props.item.data.link" | |
+ :href="props.item.data.link" | |
+ :title="props.item.data.title" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
>{{ props.item.data.title || props.item.data.link }}</a | |
- > | |
- <span v-else :title="props.item.data.url">{{ | |
- props.item.data.title || props.item.data.url | |
- }}</span> | |
- <br /> | |
- <span class="sub-title" | |
+ > | |
+ <span v-else :title="props.item.data.url">{{ | |
+ props.item.data.title || props.item.data.url | |
+ }}</span> | |
+ <br/> | |
+ <span class="sub-title" | |
>[ | |
{{ | |
- getClientName(props.item.data.clientId || props.item.clientId) | |
- }} | |
+ getClientName(props.item.data.clientId || props.item.clientId) | |
+ }} | |
] -> | |
{{ props.item.data.savePath || $t("history.defaultPath") }}</span | |
- > | |
- </td> | |
- <td> | |
- <v-icon | |
- v-if="props.item.success === false" | |
- color="error" | |
- :title="$t('history.fail')" | |
- >close</v-icon | |
- > | |
- <v-icon v-else color="success" :title="$t('history.success')" | |
- >done</v-icon | |
- > | |
- </td> | |
- <td>{{ props.item.time | formatDate }}</td> | |
- <td> | |
- <!-- 重新下载 --> | |
- <v-btn | |
- icon | |
- flat | |
- small | |
- @click="download(props.item)" | |
- :title="$t('history.download')" | |
- > | |
- <v-icon small>save_alt</v-icon> | |
- </v-btn> | |
+ > | |
+ </td> | |
+ <td> | |
+ <v-icon | |
+ v-if="props.item.success === false" | |
+ :title="$t('history.fail')" | |
+ color="error" | |
+ >close | |
+ </v-icon | |
+ > | |
+ <v-icon v-else :title="$t('history.success')" color="success" | |
+ >done | |
+ </v-icon | |
+ > | |
+ </td> | |
+ <td>{{ props.item.time | formatDate }}</td> | |
+ <td> | |
+ <!-- 重新下载 --> | |
+ <v-btn | |
+ :title="$t('history.download')" | |
+ icon | |
+ small | |
+ text | |
+ @click="download(props.item)" | |
+ > | |
+ <v-icon small>save_alt</v-icon> | |
+ </v-btn> | |
- <!-- 下载到 --> | |
- <DownloadTo | |
- :downloadOptions="{ | |
+ <!-- 下载到 --> | |
+ <DownloadTo | |
+ :downloadOptions="{ | |
host: props.item.host, | |
url: props.item.data.url | |
}" | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- @error="onError" | |
- @success="onSuccess" | |
- /> | |
+ class="mx-0" | |
+ flat | |
+ icon | |
+ small | |
+ @error="onError" | |
+ @success="onSuccess" | |
+ /> | |
- <v-btn | |
- icon | |
- flat | |
- small | |
- color="error" | |
- @click="removeConfirm(props.item)" | |
- :title="$t('common.remove')" | |
- > | |
- <v-icon small>delete</v-icon> | |
- </v-btn> | |
- </td> | |
+ <v-btn | |
+ :title="$t('common.remove')" | |
+ color="error" | |
+ icon | |
+ small | |
+ text | |
+ @click="removeConfirm(props.item)" | |
+ > | |
+ <v-icon small>delete</v-icon> | |
+ </v-btn> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -135,8 +139,9 @@ | |
<v-dialog v-model="dialogRemoveConfirm" width="300"> | |
<v-card> | |
<v-card-title class="headline red lighten-2">{{ | |
- $t("history.removeConfirmTitle") | |
- }}</v-card-title> | |
+ $t("history.removeConfirmTitle") | |
+ }} | |
+ </v-card-title> | |
<v-card-text>{{ $t("history.removeConfirm") }}</v-card-text> | |
@@ -144,11 +149,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm = false"> | |
+ <v-btn color="info" text @click="dialogRemoveConfirm = false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t("history.cancel") }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove(null)"> | |
+ <v-btn color="error" text @click="remove(null)"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t("history.ok") }}</span> | |
</v-btn> | |
@@ -156,17 +161,19 @@ | |
</v-card> | |
</v-dialog> | |
- <v-snackbar v-model="haveError" top :timeout="3000" color="error">{{ | |
- errorMsg | |
- }}</v-snackbar> | |
- <v-snackbar v-model="haveSuccess" bottom :timeout="3000" color="success">{{ | |
- successMsg | |
- }}</v-snackbar> | |
+ <v-snackbar v-model="haveError" :timeout="3000" color="error" top>{{ | |
+ errorMsg | |
+ }} | |
+ </v-snackbar> | |
+ <v-snackbar v-model="haveSuccess" :timeout="3000" bottom color="success">{{ | |
+ successMsg | |
+ }} | |
+ </v-snackbar> | |
</div> | |
</template> | |
<script lang="ts"> | |
import Vue from "vue"; | |
-import { EAction, DownloadOptions, Site, Dictionary } from "@/interface/common"; | |
+import {EAction, DownloadOptions, Site, Dictionary} from "@/interface/common"; | |
import Extension from "@/service/extension"; | |
import DownloadTo from "@/options/components/DownloadTo.vue"; | |
@@ -180,9 +187,9 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: 10, | |
- sortBy: "time", | |
- descending: true | |
+ itemsPerPage: 10, | |
+ sortBy: ["time"], | |
+ sortDesc: [true] | |
}, | |
items: [] as any[], | |
dialogRemoveConfirm: false, | |
@@ -200,21 +207,21 @@ | |
clear() { | |
if (confirm(this.$t("history.clearConfirm").toString())) { | |
extension | |
- .sendRequest(EAction.clearDownloadHistory) | |
- .then((result: any) => { | |
- this.getDownloadHistory(); | |
- }); | |
+ .sendRequest(EAction.clearDownloadHistory) | |
+ .then((result: any) => { | |
+ this.getDownloadHistory(); | |
+ }); | |
} | |
}, | |
removeSelected() { | |
if (this.selected && this.selected.length > 0) { | |
if ( | |
- confirm( | |
- this.$t("common.removeSelectedConfirm", { | |
- count: this.selected.length | |
- }).toString() | |
- ) | |
+ confirm( | |
+ this.$t("common.removeSelectedConfirm", { | |
+ count: this.selected.length | |
+ }).toString() | |
+ ) | |
) { | |
this.remove(this.selected); | |
} | |
@@ -227,10 +234,10 @@ | |
} | |
extension | |
- .sendRequest(EAction.removeDownloadHistory, null, items) | |
- .then((result: any) => { | |
- this.getDownloadHistory(); | |
- }); | |
+ .sendRequest(EAction.removeDownloadHistory, null, items) | |
+ .then((result: any) => { | |
+ this.getDownloadHistory(); | |
+ }); | |
this.dialogRemoveConfirm = false; | |
}, | |
@@ -279,18 +286,18 @@ | |
} | |
extension | |
- .sendRequest(EAction.sendTorrentToClient, null, data) | |
- .then((result: any) => { | |
- console.log("命令执行完成", result); | |
+ .sendRequest(EAction.sendTorrentToClient, null, data) | |
+ .then((result: any) => { | |
+ console.log("命令执行完成", result); | |
- if (result.success) { | |
- this.haveSuccess = true; | |
- this.successMsg = result.msg; | |
- } else { | |
- this.haveError = true; | |
- this.errorMsg = result.msg; | |
- } | |
- }); | |
+ if (result.success) { | |
+ this.haveSuccess = true; | |
+ this.successMsg = result.msg; | |
+ } else { | |
+ this.haveError = true; | |
+ this.errorMsg = result.msg; | |
+ } | |
+ }); | |
}, | |
onError(msg: string) { | |
@@ -325,7 +332,7 @@ | |
align: "left", | |
value: "data.success" | |
}, | |
- { text: this.$t("history.headers.time"), align: "left", value: "time" }, | |
+ {text: this.$t("history.headers.time"), align: "left", value: "time"}, | |
{ | |
text: this.$t("history.headers.action"), | |
value: "name", | |
Index: src/options/views/Teams.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/Teams.vue b/src/options/views/Teams.vue | |
--- a/src/options/views/Teams.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/Teams.vue (date 1612507587540) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ $t('team.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('team.title') }}</v-alert> | |
<v-card> | |
<div v-for="(item, index) in peoples" :key="index"> | |
<v-avatar> | |
@@ -10,7 +10,7 @@ | |
<v-divider :key="index"></v-divider> | |
</div> | |
</v-card> | |
- <v-alert :value="true" color="grey"> | |
+ <v-alert color="grey"> | |
在项目的开发和测试中,他们给予了很多帮助和支持(或开发,或测试,或发💊,或建议,或鼓励,或鞭策),在此表示感谢。 | |
<br>列表中未能一一列出所有给予帮助的同学,也对他们表示感谢,如有遗漏敬请谅解。 | |
<br>同时一并感谢这些 | |
Index: src/options/views/search/Actions.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/Actions.vue b/src/options/views/search/Actions.vue | |
--- a/src/options/views/search/Actions.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/Actions.vue (date 1612510645574) | |
@@ -15,7 +15,7 @@ | |
<!-- 复制下载链接 --> | |
<v-btn | |
- flat | |
+ text | |
icon | |
small | |
:class="$vuetify.breakpoint.mdAndUp? 'mx-0': 'mx-0 btn-mini'" | |
@@ -31,7 +31,7 @@ | |
<!-- 下载种子文件 --> | |
<v-btn | |
v-if="downloadMethod=='POST'" | |
- flat | |
+ text | |
icon | |
small | |
:class="$vuetify.breakpoint.mdAndUp? 'mx-0': 'mx-0 btn-mini'" | |
@@ -42,7 +42,7 @@ | |
<v-btn | |
v-else | |
- flat | |
+ text | |
icon | |
small | |
:class="$vuetify.breakpoint.mdAndUp? 'mx-0': 'mx-0 btn-mini'" | |
@@ -58,7 +58,7 @@ | |
<!-- 收藏 --> | |
<v-btn | |
v-if="!isCollectioned" | |
- flat | |
+ text | |
icon | |
small | |
:class="$vuetify.breakpoint.mdAndUp? 'mx-0': 'mx-0 btn-mini'" | |
@@ -71,7 +71,7 @@ | |
<v-btn | |
v-else | |
- flat | |
+ text | |
icon | |
small | |
:class="$vuetify.breakpoint.mdAndUp? 'mx-0': 'mx-0 btn-mini'" | |
@@ -125,4 +125,4 @@ | |
.torrent-actions { | |
display: inline-flex; | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/views/search/KeepUpload.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/KeepUpload.vue b/src/options/views/search/KeepUpload.vue | |
--- a/src/options/views/search/KeepUpload.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/KeepUpload.vue (date 1612510399993) | |
@@ -27,7 +27,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/keep-upload-task" | |
target="_blank" | |
@@ -46,33 +46,33 @@ | |
<v-subheader v-if="index == 1" :key="index">{{ | |
$t("keepUploadTask.otherTorrent") | |
}}</v-subheader> | |
- <v-list-tile :key="item.title"> | |
- <v-list-tile-avatar> | |
+ <v-list-item :key="item.title"> | |
+ <v-list-item-avatar> | |
<v-avatar size="18"> | |
<img :src="item.data.site.icon" /> | |
</v-avatar> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title class="list-item"> | |
+ <v-list-item-content> | |
+ <v-list-item-title class="list-item"> | |
<a | |
:href="item.data.link" | |
target="_blank" | |
rel="noopener noreferrer nofollow" | |
>{{ item.data.title }}</a | |
> | |
- </v-list-tile-title> | |
- <v-list-tile-sub-title | |
+ </v-list-item-title> | |
+ <v-list-item-subtitle | |
>{{ $t("keepUploadTask.size") | |
}}{{ item.data.size | formatSize }}, | |
{{ $t("keepUploadTask.fileCount") | |
}}{{ item.torrent ? item.torrent.files.length : "N/A" }}, | |
{{ $t("keepUploadTask.status.label") | |
- }}{{ item.status }}</v-list-tile-sub-title | |
+ }}{{ item.status }}</v-list-item-subtitle | |
> | |
- </v-list-tile-content> | |
+ </v-list-item-content> | |
- <v-list-tile-action> | |
+ <v-list-item-action> | |
<div> | |
<v-btn | |
icon | |
@@ -96,8 +96,8 @@ | |
<v-icon color="error" v-else>clear</v-icon> | |
</v-btn> | |
</div> | |
- </v-list-tile-action> | |
- </v-list-tile> | |
+ </v-list-item-action> | |
+ </v-list-item> | |
<v-divider v-if="index > 0" :key="'d' + index" inset></v-divider> | |
</template> | |
</v-list> | |
@@ -132,7 +132,7 @@ | |
:downloadOptions="items[0]" | |
/> | |
<v-btn | |
- flat | |
+ text | |
small | |
@click="create" | |
v-if="downloadOptions && verifiedItems.length > 0" | |
@@ -145,7 +145,7 @@ | |
</template> | |
<v-spacer></v-spacer> | |
- <v-btn color="error" flat @click="dialog = false">{{ | |
+ <v-btn color="error" text @click="dialog = false">{{ | |
$t("common.close") | |
}}</v-btn> | |
</v-card-actions> | |
Index: src/options/views/search/AddToCollectionGroup.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/AddToCollectionGroup.vue b/src/options/views/search/AddToCollectionGroup.vue | |
--- a/src/options/views/search/AddToCollectionGroup.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/AddToCollectionGroup.vue (date 1612510434199) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<v-btn | |
- :flat="flat" | |
+ :text="flat" | |
:icon="icon" | |
:small="small" | |
:loading="loading" | |
@@ -120,4 +120,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> | |
Index: src/options/views/search/SearchResultSnapshot.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/SearchResultSnapshot.vue b/src/options/views/search/SearchResultSnapshot.vue | |
--- a/src/options/views/search/SearchResultSnapshot.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/SearchResultSnapshot.vue (date 1612516871744) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ $t("searchResultSnapshot.title") }}</v-alert> | |
+ <v-alert type="info">{{ $t("searchResultSnapshot.title") }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="error" :disabled="selected.length==0" @click="removeSelected"> | |
@@ -31,42 +31,44 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="id" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <!-- 关键字 --> | |
- <td>{{ props.item.key }} {{ getInfos(props.item)}}</td> | |
- <td>{{ props.item.time | formatDate }}</td> | |
- <td> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- :title="$t('searchResultSnapshot.show')" | |
- :to="`/search-torrent/show-snapshot-${props.item.id}`" | |
- > | |
- <v-icon small>image_search</v-icon> | |
- </v-btn> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <!-- 关键字 --> | |
+ <td>{{ props.item.key }} {{ getInfos(props.item) }}</td> | |
+ <td>{{ props.item.time | formatDate }}</td> | |
+ <td> | |
+ <v-btn | |
+ :title="$t('searchResultSnapshot.show')" | |
+ :to="`/search-torrent/show-snapshot-${props.item.id}`" | |
+ class="mx-0" | |
+ icon | |
+ small | |
+ text | |
+ > | |
+ <v-icon small>image_search</v-icon> | |
+ </v-btn> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- color="error" | |
- :title="$t('common.remove')" | |
- @click="removeConfirm(props.item)" | |
- > | |
- <v-icon small>delete</v-icon> | |
- </v-btn> | |
- </td> | |
+ <v-btn | |
+ :title="$t('common.remove')" | |
+ class="mx-0" | |
+ color="error" | |
+ icon | |
+ small | |
+ text | |
+ @click="removeConfirm(props.item)" | |
+ > | |
+ <v-icon small>delete</v-icon> | |
+ </v-btn> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -84,11 +86,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove()"> | |
+ <v-btn color="error" text @click="remove()"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -118,9 +120,9 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: 10, | |
- sortBy: "time", | |
- descending: true | |
+ itemsPerPage: 10, | |
+ sortBy: ["time"], | |
+ sortDesc: [true] | |
}, | |
items: [] as any[], | |
dialogRemoveConfirm: false, | |
Index: src/options/views/settings/SupportSchema.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SupportSchema.vue b/src/options/views/settings/SupportSchema.vue | |
--- a/src/options/views/settings/SupportSchema.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SupportSchema.vue (date 1612516968867) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="set-support-schema"> | |
- <v-alert :value="true" type="info">已支持的网站架构</v-alert> | |
+ <v-alert type="info">已支持的网站架构</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="success" @click="update"> | |
@@ -10,10 +10,8 @@ | |
<v-text-field class="search" append-icon="search" label="Search" single-line hide-details></v-text-field> | |
</v-card-title> | |
<v-data-table :headers="headers" :items="items" item-key="name" class="elevation-1"> | |
- <template slot="items" slot-scope="props"> | |
- <td>{{ props.item.name }}</td> | |
- <td>{{ props.item.ver }}</td> | |
- <td>{{ showPlugins(props.item.plugins) }}</td> | |
+ <template v-slot:item.plugins="props"> | |
+ {{ showPlugins(props.item.plugins) }} | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -57,4 +55,4 @@ | |
max-width: 400px; | |
} | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/views/settings/Sites/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Sites/Add.vue b/src/options/views/settings/Sites/Add.vue | |
--- a/src/options/views/settings/Sites/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Sites/Add.vue (date 1612515152801) | |
@@ -13,7 +13,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-site" | |
target="_blank" | |
@@ -49,23 +49,23 @@ | |
item-text="name" | |
item-value="name" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
- <v-list-tile-avatar> | |
+ <template v-slot:selection="{ item }"> | |
+ <v-list-item-avatar> | |
<img :src="item.icon" /> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-avatar> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-avatar> | |
<img :src="data.item.icon" /> | |
- </v-list-tile-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.url"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ joinTags(data.item.tags) }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ </v-list-item-avatar> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.url"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ joinTags(data.item.tags) }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
</v-stepper-content> | |
@@ -80,9 +80,9 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-btn | |
- flat | |
+ text | |
color="grey darken-1" | |
href="https://github.com/ronggang/PT-Plugin-Plus/tree/master/resource/sites" | |
target="_blank" | |
@@ -92,24 +92,24 @@ | |
<v-icon>help</v-icon> | |
<span class="ml-1">{{ $t('settings.sites.add.help') }}</span> | |
</v-btn> | |
- <v-btn flat @click="custom" v-show="step<stepCount"> | |
+ <v-btn text @click="custom" v-show="step<stepCount"> | |
<v-icon>add_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.sites.add.custom') }}</span> | |
</v-btn> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="grey darken-1" @click="step--" :disabled="step===1"> | |
+ <v-btn text color="grey darken-1" @click="step--" :disabled="step===1"> | |
<v-icon>navigate_before</v-icon> | |
<span>{{ $t('settings.sites.add.prev') }}</span> | |
</v-btn> | |
- <v-btn flat color="blue" @click="next(step)" v-show="step<stepCount"> | |
+ <v-btn text color="blue" @click="next(step)" v-show="step<stepCount"> | |
<span>{{ $t('settings.sites.add.next') }}</span> | |
<v-icon>navigate_next</v-icon> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" v-show="step===stepCount" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" v-show="step===stepCount" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
</v-btn> | |
</v-card-actions> | |
Index: src/options/views/settings/Sites/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Sites/Index.vue b/src/options/views/settings/Sites/Index.vue | |
--- a/src/options/views/settings/Sites/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Sites/Index.vue (date 1612516593468) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="set-sites"> | |
- <v-alert :value="true" type="info"> | |
+ <v-alert type="info"> | |
<div>{{ $t('settings.sites.index.title') }}</div> | |
</v-alert> | |
<v-card> | |
@@ -14,7 +14,7 @@ | |
{{$t('common.remove')}} | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" inset vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" inset vertical></v-divider> | |
<input | |
type="file" | |
@@ -29,7 +29,7 @@ | |
{{$t('settings.sites.index.importConfig')}} | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" inset vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" inset vertical></v-divider> | |
<!-- 一键导入已登录站点 --> | |
<v-btn color="info" @click="importAll" :loading="importing"> | |
@@ -38,7 +38,7 @@ | |
</v-btn> | |
<span v-if="importing">{{ $t('settings.sites.index.importedText') }} {{importedCount}}</span> | |
- <v-divider class="mx-3 mt-0" inset vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" inset vertical></v-divider> | |
<!-- 重置站点图标缓存 --> | |
<v-btn color="purple" dark @click="resetFavicons" :loading="faviconReseting"> | |
@@ -53,97 +53,103 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="this.$store.state.options.sites" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="host" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td class="text-xs-center pb-1"> | |
- <v-btn | |
- flat | |
- icon | |
- :title="$t('settings.sites.index.resetFavicons')" | |
- @click.stop="resetFavicon(props.item)" | |
- :loading="loadingIconSites.includes(props.item.host)" | |
- class="siteIcon" | |
- > | |
- <v-avatar :size="18" v-if="!loadingIconSites.includes(props.item.host)"> | |
- <img :src="props.item.icon" /> | |
- </v-avatar> | |
- </v-btn> | |
- <br /> | |
- <a @click="edit(props.item)"> | |
- <span>{{ props.item.name }}</span> | |
- </a> | |
- </td> | |
- <td>{{ props.item.tags && props.item.tags.join(", ") }}</td> | |
- <td> | |
- <v-switch | |
- true-value="true" | |
- false-value="false" | |
- :input-value="props.item.allowSearch?'true':'false'" | |
- hide-details | |
- @click.stop="updateSearchStatus(props.item)" | |
- ></v-switch> | |
- </td> | |
- <td> | |
- <v-switch | |
- true-value="true" | |
- false-value="false" | |
- :input-value="props.item.allowGetUserInfo?'true':'false'" | |
- hide-details | |
- @click.stop="updateAllowGetUserInfo(props.item)" | |
- ></v-switch> | |
- </td> | |
- <!-- <td> | |
- <v-switch | |
- true-value="true" | |
- false-value="false" | |
- :input-value="props.item.offline?'true':'false'" | |
- hide-details | |
- @click.stop="updateOfflineStatus(props.item)" | |
- ></v-switch> | |
- </td>--> | |
- <td> | |
- <a | |
- :href="props.item.activeURL" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- >{{ props.item.activeURL }}</a> | |
- </td> | |
- <td> | |
- <v-icon small @click="edit(props.item)" :title="$t('common.edit')">edit</v-icon> | |
- <v-icon | |
- small | |
- class="ml-2" | |
- @click="editPlugins(props.item)" | |
- :title="$t('settings.sites.index.plugins')" | |
- >assistant</v-icon> | |
- <v-icon | |
- small | |
- class="ml-2" | |
- @click="editSearchEntry(props.item)" | |
- :title="$t('settings.sites.index.searchEntry')" | |
- >search</v-icon> | |
- <v-icon | |
- small | |
- color="error" | |
- class="ml-2" | |
- @click="removeConfirm(props.item)" | |
- :title="$t('common.remove')" | |
- >delete</v-icon> | |
- <v-icon | |
- small | |
- color="info" | |
- class="ml-2" | |
- @click="shareSiteConfig(props.item)" | |
- :title="$t('common.share')" | |
- >share</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-simple-checkbox v-model="props.selected" hide-details primary></v-simple-checkbox> | |
+ </td> | |
+ <td class="text-xs-center pb-1"> | |
+ <v-btn | |
+ :loading="loadingIconSites.includes(props.item.host)" | |
+ :title="$t('settings.sites.index.resetFavicons')" | |
+ class="siteIcon" | |
+ icon | |
+ text | |
+ @click.stop="resetFavicon(props.item)" | |
+ > | |
+ <v-avatar v-if="!loadingIconSites.includes(props.item.host)" :size="18"> | |
+ <img :src="props.item.icon"/> | |
+ </v-avatar> | |
+ </v-btn> | |
+ <br/> | |
+ <a @click="edit(props.item)"> | |
+ <span>{{ props.item.name }}</span> | |
+ </a> | |
+ </td> | |
+ <td>{{ props.item.tags && props.item.tags.join(", ") }}</td> | |
+ <td> | |
+ <v-switch | |
+ :input-value="props.item.allowSearch?'true':'false'" | |
+ false-value="false" | |
+ hide-details | |
+ true-value="true" | |
+ @click.stop="updateSearchStatus(props.item)" | |
+ ></v-switch> | |
+ </td> | |
+ <td> | |
+ <v-switch | |
+ :input-value="props.item.allowGetUserInfo?'true':'false'" | |
+ false-value="false" | |
+ hide-details | |
+ true-value="true" | |
+ @click.stop="updateAllowGetUserInfo(props.item)" | |
+ ></v-switch> | |
+ </td> | |
+ <!-- <td> | |
+ <v-switch | |
+ true-value="true" | |
+ false-value="false" | |
+ :input-value="props.item.offline?'true':'false'" | |
+ hide-details | |
+ @click.stop="updateOfflineStatus(props.item)" | |
+ ></v-switch> | |
+ </td>--> | |
+ <td> | |
+ <a | |
+ :href="props.item.activeURL" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ >{{ props.item.activeURL }}</a> | |
+ </td> | |
+ <td> | |
+ <v-icon :title="$t('common.edit')" small @click="edit(props.item)">edit</v-icon> | |
+ <v-icon | |
+ :title="$t('settings.sites.index.plugins')" | |
+ class="ml-2" | |
+ small | |
+ @click="editPlugins(props.item)" | |
+ >assistant | |
+ </v-icon> | |
+ <v-icon | |
+ :title="$t('settings.sites.index.searchEntry')" | |
+ class="ml-2" | |
+ small | |
+ @click="editSearchEntry(props.item)" | |
+ >search | |
+ </v-icon> | |
+ <v-icon | |
+ :title="$t('common.remove')" | |
+ class="ml-2" | |
+ color="error" | |
+ small | |
+ @click="removeConfirm(props.item)" | |
+ >delete | |
+ </v-icon> | |
+ <v-icon | |
+ :title="$t('common.share')" | |
+ class="ml-2" | |
+ color="info" | |
+ small | |
+ @click="shareSiteConfig(props.item)" | |
+ >share | |
+ </v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -163,11 +169,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -175,7 +181,7 @@ | |
</v-card> | |
</v-dialog> | |
- <v-alert :value="true" color="grey"> | |
+ <v-alert color="grey"> | |
<div v-html="$t('settings.sites.index.subTitle')"></div> | |
</v-alert> | |
@@ -221,7 +227,7 @@ | |
return { | |
selected: [], | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
showAddDialog: false, | |
showEditDialog: false, | |
@@ -280,26 +286,27 @@ | |
updateSearchStatus(item: any) { | |
item.allowSearch = !(<boolean>item.allowSearch); | |
this.$store.commit("updateSite", item); | |
- this.pagination.rowsPerPage = 0; | |
- this.pagination.rowsPerPage = -1; | |
+ this.pagination.itemsPerPage = 0; | |
+ this.pagination.itemsPerPage = -1; | |
}, | |
+ | |
updateAllowGetUserInfo(item: any) { | |
item.allowGetUserInfo = !(<boolean>item.allowGetUserInfo); | |
this.$store.commit("updateSite", item); | |
- this.pagination.rowsPerPage = 0; | |
- this.pagination.rowsPerPage = -1; | |
+ this.pagination.itemsPerPage = 0; | |
+ this.pagination.itemsPerPage = -1; | |
}, | |
updateOfflineStatus(item: any) { | |
item.offline = !(<boolean>item.offline); | |
this.$store.commit("updateSite", item); | |
- this.pagination.rowsPerPage = 0; | |
- this.pagination.rowsPerPage = -1; | |
+ this.pagination.itemsPerPage = 0; | |
+ this.pagination.itemsPerPage = -1; | |
}, | |
updateSite(item: any) { | |
// this.selectedSite = item; | |
this.$store.commit("updateSite", item); | |
- this.pagination.rowsPerPage = 0; | |
- this.pagination.rowsPerPage = -1; | |
+ this.pagination.itemsPerPage = 0; | |
+ this.pagination.itemsPerPage = -1; | |
}, | |
addSite(item: any) { | |
if (!item.host) { | |
Index: yarn.lock | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/yarn.lock b/yarn.lock | |
--- a/yarn.lock (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/yarn.lock (date 1612506284924) | |
@@ -801,6 +801,11 @@ | |
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" | |
integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== | |
+"@types/json-schema@^7.0.6": | |
+ version "7.0.7" | |
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" | |
+ integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== | |
+ | |
"@types/magnet-uri@*": | |
version "5.1.2" | |
resolved "https://registry.yarnpkg.com/@types/magnet-uri/-/magnet-uri-5.1.2.tgz#7860417399d52ddc0be1021d570b4ac93ffc133e" | |
@@ -1297,7 +1302,7 @@ | |
dependencies: | |
acorn "^3.0.4" | |
-acorn-jsx@^5.0.0: | |
+acorn-jsx@^5.0.0, acorn-jsx@^5.2.0: | |
version "5.3.1" | |
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" | |
integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== | |
@@ -1370,7 +1375,7 @@ | |
fast-json-stable-stringify "^2.0.0" | |
json-schema-traverse "^0.3.0" | |
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.9.1: | |
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: | |
version "6.12.6" | |
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" | |
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== | |
@@ -2149,6 +2154,11 @@ | |
dependencies: | |
caller-callsite "^2.0.0" | |
+callsite@^1.0.0: | |
+ version "1.0.0" | |
+ resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" | |
+ integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= | |
+ | |
callsites@^0.2.0: | |
version "0.2.0" | |
resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" | |
@@ -2818,13 +2828,6 @@ | |
postcss-value-parser "^3.3.0" | |
source-list-map "^2.0.0" | |
-css-parse@~2.0.0: | |
- version "2.0.0" | |
- resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4" | |
- integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q= | |
- dependencies: | |
- css "^2.0.0" | |
- | |
css-select-base-adapter@^0.1.1: | |
version "0.1.1" | |
resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" | |
@@ -2869,16 +2872,6 @@ | |
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" | |
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== | |
-css@^2.0.0: | |
- version "2.2.4" | |
- resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" | |
- integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== | |
- dependencies: | |
- inherits "^2.0.3" | |
- source-map "^0.6.1" | |
- source-map-resolve "^0.5.2" | |
- urix "^0.1.0" | |
- | |
cssesc@^3.0.0: | |
version "3.0.0" | |
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" | |
@@ -2993,7 +2986,7 @@ | |
dependencies: | |
ms "2.0.0" | |
-debug@=3.1.0, debug@~3.1.0: | |
+debug@=3.1.0: | |
version "3.1.0" | |
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" | |
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== | |
@@ -3014,6 +3007,13 @@ | |
dependencies: | |
ms "2.1.2" | |
+decache@^4.6.0: | |
+ version "4.6.0" | |
+ resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.0.tgz#87026bc6e696759e82d57a3841c4e251a30356e8" | |
+ integrity sha512-PppOuLiz+DFeaUvFXEYZjLxAkKiMYH/do/b/MxpDe/8AgKBi5GhZxridoVIbBq72GDbL36e4p0Ce2jTGUwwU+w== | |
+ dependencies: | |
+ callsite "^1.0.0" | |
+ | |
decamelize@^1.2.0: | |
version "1.2.0" | |
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" | |
@@ -3501,6 +3501,23 @@ | |
dependencies: | |
vue-eslint-parser "^5.0.0" | |
+eslint-plugin-vue@^6.2.2: | |
+ version "6.2.2" | |
+ resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" | |
+ integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ== | |
+ dependencies: | |
+ natural-compare "^1.4.0" | |
+ semver "^5.6.0" | |
+ vue-eslint-parser "^7.0.0" | |
+ | |
+eslint-plugin-vuetify@^1.0.0-beta.7: | |
+ version "1.0.0-beta.7" | |
+ resolved "https://registry.yarnpkg.com/eslint-plugin-vuetify/-/eslint-plugin-vuetify-1.0.0-beta.7.tgz#5f59e821e33df22a44f58a21ebd60fc6604e3f76" | |
+ integrity sha512-1qzMFR9QlcQLzMWxgslTnluDF3hZne9Q24jEfYu3mEhhs/4SiFrCFvbKmVkMShY4kfeZRcLL87KzlUq+3dyyuw== | |
+ dependencies: | |
+ eslint-plugin-vue "^6.2.2" | |
+ requireindex "^1.2.0" | |
+ | |
eslint-scope@^3.7.1: | |
version "3.7.3" | |
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535" | |
@@ -3517,6 +3534,14 @@ | |
esrecurse "^4.1.0" | |
estraverse "^4.1.1" | |
+eslint-scope@^5.0.0: | |
+ version "5.1.1" | |
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" | |
+ integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== | |
+ dependencies: | |
+ esrecurse "^4.3.0" | |
+ estraverse "^4.1.1" | |
+ | |
eslint-utils@^1.3.1: | |
version "1.4.3" | |
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" | |
@@ -3641,6 +3666,15 @@ | |
acorn-jsx "^5.0.0" | |
eslint-visitor-keys "^1.0.0" | |
+espree@^6.2.1: | |
+ version "6.2.1" | |
+ resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" | |
+ integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== | |
+ dependencies: | |
+ acorn "^7.1.1" | |
+ acorn-jsx "^5.2.0" | |
+ eslint-visitor-keys "^1.1.0" | |
+ | |
esprima@^4.0.0: | |
version "4.0.1" | |
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" | |
@@ -3653,7 +3687,7 @@ | |
dependencies: | |
estraverse "^5.1.0" | |
-esrecurse@^4.1.0: | |
+esrecurse@^4.1.0, esrecurse@^4.3.0: | |
version "4.3.0" | |
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" | |
integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== | |
@@ -3949,13 +3983,13 @@ | |
loader-utils "^1.0.2" | |
schema-utils "^1.0.0" | |
-file-loader@^4.0.0: | |
- version "4.3.0" | |
- resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" | |
- integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== | |
+file-loader@^6.2.0: | |
+ version "6.2.0" | |
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" | |
+ integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== | |
dependencies: | |
- loader-utils "^1.2.3" | |
- schema-utils "^2.5.0" | |
+ loader-utils "^2.0.0" | |
+ schema-utils "^3.0.0" | |
file-saver@^2.0.0: | |
version "2.0.5" | |
@@ -4320,7 +4354,7 @@ | |
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" | |
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= | |
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: | |
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: | |
version "7.1.6" | |
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" | |
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== | |
@@ -4933,7 +4967,7 @@ | |
default-gateway "^4.2.0" | |
ipaddr.js "^1.9.0" | |
-interpret@^1.4.0: | |
+interpret@^1.0.0, interpret@^1.4.0: | |
version "1.4.0" | |
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" | |
integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== | |
@@ -5530,7 +5564,7 @@ | |
json5 "^0.5.0" | |
object-assign "^4.0.1" | |
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.0, loader-utils@^1.2.3, loader-utils@^1.4.0: | |
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: | |
version "1.4.0" | |
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" | |
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== | |
@@ -5539,6 +5573,15 @@ | |
emojis-list "^3.0.0" | |
json5 "^1.0.1" | |
+loader-utils@^2.0.0: | |
+ version "2.0.0" | |
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" | |
+ integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== | |
+ dependencies: | |
+ big.js "^5.2.2" | |
+ emojis-list "^3.0.0" | |
+ json5 "^2.1.2" | |
+ | |
locate-path@^2.0.0: | |
version "2.0.0" | |
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" | |
@@ -5562,11 +5605,6 @@ | |
dependencies: | |
p-locate "^4.1.0" | |
-lodash.clonedeep@^4.5.0: | |
- version "4.5.0" | |
- resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" | |
- integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= | |
- | |
lodash.defaults@^4.2.0: | |
version "4.2.0" | |
resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" | |
@@ -5676,6 +5714,13 @@ | |
dependencies: | |
yallist "^3.0.2" | |
+lru-cache@^6.0.0: | |
+ version "6.0.0" | |
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" | |
+ integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== | |
+ dependencies: | |
+ yallist "^4.0.0" | |
+ | |
magnet-uri@^5.1.3: | |
version "5.4.0" | |
resolved "https://registry.yarnpkg.com/magnet-uri/-/magnet-uri-5.4.0.tgz#5c64d3b8853eafb2f31840df09fbfc90c00f0e1d" | |
@@ -5966,11 +6011,6 @@ | |
dependencies: | |
minimist "^1.2.5" | |
-mkdirp@~1.0.4: | |
- version "1.0.4" | |
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" | |
- integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== | |
- | |
move-concurrently@^1.0.1: | |
version "1.0.1" | |
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" | |
@@ -6207,6 +6247,14 @@ | |
dependencies: | |
boolbase "~1.0.0" | |
+null-loader@^3.0.0: | |
+ version "3.0.0" | |
+ resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-3.0.0.tgz#3e2b6c663c5bda8c73a54357d8fa0708dc61b245" | |
+ integrity sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw== | |
+ dependencies: | |
+ loader-utils "^1.2.3" | |
+ schema-utils "^1.0.0" | |
+ | |
num2fraction@^1.2.2: | |
version "1.2.2" | |
resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" | |
@@ -7336,6 +7384,13 @@ | |
dependencies: | |
picomatch "^2.2.1" | |
+rechoir@^0.6.2: | |
+ version "0.6.2" | |
+ resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" | |
+ integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= | |
+ dependencies: | |
+ resolve "^1.1.6" | |
+ | |
regenerate-unicode-properties@^8.2.0: | |
version "8.2.0" | |
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" | |
@@ -7501,6 +7556,11 @@ | |
caller-path "^0.1.0" | |
resolve-from "^1.0.0" | |
+requireindex@^1.2.0: | |
+ version "1.2.0" | |
+ resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef" | |
+ integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww== | |
+ | |
requireindex@~1.1.0: | |
version "1.1.0" | |
resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162" | |
@@ -7558,7 +7618,7 @@ | |
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" | |
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= | |
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.4.0: | |
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.4.0: | |
version "1.19.0" | |
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" | |
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== | |
@@ -7669,7 +7729,7 @@ | |
dependencies: | |
ret "~0.1.10" | |
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: | |
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: | |
version "2.1.2" | |
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" | |
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== | |
@@ -7706,7 +7766,7 @@ | |
ajv-errors "^1.0.0" | |
ajv-keywords "^3.1.0" | |
-schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6: | |
+schema-utils@^2.6.5, schema-utils@^2.6.6: | |
version "2.7.1" | |
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" | |
integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== | |
@@ -7715,6 +7775,15 @@ | |
ajv "^6.12.4" | |
ajv-keywords "^3.5.2" | |
+schema-utils@^3.0.0: | |
+ version "3.0.0" | |
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" | |
+ integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== | |
+ dependencies: | |
+ "@types/json-schema" "^7.0.6" | |
+ ajv "^6.12.5" | |
+ ajv-keywords "^3.5.2" | |
+ | |
select-hose@^2.0.0: | |
version "2.0.0" | |
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" | |
@@ -7742,6 +7811,13 @@ | |
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" | |
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== | |
+semver@^7.1.2: | |
+ version "7.3.4" | |
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" | |
+ integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== | |
+ dependencies: | |
+ lru-cache "^6.0.0" | |
+ | |
send@0.17.1: | |
version "0.17.1" | |
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" | |
@@ -7875,6 +7951,15 @@ | |
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" | |
integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== | |
+shelljs@^0.8.3: | |
+ version "0.8.4" | |
+ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" | |
+ integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ== | |
+ dependencies: | |
+ glob "^7.0.0" | |
+ interpret "^1.0.0" | |
+ rechoir "^0.6.2" | |
+ | |
signal-exit@^3.0.0, signal-exit@^3.0.2: | |
version "3.0.3" | |
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" | |
@@ -7998,7 +8083,7 @@ | |
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" | |
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== | |
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: | |
+source-map-resolve@^0.5.0: | |
version "0.5.3" | |
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" | |
integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== | |
@@ -8032,11 +8117,6 @@ | |
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" | |
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== | |
-source-map@^0.7.3: | |
- version "0.7.3" | |
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" | |
- integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== | |
- | |
spdx-correct@^3.0.0: | |
version "3.1.1" | |
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" | |
@@ -8331,29 +8411,6 @@ | |
postcss "^7.0.0" | |
postcss-selector-parser "^3.0.0" | |
-stylus-loader@^3.0.1: | |
- version "3.0.2" | |
- resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6" | |
- integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA== | |
- dependencies: | |
- loader-utils "^1.0.2" | |
- lodash.clonedeep "^4.5.0" | |
- when "~3.6.x" | |
- | |
-stylus@^0.54.5: | |
- version "0.54.8" | |
- resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147" | |
- integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg== | |
- dependencies: | |
- css-parse "~2.0.0" | |
- debug "~3.1.0" | |
- glob "^7.1.6" | |
- mkdirp "~1.0.4" | |
- safer-buffer "^2.1.2" | |
- sax "~1.2.4" | |
- semver "^6.3.0" | |
- source-map "^0.7.3" | |
- | |
supports-color@^2.0.0: | |
version "2.0.0" | |
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" | |
@@ -9014,10 +9071,14 @@ | |
resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6" | |
integrity sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A== | |
-vue-cli-plugin-vuetify@^0.4.6: | |
- version "0.4.6" | |
- resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-0.4.6.tgz#91c4534d17bc04bbd6f41eacdb6ff49be0f59f2b" | |
- integrity sha512-vkai2B3XqanmscUYSioIjJkU7bzBZGl9mCuIISEZtaDy3qWEkF143UGdJ72u/rGuOytLxpV+9B+FNoV93qlnag== | |
+vue-cli-plugin-vuetify@^2.1.0: | |
+ version "2.1.0" | |
+ resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.1.0.tgz#1261d5866bca8f5c256f1b13abad2568fbcd6bb2" | |
+ integrity sha512-cvJR2+6U1PS4UUP7NnuylWfxM3LrzKnusOgrCZUyzr5abyDxf/t0TZy5EqfJwAa9/TsIO0W4gOoaoy/f4Yw0aQ== | |
+ dependencies: | |
+ null-loader "^3.0.0" | |
+ semver "^7.1.2" | |
+ shelljs "^0.8.3" | |
vue-eslint-parser@^2.0.3: | |
version "2.0.3" | |
@@ -9043,6 +9104,18 @@ | |
esquery "^1.0.1" | |
lodash "^4.17.11" | |
+vue-eslint-parser@^7.0.0: | |
+ version "7.4.1" | |
+ resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz#e4adcf7876a7379758d9056a72235af18a587f92" | |
+ integrity sha512-AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ== | |
+ dependencies: | |
+ debug "^4.1.1" | |
+ eslint-scope "^5.0.0" | |
+ eslint-visitor-keys "^1.1.0" | |
+ espree "^6.2.1" | |
+ esquery "^1.0.1" | |
+ lodash "^4.17.15" | |
+ | |
vue-hot-reload-api@^2.3.0: | |
version "2.3.4" | |
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" | |
@@ -9102,18 +9175,19 @@ | |
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" | |
integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== | |
-vuetify-loader@^1.0.5: | |
- version "1.6.0" | |
- resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.6.0.tgz#05df0805b3ab2ff0de198109d34f9da3f69da667" | |
- integrity sha512-1bx3YeZ712dT1+QMX+XSFlP0O5k5O5Ui9ysBBmUZ9bWkAEHWZJQI9soI+qG5qmeFxUC0L9QYMCIKP0hOL/pf3Q== | |
+vuetify-loader@^1.7.1: | |
+ version "1.7.1" | |
+ resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.7.1.tgz#d2fb905ee7dbd1183ea210dbd31e52756fd622fc" | |
+ integrity sha512-zRfgNxi/SeE8Nh4Vhw3aIJftYrcJWd3PqPn8+cB/F9CgBVhJo5qp2BuFL70k33G1kTaBvcjYgM+vZc9nvvU3xg== | |
dependencies: | |
- file-loader "^4.0.0" | |
- loader-utils "^1.2.0" | |
+ decache "^4.6.0" | |
+ file-loader "^6.2.0" | |
+ loader-utils "^2.0.0" | |
-vuetify@^1.3.0: | |
- version "1.5.24" | |
- resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.5.24.tgz#d5cf6e7289570d5d05f8832a097cd435d36d37df" | |
- integrity sha512-guFOgEgZ8VpSgNXOv1QL2fOliaJBoiyNnf+bBqcXsnIppJGRlW1wyT6Ux7ZlQyphSHs+UK1aJNUjcyAtoOiHWg== | |
+vuetify@^2.4.3: | |
+ version "2.4.3" | |
+ resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.4.3.tgz#8d6f15dde396e81f64e130d8ac0bc272e030879c" | |
+ integrity sha512-i2/Df0U0sedlaCbft4NMbna7WXbTCBhKVYTMjBrLVzrYTTWqzSO7ZCxLuDRY7MjwQhn7AOec7ent9U/NyIICqA== | |
vuex@^3.0.1: | |
version "3.6.0" | |
@@ -9328,11 +9402,6 @@ | |
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" | |
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== | |
-when@~3.6.x: | |
- version "3.6.4" | |
- resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e" | |
- integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404= | |
- | |
which-module@^2.0.0: | |
version "2.0.0" | |
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" | |
Index: src/options/views/settings/Sites/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Sites/Editor.vue b/src/options/views/settings/Sites/Editor.vue | |
--- a/src/options/views/settings/Sites/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Sites/Editor.vue (date 1612515152750) | |
@@ -1,5 +1,5 @@ | |
<template> | |
- <v-card class="mb-5" color="grey lighten-4"> | |
+ <v-card class="mb-12" color="grey lighten-4"> | |
<v-card-text> | |
<v-form v-model="valid"> | |
<!-- 站点名称 --> | |
@@ -43,16 +43,16 @@ | |
item-value="name" | |
v-if="site.isCustom" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
+ <template v-slot:selection="{ item }"> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ data.item.ver }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ data.item.ver }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
@@ -122,17 +122,17 @@ | |
item-text="name" | |
item-value="id" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
+ <template v-slot:selection="{ item }"> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.address"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ data.item.type }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.address"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ data.item.type }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
@@ -147,11 +147,11 @@ | |
<!-- 搜索入口设置 v-if="site.allowSearch" --> | |
<template v-if="site.allowSearch"> | |
- <v-container fluid class="ma-0 pa-0 ml-4"> | |
- <v-layout row wrap class="ma-0 pa-0"> | |
- <v-flex | |
+ <v-container fluid class="ma-0 pa-0 ml-6"> | |
+ <v-row class="ma-0 pa-0"> | |
+ <v-col | |
class="ma-0 pa-0" | |
- xs3 | |
+ cols="3" | |
v-for="(item, key, index) in site.searchEntry" | |
:key="index" | |
> | |
@@ -161,8 +161,8 @@ | |
:label="item.name" | |
v-model="item.enabled" | |
></v-checkbox> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</template> | |
Index: src/options/views/settings/Sites/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Sites/Edit.vue b/src/options/views/settings/Sites/Edit.vue | |
--- a/src/options/views/settings/Sites/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Sites/Edit.vue (date 1612510645336) | |
@@ -12,13 +12,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/Backup/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Backup/Index.vue b/src/options/views/settings/Backup/Index.vue | |
--- a/src/options/views/settings/Backup/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Backup/Index.vue (date 1612516892636) | |
@@ -1,8 +1,8 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ $t('settings.backup.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('settings.backup.title') }}</v-alert> | |
<v-card> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<input type="file" ref="fileRestore" style="display:none;" /> | |
<v-btn color="success" @click="createBackupFile"> | |
<v-icon>save</v-icon> | |
@@ -13,7 +13,7 @@ | |
<span class="ml-1">{{ $t('settings.backup.restore') }}</span> | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" vertical></v-divider> | |
<v-menu offset-y> | |
<template v-slot:activator="{ on }"> | |
@@ -23,13 +23,13 @@ | |
</v-btn> | |
</template> | |
<v-list> | |
- <v-list-tile | |
+ <v-list-item | |
v-for="(item, index) in backupServerTypes" | |
:key="index" | |
@click="showAddServer(item.type)" | |
> | |
- <v-list-tile-title>{{ item.type }}</v-list-tile-title> | |
- </v-list-tile> | |
+ <v-list-item-title>{{ item.type }}</v-list-item-title> | |
+ </v-list-item> | |
</v-list> | |
</v-menu> | |
@@ -75,72 +75,74 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="servers" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="id" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="editBackupServer(props.item)">{{ props.item.name }}</a> | |
- </td> | |
- <td> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- @click="backupToServer(props.item)" | |
- :loading="props.item.backingup" | |
- color="success" | |
- class="mx-0" | |
- :title="$t('settings.backup.server.list.backupToServer')" | |
- > | |
- <v-icon small>backup</v-icon> | |
- </v-btn> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- @click="getBackupServerFileList(props)" | |
- :loading="props.item.loading" | |
- color="info" | |
- class="mx-0" | |
- :title="$t('settings.backup.server.list.loadBackupList')" | |
- > | |
- <v-icon small>restore</v-icon> | |
- </v-btn> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- @click="editBackupServer(props.item)" | |
- color="grey" | |
- class="mx-0" | |
- :title="$t('common.edit')" | |
- > | |
- <v-icon small>edit</v-icon> | |
- </v-btn> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- @click="removeBackupServer(props.item)" | |
- :loading="props.item.deleting" | |
- color="error" | |
- class="mx-0" | |
- :title="$t('common.remove')" | |
- > | |
- <v-icon small>delete</v-icon> | |
- </v-btn> | |
- </td> | |
- <td>{{ props.item.type }}</td> | |
- <td>{{ props.item.lastBackupTime | formatDate }}</td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="editBackupServer(props.item)">{{ props.item.name }}</a> | |
+ </td> | |
+ <td> | |
+ <v-btn | |
+ :loading="props.item.backingup" | |
+ :title="$t('settings.backup.server.list.backupToServer')" | |
+ class="mx-0" | |
+ color="success" | |
+ icon | |
+ small | |
+ text | |
+ @click="backupToServer(props.item)" | |
+ > | |
+ <v-icon small>backup</v-icon> | |
+ </v-btn> | |
+ <v-btn | |
+ :loading="props.item.loading" | |
+ :title="$t('settings.backup.server.list.loadBackupList')" | |
+ class="mx-0" | |
+ color="info" | |
+ icon | |
+ small | |
+ text | |
+ @click="getBackupServerFileList(props)" | |
+ > | |
+ <v-icon small>restore</v-icon> | |
+ </v-btn> | |
+ <v-btn | |
+ :title="$t('common.edit')" | |
+ class="mx-0" | |
+ color="grey" | |
+ icon | |
+ small | |
+ text | |
+ @click="editBackupServer(props.item)" | |
+ > | |
+ <v-icon small>edit</v-icon> | |
+ </v-btn> | |
+ <v-btn | |
+ :loading="props.item.deleting" | |
+ :title="$t('common.remove')" | |
+ class="mx-0" | |
+ color="error" | |
+ icon | |
+ small | |
+ text | |
+ @click="removeBackupServer(props.item)" | |
+ > | |
+ <v-icon small>delete</v-icon> | |
+ </v-btn> | |
+ </td> | |
+ <td>{{ props.item.type }}</td> | |
+ <td>{{ props.item.lastBackupTime | formatDate }}</td> | |
+ </tr> | |
</template> | |
- <template slot="expand" slot-scope="props"> | |
- <div class="px-5" style="padding-left: 80px !important;"> | |
+ <template v-slot:expanded-item="props"> | |
+ <div class="px-12" style="padding-left: 80px !important;"> | |
<ServerList | |
:items="props.item.dataList" | |
:server="props.item" | |
@@ -153,7 +155,7 @@ | |
</template> | |
</v-data-table> | |
</v-card> | |
- <v-alert :value="true" color="grey">{{ $t('settings.backup.subTitle') }}</v-alert> | |
+ <v-alert color="grey">{{ $t('settings.backup.subTitle') }}</v-alert> | |
<v-snackbar v-model="haveError" top :timeout="3000" color="error">{{ errorMsg }}</v-snackbar> | |
<v-snackbar v-model="haveSuccess" bottom :timeout="3000" color="success">{{ successMsg }}</v-snackbar> | |
@@ -230,7 +232,7 @@ | |
}, | |
isDevelopmentMode: true, | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
selected: [] as any, | |
showServerAdd: false, | |
Index: src/options/views/UserDataTimeline.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/UserDataTimeline.vue b/src/options/views/UserDataTimeline.vue | |
--- a/src/options/views/UserDataTimeline.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/UserDataTimeline.vue (date 1612510399763) | |
@@ -17,7 +17,7 @@ | |
</v-chip> | |
<v-spacer></v-spacer> | |
<v-btn | |
- flat | |
+ text | |
icon | |
class="white--text" | |
@click="share" | |
@@ -27,7 +27,7 @@ | |
<v-icon>share</v-icon> | |
</v-btn> | |
<v-btn | |
- flat | |
+ text | |
icon | |
class="white--text" | |
to="/home" | |
@@ -122,8 +122,8 @@ | |
></v-switch> | |
<v-divider /> | |
<h1 style="padding: 5px;">{{ $t('timeline.showSites') }}</h1> | |
- <v-layout justify-start row wrap> | |
- <v-flex v-for="(site, i) in sites" :key="i" xs3> | |
+ <v-row justify="start" > | |
+ <v-col v-for="(site, i) in sites" :key="i" cols="3"> | |
<v-switch | |
color="success" | |
v-model="showSites" | |
@@ -133,8 +133,8 @@ | |
:disabled="!site.allowGetUserInfo" | |
@change="formatData" | |
></v-switch> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</div> | |
</div> | |
</template> | |
Index: src/options/views/Home.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/Home.vue b/src/options/views/Home.vue | |
--- a/src/options/views/Home.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/Home.vue (date 1612516723467) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="home"> | |
- <v-alert :value="true" type="info">{{ $t("home.title") }}</v-alert> | |
+ <v-alert type="info">{{ $t("home.title") }}</v-alert> | |
<v-card> | |
<v-card-title v-if="sites && sites.length > 0"> | |
<v-btn color="success" @click="getInfos" :loading="loading" :title="$t('home.getInfos')"> | |
@@ -23,7 +23,7 @@ | |
</template> | |
<v-card> | |
- <v-container grid-list-xs> | |
+ <v-container > | |
<v-switch | |
color="success" | |
v-model="showSiteName" | |
@@ -70,111 +70,116 @@ | |
:search="filterKey" | |
:headers="headers" | |
:items="sites" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="host" | |
class="elevation-1" | |
ref="userDataTable" | |
:no-data-text="$t('home.nodata')" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <!-- 站点 --> | |
- <td class="center"> | |
- <v-badge color="red messageCount" overlap> | |
- <template | |
- v-slot:badge | |
- v-if="props.item.user.messageCount > 0" | |
- :title="$t('home.newMessage')" | |
- > | |
- {{ | |
- props.item.user.messageCount > 10 | |
- ? "" | |
- : props.item.user.messageCount | |
- }} | |
- </template> | |
- <v-btn | |
- flat | |
- icon | |
- class="siteIcon" | |
- :title="$t('home.getInfos')" | |
- @click.stop="getSiteUserInfo(props.item)" | |
- > | |
- <v-avatar :size="showSiteName ? 18 : 24"> | |
- <img :src="props.item.icon" /> | |
- </v-avatar> | |
- </v-btn> | |
- </v-badge> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <!-- 站点 --> | |
+ <td class="center"> | |
+ <v-badge color="red messageCount" overlap> | |
+ <template | |
+ v-if="props.item.user.messageCount > 0" | |
+ v-slot:badge | |
+ :title="$t('home.newMessage')" | |
+ > | |
+ {{ | |
+ props.item.user.messageCount > 10 | |
+ ? "" | |
+ : props.item.user.messageCount | |
+ }} | |
+ </template> | |
+ <v-btn | |
+ :title="$t('home.getInfos')" | |
+ class="siteIcon" | |
+ icon | |
+ text | |
+ @click.stop="getSiteUserInfo(props.item)" | |
+ > | |
+ <v-avatar :size="showSiteName ? 18 : 24"> | |
+ <img :src="props.item.icon"/> | |
+ </v-avatar> | |
+ </v-btn> | |
+ </v-badge> | |
- <br /> | |
- <a | |
- :href="props.item.activeURL" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- class="nodecoration" | |
- v-if="showSiteName" | |
- > | |
- <span class="caption">{{ props.item.name }}</span> | |
- </a> | |
- </td> | |
- <td>{{ showUserName ? props.item.user.name : "****" }}</td> | |
- <td>{{ showUserLevel ? props.item.user.levelName : "****" }}</td> | |
- <td class="number"> | |
- <div> | |
- {{ props.item.user.uploaded | formatSize }} | |
- <v-icon small color="green darken-4">expand_less</v-icon> | |
- </div> | |
- <div> | |
- {{ props.item.user.downloaded | formatSize }} | |
- <v-icon small color="red darken-4">expand_more</v-icon> | |
- </div> | |
- </td> | |
- <td class="number">{{ props.item.user.ratio | formatRatio }}</td> | |
- <td class="number">{{ props.item.user.seeding }}</td> | |
- <td class="number">{{ props.item.user.seedingSize | formatSize }}</td> | |
- <td class="number">{{ props.item.user.bonus | formatNumber }}</td> | |
- <td | |
- class="number" | |
- :title="props.item.user.joinDateTime" | |
- >{{ props.item.user.joinTime | timeAgo(showWeek) }}</td> | |
- <td class="number"> | |
- <v-btn | |
- depressed | |
- small | |
- :to="`statistic/${props.item.host}`" | |
- :title="$t('home.statistic')" | |
- >{{ props.item.user.lastUpdateTime | formatDate('YYYY-MM-DD HH:mm:ss') }}</v-btn> | |
- </td> | |
- <td class="center"> | |
- <v-progress-circular | |
- indeterminate | |
- :width="3" | |
- size="30" | |
- color="green" | |
- v-if="props.item.user.isLoading" | |
- > | |
- <v-icon | |
- v-if="props.item.user.isLoading" | |
- @click="abortRequest(props.item)" | |
- color="red" | |
- small | |
- :title="$t('home.cancelRequest')" | |
- >cancel</v-icon> | |
- </v-progress-circular> | |
- <span v-else> | |
+ <br/> | |
+ <a | |
+ v-if="showSiteName" | |
+ :href="props.item.activeURL" | |
+ class="nodecoration" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ > | |
+ <span class="caption">{{ props.item.name }}</span> | |
+ </a> | |
+ </td> | |
+ <td>{{ showUserName ? props.item.user.name : "****" }}</td> | |
+ <td>{{ showUserLevel ? props.item.user.levelName : "****" }}</td> | |
+ <td class="number"> | |
+ <div> | |
+ {{ props.item.user.uploaded | formatSize }} | |
+ <v-icon color="green darken-4" small>expand_less</v-icon> | |
+ </div> | |
+ <div> | |
+ {{ props.item.user.downloaded | formatSize }} | |
+ <v-icon color="red darken-4" small>expand_more</v-icon> | |
+ </div> | |
+ </td> | |
+ <td class="number">{{ props.item.user.ratio | formatRatio }}</td> | |
+ <td class="number">{{ props.item.user.seeding }}</td> | |
+ <td class="number">{{ props.item.user.seedingSize | formatSize }}</td> | |
+ <td class="number">{{ props.item.user.bonus | formatNumber }}</td> | |
+ <td | |
+ :title="props.item.user.joinDateTime" | |
+ class="number" | |
+ >{{ props.item.user.joinTime | timeAgo(showWeek) }} | |
+ </td> | |
+ <td class="number"> | |
+ <v-btn | |
+ :title="$t('home.statistic')" | |
+ :to="`statistic/${props.item.host}`" | |
+ depressed | |
+ small | |
+ >{{ props.item.user.lastUpdateTime | formatDate('YYYY-MM-DD HH:mm:ss') }} | |
+ </v-btn> | |
+ </td> | |
+ <td class="center"> | |
+ <v-progress-circular | |
+ v-if="props.item.user.isLoading" | |
+ :width="3" | |
+ color="green" | |
+ indeterminate | |
+ size="30" | |
+ > | |
+ <v-icon | |
+ v-if="props.item.user.isLoading" | |
+ :title="$t('home.cancelRequest')" | |
+ color="red" | |
+ small | |
+ @click="abortRequest(props.item)" | |
+ >cancel | |
+ </v-icon> | |
+ </v-progress-circular> | |
+ <span v-else> | |
<a | |
- :href="props.item.activeURL" | |
- v-if="!props.item.user.isLogged" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- class="nodecoration" | |
+ v-if="!props.item.user.isLogged" | |
+ :href="props.item.activeURL" | |
+ class="nodecoration" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
>{{ props.item.user.lastErrorMsg }}</a> | |
<span v-else>{{ props.item.user.lastErrorMsg }}</span> | |
</span> | |
- </td> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
- <v-alert :value="true" color="grey"> | |
+ <v-alert color="grey"> | |
<div v-html="$t('home.tip')"></div> | |
</v-alert> | |
</div> | |
@@ -212,7 +217,7 @@ | |
loading: false, | |
items: [] as any[], | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
options: this.$store.state.options, | |
beginTime: null as any, | |
Index: src/options/views/settings/Backup/Server/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Backup/Server/Add.vue b/src/options/views/settings/Backup/Server/Add.vue | |
--- a/src/options/views/settings/Backup/Server/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Backup/Server/Add.vue (date 1612510400084) | |
@@ -7,7 +7,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-backup-server" | |
target="_blank" | |
@@ -24,13 +24,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3 toolbar"> | |
+ <v-card-actions class="pa-4 toolbar"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/Backup/Server/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Backup/Server/Edit.vue b/src/options/views/settings/Backup/Server/Edit.vue | |
--- a/src/options/views/settings/Backup/Server/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Backup/Server/Edit.vue (date 1612510400057) | |
@@ -7,7 +7,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-backup-server" | |
target="_blank" | |
@@ -24,13 +24,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3 toolbar"> | |
+ <v-card-actions class="pa-4 toolbar"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/Backup/Server/List.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Backup/Server/List.vue b/src/options/views/settings/Backup/Server/List.vue | |
--- a/src/options/views/settings/Backup/Server/List.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Backup/Server/List.vue (date 1612507931246) | |
@@ -3,14 +3,14 @@ | |
<v-progress-circular v-if="loading" indeterminate color="primary" class="ma-2" :width="3"></v-progress-circular> | |
<v-list two-line dense v-if="items && items.length>0"> | |
<template v-for="(item, index) in items"> | |
- <v-list-tile :key="item.name" v-if="item.type=='file'"> | |
- <v-list-tile-avatar> | |
+ <v-list-item :key="item.name" v-if="item.type=='file'"> | |
+ <v-list-item-avatar> | |
<v-icon class="grey lighten-1 white--text">bookmark</v-icon> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title>{{ item.name }}</v-list-tile-title> | |
- <v-list-tile-sub-title> | |
+ <v-list-item-content> | |
+ <v-list-item-title>{{ item.name }}</v-list-item-title> | |
+ <v-list-item-subtitle> | |
<div> | |
<span class="caption mr-2"> | |
<span>{{ item.time | formatDate }}</span> | |
@@ -40,19 +40,19 @@ | |
<v-icon color="red" small>delete</v-icon> | |
</v-btn> | |
</div> | |
- </v-list-tile-sub-title> | |
- </v-list-tile-content> | |
+ </v-list-item-subtitle> | |
+ </v-list-item-content> | |
- <v-list-tile-action></v-list-tile-action> | |
- </v-list-tile> | |
+ <v-list-item-action></v-list-item-action> | |
+ </v-list-item> | |
<v-divider :key="index"></v-divider> | |
</template> | |
</v-list> | |
<v-list two-line dense v-else-if="!loading"> | |
- <v-list-tile> | |
- <v-list-tile-content>{{ $t('settings.backup.server.list.noData') }}</v-list-tile-content> | |
- </v-list-tile> | |
+ <v-list-item> | |
+ <v-list-item-content>{{ $t('settings.backup.server.list.noData') }}</v-list-item-content> | |
+ </v-list-item> | |
</v-list> | |
</div> | |
</template> | |
@@ -156,4 +156,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> | |
Index: src/options/views/settings/Backup/Server/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Backup/Server/Editor.vue b/src/options/views/settings/Backup/Server/Editor.vue | |
--- a/src/options/views/settings/Backup/Server/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Backup/Server/Editor.vue (date 1612510399931) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <v-card class="mb-5" color="grey lighten-4"> | |
+ <v-card class="mb-12" color="grey lighten-4"> | |
<v-card-text> | |
<v-form v-model="valid"> | |
<!-- 类型 --> | |
@@ -45,7 +45,7 @@ | |
@click="showAuthCode = !showAuthCode" | |
>{{showAuthCode ? 'visibility_off' : 'visibility'}}</v-icon> | |
<v-btn | |
- flat | |
+ text | |
small | |
color="primary" | |
@click="applyAuthCode" | |
@@ -85,7 +85,7 @@ | |
</v-form> | |
<v-btn | |
- flat | |
+ text | |
block | |
:color="testButtonColor" | |
:loading="testing" | |
Index: src/options/views/search/SearchTorrent.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/SearchTorrent.vue b/src/options/views/search/SearchTorrent.vue | |
--- a/src/options/views/search/SearchTorrent.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/SearchTorrent.vue (date 1612516835857) | |
@@ -5,11 +5,11 @@ | |
:doubanId="searchPayload.doubanId" | |
v-if="!!options.showMoiveInfoCardOnSearch" | |
/> | |
- <v-alert :value="true" type="info" style="padding:8px 16px;"> | |
+ <v-alert type="info" style="padding:8px 16px;"> | |
{{ $t("searchTorrent.title") }} [{{ key }}], {{ searchMsg }} | |
{{ skipSites }} | |
<v-btn | |
- flat | |
+ text | |
icon | |
small | |
color="white" | |
@@ -24,7 +24,7 @@ | |
<v-btn | |
v-if="searchResult.noResultsSites.length > 0" | |
class="mt-1" | |
- flat | |
+ text | |
small | |
color="white" | |
@click.stop="showNoResultsSites = !showNoResultsSites" | |
@@ -38,7 +38,7 @@ | |
<v-btn | |
v-if="searchResult.failedSites.length > 0" | |
class="mt-1" | |
- flat | |
+ text | |
small | |
color="white" | |
@click.stop="showFailedSites = !showFailedSites" | |
@@ -51,7 +51,7 @@ | |
<v-btn | |
v-if="searchResult.failedSites.length > 0 && showFailedSites" | |
class="mt-1" | |
- flat | |
+ text | |
small | |
color="white" | |
@click.stop="reSearchFailedSites" | |
@@ -63,28 +63,28 @@ | |
<!-- 搜索队列--> | |
<v-list small v-if="searchQueue && searchQueue.length"> | |
<template v-for="(item, index) in searchQueue"> | |
- <v-list-tile :key="item.site.host"> | |
- <v-list-tile-action> | |
+ <v-list-item :key="item.site.host"> | |
+ <v-list-item-action> | |
<v-progress-circular :size="18" :width="2" indeterminate color="primary"></v-progress-circular> | |
- </v-list-tile-action> | |
+ </v-list-item-action> | |
- <v-list-tile-content> | |
- <v-list-tile-title> | |
+ <v-list-item-content> | |
+ <v-list-item-title> | |
<v-avatar size="18" class="mr-2"> | |
<img :src="item.site.icon" /> | |
</v-avatar> | |
{{ item.site.name }} {{ $t("searchTorrent.searching") }} | |
- </v-list-tile-title> | |
- </v-list-tile-content> | |
+ </v-list-item-title> | |
+ </v-list-item-content> | |
- <v-list-tile-action class="mr-5"> | |
+ <v-list-item-action class="mr-12"> | |
<v-icon | |
@click="abortSearch(item.site)" | |
color="red" | |
:title="$t('searchTorrent.cancelSearch')" | |
>cancel</v-icon> | |
- </v-list-tile-action> | |
- </v-list-tile> | |
+ </v-list-item-action> | |
+ </v-list-item> | |
<v-divider v-if="index + 1 < searchQueue.length" :key="'line' + item.site.host + index"></v-divider> | |
</template> | |
</v-list> | |
@@ -92,7 +92,7 @@ | |
<!-- 搜索结果列表 --> | |
<v-card> | |
<v-card-title style="padding: 0 5px 0 3px;"> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<!-- 站点返回的搜索结果 --> | |
<div v-if="searchSiteCount > 1"> | |
<template v-for="(item, key) in searchResult.sites"> | |
@@ -102,7 +102,7 @@ | |
:color="item.length ? 'blue-grey darken-2' : 'grey'" | |
text-color="white" | |
small | |
- class="mr-1 py-3 pl-1" | |
+ class="mr-1 py-4 pl-1" | |
@click.stop="resetDatas(item)" | |
:disabled="!item.length" | |
> | |
@@ -126,7 +126,7 @@ | |
small | |
text-color="white" | |
style="margin-right:-13px;" | |
- class="ml-2 py-3" | |
+ class="ml-2 py-4" | |
disabled | |
> | |
<span>{{ item.length || item.msg }}</span> | |
@@ -144,7 +144,7 @@ | |
color="grey darken-1" | |
text-color="white" | |
small | |
- class="mr-1 py-3 pl-1" | |
+ class="mr-1 py-4 pl-1" | |
disabled | |
> | |
<template> | |
@@ -165,13 +165,13 @@ | |
small | |
text-color="white" | |
style="margin-right:-13px;" | |
- class="ml-2 py-3 chip-compact" | |
+ class="ml-2 py-4 chip-compact" | |
disabled | |
> | |
<span>{{ item.msg }}</span> | |
<v-btn | |
- flat | |
+ text | |
icon | |
small | |
color="grey lighten-2" | |
@@ -194,7 +194,7 @@ | |
color="orange darken-3" | |
text-color="white" | |
small | |
- class="mr-1 py-3 pl-1" | |
+ class="mr-1 py-4 pl-1" | |
disabled | |
> | |
<template> | |
@@ -209,7 +209,7 @@ | |
small | |
text-color="white" | |
style="margin-right:-13px;" | |
- class="ml-2 py-3" | |
+ class="ml-2 py-4" | |
disabled | |
> | |
<a | |
@@ -221,7 +221,7 @@ | |
<span v-if="!item.url">{{ item.msg }}</span> | |
<v-btn | |
- flat | |
+ text | |
icon | |
small | |
color="grey lighten-2" | |
@@ -234,8 +234,8 @@ | |
</v-chip> | |
</template> | |
</div> | |
- </v-flex> | |
- <v-flex xs6> | |
+ </v-col> | |
+ <v-col cols="6"> | |
<!-- 标签列表 --> | |
<div class="mt-1"> | |
<template v-for="(item, key) in searchResult.tags"> | |
@@ -290,9 +290,9 @@ | |
</v-chip> | |
</template> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
- <v-flex xs6> | |
+ <v-col cols="6"> | |
<div> | |
<v-text-field | |
v-model="filterKey" | |
@@ -302,7 +302,7 @@ | |
hide-details | |
></v-text-field> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
</v-card-title> | |
<!-- 操作按钮列表 --> | |
@@ -311,14 +311,14 @@ | |
<div id="divToobarInner" :class="toolbarClass"> | |
<!-- 排序,小屏幕显示 --> | |
<div v-if="$vuetify.breakpoint.smAndDown" style="display: inline-flex;"> | |
- <v-flex xs6 class="px-2" style="height: 50px;"> | |
+ <v-col cols="6" class="px-2" style="height: 50px;"> | |
<v-select | |
:items="orderHeaders" | |
:label="$t('common.orderBy')" | |
v-model="pagination.sortBy" | |
></v-select> | |
- </v-flex> | |
- <v-flex xs6 class="px-0" style="height: 50px;"> | |
+ </v-col> | |
+ <v-col cols="6" class="px-0" style="height: 50px;"> | |
<v-radio-group v-model="currentOrderMode" row> | |
<v-radio | |
class="mr-2" | |
@@ -328,7 +328,7 @@ | |
:value="item.value" | |
></v-radio> | |
</v-radio-group> | |
- </v-flex> | |
+ </v-col> | |
</div> | |
<div style="display: inline-flex;overflow-x:auto;width: 100%;overflow-y:hidden;"> | |
@@ -484,7 +484,7 @@ | |
</template> | |
<v-card> | |
- <v-container grid-list-xs> | |
+ <v-container > | |
<!-- 显示多选框 --> | |
<v-switch | |
color="success" | |
@@ -513,15 +513,15 @@ | |
:custom-filter="searchResultFilter" | |
:headers="headers" | |
:items="datas" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
:loading="loading" | |
item-key="link" | |
:class=" | |
'torrent' + | |
(fixedTable ? ' fixed-table fixed-header v-table__overflow' : '') | |
" | |
- :select-all="checkBox" | |
- :rows-per-page-items="options.rowsPerPageItems" | |
+ :show-select="checkBox" | |
+ :items-per-page-options="options.rowsPerPageItems" | |
> | |
<!-- 表头内容 --> | |
<template v-slot:headers="props"> | |
@@ -551,154 +551,156 @@ | |
</template> | |
<!-- 表格内容 --> | |
- <template slot="items" slot-scope="props"> | |
- <td v-if="checkBox"> | |
- <v-checkbox | |
- v-model="props.selected" | |
- primary | |
- hide-details | |
- @change="shiftCheck($event, props.index)" | |
- ></v-checkbox> | |
- </td> | |
- <!-- 站点 --> | |
- <td class="center" v-if="$vuetify.breakpoint.mdAndUp"> | |
- <v-avatar size="18"> | |
- <img :src="props.item.site.icon" /> | |
- </v-avatar> | |
- <template v-if="$vuetify.breakpoint.width > 1200"> | |
- <br /> | |
- <a | |
- :href="props.item.site.activeURL || props.item.site.url" | |
- target="_blank" | |
- v-html="props.item.site.name" | |
- rel="noopener noreferrer nofollow" | |
- class="captionText" | |
- ></a> | |
- </template> | |
- </td> | |
- <!-- 标题 --> | |
- <td :class="$vuetify.breakpoint.xs ? 'titleCell-mobile' : 'titleCell'"> | |
- <v-avatar | |
- size="14" | |
- class="mr-1" | |
- style="vertical-align: unset;" | |
- v-if="$vuetify.breakpoint.smAndDown" | |
- > | |
- <img :src="props.item.site.icon" /> | |
- </v-avatar> | |
- <a | |
- :href="props.item.link" | |
- target="_blank" | |
- v-html="props.item.titleHTML" | |
- :title="props.item.title" | |
- rel="noopener noreferrer nofollow" | |
- :class="[ | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td v-if="checkBox"> | |
+ <v-checkbox | |
+ v-model="props.selected" | |
+ hide-details | |
+ primary | |
+ @change="shiftCheck($event, props.index)" | |
+ ></v-checkbox> | |
+ </td> | |
+ <!-- 站点 --> | |
+ <td v-if="$vuetify.breakpoint.mdAndUp" class="center"> | |
+ <v-avatar size="18"> | |
+ <img :src="props.item.site.icon"/> | |
+ </v-avatar> | |
+ <template v-if="$vuetify.breakpoint.width > 1200"> | |
+ <br/> | |
+ <a | |
+ :href="props.item.site.activeURL || props.item.site.url" | |
+ class="captionText" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ v-html="props.item.site.name" | |
+ ></a> | |
+ </template> | |
+ </td> | |
+ <!-- 标题 --> | |
+ <td :class="$vuetify.breakpoint.xs ? 'titleCell-mobile' : 'titleCell'"> | |
+ <v-avatar | |
+ v-if="$vuetify.breakpoint.smAndDown" | |
+ class="mr-1" | |
+ size="14" | |
+ style="vertical-align: unset;" | |
+ > | |
+ <img :src="props.item.site.icon"/> | |
+ </v-avatar> | |
+ <a | |
+ :class="[ | |
$vuetify.breakpoint.xs ? 'body-2' : 'subheading', | |
'font-weight-medium', | |
]" | |
- ></a> | |
- <div | |
- class="sub-title captionText" | |
- v-if=" | |
+ :href="props.item.link" | |
+ :title="props.item.title" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ v-html="props.item.titleHTML" | |
+ ></a> | |
+ <div | |
+ v-if=" | |
(props.item.tags && props.item.tags.length) || | |
props.item.subTitle | |
" | |
- > | |
- <span class="mr-1" v-if="props.item.tags && props.item.tags.length"> | |
+ class="sub-title captionText" | |
+ > | |
+ <span v-if="props.item.tags && props.item.tags.length" class="mr-1"> | |
<span | |
- :class="['tag', `${tag.color}`]" | |
- v-for="(tag, index) in props.item.tags" | |
- :key="index" | |
- :title="tag.title" | |
+ v-for="(tag, index) in props.item.tags" | |
+ :key="index" | |
+ :class="['tag', `${tag.color}`]" | |
+ :title="tag.title" | |
>{{ tag.name }}</span> | |
</span> | |
- <span v-if="props.item.subTitle">{{ props.item.subTitle }}</span> | |
- </div> | |
+ <span v-if="props.item.subTitle">{{ props.item.subTitle }}</span> | |
+ </div> | |
- <v-layout v-if="$vuetify.breakpoint.xs"> | |
- <v-flex xs3 class="pt-2 captionText"> | |
- {{ | |
- props.item.size | formatSize | |
- }} | |
- </v-flex> | |
- <v-flex xs3 class="pt-2 captionText"> | |
- <v-icon style="font-size:12px;margin-bottom: 2px;">arrow_upward</v-icon> | |
- {{ props.item.seeders }} | |
- <v-icon style="font-size:12px;margin-bottom: 2px;">arrow_downward</v-icon> | |
- {{ props.item.leechers }} | |
- </v-flex> | |
- <v-flex xs3> | |
- <!-- 进度条 --> | |
- <TorrentProgress | |
- class="progress" | |
- style="position: unset; padding-top:2px;" | |
- v-if="props.item.progress != null" | |
- :progress="parseInt(props.item.progress)" | |
- :status="props.item.status" | |
- ></TorrentProgress> | |
- </v-flex> | |
+ <v-row v-if="$vuetify.breakpoint.xs"> | |
+ <v-col class="pt-2 captionText" cols="3"> | |
+ {{ | |
+ props.item.size | formatSize | |
+ }} | |
+ </v-col> | |
+ <v-col class="pt-2 captionText" cols="3"> | |
+ <v-icon style="font-size:12px;margin-bottom: 2px;">arrow_upward</v-icon> | |
+ {{ props.item.seeders }} | |
+ <v-icon style="font-size:12px;margin-bottom: 2px;">arrow_downward</v-icon> | |
+ {{ props.item.leechers }} | |
+ </v-col> | |
+ <v-col cols="3"> | |
+ <!-- 进度条 --> | |
+ <TorrentProgress | |
+ v-if="props.item.progress != null" | |
+ :progress="parseInt(props.item.progress)" | |
+ :status="props.item.status" | |
+ class="progress" | |
+ style="position: unset; padding-top:2px;" | |
+ ></TorrentProgress> | |
+ </v-col> | |
- <v-flex xs3> | |
- <!-- 工具栏 --> | |
- <Actions | |
- v-if="$vuetify.breakpoint.xs" | |
- :url="props.item.url" | |
- :downloadMethod="props.item.site.downloadMethod" | |
- :isCollectioned="isCollectioned(props.item.link)" | |
- :item="props.item" | |
- @copyLinkToClipboard="copyLinkToClipboard(props.item.url)" | |
- @saveTorrentFile="saveTorrentFile(props.item)" | |
- @addToCollection="addToCollection(props.item)" | |
- @deleteCollection="deleteCollection(props.item)" | |
- @downloadSuccess="downloadSuccess" | |
- @downloadError="downloadError" | |
- /> | |
- </v-flex> | |
- </v-layout> | |
- </td> | |
- <!-- 分类 --> | |
- <td class="category center" v-if="$vuetify.breakpoint.width > 1200"> | |
+ <v-col cols="3"> | |
+ <!-- 工具栏 --> | |
+ <Actions | |
+ v-if="$vuetify.breakpoint.xs" | |
+ :downloadMethod="props.item.site.downloadMethod" | |
+ :isCollectioned="isCollectioned(props.item.link)" | |
+ :item="props.item" | |
+ :url="props.item.url" | |
+ @addToCollection="addToCollection(props.item)" | |
+ @copyLinkToClipboard="copyLinkToClipboard(props.item.url)" | |
+ @deleteCollection="deleteCollection(props.item)" | |
+ @downloadError="downloadError" | |
+ @downloadSuccess="downloadSuccess" | |
+ @saveTorrentFile="saveTorrentFile(props.item)" | |
+ /> | |
+ </v-col> | |
+ </v-row> | |
+ </td> | |
+ <!-- 分类 --> | |
+ <td v-if="$vuetify.breakpoint.width > 1200" class="category center"> | |
<span | |
- v-if="props.item.category && !!props.item.category.name" | |
- :title="props.item.category.name" | |
- class="captionText" | |
+ v-if="props.item.category && !!props.item.category.name" | |
+ :title="props.item.category.name" | |
+ class="captionText" | |
>{{ props.item.category.name }}</span> | |
- <br /> | |
- <span class="captionText"><{{ props.item.entryName }}></span> | |
- </td> | |
- <td class="size" v-if="$vuetify.breakpoint.smAndUp"> | |
- {{ props.item.size | formatSize }} | |
- <TorrentProgress | |
- class="progress" | |
- v-if="props.item.progress != null" | |
- :progress="parseInt(props.item.progress)" | |
- :status="props.item.status" | |
- ></TorrentProgress> | |
- </td> | |
- <td class="size" v-if="$vuetify.breakpoint.smAndUp">{{ props.item.seeders }}</td> | |
- <td class="size" v-if="$vuetify.breakpoint.mdAndUp">{{ props.item.leechers }}</td> | |
- <td class="size" v-if="$vuetify.breakpoint.mdAndUp">{{ props.item.completed }}</td> | |
- <td class="size" v-if="$vuetify.breakpoint.smAndUp">{{ props.item.comments }}</td> | |
- <!-- <td>{{ props.item.author }}</td> --> | |
- <td v-if="$vuetify.breakpoint.mdAndUp">{{ props.item.time | formatDate }}</td> | |
- <td class="text-xs-center" v-if="$vuetify.breakpoint.smAndUp"> | |
- <template v-if="!!props.item.url"> | |
- <Actions | |
- :url="props.item.url" | |
- :downloadMethod="props.item.site.downloadMethod" | |
- :isCollectioned="isCollectioned(props.item.link)" | |
- :item="props.item" | |
- @copyLinkToClipboard="copyLinkToClipboard(props.item.url)" | |
- @saveTorrentFile="saveTorrentFile(props.item)" | |
- @addToCollection="addToCollection(props.item)" | |
- @deleteCollection="deleteCollection(props.item)" | |
- @downloadSuccess="downloadSuccess" | |
- @downloadError="downloadError" | |
- /> | |
- </template> | |
- <span v-else>{{ $t("searchTorrent.failUrl") }}</span> | |
- </td> | |
+ <br/> | |
+ <span class="captionText"><{{ props.item.entryName }}></span> | |
+ </td> | |
+ <td v-if="$vuetify.breakpoint.smAndUp" class="size"> | |
+ {{ props.item.size | formatSize }} | |
+ <TorrentProgress | |
+ v-if="props.item.progress != null" | |
+ :progress="parseInt(props.item.progress)" | |
+ :status="props.item.status" | |
+ class="progress" | |
+ ></TorrentProgress> | |
+ </td> | |
+ <td v-if="$vuetify.breakpoint.smAndUp" class="size">{{ props.item.seeders }}</td> | |
+ <td v-if="$vuetify.breakpoint.mdAndUp" class="size">{{ props.item.leechers }}</td> | |
+ <td v-if="$vuetify.breakpoint.mdAndUp" class="size">{{ props.item.completed }}</td> | |
+ <td v-if="$vuetify.breakpoint.smAndUp" class="size">{{ props.item.comments }}</td> | |
+ <!-- <td>{{ props.item.author }}</td> --> | |
+ <td v-if="$vuetify.breakpoint.mdAndUp">{{ props.item.time | formatDate }}</td> | |
+ <td v-if="$vuetify.breakpoint.smAndUp" class="text-center"> | |
+ <template v-if="!!props.item.url"> | |
+ <Actions | |
+ :downloadMethod="props.item.site.downloadMethod" | |
+ :isCollectioned="isCollectioned(props.item.link)" | |
+ :item="props.item" | |
+ :url="props.item.url" | |
+ @addToCollection="addToCollection(props.item)" | |
+ @copyLinkToClipboard="copyLinkToClipboard(props.item.url)" | |
+ @deleteCollection="deleteCollection(props.item)" | |
+ @downloadError="downloadError" | |
+ @downloadSuccess="downloadSuccess" | |
+ @saveTorrentFile="saveTorrentFile(props.item)" | |
+ /> | |
+ </template> | |
+ <span v-else>{{ $t("searchTorrent.failUrl") }}</span> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
Index: src/options/views/settings/SitePlugins/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SitePlugins/Add.vue b/src/options/views/settings/SitePlugins/Add.vue | |
--- a/src/options/views/settings/SitePlugins/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SitePlugins/Add.vue (date 1612510399707) | |
@@ -7,7 +7,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-custom-plugin" | |
target="_blank" | |
@@ -24,13 +24,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3 toolbar"> | |
+ <v-card-actions class="pa-4 toolbar"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/SitePlugins/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SitePlugins/Index.vue b/src/options/views/settings/SitePlugins/Index.vue | |
--- a/src/options/views/settings/SitePlugins/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SitePlugins/Index.vue (date 1612516871728) | |
@@ -14,7 +14,7 @@ | |
<v-icon class="mr-2">remove</v-icon> | |
{{$t('common.remove')}} | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" inset vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" inset vertical></v-divider> | |
<input | |
type="file" | |
@@ -29,7 +29,7 @@ | |
{{$t('settings.sites.index.importConfig')}} | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" inset vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" inset vertical></v-divider> | |
<v-btn | |
color="info" | |
@@ -47,59 +47,64 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="plugins" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="name" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details v-if="props.item.isCustom"></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="edit(props.item)"> | |
- <span class="ml-2">{{ props.item.name }}</span> | |
- </a> | |
- </td> | |
- <td> | |
- <v-chip | |
- label | |
- color="light-blue" | |
- text-color="white" | |
- v-for="(page, index) in props.item.pages" | |
- :key="index" | |
- small | |
- > | |
- <!-- <v-icon left small>label</v-icon> --> | |
- {{ page }} | |
- </v-chip> | |
- </td> | |
- <td>{{ props.item.url }}</td> | |
- <td> | |
- <v-icon | |
- small | |
- class="mr-2" | |
- @click="edit(props.item)" | |
- :title="$t('common.edit')" | |
- v-if="props.item.isCustom" | |
- >edit</v-icon> | |
- <v-icon | |
- small | |
- color="error" | |
- @click="removeConfirm(props.item)" | |
- :title="$t('common.remove')" | |
- v-if="props.item.isCustom" | |
- >delete</v-icon> | |
- | |
- <v-icon | |
- small | |
- color="info" | |
- class="ml-2" | |
- @click="share(props.item)" | |
- :title="$t('common.share')" | |
- v-if="props.item.isCustom" | |
- >share</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-if="props.item.isCustom" v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="edit(props.item)"> | |
+ <span class="ml-2">{{ props.item.name }}</span> | |
+ </a> | |
+ </td> | |
+ <td> | |
+ <v-chip | |
+ v-for="(page, index) in props.item.pages" | |
+ :key="index" | |
+ color="light-blue" | |
+ label | |
+ small | |
+ text-color="white" | |
+ > | |
+ <!-- <v-icon left small>label</v-icon> --> | |
+ {{ page }} | |
+ </v-chip> | |
+ </td> | |
+ <td>{{ props.item.url }}</td> | |
+ <td> | |
+ <v-icon | |
+ v-if="props.item.isCustom" | |
+ :title="$t('common.edit')" | |
+ class="mr-2" | |
+ small | |
+ @click="edit(props.item)" | |
+ >edit | |
+ </v-icon> | |
+ <v-icon | |
+ v-if="props.item.isCustom" | |
+ :title="$t('common.remove')" | |
+ color="error" | |
+ small | |
+ @click="removeConfirm(props.item)" | |
+ >delete | |
+ </v-icon> | |
+ | |
+ <v-icon | |
+ v-if="props.item.isCustom" | |
+ :title="$t('common.share')" | |
+ class="ml-2" | |
+ color="info" | |
+ small | |
+ @click="share(props.item)" | |
+ >share | |
+ </v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -121,11 +126,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -157,7 +162,7 @@ | |
return { | |
selected: [], | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
showAddDialog: false, | |
showEditDialog: false, | |
Index: src/options/views/settings/DownloadClients/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadClients/Editor.vue b/src/options/views/settings/DownloadClients/Editor.vue | |
--- a/src/options/views/settings/DownloadClients/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadClients/Editor.vue (date 1612510399981) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <v-card class="mb-5" color="grey lighten-4"> | |
+ <v-card class="mb-12" color="grey lighten-4"> | |
<v-card-text> | |
<v-form v-model="option.valid"> | |
<v-text-field | |
@@ -54,7 +54,7 @@ | |
</v-form> | |
<v-btn | |
- flat | |
+ text | |
block | |
:color="testButtonColor" | |
:loading="testing" | |
@@ -64,8 +64,8 @@ | |
<v-icon class="mr-2">{{ testButtonIcon }}</v-icon> | |
{{ successMsg || errorMsg || $t('settings.downloadClients.editor.test') }} | |
</v-btn> | |
- <v-alert :value="true" color="info" v-if="option.description">{{ option.description }}</v-alert> | |
- <v-alert :value="true" color="warning" v-if="option.warning">{{ option.warning }}</v-alert> | |
+ <v-alert color="info" v-if="option.description">{{ option.description }}</v-alert> | |
+ <v-alert color="warning" v-if="option.warning">{{ option.warning }}</v-alert> | |
</v-card-text> | |
</v-card> | |
<v-snackbar v-model="haveError" absolute top :timeout="3000" color="error">{{ errorMsg }}</v-snackbar> | |
Index: src/options/views/settings/SitePlugins/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SitePlugins/Editor.vue b/src/options/views/settings/SitePlugins/Editor.vue | |
--- a/src/options/views/settings/SitePlugins/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SitePlugins/Editor.vue (date 1612507137632) | |
@@ -1,5 +1,5 @@ | |
<template> | |
- <v-card class="mb-5" color="grey lighten-4"> | |
+ <v-card class="mb-12" color="grey lighten-4"> | |
<v-card-text> | |
<v-form v-model="valid"> | |
<!-- 站点名称 --> | |
Index: src/options/views/settings/SitePlugins/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SitePlugins/Edit.vue b/src/options/views/settings/SitePlugins/Edit.vue | |
--- a/src/options/views/settings/SitePlugins/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SitePlugins/Edit.vue (date 1612510645355) | |
@@ -6,7 +6,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-custom-plugin" | |
target="_blank" | |
@@ -23,13 +23,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3 toolbar"> | |
+ <v-card-actions class="pa-4 toolbar"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid||defaultItem.readonly"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid||defaultItem.readonly"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -99,4 +99,4 @@ | |
bottom: 0; | |
right: 0; | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/components/SearchBox.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/SearchBox.vue b/src/options/components/SearchBox.vue | |
--- a/src/options/components/SearchBox.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/SearchBox.vue (date 1612510400075) | |
@@ -23,7 +23,7 @@ | |
nudge-left="12" | |
v-if="topSearches.length > 0" | |
> | |
- <v-btn slot="activator" flat small color="grey lighten-2">{{ | |
+ <v-btn v-slot:activator="on" text small color="grey lighten-2">{{ | |
$t("common.hot") | |
}}</v-btn> | |
@@ -33,9 +33,9 @@ | |
';background-color: #fff;' | |
" | |
> | |
- <v-container fluid grid-list-lg class="pa-3"> | |
- <v-layout row wrap> | |
- <v-flex v-for="(item, index) in topSearches" :key="index" xs4> | |
+ <v-container fluid class="pa-4"> | |
+ <v-row > | |
+ <v-col v-for="(item, index) in topSearches" :key="index" cols="4"> | |
<v-card | |
@click="searchHotItem(item)" | |
style="cursor: pointer" | |
@@ -75,14 +75,14 @@ | |
</div> | |
</v-img> | |
</v-card> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
<v-divider></v-divider> | |
<div class="pa-1 top-searches text-sm-right"> | |
<v-btn | |
- flat | |
+ text | |
small | |
class="caption grey--text" | |
:title="$t('common.refresh')" | |
@@ -99,19 +99,19 @@ | |
</v-menu> | |
<!-- 搜索方案 --> | |
- <v-menu slot="append" offset-y class="search-solution"> | |
- <v-btn slot="activator" flat small color="grey lighten-2">{{ | |
+ <v-menu v-slot:append="{ on }" offset-y class="search-solution"> | |
+ <v-btn v-on="on" text small color="grey lighten-2">{{ | |
selectedSearchSolutionName | |
}}</v-btn> | |
<v-list dense> | |
- <v-list-tile | |
+ <v-list-item | |
@click="changeSearchSolution(null)" | |
:title="$t('searchBox.defaultTip')" | |
> | |
- <v-list-tile-title>{{ | |
+ <v-list-item-title>{{ | |
$t("searchBox.default") | |
- }}</v-list-tile-title> | |
- </v-list-tile> | |
+ }}</v-list-item-title> | |
+ </v-list-item> | |
<v-divider></v-divider> | |
<template | |
v-if=" | |
@@ -119,22 +119,22 @@ | |
$store.state.options.searchSolutions.length > 0 | |
" | |
> | |
- <v-list-tile | |
+ <v-list-item | |
@click="changeSearchSolution(item)" | |
v-for="(item, index) in $store.state.options.searchSolutions" | |
:key="index" | |
> | |
- <v-list-tile-title>{{ item.name }}</v-list-tile-title> | |
- </v-list-tile> | |
+ <v-list-item-title>{{ item.name }}</v-list-item-title> | |
+ </v-list-item> | |
</template> | |
- <v-btn flat small v-else to="/set-search-solution">{{ | |
+ <v-btn text small v-else to="/set-search-solution">{{ | |
$t("searchBox.noSearchSolution") | |
}}</v-btn> | |
<v-divider></v-divider> | |
- <v-list-tile @click="changeSearchSolution(allSite)"> | |
- <v-list-tile-title>{{ $t("searchBox.all") }}</v-list-tile-title> | |
- </v-list-tile> | |
+ <v-list-item @click="changeSearchSolution(allSite)"> | |
+ <v-list-item-title>{{ $t("searchBox.all") }}</v-list-item-title> | |
+ </v-list-item> | |
</v-list> | |
</v-menu> | |
</v-text-field> | |
@@ -143,19 +143,19 @@ | |
<div> | |
<!-- 直接关键字跳转 --> | |
<v-list class="pb-0"> | |
- <v-list-tile @click.stop="itemClick(null)"> | |
- <v-list-tile-content> | |
- <v-list-tile-title> | |
+ <v-list-item @click.stop="itemClick(null)"> | |
+ <v-list-item-content> | |
+ <v-list-item-title> | |
<v-icon>search</v-icon> | |
<span class="title ml-1">{{ | |
$t("searchBox.searchThisKey", { key: this.searchKey }) | |
}}</span> | |
- </v-list-tile-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
+ </v-list-item-title> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
<v-icon>forward</v-icon> | |
- </v-list-tile-action> | |
- </v-list-tile> | |
+ </v-list-item-action> | |
+ </v-list-item> | |
<v-divider v-if="!isLoading"></v-divider> | |
<v-progress-linear | |
:indeterminate="true" | |
@@ -168,12 +168,12 @@ | |
<!-- 预选列表 --> | |
<v-list three-line class="py-0"> | |
<template v-for="(item, index) in items"> | |
- <v-list-tile | |
+ <v-list-item | |
:key="index" | |
@click.stop="itemClick(item)" | |
:title="$t('searchBox.searchThisKey', { key: item.title })" | |
> | |
- <v-list-tile-avatar class="album" :size="75"> | |
+ <v-list-item-avatar class="album" :size="75"> | |
<img | |
:src=" | |
item.image || | |
@@ -184,13 +184,13 @@ | |
: '') | |
" | |
/> | |
- </v-list-tile-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title class="mb-1"> | |
+ </v-list-item-avatar> | |
+ <v-list-item-content> | |
+ <v-list-item-title class="mb-1"> | |
<span class="title">{{ item.title }}</span> | |
<span class="ml-1 caption">({{ item.year }})</span> | |
- </v-list-tile-title> | |
- <v-list-tile-sub-title> | |
+ </v-list-item-title> | |
+ <v-list-item-subtitle> | |
<div> | |
{{ | |
item.aka || item.originalTitle || item.original_title || "" | |
@@ -199,12 +199,12 @@ | |
<div class="caption"> | |
{{ item.genre || (item.genres && item.genres.join(" | ")) }} | |
</div> | |
- </v-list-tile-sub-title> | |
- </v-list-tile-content> | |
+ </v-list-item-subtitle> | |
+ </v-list-item-content> | |
- <v-list-tile-action style="align-items: center"> | |
+ <v-list-item-action style="align-items: center"> | |
<a | |
- class="grey--text text--darken-1 mt-3 title" | |
+ class="grey--text text--darken-1 mt-4 title" | |
style="text-decoration: none" | |
:href="item.link || item.alt || item.url" | |
rel="noopener noreferrer nofollow" | |
@@ -233,21 +233,21 @@ | |
readonly | |
half-increments | |
size="13" | |
- class="mb-3" | |
+ class="mb-4" | |
></v-rating> | |
- </v-list-tile-action> | |
- </v-list-tile> | |
+ </v-list-item-action> | |
+ </v-list-item> | |
<v-divider :key="'l' + index"></v-divider> | |
</template> | |
</v-list> | |
<v-list class="py-0"> | |
- <v-list-tile> | |
- <v-list-tile-content> | |
- <v-list-tile-title class="grey--text text--darken-1 caption">{{ | |
+ <v-list-item> | |
+ <v-list-item-content> | |
+ <v-list-item-title class="grey--text text--darken-1 caption">{{ | |
$t("searchBox.doubanTip") | |
- }}</v-list-tile-title> | |
- </v-list-tile-content> | |
- </v-list-tile> | |
+ }}</v-list-item-title> | |
+ </v-list-item-content> | |
+ </v-list-item> | |
</v-list> | |
</div> | |
</v-menu> | |
Index: src/options/views/statisticCharts/SiteBase.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/statisticCharts/SiteBase.vue b/src/options/views/statisticCharts/SiteBase.vue | |
--- a/src/options/views/statisticCharts/SiteBase.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/statisticCharts/SiteBase.vue (date 1612515152775) | |
@@ -11,49 +11,49 @@ | |
return-object | |
@input="init(selectedSite.host)" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
- <v-list-tile-avatar v-if="item.icon"> | |
+ <template v-slot:selection="{ item }"> | |
+ <v-list-item-avatar v-if="item.icon"> | |
<img :src="item.icon" /> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data"> | |
- <v-list-tile-avatar v-if="data.item.icon"> | |
+ <template v-slot:item="data"> | |
+ <v-list-item-avatar v-if="data.item.icon"> | |
<img :src="data.item.icon" /> | |
- </v-list-tile-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.url"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ joinTags(data.item.tags) }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ </v-list-item-avatar> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.url"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ joinTags(data.item.tags) }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
- <v-layout row wrap class="mb-2"> | |
+ <v-row class="mb-2"> | |
<v-btn depressed small to="/home">{{ $t('statistic.goback') }}</v-btn> | |
<v-btn depressed small @click.stop="exportRawData">{{ $t('statistic.exportRawData') }}</v-btn> | |
<v-spacer> | |
- <v-btn-toggle v-model="dateRange" class="ml-5"> | |
- <v-btn flat value="7day" v-text="$t('statistic.dateRange.7day')"></v-btn> | |
- <v-btn flat value="30day" v-text="$t('statistic.dateRange.30day')"></v-btn> | |
- <v-btn flat value="60day" v-text="$t('statistic.dateRange.60day')"></v-btn> | |
- <v-btn flat value="90day" v-text="$t('statistic.dateRange.90day')"></v-btn> | |
- <v-btn flat value="180day" v-text="$t('statistic.dateRange.180day')"></v-btn> | |
- <v-btn flat value="all" v-text="$t('statistic.dateRange.all')"></v-btn> | |
+ <v-btn-toggle v-model="dateRange" class="ml-12"> | |
+ <v-btn text value="7day" v-text="$t('statistic.dateRange.7day')"></v-btn> | |
+ <v-btn text value="30day" v-text="$t('statistic.dateRange.30day')"></v-btn> | |
+ <v-btn text value="60day" v-text="$t('statistic.dateRange.60day')"></v-btn> | |
+ <v-btn text value="90day" v-text="$t('statistic.dateRange.90day')"></v-btn> | |
+ <v-btn text value="180day" v-text="$t('statistic.dateRange.180day')"></v-btn> | |
+ <v-btn text value="all" v-text="$t('statistic.dateRange.all')"></v-btn> | |
</v-btn-toggle> | |
</v-spacer> | |
- <v-btn flat icon small @click="share" :title="$t('statistic.share')" v-if="!shareing"> | |
+ <v-btn text icon small @click="share" :title="$t('statistic.share')" v-if="!shareing"> | |
<v-icon small>share</v-icon> | |
</v-btn> | |
<v-progress-circular indeterminate :width="3" size="30" color="green" v-if="shareing" class="by_pass_canvas"></v-progress-circular> | |
- </v-layout> | |
+ </v-row> | |
<div ref="charts"> | |
<highcharts :options="chartBaseData" /> | |
- <highcharts :options="chartExtData" class="mt-4" /> | |
+ <highcharts :options="chartExtData" class="mt-6" /> | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
@@ -62,7 +62,7 @@ | |
</v-card-actions> | |
</div> | |
- <v-alert :value="true" type="info" color="grey"> | |
+ <v-alert type="info" color="grey"> | |
<div v-html="$t('statistic.note')"></div> | |
</v-alert> | |
</div> | |
Index: src/options/views/settings/DownloadPaths/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadPaths/Add.vue b/src/options/views/settings/DownloadPaths/Add.vue | |
--- a/src/options/views/settings/DownloadPaths/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadPaths/Add.vue (date 1612515333227) | |
@@ -20,23 +20,23 @@ | |
return-object | |
:rules="rules.require" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
- <v-list-tile-avatar> | |
+ <template v-slot:selection="{ item }"> | |
+ <v-list-item-avatar> | |
<img :src="item.icon"> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-avatar> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-avatar> | |
<img :src="data.item.icon"> | |
- </v-list-tile-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.url"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ joinTags(data.item.tags) }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ </v-list-item-avatar> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.url"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ joinTags(data.item.tags) }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
<v-textarea | |
@@ -46,7 +46,7 @@ | |
:hint="$t('settings.downloadPaths.add.pathTip')" | |
:rules="rules.require" | |
></v-textarea> | |
- <v-alert :value="true" color="info" icon="info" outline v-if="client.pathDescription"> | |
+ <v-alert color="info" icon="info" outlined v-if="client.pathDescription"> | |
<div v-html="client.pathDescription"></div> | |
<KeyDescription/> | |
</v-alert> | |
@@ -55,13 +55,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.add.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.add.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/Base/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/Base/Index.vue b/src/options/views/settings/Base/Index.vue | |
--- a/src/options/views/settings/Base/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/Base/Index.vue (date 1612515152659) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <!-- <v-alert :value="true" type="info">{{ $t('settings.base.title') }}</v-alert> --> | |
+ <!-- <v-alert type="info">{{ $t('settings.base.title') }}</v-alert> --> | |
<v-card> | |
<v-card-text> | |
<v-form v-model="valid" ref="form"> | |
@@ -30,10 +30,10 @@ | |
<!-- 常规选项 --> | |
<v-tab-item key="base"> | |
- <v-container fluid grid-list-xs> | |
- <v-layout row wrap> | |
+ <v-container fluid > | |
+ <v-row > | |
<!-- 默认下载服务器 --> | |
- <v-flex xs10> | |
+ <v-col cols="10"> | |
<v-autocomplete | |
v-model="options.defaultClientId" | |
:items="this.$store.state.options.clients" | |
@@ -48,35 +48,35 @@ | |
autofocus | |
ref="defaultClient" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
+ <template v-slot:selection="{ item }"> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.address"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ data.item.type }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.address"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ data.item.type }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
<template slot="no-data"> | |
<span class="ma-2">{{ $t('settings.base.noClient') }}</span> | |
</template> | |
</v-autocomplete> | |
- </v-flex> | |
- <v-flex xs2></v-flex> | |
+ </v-col> | |
+ <v-col cols="2"></v-col> | |
<!-- 连接超时设置 --> | |
- <v-flex xs10> | |
+ <v-col cols="10"> | |
<v-text-field | |
v-model="options.connectClientTimeout" | |
:label="$t('settings.base.connectClientTimeout')" | |
:placeholder="$t('settings.base.connectClientTimeout')" | |
type="number" | |
></v-text-field> | |
- </v-flex> | |
- <v-flex xs2> | |
+ </v-col> | |
+ <v-col cols="2"> | |
<v-slider | |
style="display:none;" | |
v-model="options.connectClientTimeout" | |
@@ -84,9 +84,9 @@ | |
:min="500" | |
:step="1" | |
></v-slider> | |
- </v-flex> | |
+ </v-col> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<!-- 自动刷新用户数据 --> | |
<v-switch | |
color="success" | |
@@ -95,7 +95,7 @@ | |
></v-switch> | |
<!-- 自动刷新用户数据时间 --> | |
- <v-flex xs12 v-if="options.autoRefreshUserData"> | |
+ <v-col cols="12" v-if="options.autoRefreshUserData"> | |
<div style="margin: -40px 0 10px 45px;"> | |
<span>{{ $t('settings.base.autoRefreshUserDataTip1') }}</span> | |
<v-select | |
@@ -113,10 +113,10 @@ | |
></v-select> | |
<span>{{ $t('settings.base.autoRefreshUserDataTip2') }}</span> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
<!-- 失败重试 --> | |
- <v-flex xs12 v-if="options.autoRefreshUserData"> | |
+ <v-col cols="12" v-if="options.autoRefreshUserData"> | |
<div style="margin: -20px 0 10px 45px;"> | |
<span>{{ $t('settings.base.autoRefreshUserDataTip3') }}</span> | |
<v-select | |
@@ -134,7 +134,7 @@ | |
></v-select> | |
<span>{{ $t('settings.base.autoRefreshUserDataTip5') }}</span> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
<!-- 显示插件图标 --> | |
<v-switch | |
@@ -148,7 +148,7 @@ | |
v-model="options.position" | |
row | |
v-if="options.showToolbarOnContentPage" | |
- class="ml-5" | |
+ class="ml-12" | |
> | |
<span class="mr-1">{{ $t('settings.base.position.label') }}</span> | |
<v-radio | |
@@ -169,7 +169,7 @@ | |
v-if="options.showToolbarOnContentPage" | |
v-model="options.allowDropToSend" | |
:label="$t('settings.base.allowDropToSend')" | |
- class="ml-5" | |
+ class="ml-12" | |
></v-switch> | |
<v-switch | |
@@ -194,7 +194,7 @@ | |
></v-switch> | |
<!-- 加密备份数据 --> | |
- <v-flex xs12 v-if="options.encryptBackupData"> | |
+ <v-col cols="12" v-if="options.encryptBackupData"> | |
<div style="margin: -20px 0 10px 45px;"> | |
<v-text-field | |
v-model="options.encryptSecretKey" | |
@@ -209,7 +209,7 @@ | |
@click="showEncryptSecretKey = !showEncryptSecretKey" | |
>{{showEncryptSecretKey ? 'visibility_off' : 'visibility'}}</v-icon> | |
<v-btn | |
- flat | |
+ text | |
small | |
color="primary" | |
@click="createSecretKey" | |
@@ -217,7 +217,7 @@ | |
>{{ $t('settings.base.createSecretKey') }}</v-btn> | |
<v-btn | |
- flat | |
+ text | |
small | |
color="success" | |
@click="copySecretKeyToClipboard" | |
@@ -226,37 +226,37 @@ | |
</template> | |
</v-text-field> | |
- <v-alert :value="true" type="info">{{ $t('settings.base.encryptTip') }}</v-alert> | |
+ <v-alert type="info">{{ $t('settings.base.encryptTip') }}</v-alert> | |
</div> | |
- </v-flex> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</v-tab-item> | |
<!-- 搜索选项 --> | |
<v-tab-item key="search"> | |
- <v-container fluid grid-list-xs> | |
- <v-layout row wrap> | |
+ <v-container fluid > | |
+ <v-row > | |
<!-- 搜索返回的结果 --> | |
- <v-flex xs6> | |
+ <v-col cols="6"> | |
<v-text-field | |
v-model="options.search.rows" | |
type="number" | |
:label="$t('settings.base.searchResultRows')" | |
:placeholder="$t('settings.base.searchResultRows')" | |
></v-text-field> | |
- </v-flex> | |
- <v-flex xs6> | |
+ </v-col> | |
+ <v-col cols="6"> | |
<v-slider | |
style="display:none;" | |
v-model="options.search.rows" | |
:max="200" | |
:min="1" | |
></v-slider> | |
- </v-flex> | |
+ </v-col> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<!-- 启用内容选择搜索 --> | |
<v-switch | |
color="success" | |
@@ -288,7 +288,7 @@ | |
v-model="options.beforeSearchingOptions.getMovieInformation" | |
:label="$t('settings.base.getMovieInformationBeforeSearching')" | |
></v-switch> | |
- <v-flex xs12 v-if="options.beforeSearchingOptions.getMovieInformation"> | |
+ <v-col cols="12" v-if="options.beforeSearchingOptions.getMovieInformation"> | |
<div style="margin: -40px 0 10px 45px;"> | |
<span>{{ $t('settings.base.maxMovieInformationCount') }}</span> | |
<v-text-field | |
@@ -304,10 +304,10 @@ | |
:min="1" | |
></v-slider> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
<!-- 当点击预选条目时,搜索模式 --> | |
- <v-flex xs12 v-if="options.beforeSearchingOptions.getMovieInformation"> | |
+ <v-col cols="12" v-if="options.beforeSearchingOptions.getMovieInformation"> | |
<div style="margin: -20px 0 10px 45px;"> | |
<span>{{ $t('settings.base.searchModeForItem') }}</span> | |
<v-select | |
@@ -317,26 +317,26 @@ | |
style="max-height: 30px;" | |
></v-select> | |
</div> | |
- </v-flex> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</v-tab-item> | |
<!-- 下载选项 --> | |
<v-tab-item key="download"> | |
- <v-container fluid grid-list-xs> | |
- <v-layout row wrap> | |
- <v-flex xs12> | |
+ <v-container fluid > | |
+ <v-row > | |
+ <v-col cols="12"> | |
<!-- 批量下载时间间隔 --> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<v-text-field | |
v-model="options.batchDownloadInterval" | |
:label="$t('settings.base.batchDownloadInterval')" | |
:placeholder="$t('settings.base.batchDownloadInterval')" | |
type="number" | |
></v-text-field> | |
- </v-flex> | |
+ </v-col> | |
<!-- 保存下载历史 --> | |
<v-switch | |
@@ -353,7 +353,7 @@ | |
></v-switch> | |
<!-- 下载失败重试选项 --> | |
- <v-flex xs12 v-if="options.downloadFailedRetry"> | |
+ <v-col cols="12" v-if="options.downloadFailedRetry"> | |
<div style="margin: -35px 0 10px 45px;"> | |
<span>{{ $t('settings.base.downloadFailedRetryTip1') }}</span> | |
<v-select | |
@@ -371,7 +371,7 @@ | |
></v-text-field> | |
<span>{{ $t('settings.base.downloadFailedRetryTip3') }}</span> | |
</div> | |
- </v-flex> | |
+ </v-col> | |
<!-- 启用后台下载任务 --> | |
<v-switch | |
@@ -387,7 +387,7 @@ | |
:label="$t('settings.base.needConfirmWhenExceedSize')" | |
></v-switch> | |
- <v-flex xs12 v-if="options.needConfirmWhenExceedSize"> | |
+ <v-col cols="12" v-if="options.needConfirmWhenExceedSize"> | |
<div style="margin: -40px 0 10px 40px;"> | |
<v-text-field | |
v-model="options.exceedSize" | |
@@ -402,23 +402,23 @@ | |
style="max-width: 50px;max-height: 30px;" | |
></v-select> | |
</div> | |
- </v-flex> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</v-tab-item> | |
<!-- 高级 --> | |
<v-tab-item key="advanced"> | |
- <v-container fluid grid-list-xs> | |
- <v-layout row wrap> | |
- <v-flex xs12> | |
+ <v-container fluid > | |
+ <v-row > | |
+ <v-col cols="12"> | |
<!-- omdb api key --> | |
<v-textarea | |
v-model="apiKey.omdb" | |
:label="$t('settings.base.apiKey.omdb')" | |
auto-grow | |
- box | |
+ filled | |
></v-textarea> | |
<!-- douban api key --> | |
@@ -426,17 +426,17 @@ | |
v-model="apiKey.douban" | |
:label="$t('settings.base.apiKey.douban')" | |
auto-grow | |
- box | |
+ filled | |
></v-textarea> | |
- <div class="mb-4 text-xs-right"> | |
+ <div class="mb-6 text-right"> | |
<v-btn | |
@click="verifyApiKey" | |
:loading="apiKeyVerifying" | |
>{{ $t('settings.base.verifyApiKey') }}</v-btn> | |
</div> | |
- <v-alert :value="showVerifyingStatus" color="info" icon="info" outline> | |
+ <v-alert :value="showVerifyingStatus" color="info" icon="info" outlined> | |
<div>OMDb:</div> | |
<div v-html="apiKeyVerifyResults.omdb.join('<br>')"></div> | |
<v-divider></v-divider> | |
@@ -444,11 +444,11 @@ | |
<div v-html="apiKeyVerifyResults.douban.join('<br>')"></div> | |
</v-alert> | |
- <v-alert :value="true" color="info" icon="info" outline> | |
+ <v-alert color="info" icon="info" outlined> | |
<div v-html="$t('settings.base.apiKeyTip').toString().replace(/\n/g, '<br>')"></div> | |
</v-alert> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</v-tab-item> | |
</v-tabs> | |
@@ -457,7 +457,7 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-btn color="success" @click="save"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.base.save') }}</span> | |
Index: src/options/views/settings/DownloadPaths/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadPaths/Index.vue b/src/options/views/settings/DownloadPaths/Index.vue | |
--- a/src/options/views/settings/DownloadPaths/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadPaths/Index.vue (date 1612516934790) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="set-download-clients"> | |
- <v-alert :value="true" type="info">{{ $t('settings.downloadPaths.index.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('settings.downloadPaths.index.title') }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-autocomplete | |
@@ -15,17 +15,17 @@ | |
item-text="name" | |
item-value="id" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
+ <template v-slot:selection="{ item }"> | |
<span>{{ item.name }}</span> | |
</template> | |
- <template slot="item" slot-scope="data"> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- <v-list-tile-sub-title v-html="data.item.address"></v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ data.item.allowCustomPath?data.item.type:$t('settings.downloadPaths.index.notSupport') }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ <template v-slot:item="data"> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ <v-list-item-subtitle v-html="data.item.address"></v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ data.item.allowCustomPath?data.item.type:$t('settings.downloadPaths.index.notSupport') }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
@@ -49,25 +49,27 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="getClientPaths" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="name" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="edit(props.item)">{{ props.item.name }}</a> | |
- </td> | |
- <td> | |
- <div v-for="(path, index) in props.item.paths" :key="index">{{path}}</div> | |
- </td> | |
- <td> | |
- <v-icon small class="mr-2" @click="edit(props.item)">edit</v-icon> | |
- <v-icon small color="error" @click="removeConfirm(props.item)">delete</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="edit(props.item)">{{ props.item.name }}</a> | |
+ </td> | |
+ <td> | |
+ <div v-for="(path, index) in props.item.paths" :key="index">{{path}}</div> | |
+ </td> | |
+ <td> | |
+ <v-icon small class="mr-2" @click="edit(props.item)">edit</v-icon> | |
+ <v-icon small color="error" @click="removeConfirm(props.item)">delete</v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -95,11 +97,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.index.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.index.ok') }}</span> | |
</v-btn> | |
@@ -134,7 +136,7 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
items: [], | |
dialogRemoveConfirm: false, | |
@@ -321,4 +323,4 @@ | |
max-width: 400px; | |
} | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/views/settings/DownloadPaths/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadPaths/Edit.vue b/src/options/views/settings/DownloadPaths/Edit.vue | |
--- a/src/options/views/settings/DownloadPaths/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadPaths/Edit.vue (date 1612513003387) | |
@@ -20,7 +20,7 @@ | |
:hint="$t('settings.downloadPaths.add.pathTip')" | |
:rules="rules.require" | |
></v-textarea> | |
- <v-alert :value="true" color="info" icon="info" outline v-if="client.pathDescription"> | |
+ <v-alert color="info" icon="info" outlined v-if="client.pathDescription"> | |
<div v-html="client.pathDescription"></div> | |
<KeyDescription/> | |
</v-alert> | |
@@ -29,13 +29,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.add.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadPaths.add.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/SearchSolution/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SearchSolution/Edit.vue b/src/options/views/settings/SearchSolution/Edit.vue | |
--- a/src/options/views/settings/SearchSolution/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SearchSolution/Edit.vue (date 1612510400090) | |
@@ -12,13 +12,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3 toolber"> | |
+ <v-card-actions class="pa-4 toolber"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t("common.cancel") }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t("common.ok") }}</span> | |
</v-btn> | |
Index: src/options/views/settings/SearchSolution/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SearchSolution/Index.vue b/src/options/views/settings/SearchSolution/Index.vue | |
--- a/src/options/views/settings/SearchSolution/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SearchSolution/Index.vue (date 1612516998419) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="set-download-clients"> | |
- <v-alert :value="true" type="info">{{ $t('settings.searchSolution.index.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('settings.searchSolution.index.title') }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="success" @click="add"> | |
@@ -28,35 +28,38 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="name" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="edit(props.item)">{{ props.item.name }}</a> | |
- </td> | |
- <td> | |
- <template v-for="(item, index) in props.item.range"> | |
- <v-chip | |
- :key="index" | |
- label | |
- color="blue-grey" | |
- text-color="white" | |
- small | |
- class="mr-2 pl-0" | |
- @click="editSearchEntry(item.host)" | |
- >{{ item.siteName }}{{ getSiteEntry(item.host, item.entry) }}</v-chip> | |
- </template> | |
- </td> | |
- <td> | |
- <v-icon small class="mr-2" @click="edit(props.item)">edit</v-icon> | |
- <v-icon small color="error" @click="removeConfirm(props.item)">delete</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="edit(props.item)">{{ props.item.name }}</a> | |
+ </td> | |
+ <td> | |
+ <template v-for="(item, index) in props.item.range"> | |
+ <v-chip | |
+ :key="index" | |
+ class="mr-2 pl-0" | |
+ color="blue-grey" | |
+ label | |
+ small | |
+ text-color="white" | |
+ @click="editSearchEntry(item.host)" | |
+ >{{ item.siteName }}{{ getSiteEntry(item.host, item.entry) }} | |
+ </v-chip> | |
+ </template> | |
+ </td> | |
+ <td> | |
+ <v-icon class="mr-2" small @click="edit(props.item)">edit</v-icon> | |
+ <v-icon color="error" small @click="removeConfirm(props.item)">delete</v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -79,11 +82,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -117,7 +120,7 @@ | |
selected: [], | |
selectedItem: {}, | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
items: [] as SearchSolution[], | |
dialogRemoveConfirm: false, | |
@@ -131,8 +134,8 @@ | |
}, | |
updateItem(item: SearchSolution) { | |
this.$store.dispatch("updateSearchSolution", item); | |
- this.pagination.rowsPerPage = 0; | |
- this.pagination.rowsPerPage = -1; | |
+ this.pagination.itemsPerPage = 0; | |
+ this.pagination.itemsPerPage = -1; | |
}, | |
edit(item: any) { | |
@@ -240,4 +243,4 @@ | |
max-width: 400px; | |
} | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/views/settings/SearchSolution/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SearchSolution/Editor.vue b/src/options/views/settings/SearchSolution/Editor.vue | |
--- a/src/options/views/settings/SearchSolution/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SearchSolution/Editor.vue (date 1612515152770) | |
@@ -3,11 +3,11 @@ | |
<v-card color="grey lighten-4" class="body"> | |
<v-card-text> | |
<v-form v-model="isValid" class="content"> | |
- <v-layout row> | |
- <v-flex xs3> | |
+ <v-row > | |
+ <v-col cols="3"> | |
<v-subheader>{{ $t('settings.searchSolution.editor.name') }}</v-subheader> | |
- </v-flex> | |
- <v-flex xs9> | |
+ </v-col> | |
+ <v-col cols="9"> | |
<v-text-field | |
v-model="option.name" | |
:label="$t('settings.searchSolution.editor.name')" | |
@@ -16,13 +16,13 @@ | |
:rules="rules.require" | |
@change="change(true)" | |
></v-text-field> | |
- </v-flex> | |
- </v-layout> | |
- <v-layout row> | |
- <v-flex xs3> | |
+ </v-col> | |
+ </v-row> | |
+ <v-row > | |
+ <v-col cols="3"> | |
<v-subheader>{{$t('settings.searchSolution.editor.range')}}</v-subheader> | |
- </v-flex> | |
- <v-flex xs9> | |
+ </v-col> | |
+ <v-col cols="9"> | |
<div class="list"> | |
<v-list dense> | |
<!-- 站点列表 --> | |
@@ -30,24 +30,24 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="sites" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="host" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
- hide-actions | |
+ hide-default-footer | |
> | |
- <template slot="items" slot-scope="props"> | |
+ <template v-slot:item="props"> | |
<tr> | |
<td style="width:20px;"> | |
<v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
</td> | |
<td> | |
<div>{{ props.item.name }}</div> | |
- <v-container v-if="props.item.enabled" fluid class="ma-0 pa-0 ml-4"> | |
- <v-layout row wrap class="ma-0 pa-0"> | |
- <v-flex | |
+ <v-container v-if="props.item.enabled" fluid class="ma-0 pa-0 ml-6"> | |
+ <v-row class="ma-0 pa-0"> | |
+ <v-col | |
class="ma-0 pa-0" | |
- xs3 | |
+ cols="3" | |
v-for="(item, key, index) in props.item.searchEntry" | |
:key="index" | |
> | |
@@ -57,8 +57,8 @@ | |
v-model="item.enabled" | |
@change="change(true)" | |
></v-checkbox> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-container> | |
</td> | |
</tr> | |
@@ -66,8 +66,8 @@ | |
</v-data-table> | |
</v-list> | |
</div> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-form> | |
<v-divider class="mb-2"></v-divider> | |
<div class="bottom"> | |
@@ -114,7 +114,7 @@ | |
require: [(v: any) => !!v || "!"] | |
}, | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
haveError: false, | |
haveSuccess: false, | |
Index: src/options/views/settings/DownloadClients/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadClients/Add.vue b/src/options/views/settings/DownloadClients/Add.vue | |
--- a/src/options/views/settings/DownloadClients/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadClients/Add.vue (date 1612515152755) | |
@@ -13,7 +13,7 @@ | |
<v-spacer></v-spacer> | |
<v-btn | |
icon | |
- flat | |
+ text | |
color="success" | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki/config-download-client" | |
target="_blank" | |
@@ -52,22 +52,22 @@ | |
item-text="name" | |
item-value="name" | |
> | |
- <template slot="selection" slot-scope="{ item }"> | |
- <v-list-tile-avatar> | |
+ <template v-slot:selection="{ item }"> | |
+ <v-list-item-avatar> | |
<img :src="item.icon" /> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
<span v-text="item.name"></span> | |
</template> | |
- <template slot="item" slot-scope="data" style> | |
- <v-list-tile-avatar> | |
+ <template v-slot:item="data" style> | |
+ <v-list-item-avatar> | |
<img :src="data.item.icon" /> | |
- </v-list-tile-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-html="data.item.name"></v-list-tile-title> | |
- </v-list-tile-content> | |
- <v-list-tile-action> | |
- <v-list-tile-action-text>{{ data.item.ver }}</v-list-tile-action-text> | |
- </v-list-tile-action> | |
+ </v-list-item-avatar> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-html="data.item.name"></v-list-item-title> | |
+ </v-list-item-content> | |
+ <v-list-item-action> | |
+ <v-list-item-action-text>{{ data.item.ver }}</v-list-item-action-text> | |
+ </v-list-item-action> | |
</template> | |
</v-autocomplete> | |
</v-stepper-content> | |
@@ -82,9 +82,9 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-btn | |
- flat | |
+ text | |
color="grey darken-1" | |
href="https://github.com/ronggang/PT-Plugin-Plus/tree/master/resource/clients" | |
target="_blank" | |
@@ -95,20 +95,20 @@ | |
<span class="ml-1">{{ $t('settings.downloadClients.add.helpMsg') }}</span> | |
</v-btn> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadClients.add.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="grey darken-1" @click="step--" :disabled="step===1"> | |
+ <v-btn text color="grey darken-1" @click="step--" :disabled="step===1"> | |
<v-icon>navigate_before</v-icon> | |
<span>{{ $t('settings.downloadClients.add.prevStep') }}</span> | |
</v-btn> | |
- <v-btn flat color="blue" @click="next(step)" v-show="step<stepCount"> | |
+ <v-btn text color="blue" @click="next(step)" v-show="step<stepCount"> | |
<span>{{ $t('settings.downloadClients.add.nextStep') }}</span> | |
<v-icon>navigate_next</v-icon> | |
</v-btn> | |
<v-btn | |
- flat | |
+ text | |
color="success" | |
@click="save" | |
v-show="step===stepCount" | |
Index: package.json | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/package.json b/package.json | |
--- a/package.json (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/package.json (date 1612506993256) | |
@@ -53,7 +53,7 @@ | |
"vue-i18n": "^8.11.2", | |
"vue-property-decorator": "^7.0.0", | |
"vue-router": "^3.0.1", | |
- "vuetify": "^1.3.0", | |
+ "vuetify": "^2.4.3", | |
"vuex": "^3.0.1", | |
"webdav": "^2.10.0" | |
}, | |
@@ -82,18 +82,17 @@ | |
"crx3": "^1.1.1", | |
"eslint": "^5.8.0", | |
"eslint-plugin-vue": "^5.0.0-0", | |
+ "eslint-plugin-vuetify": "^1.0.0-beta.7", | |
"sass": "^1.23.7", | |
"sass-loader": "^7.1.0", | |
- "stylus": "^0.54.5", | |
- "stylus-loader": "^3.0.1", | |
"terser-webpack-plugin": "^2.2.1", | |
"ts-loader": "^5.3.1", | |
"ts-node": "^8.5.2", | |
"typescript": "^3.0.0", | |
"uglifyjs-webpack-plugin": "^2.0.1", | |
- "vue-cli-plugin-vuetify": "^0.4.6", | |
+ "vue-cli-plugin-vuetify": "^2.1.0", | |
"vue-template-compiler": "^2.5.17", | |
- "vuetify-loader": "^1.0.5", | |
+ "vuetify-loader": "^1.7.1", | |
"webpack": "^4.26.1", | |
"webpack-cli": "^3.1.2", | |
"webpack-merge": "^4.1.4" | |
@@ -108,8 +107,14 @@ | |
"eslint:recommended", | |
"@vue/typescript" | |
], | |
+ "plugins": [ | |
+ "vuetify" | |
+ ], | |
"rules": { | |
- "no-console": 0 | |
+ "no-console": 0, | |
+ "vuetify/no-deprecated-classes": "error", | |
+ "vuetify/grid-unknown-attributes": "error", | |
+ "vuetify/no-legacy-grid": "error" | |
}, | |
"parserOptions": { | |
"parser": "typescript-eslint-parser" | |
@@ -125,4 +130,4 @@ | |
"last 2 versions", | |
"not ie <= 8" | |
] | |
-} | |
\ No newline at end of file | |
+} | |
Index: src/options/views/settings/DownloadClients/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadClients/Index.vue b/src/options/views/settings/DownloadClients/Index.vue | |
--- a/src/options/views/settings/DownloadClients/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadClients/Index.vue (date 1612516934804) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="set-download-clients"> | |
- <v-alert :value="true" type="info">{{ $t('settings.downloadClients.index.title') }}</v-alert> | |
+ <v-alert type="info">{{ $t('settings.downloadClients.index.title') }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="success" @click="add"> | |
@@ -19,30 +19,32 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="this.$store.state.options.clients" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="id" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="edit(props.item)">{{ props.item.name }}</a> | |
- </td> | |
- <td>{{ props.item.type }}</td> | |
- <td> | |
- <a | |
- :href="props.item.address" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- >{{ props.item.address }}</a> | |
- </td> | |
- <td> | |
- <v-icon small class="mr-2" @click="edit(props.item)">edit</v-icon> | |
- <v-icon small color="error" @click="removeConfirm(props.item)">delete</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="edit(props.item)">{{ props.item.name }}</a> | |
+ </td> | |
+ <td>{{ props.item.type }}</td> | |
+ <td> | |
+ <a | |
+ :href="props.item.address" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ >{{ props.item.address }}</a> | |
+ </td> | |
+ <td> | |
+ <v-icon class="mr-2" small @click="edit(props.item)">edit</v-icon> | |
+ <v-icon color="error" small @click="removeConfirm(props.item)">delete</v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -65,11 +67,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadClients.index.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadClients.index.ok') }}</span> | |
</v-btn> | |
@@ -77,7 +79,7 @@ | |
</v-card> | |
</v-dialog> | |
- <v-alert :value="true" color="grey"> | |
+ <v-alert color="grey"> | |
<div v-html="$t('settings.downloadClients.index.subTitle')"></div> | |
</v-alert> | |
@@ -107,7 +109,7 @@ | |
selected: [], | |
selectedItem: {}, | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
items: [], | |
dialogRemoveConfirm: false | |
@@ -214,4 +216,4 @@ | |
max-width: 400px; | |
} | |
} | |
-</style> | |
\ No newline at end of file | |
+</style> | |
Index: src/options/views/settings/DownloadClients/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/DownloadClients/Edit.vue b/src/options/views/settings/DownloadClients/Edit.vue | |
--- a/src/options/views/settings/DownloadClients/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/DownloadClients/Edit.vue (date 1612510400017) | |
@@ -12,13 +12,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadClients.edit.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!defaultItem.valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!defaultItem.valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('settings.downloadClients.edit.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/SiteSearchEntry/Add.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SiteSearchEntry/Add.vue b/src/options/views/settings/SiteSearchEntry/Add.vue | |
--- a/src/options/views/settings/SiteSearchEntry/Add.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SiteSearchEntry/Add.vue (date 1612510399690) | |
@@ -13,13 +13,13 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn flat color="success" @click="save" :disabled="!selected.valid"> | |
+ <v-btn text color="success" @click="save" :disabled="!selected.valid"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
Index: src/options/views/settings/SiteSearchEntry/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SiteSearchEntry/Index.vue b/src/options/views/settings/SiteSearchEntry/Index.vue | |
--- a/src/options/views/settings/SiteSearchEntry/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SiteSearchEntry/Index.vue (date 1612516694959) | |
@@ -1,106 +1,114 @@ | |
<template> | |
<div class="site-search-entry"> | |
<v-alert | |
- :value="true" | |
- type="info" | |
- >{{ $t('settings.siteSearchEntry.index.title') }} [{{ site.name }}]</v-alert> | |
+ :value="true" | |
+ type="info" | |
+ >{{ $t('settings.siteSearchEntry.index.title') }} [{{ site.name }}] | |
+ </v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="success" @click="add"> | |
<v-icon class="mr-2">add</v-icon> | |
- {{$t('common.add')}} | |
+ {{ $t('common.add') }} | |
</v-btn> | |
- <v-btn color="error" :disabled="selected.length==0" @click="removeSelected"> | |
+ <v-btn :disabled="selected.length==0" color="error" @click="removeSelected"> | |
<v-icon class="mr-2">remove</v-icon> | |
- {{$t('common.remove')}} | |
+ {{ $t('common.remove') }} | |
</v-btn> | |
<v-btn | |
- color="info" | |
- href="https://github.com/ronggang/PT-Plugin-Plus/wiki/search-entry-definition" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
+ color="info" | |
+ href="https://github.com/ronggang/PT-Plugin-Plus/wiki/search-entry-definition" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
> | |
<v-icon class="mr-2">help</v-icon> | |
{{ $t('settings.siteSearchEntry.index.help') }} | |
</v-btn> | |
<v-spacer></v-spacer> | |
- <v-text-field class="search" append-icon="search" label="Search" single-line hide-details></v-text-field> | |
+ <v-text-field append-icon="search" class="search" hide-details label="Search" single-line></v-text-field> | |
</v-card-title> | |
<v-data-table | |
- v-model="selected" | |
- :headers="headers" | |
- :items="searchEntry" | |
- :pagination.sync="pagination" | |
- item-key="name" | |
- select-all | |
- class="elevation-1" | |
+ v-model="selected" | |
+ :headers="headers" | |
+ :items="searchEntry" | |
+ :options.sync="pagination" | |
+ class="elevation-1" | |
+ item-key="name" | |
+ show-select | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:20px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details v-if="props.item.isCustom"></v-checkbox> | |
- </td> | |
- <td> | |
- <a @click="edit(props.item)"> | |
- <span class="ml-2">{{ props.item.name }}</span> | |
- </a> | |
- </td> | |
- <td class="cat"> | |
- <template v-for="(item, index) in getCategory(props.item)"> | |
- <v-chip | |
- :key="index" | |
- label | |
- color="blue-grey" | |
- text-color="white" | |
- small | |
- class="mr-2 pl-0" | |
- disabled | |
- >{{ item }}</v-chip> | |
- </template> | |
- </td> | |
- <td> | |
- <v-switch | |
- true-value="true" | |
- false-value="false" | |
- :input-value="props.item.enabled?'true':'false'" | |
- hide-details | |
- ></v-switch> | |
- </td> | |
- <td> | |
- <v-icon | |
- small | |
- class="mr-2" | |
- @click="copy(props.item)" | |
- :title="$t('common.copy')" | |
- >file_copy</v-icon> | |
- <v-icon | |
- small | |
- class="mr-2" | |
- @click="edit(props.item)" | |
- v-if="props.item.isCustom" | |
- :title="$t('common.edit')" | |
- >edit</v-icon> | |
- <v-icon | |
- small | |
- color="error" | |
- @click="removeConfirm(props.item)" | |
- v-if="props.item.isCustom" | |
- :title="$t('common.remove')" | |
- >delete</v-icon> | |
- </td> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:20px;"> | |
+ <v-checkbox v-if="props.item.isCustom" v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td> | |
+ <a @click="edit(props.item)"> | |
+ <span class="ml-2">{{ props.item.name }}</span> | |
+ </a> | |
+ </td> | |
+ <td class="cat"> | |
+ <template v-for="(item, index) in getCategory(props.item)"> | |
+ <v-chip | |
+ :key="index" | |
+ class="mr-2 pl-0" | |
+ color="blue-grey" | |
+ disabled | |
+ label | |
+ small | |
+ text-color="white" | |
+ >{{ item }} | |
+ </v-chip> | |
+ </template> | |
+ </td> | |
+ <td> | |
+ <v-switch | |
+ :input-value="props.item.enabled?'true':'false'" | |
+ false-value="false" | |
+ hide-details | |
+ true-value="true" | |
+ ></v-switch> | |
+ </td> | |
+ <td> | |
+ <v-icon | |
+ :title="$t('common.copy')" | |
+ class="mr-2" | |
+ small | |
+ @click="copy(props.item)" | |
+ >file_copy | |
+ </v-icon> | |
+ <v-icon | |
+ v-if="props.item.isCustom" | |
+ :title="$t('common.edit')" | |
+ class="mr-2" | |
+ small | |
+ @click="edit(props.item)" | |
+ >edit | |
+ </v-icon> | |
+ <v-icon | |
+ v-if="props.item.isCustom" | |
+ :title="$t('common.remove')" | |
+ color="error" | |
+ small | |
+ @click="removeConfirm(props.item)" | |
+ >delete | |
+ </v-icon> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
<!-- 新增 --> | |
- <AddItem v-model="showAddDialog" @save="addItem" :site="site" /> | |
+ <AddItem v-model="showAddDialog" :site="site" @save="addItem"/> | |
<!-- 编辑 --> | |
- <EditItem v-model="showEditDialog" :site="site" :data="selectedItem" @save="updateItem" /> | |
+ <EditItem v-model="showEditDialog" :data="selectedItem" :site="site" @save="updateItem"/> | |
<v-dialog v-model="dialogRemoveConfirm" width="300"> | |
<v-card> | |
<v-card-title | |
- class="headline red lighten-2" | |
- >{{ $t('settings.siteSearchEntry.index.removeTitle') }}</v-card-title> | |
+ class="headline red lighten-2" | |
+ >{{ $t('settings.siteSearchEntry.index.removeTitle') }} | |
+ </v-card-title> | |
<v-card-text>{{ $t('settings.siteSearchEntry.index.removeConfirm') }}</v-card-text> | |
@@ -108,11 +116,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn color="info" text @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove"> | |
+ <v-btn color="error" text @click="remove"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -133,8 +141,9 @@ | |
import AddItem from "./Add.vue"; | |
import EditItem from "./Edit.vue"; | |
-import { filters } from "@/service/filters"; | |
-import { PPF } from "@/service/public"; | |
+import {filters} from "@/service/filters"; | |
+import {PPF} from "@/service/public"; | |
+ | |
export default Vue.extend({ | |
components: { | |
AddItem, | |
@@ -144,7 +153,7 @@ | |
return { | |
selected: [], | |
pagination: { | |
- rowsPerPage: -1 | |
+ itemsPerPage: -1 | |
}, | |
showAddDialog: false, | |
showEditDialog: false, | |
@@ -186,11 +195,11 @@ | |
}, | |
removeSelected() { | |
if ( | |
- confirm( | |
- this.$t( | |
- "settings.siteSearchEntry.index.removeSelectedConfirm" | |
- ).toString() | |
- ) | |
+ confirm( | |
+ this.$t( | |
+ "settings.siteSearchEntry.index.removeSelectedConfirm" | |
+ ).toString() | |
+ ) | |
) { | |
this.selected.forEach((item: any) => { | |
this.$store.dispatch("removeSiteSearchEntry", { | |
@@ -240,9 +249,9 @@ | |
let schema = this.site.schema; | |
if (typeof schema === "string") { | |
let _schema = this.$store.state.options.system.schemas.find( | |
- (item: Site) => { | |
- return item.name == schema; | |
- } | |
+ (item: Site) => { | |
+ return item.name == schema; | |
+ } | |
); | |
if (_schema) { | |
searchEntry.push(..._schema.searchEntry); | |
@@ -259,14 +268,14 @@ | |
if (site.categories && entry.categories) { | |
site.categories.forEach((item: SiteCategories) => { | |
if ( | |
- item.category && | |
- (item.entry == "*" || | |
- (entry.entry as string).indexOf(item.entry as string)) | |
+ item.category && | |
+ (item.entry == "*" || | |
+ (entry.entry as string).indexOf(item.entry as string)) | |
) { | |
item.category.forEach((c: SiteCategory) => { | |
if ( | |
- entry.categories && | |
- entry.categories.includes(c.id as string) | |
+ entry.categories && | |
+ entry.categories.includes(c.id as string) | |
) { | |
result.push(c.name as string); | |
} | |
Index: src/options/views/settings/SiteSearchEntry/Edit.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SiteSearchEntry/Edit.vue b/src/options/views/settings/SiteSearchEntry/Edit.vue | |
--- a/src/options/views/settings/SiteSearchEntry/Edit.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SiteSearchEntry/Edit.vue (date 1612510645340) | |
@@ -12,14 +12,14 @@ | |
<v-divider></v-divider> | |
- <v-card-actions class="pa-3"> | |
+ <v-card-actions class="pa-4"> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="error" @click="cancel"> | |
+ <v-btn text color="error" @click="cancel"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
<v-btn | |
- flat | |
+ text | |
color="success" | |
@click="save" | |
:disabled="!defaultItem.valid && !defaultItem.isCustom" | |
Index: src/options/views/collection/AddToGroup.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/collection/AddToGroup.vue b/src/options/views/collection/AddToGroup.vue | |
--- a/src/options/views/collection/AddToGroup.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/collection/AddToGroup.vue (date 1612510645426) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<v-btn | |
- :flat="flat" | |
+ :text="flat" | |
:icon="icon" | |
:small="small" | |
:loading="loading" | |
@@ -96,4 +96,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> | |
Index: src/options/views/collection/Index.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/collection/Index.vue b/src/options/views/collection/Index.vue | |
--- a/src/options/views/collection/Index.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/collection/Index.vue (date 1612516764195) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div class="collection"> | |
- <v-alert :value="true" type="info">{{ $t("collection.title") }}</v-alert> | |
+ <v-alert type="info">{{ $t("collection.title") }}</v-alert> | |
<v-card> | |
<div | |
style="height: 120px; overflow-x: auto;display: -webkit-box;" | |
@@ -45,7 +45,7 @@ | |
{{ $t("common.clear") }} | |
</v-btn> | |
- <v-divider class="mx-3 mt-0" vertical></v-divider> | |
+ <v-divider class="mx-4 mt-0" vertical></v-divider> | |
<v-btn color="success" @click="addGroup"> | |
<v-icon class="mr-2">add</v-icon> | |
@@ -81,196 +81,199 @@ | |
:custom-filter="searchResultFilter" | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="link" | |
- select-all | |
+ show-select | |
class="dataList" | |
> | |
- <template slot="items" slot-scope="props"> | |
- <td style="width:50px;"> | |
- <v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
- </td> | |
- <td>{{ props.index + 1 }}</td> | |
- <td> | |
- <v-img | |
- :src="(props.item.movieInfo && props.item.movieInfo.image)?props.item.movieInfo.image:'./assets/movie.png'" | |
- class="mx-0 my-2" | |
- contain | |
- :max-height="(props.item.movieInfo && props.item.movieInfo.image)? 100: 80" | |
- position="left center" | |
- > | |
- <v-layout style="margin-left: 90px;" row wrap> | |
- <template v-if="(props.item.movieInfo && props.item.movieInfo.title)"> | |
- <v-flex xs12> | |
- <a | |
- :href="props.item.movieInfo.link" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- > | |
- <img src="https://img3.doubanio.com/favicon.ico" class="mr-2 mt-0" width="16" /> | |
- </a> | |
- <span class="title">{{ props.item.movieInfo.title }}</span> | |
+ <template v-slot:item="props"> | |
+ <tr> | |
+ <td style="width:50px;"> | |
+ <v-checkbox v-model="props.selected" hide-details primary></v-checkbox> | |
+ </td> | |
+ <td>{{ props.index + 1 }}</td> | |
+ <td> | |
+ <v-img | |
+ :max-height="(props.item.movieInfo && props.item.movieInfo.image)? 100: 80" | |
+ :src="(props.item.movieInfo && props.item.movieInfo.image)?props.item.movieInfo.image:'./assets/movie.png'" | |
+ class="mx-0 my-2" | |
+ contain | |
+ position="left center" | |
+ > | |
+ <v-row style="margin-left: 90px;"> | |
+ <template v-if="(props.item.movieInfo && props.item.movieInfo.title)"> | |
+ <v-col cols="12"> | |
+ <a | |
+ :href="props.item.movieInfo.link" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ > | |
+ <img class="mr-2 mt-0" src="https://img3.doubanio.com/favicon.ico" width="16"/> | |
+ </a> | |
+ <span class="title">{{ props.item.movieInfo.title }}</span> | |
- <span class="caption ml-2">({{ props.item.movieInfo.year }})</span> | |
- </v-flex> | |
+ <span class="caption ml-2">({{ props.item.movieInfo.year }})</span> | |
+ </v-col> | |
- <v-flex xs12 class="mb-1"> | |
- <span class="sub-title">{{ props.item.movieInfo.alt_title }}</span> | |
- </v-flex> | |
- </template> | |
- <template> | |
- <v-flex xs12> | |
- <a | |
- :href="props.item.link" | |
- target="_blank" | |
- :title="props.item.title" | |
- rel="noopener noreferrer nofollow" | |
- > | |
- <span>{{ props.item.title }}</span> | |
- </a> | |
- </v-flex> | |
+ <v-col class="mb-1" cols="12"> | |
+ <span class="sub-title">{{ props.item.movieInfo.alt_title }}</span> | |
+ </v-col> | |
+ </template> | |
+ <template> | |
+ <v-col cols="12"> | |
+ <a | |
+ :href="props.item.link" | |
+ :title="props.item.title" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ > | |
+ <span>{{ props.item.title }}</span> | |
+ </a> | |
+ </v-col> | |
- <v-flex xs12> | |
- <span class="sub-title">{{ props.item.subTitle }}</span> | |
- </v-flex> | |
- </template> | |
- </v-layout> | |
- </v-img> | |
+ <v-col cols="12"> | |
+ <span class="sub-title">{{ props.item.subTitle }}</span> | |
+ </v-col> | |
+ </template> | |
+ </v-row> | |
+ </v-img> | |
- <!-- 分组列表 --> | |
- <template> | |
- <div style="margin-left: 90px;"> | |
- <v-hover v-for="(group, index) in getGroupList(props.item)" :key="index"> | |
- <v-chip | |
- slot-scope="{ hover }" | |
- :close="hover && group.id!=null" | |
- label | |
- :color="group.color||'grey'" | |
- :dark="group.color && group.color.indexOf('lighten')>0?false: true" | |
- small | |
- @input="removeFromGroup(props.item, group)" | |
- >{{group.name}}</v-chip> | |
- </v-hover> | |
+ <!-- 分组列表 --> | |
+ <template> | |
+ <div style="margin-left: 90px;"> | |
+ <v-hover v-for="(group, index) in getGroupList(props.item)" :key="index"> | |
+ <v-chip | |
+ slot-scope="{ hover }" | |
+ :close="hover && group.id!=null" | |
+ :color="group.color||'grey'" | |
+ :dark="group.color && group.color.indexOf('lighten')>0?false: true" | |
+ label | |
+ small | |
+ @input="removeFromGroup(props.item, group)" | |
+ >{{ group.name }} | |
+ </v-chip> | |
+ </v-hover> | |
- <AddToGroup | |
- v-if="groups && groups.length>1" | |
- icon | |
- small | |
- flat | |
- @add="addToGroup" | |
- :item="props.item" | |
- :groups="groups" | |
- ></AddToGroup> | |
- </div> | |
- </template> | |
- </td> | |
- <td> | |
- <v-layout row wrap v-if="!!props.item.site"> | |
- <a | |
- :href="props.item.site.activeURL" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- class="nodecoration" | |
- > | |
- <v-avatar :size="15"> | |
- <img :src="props.item.site.icon" /> | |
- </v-avatar> | |
- <span class="caption ml-1 site-name">{{ props.item.site.name }}</span> | |
- </a> | |
- </v-layout> | |
- </td> | |
- <td class="text-xs-right">{{ props.item.size | formatSize }}</td> | |
- <td class="text-xs-right">{{ props.item.time | formatDate }}</td> | |
- <td class="text-xs-center"> | |
- <template v-if="props.item.movieInfo"> | |
- <!-- IMDb Id --> | |
- <v-btn | |
- v-if="!!props.item.movieInfo.imdbId" | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- :title="$t('common.search')" | |
- :to="`/search-torrent/${props.item.movieInfo.imdbId}`" | |
- > | |
- <v-icon small>search</v-icon> | |
- </v-btn> | |
- <!-- 豆瓣ID --> | |
- <v-btn | |
- v-else-if="!!props.item.movieInfo.doubanId" | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- :title="$t('common.search')" | |
- :to="`/search-torrent/douban${props.item.movieInfo.doubanId}|${props.item.movieInfo.title}|${props.item.movieInfo.alt_title}`" | |
- > | |
- <v-icon small>search</v-icon> | |
- </v-btn> | |
+ <AddToGroup | |
+ v-if="groups && groups.length>1" | |
+ :groups="groups" | |
+ :item="props.item" | |
+ flat | |
+ icon | |
+ small | |
+ @add="addToGroup" | |
+ ></AddToGroup> | |
+ </div> | |
+ </template> | |
+ </td> | |
+ <td> | |
+ <v-row v-if="!!props.item.site"> | |
+ <a | |
+ :href="props.item.site.activeURL" | |
+ class="nodecoration" | |
+ rel="noopener noreferrer nofollow" | |
+ target="_blank" | |
+ > | |
+ <v-avatar :size="15"> | |
+ <img :src="props.item.site.icon"/> | |
+ </v-avatar> | |
+ <span class="caption ml-1 site-name">{{ props.item.site.name }}</span> | |
+ </a> | |
+ </v-row> | |
+ </td> | |
+ <td class="text-right">{{ props.item.size | formatSize }}</td> | |
+ <td class="text-right">{{ props.item.time | formatDate }}</td> | |
+ <td class="text-center"> | |
+ <template v-if="props.item.movieInfo"> | |
+ <!-- IMDb Id --> | |
+ <v-btn | |
+ v-if="!!props.item.movieInfo.imdbId" | |
+ :title="$t('common.search')" | |
+ :to="`/search-torrent/${props.item.movieInfo.imdbId}`" | |
+ class="mx-0" | |
+ icon | |
+ small | |
+ text | |
+ > | |
+ <v-icon small>search</v-icon> | |
+ </v-btn> | |
+ <!-- 豆瓣ID --> | |
+ <v-btn | |
+ v-else-if="!!props.item.movieInfo.doubanId" | |
+ :title="$t('common.search')" | |
+ :to="`/search-torrent/douban${props.item.movieInfo.doubanId}|${props.item.movieInfo.title}|${props.item.movieInfo.alt_title}`" | |
+ class="mx-0" | |
+ icon | |
+ small | |
+ text | |
+ > | |
+ <v-icon small>search</v-icon> | |
+ </v-btn> | |
- <v-btn | |
- v-else | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- :title="$t('collection.setMovieId')" | |
- @click="setMovieId(props.item)" | |
- > | |
- <v-icon small>edit</v-icon> | |
- </v-btn> | |
- </template> | |
+ <v-btn | |
+ v-else | |
+ :title="$t('collection.setMovieId')" | |
+ class="mx-0" | |
+ icon | |
+ small | |
+ text | |
+ @click="setMovieId(props.item)" | |
+ > | |
+ <v-icon small>edit</v-icon> | |
+ </v-btn> | |
+ </template> | |
- <!-- 下载到 --> | |
- <DownloadTo | |
- :downloadOptions="props.item" | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- @error="onError" | |
- @success="onSuccess" | |
- /> | |
+ <!-- 下载到 --> | |
+ <DownloadTo | |
+ :downloadOptions="props.item" | |
+ class="mx-0" | |
+ flat | |
+ icon | |
+ small | |
+ @error="onError" | |
+ @success="onSuccess" | |
+ /> | |
- <!-- 下载种子文件 --> | |
- <v-btn | |
- v-if="props.item.site.downloadMethod=='POST'" | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- @click.stop="saveTorrentFile(props.item)" | |
- > | |
- <v-icon small :title="$t('searchTorrent.saveTip')">save</v-icon> | |
- </v-btn> | |
+ <!-- 下载种子文件 --> | |
+ <v-btn | |
+ v-if="props.item.site.downloadMethod=='POST'" | |
+ class="mx-0" | |
+ icon | |
+ small | |
+ text | |
+ @click.stop="saveTorrentFile(props.item)" | |
+ > | |
+ <v-icon :title="$t('searchTorrent.saveTip')" small>save</v-icon> | |
+ </v-btn> | |
- <v-btn | |
- v-else | |
- flat | |
- icon | |
- small | |
- class="mx-0" | |
- :href="props.item.url" | |
- target="_blank" | |
- rel="noopener noreferrer nofollow" | |
- :title="$t('searchTorrent.saveTip')" | |
- > | |
- <v-icon small>save</v-icon> | |
- </v-btn> | |
+ <v-btn | |
+ v-else | |
+ :href="props.item.url" | |
+ :title="$t('searchTorrent.saveTip')" | |
+ class="mx-0" | |
+ icon | |
+ rel="noopener noreferrer nofollow" | |
+ small | |
+ target="_blank" | |
+ text | |
+ > | |
+ <v-icon small>save</v-icon> | |
+ </v-btn> | |
- <!-- 删除 --> | |
- <v-btn | |
- flat | |
- icon | |
- small | |
- @click="removeConfirm(props.item)" | |
- color="error" | |
- class="mx-0" | |
- :title="$t('common.remove')" | |
- > | |
- <v-icon small>delete</v-icon> | |
- </v-btn> | |
- </td> | |
+ <!-- 删除 --> | |
+ <v-btn | |
+ :title="$t('common.remove')" | |
+ class="mx-0" | |
+ color="error" | |
+ icon | |
+ small | |
+ text | |
+ @click="removeConfirm(props.item)" | |
+ > | |
+ <v-icon small>delete</v-icon> | |
+ </v-btn> | |
+ </td> | |
+ </tr> | |
</template> | |
</v-data-table> | |
</v-card> | |
@@ -317,9 +320,9 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: 10, | |
- sortBy: "time", | |
- descending: true | |
+ itemsPerPage: 10, | |
+ sortBy: ["time"], | |
+ sortDesc: [true] | |
}, | |
items: [] as ICollection[], | |
allItems: [] as ICollection[], | |
Index: src/options/views/collection/GroupCard.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/collection/GroupCard.vue b/src/options/views/collection/GroupCard.vue | |
--- a/src/options/views/collection/GroupCard.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/collection/GroupCard.vue (date 1612510645351) | |
@@ -34,7 +34,7 @@ | |
<!-- 复制下载链接 --> | |
<v-btn | |
icon | |
- flat | |
+ text | |
:title="$t('searchTorrent.copyToClipboardTip')" | |
@click.stop="copyLinksToClipboard" | |
class="mx-0 btn-mini" | |
@@ -262,4 +262,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> | |
Index: src/options/views/keepUpload/KeepUploadTasks.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/keepUpload/KeepUploadTasks.vue b/src/options/views/keepUpload/KeepUploadTasks.vue | |
--- a/src/options/views/keepUpload/KeepUploadTasks.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/keepUpload/KeepUploadTasks.vue (date 1612515152788) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<div> | |
- <v-alert :value="true" type="info">{{ $t("keepUploadTask.title") }}</v-alert> | |
+ <v-alert type="info">{{ $t("keepUploadTask.title") }}</v-alert> | |
<v-card> | |
<v-card-title> | |
<v-btn color="error" :disabled="selected.length==0" @click="removeSelected"> | |
@@ -31,17 +31,17 @@ | |
v-model="selected" | |
:headers="headers" | |
:items="items" | |
- :pagination.sync="pagination" | |
+ :options.sync="pagination" | |
item-key="id" | |
- select-all | |
+ show-select | |
class="elevation-1" | |
> | |
- <template slot="items" slot-scope="props"> | |
+ <template v-slot:item="props"> | |
<tr @click="props.expanded = !props.expanded"> | |
<td style="width:20px;"> | |
<v-checkbox v-model="props.selected" primary hide-details></v-checkbox> | |
</td> | |
- <td class="text-xs-center"> | |
+ <td class="text-center"> | |
<v-avatar size="18"> | |
<img :src="props.item.site.icon" /> | |
</v-avatar> | |
@@ -81,14 +81,14 @@ | |
>{{ $t('keepUploadTask.torrentCount') }}{{ props.item.items.length }}</div> | |
</td> | |
<!-- 大小 --> | |
- <td class="text-xs-right">{{ props.item.size | formatSize }}</td> | |
+ <td class="text-right">{{ props.item.size | formatSize }}</td> | |
<td>{{ props.item.time | formatDate }}</td> | |
<td> | |
<v-btn | |
small | |
color="success" | |
icon | |
- flat | |
+ text | |
:title="$t('keepUploadTask.sendBaseTorrent')" | |
class="mx-0" | |
@click.stop="sendBaseTorrent(props.item)" | |
@@ -99,7 +99,7 @@ | |
small | |
color="info" | |
icon | |
- flat | |
+ text | |
:title="$t('keepUploadTask.sendOtherTorrents')" | |
class="mx-0" | |
@click.stop="sendOtherTorrents(props.item)" | |
@@ -111,7 +111,7 @@ | |
small | |
color="primary" | |
icon | |
- flat | |
+ text | |
:title="$t('keepUploadTask.sendAllTorrents')" | |
class="mx-0" | |
@click.stop="sendAllTorrents(props.item)" | |
@@ -124,7 +124,7 @@ | |
color="info" | |
small | |
icon | |
- flat | |
+ text | |
:title="$t('searchTorrent.copyToClipboardTip')" | |
@click.stop="copyLinksToClipboard(props.item)" | |
class="mx-0" | |
@@ -136,7 +136,7 @@ | |
small | |
color="error" | |
icon | |
- flat | |
+ text | |
@click.stop="removeConfirm(props.item)" | |
class="mx-0" | |
:title="$t('common.remove')" | |
@@ -147,18 +147,18 @@ | |
</tr> | |
</template> | |
- <template slot="expand" slot-scope="props"> | |
- <v-list subheader dense class="ml-5"> | |
+ <template v-slot:expanded-item="props"> | |
+ <v-list subheader dense class="ml-12"> | |
<template v-for="(item) in props.item.items"> | |
- <v-list-tile :key="item.link" class="ml-5"> | |
- <v-list-tile-avatar> | |
+ <v-list-item :key="item.link" class="ml-12"> | |
+ <v-list-item-avatar> | |
<v-avatar size="18"> | |
<img :src="item.site.icon" /> | |
</v-avatar> | |
- </v-list-tile-avatar> | |
+ </v-list-item-avatar> | |
- <v-list-tile-content> | |
- <v-list-tile-title> | |
+ <v-list-item-content> | |
+ <v-list-item-title> | |
<a | |
:href="item.link" | |
target="_blank" | |
@@ -166,17 +166,17 @@ | |
:title="item.title" | |
rel="noopener noreferrer nofollow" | |
></a> | |
- </v-list-tile-title> | |
- <v-list-tile-sub-title>{{ item.subTitle }}</v-list-tile-sub-title> | |
- </v-list-tile-content> | |
- </v-list-tile> | |
+ </v-list-item-title> | |
+ <v-list-item-subtitle>{{ item.subTitle }}</v-list-item-subtitle> | |
+ </v-list-item-content> | |
+ </v-list-item> | |
</template> | |
</v-list> | |
</template> | |
</v-data-table> | |
</v-card> | |
- <v-alert :value="true" color="warning"> | |
+ <v-alert color="warning"> | |
<div> | |
警告: | |
<ul> | |
@@ -198,11 +198,11 @@ | |
<v-card-actions> | |
<v-spacer></v-spacer> | |
- <v-btn flat color="info" @click="dialogRemoveConfirm=false"> | |
+ <v-btn text color="info" @click="dialogRemoveConfirm=false"> | |
<v-icon>cancel</v-icon> | |
<span class="ml-1">{{ $t('common.cancel') }}</span> | |
</v-btn> | |
- <v-btn color="error" flat @click="remove()"> | |
+ <v-btn color="error" text @click="remove()"> | |
<v-icon>check_circle_outline</v-icon> | |
<span class="ml-1">{{ $t('common.ok') }}</span> | |
</v-btn> | |
@@ -237,9 +237,9 @@ | |
selected: [], | |
selectedItem: {} as any, | |
pagination: { | |
- rowsPerPage: 10, | |
- sortBy: "time", | |
- descending: true | |
+ itemsPerPage: 10, | |
+ sortBy: ["time"], | |
+ sortDesc: [true] | |
}, | |
items: [] as any[], | |
dialogRemoveConfirm: false, | |
Index: src/options/views/search/SearchTorrent.ts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/search/SearchTorrent.ts b/src/options/views/search/SearchTorrent.ts | |
--- a/src/options/views/search/SearchTorrent.ts (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/search/SearchTorrent.ts (date 1612512607456) | |
@@ -70,9 +70,9 @@ | |
selected: [] as any, | |
pagination: { | |
page: 1, | |
- rowsPerPage: 100, | |
- descending: false, | |
- sortBy: "" | |
+ itemsPerPage: 100, | |
+ sortDesc: [false], | |
+ sortBy: [""] | |
}, | |
loading: false, | |
errorMsg: "", | |
@@ -132,7 +132,7 @@ | |
currentOrderMode: EResourceOrderMode.asc, | |
rawDatas: [] as any[], | |
- toolbarClass: "mt-3", | |
+ toolbarClass: "mt-4", | |
toolbarIsFixed: false | |
}; | |
}, | |
@@ -226,7 +226,7 @@ | |
}, | |
pagination: { | |
handler() { | |
- if (this.pagination.descending) { | |
+ if (this.pagination.sortDesc[0]) { | |
this.currentOrderMode = EResourceOrderMode.desc; | |
} else { | |
this.currentOrderMode = EResourceOrderMode.asc; | |
@@ -236,7 +236,7 @@ | |
deep: true | |
}, | |
currentOrderMode() { | |
- this.pagination.descending = | |
+ this.pagination.sortDesc[0] = | |
this.currentOrderMode === EResourceOrderMode.desc; | |
}, | |
checkBox() { | |
@@ -1730,8 +1730,8 @@ | |
datas = datas.sort( | |
this.arrayObjectSort( | |
- this.pagination.sortBy, | |
- this.pagination.descending | |
+ this.pagination.sortBy[0], | |
+ this.pagination.sortDesc[0] | |
? EResourceOrderMode.desc | |
: EResourceOrderMode.asc | |
) | |
@@ -1857,16 +1857,16 @@ | |
} | |
}, | |
changeSort(column: string) { | |
- if (this.pagination.sortBy === column) { | |
- this.pagination.descending = !this.pagination.descending; | |
+ if (this.pagination.sortBy[0] === column) { | |
+ this.pagination.sortDesc[0] = !this.pagination.sortDesc[0]; | |
this.headerOrderClickCount++; | |
if (this.headerOrderClickCount == 2) { | |
- this.pagination.sortBy = ""; | |
+ this.pagination.sortBy[0] = ""; | |
} | |
} else { | |
this.headerOrderClickCount = 0; | |
- this.pagination.sortBy = column; | |
- this.pagination.descending = false; | |
+ this.pagination.sortBy[0] = column; | |
+ this.pagination.sortDesc[0] = false; | |
} | |
}, | |
getHeaderClass(header: any) { | |
@@ -1876,7 +1876,7 @@ | |
if (header.sortable !== false) { | |
result.push("sortable"); | |
- result.push(this.pagination.descending ? "desc" : "asc"); | |
+ result.push(this.pagination.sortDesc[0] ? "desc" : "asc"); | |
if (header.value === this.pagination.sortBy) { | |
result.push("active"); | |
} | |
@@ -1928,7 +1928,7 @@ | |
}); | |
} else { | |
this.toolbarIsFixed = false; | |
- this.toolbarClass = "mt-3"; | |
+ this.toolbarClass = "mt-4"; | |
} | |
} | |
}, | |
Index: src/options/plugins/vuetify.ts | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/plugins/vuetify.ts b/src/options/plugins/vuetify.ts | |
--- a/src/options/plugins/vuetify.ts (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/plugins/vuetify.ts (date 1612512792070) | |
@@ -3,18 +3,14 @@ | |
// Translation provided by Vuetify (typescript) | |
import zhHans from "vuetify/src/locale/zh-Hans"; | |
import en from "vuetify/src/locale/en"; | |
-import "vuetify/src/stylus/app.styl"; | |
-class VuetifyService { | |
- public init(lang: string = "zh-Hans") { | |
- Vue.use(Vuetify, { | |
- iconfont: "md", | |
- lang: { | |
- locales: { "zh-Hans": zhHans, en }, | |
- current: lang | |
- } | |
- }); | |
+Vue.use(Vuetify); | |
+ | |
+export default new Vuetify({ | |
+ icons: { | |
+ iconfont: 'md' | |
+ }, | |
+ lang: { | |
+ locales: { "zh-Hans": zhHans, en }, | |
} | |
-} | |
- | |
-export default new VuetifyService(); | |
+}) | |
Index: src/options/components/Content.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/Content.vue b/src/options/components/Content.vue | |
--- a/src/options/components/Content.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/Content.vue (date 1612510055647) | |
@@ -1,5 +1,5 @@ | |
<template> | |
- <v-content> | |
+ <v-main> | |
<v-container | |
fluid | |
:class="$vuetify.breakpoint.smAndDown?['pa-0']: $vuetify.breakpoint.md?['pa-1']:['pa-3']" | |
@@ -10,5 +10,5 @@ | |
<router-view v-if="!$route.meta.keepAlive"></router-view> | |
</v-container> | |
- </v-content> | |
-</template> | |
\ No newline at end of file | |
+ </v-main> | |
+</template> | |
Index: resource/clients/synologyDownloadStation/init.js | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/resource/clients/synologyDownloadStation/init.js b/resource/clients/synologyDownloadStation/init.js | |
--- a/resource/clients/synologyDownloadStation/init.js (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/resource/clients/synologyDownloadStation/init.js (date 1612505776992) | |
@@ -83,8 +83,8 @@ | |
/** | |
* 添加种子链接 | |
- * @param {*} options | |
- * @param {*} callback | |
+ * @param {*} options | |
+ * @param {*} callback | |
*/ | |
addTorrentFromUrl(options, callback) { | |
if (!this.sessionId) { | |
@@ -202,4 +202,4 @@ | |
} | |
// 添加到 window 对象,用于客户页面调用 | |
window.synologyDownloadStation = Client; | |
-})(jQuery, window) | |
\ No newline at end of file | |
+})(jQuery, window) | |
Index: src/options/components/Footer.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/Footer.vue b/src/options/components/Footer.vue | |
--- a/src/options/components/Footer.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/Footer.vue (date 1612513003373) | |
@@ -9,14 +9,14 @@ | |
>{{ words.developmentMode }}</span> | |
<v-chip | |
label | |
- outline | |
+ outlined | |
color="orange" | |
disabled | |
small | |
v-if="isDebugMode && $vuetify.breakpoint.mdAndUp" | |
>{{ $t("common.debugMode") }}</v-chip> | |
<v-btn | |
- outline | |
+ outlined | |
color="success" | |
small | |
v-if="newReleases" | |
@@ -27,7 +27,7 @@ | |
</span> | |
<v-spacer></v-spacer> | |
<v-btn | |
- flat | |
+ text | |
small | |
href="https://t.me/joinchat/NZ9NCxPKXyby8f35rn_QTw" | |
target="_blank" | |
@@ -36,7 +36,7 @@ | |
:icon="$vuetify.breakpoint.smAndDown" | |
> | |
<v-img | |
- src="./assets/telegram.svg" | |
+ src="@/../public/assets/telegram.svg" | |
width="16" | |
:style="$vuetify.breakpoint.smAndDown ? 'max-width:16px' : null" | |
/> | |
@@ -45,7 +45,7 @@ | |
<input type="file" ref="fileLanguage" style="display:none;" /> | |
<v-menu top offset-y> | |
<template v-slot:activator="{ on }"> | |
- <v-btn flat small v-on="on" :icon="$vuetify.breakpoint.smAndDown"> | |
+ <v-btn text small v-on="on" :icon="$vuetify.breakpoint.smAndDown"> | |
<v-icon small>language</v-icon> | |
<span class="ml-1" v-if="$vuetify.breakpoint.mdAndUp"> | |
{{ | |
@@ -56,26 +56,26 @@ | |
</template> | |
<v-list dense> | |
- <v-list-tile @click="selectFile"> | |
- <v-list-tile-title>{{ $t("common.addLanguage") }}</v-list-tile-title> | |
- </v-list-tile> | |
+ <v-list-item @click="selectFile"> | |
+ <v-list-item-title>{{ $t("common.addLanguage") }}</v-list-item-title> | |
+ </v-list-item> | |
</v-list> | |
<v-divider></v-divider> | |
<v-list dense> | |
- <v-list-tile v-for="(item, index) in languages" :key="index" @click="changeLanguage(item)"> | |
- <v-list-tile-title :class="currentLanguage == item.code ? 'primary--text' : ''"> | |
+ <v-list-item v-for="(item, index) in languages" :key="index" @click="changeLanguage(item)"> | |
+ <v-list-item-title :class="currentLanguage == item.code ? 'primary--text' : ''"> | |
<span> | |
<v-icon small class="mr-1 primary--text" v-if="currentLanguage == item.code">check</v-icon> | |
- <span v-else class="mr-4"></span> | |
+ <span v-else class="mr-6"></span> | |
</span> | |
{{ item.name }} | |
- </v-list-tile-title> | |
- </v-list-tile> | |
+ </v-list-item-title> | |
+ </v-list-item> | |
</v-list> | |
</v-menu> | |
- <v-btn flat small to="/system-logs" :icon="$vuetify.breakpoint.smAndDown"> | |
+ <v-btn text small to="/system-logs" :icon="$vuetify.breakpoint.smAndDown"> | |
<v-icon small>assignment</v-icon> | |
<span class="ml-1" v-if="$vuetify.breakpoint.mdAndUp"> | |
{{ | |
@@ -85,7 +85,7 @@ | |
</v-btn> | |
<v-btn | |
v-if="$vuetify.breakpoint.mdAndUp" | |
- flat | |
+ text | |
small | |
href="/debugger.html" | |
target="_blank" | |
Index: src/options/views/settings/SiteSearchEntry/Editor.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/views/settings/SiteSearchEntry/Editor.vue b/src/options/views/settings/SiteSearchEntry/Editor.vue | |
--- a/src/options/views/settings/SiteSearchEntry/Editor.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/views/settings/SiteSearchEntry/Editor.vue (date 1612515152633) | |
@@ -34,7 +34,7 @@ | |
multiple | |
:disabled="!data.isCustom" | |
> | |
- <template slot="selection" slot-scope="data"> | |
+ <template v-slot:selection="data"> | |
<v-chip | |
small | |
:selected="data.selected" | |
Index: src/options/components/Permissions.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/Permissions.vue b/src/options/components/Permissions.vue | |
--- a/src/options/components/Permissions.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/Permissions.vue (date 1612517413971) | |
@@ -1,8 +1,8 @@ | |
<template> | |
- <v-layout class="mt-3"> | |
+ <v-layout class="mt-4"> | |
<v-flex xs12 sm8 offset-sm2> | |
<v-card> | |
- <v-img src="./assets/banner/default.jpg" aspect-ratio="2.75"></v-img> | |
+ <v-img src="@/../public/assets/banner/default.jpg" aspect-ratio="2.75"></v-img> | |
<v-card-title class="pb-1"> | |
<div v-if="!cancelled"> | |
@@ -14,8 +14,8 @@ | |
:headers="headers" | |
:items="items" | |
item-key="key" | |
- select-all | |
- hide-actions | |
+ show-select | |
+ hide-default-footer | |
> | |
<template v-slot:items="props"> | |
<tr v-if="props.item.visible"> | |
@@ -42,12 +42,12 @@ | |
<v-card-actions v-if="!cancelled"> | |
<v-btn | |
- flat | |
+ textsortBy | |
color="success" | |
:disabled="selected.length==0" | |
@click="authorize" | |
>{{ $t("permissions.authorize") }}</v-btn> | |
- <v-btn flat color="orange" @click="cancel">{{ $t("permissions.cancel") }}</v-btn> | |
+ <v-btn text color="orange" @click="cancel">{{ $t("permissions.cancel") }}</v-btn> | |
</v-card-actions> | |
</v-card> | |
</v-flex> | |
Index: src/options/components/WorkingStatus.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/WorkingStatus.vue b/src/options/components/WorkingStatus.vue | |
--- a/src/options/components/WorkingStatus.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/WorkingStatus.vue (date 1612510399951) | |
@@ -1,17 +1,17 @@ | |
<template> | |
<div v-if="working"> | |
<v-list> | |
- <v-list-tile v-for="(item, index) in items" :key="index"> | |
- <v-list-tile-action> | |
- <v-btn flat icon :loading="item.status=='loading'"> | |
+ <v-list-item v-for="(item, index) in items" :key="index"> | |
+ <v-list-item-action> | |
+ <v-btn text icon :loading="item.status=='loading'"> | |
<v-icon :color="getColor(item)">{{getIcon(item)}}</v-icon> | |
</v-btn> | |
- </v-list-tile-action> | |
+ </v-list-item-action> | |
- <v-list-tile-content> | |
- <v-list-tile-title v-text="item.title"></v-list-tile-title> | |
- </v-list-tile-content> | |
- </v-list-tile> | |
+ <v-list-item-content> | |
+ <v-list-item-title v-text="item.title"></v-list-item-title> | |
+ </v-list-item-content> | |
+ </v-list-item> | |
</v-list> | |
</div> | |
</template> | |
@@ -114,4 +114,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> | |
Index: src/options/components/TorrentProgress.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/TorrentProgress.vue b/src/options/components/TorrentProgress.vue | |
--- a/src/options/components/TorrentProgress.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/TorrentProgress.vue (date 1612507015954) | |
@@ -1,9 +1,9 @@ | |
<template> | |
- <v-layout row wrap> | |
- <v-flex xs2 class="mt-1"> | |
+ <v-row > | |
+ <v-col cols="2" class="mt-1"> | |
<v-icon :size="10" :color="color" :title="statusTip">{{icon}}</v-icon> | |
- </v-flex> | |
- <v-flex xs10> | |
+ </v-col> | |
+ <v-col cols="10"> | |
<v-progress-linear | |
style="margin-left: 1px;" | |
:color="color" | |
@@ -11,8 +11,8 @@ | |
:value="progress" | |
:title="`${progress}%`" | |
></v-progress-linear> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</template> | |
<script lang="ts"> | |
import Vue from "vue"; | |
Index: src/options/components/Topbar.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/Topbar.vue b/src/options/components/Topbar.vue | |
--- a/src/options/components/Topbar.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/Topbar.vue (date 1612510772298) | |
@@ -1,12 +1,12 @@ | |
<template> | |
- <v-toolbar :color="baseColor" app fixed clipped-left id="system-topbar"> | |
- <v-toolbar-side-icon @click.stop="drawer = !drawer" :title="$t('topbar.navBarTip')"></v-toolbar-side-icon> | |
- <v-toolbar-title style="width: 220px;" class="hidden-md-and-down"> | |
+ <v-app-bar :color="baseColor" fixed app clipped-left id="system-topbar"> | |
+ <v-app-bar-nav-icon @click.stop="drawer = !drawer" :title="$t('topbar.navBarTip')"></v-app-bar-nav-icon> | |
+ <v-app-bar-title style="width: 220px;" class="hidden-md-and-down"> | |
<span>{{ $t("topbar.title") }}</span> | |
- </v-toolbar-title> | |
+ </v-app-bar-title> | |
<SearchBox /> | |
<v-btn | |
- flat | |
+ text | |
to="/search-torrent/__LatestTorrents__" | |
class="grey--text text--darken-2 hidden-xs-only" | |
:title="$t('topbar.showNewTorrentsTip')" | |
@@ -18,7 +18,7 @@ | |
<v-spacer></v-spacer> | |
<v-toolbar-items class="hidden-xs-only"> | |
<v-btn | |
- flat | |
+ text | |
href="https://github.com/ronggang/PT-Plugin-Plus" | |
target="_blank" | |
class="grey--text text--darken-2" | |
@@ -29,7 +29,7 @@ | |
<span class="ml-1">{{ $t("topbar.github") }}</span> | |
</v-btn> | |
<v-btn | |
- flat | |
+ text | |
href="https://github.com/ronggang/PT-Plugin-Plus/wiki" | |
target="_blank" | |
class="grey--text text--darken-2" | |
@@ -40,7 +40,7 @@ | |
<span class="ml-1">{{ $t("topbar.help") }}</span> | |
</v-btn> | |
<v-btn | |
- flat | |
+ text | |
to="/donate" | |
class="grey--text text--darken-2" | |
:title="$t('navigation.support.donate')" | |
@@ -49,7 +49,7 @@ | |
<span class="ml-1">{{ $t("navigation.support.donate") }}</span> | |
</v-btn> | |
</v-toolbar-items> | |
- </v-toolbar> | |
+ </v-app-bar> | |
</template> | |
<script lang="ts"> | |
import Vue from "vue"; | |
Index: src/options/components/Navigation.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/Navigation.vue b/src/options/components/Navigation.vue | |
--- a/src/options/components/Navigation.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/Navigation.vue (date 1612508096781) | |
@@ -6,7 +6,7 @@ | |
$t(group.title) | |
}}</v-subheader> | |
<template v-for="(item, index) in group.items"> | |
- <v-list-tile | |
+ <v-list-item | |
v-if="item.visible !== false" | |
:to="item.key" | |
:key="index" | |
@@ -14,13 +14,13 @@ | |
:target="item.url ? '_blank' : ''" | |
rel="noopener noreferrer nofollow" | |
> | |
- <v-list-tile-action style="min-width: 42px;margin-left: 13px;"> | |
+ <v-list-item-action style="min-width: 42px;margin-left: 13px;"> | |
<v-icon>{{ item.icon }}</v-icon> | |
- </v-list-tile-action> | |
- <v-list-tile-content> | |
- <v-list-tile-title>{{ $t(item.title) }}</v-list-tile-title> | |
- </v-list-tile-content> | |
- </v-list-tile> | |
+ </v-list-item-action> | |
+ <v-list-item-content> | |
+ <v-list-item-title>{{ $t(item.title) }}</v-list-item-title> | |
+ </v-list-item-content> | |
+ </v-list-item> | |
</template> | |
</v-list> | |
</v-navigation-drawer> | |
Index: src/options/components/MovieInfoCard.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/MovieInfoCard.vue b/src/options/components/MovieInfoCard.vue | |
--- a/src/options/components/MovieInfoCard.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/MovieInfoCard.vue (date 1612507170520) | |
@@ -12,133 +12,133 @@ | |
</v-card-title> | |
<v-img | |
:src="info.image || info.pic.normal" | |
- class="ml-3 mb-3" | |
+ class="ml-4 mb-4" | |
contain | |
:max-height="maxHeight" | |
position="left center" | |
> | |
- <v-layout style="margin-left: 220px;" v-if="$vuetify.breakpoint.mdAndUp"> | |
+ <v-row style="margin-left: 220px;" v-if="$vuetify.breakpoint.mdAndUp"> | |
<!-- omit 格式 --> | |
<v-card-title class="pt-0" v-if="info.updateTime"> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.alias") }}</span> | |
<span class="caption">{{ info.aka }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.director") }}</span> | |
<span class="caption">{{ info.director }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.writer") }}</span> | |
<span class="caption">{{ info.scenarist }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.cast") }}</span> | |
<span class="caption">{{ info.cast }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.type") }}</span> | |
<span class="caption">{{ info.genre }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.pubdate") }}</span> | |
<span class="caption">{{ info.releaseDate }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.duration") }}</span> | |
<span class="caption">{{ info.runtime }}</span> | |
- </v-flex> | |
- <v-flex xs12 class="my-2"> | |
+ </v-col> | |
+ <v-col cols="12" class="my-2"> | |
<v-divider light></v-divider> | |
- </v-flex> | |
+ </v-col> | |
<div class="caption" v-html="` ${info.summary.replace(/\n/g, '<br>')} @豆瓣`"></div> | |
</v-card-title> | |
<v-card-title class="pt-0" v-else-if="info.attrs"> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.alias") }}</span> | |
<span class="caption">{{ info.alt_title }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.director") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.director) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.writer") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.writer) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.cast") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.cast) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.type") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.movie_type) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.pubdate") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.pubdate) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.duration") }}</span> | |
<span class="caption">{{ formatArray(info.attrs.movie_duration) }}</span> | |
- </v-flex> | |
- <v-flex xs12 class="my-2"> | |
+ </v-col> | |
+ <v-col cols="12" class="my-2"> | |
<v-divider light></v-divider> | |
- </v-flex> | |
+ </v-col> | |
<div class="caption" v-html="`${info.summary} @豆瓣`"></div> | |
</v-card-title> | |
<v-card-title class="pt-0" v-else> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.alias") }}</span> | |
<span class="caption">{{ info.original_title }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.director") }}</span> | |
<span class="caption">{{ getArrayValues(info.directors) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.cast") }}</span> | |
<span class="caption">{{ getArrayValues(info.actors) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.type") }}</span> | |
<span class="caption">{{ formatArray(info.genres) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.pubdate") }}</span> | |
<span class="caption">{{ formatArray(info.pubdate) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span>{{ $t("movieInfoCard.duration") }}</span> | |
<span class="caption">{{ formatArray(info.durations) }}</span> | |
- </v-flex> | |
- <v-flex xs12 class="my-2"> | |
+ </v-col> | |
+ <v-col cols="12" class="my-2"> | |
<v-divider light></v-divider> | |
- </v-flex> | |
+ </v-col> | |
<div class="caption" v-html="`${info.intro} @豆瓣`"></div> | |
</v-card-title> | |
- </v-layout> | |
- <v-layout v-else style="margin-left: 75px;"> | |
+ </v-row> | |
+ <v-row v-else style="margin-left: 75px;"> | |
<v-card-text class="pt-0"> | |
- <v-flex xs12> | |
+ <v-col cols="12"> | |
<span class="caption">{{ info.original_title || info.alt_title }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span class="caption">{{ formatArray(info.genres || info.attrs.movie_type) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span class="caption">{{ formatArray(info.pubdate || info.attrs.pubdate) }}</span> | |
- </v-flex> | |
- <v-flex xs12> | |
+ </v-col> | |
+ <v-col cols="12"> | |
<span class="caption">{{ formatArray(info.durations || info.attrs.movie_duration) }}</span> | |
- </v-flex> | |
+ </v-col> | |
</v-card-text> | |
- </v-layout> | |
+ </v-row> | |
</v-img> | |
<v-divider light></v-divider> | |
- <v-card-actions class="px-3"> | |
+ <v-card-actions class="px-4"> | |
<!-- 豆瓣评分 --> | |
<v-btn | |
color="success" | |
@@ -186,8 +186,8 @@ | |
</v-btn> | |
<v-spacer></v-spacer> | |
- <v-layout v-if="$vuetify.breakpoint.mdAndUp"> | |
- <v-flex xs6 v-if="rating>0"> | |
+ <v-row v-if="$vuetify.breakpoint.mdAndUp"> | |
+ <v-col cols="6" v-if="rating>0"> | |
<v-rating | |
v-model="rating" | |
background-color="white" | |
@@ -200,8 +200,8 @@ | |
<span | |
class="ma-2" | |
>{{ $t("movieInfoCard.ratings.douban", {average: info.average || info.rating.value || info.rating.average, numRaters: info.votes || info.rating.count || info.rating.numRaters}) }}</span> | |
- </v-flex> | |
- <v-flex xs6 v-if="imdbRating>0"> | |
+ </v-col> | |
+ <v-col cols="6" v-if="imdbRating>0"> | |
<v-rating | |
v-model="imdbRating" | |
background-color="white" | |
@@ -214,8 +214,8 @@ | |
<span | |
class="ma-2" | |
>{{ $t("movieInfoCard.ratings.imdb", {average: ratings.imdbRating, numRaters: ratings.imdbVotes.replace(/,/g, "")}) }}</span> | |
- </v-flex> | |
- </v-layout> | |
+ </v-col> | |
+ </v-row> | |
</v-card-actions> | |
</v-card> | |
</div> | |
Index: src/options/components/DownloadTo.vue | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/options/components/DownloadTo.vue b/src/options/components/DownloadTo.vue | |
--- a/src/options/components/DownloadTo.vue (revision 61365938efaf49b892118c0776d6477e5dec1329) | |
+++ b/src/options/components/DownloadTo.vue (date 1612510434168) | |
@@ -1,6 +1,6 @@ | |
<template> | |
<v-btn | |
- :flat="flat" | |
+ :text="flat" | |
:icon="icon" | |
:small="small" | |
:loading="loading" | |
@@ -381,4 +381,4 @@ | |
} | |
} | |
}); | |
-</script> | |
\ No newline at end of file | |
+</script> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment