修复ResizeObserver loop limit exceeded错误

src/components/CommandEditor.vue

@@ -1,57 +1,29 @@
 <template>
   <div class="absolute-full container" style="overflow: 'hidden'">
     <!-- 命令设置栏 -->
-    <CommandSideBar
+    <CommandSideBar ref="sidebar" :canCommandSave="canCommandSave" :quickcommandInfo="quickcommandInfo"
-      ref="sidebar"
+      class="absolute-left shadow-10" :style="{
-      :canCommandSave="canCommandSave"
-      :quickcommandInfo="quickcommandInfo"
-      class="absolute-left shadow-10"
-      :style="{
         width: sideBarWidth + 'px',
         zIndex: 1,
-        transition: '0.3s',
+        // transition: '0.3s',
-      }"
+      }" v-if="showSidebar"></CommandSideBar>
-      v-if="showSidebar"
-    ></CommandSideBar>
     <!-- 编程语言栏 -->
-    <div
+    <div class="absolute-top" :style="{
-      class="absolute-top"
+      left: showSidebar ? sideBarWidth + 'px' : 65,
-      :style="{
+      zIndex: 1,
-        left: showSidebar ? sideBarWidth + 'px' : 65,
+      // transition: '0.3s',
-        zIndex: 1,
+    }">
-        transition: '0.3s',
+      <div class="row" v-show="!!languageBarHeight">
-      }"
+        <!-- 去掉收起侧栏功能，处理侧栏宽度变化时，Monaco调整大小导致ResizeObserver loop limit exceeded错误 -->
-    >
+        <!-- <div class="col-auto flex">
-      <div class="row" v-show="languageBarHeight">
+          <q-btn v-if="!isRunCodePage" flat dense color="primary" class="menuBtn" icon="menu"
-        <div class="col-auto flex">
+            @click="toggleSideBarWidth"><q-tooltip>{{ !!sideBarWidth ? "收起" : "展开" }}侧栏</q-tooltip></q-btn>
-          <q-btn
+        </div> -->
-            v-if="!isRunCodePage"
-            flat
-            dense
-            color="primary"
-            class="menuBtn"
-            icon="menu"
-            @click="toggleSideBarWidth"
-            ><q-tooltip
-              >{{ sideBarWidth ? "收起" : "展开" }}侧栏</q-tooltip
-            ></q-btn
-          >
-        </div>
         <div class="col">
           <div>
-            <q-select
+            <q-select dense standout="bg-primary text-white" square hide-bottom-space color="primary"
-              dense
+              transition-show="jump-down" transition-hide="jump-up" @update:model-value="programChanged"
-              standout="bg-primary text-white"
+              v-model="quickcommandInfo.program" :options="programLanguages" label="环境">
-              square
-              hide-bottom-space
-              color="primary"
-              transition-show="jump-down"
-              transition-hide="jump-up"
-              @update:model-value="programChanged"
-              v-model="quickcommandInfo.program"
-              :options="programLanguages"
-              label="环境"
-            >
               <template v-slot:append>
                 <q-avatar size="lg" square>
                   <img :src="$root.programs[quickcommandInfo.program].icon" />
@@ -73,34 +45,20 @@
         <q-separator vertical />
         <div class="col-auto justify-end flex">
           <q-btn-group unelevated>
-            <q-btn-dropdown
+            <q-btn-dropdown v-show="quickcommandInfo.program !== 'html'" style="padding: 0 10px" dense flat ref="settings"
-              v-show="quickcommandInfo.program !== 'html'"
+              color="primary" :icon="quickcommandInfo.program === 'quickcommand'
-              style="padding: 0 10px"
+                ? 'insights'
-              dense
+                : 'settings'
-              flat
+                ">
-              ref="settings"
-              color="primary"
-              :icon="
-                quickcommandInfo.program === 'quickcommand'
-                  ? 'insights'
-                  : 'settings'
-              "
-            >
               <q-list>
                 <!-- quickcommand系列按键 -->
-                <q-item
+                <q-item clickable v-for="(item, index) in ['keyboard', 'ads_click', 'help']" :key="index" @click="
-                  clickable
+                  [
-                  v-for="(item, index) in ['keyboard', 'ads_click', 'help']"
+                    () => (showRecorder = true),
-                  :key="index"
+                    () => (showActions = true),
-                  @click="
+                    showHelp,
-                    [
+                  ][index]
-                      () => (showRecorder = true),
+                  " v-show="quickcommandInfo.program === 'quickcommand'">
-                      () => (showActions = true),
-                      showHelp,
-                    ][index]
-                  "
-                  v-show="quickcommandInfo.program === 'quickcommand'"
-                >
                   <q-item-section avatar>
                     <q-icon :name="item" />
                   </q-item-section>
