diff --git a/server/main.go b/server/main.go index fdf1a40d3..2bb0a2152 100644 --- a/server/main.go +++ b/server/main.go @@ -1,8 +1,6 @@ package main import ( - "go.uber.org/zap" - "github.com/flipped-aurora/gin-vue-admin/server/core" "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/initialize" diff --git a/web/package.json b/web/package.json index 76a94b539..a453278c5 100644 --- a/web/package.json +++ b/web/package.json @@ -11,35 +11,35 @@ }, "dependencies": { "@element-plus/icons-vue": "^0.2.7", - "axios": "^0.24.0", + "axios": "^0.27.2", "core-js": "^3.6.5", - "echarts": "5.3.2", - "element-plus": "2.2.9", + "echarts": "5.3.3", + "element-plus": "2.2.16", "highlight.js": "^10.6.0", "js-cookie": "^3.0.1", - "marked": "^2.0.0", + "marked": "^4.1.0", "mitt": "^3.0.0", "nprogress": "^0.2.0", "path": "^0.12.7", - "pinia": "^2.0.9", - "qs": "^6.8.0", + "pinia": "^2.0.22", + "qs": "^6.11.0", "quill": "^1.3.7", - "screenfull": "^5.0.2", - "spark-md5": "^3.0.1", - "vue": "^3.2.25", - "vue-i18n": "^9.2.0-beta.26", - "vue-router": "^4.0.0-0" + "screenfull": "^6.0.2", + "spark-md5": "^3.0.2", + "vue": "^3.2.39", + "vue-i18n": "^9.2.2", + "vue-router": "^4.1.5" }, "devDependencies": { - "@intlify/vite-plugin-vue-i18n": "^3.2.1", - "@intlify/vue-i18n-loader": "^4.1.0", + "@intlify/vite-plugin-vue-i18n": "^6.0.1", + "@intlify/vue-i18n-loader": "^4.2.0", "@vitejs/plugin-legacy": "^2.0.0", "@vitejs/plugin-vue": "^3.0.1", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.5.0", - "@vue/cli-service": "~4.5.0", + "@vue/cli-plugin-babel": "^5.0.8", + "@vue/cli-plugin-eslint": "^5.0.8", + "@vue/cli-plugin-router": "^5.0.8", + "@vue/cli-plugin-vuex": "^5.0.8", + "@vue/cli-service": "^5.0.8", "@vue/compiler-sfc": "^3.1.5", "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.13.3", diff --git a/web/src/main.js b/web/src/main.js index c5f833181..ec6e30003 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -13,12 +13,15 @@ import auth from '@/directive/auth' import { store } from '@/pinia' import App from './App.vue' import i18n from './i18n' // added by mohamed hassan to multilangauge -/** + +/* * * @description 导入加载进度条,防止首屏加载时间过长,用户等待 * * */ + import Nprogress from 'nprogress' import 'nprogress/nprogress.css' + Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 }) Nprogress.start() diff --git a/web/src/view/superAdmin/authority/components/menus.vue b/web/src/view/superAdmin/authority/components/menus.vue index 0c5b08bcc..68844ea1e 100644 --- a/web/src/view/superAdmin/authority/components/menus.vue +++ b/web/src/view/superAdmin/authority/components/menus.vue @@ -42,6 +42,7 @@ 分配按钮 + diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index 1f801fe7a..edf6fd580 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -192,9 +192,10 @@ import PreviewCodeDialog from '@/view/systemTools/autoCode/component/previewCode import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun' import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode' import { getDict } from '@/utils/dictionary' -import { ref, getCurrentInstance, reactive } from 'vue' +import { ref, getCurrentInstance, reactive, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { ElMessage } from 'element-plus' +import WarningBar from '@/components/warningBar/warningBar.vue' import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage const { t } = useI18n() // added by mohamed hassan to support multilanguage @@ -215,16 +216,6 @@ const fieldTemplate = { dictType: '' } -import FieldDialog from '@/view/systemTools/autoCode/component/fieldDialog.vue' -import PreviewCodeDialog from '@/view/systemTools/autoCode/component/previewCodeDialg.vue' -import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun' -import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode' -import { getDict } from '@/utils/dictionary' -import { ref, getCurrentInstance, reactive, watch } from 'vue' -import { useRoute, useRouter } from 'vue-router' -import { ElMessage } from 'element-plus' -import WarningBar from '@/components/warningBar/warningBar.vue' - const route = useRoute() const router = useRouter() const activeNames = reactive([])