@teamix/pro 1.5.34 → 1.5.36

package/es/form/Filter/AdvancedFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear", "submitProps", "resetProps", "buttonGroup"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -29,9 +29,46 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
     breakpoints = props.breakpoints,
     gridProps = props.gridProps,
     forceClear = props.forceClear,
+    _props$submitProps = props.submitProps,
+    submitProps = _props$submitProps === void 0 ? {} : _props$submitProps,
+    _props$resetProps = props.resetProps,
+    resetProps = _props$resetProps === void 0 ? {} : _props$resetProps,
+    buttonGroup = props.buttonGroup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-advanced');
   var gridSchema = useMemo(function () {
+    var resetSchema = _objectSpread(_objectSpread({
+      name: 'AdvancedFilterReset',
+      component: 'Reset'
+    }, resetProps), {}, {
+      props: _objectSpread({
+        onResetValidateSuccess: onReset,
+        forceClear: !!forceClear,
+        children: getMessage('reset')
+      }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.props)
+    });
+    var submitSchema = _objectSpread(_objectSpread({
+      component: 'Submit'
+    }, submitProps), {}, {
+      props: _objectSpread({
+        style: {
+          marginRight: -4
+        },
+        children: getMessage('search')
+      }, submitProps === null || submitProps === void 0 ? void 0 : submitProps.props)
+    });
+    var buttonGroupSchema = [resetSchema, submitSchema];
+    if (buttonGroup) {
+      buttonGroupSchema = buttonGroup.map(function (item) {
+        if (item === 'Submit') {
+          return submitSchema;
+        }
+        if (item === 'Reset') {
+          return resetSchema;
+        }
+        return item;
+      });
+    }
     return [{
       name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
@@ -52,23 +89,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
           props: {
             align: 'right'
           },
-          children: [{
-            name: 'AdvancedFilterReset',
-            component: 'Reset',
-            props: {
-              onResetValidateSuccess: onReset,
-              forceClear: !!forceClear,
-              children: getMessage('reset')
-            }
-          }, {
-            component: 'Submit',
-            props: {
-              style: {
-                marginRight: -4
-              },
-              children: getMessage('search')
-            }
-          }]
+          children: _toConsumableArray(buttonGroupSchema)
         }]
       }])
     }];

package/es/form/typing.d.ts

