From cba35d698f2f4b1be0b2d7d271f5411fe9d7284c Mon Sep 17 00:00:00 2001
From: AKING <2734339436@qq.com>
Date: Tue, 22 Aug 2023 09:06:09 +0000
Subject: [PATCH 1/5] =?UTF-8?q?update=20src/components/Dialog/src/Dialog.v?=
 =?UTF-8?q?ue.=20=E8=A7=A3=E5=86=B3=E4=BA=86=E5=8D=95=E7=8B=AC=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8elementplus=20diaolog=E7=BB=84=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=A2=AB=E7=AF=A1=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: AKING <2734339436@qq.com>
---
 src/components/Dialog/src/Dialog.vue | 47 +++++++++++++++-------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index ea9caf92..302168ca 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -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>

From e30d5559e6b930185ec25ab70a3a2a843abde6cf Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 23 Aug 2023 10:40:03 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/member/point/record/index.vue         | 2 +-
 src/views/member/user/components/point-list.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/member/point/record/index.vue b/src/views/member/point/record/index.vue
index a21cd85c..dc8a35ec 100644
--- a/src/views/member/point/record/index.vue
+++ b/src/views/member/point/record/index.vue
@@ -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' })
 
diff --git a/src/views/member/user/components/point-list.vue b/src/views/member/user/components/point-list.vue
index 7a454562..1583d4ff 100644
--- a/src/views/member/user/components/point-list.vue
+++ b/src/views/member/user/components/point-list.vue
@@ -99,8 +99,8 @@
 <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 { RecordQueryVO } from '@/api//member/point/record'
+import * as RecordApi from '@/api/member/point/record'
+import { RecordQueryVO } from '@/api/member/point/record'
 
 defineOptions({ name: 'PointList' })
 const loading = ref(true) // 列表的加载中

From 0207affd02899ac8f1a9617b2f43ff9a3615983d Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 23 Aug 2023 10:42:35 +0800
Subject: [PATCH 3/5] chore: update deps

---
 package.json | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 34b33f53..98533cee 100644
--- a/package.json
+++ b/package.json
@@ -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",

From 65f9e3ee6c13a76f38768b698cfb1d0ef85a9d3b Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 23 Aug 2023 10:42:42 +0800
Subject: [PATCH 4/5] docs: update deps

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c9b9f71a..e9940959 100644
--- a/README.md
+++ b/README.md
@@ -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 |
 

From ff8a8e7243402f8f8946deee56aae9b5e45496f4 Mon Sep 17 00:00:00 2001
From: AKING <2734339436@qq.com>
Date: Wed, 23 Aug 2023 05:51:24 +0000
Subject: [PATCH 5/5] =?UTF-8?q?update=20src/components/Pagination/index.vu?=
 =?UTF-8?q?e.=20=E8=A7=A3=E5=86=B3=E4=BA=86=E5=BD=93=E5=85=A8=E5=B1=80size?=
 =?UTF-8?q?=E4=B8=BAsmall=E7=9A=84=E6=97=B6=E5=80=99=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=A4=AA=E5=A4=A7=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=BD=93=E7=BB=84=E4=BB=B6=E4=B8=BA?=
 =?UTF-8?q?small=E6=97=B6=EF=BC=8C=E5=88=99=E4=BC=9A=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B0=8F=E7=9A=84=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E8=AF=B7=E5=8F=82=E7=85=A7ep=E5=AE=98?=
 =?UTF-8?q?=E7=BD=91=EF=BC=9Ahttps://element-plus.org/zh-CN/component/pagi?=
 =?UTF-8?q?nation.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: AKING <2734339436@qq.com>
---
 src/components/Pagination/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 41cde9df..b441981f 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -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: {