Commit b1cb86350253dc5be095466966d9469775f4395d
1 parent
132c7fb9
fix(table-action): fix the split line style is missing,fix #674
Showing
3 changed files
with
25 additions
and
20 deletions
package.json
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | "@iconify/iconify": "^2.0.1", | 35 | "@iconify/iconify": "^2.0.1", |
36 | "@logicflow/core": "^0.4.10", | 36 | "@logicflow/core": "^0.4.10", |
37 | "@logicflow/extension": "^0.4.10", | 37 | "@logicflow/extension": "^0.4.10", |
38 | - "@vueuse/core": "^4.11.1", | 38 | + "@vueuse/core": "^4.11.2", |
39 | "@zxcvbn-ts/core": "^0.3.0", | 39 | "@zxcvbn-ts/core": "^0.3.0", |
40 | "ant-design-vue": "2.1.2", | 40 | "ant-design-vue": "2.1.2", |
41 | "axios": "^0.21.1", | 41 | "axios": "^0.21.1", |
@@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
63 | "devDependencies": { | 63 | "devDependencies": { |
64 | "@commitlint/cli": "^12.1.4", | 64 | "@commitlint/cli": "^12.1.4", |
65 | "@commitlint/config-conventional": "^12.1.4", | 65 | "@commitlint/config-conventional": "^12.1.4", |
66 | - "@iconify/json": "^1.1.349", | 66 | + "@iconify/json": "^1.1.350", |
67 | "@purge-icons/generated": "^0.7.0", | 67 | "@purge-icons/generated": "^0.7.0", |
68 | "@types/codemirror": "^5.60.0", | 68 | "@types/codemirror": "^5.60.0", |
69 | "@types/crypto-js": "^4.0.1", | 69 | "@types/crypto-js": "^4.0.1", |
@@ -127,7 +127,7 @@ | @@ -127,7 +127,7 @@ | ||
127 | "resolutions": { | 127 | "resolutions": { |
128 | "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", | 128 | "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", |
129 | "bin-wrapper": "npm:bin-wrapper-china", | 129 | "bin-wrapper": "npm:bin-wrapper-china", |
130 | - "rollup": "^2.50.4" | 130 | + "rollup": "^2.50.5" |
131 | }, | 131 | }, |
132 | "repository": { | 132 | "repository": { |
133 | "type": "git", | 133 | "type": "git", |
src/components/Table/src/components/TableAction.vue
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | </PopConfirmButton> | 7 | </PopConfirmButton> |
8 | <Divider | 8 | <Divider |
9 | type="vertical" | 9 | type="vertical" |
10 | + class="action-divider" | ||
10 | v-if="divider && index < getActions.length - (dropDownActions ? 0 : 1)" | 11 | v-if="divider && index < getActions.length - (dropDownActions ? 0 : 1)" |
11 | /> | 12 | /> |
12 | </template> | 13 | </template> |
@@ -132,6 +133,10 @@ | @@ -132,6 +133,10 @@ | ||
132 | display: flex; | 133 | display: flex; |
133 | align-items: center; | 134 | align-items: center; |
134 | 135 | ||
136 | + .action-divider { | ||
137 | + display: table; | ||
138 | + } | ||
139 | + | ||
135 | &.left { | 140 | &.left { |
136 | justify-content: flex-start; | 141 | justify-content: flex-start; |
137 | } | 142 | } |
yarn.lock
@@ -1191,10 +1191,10 @@ | @@ -1191,10 +1191,10 @@ | ||
1191 | dependencies: | 1191 | dependencies: |
1192 | cross-fetch "^3.0.6" | 1192 | cross-fetch "^3.0.6" |
1193 | 1193 | ||
1194 | -"@iconify/json@^1.1.349": | ||
1195 | - version "1.1.349" | ||
1196 | - resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.349.tgz#c3784ea0fb63e348c3f251cfd7f376808c2c15f8" | ||
1197 | - integrity sha512-eYUjmqyQ2ytNHc6t039ooCXyiIPOkiYKcNITG0g2nECrtuY0jPmd686Q0Y8tMNEaS6uniznT6SKOvIEAFr4U9A== | 1194 | +"@iconify/json@^1.1.350": |
1195 | + version "1.1.350" | ||
1196 | + resolved "https://registry.yarnpkg.com/@iconify/json/-/json-1.1.350.tgz#abd66f4ef1250306f7ce088dac637ea0d781e694" | ||
1197 | + integrity sha512-pNHlRLZCbNsk7WXZfFGPa1no3oOi5KcWFyo1Pk3cQJzPhHEqqpV7zImAGW4WJrxhlRkv/6wzZVcBF5xhkp4Avw== | ||
1198 | 1198 | ||
1199 | "@intlify/core-base@9.1.6": | 1199 | "@intlify/core-base@9.1.6": |
1200 | version "9.1.6" | 1200 | version "9.1.6" |
@@ -2028,18 +2028,18 @@ | @@ -2028,18 +2028,18 @@ | ||
2028 | resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77" | 2028 | resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77" |
2029 | integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA== | 2029 | integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA== |
2030 | 2030 | ||
2031 | -"@vueuse/core@^4.11.1": | ||
2032 | - version "4.11.1" | ||
2033 | - resolved "https://registry.npmjs.com/@vueuse/core/-/core-4.11.1.tgz#1ab79284dffe8934420a1a40491333cd0591ecd2" | ||
2034 | - integrity sha512-69PdXDVLqZgmjFLbhqN+3Yp/29BRjKtk83UoeVv6csPIPB0DG7SFfsmZbnuSouEetgHXyFSKzty7+4S8GwEyWA== | 2031 | +"@vueuse/core@^4.11.2": |
2032 | + version "4.11.2" | ||
2033 | + resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-4.11.2.tgz#d4f54bd38e7c289c6f6357992c02423774cb26d9" | ||
2034 | + integrity sha512-4A17XvKXpMR6829EVWvrdSKEeAjTWaiC3+xh51KEtlyCwvWQwZ0xwKDrbMj+e15ANxjHrTw/0bJVaWDfPQt/Pw== | ||
2035 | dependencies: | 2035 | dependencies: |
2036 | - "@vueuse/shared" "4.11.1" | 2036 | + "@vueuse/shared" "4.11.2" |
2037 | vue-demi "*" | 2037 | vue-demi "*" |
2038 | 2038 | ||
2039 | -"@vueuse/shared@4.11.1": | ||
2040 | - version "4.11.1" | ||
2041 | - resolved "https://registry.npmjs.com/@vueuse/shared/-/shared-4.11.1.tgz#c8f5735839659bf0a03655bdf70ab337b8f0d452" | ||
2042 | - integrity sha512-9ye1Y6AwjAsbbPSVoWvOVFbObPcEe5ZFV2eU560+Ii+LGhvP8NhH+lyReuuhTzjVL8kEYR6mWRCRqK3rQc7dag== | 2039 | +"@vueuse/shared@4.11.2": |
2040 | + version "4.11.2" | ||
2041 | + resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-4.11.2.tgz#1d56e08937600e3e65abf76f27cb4a1bc182adfd" | ||
2042 | + integrity sha512-vTbTi6ou7ljH3CkKVoaIaCAoWB5T1ewSogpL6VnO1duMPNuiv7x8K/LunMbnTg4tVyt6QwaiCuEq/kyS6AUBRg== | ||
2043 | dependencies: | 2043 | dependencies: |
2044 | vue-demi "*" | 2044 | vue-demi "*" |
2045 | 2045 | ||
@@ -8851,10 +8851,10 @@ rollup-plugin-visualizer@5.5.0: | @@ -8851,10 +8851,10 @@ rollup-plugin-visualizer@5.5.0: | ||
8851 | source-map "^0.7.3" | 8851 | source-map "^0.7.3" |
8852 | yargs "^16.2.0" | 8852 | yargs "^16.2.0" |
8853 | 8853 | ||
8854 | -rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.50.4: | ||
8855 | - version "2.50.4" | ||
8856 | - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.50.4.tgz#5a53e4294296dfee2a83b0ec0d0536984b98de71" | ||
8857 | - integrity sha512-mBQa9O6bdqur7a6R+TXcbdYgfO2arXlDG+rSrWfwAvsiumpJjD4OS23R9QuhItuz8ysWb8mZ91CFFDQUhJY+8Q== | 8854 | +rollup@^2.38.5, rollup@^2.43.1, rollup@^2.45.2, rollup@^2.50.5: |
8855 | + version "2.50.5" | ||
8856 | + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.50.5.tgz#bbee9d6411af3f5fa5c6e7e2c69f7a65b753e568" | ||
8857 | + integrity sha512-Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ== | ||
8858 | optionalDependencies: | 8858 | optionalDependencies: |
8859 | fsevents "~2.3.1" | 8859 | fsevents "~2.3.1" |
8860 | 8860 |