From 808e9a983afd2291e2d4eba4cd0ee42430905094 Mon Sep 17 00:00:00 2001
From: sc <shencheng@heronshn.com>
Date: Thu, 10 Feb 2022 14:01:02 +0800
Subject: [PATCH] =?UTF-8?q?:up:=20=E6=9B=B4=E6=96=B0=E4=B8=8A=E6=B8=B8?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=90=8C=E6=AD=A5element-plus2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  | 16 +++---
 src/components/scContextmenu/item.vue         |  6 +-
 src/components/scFilterBar/index.vue          |  8 +--
 src/components/scFormTable/index.vue          |  6 +-
 src/components/scIconSelect/index.vue         |  6 +-
 src/components/scTable/columnSetting.vue      |  2 +-
 src/components/scTable/index.vue              | 13 ++---
 src/components/scWorkflow/index.vue           |  6 +-
 src/components/scWorkflow/nodes/addNode.vue   |  5 +-
 src/components/scWorkflow/nodes/approver.vue  | 12 ++--
 src/components/scWorkflow/nodes/branch.vue    |  4 +-
 src/components/scWorkflow/select.vue          |  2 +-
 src/config/index.js                           |  4 +-
 src/layout/components/userbar.vue             |  4 +-
 src/main.js                                   |  2 +-
 src/style/fix.scss                            | 11 +++-
 src/style/theme/dark.scss                     |  7 ++-
 src/views/home/widgets/components/welcome.vue |  2 +-
 src/views/home/widgets/index.vue              |  2 +-
 src/views/home/work/components/myapp.vue      | 57 +++++++++----------
 src/views/setting/dic/index.vue               |  4 +-
 src/views/setting/log/index.vue               | 12 ++--
 src/views/setting/menu/index.vue              |  6 +-
 src/views/setting/task/index.vue              |  8 +--
 src/views/setting/task/logs.vue               |  2 +-
 src/views/setting/user/index.vue              |  2 +-
 src/views/template/calendar.vue               |  8 +--
 src/views/template/chartlist.vue              |  4 +-
 src/views/template/list/info.vue              | 12 ++--
 src/views/template/list/save.vue              |  2 +-
 src/views/template/server.vue                 |  4 +-
 src/views/userCenter/index.vue                |  4 +-
 src/views/vab/chart.vue                       | 14 ++---
 src/views/vab/filterBar.vue                   |  2 +-
 src/views/vab/formtable.vue                   |  2 +-
 src/views/vab/select.vue                      |  8 +--
 src/views/vab/tableselect.vue                 |  8 +--
 37 files changed, 141 insertions(+), 136 deletions(-)

