diff --git a/package.json b/package.json index 2aa7d17eb..04fdbee78 100644 --- a/package.json +++ b/package.json @@ -53,8 +53,8 @@ "@logicflow/core": "^1.2.18", "@logicflow/extension": "^1.2.19", "@pureadmin/descriptions": "^1.2.0", - "@pureadmin/table": "^3.0.0", - "@pureadmin/utils": "^2.2.0", + "@pureadmin/table": "^3.0.1", + "@pureadmin/utils": "^2.3.1", "@vueuse/core": "^10.7.1", "@vueuse/motion": "^2.0.0", "@wangeditor/editor": "^5.1.23", @@ -67,7 +67,7 @@ "dayjs": "^1.11.10", "echarts": "^5.4.3", "el-table-infinite-scroll": "^3.0.3", - "element-plus": "^2.4.4", + "element-plus": "^2.5.0", "intro.js": "^7.2.0", "js-cookie": "^3.0.5", "jsbarcode": "^3.11.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f2bfaa03..4dc8ba72d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,13 +19,13 @@ dependencies: version: 1.2.19 '@pureadmin/descriptions': specifier: ^1.2.0 - version: 1.2.0(element-plus@2.4.4)(typescript@5.3.3) + version: 1.2.0(element-plus@2.5.0)(typescript@5.3.3) '@pureadmin/table': - specifier: ^3.0.0 - version: 3.0.0(element-plus@2.4.4)(typescript@5.3.3) + specifier: ^3.0.1 + version: 3.0.1(element-plus@2.5.0)(typescript@5.3.3) '@pureadmin/utils': - specifier: ^2.2.0 - version: 2.2.0(echarts@5.4.3)(vue@3.4.5) + specifier: ^2.3.1 + version: 2.3.1(echarts@5.4.3)(vue@3.4.5) '@vueuse/core': specifier: ^10.7.1 version: 10.7.1(vue@3.4.5) @@ -63,8 +63,8 @@ dependencies: specifier: ^3.0.3 version: 3.0.3(typescript@5.3.3) element-plus: - specifier: ^2.4.4 - version: 2.4.4(vue@3.4.5) + specifier: ^2.5.0 + version: 2.5.0(vue@3.4.5) intro.js: specifier: ^7.2.0 version: 7.2.0 @@ -1726,24 +1726,24 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false - /@pureadmin/descriptions@1.2.0(element-plus@2.4.4)(typescript@5.3.3): + /@pureadmin/descriptions@1.2.0(element-plus@2.5.0)(typescript@5.3.3): resolution: {integrity: sha512-k2A3SGGKf0eKrSQB3hXzgGlAz7DKSM31WN/QGBn37UCIHfQlIVrvSPEAF2omHlukQT2Artap6veCqBcJ9dGAKQ==} peerDependencies: element-plus: ^2.0.0 dependencies: '@element-plus/icons-vue': 2.3.1(vue@3.4.5) - element-plus: 2.4.4(vue@3.4.5) + element-plus: 2.5.0(vue@3.4.5) vue: 3.4.5(typescript@5.3.3) transitivePeerDependencies: - typescript dev: false - /@pureadmin/table@3.0.0(element-plus@2.4.4)(typescript@5.3.3): - resolution: {integrity: sha512-Pfh1apzYwCfkNIrc9R0/Yi8dBZOhWZq0uwRa/b1OsDr7dYqfYs1lRxcGkPsmYgIKx8kZbaOaGBfHAsyf+WFgpQ==} + /@pureadmin/table@3.0.1(element-plus@2.5.0)(typescript@5.3.3): + resolution: {integrity: sha512-DBIv0YRZogSIEtsBPNjm6tYuImaE8ZJXwAu/gutEyaH9wATN09doKDmAisyBj+XEydfM5R9hlvhQ8SzJkbtarA==} peerDependencies: element-plus: ^2.0.0 dependencies: - element-plus: 2.4.4(vue@3.4.5) + element-plus: 2.5.0(vue@3.4.5) vue: 3.4.5(typescript@5.3.3) transitivePeerDependencies: - typescript @@ -1757,8 +1757,8 @@ packages: string-hash: 1.1.3 dev: true - /@pureadmin/utils@2.2.0(echarts@5.4.3)(vue@3.4.5): - resolution: {integrity: sha512-G4/Qzu0QosXlfTO/gWvgpygugFuUVpwUspfuejIqBnrJEudBllx17wZdDjNEL27Uwg+HjXYjofXQUGUX4E2NtA==} + /@pureadmin/utils@2.3.1(echarts@5.4.3)(vue@3.4.5): + resolution: {integrity: sha512-rg23cFs7y0jJ54TNCIM810ZKLf6G7Hk8h2Lr/D1Uw+ertDxCtIeQYpJ56Vo+I8ibUpVZDBA0qpKiUziUTs//WA==} peerDependencies: echarts: '*' vue: '*' @@ -3963,7 +3963,7 @@ packages: resolution: {integrity: sha512-cmMHg4MxrNOV2dFziV3ISRo+rM/3tAH8TE3wWMGKd4ucjvk21Bfb6MJfPuNAicLOkq4fYZm+J+mr0NmDPnvolQ==} dependencies: core-js: 3.35.0 - element-plus: 2.4.4(vue@3.4.5) + element-plus: 2.5.0(vue@3.4.5) vue: 3.4.5(typescript@5.3.3) transitivePeerDependencies: - '@vue/composition-api' @@ -3996,8 +3996,8 @@ packages: - '@vue/composition-api' dev: false - /element-plus@2.4.4(vue@3.4.5): - resolution: {integrity: sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==} + /element-plus@2.5.0(vue@3.4.5): + resolution: {integrity: sha512-NE58a5Exf0/vxgxRRR2Ibs7AjiqB72lMrg7plmSoZwgZy17IQAWgzOe7ZyRtEQM/3q3BAuJDTUUAuhP/mKVPKg==} peerDependencies: vue: ^3.2.0 dependencies: diff --git a/src/views/welcome/components/table/columns.tsx b/src/views/welcome/components/table/columns.tsx index 515ba577e..c6d0b8e0c 100644 --- a/src/views/welcome/components/table/columns.tsx +++ b/src/views/welcome/components/table/columns.tsx @@ -20,7 +20,7 @@ export function useColumns() { label: "需求人数", prop: "requiredNumber", filterMultiple: false, - // filterClassName: "pure-table-filter", // TODO:https://github.com/element-plus/element-plus/pull/15389 + filterClassName: "pure-table-filter", filters: [ { text: "≥16000", value: "more" }, { text: "<16000", value: "less" } diff --git a/src/views/welcome/components/table/index.vue b/src/views/welcome/components/table/index.vue index 76f7f251d..9e334383d 100644 --- a/src/views/welcome/components/table/index.vue +++ b/src/views/welcome/components/table/index.vue @@ -42,7 +42,7 @@ const { loading, columns, dataList, pagination, Empty, onCurrentChange } = - +