Compare commits

..

4 Commits

Author SHA1 Message Date
zhuzhengjian
7f296bc378 Merge branch 'main' of github.com:antd-tiny-vue/antd-tiny-vue into main 2023-04-19 10:46:46 +08:00
zhuzhengjian
4e0a756239 chore: resolve conflict 2023-04-18 15:50:37 +08:00
zhuzhengjian
79210d99c9 chore: change 2023-04-18 15:49:28 +08:00
zhuzhengjian
0d1e4d3e7c fix: space error 2023-04-17 11:30:22 +08:00
3 changed files with 456 additions and 447 deletions

View File

@ -152,7 +152,7 @@ const Button = defineComponent({
isNeedInserted = isNeedInserted =
children.length === 1 && children.length === 1 &&
!slots.icon && !slots.icon &&
isUnBorderedButtonType(props.type) !isUnBorderedButtonType(props.type)
fixTwoCNChar() fixTwoCNChar()
showError() showError()
const iconType = innerLoading.value ? 'loading' : icon const iconType = innerLoading.value ? 'loading' : icon

View File

@ -1,7 +1,9 @@
import type { AliasToken, GenerateStyle } from '../../theme/internal' import type { AliasToken, GenerateStyle } from '../../theme/internal'
import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook' import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook'
const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = token => ({ const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = (
token
) => ({
[token.componentCls]: { [token.componentCls]: {
// For common/openAnimation // For common/openAnimation
[`${token.antCls}-motion-collapse-legacy`]: { [`${token.antCls}-motion-collapse-legacy`]: {

File diff suppressed because it is too large Load Diff