diff --git a/package.json b/package.json
index 0be5d3b2..2b56aa05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "scui",
-	"version": "1.4.2",
+	"version": "1.5.0",
 	"private": true,
 	"scripts": {
 		"serve": "vue-cli-service serve",
@@ -10,29 +10,29 @@
 	"dependencies": {
 		"@element-plus/icons": "0.0.11",
 		"@tinymce/tinymce-vue": "4.0.5",
-		"axios": "0.24.0",
-		"core-js": "3.19.2",
+		"axios": "0.25.0",
+		"core-js": "3.21.0",
 		"cropperjs": "1.5.12",
 		"crypto-js": "4.1.1",
-		"echarts": "5.2.2",
-		"element-plus": "1.2.0-beta.6",
+		"echarts": "5.3.0",
+		"element-plus": "2.0.1",
 		"nprogress": "0.2.0",
 		"qrcodejs2": "0.0.2",
 		"sortablejs": "1.14.0",
 		"tinymce": "5.10.2",
-		"vue": "3.2.23",
+		"vue": "3.2.30",
 		"vue-i18n": "9.1.9",
 		"vue-router": "4.0.12",
 		"vuedraggable": "4.0.3",
 		"vuex": "4.0.2",
 		"xgplayer": "2.31.4",
-		"xgplayer-hls": "2.4.32-3"
+		"xgplayer-hls": "2.5.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "4.5.15",
 		"@vue/cli-plugin-eslint": "4.5.15",
 		"@vue/cli-service": "4.5.15",
-		"@vue/compiler-sfc": "3.2.23",
+		"@vue/compiler-sfc": "3.2.30",
 		"babel-eslint": "10.1.0",
 		"eslint": "6.8.0",
 		"eslint-plugin-vue": "7.19.1",
diff --git a/src/components/scContextmenu/item.vue b/src/components/scContextmenu/item.vue
index 7f090a83..aa5a44eb 100644
--- a/src/components/scContextmenu/item.vue
+++ b/src/components/scContextmenu/item.vue
@@ -1,17 +1,17 @@
 <!--
  * @Descripttion: scContextmenuItem组件
- * @version: 1.1
+ * @version: 1.2
  * @Author: sakuya
  * @Date: 2021年7月23日16:29:36
  * @LastEditors: sakuya
- * @LastEditTime: 2021年11月26日23:13:57
+ * @LastEditTime: 2022年2月8日15:51:07
 -->
 
 <template>
 	<hr v-if="divided">
 	<li :class="disabled?'disabled':''" @click.stop="liClick" @mouseenter="openSubmenu($event)" @mouseleave="closeSubmenu($event)">
 		<span class="title">
-			<el-icon class="sc-contextmenu__icon"><component :is="icon" /></el-icon>
+			<el-icon class="sc-contextmenu__icon"><component v-if="icon" :is="icon" /></el-icon>
 			{{title}}
 		</span>
 		<span class="sc-contextmenu__suffix">
diff --git a/src/components/scFilterBar/index.vue b/src/components/scFilterBar/index.vue
index b696cb32..136cb34b 100644
--- a/src/components/scFilterBar/index.vue
+++ b/src/components/scFilterBar/index.vue
@@ -1,17 +1,17 @@
 <!--
  * @Descripttion: 过滤器V2
- * @version: 2.3
+ * @version: 2.4
  * @Author: sakuya
  * @Date: 2021年7月30日14:48:41
  * @LastEditors: sakuya
- * @LastEditTime: 2022年1月13日13:47:20
+ * @LastEditTime: 2022年2月8日15:28:24
 -->
 
 <template>
 	<div class="sc-filterBar">
 		<slot :filterLength="filterObjLength" :openFilter="openFilter">
 			<el-badge :value="filterObjLength" type="danger" :hidden="filterObjLength<=0">
-				<el-button size="small" icon="el-icon-filter" @click="openFilter"></el-button>
+				<el-button icon="el-icon-filter" @click="openFilter"></el-button>
 			</el-badge>
 		</slot>
 
@@ -39,7 +39,7 @@
 										</colgroup>
 										<tr v-for="(item,index) in filter" :key="index">
 											<td>
-												<el-tag size="medium">{{index+1}}</el-tag>
+												<el-tag>{{index+1}}</el-tag>
 											</td>
 											<td>
 												<py-select v-model="item.field" :options="fields" placeholder="过滤字段" filterable @change="fieldChange(item)">
diff --git a/src/components/scFormTable/index.vue b/src/components/scFormTable/index.vue
index e72c7b74..2f292b3b 100644
--- a/src/components/scFormTable/index.vue
+++ b/src/components/scFormTable/index.vue
@@ -3,16 +3,16 @@
 		<el-table :data="data" ref="table" :key="toggleIndex" border stripe>
 			<el-table-column type="index" width="50" fixed="left">
 				<template #header>
-					<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="rowAdd"></el-button>
+					<el-button type="primary" icon="el-icon-plus" size="small" circle @click="rowAdd"></el-button>
 				</template>
 				<template #default="scope">
 					<div class="sc-form-table-handle">
 						<span>{{scope.$index + 1}}</span>
-						<el-button type="danger" icon="el-icon-delete" size="mini" plain circle @click="rowDel(scope.row, scope.$index)"></el-button>
+						<el-button type="danger" icon="el-icon-delete" size="small" plain circle @click="rowDel(scope.row, scope.$index)"></el-button>
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column label="" width="51" v-if="dragSort">
+			<el-table-column label="" width="58" v-if="dragSort">
 				<template #default>
 					<el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag>
 				</template>
diff --git a/src/components/scIconSelect/index.vue b/src/components/scIconSelect/index.vue
index 4a031f54..11429c99 100644
--- a/src/components/scIconSelect/index.vue
+++ b/src/components/scIconSelect/index.vue
@@ -1,10 +1,10 @@
 <!--
  * @Descripttion: 图标选择器组件
- * @version: 1.2
+ * @version: 1.3
  * @Author: sakuya
  * @Date: 2021年7月27日10:02:46
  * @LastEditors: sakuya
- * @LastEditTime: 2021年11月16日09:35:34
+ * @LastEditTime: 2022年2月8日15:47:13
 -->
 
 <template>
@@ -16,7 +16,7 @@
 			<el-tabs style="margin-top: -30px;">
 				<el-tab-pane  v-for="item in data" :key="item.name" lazy>
 					<template #label>
-						{{item.name}} <el-tag size="mini" type="info">{{item.icons.length}}</el-tag>
+						{{item.name}} <el-tag size="small" type="info">{{item.icons.length}}</el-tag>
 					</template>
 					<div class="sc-icon-select__list">
 						<el-scrollbar>
diff --git a/src/components/scTable/columnSetting.vue b/src/components/scTable/columnSetting.vue
index 033ecd85..ecaecf6e 100644
--- a/src/components/scTable/columnSetting.vue
+++ b/src/components/scTable/columnSetting.vue
@@ -19,7 +19,7 @@
 					</span>
 					<span class="name_b" :title="item.prop">{{ item.label }}</span>
 					<span class="width_b">
-						<el-input v-model="item.width" placeholder="auto" size="mini"></el-input>
+						<el-input v-model="item.width" placeholder="auto" size="small"></el-input>
 					</span>
 					<span class="sortable_b">
 						<el-switch v-model="item.sortable"></el-switch>
diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index 131943b2..dafda61a 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -1,10 +1,10 @@
 <!--
  * @Descripttion: 数据表格组件
- * @version: 1.6
+ * @version: 1.7
  * @Author: sakuya
  * @Date: 2021年11月29日21:51:15
  * @LastEditors: sakuya
- * @LastEditTime: 2021年12月12日12:49:50
+ * @LastEditTime: 2022年2月9日09:59:37
 -->
 
 <template>
@@ -45,11 +45,10 @@
 					</template>
 					<el-form label-width="80px" label-position="left">
 						<el-form-item label="表格尺寸">
-							<el-radio-group v-model="config.size" size="mini" @change="configSizeChange">
+							<el-radio-group v-model="config.size" size="small" @change="configSizeChange">
 								<el-radio-button label="large">大</el-radio-button>
-								<el-radio-button label="medium">中</el-radio-button>
-								<el-radio-button label="small">正常</el-radio-button>
-								<el-radio-button label="mini">小</el-radio-button>
+								<el-radio-button label="default">正常</el-radio-button>
+								<el-radio-button label="small">小</el-radio-button>
 							</el-radio-group>
 						</el-form-item>
 						<el-form-item label="样式">
@@ -78,7 +77,7 @@
 			params: { type: Object, default: () => ({}) },
 			data: { type: Object, default: () => {} },
 			height: { type: [String,Number], default: "100%" },
-			size: { type: String, default: "small" },
+			size: { type: String, default: "default" },
 			border: { type: Boolean, default: false },
 			stripe: { type: Boolean, default: false },
 			pageSize: { type: Number, default: config.pageSize },
diff --git a/src/components/scWorkflow/index.vue b/src/components/scWorkflow/index.vue
index c8fc86ec..30eaf568 100644
--- a/src/components/scWorkflow/index.vue
+++ b/src/components/scWorkflow/index.vue
@@ -1,10 +1,10 @@
 <!--
  * @Descripttion: 仿钉钉流程设计器
- * @version: 1.1
+ * @version: 1.2
  * @Author: sakuya
  * @Date: 2021年9月14日08:38:35
  * @LastEditors: sakuya
- * @LastEditTime: 2021年10月28日23:07:06
+ * @LastEditTime: 2022年2月9日16:48:49
 -->
 
 <template>
@@ -127,7 +127,7 @@
 		.node-wrap-box:hover:after {border: 1px solid #3296fa;box-shadow: 0 0 6px 0 rgba(50,150,250,.3);}
 	}
 
-	.tags-list {margin-top: 15px;}
+	.tags-list {margin-top: 15px;width: 100%;}
 	.add-node-popover-body {}
 	.add-node-popover-body li {display: inline-block;width: 80px;text-align: center;padding:10px 0;}
 	.add-node-popover-body li i {border: 1px solid var(--el-border-color-light);width:40px;height:40px;border-radius: 50%;text-align: center;line-height: 38px;font-size: 18px;cursor: pointer;}
diff --git a/src/components/scWorkflow/nodes/addNode.vue b/src/components/scWorkflow/nodes/addNode.vue
index 5c6648ad..ff693cf7 100644
--- a/src/components/scWorkflow/nodes/addNode.vue
+++ b/src/components/scWorkflow/nodes/addNode.vue
@@ -1,7 +1,7 @@
 <template>
 	 <div class="add-node-btn-box">
 	 	<div class="add-node-btn">
-			<el-popover placement="right-start" :width="270" v-model:visible="visible" :hide-after="0" :show-after="0">
+			<el-popover placement="right-start" :width="270" trigger="click" :hide-after="0" :show-after="0">
 				<template #reference>
 					<el-button type="primary" icon="el-icon-plus" circle></el-button>
 				</template>
@@ -33,7 +33,7 @@
 		},
 		data() {
 			return {
-				visible: false
+				
 			}
 		},
 		mounted() {
@@ -93,7 +93,6 @@
 
 				}
 				this.$emit("update:modelValue", node)
-				this.visible = false
 			}
 		}
 	}
