diff --git a/pom.xml b/pom.xml index 1995c085..58acc2f9 100644 --- a/pom.xml +++ b/pom.xml @@ -375,7 +375,7 @@ com.baomidou dynamic-datasource-spring-boot3-starter - 4.3.0 + 4.3.1 diff --git a/snowy-admin-web/.env.development b/snowy-admin-web/.env.development index f7b453fd..5e3b7869 100644 --- a/snowy-admin-web/.env.development +++ b/snowy-admin-web/.env.development @@ -9,3 +9,6 @@ VITE_SET_DRAWER = true # 本地环境 NODE_ENV = development + +# 检测更新(本地建议关闭) +VITE_VERSION_UPDATE = false diff --git a/snowy-admin-web/.env.production b/snowy-admin-web/.env.production index 26326300..6b454a68 100644 --- a/snowy-admin-web/.env.production +++ b/snowy-admin-web/.env.production @@ -6,3 +6,6 @@ VITE_PORT = 81 # 开启设置抽屉 VITE_SET_DRAWER = false + +# 检测更新(生产建议开启) +VITE_VERSION_UPDATE = true diff --git a/snowy-admin-web/package.json b/snowy-admin-web/package.json index abb8a77e..bdfbeea5 100644 --- a/snowy-admin-web/package.json +++ b/snowy-admin-web/package.json @@ -18,40 +18,40 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "1.0.1", - "@ant-design/colors": "7.0.0", + "@ant-design/colors": "7.1.0", "@ant-design/icons-vue": "7.0.1", - "@antv/g2plot": "2.4.31", + "@antv/g2plot": "2.4.32", "@chenfengyuan/vue-qrcode": "2.0.0", "@highlightjs/vue-plugin": "2.1.0", "@tinymce/tinymce-vue": "5.1.1", - "@vue-office/docx": "1.6.0", - "@vue-office/excel": "1.7.1", - "@vue-office/pdf": "1.6.4", - "ant-design-vue": "4.1.2", - "axios": "1.6.2", - "cropperjs": "1.6.1", - "dayjs": "1.11.10", - "echarts": "5.4.3", + "@vue-office/docx": "1.6.2", + "@vue-office/excel": "1.7.11", + "@vue-office/pdf": "2.0.2", + "ant-design-vue": "4.2.5", + "axios": "1.7.7", + "cropperjs": "1.6.2", + "dayjs": "1.11.13", + "echarts": "5.5.1", "echarts-stat": "1.2.0", "enquire.js": "2.1.6", "event-source-polyfill": "1.0.31", "fuse.js": "7.0.0", - "highlight.js": "11.9.0", - "hotkeys-js": "3.12.2", - "js-pinyin": "0.2.5", + "highlight.js": "11.10.0", + "hotkeys-js": "3.13.7", + "js-pinyin": "0.2.7", "lodash-es": "4.17.21", "nprogress": "0.2.0", - "pinia": "2.1.7", - "qs": "6.11.2", - "screenfull": "6.0.2", + "pinia": "2.2.2", + "qrcode": "1.5.4", + "qs": "6.13.0", "sm-crypto": "0.3.13", "snowflake-id": "1.1.0", - "sortablejs": "1.15.1", - "tinymce": "6.8.1", - "vue": "3.4.21", - "vue-cropper": "1.1.1", - "vue-i18n": "9.8.0", - "vue-router": "4.3.0", + "sortablejs": "1.15.3", + "tinymce": "7.3.0", + "vue": "3.5.10", + "vue-cropper": "1.1.4", + "vue-i18n": "10.0.0", + "vue-router": "4.4.5", "vue3-colorpicker": "2.3.0", "vue3-tree-org": "4.2.2", "vuedraggable-es": "4.1.1" @@ -61,23 +61,23 @@ "@vitejs/plugin-legacy": "5.2.0", "@vitejs/plugin-vue": "4.5.2", "@vitejs/plugin-vue-jsx": "3.1.0", - "@vue/compiler-sfc": "3.3.10", + "@vue/compiler-sfc": "3.5.10", "@vue/eslint-config-standard": "8.0.1", "antd-less-to-css-variable": "1.0.5", - "autoprefixer": "10.4.16", - "eslint": "8.55.0", + "autoprefixer": "10.4.20", + "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.0.1", "eslint-plugin-vue": "9.7.0", - "less": "4.1.3", - "postcss": "8.4.32", - "prettier": "3.1.0", - "rollup-plugin-visualizer": "5.10.0", - "tailwindcss": "3.3.6", - "typescript": "5.3.3", - "unplugin-auto-import": "0.17.2", - "unplugin-vue-components": "0.26.0", - "vite": "5.1.6", + "less": "4.2.0", + "postcss": "8.4.47", + "prettier": "3.3.3", + "rollup-plugin-visualizer": "5.12.0", + "tailwindcss": "3.4.13", + "typescript": "5.6.2", + "unplugin-auto-import": "0.18.3", + "unplugin-vue-components": "0.27.4", + "vite": "5.4.8", "vite-plugin-compression": "0.5.1", "vite-plugin-vue-setup-extend": "0.4.0", "vue-eslint-parser": "9.3.2" diff --git a/snowy-admin-web/src/api/gen/genBasicApi.js b/snowy-admin-web/src/api/gen/genBasicApi.js index 45845c35..24abb79f 100644 --- a/snowy-admin-web/src/api/gen/genBasicApi.js +++ b/snowy-admin-web/src/api/gen/genBasicApi.js @@ -45,5 +45,13 @@ export default { // 获取所有移动端模块 basicMobileModuleSelector(data) { return request('mobileModuleSelector', data, 'get') + }, + // 获取所有模块 + basicModuleSelector(data) { + return request('moduleSelector', data, 'get') + }, + // 获取所有菜单树包括未授权的 + basicMenuTreeSelector(data) { + return request('menuTreeSelector', data, 'get') } } diff --git a/snowy-admin-web/src/components/HomeCard/BizSlideshowCard/index.vue b/snowy-admin-web/src/components/HomeCard/BizSlideshowCard/index.vue index a9cb4394..e98dbfeb 100644 --- a/snowy-admin-web/src/components/HomeCard/BizSlideshowCard/index.vue +++ b/snowy-admin-web/src/components/HomeCard/BizSlideshowCard/index.vue @@ -9,16 +9,14 @@ -
- -
- + + @@ -57,18 +55,18 @@ return } const detail = cloneDeep(value) - let detailObj = {} + let result = {} if (typeof detail !== 'object') { - detailObj = JSON.parse(detail) + result = JSON.parse(detail) } // json内包含且是开启了点击,否则不处理 - if (detailObj.whetherToClick && detailObj.whetherToClick === 'ENABLE') { - if (detailObj.skipMode && detailObj.skipMode === 'URL') { - window.open(detailObj.url) + if (result.whetherToClick && result.whetherToClick === 'ENABLE') { + if (result.skipMode && result.skipMode === 'URL') { + window.open(result.url) } - if (detailObj.skipMode && detailObj.skipMode === 'ROUTER') { + if (result.skipMode && result.skipMode === 'ROUTER') { router.replace({ - path: detailObj.url + path: result.url }) } } diff --git a/snowy-admin-web/src/components/HomeCard/SysOpDataCard/index.vue b/snowy-admin-web/src/components/HomeCard/SysOpDataCard/index.vue index f8be0299..aa552bc0 100644 --- a/snowy-admin-web/src/components/HomeCard/SysOpDataCard/index.vue +++ b/snowy-admin-web/src/components/HomeCard/SysOpDataCard/index.vue @@ -1,6 +1,8 @@ diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue index 522efd78..bb8eb35a 100644 --- a/snowy-admin-web/src/views/biz/user/index.vue +++ b/snowy-admin-web/src/views/biz/user/index.vue @@ -77,11 +77,13 @@ {{ $t('user.batchExportButton') }} - diff --git a/snowy-admin-web/src/views/dev/dict/category/index.vue b/snowy-admin-web/src/views/dev/dict/category/index.vue index b7196bea..7e9968e5 100644 --- a/snowy-admin-web/src/views/dev/dict/category/index.vue +++ b/snowy-admin-web/src/views/dev/dict/category/index.vue @@ -183,14 +183,10 @@ id: record.id } ] - dictApi.dictDelete(params).then((res) => { - if (res.code === 200) { - tableRef.value.refresh(true) - } else { - res.message && tool.error(res.message) - } + dictApi.dictDelete(params).then(() => { + tableRef.value.refresh() + refreshStoreDict() }) - refreshStoreDict() } // 表单界面回调 const formSuccessful = () => { diff --git a/snowy-admin-web/src/views/dev/file/index.vue b/snowy-admin-web/src/views/dev/file/index.vue index 665b913c..d5e56b8a 100644 --- a/snowy-admin-web/src/views/dev/file/index.vue +++ b/snowy-admin-web/src/views/dev/file/index.vue @@ -48,7 +48,13 @@ 文件上传 - + diff --git a/snowy-admin-web/src/views/dev/slideshow/subForm.vue b/snowy-admin-web/src/views/dev/slideshow/subForm.vue index a3bfe3e8..a00b50d3 100644 --- a/snowy-admin-web/src/views/dev/slideshow/subForm.vue +++ b/snowy-admin-web/src/views/dev/slideshow/subForm.vue @@ -1,25 +1,33 @@