Skip to content

fix(colorPicker): 组件无法正常打开选择器 #1340

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

Merged
merged 1 commit into from
Sep 16, 2022
Merged

fix(colorPicker): 组件无法正常打开选择器 #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions packages/devui-vue/devui/color-picker/src/color-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
readonly,
Transition
} from 'vue';
import type { StyleValue } from 'vue';
import type { StyleValue, Ref } from 'vue';
import {
useReactive,
colorPickerResize,
Expand Down Expand Up @@ -58,16 +58,21 @@ export default defineComponent({
emit('update:modelValue', value);
}
function resize() {
return colorPickerResize(colorCubeRef, top, left);
return colorPickerResize(colorCubeRef as Ref<HTMLElement>, top, left);
}
function isExhibition(event: Event) {
return isExhibitionColorPicker(event as PointerEvent, colorCubeRef, pickerRef, showColorPicker);
return isExhibitionColorPicker(
event as PointerEvent,
colorCubeRef as Ref<HTMLElement>,
pickerRef as Ref<HTMLElement>,
showColorPicker
);
}
onMounted(() => {
// resize 响应式 colorpicker
window.addEventListener('resize', resize);
// 点击展示 colorpicker
window.addEventListener('click', isExhibition);
window.addEventListener('click', isExhibition, true);
});
// ** computeds
// colorpicker panel 组件位置
Expand Down Expand Up @@ -152,7 +157,7 @@ export default defineComponent({
]}
></div>
<div class='devui-color-picker-color-value'>
<p style={textColor.value}>{formItemValue.value}</p>
<p style={textColor.value as StyleValue}>{formItemValue.value}</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/devui-vue/devui/color-picker/src/utils/composeable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function isExhibitionColorPicker(
pickerRef: Ref<HTMLElement | null>,
showColorPicker: Ref<boolean>
): void {
if (colorCubeRef.value?.contains?.(event.target as Node)) {
if (colorCubeRef.value?.contains?.(event.target as Node) && !showColorPicker.value) {
showColorPicker.value = true;
}
if (!!pickerRef.value && !pickerRef.value?.contains(event.target as Node)) {
Expand Down