fix(table): fix can't get table column index

emqx · Apr 21, 2021 · bd2462f · bd2462f
1 parent e5788d0
commit bd2462f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/example/App.vue b/example/App.vue
@@ -10,6 +10,10 @@
     <emqx-button type="primary" size="small">test</emqx-button>
     <emqx-button type="primary" size="mini">test</emqx-button>
   </div>
+  <div class="show-item">
+    <emqx-button icon="el-icon-search" circle></emqx-button>
+    <emqx-button icon="el-icon-plus" circle size="mini"></emqx-button>
+  </div>
   <h2>Input</h2>
   <div class="show-item">
     <emqx-input v-model="testInput" placeholder="test" style="margin-bottom: 20px"></emqx-input>

diff --git a/packages/Option/src/option.vue b/packages/Option/src/option.vue
@@ -1,5 +1,7 @@
 <template>
-  <el-option class="emqx-option"></el-option>
+  <el-option class="emqx-option">
+    <slot></slot>
+  </el-option>
 </template>
 
 <script lang="ts">

diff --git a/packages/TableColumn/src/table-column.vue b/packages/TableColumn/src/table-column.vue
@@ -1,7 +1,7 @@
 <template>
   <el-table-column class="emqx-table-column">
     <template v-if="$slots.default" #default="scope">
-      <slot :row="scope.row"></slot>
+      <slot :row="scope.row" :index="scope.$index"></slot>
     </template>
   </el-table-column>
 </template>

diff --git a/packages/styles/components/button.scss b/packages/styles/components/button.scss
@@ -1,3 +1,16 @@
 .emqx-button.el-button {
   border-radius: 8px;
+  &.is-circle {
+    padding: 16px;
+    width: 47px;
+    height: 47px;
+    i {
+      font-size: 14px;
+    }
+  }
+  &.el-button--mini.is-circle {
+    width: 32px;
+    height: 32px;
+    padding: 8px;
+  }
 }