@@ -109,29 +67,15 @@
                   }}</q-item-section>
                 </q-item>
                 <!-- 自定义解释器 -->
-                <q-item
+                <q-item v-for="(item, index) in Object.keys(
-                  v-for="(item, index) in Object.keys(
+                  quickcommandInfo.customOptions
-                    quickcommandInfo.customOptions
+                )" :key="index" v-show="quickcommandInfo.program === 'custom'">
-                  )"
+                  <q-input stack-label autofocus dense outlined class="full-width" @blur="matchLanguage" :label="[
-                  :key="index"
+                    '解释器路径，如：/opt/python',
-                  v-show="quickcommandInfo.program === 'custom'"
+                    '运行参数，如：-u',
-                >
+                    '脚本后缀，不含点，如：py',
-                  <q-input
+                  ][index]
-                    stack-label
+                    " v-model="quickcommandInfo.customOptions[item]">
-                    autofocus
-                    dense
-                    outlined
-                    class="full-width"
-                    @blur="matchLanguage"
-                    :label="
-                      [
-                        '解释器路径，如：/opt/python',
-                        '运行参数，如：-u',
-                        '脚本后缀，不含点，如：py',
-                      ][index]
-                    "
-                    v-model="quickcommandInfo.customOptions[item]"
-                  >
                     <template v-slot:prepend>
                       <q-icon name="code" />
                     </template>
@@ -139,36 +83,17 @@
                 </q-item>
                 <!-- 脚本参数 -->
                 <q-item v-show="quickcommandInfo.program !== 'quickcommand'">
-                  <q-input
+                  <q-input dense stack-label outlined label="脚本参数" class="full-width" v-model="quickcommandInfo.scptarg">
-                    dense
-                    stack-label
-                    outlined
-                    label="脚本参数"
-                    class="full-width"
-                    v-model="quickcommandInfo.scptarg"
-                  >
                     <template v-slot:prepend>
                       <q-icon name="input" />
                     </template>
                   </q-input>
                 </q-item>
                 <!-- 编码设置 -->
-                <q-item
+                <q-item v-for="(item, index) in Object.keys(quickcommandInfo.charset)" :key="index"
-                  v-for="(item, index) in Object.keys(quickcommandInfo.charset)"
+                  v-show="quickcommandInfo.program !== 'quickcommand'">
-                  :key="index"
+                  <q-select dense outlined stack-label clearable class="full-width" :label="['脚本编码', '输出编码'][index]"
-                  v-show="quickcommandInfo.program !== 'quickcommand'"
+                    v-model="quickcommandInfo.charset[item]" :options="['GBK', 'utf8', 'Big5']" type="text">
-                >
-                  <q-select
-                    dense
-                    outlined
-                    stack-label
-                    clearable
-                    class="full-width"
-                    :label="['脚本编码', '输出编码'][index]"
-                    v-model="quickcommandInfo.charset[item]"
-                    :options="['GBK', 'utf8', 'Big5']"
-                    type="text"
-                  >
                     <template v-slot:prepend>
                       <q-icon :name="['format_size', 'output'][index]" />
                     </template>
@@ -177,49 +102,26 @@
               </q-list>
             </q-btn-dropdown>
             <q-separator vertical inset />
-            <q-btn
+            <q-btn style="padding: 0 10px" dense flat color="primary" icon="play_arrow" label="运行"
-              style="padding: 0 10px"
+              @click="runCurrentCommand()"></q-btn>
-              dense
+            <q-btn flat style="padding: 0 10px" dense v-if="!isRunCodePage" :disable="!canCommandSave"
-              flat
+              :color="canCommandSave ? 'primary' : 'grey'" icon="save" label="保存" @click="saveCurrentCommand()"></q-btn>
-              color="primary"
-              icon="play_arrow"
-              label="运行"
-              @click="runCurrentCommand()"
-            ></q-btn>
-            <q-btn
-              flat
-              style="padding: 0 10px"
-              dense
-              v-if="!isRunCodePage"
-              :disable="!canCommandSave"
-              :color="canCommandSave ? 'primary' : 'grey'"
-              icon="save"
-              label="保存"
-              @click="saveCurrentCommand()"
-            ></q-btn>
           </q-btn-group>
         </div>
-        <q-dialog v-model="showActions"
+        <q-dialog v-model="showActions">
-          ><QuickAction @addAction="insertText" />
+          <QuickAction @addAction="insertText" />
         </q-dialog>
-        <q-dialog v-model="showRecorder" position="bottom"
+        <q-dialog v-model="showRecorder" position="bottom">
-          ><KeyRecorder @sendKeys="insertText" />
+          <KeyRecorder @sendKeys="insertText" />
         </q-dialog>
       </div>
     </div>