diff --git a/src/components/scWorkflow/nodes/approver.vue b/src/components/scWorkflow/nodes/approver.vue
index 8b287cc7..effe9d1b 100644
--- a/src/components/scWorkflow/nodes/approver.vue
+++ b/src/components/scWorkflow/nodes/approver.vue
@@ -42,7 +42,7 @@
 						</el-form-item>
 
 						<el-form-item v-if="form.setType==2" label="指定主管">
-							发起人的第 <el-input-number v-model="form.examineLevel" :min="1" size="mini"/> 级主管
+							发起人的第  <el-input-number v-model="form.examineLevel" :min="1"/>  级主管
 						</el-form-item>
 
 						<el-form-item v-if="form.setType==3" label="选择角色">
@@ -64,7 +64,7 @@
 								<el-radio :label="0">直到最上层主管</el-radio>
 								<el-radio :label="1">自定义审批终点</el-radio>
 							</el-radio-group>
-							<p v-if="form.directorMode==1">直到发起人的第  <el-input-number v-model="form.directorLevel" :min="1" size="mini"/> 级主管</p>
+							<p v-if="form.directorMode==1">直到发起人的第  <el-input-number v-model="form.directorLevel" :min="1"/> 级主管</p>
 						</el-form-item>
 
 						<el-divider></el-divider>
@@ -73,7 +73,7 @@
 						</el-form-item>
 						<template v-if="form.termAuto">
 							<el-form-item label="审批期限（为 0 则不生效）">
-								<el-input-number v-model="form.term" :min="0" size="mini"/> 小时
+								<el-input-number v-model="form.term" :min="0"/> 小时
 							</el-form-item>
 							<el-form-item label="审批期限超时后执行">
 								<el-radio-group v-model="form.termMode">
@@ -85,9 +85,9 @@
 						<el-divider></el-divider>
 						<el-form-item label="多人审批时审批方式">
 							<el-radio-group v-model="form.examineMode">
-								<p><el-radio :label="1">按顺序依次审批</el-radio></p>
-								<p><el-radio :label="2">会签 (可同时审批，每个人必须审批通过)</el-radio></p>
-								<p><el-radio :label="3">或签 (有一人审批通过即可)</el-radio></p>
+								<p style="width: 100%;"><el-radio :label="1">按顺序依次审批</el-radio></p>
+								<p style="width: 100%;"><el-radio :label="2">会签 (可同时审批，每个人必须审批通过)</el-radio></p>
+								<p style="width: 100%;"><el-radio :label="3">或签 (有一人审批通过即可)</el-radio></p>
 							</el-radio-group>
 						</el-form-item>
 					</el-form>
diff --git a/src/components/scWorkflow/nodes/branch.vue b/src/components/scWorkflow/nodes/branch.vue
index d682e681..86bf1635 100644
--- a/src/components/scWorkflow/nodes/branch.vue
+++ b/src/components/scWorkflow/nodes/branch.vue
@@ -83,9 +83,9 @@
 										<el-input v-model="scope.row.value" placeholder="值"></el-input>
 									</template>
 								</el-table-column>
-								<el-table-column prop="value" label="移除" width="50">
+								<el-table-column prop="value" label="移除" width="55">
 									<template #default="scope">
-										<el-button size="mini" type="text" @click="deleteConditionList(scope.$index)">移除</el-button>
+										<el-button size="small" type="text" @click="deleteConditionList(scope.$index)">移除</el-button>
 									</template>
 								</el-table-column>
 							</el-table>
