Merge branch 'main' into pages

.github/workflows/linter.yml

@@ -24,7 +24,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8.6.10
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory

.github/workflows/pages.yml

@@ -24,7 +24,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8.6.10
+          version: 9
           run_install: false
 
       - name: Deploy 🔧

.lintstagedrc

@@ -3,7 +3,7 @@
     "prettier --cache --ignore-unknown  --write",
     "eslint --cache --fix"
   ],
-  "{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [
+  "{!(package)*.json,*.code-snippets,.!({browserslist,npm,nvm})*rc}": [
     "prettier --cache --write--parser json"
   ],
   "package.json": ["prettier --cache --write"],

.npmrc

@@ -1,3 +1,4 @@
-shamefully-hoist=true
-strict-peer-dependencies=false
 shell-emulator=true
+shamefully-hoist=true
+enable-pre-post-scripts=false
+strict-peer-dependencies=false

.nvmrc

@@ -1 +1 @@
-v20.12.2
+v20.13.1

CHANGELOG.en_US.md

@@ -1,3 +1,17 @@
+# 5.6.0 (2024-05-14)
+
+### ✔️ Refactor
+
+- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`
+
+### 🐞 Bug fixes
+
+- Fixed the issue where clicking on an external link would jump twice
+
+### 🍏 Perf
+
+- Optimize `ReSegmented` component
+
 # 5.5.0 (2024-05-07)
 
 ### 📄 Docs

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 5.6.0 (2024-05-14)
+
+### ✔️ Refactor
+
+- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`
+
+### 🐞 Bug fixes
+
+- Fixed the issue where clicking on an external link would jump twice
+
+### 🍏 Perf
+
+- Optimize `ReSegmented` component
+
 # 5.5.0 (2024-05-07)
 
 ### 📄 Docs

CHANGELOG.zh_CN.md

@@ -1,3 +1,17 @@
+# 5.6.0 (2024-05-14)
+
+### ✔️ Refactor
+
+- 升级`pnpm`至`v9`版本，规定`pnpm`版本`>=9`
+
+### 🐞 Bug fixes
+
+- 修复点击外链会跳转两次的问题
+
+### 🍏 Perf
+
+- 优化`ReSegmented`组件
+
 # 5.5.0 (2024-05-07)
 
 ### 📄 Docs

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:18-alpine as build-stage
+FROM node:20-alpine as build-stage
 
 WORKDIR /app
 RUN corepack enable
-RUN corepack prepare pnpm@8.6.10 --activate
+RUN corepack prepare pnpm@latest --activate
 
 RUN npm config set registry https://registry.npmmirror.com
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -56,7 +56,7 @@
     "@pureadmin/table": "^3.1.2",
     "@pureadmin/utils": "^2.4.7",
     "@vue-flow/background": "^1.3.0",
-    "@vue-flow/core": "^1.33.6",
+    "@vue-flow/core": "^1.33.7",
     "@vueuse/core": "^10.9.0",
     "@vueuse/motion": "^2.1.0",
     "@wangeditor/editor": "^5.1.23",
@@ -69,7 +69,7 @@
     "dayjs": "^1.11.11",
     "echarts": "^5.5.0",
     "el-table-infinite-scroll": "^3.0.3",
-    "element-plus": "2.7.1",
+    "element-plus": "^2.7.3",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
     "jsbarcode": "^3.11.6",
@@ -80,18 +80,18 @@
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^2.1.7",
-    "pinyin-pro": "^3.20.3",
+    "pinyin-pro": "^3.20.4",
-    "plus-pro-components": "^0.0.11",
+    "plus-pro-components": "^0.1.3",
     "qrcode": "^1.5.3",
     "qs": "^6.12.1",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.2",
-    "swiper": "^11.1.1",
+    "swiper": "^11.1.2",
     "typeit": "^8.8.3",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.1",
     "version-rocket": "^1.7.1",
-    "vue": "^3.4.26",
+    "vue": "^3.4.27",
     "vue-i18n": "^9.13.1",
     "vue-json-pretty": "^2.4.0",
     "vue-pdf-embed": "^2.0.3",
@@ -103,8 +103,8 @@
     "vue3-danmaku": "^1.6.0",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "^4.6.9",
