From 1486beb52cf2553ebc026ed5941a8a865c483a96 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Fri, 13 May 2022 14:52:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7element-plus2.2.0?=
 =?UTF-8?q?=E5=90=8E,button=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/layouts/sidebar/Sidebar.vue |  4 ++--
 packages/editor/src/theme/props-panel.scss      |  4 ++++
 packages/form/src/containers/Table.vue          | 12 ++++++++++--
 packages/form/src/fields/Link.vue               |  2 +-
 packages/table/src/ActionsColumn.vue            | 11 +++++++----
 packages/table/src/PopoverColumn.vue            |  2 +-
 packages/table/src/Table.vue                    |  3 ---
 packages/table/src/TextColumn.vue               |  4 ++--
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/editor/src/layouts/sidebar/Sidebar.vue b/packages/editor/src/layouts/sidebar/Sidebar.vue
index bd66975a..4872353f 100644
--- a/packages/editor/src/layouts/sidebar/Sidebar.vue
+++ b/packages/editor/src/layouts/sidebar/Sidebar.vue
@@ -2,10 +2,10 @@
   <el-tabs v-if="data.type === 'tabs'" class="m-editor-sidebar" v-model="activeTabName" type="card" tab-position="left">
     <el-tab-pane v-for="item in items" :key="item.text" :name="item.text">
       <template #label>
-        <span>
+        <div :key="item.text">
           <m-icon v-if="item.icon" :icon="item.icon"></m-icon>
           <div v-if="item.text" class="magic-editor-tab-panel-title">{{ item.text }}</div>
-        </span>
+        </div>
       </template>
 
       <component :is="item.component" v-bind="item.props || {}" v-on="item.listeners || {}">
diff --git a/packages/editor/src/theme/props-panel.scss b/packages/editor/src/theme/props-panel.scss
index a8cd3ef5..9540b76b 100644
--- a/packages/editor/src/theme/props-panel.scss
+++ b/packages/editor/src/theme/props-panel.scss
@@ -14,6 +14,10 @@
   .el-tabs__item {
     font-size: 12px;
   }
