fix(markdown): set value error

修复markdown组件在完成初始化之前动态设置value可能导致异常的问题
vbenjs · Jul 13, 2021 · 35e1347 · 35e1347
1 parent d95815b
commit 35e1347
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/components/Markdown/src/Markdown.vue b/src/components/Markdown/src/Markdown.vue
@@ -59,8 +59,8 @@
         (v) => {
           if (v !== valueRef.value) {
             instance.getVditor()?.setValue(v);
-            valueRef.value = v;
           }
+          valueRef.value = v;
         }
       );
 
@@ -85,7 +85,7 @@
         const wrapEl = unref(wrapRef) as HTMLElement;
         if (!wrapEl) return;
         const bindValue = { ...attrs, ...props };
-        vditorRef.value = new Vditor(wrapEl, {
+        const insEditor = new Vditor(wrapEl, {
           theme: getDarkMode.value === 'dark' ? 'dark' : 'classic',
           lang: unref(getCurrentLang),
           mode: 'sv',
@@ -100,7 +100,10 @@
           after: () => {
             nextTick(() => {
               modalFn?.redoModalHeight?.();
+              insEditor.setValue(valueRef.value);
+              vditorRef.value = insEditor;
               initedRef.value = true;
+              emit('get', instance);
             });
           },
           blur: () => {
@@ -124,14 +127,10 @@
           vditorInstance?.destroy?.();
         } catch (error) {}
         vditorRef.value = null;
+        initedRef.value = false;
       }
 
-      onMountedOrActivated(() => {
-        nextTick(() => {
-          init();
-        });
-        emit('get', instance);
-      });
+      onMountedOrActivated(init);
 
       onBeforeUnmount(destroy);
       onDeactivated(destroy);