From d73d43ed91f30957cfd202c51552ca40a19cef08 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Tue, 1 Jun 2021 23:21:04 +0800
Subject: [PATCH] fix(table): make sure the table width is correct, fix #593

---
 src/components/Table/src/BasicTable.vue |  2 ++
 src/components/Tinymce/src/Editor.vue   | 12 +++++++-----
 src/main.ts                             |  9 +++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index f5c7034e..bf6047e1 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -304,6 +304,8 @@
   @prefix-cls: ~'@{namespace}-basic-table';
 
   .@{prefix-cls} {
+    max-width: 100%;
+
     &-row__striped {
       td {
         background-color: @app-content-background;
diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue
index f3986765..72223f72 100644
--- a/src/components/Tinymce/src/Editor.vue
+++ b/src/components/Tinymce/src/Editor.vue
@@ -12,6 +12,7 @@
 </template>
 
 <script lang="ts">
+  import type { RawEditorSettings } from 'tinymce';
   import tinymce from 'tinymce/tinymce';
   import 'tinymce/themes/silver';
 
@@ -71,7 +72,7 @@
 
   const tinymceProps = {
     options: {
-      type: Object as PropType<any>,
+      type: Object as PropType<Partial<RawEditorSettings>>,
       default: {},
     },
     value: {
@@ -141,7 +142,7 @@
         return ['zh_CN', 'en'].includes(lang) ? lang : 'zh_CN';
       });
 
-      const initOptions = computed(() => {
+      const initOptions = computed((): RawEditorSettings => {
         const { height, options, toolbar, plugins } = props;
         const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
         return {
@@ -156,14 +157,15 @@
           default_link_target: '_blank',
           link_title: false,
           object_resizing: false,
+          auto_focus: true,
           skin: skinName.value,
           skin_url: publicPath + 'resource/tinymce/skins/ui/' + skinName.value,
           content_css:
             publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css',
           ...options,
-          setup: (editor: any) => {
+          setup: (editor) => {
             editorRef.value = editor;
-            editor.on('init', (e: Event) => initSetup(e));
+            editor.on('init', (e) => initSetup(e));
           },
         };
       });
@@ -210,7 +212,7 @@
         tinymce.init(unref(initOptions));
       }
 
-      function initSetup(e: Event) {
+      function initSetup(e) {
         const editor = unref(editorRef);
         if (!editor) {
           return;
diff --git a/src/main.ts b/src/main.ts
index f8442951..a60a3c4c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,20 +1,21 @@
 import '/@/design/index.less';
+
+// Register windi
 import 'virtual:windi.css';
+// Register icon sprite
+import 'virtual:svg-icons-register';
 
 import { createApp } from 'vue';
 import App from './App.vue';
 import { initAppConfigStore } from '/@/logics/initAppConfig';
+import { setupErrorHandle } from '/@/logics/error-handle';
 import router, { setupRouter } from '/@/router';
 import { setupRouterGuard } from '/@/router/guard';
 import { setupStore } from '/@/store';
-import { setupErrorHandle } from '/@/logics/error-handle';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
 
-// Register icon Sprite
-import 'virtual:svg-icons-register';
-
 // Do not introduce on-demand in local development?
 // In the local development for introduce on-demand, the number of browser requests will increase by about 20%.
 // Which may slow down the browser refresh.
-- 
GitLab