+    "vxe-table": "^4.6.12",
-    "wavesurfer.js": "^7.7.13",
+    "wavesurfer.js": "^7.7.14",
     "xgplayer": "^3.0.17",
     "xlsx": "^0.18.5"
   },
@@ -123,13 +123,13 @@
     "@types/gradient-string": "^1.1.6",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.12.8",
+    "@types/node": "^20.12.11",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.9.15",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/parser": "^7.9.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "autoprefixer": "^10.4.19",
@@ -140,28 +140,28 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-define-config": "^2.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.25.0",
+    "eslint-plugin-vue": "^9.26.0",
     "gradient-string": "^2.0.2",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "postcss": "^8.4.38",
-    "postcss-html": "^1.6.0",
+    "postcss-html": "^1.7.0",
     "postcss-import": "^16.1.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.2.5",
-    "rimraf": "^5.0.5",
+    "rimraf": "^5.0.7",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.76.0",
+    "sass": "^1.77.1",
     "stylelint": "^16.5.0",
     "stylelint-config-recess-order": "^5.0.1",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard-scss": "^13.1.0",
     "stylelint-prettier": "^5.0.0",
-    "svgo": "^3.2.0",
+    "svgo": "^3.3.2",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
-    "vite-plugin-cdn-import": "^0.3.5",
+    "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.1.1",
     "vite-plugin-remove-console": "^2.2.0",
@@ -172,9 +172,8 @@
   },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
-    "pnpm": ">=8.6.10"
+    "pnpm": ">=9"
   },
-  "packageManager": "pnpm@8.6.10",
   "pnpm": {
     "allowedDeprecatedVersions": {
       "sourcemap-codec": "*",

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "5.5.0",
+  "Version": "5.6.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/components/ReSegmented/src/index.tsx

@@ -127,7 +127,9 @@ export default defineComponent({
       }
     );
 
-    watch(() => props.size, handleResizeInit);
+    watch(() => props.size, handleResizeInit, {
+      immediate: true
+    });
 
     const rendLabel = () => {
       return props.options.map((option, index) => {

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -4,7 +4,7 @@ import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";
 
-const props = defineProps({
+defineProps({
   noticeItem: {
     type: Object as PropType<ListItem>,
     default: () => {}

src/layout/components/lay-search/components/SearchFooter.vue

@@ -6,7 +6,7 @@ import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
 import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 
-const props = withDefaults(defineProps<{ total: number }>(), {
+withDefaults(defineProps<{ total: number }>(), {
   total: 0
 });
 

src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue

@@ -10,7 +10,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue

@@ -2,7 +2,7 @@
 import { toRaw } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 
-const props = defineProps({
+defineProps({
   extraIcon: {
     type: String,
     default: ""

src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue

@@ -10,7 +10,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/layout/components/lay-sidebar/components/SidebarLogo.vue

@@ -2,7 +2,7 @@
 import { getTopMenu } from "@/router/utils";
 import { useNav } from "@/layout/hooks/useNav";
 
-const props = defineProps({
+defineProps({
   collapse: Boolean
 });
 

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -7,7 +7,7 @@ interface Props {
   isActive: boolean;
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isActive: false
 });
 

src/views/schema-form/form/base.vue

@@ -127,7 +127,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/dialog.vue

@@ -180,7 +180,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/drawer.vue

@@ -180,7 +180,6 @@ const columns: PlusColumn[] = [
     fieldProps: {
       maxlength: 10,
       showWordLimit: true,
-      // @ts-expect-error
       autosize: { minRows: 2, maxRows: 4 }
     }
   }

src/views/schema-form/form/steps.vue

@@ -197,7 +197,7 @@ const next = (actives: number, values: any) => {
     v-model="active"
     simple
     class="w-[800px] m-auto"
-    :data="stepForm"
+    :data="stepForm as any"
     align-center
     @next="next"
   />

types/index.d.ts

@@ -75,6 +75,8 @@ interface ComponentElRef<T extends HTMLElement = HTMLDivElement> {
   $el: T;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function parseInt(s: string | number, radix?: number): number;
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function parseFloat(string: string | number): number;