From 1693d08d093c1eb89a32324f3be14ba6871b6e25 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 23 Feb 2023 21:29:24 +0800 Subject: [PATCH] no message --- cmd | 6 +++--- package.json | 13 ++++++------- .../js/pages/manage/components/FileContent.vue | 3 ++- resources/assets/sass/element.scss | 18 +++++++++--------- .../sass/pages/components/chat-input.scss | 4 ++-- vite.config.js | 10 +++++++++- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/cmd b/cmd index 9f50e9afc..6bfac7817 100755 --- a/cmd +++ b/cmd @@ -104,11 +104,11 @@ run_compile() { # if [ "$type" = "prod" ]; then rm -rf "./public/js/build" - npx mix --production + npx vite build mix_manifest "public" echo "$(rand_string 16)" > ./public/js/hash else - npx mix watch --hot + npx vite fi } @@ -134,7 +134,7 @@ run_electron() { cp ./electron/index.html ./electron/public/index.html # if [ "$argv" != "dev" ] && [ "$argv" != "--nobuild" ]; then - npx mix --production -- --env --electron + npx vite build -- --env --electron mix_manifest "electron/public" fi if [ "$argv" == "dev" ]; then diff --git a/package.json b/package.json index 8f8cdafe2..46abf4d8b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "internal-ip": "^6.2.0", "jquery": "^3.6.1", "jspdf": "^2.5.1", - "laravel-mix": "git+https://github.com/kuaifan/laravel-mix.git#master", "le5le-store": "^1.0.7", "less": "^4.1.2", "less-loader": "^10.2.0", @@ -43,7 +42,7 @@ "quill": "^1.3.7", "quill-mention-hi": "^3.1.0-1", "resolve-url-loader": "^4.0.0", - "sass": "~1.26.5", + "sass": "~1.32.13", "sass-loader": "^12.6.0", "stylus": "^0.59.0", "stylus-loader": "^7.1.0", @@ -51,20 +50,20 @@ "tui-calendar-hi": "^1.15.1-5", "view-design-hi": "^4.7.0-36", "vite": "^2.9.15", - "vite-plugin-vue2": "^2.0.3", "vite-plugin-file-copy": "^1.0.0", "vite-plugin-require": "^1.1.10", - "vue": "^2.7.14", + "vite-plugin-vue2": "^2.0.3", + "vue": "~2.6.14", "vue-clipboard2": "^0.3.3", + "vue-jsonp": "^2.0.0", "vue-kityminder-ggg": "^1.3.10", "vue-loader": "^15.10.1", - "vue-jsonp": "^2.0.0", "vue-resize-observer": "^2.0.16", "vue-router": "^3.6.5", - "vue-template-compiler": "^2.7.14", + "vue-template-compiler": "~2.6.14", "vue-virtual-scroll-list-hi": "^2.3.4-3", "vuedraggable": "^2.24.3", - "vuex": "3.6.2" + "vuex": "^3.6.2" }, "app": [ { diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index e64da3f1e..e644da727 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -45,7 +45,8 @@ + @on-click="exportMenu" + transfer> {{$L('导出')}} {{$L('导出PNG图片')}} diff --git a/resources/assets/sass/element.scss b/resources/assets/sass/element.scss index cb4391f15..6607f15e7 100644 --- a/resources/assets/sass/element.scss +++ b/resources/assets/sass/element.scss @@ -5,15 +5,15 @@ $--tooltip-font-size: 14px; $--dropdown-menuItem-hover-fill: #f4f5f7; $--dropdown-menuItem-hover-color: #606266; -@import "element-ui/packages/theme-chalk/src/common/transition"; -@import "element-ui/packages/theme-chalk/src/icon"; -@import "element-ui/packages/theme-chalk/src/avatar"; -@import "element-ui/packages/theme-chalk/src/tooltip"; -@import "element-ui/packages/theme-chalk/src/popover"; -@import "element-ui/packages/theme-chalk/src/dropdown"; -@import "element-ui/packages/theme-chalk/src/dropdown-menu"; -@import "element-ui/packages/theme-chalk/src/dropdown-item"; -@import "element-ui/packages/theme-chalk/src/notification"; +@import "~element-ui/packages/theme-chalk/src/common/transition"; +@import "~element-ui/packages/theme-chalk/src/icon"; +@import "~element-ui/packages/theme-chalk/src/avatar"; +@import "~element-ui/packages/theme-chalk/src/tooltip"; +@import "~element-ui/packages/theme-chalk/src/popover"; +@import "~element-ui/packages/theme-chalk/src/dropdown"; +@import "~element-ui/packages/theme-chalk/src/dropdown-menu"; +@import "~element-ui/packages/theme-chalk/src/dropdown-item"; +@import "~element-ui/packages/theme-chalk/src/notification"; .el-dropdown-menu { user-select: none; diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index efbcdb4a5..f1bcbe3db 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -1,5 +1,5 @@ -@import "quill/dist/quill.bubble.css"; -@import "quill-mention-hi/dist/quill.mention.min.css"; +@import "~quill/dist/quill.bubble.css"; +@import "~quill-mention-hi/dist/quill.mention.min.css"; .chat-input-box { display: inline-block; diff --git a/vite.config.js b/vite.config.js index 09a04c512..6baf42f74 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,3 +1,4 @@ +import {resolve} from "path"; import {defineConfig} from 'vite' import {createVuePlugin} from 'vite-plugin-vue2'; import vitePluginRequire from 'vite-plugin-require' @@ -19,6 +20,13 @@ export default defineConfig(({command, mode}) => { port: serverPort, }, resolve: { + alias: { + '~element-ui': resolve(__dirname, './node_modules/element-ui'), + '~quill': resolve(__dirname, './node_modules/quill'), + '~quill-mention-hi': resolve(__dirname, './node_modules/quill-mention-hi'), + '../images': resolve(__dirname, command === 'serve' ? '/images' : './resources/assets/statics/public/images'), + '../css': resolve(__dirname, command === 'serve' ? '/css' : './resources/assets/statics/public/css') + }, extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'] }, define: { @@ -36,7 +44,7 @@ export default defineConfig(({command, mode}) => { plugins: [ createVuePlugin(), vitePluginRequire(), - vitePluginFileCopy([{src: 'resources/assets/statics/public', dest: publicPath}]), // 拷贝 public + vitePluginFileCopy([{src: 'resources/assets/statics/public', dest: publicPath}]), ] }; });