@cniot/mdd-render-pc-ftp
Advanced tools
Comparing version 2.5.0-beta.63 to 2.5.0-beta.64
{ | ||
"name": "@cniot/mdd-render-pc-ftp", | ||
"version": "2.5.0-beta.63", | ||
"version": "2.5.0-beta.64", | ||
"description": "模型驱动FTP渲染组件", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -0,1 +1,4 @@ | ||
# 2.5.0-beta.64 | ||
- fix全局tabler中filter设置和单个页面filter设置冲突问题; | ||
# 2.5.0-beta.63 | ||
@@ -2,0 +5,0 @@ - fix: tableModule针对 setDataSource 做页面刷新操作 |
@@ -68,4 +68,4 @@ import React, { useEffect, useState, useRef, useMemo, useCallback } from 'react'; | ||
remoteSort = false, // 是否开启远程排序 | ||
filter = false, // 列头筛选 | ||
copy = false, // 列头复制 | ||
filter, // 列头筛选 boolean | ||
copy, // 列头复制 boolean | ||
...moreTableProps | ||
@@ -86,4 +86,4 @@ } = table; | ||
// 是否开启筛选,默认单页配置 优先级高,其次是全局设置 | ||
const realFilter = filter || globalFilter; | ||
const realCopy = copy || globalCopy; | ||
const realFilter = filter ?? globalFilter; | ||
const realCopy = copy ?? globalCopy; | ||
@@ -122,3 +122,4 @@ // 获取分页列表选择数据 | ||
dataIndex: name, | ||
filter: globalFilter ? true : filter, | ||
// filter: globalFilter ? true : filter, | ||
filter: filter, | ||
}; | ||
@@ -125,0 +126,0 @@ if (MDD_COLUMN_FORMAT.includes(type)) { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1059890
23907
499