twh_eastasia/vue-pure-admin
1
0
Fork 0
mirror of https://github.com/pure-admin/vue-pure-admin.git synced 2025-11-03 13:44:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into gitee

Browse Source
This commit is contained in:
xiaoxian521 2023-02-12 23:53:58 +08:00
commit 0b4a281bad
3 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -46,7 +46,7 @@
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"echarts": "^5.4.1", "echarts": "^5.4.1",
"el-table-infinite-scroll": "^3.0.1", "el-table-infinite-scroll": "^3.0.1",
"element-plus": "2.2.28", "element-plus": "^2.2.30",
"element-resize-detector": "^1.2.4", "element-resize-detector": "^1.2.4",
"intro.js": "^6.0.0", "intro.js": "^6.0.0",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",

50
pnpm-lock.yaml generated
View File

@ -44,7 +44,7 @@ specifiers:
dayjs: ^1.11.7 dayjs: ^1.11.7
echarts: ^5.4.1 echarts: ^5.4.1
el-table-infinite-scroll: ^3.0.1 el-table-infinite-scroll: ^3.0.1
element-plus: 2.2.28 element-plus: ^2.2.30
element-resize-detector: ^1.2.4 element-resize-detector: ^1.2.4
eslint: ^8.8.0 eslint: ^8.8.0
eslint-plugin-prettier: ^4.0.0 eslint-plugin-prettier: ^4.0.0
@ -114,8 +114,8 @@ dependencies:
"@howdyjs/mouse-menu": 2.0.5_vue@3.2.45 "@howdyjs/mouse-menu": 2.0.5_vue@3.2.45
"@logicflow/core": 1.1.31 "@logicflow/core": 1.1.31
"@logicflow/extension": 1.1.31 "@logicflow/extension": 1.1.31
"@pureadmin/descriptions": 1.1.1_element-plus@2.2.28 "@pureadmin/descriptions": 1.1.1_element-plus@2.2.30
"@pureadmin/table": 2.0.0_element-plus@2.2.28 "@pureadmin/table": 2.0.0_element-plus@2.2.30
"@pureadmin/utils": 1.8.5_echarts@5.4.1+vue@3.2.45 "@pureadmin/utils": 1.8.5_echarts@5.4.1+vue@3.2.45
"@vueuse/core": 9.12.0_vue@3.2.45 "@vueuse/core": 9.12.0_vue@3.2.45
"@vueuse/motion": 2.0.0-beta.12_vue@3.2.45 "@vueuse/motion": 2.0.0-beta.12_vue@3.2.45
@ -128,7 +128,7 @@ dependencies:
dayjs: 1.11.7 dayjs: 1.11.7
echarts: 5.4.1 echarts: 5.4.1
el-table-infinite-scroll: 3.0.1 el-table-infinite-scroll: 3.0.1
element-plus: 2.2.28_vue@3.2.45 element-plus: 2.2.30_vue@3.2.45
element-resize-detector: 1.2.4 element-resize-detector: 1.2.4
intro.js: 6.0.0 intro.js: 6.0.0
js-cookie: 3.0.1 js-cookie: 3.0.1
@ -1503,7 +1503,7 @@ packages:
fastq: 1.15.0 fastq: 1.15.0
dev: true dev: true
/@pureadmin/descriptions/1.1.1_element-plus@2.2.28: /@pureadmin/descriptions/1.1.1_element-plus@2.2.30:
resolution: resolution:
{ {
integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg== integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg==
@ -1512,11 +1512,11 @@ packages:
element-plus: ^2.0.0 element-plus: ^2.0.0
dependencies: dependencies:
"@element-plus/icons-vue": 2.0.10_vue@3.2.45 "@element-plus/icons-vue": 2.0.10_vue@3.2.45
element-plus: 2.2.28_vue@3.2.45 element-plus: 2.2.30_vue@3.2.45
vue: 3.2.45 vue: 3.2.45
dev: false dev: false
/@pureadmin/table/2.0.0_element-plus@2.2.28: /@pureadmin/table/2.0.0_element-plus@2.2.30:
resolution: resolution:
{ {
integrity: sha512-B5+vniSskCOjXLbQA+quPtySoOdwrhQOV93ruSwaUUZvRXxbfro1C3tAhUk/xYSeg8CbGrjoKdXYtN+yGjn6YA== integrity: sha512-B5+vniSskCOjXLbQA+quPtySoOdwrhQOV93ruSwaUUZvRXxbfro1C3tAhUk/xYSeg8CbGrjoKdXYtN+yGjn6YA==
@ -1524,7 +1524,7 @@ packages:
peerDependencies: peerDependencies:
element-plus: ^2.0.0 element-plus: ^2.0.0
dependencies: dependencies:
element-plus: 2.2.28_vue@3.2.45 element-plus: 2.2.30_vue@3.2.45
vue: 3.2.45 vue: 3.2.45
dev: false dev: false
@ -4020,7 +4020,7 @@ packages:
} }
dependencies: dependencies:
core-js: 3.27.1 core-js: 3.27.1
element-plus: 2.2.29_vue@3.2.45 element-plus: 2.2.30_vue@3.2.45
vue: 3.2.45 vue: 3.2.45
transitivePeerDependencies: transitivePeerDependencies:
- "@vue/composition-api" - "@vue/composition-api"
@ -4033,38 +4033,10 @@ packages:
} }
dev: true dev: true
/element-plus/2.2.28_vue@3.2.45: /element-plus/2.2.30_vue@3.2.45:
resolution: resolution:
{ {
integrity: sha512-BsxF7iEaBydmRfw1Tt++EO9jRBjbtJr7ZRIrnEwz4J3Cwa1IzHCNCcx3ZwcYTlJq9CYFxv94JnbNr1EbkTou3A== integrity: sha512-HYSnmf2VMGa0gmw03evxevodPy3WimbAd4sfenOAhNs7Wl8IdT+YJjQyGAQjgEjRvhmujN4O/CZqhuEffRyOZg==
}
peerDependencies:
vue: ^3.2.0
dependencies:
"@ctrl/tinycolor": 3.5.0
"@element-plus/icons-vue": 2.0.10_vue@3.2.45
"@floating-ui/dom": 1.1.0
"@popperjs/core": /@sxzz/popperjs-es/2.11.7
"@types/lodash": 4.14.191
"@types/lodash-es": 4.17.6
"@vueuse/core": 9.12.0_vue@3.2.45
async-validator: 4.2.5
dayjs: 1.11.7
escape-html: 1.0.3
lodash: 4.17.21
lodash-es: 4.17.21
lodash-unified: 1.0.3_3ib2ivapxullxkx3xftsimdk7u
memoize-one: 6.0.0
normalize-wheel-es: 1.2.0
vue: 3.2.45
transitivePeerDependencies:
- "@vue/composition-api"
dev: false
/element-plus/2.2.29_vue@3.2.45:
resolution:
{
integrity: sha512-g4dcrURrKkR5uUX8n5RVnnqGnimoki9HfqS4yHHG6XwCHBkZGozdq4x+478BzeWUe31h++BO+7dakSx4VnM8RQ==
} }
peerDependencies: peerDependencies:
vue: ^3.2.0 vue: ^3.2.0

2
src/style/sidebar.scss
View File

@ -173,6 +173,7 @@
position: absolute; position: absolute;
left: 8px; left: 8px;
right: 8px; right: 8px;
margin: 4px 0;
top: 0; top: 0;
bottom: 0; bottom: 0;
border-radius: 3px; border-radius: 3px;
@ -224,6 +225,7 @@
position: absolute; position: absolute;
left: 8px; left: 8px;
right: 8px; right: 8px;
margin: 4px 0;
top: 0; top: 0;
bottom: 0; bottom: 0;
border-radius: 3px; border-radius: 3px;