From 59ad82442bf213bac547940086ff4e14d0cd342a Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Sun, 6 Dec 2020 00:05:26 +0800
Subject: [PATCH] fix(table): fix table setting error

---
 CHANGELOG.zh_CN.md                                 |  1 +
 .../Table/src/components/TableSetting.vue          |  5 +++--
 src/router/constant.ts                             | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index d93ff714b..aaca09aa3 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -29,6 +29,7 @@
 - 修复表格 i18n 错误
 - 修复菜单图标大小不一致
 - 修复顶部菜单宽度计算问题
+- 修复表格 tabSetting 问题
 
 ## 2.0.0-rc.12 (2020-11-30)
 
diff --git a/src/components/Table/src/components/TableSetting.vue b/src/components/Table/src/components/TableSetting.vue
index 03c443a99..3fd5f8fcc 100644
--- a/src/components/Table/src/components/TableSetting.vue
+++ b/src/components/Table/src/components/TableSetting.vue
@@ -158,8 +158,9 @@
             value: (item.dataIndex || item.title) as string,
           });
         });
-
-        plainOptions.value = ret;
+        if (!plainOptions.value.length) {
+          plainOptions.value = ret;
+        }
         const checkList = table
           .getColumns()
           .map((item) => item.dataIndex || item.title) as string[];
diff --git a/src/router/constant.ts b/src/router/constant.ts
index a0025c7ab..b22260a9e 100644
--- a/src/router/constant.ts
+++ b/src/router/constant.ts
@@ -25,11 +25,23 @@ export const getParentLayout = (name: string) => {
 export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
   path: '/:path(.*)*',
   name: 'ErrorPage',
-  component: EXCEPTION_COMPONENT,
+  redirect: '/error/404',
+  component: LAYOUT,
   meta: {
     title: 'ErrorPage',
     hideBreadcrumb: true,
   },
+  children: [
+    {
+      path: '/error/404',
+      name: 'ErrorPage',
+      component: EXCEPTION_COMPONENT,
+      meta: {
+        title: 'ErrorPage',
+        hideBreadcrumb: true,
+      },
+    },
+  ],
 };
 
 export const REDIRECT_NAME = 'Redirect';