Skip to content

Commit

Permalink
chore(*): fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@lakerswgq
lakerswgq committed Aug 18, 2022
2 parents e36f02a + 3953968 commit 16fc370
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 11 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Change Log

## [1.25.50](https://github.com/alibaba-fusion/next/compare/1.25.49...1.25.50) (2022-08-11)


### Bug Fixes

* **Table:** optimize expandedRowIndent type hints ([#4039](https://github.com/alibaba-fusion/next/issues/4039)) ([9d80631](https://github.com/alibaba-fusion/next/commit/9d80631))




## [1.25.49](https://github.com/alibaba-fusion/next/compare/1.25.48...1.25.49) (2022-08-04)


### Features

* **Dialog:** add wrapperClassName to Dialog v2 ([ddb7bc2](https://github.com/alibaba-fusion/next/commit/ddb7bc2))




## [1.25.48](https://github.com/alibaba-fusion/next/compare/1.25.47...1.25.48) (2022-07-28)


Expand Down
7 changes: 2 additions & 5 deletions LATESTLOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# Latest Log

## [1.25.48](https://github.com/alibaba-fusion/next/compare/1.25.47...1.25.48) (2022-07-28)
## [1.25.50](https://github.com/alibaba-fusion/next/compare/1.25.49...1.25.50) (2022-08-11)


### Bug Fixes

* **NumberPicker:** ignore input not in -.\d fix [#3363](https://github.com/alibaba-fusion/next/issues/3363), [#3916](https://github.com/alibaba-fusion/next/issues/3916) ([e9c361f](https://github.com/alibaba-fusion/next/commit/e9c361f))
* **NumberPicker:** should not input bigger then max fix [#4002](https://github.com/alibaba-fusion/next/issues/4002) ([e2371e0](https://github.com/alibaba-fusion/next/commit/e2371e0))
* **Select:** auto close popup when item get clicked, close [#4004](https://github.com/alibaba-fusion/next/issues/4004) ([c879a52](https://github.com/alibaba-fusion/next/commit/c879a52))
* **Table:** table tree if without children should icon type equal, close [#4009](https://github.com/alibaba-fusion/next/issues/4009) ([#4022](https://github.com/alibaba-fusion/next/issues/4022)) ([09ea83e](https://github.com/alibaba-fusion/next/commit/09ea83e))
* **Table:** optimize expandedRowIndent type hints ([#4039](https://github.com/alibaba-fusion/next/issues/4039)) ([9d80631](https://github.com/alibaba-fusion/next/commit/9d80631))


1 change: 1 addition & 0 deletions docs/dialog/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ API变化：
| closeIcon | [v2] 定制关闭按钮 icon | ReactNode | - | 1.25 |
| centered | [v2] 弹窗居中对齐 | Boolean | false | 1.25 |
| overflowScroll | [v2] 对话框高度超过浏览器视口高度时，对话框是否展示滚动条。关闭此功后对话框会随高度撑开页面 | Boolean | true | 1.25 |
| wrapperClassName | [v2] 弹窗最外包裹层 classname | String | - | |
| closeable | [废弃]同closeMode, 控制对话框关闭的方式，值可以为字符串或者布尔值，其中字符串是由以下值组成：<br/>**close** 表示点击关闭按钮可以关闭对话框<br/>**mask** 表示点击遮罩区域可以关闭对话框<br/>**esc** 表示按下 esc 键可以关闭对话框<br/>如 'close' 或 'close,esc,mask'<br/>如果设置为 true，则以上关闭方式全部生效<br/>如果设置为 false，则以上关闭方式全部失效 | String/Boolean | 'esc,close' | |
| onClose | 点击对话框关闭按钮时触发的回调函数<br/><br/>**签名**:<br/>Function(trigger: String, event: Object) => void<br/>**参数**:<br/>_trigger_: {String} 关闭触发行为的描述字符串<br/>_event_: {Object} 关闭时事件对象 | Function | () => {} | |
| align | [v2废弃] 对话框对齐方式, 具体见Overlay文档 | String/Boolean | 'cc cc' | |
Expand Down
2 changes: 1 addition & 1 deletion docs/table/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ ReactDOM.render(
| primaryKey | dataSource当中数据的主键，如果给定的数据源中的属性不包含该主键，会造成选择状态全部选中 | Symbol/String | 'id' | |
| expandedRowRender | 额外渲染行的渲染函数<br/><br/>**签名**:<br/>Function(record: Object, index: Number) => Element<br/>**参数**:<br/>_record_: {Object} 该行所对应的数据<br/>_index_: {Number} 该行所对应的序列<br/>**返回值**:<br/>{Element} 渲染内容<br/> | Function | - | |
| rowExpandable | 设置行是否可展开，设置 false 为不可展开<br/><br/>**签名**:<br/>Function(record: Object, index: Number) => Boolean<br/>**参数**:<br/>_record_: {Object} 该行所对应的数据<br/>_index_: {Number} 该行所对应的序列<br/>**返回值**:<br/>{Boolean} 是否可展开<br/> | Function | - | |
| expandedRowIndent | 额外渲染行的缩进 | Array | - | |
| expandedRowIndent | 额外渲染行的缩进, 是个二维数组(eg:[1,1]) 分别表示左右两边的缩进 | Array | - | |
| hasExpandedRowCtrl | 是否显示点击展开额外渲染行的+号按钮 | Boolean | - | |
| getExpandedColProps | 设置额外渲染行的属性<br/><br/>**签名**:<br/>Function(record: Object, index: Number) => Object<br/>**参数**:<br/>_record_: {Object} 该行所对应的数据<br/>_index_: {Number} 该行所对应的序列<br/>**返回值**:<br/>{Object} 额外渲染行的属性<br/> | Function | - | |
| openRowKeys | 当前展开的 Expand行 或者 Tree行 , 传入此属性为受控状态，一般配合 onRowOpen 使用 | Array | - | |
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var next = require('./lib/index.js');

next.version = '1.25.48';
next.version = '1.25.50';

module.exports = next;
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alifd/next",
"version": "1.25.48",
"version": "1.25.50",
"description": "A configurable component library for web built on React.",
"keywords": [
"fusion",
Expand Down
1 change: 1 addition & 0 deletions src/dialog/dialog-v2.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const Dialog = props => {
animation = { in: 'fadeInUp', out: 'fadeOutUp' },
cache,
wrapperStyle,
wrapperClassName,
popupContainer = document.body,
dialogRender,
centered,
Expand Down
12 changes: 12 additions & 0 deletions src/nav/scss/mixin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@
background: $selectedBgColor;
color: $selectedColor;
font-weight: $selectedWeight;

&.#{$css-prefix}nav-item {
background: $selectedBgColor;
color: $selectedColor;
}
}

&.#{$css-prefix}opened {
Expand Down Expand Up @@ -206,6 +211,13 @@
&.#{$css-prefix}selected {
background: $selectedBgColor;
color: $selectedColor;

// fix https://github.com/alibaba-fusion/next/issues/4050
// 这里冗余一下样式，避免影响之前生效的选择器样式
&.#{$css-prefix}nav-item {
background: $selectedBgColor;
color: $selectedColor;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/table/base.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class Table extends React.Component {
*/
rowExpandable: PropTypes.func,
/**
* 额外渲染行的缩进
* 额外渲染行的缩进, 是个二维数组(eg:[1,1]) 分别表示左右两边的缩进
*/
expandedRowIndent: PropTypes.array,
/**
Expand Down
4 changes: 2 additions & 2 deletions types/table/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ export interface TableProps extends React.HTMLAttributes<HTMLElement>, BaseTable
rowExpandable?: (record: any) => boolean;

/**
* 额外渲染行的缩进
* 额外渲染行的缩进，包含两个数字，第一个数字为左侧缩进，第二个数字为右侧缩进
*/
expandedRowIndent?: Array<any>;
expandedRowIndent?: [number, number];

/**
* 默认情况下展开的渲染行或者Tree, 传入此属性为受控状态
Expand Down

0 comments on commit 16fc370

Please sign in to comment.