fix: 扩展未加载完成对编辑器进行部分操作报错（#84）

imzbf · Apr 24, 2022 · 8437b1b · 8437b1b
1 parent efb4a9b
commit 8437b1b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/MdEditor/layouts/Modals/Clip.tsx b/MdEditor/layouts/Modals/Clip.tsx
@@ -63,6 +63,11 @@ export default defineComponent({
 
           // 直接定义onchange，防止创建新的实例时遗留事件
           (uploadRef.value as HTMLInputElement).onchange = () => {
+            if (!Cropper) {
+              // CATCH ERROR: 捕获全局错误
+              return;
+            }
+
             const fileList = (uploadRef.value as HTMLInputElement).files || [];
 
             // 切换模式

diff --git a/MdEditor/layouts/Toolbar/composition.ts b/MdEditor/layouts/Toolbar/composition.ts
@@ -9,7 +9,13 @@ export const useSreenfull = (props: any) => {
   // 是否组件内部全屏标识
   const screenfullMe = ref(false);
 
+  // 触发器
   const fullScreenHandler = () => {
+    if (!screenfull) {
+      // CATCH ERROR: 捕获全局错误
+      return;
+    }
+
     if (screenfull.isEnabled) {
       screenfullMe.value = true;
       if (screenfull.isFullscreen) {
@@ -22,11 +28,8 @@ export const useSreenfull = (props: any) => {
     }
   };
 
-  const screenfullLoad = () => {
-    // 复制实例
-    screenfull = window.screenfull;
-
-    // 注册事件
+  // 挂载监听事件
+  const onScreenfullEvent = () => {
     if (screenfull && screenfull.isEnabled) {
       screenfull.on('change', () => {
         if (screenfullMe.value) {
@@ -37,15 +40,15 @@ export const useSreenfull = (props: any) => {
     }
   };
 
+  const screenfullLoad = () => {
+    // 复制实例
+    screenfull = window.screenfull;
+    // 重新监听
+    onScreenfullEvent();
+  };
+
   onMounted(() => {
-    if (screenfull && screenfull.isEnabled) {
-      screenfull.on('change', () => {
-        if (screenfullMe.value) {
-          screenfullMe.value = false;
-          props.updateSetting(!props.setting.fullscreen, 'fullscreen');
-        }
-      });
-    }
+    onScreenfullEvent();
 
     if (!previewOnly && props.screenfull === null) {
       const screenScript = document.createElement('script');

diff --git a/MdEditor/utils/content-help.ts b/MdEditor/utils/content-help.ts
@@ -120,6 +120,11 @@ export const directive2flag = (
     targetValue = `${pix} ${selectedText}`;
     deviationStart = pix.length + 1;
   } else if (direct === 'prettier') {
+    if (!window.prettier) {
+      // CATCH ERROR: 捕获全局错误
+      return inputArea.value;
+    }
+
     return window.prettier.format(inputArea.value, {
       parser: 'markdown',
       plugins: window.prettierPlugins