冲突修改

src/views/Core/KtCommonTable.vue

@@ -49,22 +49,12 @@
             @click="handleEdit(scope.$index, scope.row)" />
           <kt-button v-if="deleteButtonName" icon="fa fa-trash" :label="deleteButtonName" :perms="permsDelete"
             :size="size" type="danger" @click="handleDeleteFlag(scope.$index, scope.row)" />
-          <kt-button :style="{ background: button1Background+'', border: '1px solid'+button1Background, color:'#fff'}"  v-if="button1Name" :label="button1Name" :perms="permsButton1" :size="size"
+          <kt-button :style="{ background: button1Background+'', border: '1px solid'+button1Background, color:'#fff'}"  v-if="button1Name" :label="button1Name" :perms="permsButton1" :size="size" :icon="button1Icon"
             @click="handleButton1(scope.$index, scope.row)" />
-            <kt-button :style="{ background: button2Background, border: '1px solid'+button2Background, color:'#fff'}"  v-if="button2Name" :label="button2Name" :perms="permsButton2" :size="size"
+            <kt-button :style="{ background: button2Background, border: '1px solid'+button2Background, color:'#fff'}"  v-if="button2Name" :label="button2Name" :perms="permsButton2" :size="size" :icon="button2Icon"
             @click="handleButton2(scope.$index, scope.row)" />
             <kt-button :style="{ background: button3Background, border: '1px solid'+button3Background, color:'#fff'}" v-if="button3Name" :label="button3Name" :perms="permsButton3"  :size="size" :icon="button3Icon"
              @click="handleButton3(scope.$index, scope.row)" />
-
-            <kt-button  :style="{ background: button4Background, border: '1px solid'+button4Background, color:'#fff'}" v-if="button4Name" :label="button4Name" :perms="permsButton4" :size="size" :icon="button2Icon"
-            @click="handleButton2(scope.$index, scope.row)" />
-          <kt-button :style="{
-              background:button1Background,
-              border: '1px solid '+button1Background,
-              color:'#ffffff',
-            }
-            " :icon="button1Icon" v-if="button1Name" :label="button1Name" :perms="permsButton1" :size="size"
-            @click="handleButton1(scope.$index, scope.row)" />
             <kt-button :style="{
               background:button4Background,
               border: '1px solid '+button4Background,
@@ -175,30 +165,6 @@ export default {
       type: String,
       default: "fa fa-trash",
     },
-    button4Background: {
-      type: String,
-      default: "rgb(14, 194, 22)",
-    },
-    button4Background: {
-      type: String,
-      default: "#1e87ed",
-    },
-    button1Icon: {
-      type: String,
-      default: "fa fa-trash",
-    },
-    button2Icon: {
-      type: String,
-      default: "fa fa-edit",
-    },
-    button3Icon: {
-      type: String,
-      default: "fa fa-edit",
-    },
-    button4Icon: {
-      type: String,
-      default: "fa fa-trash",
-    },
     editButtonName: {
       type: String,
     },