chore: 升级依赖,element-plus最新版兼容处理

This commit is contained in:
xiaoxian521 2024-08-12 14:51:34 +08:00
parent 244ab7f990
commit 5fbb664da7
15 changed files with 1183 additions and 1193 deletions

View File

@ -50,26 +50,26 @@
"@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.1.3",
"@infectoone/vue-ganttastic": "^2.3.2",
"@logicflow/core": "^1.2.27",
"@logicflow/extension": "^1.2.27",
"@logicflow/core": "^1.2.28",
"@logicflow/extension": "^1.2.28",
"@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.1.2",
"@pureadmin/utils": "^2.4.7",
"@pureadmin/table": "^3.2.0",
"@pureadmin/utils": "^2.4.8",
"@vue-flow/background": "^1.3.0",
"@vue-flow/core": "^1.39.1",
"@vueuse/core": "^10.11.0",
"@vue-flow/core": "^1.39.3",
"@vueuse/core": "^10.11.1",
"@vueuse/motion": "^2.2.3",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.7.2",
"axios": "^1.7.3",
"china-area-data": "^5.0.1",
"cropperjs": "^1.6.2",
"dayjs": "^1.11.12",
"echarts": "^5.5.1",
"el-table-infinite-scroll": "^3.0.6",
"element-plus": "^2.7.8",
"element-plus": "^2.8.0",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6",
@ -79,23 +79,23 @@
"mqtt": "4.3.7",
"nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.2.0",
"pinyin-pro": "^3.24.0",
"plus-pro-components": "^0.1.13",
"qrcode": "^1.5.3",
"qs": "^6.12.3",
"pinia": "^2.2.1",
"pinyin-pro": "^3.24.2",
"plus-pro-components": "^0.1.14",
"qrcode": "^1.5.4",
"qs": "^6.13.0",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2",
"swiper": "^11.1.8",
"swiper": "^11.1.9",
"typeit": "^8.8.4",
"v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.1",
"vue": "^3.4.34",
"version-rocket": "^1.7.2",
"vue": "^3.4.37",
"vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.1.0",
"vue-router": "^4.4.0",
"vue-router": "^4.4.3",
"vue-tippy": "^6.4.4",
"vue-types": "^5.1.3",
"vue-virtual-scroller": "2.0.0-beta.8",
@ -104,15 +104,15 @@
"vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.17",
"wavesurfer.js": "^7.8.2",
"wavesurfer.js": "^7.8.3",
"xgplayer": "^3.0.19",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2",
"@commitlint/types": "^19.0.3",
"@eslint/js": "^9.8.0",
"@eslint/js": "^9.9.0",
"@faker-js/faker": "^8.4.1",
"@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10",
@ -123,44 +123,44 @@
"@types/gradient-string": "^1.1.6",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.14.13",
"@types/node": "^20.14.15",
"@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.17.0",
"@typescript-eslint/parser": "^7.17.0",
"@vitejs/plugin-vue": "^5.1.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"autoprefixer": "^10.4.19",
"autoprefixer": "^10.4.20",
"boxen": "^7.1.1",
"cssnano": "^7.0.4",
"cssnano": "^7.0.5",
"dagre": "^0.8.5",
"eslint": "^9.8.0",
"eslint": "^9.9.0",
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0",
"gradient-string": "^2.0.2",
"husky": "^9.1.3",
"lint-staged": "^15.2.7",
"postcss": "^8.4.40",
"husky": "^9.1.4",
"lint-staged": "^15.2.8",
"postcss": "^8.4.41",
"postcss-html": "^1.7.0",
"postcss-import": "^16.1.0",
"postcss-scss": "^4.0.9",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"rimraf": "^5.0.10",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.8",
"stylelint": "^16.7.0",
"stylelint": "^16.8.1",
"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.2",
"svgo": "^3.3.2",
"tailwindcss": "^3.4.7",
"tailwindcss": "^3.4.9",
"typescript": "^5.5.4",
"vite": "^5.3.5",
"vite": "^5.4.0",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-compression": "^0.5.1",

2262
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -194,7 +194,7 @@ watch(
:pager-count="5"
layout="pager"
background
small
size="small"
@current-change="onCurrentChange"
/>
<el-button

View File

@ -133,8 +133,7 @@ const {
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -133,8 +133,7 @@ const {
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -125,8 +125,7 @@ const {
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -74,8 +74,7 @@ const {
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -173,8 +173,7 @@ onMounted(() => {
:adaptiveConfig="{ offsetBottom: 108 }"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -160,8 +160,7 @@ const {
:size="size"
:data="dataList"
:columns="dynamicColumns"
:pagination="pagination"
:paginationSmall="size === 'small' ? true : false"
:pagination="{ ...pagination, size }"
:header-cell-style="{
background: 'var(--el-fill-color-light)',
color: 'var(--el-text-color-primary)'

View File

@ -116,7 +116,11 @@ const columns: TableColumnList = [
border
lazy
:load="load"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
:tree-props="{
hasChildren: 'hasChildren',
children: 'children',
checkStrictly: false
}"
/>
</div>
</template>

View File

@ -33,7 +33,7 @@ export function useColumns() {
total: 0,
align: "right",
background: true,
small: false
size: "default"
});
/** 加载动画配置 */

View File

@ -9,7 +9,6 @@ export function useColumns() {
const select = ref("no");
const hideVal = ref("nohide");
const tableSize = ref("default");
const paginationSmall = ref(false);
const paginationAlign = ref("right");
const columns: TableColumnList = [
{
@ -43,7 +42,7 @@ export function useColumns() {
total: 0,
align: "right",
background: true,
small: false
size: "default"
});
/** 加载动画配置 */
@ -65,7 +64,7 @@ export function useColumns() {
});
function onChange(val) {
pagination.small = val;
pagination.size = val;
}
function onSizeChange(val) {
@ -108,7 +107,6 @@ export function useColumns() {
pagination,
loadingConfig,
paginationAlign,
paginationSmall,
onChange,
onSizeChange,
onCurrentChange

View File

@ -11,7 +11,6 @@ const {
pagination,
loadingConfig,
paginationAlign,
paginationSmall,
onChange,
onSizeChange,
onCurrentChange
@ -43,9 +42,10 @@ const {
</el-radio-group>
<el-divider direction="vertical" />
<p class="text-sm">分页大小</p>
<el-radio-group v-model="paginationSmall" size="small" @change="onChange">
<el-radio-button :value="false">no small</el-radio-button>
<el-radio-button :value="true">small</el-radio-button>
<el-radio-group v-model="pagination.size" size="small" @change="onChange">
<el-radio-button value="large">large</el-radio-button>
<el-radio-button value="default">default</el-radio-button>
<el-radio-button value="small">small</el-radio-button>
</el-radio-group>
<el-divider direction="vertical" />
<p class="text-sm">分页的对齐方式</p>

View File

@ -59,7 +59,7 @@ export function useColumns(selectRef: Ref, formRef: Ref, tableRef: Ref) {
layout: "prev, pager, next",
total: tableData.value.length,
background: true,
small: true
size: "small"
});
const handleSelectionChange = val => {

View File

@ -33,7 +33,7 @@ export function useColumns(selectRef: Ref) {
layout: "prev, pager, next",
total: tableDataEdit.length,
background: true,
small: true
size: "small"
});
/** 高亮当前选中行 */