Skip to content

Commit afad269

Browse files
authored
Merge pull request #1392 from alibaba/refresh
Refresh
2 parents 070b4b4 + ffce6b4 commit afad269

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

packages/form-render/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
4+
## 1.14.17
5+
- [!] 图片组件格式放宽限制,支持网络链接
36
## 1.14.15
47
- [!] removeErrorField 无法完全清除(同步被多个组件调用)
58
## 1.14.14

packages/form-render/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "form-render",
3-
"version": "1.14.16",
3+
"version": "1.14.17",
44
"description": "通过 JSON Schema 生成标准 Form,常用于自定义搭建配置界面生成",
55
"keywords": [
66
"Form",

packages/table-render/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Changelog
22

3+
### 1.3.14
4+
- [+] 修复 `refresh` stay 之后 分页数据不更新
35
### 1.3.11
46
- [+] 修复 `refresh` stay 参数不生效
57
### 1.3.10

packages/table-render/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "table-render",
3-
"version": "1.3.13",
3+
"version": "1.3.14",
44
"description": "中后台表格解决方案",
55
"keywords": [
66
"TableRender",

packages/table-render/src/components/index.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,19 @@ const useTableRoot = props => {
7979
.then(res => {
8080
// TODO:这里校验res是否规范
8181
const { rows, total, pageSize, ...extraData } = res;
82+
const newPagination = {
83+
..._pagination,
84+
total,
85+
pageSize: pageSize || _pageSize,
86+
};
87+
8288
set({
8389
loading: false,
8490
dataSource: rows,
8591
...extraData,
86-
pagination: {
87-
..._pagination,
88-
total,
89-
pageSize: pageSize || _pageSize,
90-
},
92+
pagination: newPagination,
9193
});
94+
paginationRef.current = newPagination;
9295
afterSearch.current({ rows, total, pageSize, ...extraData });
9396
})
9497
.catch(err => {
@@ -101,8 +104,9 @@ const useTableRoot = props => {
101104
params?: { tab?: string | number; stay?: boolean },
102105
moreSearch?: any
103106
) => {
104-
const _stay = (params && params.stay) || false;
107+
const _stay = params?.stay || false;
105108
const _search = moreSearch || {};
109+
106110
doSearch(
107111
{
108112
current: _stay ? paginationRef?.current?.current : 1,

tools/schema-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fr-generator",
3-
"version": "2.8.9",
3+
"version": "2.9.0-beta.1",
44
"main": "dist/index.js",
55
"module": "dist/index.esm.js",
66
"typings": "dist/index.d.ts",

0 commit comments

Comments
 (0)