Merge branch 'develop' of github.com:Tencent/tdesign-vue-next-starter into main

This commit is contained in:
Uyarn 2022-07-06 18:35:51 +08:00
commit a7e228bcdc
5 changed files with 7 additions and 9 deletions

View File

@ -27,11 +27,11 @@
"qrcode.vue": "^3.2.2", "qrcode.vue": "^3.2.2",
"qs": "^6.10.5", "qs": "^6.10.5",
"tdesign-icons-vue-next": "^0.1.1", "tdesign-icons-vue-next": "^0.1.1",
"tdesign-vue-next": "^0.16.0", "tdesign-vue-next": "0.17.3",
"tvision-color": "^1.3.1", "tvision-color": "^1.3.1",
"vue": "^3.2.31", "vue": "^3.2.31",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-router": "^4.0.11" "vue-router": "~4.0.11"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^16.2.1", "@commitlint/cli": "^16.2.1",
@ -63,7 +63,7 @@
"stylelint-config-prettier": "~9.0.3", "stylelint-config-prettier": "~9.0.3",
"stylelint-less": "1.0.1", "stylelint-less": "1.0.1",
"stylelint-order": "~4.1.0", "stylelint-order": "~4.1.0",
"typescript": "~4.4.3", "typescript": "~4.7.4",
"vite": "^2.7.1", "vite": "^2.7.1",
"vite-plugin-mock": "^2.9.6", "vite-plugin-mock": "^2.9.6",
"vite-svg-loader": "^3.1.0", "vite-svg-loader": "^3.1.0",

View File

@ -20,7 +20,7 @@ const crumbs = computed(() => {
breadcrumbArray.push({ breadcrumbArray.push({
path, path,
to: breadcrumbArray[idx - 1] ? `/${breadcrumbArray[idx - 1].path}/${path}` : `/${path}`, to: breadcrumbArray[idx - 1] ? `/${breadcrumbArray[idx - 1].path}/${path}` : `/${path}`,
title: route.matched[idx].meta.title || path, title: route.matched[idx]?.meta?.title ?? path,
}); });
return breadcrumbArray; return breadcrumbArray;
}, []); }, []);

View File

@ -24,8 +24,7 @@
:pagination="pagination" :pagination="pagination"
:selected-row-keys="selectedRowKeys" :selected-row-keys="selectedRowKeys"
:loading="dataLoading" :loading="dataLoading"
:header-affixed-top="true" :header-affixed-top="{ offsetTop, container: getContainer }"
:header-affix-props="{ offsetTop, container: getContainer }"
@page-change="rehandlePageChange" @page-change="rehandlePageChange"
@change="rehandleChange" @change="rehandleChange"
@select-change="rehandleSelectChange" @select-change="rehandleSelectChange"

View File

@ -73,8 +73,7 @@
:hover="hover" :hover="hover"
:pagination="pagination" :pagination="pagination"
:loading="dataLoading" :loading="dataLoading"
:header-affixed-top="true" :header-affixed-top="{ offsetTop, container: getContainer }"
:header-affix-props="{ offsetTop, container: getContainer }"
@page-change="rehandlePageChange" @page-change="rehandlePageChange"
@change="rehandleChange" @change="rehandleChange"
> >

View File

@ -11,7 +11,7 @@
margin-left: @spacer; margin-left: @spacer;
} }
.t-jumper-jumper { .t-jumper {
.t-button + .t-button { .t-button + .t-button {
margin-left: 0; margin-left: 0;
} }