@@ -115,6 +115,12 @@ export interface FilterProps extends ProFormProps {
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -164,6 +170,12 @@ export interface QueryFilterProps extends ProFormProps {
     onReset?: (payload?: any) => void;
     /** 高级筛选按钮切换 */
     onExpand?: (expand: boolean) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 /**
  * 兼容性导出

package/es/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.34";
+declare const version = "1.5.36";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.34';
+var version = '1.5.36';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/table/components/Cell/index.d.ts

@@ -12,6 +12,7 @@ interface ICellProps {
     /** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
     context?: any;
     dataTeamixSpm?: string;
+    forcedUpdate?: boolean;
 }
 declare const _default: React.MemoExoticComponent<(props: ICellProps) => JSX.Element>;
 export default _default;

package/es/table/components/Cell/index.js

@@ -190,13 +190,14 @@ var processBuriedPoint = function processBuriedPoint() {
 };
 var equalColumns = function equalColumns(prevProps, nextProps) {
   var preValue = prevProps.value;
-  var nextValue = nextProps.value;
+  var nextValue = nextProps.value,
+    item = nextProps.item;
   // columns 强制更新参数
-  if (nextProps === null || nextProps === void 0 ? void 0 : nextProps.forcedUpdate) {
+  if (item === null || item === void 0 ? void 0 : item.forcedUpdate) {
     return false;
   }
-  // 操作列的时候强制刷新
-  if (preValue === false && nextValue === false) {
+  // 操作列的时候强制刷新 || 当 value 值拿不到的时候
+  if (preValue === false && nextValue === false || nextValue === undefined) {
     return false;
   }
   if (preValue === nextValue) {

package/es/table/components/Filter/index.js

@@ -75,7 +75,6 @@ var Filter = function Filter(props) {
         });
       });
     }
-    // console.log(filters);
     return filters;
   }, [column]);
   // 点击确定回调

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -27,7 +27,11 @@ var Row = Grid.Row,
 var cls = usePrefixCls('teamix-pro-table-toolbar-filter-column');
 var processColumns = function processColumns(columns) {
   var _getGlobalConfig;
+  var filterColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumnsKey = filterColumns.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.dataIndex;
+  });
   // hidden 为 true 时不展示
   columns = columns.filter(function (item) {
     return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
@@ -37,11 +41,14 @@ var processColumns = function processColumns(columns) {
       return item;
     }
     return _objectSpread(_objectSpread({}, item), {}, {
-      columnFilters: true
+      columnFilters: filterColumnsKey.findIndex(function (key) {
+        return item.dataIndex === key;
+      }) >= 0 ? true : false
     });
   });
 };
 var FilterColumnIcon = function FilterColumnIcon(props) {
+  var _actionRef$current, _actionRef$current3;
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     actionRef = props.actionRef,
@@ -54,7 +61,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     indeterminate = _useState4[0],
     setIndeterminate = _useState4[1];
-  var _useState5 = useState(processColumns(columns)),
+  var _useState5 = useState(processColumns(columns, (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.filterColumns)),
     _useState6 = _slicedToArray(_useState5, 2),
     newColumns = _useState6[0],
     setNewColumns = _useState6[1];
@@ -100,8 +107,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     };
   });
   useEffect(function () {
-    setNewColumns(processColumns(columns));
-  }, [columns]);
+    var _actionRef$current2;
+    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+  }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -193,10 +201,10 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 通知表格渲染
   var notifyTableRender = function notifyTableRender(columns) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current4, _actionRef$current4$s;
     calculateSelectAllState(columns);
     setNewColumns(columns);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
+    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setColumn) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, columns, false);
   };
   // 计算全选状态
   var calculateSelectAllState = function calculateSelectAllState(columns) {

package/es/table/index.js

@@ -297,7 +297,9 @@ var ProTable = function ProTable(props) {
   // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
   var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
     var _tableDom$getElements, _tableDom$getElements2, _document$querySelect, _document$querySelect2, _document$querySelect3;
-    if (!fixedTableBody) {
+    if (isFullscreen) {
+      // 开启全屏的时候先往下面走
+    } else if (!fixedTableBody) {
       return;
     }
     var tableDom = tableRef.current;
@@ -420,9 +422,9 @@ var ProTable = function ProTable(props) {
       if (showSkeleton && result) {
         result.disabled = true;
       }
-      return _objectSpread({
+      return _objectSpread(_objectSpread({
         _primaryKey: props.primaryKey
-      }, result);
+      }, record), result);
     },
     titleProps: function titleProps() {
       var result = {};
@@ -834,7 +836,7 @@ var ProTable = function ProTable(props) {
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
     // 格式化后的请求参数
     var requestData = {};
-    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params);
+    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3))), params);
     if (typeof formatParams === 'string') {
       requestData = getTargetValue(formatParams, {
         params: preParams
@@ -947,7 +949,7 @@ var ProTable = function ProTable(props) {
         return true;
       } : undefined,
       onFilter: function onFilter(values) {
-        var _actionRef$current7, _actionRef$current7$c;
+        var _actionRef$current7, _actionRef$current7$c, _request8;
         // 全屏状态，判断全屏表单onFilter是否禁用
         if (fullscreenState && !filterEnableRef.current.fullscreen) {
           filterEnableRef.current.fullscreen = true;
@@ -959,20 +961,26 @@ var ProTable = function ProTable(props) {
           return;
         }
         (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
+        if (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) {
+          var filterResult = propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values);
+          if (filterResult === false) {
+            return false;
+          }
+        }
         // 搜索变化时，暂时先清空选择
         (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
         setCurrentPage(1);
-        _request(_defineProperty({}, targetPageKey, 1), false, values);
+        _request((_request8 = {}, _defineProperty(_request8, targetPageKey, 1), _defineProperty(_request8, targetPageSizeKey, pageSize), _request8), false, values);
       },
       onReset: function onReset(values) {
-        var _dataFilterFormRef$cu3;
+        var _dataFilterFormRef$cu3, _request9;
         (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
         (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
         setCurrentPage(1);
-        _request(_defineProperty({}, targetPageKey, 1), false, values);
+        _request((_request9 = {}, _defineProperty(_request9, targetPageKey, 1), _defineProperty(_request9, targetPageSizeKey, pageSize), _request9), false, values);
       }
     });
-  }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef]);
+  }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef, pageSize]);
   var isLoading = useMemo(function () {
     if (!customRequest) {
       return showLoading && !showSkeleton && (getData.loading || props.loading);

package/es/table/index.scss

@@ -71,7 +71,7 @@ $fullscreenPadding: 24px;
       box-shadow: var(--shadow-1-up);
       background-color: var(--table-row-bg, #ffffff);
       margin: 0;
-      z-index: 2;
+      z-index: 5;
     }
 
     .next-table-body {
@@ -126,6 +126,15 @@ $fullscreenPadding: 24px;
   }
 }
 
+// .teamix-pro-table-fullscreen {
+//   .teamix-pro-table-container {
+//     height: calc(100vh - 74px);
+//     overflow: hidden;
+//     overflow-y: auto;
+//   }
+// }
+
+
 .teamix-pro-table-footer-suction {
   margin-bottom: 50px;
   .teamix-pro-table-footer {

package/es/table/typing.d.ts

@@ -24,6 +24,8 @@ declare type TDataService = {
 };
 export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
+    /** 是否强制刷新 */
+    forcedUpdate?: boolean;
     /** 是否开启了自动计算宽度 */
     isAutoWidth?: boolean;
     /** 自动计算宽度时的被挤占的情况 */

package/es/table/utils/useTableSelection.js

@@ -94,6 +94,9 @@ function useTableSelection() {
     // console.log('propResult', propResult, selectedRowKeys);
     var resultProps = _objectSpread(_objectSpread({}, record), propResult);
     var primaryKey = record === null || record === void 0 ? void 0 : record[resultProps === null || resultProps === void 0 ? void 0 : resultProps['_primaryKey']];
+    if ((config === null || config === void 0 ? void 0 : config.mode) === 'single') {
+      return resultProps;
+    }
     return _objectSpread(_objectSpread({}, resultProps), {}, {
       isPreview: true,
       renderPreview: function renderPreview() {

package/lib/form/Filter/AdvancedFilter.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _utils = require("@teamix/utils");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _utils2 = require("../utils");
-var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear", "submitProps", "resetProps", "buttonGroup"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -39,9 +39,46 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     breakpoints = props.breakpoints,
     gridProps = props.gridProps,
     forceClear = props.forceClear,
+    _props$submitProps = props.submitProps,
+    submitProps = _props$submitProps === void 0 ? {} : _props$submitProps,
+    _props$resetProps = props.resetProps,
+    resetProps = _props$resetProps === void 0 ? {} : _props$resetProps,
+    buttonGroup = props.buttonGroup,
     otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
+    var resetSchema = _objectSpread(_objectSpread({
+      name: 'AdvancedFilterReset',
+      component: 'Reset'
+    }, resetProps), {}, {
+      props: _objectSpread({
+        onResetValidateSuccess: onReset,
+        forceClear: !!forceClear,
+        children: (0, _utils.getMessage)('reset')
+      }, resetProps === null || resetProps === void 0 ? void 0 : resetProps.props)
+    });
+    var submitSchema = _objectSpread(_objectSpread({
+      component: 'Submit'
+    }, submitProps), {}, {
+      props: _objectSpread({
+        style: {
+          marginRight: -4
+        },
+        children: (0, _utils.getMessage)('search')
+      }, submitProps === null || submitProps === void 0 ? void 0 : submitProps.props)
+    });
+    var buttonGroupSchema = [resetSchema, submitSchema];
+    if (buttonGroup) {
+      buttonGroupSchema = buttonGroup.map(function (item) {
+        if (item === 'Submit') {
+          return submitSchema;
+        }
+        if (item === 'Reset') {
+          return resetSchema;
+        }
+        return item;
+      });
+    }
     return [{
       name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
@@ -62,23 +99,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
           props: {
             align: 'right'
           },
-          children: [{
-            name: 'AdvancedFilterReset',
-            component: 'Reset',
-            props: {
-              onResetValidateSuccess: onReset,
-              forceClear: !!forceClear,
-              children: (0, _utils.getMessage)('reset')
-            }
-          }, {
-            component: 'Submit',
-            props: {
-              style: {
-                marginRight: -4
-              },
-              children: (0, _utils.getMessage)('search')
-            }
-          }]
+          children: _toConsumableArray(buttonGroupSchema)
         }]
       }])
     }];

package/lib/form/typing.d.ts

@@ -115,6 +115,12 @@ export interface FilterProps extends ProFormProps {
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -164,6 +170,12 @@ export interface QueryFilterProps extends ProFormProps {
     onReset?: (payload?: any) => void;
     /** 高级筛选按钮切换 */
     onExpand?: (expand: boolean) => void;
+    /** 搜索按钮配置 */
+    submitProps?: ProFormSchemaItem;
+    /** 重置按钮配置 */
+    resetProps?: ProFormSchemaItem;
+    /** 操作区按钮组配置 */
+    buttonGroup?: (ProFormSchemaItem | 'Submit' | 'Reset')[];
 }
 /**
  * 兼容性导出

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.34";
+declare const version = "1.5.36";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.34';
+var version = '1.5.36';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/table/components/Cell/index.d.ts

@@ -12,6 +12,7 @@ interface ICellProps {
     /** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
     context?: any;
     dataTeamixSpm?: string;
+    forcedUpdate?: boolean;
 }
 declare const _default: React.MemoExoticComponent<(props: ICellProps) => JSX.Element>;
 export default _default;

package/lib/table/components/Cell/index.js

@@ -194,13 +194,14 @@ var processBuriedPoint = function processBuriedPoint() {
 };
 var equalColumns = function equalColumns(prevProps, nextProps) {
   var preValue = prevProps.value;
-  var nextValue = nextProps.value;
+  var nextValue = nextProps.value,
+    item = nextProps.item;
   // columns 强制更新参数
-  if (nextProps === null || nextProps === void 0 ? void 0 : nextProps.forcedUpdate) {
+  if (item === null || item === void 0 ? void 0 : item.forcedUpdate) {
     return false;
   }
-  // 操作列的时候强制刷新
-  if (preValue === false && nextValue === false) {
+  // 操作列的时候强制刷新 || 当 value 值拿不到的时候
+  if (preValue === false && nextValue === false || nextValue === undefined) {
     return false;
   }
   if (preValue === nextValue) {

package/lib/table/components/Filter/index.js

@@ -84,7 +84,6 @@ var Filter = function Filter(props) {
         });
       });
     }
-    // console.log(filters);
     return filters;
   }, [column]);
   // 点击确定回调

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -34,7 +34,11 @@ var Row = _components.Grid.Row,
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter-column');
 var processColumns = function processColumns(columns) {
   var _getGlobalConfig;
+  var filterColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumnsKey = filterColumns.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.dataIndex;
+  });
   // hidden 为 true 时不展示
   columns = columns.filter(function (item) {
     return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
@@ -44,11 +48,14 @@ var processColumns = function processColumns(columns) {
       return item;
     }
     return _objectSpread(_objectSpread({}, item), {}, {
-      columnFilters: true
+      columnFilters: filterColumnsKey.findIndex(function (key) {
+        return item.dataIndex === key;
+      }) >= 0 ? true : false
     });
   });
 };
 var FilterColumnIcon = function FilterColumnIcon(props) {
+  var _actionRef$current, _actionRef$current3;
   var _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     actionRef = props.actionRef,
@@ -61,7 +68,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     indeterminate = _useState4[0],
     setIndeterminate = _useState4[1];
-  var _useState5 = (0, _react.useState)(processColumns(columns)),
+  var _useState5 = (0, _react.useState)(processColumns(columns, (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.filterColumns)),
     _useState6 = _slicedToArray(_useState5, 2),
     newColumns = _useState6[0],
     setNewColumns = _useState6[1];
@@ -107,8 +114,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     };
   });
   (0, _react.useEffect)(function () {
-    setNewColumns(processColumns(columns));
-  }, [columns]);
+    var _actionRef$current2;
+    setNewColumns(processColumns(columns, (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : _actionRef$current2.filterColumns));
+  }, [columns, (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : _actionRef$current3.filterColumns]);
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -200,10 +208,10 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   };
   // 通知表格渲染
   var notifyTableRender = function notifyTableRender(columns) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current4, _actionRef$current4$s;
     calculateSelectAllState(columns);
     setNewColumns(columns);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
+    (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setColumn) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, columns, false);
   };
   // 计算全选状态
   var calculateSelectAllState = function calculateSelectAllState(columns) {

package/lib/table/index.js

@@ -318,7 +318,9 @@ var ProTable = function ProTable(props) {
   // 获取header高度，用作全屏吸底吸底高度计算以及固定body高度计算（滚动条在底部）
   var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
     var _tableDom$getElements, _tableDom$getElements2, _document$querySelect, _document$querySelect2, _document$querySelect3;
-    if (!fixedTableBody) {
+    if (isFullscreen) {
+      // 开启全屏的时候先往下面走
+    } else if (!fixedTableBody) {
       return;
     }
     var tableDom = tableRef.current;
@@ -441,9 +443,9 @@ var ProTable = function ProTable(props) {
       if (showSkeleton && result) {
         result.disabled = true;
       }
-      return _objectSpread({
+      return _objectSpread(_objectSpread({
         _primaryKey: props.primaryKey
-      }, result);
+      }, record), result);
     },
     titleProps: function titleProps() {
       var result = {};
@@ -855,7 +857,7 @@ var ProTable = function ProTable(props) {
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
     // 格式化后的请求参数
     var requestData = {};
-    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params);
+    var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3))), params);
     if (typeof formatParams === 'string') {
       requestData = (0, _utils.getTargetValue)(formatParams, {
         params: preParams
@@ -968,7 +970,7 @@ var ProTable = function ProTable(props) {
         return true;
       } : undefined,
       onFilter: function onFilter(values) {
-        var _actionRef$current7, _actionRef$current7$c;
+        var _actionRef$current7, _actionRef$current7$c, _request8;
         // 全屏状态，判断全屏表单onFilter是否禁用
         if (fullscreenState && !filterEnableRef.current.fullscreen) {
           filterEnableRef.current.fullscreen = true;
@@ -980,20 +982,26 @@ var ProTable = function ProTable(props) {
           return;
         }
         (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
+        if (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) {
+          var filterResult = propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values);
+          if (filterResult === false) {
+            return false;
+          }
+        }
         // 搜索变化时，暂时先清空选择
         (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
         setCurrentPage(1);
-        _request(_defineProperty({}, targetPageKey, 1), false, values);
+        _request((_request8 = {}, _defineProperty(_request8, targetPageKey, 1), _defineProperty(_request8, targetPageSizeKey, pageSize), _request8), false, values);
       },
       onReset: function onReset(values) {
-        var _dataFilterFormRef$cu3;
+        var _dataFilterFormRef$cu3, _request9;
         (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
         (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
         setCurrentPage(1);
-        _request(_defineProperty({}, targetPageKey, 1), false, values);
+        _request((_request9 = {}, _defineProperty(_request9, targetPageKey, 1), _defineProperty(_request9, targetPageSizeKey, pageSize), _request9), false, values);
       }
     });
-  }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef]);
+  }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef, pageSize]);
   var isLoading = (0, _react.useMemo)(function () {
     if (!customRequest) {
       return showLoading && !showSkeleton && (getData.loading || props.loading);