-    <MonacoEditor
+    <MonacoEditor class="absolute-bottom" :placeholder="true" ref="editor" @loaded="monacoInit"
-      class="absolute-bottom"
+      @typing="(val) => monacoTyping(val)" @keyStroke="monacoKeyStroke" :style="{
-      :placeholder="true"
-      ref="editor"
-      @loaded="monacoInit"
-      @typing="(val) => monacoTyping(val)"
-      @keyStroke="monacoKeyStroke"
-      :style="{
         top: languageBarHeight + 'px',
-        left: this.action.type === 'run' ? 0 : this.sideBarWidth + 'px',
+        left: action.type === 'run' ? 0 : sideBarWidth + 'px',
-        transition: '0.3s',
+        // transition: '0.3s',
-      }"
+      }" />
-    />
     <!-- 运行结果 -->
     <CommandRunResult :action="action" ref="result"></CommandRunResult>
   </div>
@@ -236,6 +138,9 @@ const MonacoEditor = defineAsyncComponent(() =>
   import("components/MonacoEditor")
 );
 
+const defaultSideBarWidth = 250;
+const defaultlanguageBarHeight = 40;
+
 export default {
   components: {
     MonacoEditor,
@@ -247,8 +152,8 @@ export default {
   data() {
     return {
       programLanguages: Object.keys(this.$root.programs),
-      sideBarWidth: 250,
+      sideBarWidth: defaultSideBarWidth,
-      languageBarHeight: 40,
+      languageBarHeight: defaultlanguageBarHeight,
       canCommandSave: this.action.type === "code" ? false : true,
       showActions: false,
       showRecorder: false,
@@ -348,13 +253,7 @@ export default {
     },
     // 展开收起侧栏
     toggleSideBarWidth() {
-      if (this.sideBarWidth) {
+      this.sideBarWidth = !!this.sideBarWidth ? 0 : defaultSideBarWidth;
-        this.lastSideBarWidth = this.sideBarWidth;
-        this.sideBarWidth = 0;
-      } else {
-        this.sideBarWidth = this.lastSideBarWidth;
-        this.lastSideBarWidth = 0;
-      }
     },
     // 保存
     saveCurrentCommand() {
@@ -415,6 +314,7 @@ export default {
   background: rgba(0, 0, 0, 0.05);
   border-radius: 0;
 }
+
 .body--dark .menuBtn {
   background: rgba(255, 255, 255, 0.07);
 }

src/components/MonacoEditor.vue

@@ -4,9 +4,8 @@
     <div class="absolute-center flex" v-show="!value && placeholder">
       <div class="placeholder text-center q-gutter-md">
         <div v-for="shortCut in shortCuts" :key="shortCut">
-          <span>{{ shortCut[0] }}</span
+          <span>{{ shortCut[0] }}</span><span class="shortcut-key">{{ shortCut[1] }}</span><span class="shortcut-key">{{
-          ><span class="shortcut-key">{{ shortCut[1] }}</span
+            shortCut[2] }}</span>
-          ><span class="shortcut-key">{{ shortCut[2] }}</span>
         </div>
       </div>
     </div>
@@ -46,6 +45,8 @@ export default {
   },
   mounted() {
     this.initEditor();
+    // 手动监听窗口大小变化，解决Monaco自动调整大小时导致ResizeObserver loop limit exceeded错误
+    window.addEventListener('resize', this.resizeEditor);
     this.$emit("loaded");
   },
   props: {
@@ -55,7 +56,8 @@ export default {
     initEditor() {
       let monacoEditorPreferences = {
         value: "",
-        automaticLayout: true,
+        // 取消自动布局
+        automaticLayout: false,
         foldingStrategy: "indentation",
         autoClosingBrackets: true,
         tabSize: 2,
@@ -73,6 +75,9 @@ export default {
       this.listenEditorValue();
       this.bindKeys();
     },
+    resizeEditor() {
+      this.rawEditor().layout();
+    },
     loadTypes() {
       monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
         noSemanticValidation: true,
@@ -255,6 +260,7 @@ export default {
     },
   },
   beforeUnmount() {
+    window.removeEventListener('resize', this.resizeEditor);
     this.rawEditor().dispose();
   },
 };
@@ -267,6 +273,7 @@ export default {
   color: #535353;
   user-select: none;
 }
+
 .shortcut-key {
   background-color: #f3f4f6;
   border-radius: 0.25rem;
@@ -274,6 +281,7 @@ export default {
   padding-left: 0.25rem;
   padding-right: 0.25rem;
 }
+
 .body--dark .shortcut-key {
   background-color: #262626;
 }