+
+  .el-input__wrapper {
+    border-radius: 0;
+  }
 }
 
 .m-editor-props-panel-popper {
diff --git a/packages/form/src/containers/Table.vue b/packages/form/src/containers/Table.vue
index bcd5f62d..7314c0ff 100644
--- a/packages/form/src/containers/Table.vue
+++ b/packages/form/src/containers/Table.vue
@@ -43,6 +43,7 @@
                 <el-button
                   plain
                   size="small"
+                  type="primary"
                   :icon="ArrowUp"
                   text
                   @click="upHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
@@ -57,6 +58,7 @@
                 <el-button
                   plain
                   size="small"
+                  type="primary"
                   :icon="ArrowDown"
                   text
                   @click="downHandler(scope.$index + 1 + pagecontext * pagesize - 1)"
@@ -107,10 +109,16 @@
       </el-tooltip>
       <slot></slot>
       <el-button v-if="addable" size="small" type="primary" plain @click="newHandler()">添加</el-button> &nbsp;
-      <el-button :icon="Grid" size="small" @click="toggleMode" v-if="enableToggleMode && !isFullscreen"
+      <el-button :icon="Grid" size="small" type="primary" @click="toggleMode" v-if="enableToggleMode && !isFullscreen"
         >展开配置</el-button
       >
-      <el-button :icon="FullScreen" size="small" @click="toggleFullscreen" v-if="config.enableFullscreen !== false">
+      <el-button
+        :icon="FullScreen"
+        size="small"
+        type="primary"
+        @click="toggleFullscreen"
+        v-if="config.enableFullscreen !== false"
+      >
         {{ isFullscreen ? '退出全屏' : '全屏编辑' }}
       </el-button>
       <el-upload
diff --git a/packages/form/src/fields/Link.vue b/packages/form/src/fields/Link.vue
index bbcd2373..e635e4c2 100644
--- a/packages/form/src/fields/Link.vue
+++ b/packages/form/src/fields/Link.vue
@@ -2,7 +2,7 @@
   <a v-if="config.href && !disabled" target="_blank" :href="href" :style="config.css || {}">{{ displayText }}</a>
   <span v-else-if="config.href && disabled" :style="config.disabledCss || {}">{{ displayText }}</span>
   <div v-else class="m-fields-link">
-    <el-button text @click="editHandler">点击编辑</el-button>
+    <el-button text type="primary" @click="editHandler">点击编辑</el-button>
     <m-form-dialog
       ref="editor"
       :title="config.formTitle || '编辑扩展配置'"
diff --git a/packages/table/src/ActionsColumn.vue b/packages/table/src/ActionsColumn.vue
index c4aee7f7..267034eb 100644
--- a/packages/table/src/ActionsColumn.vue
+++ b/packages/table/src/ActionsColumn.vue
@@ -7,6 +7,7 @@
         v-html="action.text"
         class="action-btn"
         text
+        type="primary"
         size="small"
         :key="actionIndex"
         @click="actionHandler(action, scope.row, scope.$index)"
@@ -15,6 +16,7 @@
         class="action-btn"
         v-show="editState[scope.$index]"
         text
+        type="primary"
         size="small"
         @click="save(scope.$index, config)"
         >保存</el-button
@@ -23,6 +25,7 @@
         class="action-btn"
         v-show="editState[scope.$index]"
         text
+        type="primary"
         size="small"
         @click="editState[scope.$index] = undefined"
         >取消</el-button
@@ -72,9 +75,9 @@ const display = (fuc: boolean | Function | undefined, row: any) => {
   return true;
 };
 
-const success = (msg: string, action: ColumnActionConfig) => {
+const success = (msg: string, action: ColumnActionConfig, row: any) => {
   ElMessage.success(msg);
-  action.after?.();
+  action.after?.(row);
 };
 
 const error = (msg: string) => ElMessage.error(msg);
@@ -89,7 +92,7 @@ const deleteAction = async (action: ColumnActionConfig, row: any) => {
   const res = await action.handler?.(row);
 
   if (res.ret === 0) {
-    success('删除成功!', action);
+    success('删除成功!', action, row);
   } else {
     error(res.msg || '删除失败');
   }
@@ -106,7 +109,7 @@ const copyHandler = async (action: ColumnActionConfig, row: any) => {
     const res = await action.handler?.(row);
 
     if (res.ret === 0) {
-      success('复制成功!', action);
+      success('复制成功!', action, row);
     } else {
       error(`复制失败!${res.msg}`);
     }
diff --git a/packages/table/src/PopoverColumn.vue b/packages/table/src/PopoverColumn.vue
index 47786677..cbb29ed8 100644
--- a/packages/table/src/PopoverColumn.vue
+++ b/packages/table/src/PopoverColumn.vue
@@ -9,7 +9,7 @@
           :data="scope.row[config.prop]"
         ></m-table>
         <template #reference>
-          <el-button text> {{ config.text || formatter(config, scope.row) }}</el-button>
+          <el-button text type="primary"> {{ config.text || formatter(config, scope.row) }}</el-button>
         </template>
       </el-popover>
     </template>
diff --git a/packages/table/src/Table.vue b/packages/table/src/Table.vue
index 66df2df0..2a44cdb2 100644
--- a/packages/table/src/Table.vue
+++ b/packages/table/src/Table.vue
@@ -205,9 +205,6 @@ export default defineComponent({
 
 <style lang="scss">
 .m-table {
-  .el-button.action-btn {
-    margin-right: 10px;
-  }
   .el-button.action-btn + .el-button.action-btn {
     margin-left: 0;
   }
diff --git a/packages/table/src/TextColumn.vue b/packages/table/src/TextColumn.vue
index 0bcb0a87..2d70b3df 100644
--- a/packages/table/src/TextColumn.vue
+++ b/packages/table/src/TextColumn.vue
@@ -18,7 +18,7 @@
         ></m-form-container>
       </el-form>
 
-      <el-button v-else-if="config.action === 'actionLink'" text @click="config.handler(scope.row)">
+      <el-button v-else-if="config.action === 'actionLink'" text type="primary" @click="config.handler(scope.row)">
         {{ formatter(config, scope.row) }}
       </el-button>
 
@@ -34,7 +34,7 @@
         <template #content>
           <div>{{ formatter(config, scope.row) }}</div>
         </template>
-        <el-button text>扩展配置</el-button>
+        <el-button text type="primary">扩展配置</el-button>
       </el-tooltip>
 
       <el-tag