diff --git a/src/components/scWorkflow/select.vue b/src/components/scWorkflow/select.vue
index 93f8c037..be38097b 100644
--- a/src/components/scWorkflow/select.vue
+++ b/src/components/scWorkflow/select.vue
@@ -40,7 +40,7 @@
 									<label>{{item.name}}</label>
 								</span>
 								<span class="delete">
-									<el-button type="text" icon="el-icon-delete" circle size="mini" @click="deleteSelected(index)"></el-button>
+									<el-button type="text" icon="el-icon-delete" circle size="small" @click="deleteSelected(index)"></el-button>
 								</span>
 							</li>
 						</el-scrollbar>
diff --git a/src/config/index.js b/src/config/index.js
index b06d02c8..b41222c2 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -6,10 +6,10 @@ const DEFAULT_CONFIG = {
 	DASHBOARD_URL: "/dashboard",
 
 	//版本号
-	APP_VER: "1.4.2",
+	APP_VER: "1.5.0",
 
 	//内核版本号
-	CORE_VER: "1.4.2",
+	CORE_VER: "1.5.0",
 
 	//接口地址
 	API_URL: "/api",
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index b25d101f..3b2fe17d 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -33,8 +33,8 @@
 						</el-scrollbar>
 					</el-main>
 					<el-footer>
-						<el-button type="primary" size="small">消息中心</el-button>
-						<el-button size="small" @click="markRead">全部设为已读</el-button>
+						<el-button type="primary">消息中心</el-button>
+						<el-button @click="markRead">全部设为已读</el-button>
 					</el-footer>
 				</el-container>
 			</el-drawer>
diff --git a/src/main.js b/src/main.js
index 77f3e35e..212abc76 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,7 @@ const app = createApp(App);
 
 app.use(store);
 app.use(router);
-app.use(ElementPlus, {size: 'small'});
+app.use(ElementPlus, {size: 'default'});
 app.use(i18n);
 app.use(scui);
 
diff --git a/src/style/fix.scss b/src/style/fix.scss
index d5e5cd3c..a5d94213 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -1,7 +1,7 @@
 /* 覆盖element-plus样式 */
 .el-menu {border: none!important;}
 .el-menu .el-menu-item a {color: inherit;text-decoration: none;display: block;width:100%;height:100%;position: absolute;top:0px;left:0px;}
-.el-form-item-msg {font-size: 12px;color: #999;clear: both;}
+.el-form-item-msg {font-size: 12px;color: #999;clear: both;width: 100%;}
 .el-container {height: 100%;}
 .el-aside {border-right: 1px solid #e6e6e6;background: #fff;}
 .el-header {background: #fff;border-bottom: 1px solid #e6e6e6;padding:13px 15px;display: flex;justify-content: space-between;align-items: center;}
@@ -33,7 +33,14 @@
 .el-table .el-table__body-wrapper {background: #f6f8f9;}
 .el-col .el-card {margin-bottom: 15px;}
 .el-main {flex-basis: 100%;}
-.el-main > .scTable .el-table--border {border: 0;}
+.el-main > .scTable .el-table--border::before {display: none;}
+.el-main > .scTable .el-table--border::after {display: none;}
+.el-main > .scTable .el-table--border .el-table__inner-wrapper::after {display: none;}
+.el-main > .scTable .el-table__border-left-patch {display: none;}
+.el-main > .scTable .el-table--border .el-table__inner-wrapper tr:first-child td:first-child {border-left: 0;}
+.el-main > .scTable .el-table--border .el-table__inner-wrapper tr:first-child th:first-child {border-left: 0;}
+.el-table.el-table--large {font-size: 14px;}
+.el-table {font-size: 12px;}
 
 /* 动态值 */
 .el-button--default:active, .el-button--default.is-plain:active {border-color: var(--el-color-primary-darken-1, #0d84ff);color: var(--el-color-primary-darken-1, #0d84ff);}
diff --git a/src/style/theme/dark.scss b/src/style/theme/dark.scss
index 9462aef9..89079093 100644
--- a/src/style/theme/dark.scss
+++ b/src/style/theme/dark.scss
@@ -154,6 +154,11 @@
 	.el-table tr {background: #2e2e2e;}
 	.el-table--striped .el-table__body tr.el-table__row--striped td {background: #2b2b2b;}
 	.el-table .el-table__body-wrapper {background: $--background;}
+	.el-table__header-wrapper tr th.el-table-fixed-column--right {background: var(--el-table-header-bg-color);}
+	.el-table__body-wrapper tr td.el-table-fixed-column--right {background: #2e2e2e;}
+	.el-table__header-wrapper tr th.el-table-fixed-column--left {background: var(--el-table-header-bg-color);}
+	.el-table__body-wrapper tr td.el-table-fixed-column--left {background: #2e2e2e;}
+	.el-table__body tr.hover-row>td.el-table__cell {background-color: var(--el-table-row-hover-bg-color);}
 
 	.el-menu {background: $--card-background;}
 	.el-menu-item {color: $--text-color;}
@@ -218,7 +223,7 @@
 
 	.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {background: #383838;}
 	.el-pagination.is-background .el-pager li:not(.disabled).active {color: #fff;}
-	
+
 	.el-descriptions__body {background: none;}
 
 	.el-alert--info.is-light {background: #383838;}
diff --git a/src/views/home/widgets/components/welcome.vue b/src/views/home/widgets/components/welcome.vue
index 0889ab44..b1bf5368 100644
--- a/src/views/home/widgets/components/welcome.vue
+++ b/src/views/home/widgets/components/welcome.vue
@@ -20,7 +20,7 @@
 				</div>
 			</div>
 			<div class="actions">
-				<el-button type="primary" icon="el-icon-check" size="medium" @click="godoc">文档</el-button>
+				<el-button type="primary" icon="el-icon-check" size="large" @click="godoc">文档</el-button>
 			</div>
 		</div>
 	</el-card>
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index 998d146f..713d204e 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -82,7 +82,7 @@
 					</div>
 				</el-main>
 				<el-footer style="height:51px;">
-					<el-button size="mini" @click="backDefaul()">恢复默认</el-button>
+					<el-button size="small" @click="backDefaul()">恢复默认</el-button>
 				</el-footer>
 			</el-container>
 		</div>
diff --git a/src/views/home/work/components/myapp.vue b/src/views/home/work/components/myapp.vue
index 486a0223..57382cc9 100644
--- a/src/views/home/work/components/myapp.vue
+++ b/src/views/home/work/components/myapp.vue
@@ -19,37 +19,32 @@
 		</ul>
 
 		<el-drawer title="添加应用" v-model="modsDrawer" :size="570" destroy-on-close>
-			<el-container>
-				<el-main class="nopadding">
-					<el-scrollbar>
-						<div class="setMods">
-							<h4>我的常用 ( {{myMods.length}} )</h4>
-							<draggable tag="ul" v-model="myMods" animation="200" item-key="path" group="people">
-								<template #item="{ element }">
-									<li :style="{background:element.meta.color||'#909399'}">
-										<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
-										<p>{{element.meta.title}}</p>
-									</li>
-								</template>
-							</draggable>
-						</div>
-						<div class="setMods">
-							<h4>全部应用 ( {{filterMods.length}} )</h4>
-							<draggable tag="ul" v-model="filterMods" animation="200" item-key="path" :sort="false" group="people">
-								<template #item="{ element }">
-									<li :style="{background:element.meta.color||'#909399'}">
-										<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
-										<p>{{element.meta.title}}</p>
-									</li>
-								</template>
-							</draggable>
-						</div>
-					</el-scrollbar>
-				</el-main>
-				<el-footer>
-					<el-button type="primary" size="small" @click="saveMods">保存</el-button>
-				</el-footer>
-			</el-container>
+			<div class="setMods">
+				<h4>我的常用 ( {{myMods.length}} )</h4>
+				<draggable tag="ul" v-model="myMods" animation="200" item-key="path" group="people">
+					<template #item="{ element }">
+						<li :style="{background:element.meta.color||'#909399'}">
+							<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
+							<p>{{element.meta.title}}</p>
+						</li>
+					</template>
+				</draggable>
+			</div>
+			<div class="setMods">
+				<h4>全部应用 ( {{filterMods.length}} )</h4>
+				<draggable tag="ul" v-model="filterMods" animation="200" item-key="path" :sort="false" group="people">
+					<template #item="{ element }">
+						<li :style="{background:element.meta.color||'#909399'}">
+							<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
+							<p>{{element.meta.title}}</p>
+						</li>
+					</template>
+				</draggable>
+			</div>
+			<template #footer>
+				<el-button @click="modsDrawer=false">取消</el-button>
+				<el-button type="primary" @click="saveMods">保存</el-button>
+			</template>
 		</el-drawer>
 	</div>
 </template>
diff --git a/src/views/setting/dic/index.vue b/src/views/setting/dic/index.vue
index d9fb9e70..d8e64d3d 100644
--- a/src/views/setting/dic/index.vue
+++ b/src/views/setting/dic/index.vue
@@ -20,7 +20,7 @@
 					</el-tree>
 				</el-main>
 				<el-footer style="height:51px;">
-					<el-button type="primary" size="mini" icon="el-icon-plus" style="width: 100%;" @click="addDic">字典分类</el-button>
+					<el-button type="primary" size="small" icon="el-icon-plus" style="width: 100%;" @click="addDic">字典分类</el-button>
 				</el-footer>
 			</el-container>
 		</el-aside>
@@ -34,7 +34,7 @@
 			<el-main class="nopadding">
 				<scTable ref="table" :apiObj="listApi" row-key="id" :params="listApiParams" @selection-change="selectionChange" stripe :paginationLayout="'prev, pager, next'">
 					<el-table-column type="selection" width="50"></el-table-column>
-					<el-table-column label="" width="50">
+					<el-table-column label="" width="60">
 						<template #default>
 							<el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag>
 						</template>
diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue
index 9a2a94d7..5863c8ed 100644
--- a/src/views/setting/log/index.vue
+++ b/src/views/setting/log/index.vue
@@ -9,7 +9,7 @@
 				<el-container>
 					<el-header>
 						<div class="left-panel">
-							<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini"></el-date-picker>
+							<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 						</div>
 						<div class="right-panel">
 
@@ -20,11 +20,11 @@
 					</el-header>
 					<el-main class="nopadding">
 						<scTable ref="table" :apiObj="apiObj" stripe highlightCurrentRow @row-click="rowClick">
-							<el-table-column label="级别" prop="level" width="50">
+							<el-table-column label="级别" prop="level" width="60">
 								<template #default="scope">
-									<el-icon v-if="scope.row.level=='error'" style="color: #F56C6C;font-size: 14px;"><el-icon-circle-close-filled /></el-icon>
-									<el-icon v-if="scope.row.level=='warn'" style="color: #E6A23C;font-size: 14px;"><el-icon-warning-filled /></el-icon>
-									<el-icon v-if="scope.row.level=='info'" style="color: #409EFF;font-size: 14px;"><el-icon-info-filled /></el-icon>
+									<el-icon v-if="scope.row.level=='error'" style="color: #F56C6C;"><el-icon-circle-close-filled /></el-icon>
+									<el-icon v-if="scope.row.level=='warn'" style="color: #E6A23C;"><el-icon-warning-filled /></el-icon>
+									<el-icon v-if="scope.row.level=='info'" style="color: #409EFF;"><el-icon-info-filled /></el-icon>
 								</template>
 							</el-table-column>
 							<el-table-column label="ID" prop="id" width="180"></el-table-column>
@@ -33,7 +33,7 @@
 							<el-table-column label="请求方法" prop="type" width="150"></el-table-column>
 							<el-table-column label="用户" prop="user" width="150"></el-table-column>
 							<el-table-column label="客户端IP" prop="cip" width="150"></el-table-column>
-							<el-table-column label="日志时间" prop="time" width="150"></el-table-column>
+							<el-table-column label="日志时间" prop="time" width="170"></el-table-column>
 						</scTable>
 					</el-main>
 				</el-container>
diff --git a/src/views/setting/menu/index.vue b/src/views/setting/menu/index.vue
index e70d0fb2..992598ee 100644
--- a/src/views/setting/menu/index.vue
+++ b/src/views/setting/menu/index.vue
@@ -22,8 +22,8 @@
 					</el-tree>
 				</el-main>
 				<el-footer style="height:51px;">
-					<el-button type="primary" size="mini" icon="el-icon-plus" @click="add()"></el-button>
-					<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="delMenu"></el-button>
+					<el-button type="primary" size="small" icon="el-icon-plus" @click="add()"></el-button>
+					<el-button type="danger" size="small" plain icon="el-icon-delete" @click="delMenu"></el-button>
 				</el-footer>
 			</el-container>
 		</el-aside>
@@ -157,7 +157,7 @@
 	.custom-tree-node .label {display: flex;align-items: center;;height: 100%;}
 	.custom-tree-node .label .el-tag {margin-left: 5px;}
 	.custom-tree-node .do {display: none;}
-	.custom-tree-node .do i {margin-left:5px;color: #999;padding:5px;}
+	.custom-tree-node .do i {margin-left:5px;color: #999;}
 	.custom-tree-node .do i:hover {color: #333;}
 
 	.custom-tree-node:hover .do {display: inline-block;}
diff --git a/src/views/setting/task/index.vue b/src/views/setting/task/index.vue
index 0fd02a2c..2210de03 100644
--- a/src/views/setting/task/index.vue
+++ b/src/views/setting/task/index.vue
@@ -25,17 +25,17 @@
 					</ul>
 					<div class="bottom">
 						<div class="state">
-							<el-tag v-if="item.state=='1'" size="mini">准备就绪</el-tag>
-							<el-tag v-if="item.state=='-1'" size="mini" type="info">停用</el-tag>
+							<el-tag v-if="item.state=='1'" size="small">准备就绪</el-tag>
+							<el-tag v-if="item.state=='-1'" size="small" type="info">停用</el-tag>
 						</div>
 						<div class="handler">
 							<el-popconfirm title="确定立即执行吗？" @confirm="run(item)">
 								<template #reference>
-									<el-button type="primary" icon="el-icon-caret-right" size="mini" circle></el-button>
+									<el-button type="primary" icon="el-icon-caret-right" circle></el-button>
 								</template>
 							</el-popconfirm>
 							<el-dropdown trigger="click">
-								<el-button type="primary" icon="el-icon-more" size="mini" circle plain></el-button>
+								<el-button type="primary" icon="el-icon-more" circle plain></el-button>
 								<template #dropdown>
 									<el-dropdown-menu>
 										<el-dropdown-item @click="edit(item)">编辑</el-dropdown-item>
diff --git a/src/views/setting/task/logs.vue b/src/views/setting/task/logs.vue
index fa363411..26979832 100644
--- a/src/views/setting/task/logs.vue
+++ b/src/views/setting/task/logs.vue
@@ -20,7 +20,7 @@
 				</el-table-column>
 				<el-table-column label="执行日志" prop="logs" width="100" fixed="right">
 					<template #default="scope">
-						<el-button size="mini" @click="show(scope.row)" type="text">日志</el-button>
+						<el-button size="small" @click="show(scope.row)" type="text">日志</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index 2b1d4438..49842e4c 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -37,7 +37,7 @@
 						<el-table-column label="登录账号" prop="userName" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column>
 						<el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column>
 						<el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column>
-						<el-table-column label="加入时间" prop="date" width="150" sortable='custom'></el-table-column>
+						<el-table-column label="加入时间" prop="date" width="170" sortable='custom'></el-table-column>
 						<el-table-column label="操作" fixed="right" align="right" width="140">
 							<template #default="scope">
 								<el-button type="text" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
diff --git a/src/views/template/calendar.vue b/src/views/template/calendar.vue
index 5a0b7d54..f7f4d8d4 100644
--- a/src/views/template/calendar.vue
+++ b/src/views/template/calendar.vue
@@ -25,10 +25,10 @@
 								<h2>{{task.title}}</h2>
 								<div class="task-bottom">
 									<div class="tags">
-										<el-tag type="info" size="mini">#{{task.id}}</el-tag>
-										<el-tag v-if="task.state=='open'" type="info" size="mini">{{task.state}}</el-tag>
-										<el-tag v-if="task.state=='complete'" type="success" size="mini">{{task.state}}</el-tag>
-										<el-tag v-if="task.state=='timeout'" type="danger" size="mini">{{task.state}}</el-tag>
+										<el-tag type="info" size="small">#{{task.id}}</el-tag>
+										<el-tag v-if="task.state=='open'" type="info" size="small">{{task.state}}</el-tag>
+										<el-tag v-if="task.state=='complete'" type="success" size="small">{{task.state}}</el-tag>
+										<el-tag v-if="task.state=='timeout'" type="danger" size="small">{{task.state}}</el-tag>
 									</div>
 									<el-avatar :size="20" :src="task.avatar"></el-avatar>
 								</div>
diff --git a/src/views/template/chartlist.vue b/src/views/template/chartlist.vue
index 20a82136..f3304a4e 100644
--- a/src/views/template/chartlist.vue
+++ b/src/views/template/chartlist.vue
@@ -2,13 +2,13 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-radio-group v-model="dateType" size="mini" style="margin-right: 15px;">
+				<el-radio-group v-model="dateType" style="margin-right: 15px;">
 					<el-radio-button label="今天"></el-radio-button>
 					<el-radio-button label="昨天"></el-radio-button>
 					<el-radio-button label="最近7天"></el-radio-button>
 					<el-radio-button label="最近30天"></el-radio-button>
 				</el-radio-group>
-				<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini"></el-date-picker>
+				<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 			</div>
 		</el-header>
 		<el-main>
diff --git a/src/views/template/list/info.vue b/src/views/template/list/info.vue
index 93e5beb6..0e26b2dc 100644
--- a/src/views/template/list/info.vue
+++ b/src/views/template/list/info.vue
@@ -11,11 +11,11 @@
 
 		<div class="make">
 			<div class="make-left">
-				<el-button type="primary" size="small">主要操作</el-button>
-				<el-button size="small">次要操作</el-button>
-				<el-button size="small">次要操作</el-button>
+				<el-button type="primary">主要操作</el-button>
+				<el-button>次要操作</el-button>
+				<el-button>次要操作</el-button>
 				<el-dropdown>
-					<el-button size="small" icon="el-icon-arrow-down"></el-button>
+					<el-button icon="el-icon-arrow-down"></el-button>
 					<template #dropdown>
 						<el-dropdown-menu>
 							<el-dropdown-item>更改状态</el-dropdown-item>
@@ -40,8 +40,8 @@
 					    <el-descriptions-item label="ID">5001</el-descriptions-item>
 					    <el-descriptions-item label="名称">scEcharts</el-descriptions-item>
 						<el-descriptions-item label="参与者">
-							<el-tag size="mini">Sakuya</el-tag>
-							<el-tag size="mini">Lolowan</el-tag>
+							<el-tag size="small">Sakuya</el-tag>
+							<el-tag size="small">Lolowan</el-tag>
 						</el-descriptions-item>
 					    <el-descriptions-item label="类型">数据</el-descriptions-item>
 					    <el-descriptions-item label="创建时间">2010-10-10</el-descriptions-item>
diff --git a/src/views/template/list/save.vue b/src/views/template/list/save.vue
index 8f38b3f0..9628cf30 100644
--- a/src/views/template/list/save.vue
+++ b/src/views/template/list/save.vue
@@ -35,7 +35,7 @@
 					<el-input v-model="form.name" placeholder="请输入名称" clearable></el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="primary" size="medium" @click="save">保 存</el-button>
+					<el-button type="primary" @click="save">保 存</el-button>
 				</el-form-item>
 			</el-form>
 		</el-card>
diff --git a/src/views/template/server.vue b/src/views/template/server.vue
index e4cd0c9b..2e9ecf5e 100644
--- a/src/views/template/server.vue
+++ b/src/views/template/server.vue
@@ -146,7 +146,7 @@
 								<el-table-column label="事件" prop="title" width="150"></el-table-column>
 								<el-table-column label="等级" prop="type" width="150"></el-table-column>
 								<el-table-column label="通知" prop="push" ></el-table-column>
-								<el-table-column label="触发时间" prop="time" width="150"></el-table-column>
+								<el-table-column label="触发时间" prop="time" width="180"></el-table-column>
 							</scTable>
 						</el-card>
 						<el-card shadow="never" header="Rule" style="margin-top: 15px;">
@@ -158,7 +158,7 @@
 								<el-table-column></el-table-column>
 								<el-table-column label="操作" width="150" align="right">
 									<el-dropdown>
-										<el-button type="text" size="mini" icon="el-icon-more"></el-button>
+										<el-button type="text" size="small" icon="el-icon-more"></el-button>
 										<template #dropdown>
 											<el-dropdown-menu>
 												<el-dropdown-item>编辑</el-dropdown-item>
diff --git a/src/views/userCenter/index.vue b/src/views/userCenter/index.vue
index 863a0f10..5e87d851 100644
--- a/src/views/userCenter/index.vue
+++ b/src/views/userCenter/index.vue
@@ -8,7 +8,7 @@
 							<el-avatar :size="80" src="img/avatar.jpg"></el-avatar>
 							<h2>{{ form.name||'-' }}</h2>
 							<p>{{ form.about||'无签名' }}</p>
-							<el-button type="primary" round icon="el-icon-collection-tag" size="medium">Administrator</el-button>
+							<el-button type="primary" round icon="el-icon-collection-tag" size="large">Administrator</el-button>
 						</div>
 						<div class="user-info-main">
 							<ul>
@@ -42,7 +42,7 @@
 								<el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp" placement="top">
 									<div class="activity-item">
 										<el-avatar class="avatar" :size="24" src="img/avatar.jpg"></el-avatar>
-										<label>{{activity.operate}}</label><el-tag v-if="activity.mod" size="mini">{{activity.mod}}</el-tag>{{activity.describe}}
+										<label>{{activity.operate}}</label><el-tag v-if="activity.mod">{{activity.mod}}</el-tag>{{activity.describe}}
 									</div>
 								</el-timeline-item>
 							</el-timeline>
diff --git a/src/views/vab/chart.vue b/src/views/vab/chart.vue
index 797d8d2c..c7f79a9d 100644
--- a/src/views/vab/chart.vue
+++ b/src/views/vab/chart.vue
@@ -146,12 +146,12 @@
 						radius: 100,
 						center: ['50%', '55%'],
 						indicator: [
-							{ name: '销售', max: 6500},
-							{ name: '管理', max: 16000},
-							{ name: '信息技术', max: 30000},
-							{ name: '客服', max: 38000},
-							{ name: '研发', max: 52000},
-							{ name: '市场', max: 25000}
+							{ name: '销售', max: 100},
+							{ name: '管理', max: 100},
+							{ name: '信息技术', max: 100},
+							{ name: '客服', max: 100},
+							{ name: '研发', max: 100},
+							{ name: '市场', max: 100}
 						]
 					},
 					series: [{
@@ -160,7 +160,7 @@
 						areaStyle: {},
 						data: [
 							{
-								value: [4200, 3000, 20000, 35000, 50000, 18000],
+								value: [74, 90, 95, 65, 80, 31],
 							}
 						]
 					}]
diff --git a/src/views/vab/filterBar.vue b/src/views/vab/filterBar.vue
index 21ef6cda..de4fa270 100644
--- a/src/views/vab/filterBar.vue
+++ b/src/views/vab/filterBar.vue
@@ -4,7 +4,7 @@
 			<scFilterBar filterName="filterName" :options="options" @filterChange="change">
 				<template #default="{filterLength, openFilter}">
 					<el-badge :value="filterLength" type="danger" :hidden="filterLength<=0">
-						<el-button size="small" icon="el-icon-filter" @click="openFilter"></el-button>
+						<el-button icon="el-icon-filter" @click="openFilter"></el-button>
 					</el-badge>
 				</template>
 			</scFilterBar>
diff --git a/src/views/vab/formtable.vue b/src/views/vab/formtable.vue
index 67ee63f7..c35b3259 100644
--- a/src/views/vab/formtable.vue
+++ b/src/views/vab/formtable.vue
@@ -26,7 +26,7 @@
 								<el-input v-model="scope.row.val" placeholder="请输入内容"></el-input>
 							</template>
 						</el-table-column>
-						<el-table-column prop="open" label="checked" width="80" align="center">
+						<el-table-column prop="open" label="checked" width="85" align="center">
 							<template #default="scope">
 								<el-checkbox v-model="scope.row.checked"></el-checkbox>
 							</template>
diff --git a/src/views/vab/select.vue b/src/views/vab/select.vue
index 524537fc..bdd099d0 100644
--- a/src/views/vab/select.vue
+++ b/src/views/vab/select.vue
@@ -14,22 +14,22 @@
 		<el-row :gutter="15">
 			<el-col :lg="12">
 				<el-card shadow="never" header="异步单选">
-					<sc-select v-model="value" :apiObj="$API.system.dic.get" clearable filterable></sc-select>
+					<sc-select v-model="value" :apiObj="$API.system.dic.get" clearable filterable style="width: 100%;"></sc-select>
 				</el-card>
 			</el-col>
 			<el-col :lg="12">
 				<el-card shadow="never" header="异步多选">
-					<sc-select v-model="value2" :apiObj="$API.system.dic.get" clearable filterable multiple></sc-select>
+					<sc-select v-model="value2" :apiObj="$API.system.dic.get" clearable filterable multiple style="width: 100%;"></sc-select>
 				</el-card>
 			</el-col>
 			<el-col :lg="12">
 				<el-card shadow="never" header="字典选择器">
-					<sc-select v-model="value3" dic="notice" clearable filterable></sc-select>
+					<sc-select v-model="value3" dic="notice" clearable filterable style="width: 100%;"></sc-select>
 				</el-card>
 			</el-col>
 			<el-col :lg="12">
 				<el-card shadow="never" header="自定义模板">
-					<sc-select v-model="value4" dic="notice" clearable filterable placeholder="自定义placeholder">
+					<sc-select v-model="value4" dic="notice" clearable filterable placeholder="自定义placeholder" style="width: 100%;">
 						<template #option="{data}">
 							<span style="float: left">{{ data.label }}</span>
 							<span style="float: right; color: #999; font-size: 13px">{{ data.value }}</span>
diff --git a/src/views/vab/tableselect.vue b/src/views/vab/tableselect.vue
index 7308be27..bf357ff9 100644
--- a/src/views/vab/tableselect.vue
+++ b/src/views/vab/tableselect.vue
@@ -12,7 +12,7 @@
 		<el-alert title="select深度改造的表格选择器, 非常适用于大量数据选择的场景" type="success" style="margin-bottom:20px;"></el-alert>
 		<el-card shadow="never" header="单选">
 			<sc-table-select v-model="value2" :apiObj="apiObj" :params="params" :table-width="600" :props="props">
-				<el-table-column prop="id" label="ID" width="150"></el-table-column>
+				<el-table-column prop="id" label="ID" width="180"></el-table-column>
 				<el-table-column prop="user" label="姓名"></el-table-column>
 			</sc-table-select>
 		</el-card>
@@ -22,13 +22,13 @@
 				<template #header="{form, submit}">
 					<el-form :inline="true" :model="form">
 						<el-form-item>
-							<el-select v-model="form.sex" placeholder="性别" clearable :popper-append-to-body="false">
+							<el-select v-model="form.sex" placeholder="性别" clearable :teleported="false">
 								<el-option label="男" value="1"></el-option>
 								<el-option label="女" value="2"></el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item>
-							<el-date-picker v-model="form.date" value-format="YYYY-MM-DD" type="date" placeholder="注册时间" :append-to-body="false"></el-date-picker>
+							<el-date-picker v-model="form.date" value-format="YYYY-MM-DD" type="date" placeholder="注册时间" :teleported="false"></el-date-picker>
 						</el-form-item>
 						<el-form-item>
 							<el-button type="primary" @click="submit">查询</el-button>
@@ -36,7 +36,7 @@
 					</el-form>
 					<el-alert title="自定义FORM插糟 传递了form对象和提交方法" type="info" />
 				</template>
-				<el-table-column prop="id" label="ID" width="150"></el-table-column>
+				<el-table-column prop="id" label="ID" width="180"></el-table-column>
 				<el-table-column prop="user" label="姓名" width="100"></el-table-column>
 				<el-table-column prop="cip" label="最后请求IP" width="150"></el-table-column>
 				<el-table-column prop="time" label="注册时间"></el-table-column>