Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(components): [rate] fast move mouseLeave not triggered #9608

Merged
merged 3 commits into from Sep 6, 2022
Merged

fix(components): [rate] fast move mouseLeave not triggered #9608

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4092bca
fix(components): [rate] fast move mouseLeave not triggered
chenxch Sep 3, 2022
b3465d2
fix(components): [rate] RawSymbol error
chenxch Sep 3, 2022
50cd093
fix(components): [rate] RawSymbol error
chenxch Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 26 additions & 21 deletions packages/components/rate/src/rate.vue
View file
Open in desktop
Expand Up @@ -30,10 +30,10 @@
ns.is('active', item <= currentValue),
]"
>
<component
:is="iconComponents[item - 1]"
v-if="!showDecimalIcon(item)"
/>
<template v-if="!showDecimalIcon(item)">
<component :is="activeComponent" v-show="item <= currentValue" />
xiaoxian521 marked this conversation as resolved.
Show resolved Hide resolved
<component :is="voidComponent" v-show="!(item <= currentValue)" />
</template>
<el-icon
v-if="showDecimalIcon(item)"
:style="decimalStyle"
Expand All @@ -49,13 +49,15 @@
</div>
</template>
<script lang="ts" setup>
import { type CSSProperties, computed, inject, ref, watch } from 'vue'
import { computed, inject, markRaw, ref, watch } from 'vue'
import { EVENT_CODE, UPDATE_MODEL_EVENT } from '@element-plus/constants'
import { hasClass, isArray, isObject } from '@element-plus/utils'
import { hasClass, isArray, isObject, isString } from '@element-plus/utils'
import { formContextKey, formItemContextKey } from '@element-plus/tokens'
import { ElIcon } from '@element-plus/components/icon'
import { useFormItemInputId, useNamespace, useSize } from '@element-plus/hooks'
import { rateEmits, rateProps } from './rate'
import type { iconPropType } from '@element-plus/utils'
import type { CSSProperties, Component } from 'vue'

function getValueFromMap<T>(
value: number,
Expand Down Expand Up @@ -147,34 +149,37 @@ const decimalStyle = computed(() => {
width,
}
})
const componentMap = computed(() =>
isArray(props.icons)
const componentMap = computed(() => {
let icons = isArray(props.icons) ? [...props.icons] : { ...props.icons }
icons = markRaw(icons) as
| Array<string | Component>
| Record<number, string | Component>
return isArray(icons)
? {
[props.lowThreshold]: props.icons[0],
[props.lowThreshold]: icons[0],
[props.highThreshold]: {
value: props.icons[1],
value: icons[1],
excluded: true,
},
[props.max]: props.icons[2],
[props.max]: icons[2],
}
: props.icons
)
: icons
})
const decimalIconComponent = computed(() =>
getValueFromMap(props.modelValue, componentMap.value)
)
const voidComponent = computed(() =>
rateDisabled.value ? props.disabledVoidIcon : props.voidIcon
rateDisabled.value
? isString(props.disabledVoidIcon)
? props.disabledVoidIcon
: (markRaw(props.disabledVoidIcon) as typeof iconPropType)
: isString(props.voidIcon)
? props.voidIcon
: (markRaw(props.voidIcon) as typeof iconPropType)
)
const activeComponent = computed(() =>
getValueFromMap(currentValue.value, componentMap.value)
)
const iconComponents = computed(() => {
const result = Array.from({ length: props.max })
const threshold = currentValue.value
result.fill(activeComponent.value, 0, threshold)
result.fill(voidComponent.value, threshold, props.max)
return result
})

function showDecimalIcon(item: number) {
const showWhenDisabled =
Expand Down