Skip to content

Commit

Permalink
Merge pull request #1392 from alibaba/refresh
Browse files Browse the repository at this point in the history
Refresh
  • Loading branch information
lhbxs authored Sep 22, 2023
2 parents 070b4b4 + ffce6b4 commit afad269
Showing 6 changed files with 18 additions and 9 deletions.
3 changes: 3 additions & 0 deletions packages/form-render/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog


## 1.14.17
- [!] 图片组件格式放宽限制,支持网络链接
## 1.14.15
- [!] removeErrorField 无法完全清除(同步被多个组件调用)
## 1.14.14
2 changes: 1 addition & 1 deletion packages/form-render/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-render",
"version": "1.14.16",
"version": "1.14.17",
"description": "通过 JSON Schema 生成标准 Form,常用于自定义搭建配置界面生成",
"keywords": [
"Form",
2 changes: 2 additions & 0 deletions packages/table-render/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

### 1.3.14
- [+] 修复 `refresh` stay 之后 分页数据不更新
### 1.3.11
- [+] 修复 `refresh` stay 参数不生效
### 1.3.10
2 changes: 1 addition & 1 deletion packages/table-render/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "table-render",
"version": "1.3.13",
"version": "1.3.14",
"description": "中后台表格解决方案",
"keywords": [
"TableRender",
16 changes: 10 additions & 6 deletions packages/table-render/src/components/index.tsx
Original file line number Diff line number Diff line change
@@ -79,16 +79,19 @@ const useTableRoot = props => {
.then(res => {
// TODO:这里校验res是否规范
const { rows, total, pageSize, ...extraData } = res;
const newPagination = {
..._pagination,
total,
pageSize: pageSize || _pageSize,
};

set({
loading: false,
dataSource: rows,
...extraData,
pagination: {
..._pagination,
total,
pageSize: pageSize || _pageSize,
},
pagination: newPagination,
});
paginationRef.current = newPagination;
afterSearch.current({ rows, total, pageSize, ...extraData });
})
.catch(err => {
@@ -101,8 +104,9 @@ const useTableRoot = props => {
params?: { tab?: string | number; stay?: boolean },
moreSearch?: any
) => {
const _stay = (params && params.stay) || false;
const _stay = params?.stay || false;
const _search = moreSearch || {};

doSearch(
{
current: _stay ? paginationRef?.current?.current : 1,
2 changes: 1 addition & 1 deletion tools/schema-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fr-generator",
"version": "2.8.9",
"version": "2.9.0-beta.1",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"typings": "dist/index.d.ts",

1 comment on commit afad269

@vercel
Copy link

@vercel vercel bot commented on afad269 Sep 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.