root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

Browse Source 
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
This commit is contained in:
YunaiV 2023-08-27 21:02:52 +08:00
commit 9507e2b687
5 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -39,14 +39,14 @@
| 框架 | 说明 | 版本 |
|----------------------------------------------------------------------|------------------|--------|
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.8 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.9 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.3.0 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.54.1 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.55.2 |
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |

38
package.json
View File

@ -49,7 +49,7 @@
"element-plus": "2.3.9",
"fast-xml-parser": "^4.2.7",
"highlight.js": "^11.8.0",
"intro.js": "^7.0.1",
"intro.js": "^7.2.0",
"jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21",
"min-dash": "^4.1.1",
@ -73,23 +73,23 @@
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@iconify/json": "^2.2.100",
"@intlify/unplugin-vue-i18n": "^0.12.2",
"@iconify/json": "^2.2.103",
"@intlify/unplugin-vue-i18n": "^0.12.3",
"@purge-icons/generated": "^0.9.0",
"@types/intro.js": "^5.1.1",
"@types/lodash-es": "^4.17.8",
"@types/node": "^20.4.0",
"@types/node": "^20.5.0",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.1",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"@unocss/transformer-variant-group": "^0.55.0",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@unocss/transformer-variant-group": "^0.55.2",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue-macros/volar": "^0.13.3",
"autoprefixer": "^10.4.14",
"@vitejs/plugin-vue": "^4.3.3",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue-macros/volar": "^0.13.7",
"autoprefixer": "^10.4.15",
"bpmn-js": "^8.9.0",
"bpmn-js-properties-panel": "^0.46.0",
"consola": "^3.2.3",
@ -98,22 +98,22 @@
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"lint-staged": "^13.2.3",
"postcss": "^8.4.27",
"lint-staged": "^14.0.1",
"postcss": "^8.4.28",
"postcss-html": "^1.5.0",
"postcss-scss": "^4.0.6",
"prettier": "^3.0.1",
"postcss-scss": "^4.0.7",
"prettier": "^3.0.2",
"rimraf": "^5.0.1",
"rollup": "^3.28.0",
"sass": "^1.65.1",
"stylelint": "^15.10.2",
"rollup": "^3.28.1",
"sass": "^1.66.1",
"stylelint": "^15.10.3",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-order": "^6.0.3",
"terser": "^5.19.2",
"typescript": "5.1.6",
"unocss": "^0.55.0",
"unocss": "^0.55.2",
"unplugin-auto-import": "^0.16.6",
"unplugin-element-plus": "^0.8.0",
"unplugin-vue-components": "^0.25.1",

47
src/components/Dialog/src/Dialog.vue
View File

@ -67,6 +67,7 @@ const dialogStyle = computed(() => {
lock-scroll
draggable
top="0"
class="com-dialog"
:show-close="false"
>
<template #header="{ close }">
@ -107,32 +108,34 @@ const dialogStyle = computed(() => {
</template>
<style lang="scss">
.#{$elNamespace}-overlay-dialog {
display: flex;
justify-content: center;
align-items: center;
}
.#{$elNamespace}-dialog {
margin: 0 !important;
&__header {
height: 54px;
padding: 0;
margin-right: 0 !important;
border-bottom: 1px solid var(--el-border-color);
.com-dialog {
.#{$elNamespace}-overlay-dialog {
display: flex;
justify-content: center;
align-items: center;
}
&__body {
padding: 15px !important;
}
.#{$elNamespace}-dialog {
margin: 0 !important;
&__footer {
border-top: 1px solid var(--el-border-color);
}
&__header {
height: 54px;
padding: 0;
margin-right: 0 !important;
border-bottom: 1px solid var(--el-border-color);
}
&__headerbtn {
top: 0;
&__body {
padding: 15px !important;
}
&__footer {
border-top: 1px solid var(--el-border-color);
}
&__headerbtn {
top: 0;
}
}
}
</style>

12
src/components/Pagination/index.vue
View File

@ -8,6 +8,7 @@
:page-sizes="[10, 20, 30, 50, 100]"
:pager-count="pagerCount"
:total="total"
:small="isSmall"
class="float-right mt-15px mb-15px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@ -15,10 +16,19 @@
/>
</template>
<script lang="ts" setup>
import { computed } from 'vue'
import { computed, watchEffect } from 'vue'
import { useAppStore } from '@/store/modules/app'
defineOptions({ name: 'Pagination' })
// 此处解决了当全局size为small的时候分页组件样式太大的问题
const appStore = useAppStore()
const layoutCurrentSize = computed(() => appStore.currentSize)
const isSmall = ref<boolean>(layoutCurrentSize.value === 'small')
watchEffect(() => {
isSmall.value = layoutCurrentSize.value === 'small'
})
const props = defineProps({
// 总条目数
total: {

2
src/views/member/point/record/index.vue
View File

@ -111,7 +111,7 @@
<script lang="ts" setup>
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import * as RecordApi from '@/api//member/point/record'
import * as RecordApi from '@/api/member/point/record'
defineOptions({ name: 'PointRecord' })