diff --git a/public/index.html b/public/index.html index 826b528..1b2ccea 100644 --- a/public/index.html +++ b/public/index.html @@ -1,45 +1,53 @@ - - - - - - - <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %> - - - <% } %> - <%= htmlWebpackPlugin.options.title %> - - - <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %> - - <% } %> - - - - - - + + + + + + + <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %> + + + <% } %> + <%= htmlWebpackPlugin.options.title %> + + + <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %> + + <% } %> + + + + + + + + \ No newline at end of file diff --git a/src/i18n.js b/src/i18n.js index 386a7d4..966a37b 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -25,7 +25,7 @@ Vue.prototype.$languages = Object.keys(messages).map(langlage => ({ })) export default new VueI18n({ - locale: util.cookies.get('lang') || process.env.VUE_APP_I18N_LOCALE, + locale: util.cookies.get('lang') || window.gdconfig.themeOptions.languages || process.env.VUE_APP_I18N_LOCALE, fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE, messages }) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 5ae3c47..979b5d8 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -30,7 +30,7 @@ const router = new VueRouter({ */ router.beforeEach(async (to, from, next) => { console.log("before:"); - console.log(to); + console.log(to,from); next(); }); diff --git a/src/router/routes.js b/src/router/routes.js index ee69890..0d350b7 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,12 +1,50 @@ // 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载 const _import = require("@/libs/util.import." + process.env.NODE_ENV); -const frameIn = [ - { path: "/:id:(text)/:path", component: _import("page/GoText"), props: true }, - { path: "/:id:(pdf)/:path", component: _import("page/GoPdf"), props: true }, - { path: "/:id:(video)/:path", component: _import("page/GoVideo") }, - { path: "/:id:(image)/:path", component: _import("page/GoImg") }, - { path: "/:id::cmd?(/?/??.*/)", component: _import("page/GoList") }, +const meta = { + keepAlive: true +} + +const frameIn = [{ + path: "/:id:(text)/:path", + component: _import("page/GoText"), + meta: { + ...meta, + view: 'text' + } + }, + { + path: "/:id:(pdf)/:path", + component: _import("page/GoPdf"), + meta: { + ...meta, + view: 'pdf' + } + }, + { + path: "/:id:(video)/:path", + component: _import("page/GoVideo"), + meta: { + ...meta, + view: 'video' + } + }, + { + path: "/:id:(image)/:path", + component: _import("page/GoImg"), + meta: { + ...meta, + view: 'image' + } + }, + { + path: "/:id::cmd?(/?/??.*)", + component: _import("page/GoList"), + meta: { + ...meta, + view: 'list' + } + }, ]; -export default frameIn; +export default frameIn; \ No newline at end of file diff --git a/src/views/Layout.vue b/src/views/Layout.vue index c54e5ea..3a36d0e 100644 --- a/src/views/Layout.vue +++ b/src/views/Layout.vue @@ -4,9 +4,9 @@
- + - +
diff --git a/src/views/common/Navbar.vue b/src/views/common/Navbar.vue index e1c3202..fcac841 100644 --- a/src/views/common/Navbar.vue +++ b/src/views/common/Navbar.vue @@ -38,7 +38,7 @@
- - +
+
diff --git a/src/views/page/GoImg.vue b/src/views/page/GoImg.vue index 6dcf366..207e1b8 100644 --- a/src/views/page/GoImg.vue +++ b/src/views/page/GoImg.vue @@ -23,7 +23,10 @@ export default { }, computed: { url() { - return decode64(this.$route.params.path); + if (this.$route.params.path) { + return decode64(this.$route.params.path); + } + return '' } }, created() { @@ -33,7 +36,7 @@ export default { render() { let path = this.url; // 便于开发环境调试 - path = process.env.NODE_ENV === "development" ? "/api" + path : ""; + // path = process.env.NODE_ENV === "development" ? "/api" + path : ""; this.imgurl = path; }, loading(event) { diff --git a/src/views/page/GoList.vue b/src/views/page/GoList.vue index 92244d2..3ab0b07 100644 --- a/src/views/page/GoList.vue +++ b/src/views/page/GoList.vue @@ -25,6 +25,11 @@ + {{file.name}} {{file.modifiedTime}} @@ -84,7 +89,7 @@ export default { Headmd: Markdown, Readmemd: Markdown }, - data: function() { + data: function () { return { page: { page_token: null, @@ -123,7 +128,7 @@ export default { }; }, computed: { - columns() { + columns () { return [ { name: this.$t("list.title.file"), style: "" }, { @@ -138,22 +143,22 @@ export default { }, { name: this.$t("list.title.operation"), - style: "width:13%", + style: "width:13.5%", class: "is-hidden-mobile is-hidden-touch" } ]; } }, - mounted() { + mounted () { this.render(); }, methods: { - cellClass(row) { + cellClass (row) { if (row.columnIndex != 0) { return "is-hidden-mobile is-hidden-touch has-text-drak"; } }, - render() { + render () { let path = window.location.pathname; this.loading = true; var password = localStorage.getItem("password" + path); @@ -220,7 +225,7 @@ export default { this.loading = false; }); }, - checkPassword(path) { + checkPassword (path) { var pass = prompt(this.$t("list.auth"), ""); localStorage.setItem("password" + path, pass); if (pass != null && pass != "") { @@ -229,12 +234,12 @@ export default { history.go(-1); } }, - copy(path) { + copy (path) { let origin = window.location.origin; path = origin + path; clipboard.writeText(path); }, - go(file, target) { + go (file, target) { let path = file.path; if (path.match("/[0-9]+:search/")) { this.goSearchResult(file, target); @@ -261,7 +266,7 @@ export default { return; } }, - goSearchResult(file, target) { + goSearchResult (file, target) { this.loading = true; let cur = window.current_drive_order; axios @@ -286,19 +291,25 @@ export default { console.log(e); }); }, - getIcon(type) { + getIcon (type) { return "#" + (this.icon[type] ? this.icon[type] : "icon-weizhi"); } }, watch: { - $route(to, from) { - // 后退设置page_token为空 - if (to.path.length < from.path.length) { - this.page.page_token = null; + $route (to, from) { + if (!to.path.indexOf(':search')) { + // 后退设置page_token为空 + if (to.path.length < from.path.length) { + this.page.page_token = null; + } + if (to.path.substr(-1) !== '/' && from.meta.view !== "list") { + return + } } - if (to.path.substr(-1) === '/') { - this.render(); - } + + this.headmd = { display: false, file: {}, path: "" }, + this.readmemd = { display: false, file: {}, path: "" } + this.render(); } } }; diff --git a/src/views/page/GoPdf.vue b/src/views/page/GoPdf.vue index e5db242..3f72d9a 100644 --- a/src/views/page/GoPdf.vue +++ b/src/views/page/GoPdf.vue @@ -14,7 +14,10 @@ export default { }, computed: { url() { - return decode64(this.$route.params.path); + if (this.$route.params.path) { + return decode64(this.$route.params.path); + } + return '' } }, methods: {} diff --git a/src/views/page/GoText.vue b/src/views/page/GoText.vue index d466e4b..31c3227 100644 --- a/src/views/page/GoText.vue +++ b/src/views/page/GoText.vue @@ -15,32 +15,40 @@