Merge pull request #60 from Lohoyo/master

fix: 修复 Table 组件开启 expandRowByClick 后无法通过展开按钮展开的问题
ecomfe · Jul 6, 2021 · 09fe777 · 09fe777
2 parents d37db69 + 580b581
commit 09fe777
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -10,17 +10,22 @@
 
 ---
 
+## 1.0.10
+`2021-07-06`
+- Table
+    - 🐞 修复开启 expandRowByClick 后无法通过展开按钮展开的问题 [#60](https://github.com/ecomfe/santd/pull/60)
+
 ## 1.0.9
 `2021-07-05`
 
 - PageHeader
-    - fix: 修改pageHeader、localeProvider组件目录为中线分隔（page-header、locale-provider），解决babel-plugin-import插件引入问题[a064242](https://github.com/ecomfe/santd/commit/a064242731ccc13108d42831cd598809b736200b)
+    - 🐞 修改 pageHeader、localeProvider 组件的目录名为短横线分隔（page-header、locale-provider），解决 babel-plugin-import 插件引入问题 [a064242](https://github.com/ecomfe/santd/commit/a064242731ccc13108d42831cd598809b736200b)
 
 ## 1.0.8
 `2021-06-16`
 
 - Popconfirm
-    - fix: 解决popconfirm组件样式丢失问题[1c2f87a](https://github.com/ecomfe/santd/commit/1c2f87a5bf3de3c415354816cd1a1dcde43e19e8)
+    - 🐞 解决 popconfirm 组件样式丢失问题 [1c2f87a](https://github.com/ecomfe/santd/commit/1c2f87a5bf3de3c415354816cd1a1dcde43e19e8)
 
 ## 1.0.7
 `2021-06-04`

diff --git a/src/table/Td.js b/src/table/Td.js
@@ -10,13 +10,13 @@ const contentTemplate = `
     <!--配置展开图标-->
     <template s-if="isTree && columnIndex === 0">
         <span class="${prefixCls}-row-indent indent-level-{{item.level}}" style="padding-left: {{item.level * indentSize}}px;"></span>
-        <span on-click="handleTreeExpand(item)" s-if="hasExpandIcon && item.collapsed !== undefined">
+        <span on-click="stop:handleTreeExpand(item)" s-if="hasExpandIcon && item.collapsed !== undefined">
             <slot name="expandIcon" var-record="{{item}}"/>
         </span>
         <span
             s-else
             class="${prefixCls}-row-expand-icon ${prefixCls}-row-{{item.collapsed !== undefined ? item.collapsed ? 'collapsed' : 'expanded' : 'spaced'}}"
-            on-click="handleTreeExpand(item)"
+            on-click="stop:handleTreeExpand(item)"
         ></span>
     </template>
     <!--配置scoped slot-->
@@ -60,10 +60,10 @@ export default {
         <template s-for="column, columnIndex in getColumns(tdColumns, item, index)">
             <td s-if="hasExpandedRowRender && columnIndex === 0" class="${prefixCls}-row-expand-icon-cell">
                 <template s-if="rowExpandable(item, columnIndex)">
-                    <span on-click="handleExpandRow(item)" s-if="hasExpandIcon">
+                    <span on-click="stop:handleExpandRow(item)" s-if="hasExpandIcon">
                         <slot name="expandIcon" var-record="{{item}}"/>
                     </span>
-                    <span class="${prefixCls}-row-expand-icon ${prefixCls}-row-{{item.expanded ? 'expanded' : 'collapsed'}}" on-click="handleExpandRow(item)" s-else></span>
+                    <span class="${prefixCls}-row-expand-icon ${prefixCls}-row-{{item.expanded ? 'expanded' : 'collapsed'}}" on-click="stop:handleExpandRow(item)" s-else></span>
                 </template>
             </td>
             <td s-if="column.attrs.colSpan" colspan="{{column.attrs.colSpan}}" class="{{getThClass(column)}} {{column.ellipsis ? '${prefixCls}-cell-ellipsis' : ''}}" style="{{getThStyle(column)}}">${contentTemplate}</td>