From e8dc71c71f96111742d5cdf40f7df2fef49c58eb Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 16 May 2022 11:06:13 +0800 Subject: [PATCH] no message --- electron/build.js | 22 ++--- resources/assets/js/App.vue | 13 +-- .../assets/js/components/Mobile/Back.vue | 2 - .../assets/js/components/Mobile/Tabbar.vue | 72 ++++++++++----- resources/assets/js/functions/common.js | 2 +- resources/assets/js/pages/manage.vue | 5 +- .../js/pages/manage/components/DialogView.vue | 2 +- .../pages/manage/components/DialogWrapper.vue | 8 +- .../pages/manage/components/FileHistory.vue | 2 +- .../js/pages/manage/components/TaskDetail.vue | 2 +- .../assets/js/pages/manage/setting/index.vue | 1 + .../js/pages/manage/setting/language.vue | 57 ++++++++++++ .../js/pages/manage/setting/personal.vue | 4 +- resources/assets/js/routes.js | 5 ++ resources/assets/sass/components/mobile.scss | 84 +++++++++++++++++- resources/assets/sass/pages/common.scss | 5 ++ resources/assets/sass/pages/page-setting.scss | 1 - .../statics/public/css/fonts/taskfont.ttf | Bin 54980 -> 55484 bytes .../statics/public/css/fonts/taskfont.woff | Bin 29588 -> 29940 bytes .../statics/public/css/fonts/taskfont.woff2 | Bin 25136 -> 25452 bytes 20 files changed, 220 insertions(+), 67 deletions(-) create mode 100644 resources/assets/js/pages/manage/setting/language.vue diff --git a/electron/build.js b/electron/build.js index d84a214c6..44ce85c02 100644 --- a/electron/build.js +++ b/electron/build.js @@ -98,6 +98,13 @@ function genericPublish({url, version, output}) { // 生成配置、编译应用 function startBuild(data, publish) { + const systemInfo = { + title: data.name, + version: config.version, + origin: "./", + homeUrl: utils.formatUrl(data.url), + apiUrl: utils.formatUrl(data.url) + "api/", + } // information if (data.id === 'app') { console.log("Name: " + data.name); @@ -108,16 +115,9 @@ function startBuild(data, publish) { console.log("Version: " + config.version); console.log("Platform: " + data.platform); console.log("Publish: " + (publish ? 'Yes' : 'No')); + // drawio + cloneDrawio(systemInfo) } - let systemInfo = { - title: data.name, - version: config.version, - origin: "./", - homeUrl: utils.formatUrl(data.url), - apiUrl: utils.formatUrl(data.url) + "api/", - } - // drawio - cloneDrawio(systemInfo) // config.js fs.writeFileSync(electronDir + "/config.js", "window.systemInfo = " + JSON.stringify(systemInfo), 'utf8'); fs.writeFileSync(nativeCachePath, utils.formatUrl(data.url)); @@ -128,7 +128,9 @@ function startBuild(data, publish) { indexString = indexString.replace(/(.*?)<\/title>/g, `<title>${data.name}`); fs.writeFileSync(indexFile, indexString, 'utf8'); if (data.id === 'app') { - fse.copySync(electronDir, path.resolve(__dirname, "../resources/mobile/src/public")) + const publicDir = path.resolve(__dirname, "../resources/mobile/src/public"); + fse.removeSync(publicDir) + fse.copySync(electronDir, publicDir) return; } // package.json Backup diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index a6f4e5d64..a7546df3b 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -32,20 +32,13 @@ export default { }, created() { + if ($A.urlParameter('token')) { + this.$store.state.userToken = $A.urlParameter('token'); + } this.electronEvents(); }, mounted() { - let hash = window.location.hash; - if (hash.indexOf("#") === 0) { - hash = hash.substr(1); - if (hash) { - this.$nextTick(() => { - hash = $A.removeURLParameter(hash, 'token'); - this.goForward({path: hash}); - }); - } - } this.sessionStorage('/', 1); let pathname = window.location.pathname; if (pathname && this.sessionStorage(pathname) === 0) { diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue index 21e314b76..78f7d67e9 100644 --- a/resources/assets/js/components/Mobile/Back.vue +++ b/resources/assets/js/components/Mobile/Back.vue @@ -3,8 +3,6 @@ diff --git a/resources/assets/js/pages/manage/setting/personal.vue b/resources/assets/js/pages/manage/setting/personal.vue index 76b0762ab..3a502a314 100644 --- a/resources/assets/js/pages/manage/setting/personal.vue +++ b/resources/assets/js/pages/manage/setting/personal.vue @@ -9,10 +9,10 @@ - + - +