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.

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

fix(EditorMd): 点击组件外,收起hint提示 #1808

Merged
merged 2 commits into from
Mar 26, 2024
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cloneDeep from 'lodash/cloneDeep';
import { computed, nextTick, onMounted, reactive, Ref, ref, SetupContext, toRefs, watch } from 'vue';
import { computed, nextTick, onMounted, reactive, Ref, ref, SetupContext, toRefs, watch, onBeforeUnmount } from 'vue';
import { debounce } from '../../../shared/utils';
import { EditorMdProps, Mode } from '../editor-md-types';
import { DEFAULT_TOOLBARS } from '../toolbar-config';
Expand Down Expand Up @@ -27,6 +27,7 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
const renderRef = ref();
const overlayRef = ref();
const cursorRef = ref();
const containerRef = ref();
const isHintShow = ref();
const previewHtmlList: Ref<any[]> = ref([]);
let editorIns: any;
Expand Down Expand Up @@ -214,12 +215,7 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
const startPos = value.lastIndexOf(nowPrefix, cursor.ch);
const endPos = value.indexOf(' ', cursor.ch) > -1 ? value.indexOf(' ', cursor.ch) : value.length;
hint = value.slice(startPos, cursor.ch);
if (
startPos < 0 ||
!hint.includes(nowPrefix) ||
hint.endsWith(' ') ||
isImgRegx.test(hint)
) {
if (startPos < 0 || !hint.includes(nowPrefix) || hint.endsWith(' ') || isImgRegx.test(hint)) {
cursorHint = '';
cursorHintStart = -1;
cursorHintEnd = -1;
Expand Down Expand Up @@ -342,12 +338,23 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
}
};

const onDocumentClick = (e: Event) => {
if (isHintShow.value && e.target !== containerRef.value && !containerRef.value?.contains(e.target)) {
hideHint();
}
};

onMounted(async () => {
await import('codemirror/addon/display/placeholder.js');
await import('codemirror/mode/markdown/markdown.js');
const module = await import('codemirror');
CodeMirror = module.default;
initEditor();
document.addEventListener('click', onDocumentClick);
});

onBeforeUnmount(() => {
document.removeEventListener('click', onDocumentClick);
});

watch(modelValue, (val: string) => {
Expand Down Expand Up @@ -398,6 +405,7 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
overlayRef,
cursorRef,
renderRef,
containerRef,
toolbars,
previewHtmlList,
isHintShow,
Expand Down
7 changes: 5 additions & 2 deletions packages/devui-vue/devui/editor-md/src/editor-md.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineComponent, toRefs, provide, ref, SetupContext } from 'vue';
import { defineComponent, toRefs, provide, ref, SetupContext, withModifiers } from 'vue';
import { Fullscreen } from '../../fullscreen';
import { useEditorMd } from './composables/use-editor-md';
import { useEditorMdTheme } from './composables/use-editor-md-theme';
Expand Down Expand Up @@ -40,6 +40,7 @@ export default defineComponent({
overlayRef,
cursorRef,
renderRef,
containerRef,
isHintShow,
toolbars,
previewHtmlList,
Expand All @@ -65,6 +66,7 @@ export default defineComponent({
return () => (
<Fullscreen v-model={showFullscreen.value} z-index={fullscreenZIndex.value}>
<div
ref={containerRef}
class={[
'dp-md-container',
{ 'dp-md-readonly': mode.value === 'readonly', 'dp-md-editonly': mode.value === 'editonly', 'dp-md-dark': isDarkMode.value },
Expand All @@ -85,7 +87,8 @@ export default defineComponent({
v-model={isHintShow.value}
origin={cursorRef.value || undefined}
align="start"
position={['bottom-start']}>
position={['bottom-start']}
onClick={withModifiers(() => {}, ['stop'])}>
{ctx.slots?.hintTemplate?.()}
</FlexibleOverlay>
{Boolean(maxlength?.value) && (
Expand Down
2 changes: 1 addition & 1 deletion packages/devui-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-devui",
"version": "1.6.4-alpha.0",
"version": "1.6.4-markdown.0",
"license": "MIT",
"description": "DevUI components based on Vite and Vue3",
"keywords": [
Expand Down
Loading