Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

refactor: disable tabs change animation. #344

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 96 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"ant-design-vue": "^1.7.5",
"ant-design-vue": "^1.7.6",
"axios": "^0.21.1",
"dayjs": "^1.10.5",
"enquire.js": "^2.1.6",
Expand All @@ -30,7 +30,7 @@
"filepond-plugin-image-preview": "^4.6.6",
"flv.js": "^1.5.0",
"halo-editor": "^2.8.3",
"marked": "^2.0.7",
"marked": "^2.1.3",
"nprogress": "^0.2.0",
"tiny-pinyin": "^1.3.2",
"verte": "^0.0.12",
Expand All @@ -42,7 +42,7 @@
"vue-dplayer": "0.0.10",
"vue-filepond": "^6.0.3",
"vue-ls": "^3.2.2",
"vue-router": "^3.5.1",
"vue-router": "^3.5.2",
"vuedraggable": "^2.24.3",
"vuejs-logger": "^1.10.2",
"vuex": "^3.6.2"
Expand All @@ -54,7 +54,7 @@
"@vue/cli-plugin-unit-jest": "^4.5.13",
"@vue/cli-service": "^4.5.13",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "^1.2.0",
"@vue/test-utils": "^1.2.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Tools/HeaderComment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
>
<template slot="content">
<div class="custom-tab-wrapper">
<a-tabs v-model="activeKey" @change="handleTabsChanged">
<a-tabs v-model="activeKey" @change="handleTabsChanged" :animated="{ inkBar: true, tabPane: false }">
<a-tab-pane tab="文章" key="post">
<a-list :loading="postCommentsLoading" :dataSource="converttedPostComments">
<a-list-item slot="renderItem" slot-scope="item">
Expand Down
2 changes: 1 addition & 1 deletion src/views/dashboard/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</a-tab-pane>
<a-tab-pane key="2" tab="最近评论">
<div class="custom-tab-wrapper">
<a-tabs>
<a-tabs :animated="{ inkBar: true, tabPane: false }">
<a-tab-pane tab="文章" key="1">
<recent-comment-tab type="posts"></recent-comment-tab>
</a-tab-pane>
Expand Down
2 changes: 1 addition & 1 deletion src/views/interface/ThemeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
:afterClose="onThemeInstallModalClose"
>
<div class="custom-tab-wrapper">
<a-tabs>
<a-tabs :animated="{ inkBar: true, tabPane: false }">
<a-tab-pane tab="本地上传" key="1">
<FilePondUpload
ref="upload"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a-col :span="12">
<a-spin :spinning="loading">
<div class="custom-tab-wrapper">
<a-tabs default-active-key="1">
<a-tabs default-active-key="1" :animated="{ inkBar: true, tabPane: false }">
<a-tab-pane key="1" tab="分类目录" force-render>
<a-list item-layout="horizontal">
<a-list-item v-for="(category, index) in categories" :key="index">
Expand Down
2 changes: 1 addition & 1 deletion src/views/system/optiontabs/SmtpTab.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="custom-tab-wrapper">
<a-tabs>
<a-tabs :animated="{ inkBar: true, tabPane: false }">
<a-tab-pane tab="发信设置" key="smtpoptions">
<a-form-model ref="smtpOptionsForm" :model="options" :rules="rules" layout="vertical" :wrapperCol="wrapperCol">
<a-form-model-item label="是否启用:">
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1876,10 +1876,10 @@
resolved "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==

"@vue/test-utils@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.2.0.tgz#3bc8c17ed549157275f0aec6b95da40887f7297f"
integrity sha512-poBTLqeJYNq1TXVhtVfnY8vELUVOFdJY8KZZoUuaAkIqPTWsxonU1M8nMWpZT+xEMrM+49+YcuEqtMHVD9Q9gw==
"@vue/test-utils@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.2.1.tgz#4671fc8844e09ccddb6801ceedd7b7309ae11d06"
integrity sha512-WBRdWNJwWTodJlV9mjunTrhgfsTPI5tMuxsCxqSmQs+vyB3ccZIYixnBrkxpKRsXyah/RtEv6+kUPZhnLd9smA==
dependencies:
dom-event-types "^1.0.0"
lodash "^4.17.15"
Expand Down Expand Up @@ -2227,10 +2227,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
"@types/color-name" "^1.1.1"
color-convert "^2.0.1"

ant-design-vue@^1.7.5:
version "1.7.5"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.5.tgz#e7ed04cb358adc56be02c7453d2db026d2c405e3"
integrity sha512-QVrirCz6eetzui+Dv/ujMqUwIr8e/2H+pKr4VC3mpc+cHkw6L9cBRJK7DhfO7GTyK4EWKkEH3lfLWlD/XjUoQQ==
ant-design-vue@^1.7.6:
version "1.7.6"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.6.tgz#976a84ff037c2e5f0586dcd697eafb8cf7983b1e"
integrity sha512-EOS6g/deT53xHxZDMOxedyBehXSNMGnxdOeQtDksmiRvCBrZs+yoFYoVOe9pmQ8EJ7XQLn8TMReiYbXi78kppA==
dependencies:
"@ant-design/icons" "^2.1.1"
"@ant-design/icons-vue" "^2.0.0"
Expand Down Expand Up @@ -7532,10 +7532,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"

marked@^2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.7.tgz#bc5b857a09071b48ce82a1f7304913a993d4b7d1"
integrity sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ==
marked@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==

md5.js@^1.3.4:
version "1.3.5"
Expand Down Expand Up @@ -11175,10 +11175,10 @@ vue-ref@^2.0.0:
resolved "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz"
integrity sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ==

vue-router@^3.5.1:
version "3.5.1"
resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz"
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
vue-router@^3.5.2:
version "3.5.2"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c"
integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ==

vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
version "4.1.2"
Expand Down