@teamix/pro 1.2.16 → 1.2.20

package/es/form/ProForm/index.js

@@ -12,7 +12,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { memo, useEffect, useMemo } from 'react';
 import cls from 'classnames';
-import { createForm, onFormValuesChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
+import { createForm, onFieldValueChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form } from '@teamix/formily';
 import { usePrefixCls, getLanguage } from '@teamix/utils';
@@ -21,6 +21,7 @@ import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
 import validateLocale from '../locales/validate';
+import debounce from 'lodash.debounce';
 import './index.scss';
 registerValidateLocale(validateLocale);
 var ProForm = /*#__PURE__*/memo(function (_ref) {
@@ -78,13 +79,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
 
   useEffect(function () {
-    form.removeEffects('onChange');
-    form.addEffects('onChange', function () {
-      onFormValuesChange(function (form) {
-        if (onChange) {
-          onChange(toJS(form.values));
-        }
-      });
+    form.removeEffects('onFieldValueChange');
+    form.addEffects('onFieldValueChange', function () {
+      onFieldValueChange('*', debounce(function (field, form) {
+        onChange && onChange(toJS(form.values), toJS(field.value), field.props.name);
+      }, 300));
     });
   }, [form, onChange]); // 配置表单默认值
 
@@ -94,6 +93,10 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     } else if (initialRequest) {
       useInitialRequest(initialRequest).then(function (values) {
         form.setInitialValues(values);
+      }).finally(function () {
+        initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
+          form: form
+        });
       });
     }
   }, []); // 配置国际化

package/es/form/ProForm/index.scss

@@ -180,6 +180,9 @@
       border: 0;
     }
   }
+  .#{$css-prefix}input-control:last-child {
+    padding-right: 0;
+  }
 }
 
 // 数组类组件添加按钮

package/es/form/ProForm/useFieldRequest.js

@@ -5,18 +5,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { useField } from '@formily/react';
-import { isPlainObj } from '@teamix/utils';
 export default (function () {
   var field = useField();
 
   var refresh = function refresh() {
-    if (!isPlainObj(field.data)) {
-      field.data = {
-        refresh: {}
-      };
-    } else {
-      field.data.refresh = _objectSpread({}, field.data.refresh);
-    }
+    field.data.refresh = _objectSpread({}, field.data.refresh);
   };
 
   return {

package/es/form/SchemaForm/index.js

@@ -223,7 +223,9 @@ export default /*#__PURE__*/memo(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data
+        data: data || {
+          placeholder: true
+        }
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {

package/es/form/typing.d.ts

@@ -58,12 +58,18 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: CommonRequestConfig;
+    initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, displayValues?: any) => any;
+    onChange?: (values: any, fieldValue?: any, fieldName?: string) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
+export interface FilterProps extends ProFormProps {
+    form: FormType;
+    defaultFilterValue?: string;
+    onReset?: (payload?: any) => void;
+    onResetClick?: () => void;
+}
 export interface QueryFilterProps extends ProFormProps {
     /**
      * @deprecated triggerType已弃用
@@ -73,6 +79,9 @@ export interface QueryFilterProps extends ProFormProps {
     expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
+    defaultFilterValue?: string;
+    formRef?: React.MutableRefObject<any>;
+    onInit?: (values: any) => boolean;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.15";
+declare const version = "1.2.19";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.15';
+var version = '1.2.19';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

package/es/nocode/configurators/ProTable.js

@@ -18,6 +18,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }

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

@@ -140,7 +140,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/React.createElement(Dropdown, {
     trigger: /*#__PURE__*/React.createElement(TeamixIcon, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -149,6 +149,8 @@ var Filter = function Filter(props) {
         setVisible(!visible);
       }
     }),
+    //@ts-ignore
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -171,7 +173,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -199,24 +201,30 @@ var Filter = function Filter(props) {
         return null;
       })), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item === null || item === void 0 ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : _actionRef$current4.pageInfo;
+      })); // 再设置所有的列筛选状态
 
-      if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
-        targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
-
-
-      (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$s = _actionRef$current5.setFilterRules) === null || _actionRef$current5$s === void 0 ? void 0 : _actionRef$current5$s.call(_actionRef$current5, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
         params: param
-      }))); // 发送请求
+      })));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : _actionRef$current5.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
+        (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
 
-      (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+        (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
+      }
 
-      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
   }, getMessage('ok')), /*#__PURE__*/React.createElement(Button, {
@@ -234,7 +242,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       })));
-      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current14$, _actionRef$current15, _actionRef$current15$;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) === null || _actionRef$current12 === void 0 ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && (pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey)) {
+          targetPageKey = pageInfo === null || pageInfo === void 0 ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) === null || _actionRef$current13 === void 0 ? void 0 : (_actionRef$current13$ = _actionRef$current13.request) === null || _actionRef$current13$ === void 0 ? void 0 : _actionRef$current13$.call(_actionRef$current13, _defineProperty({}, targetPageKey, 1));
+        (_actionRef$current14 = actionRef.current) === null || _actionRef$current14 === void 0 ? void 0 : (_actionRef$current14$ = _actionRef$current14.resetPage) === null || _actionRef$current14$ === void 0 ? void 0 : _actionRef$current14$.call(_actionRef$current14); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) === null || _actionRef$current15 === void 0 ? void 0 : (_actionRef$current15$ = _actionRef$current15.clearRowSelection) === null || _actionRef$current15$ === void 0 ? void 0 : _actionRef$current15$.call(_actionRef$current15);
+      } // setVisible(!visible);
+
     }
   }, getMessage('reset'))))));
 };

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

@@ -0,0 +1,3 @@
+import { PaginationProps } from '@alicloudfe/components/types/pagination';
+declare const _default: (props: PaginationProps) => JSX.Element;
+export default _default;

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

@@ -0,0 +1,82 @@
+var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "type", "onPageSizeChange"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+// 自适应宽度的翻页器
+import React from 'react';
+import { Pagination } from '@alicloudfe/components';
+import { useResponsiveProps } from '@teamix/hooks';
+export default (function (props) {
+  var className = props.className,
+      onChange = props.onChange,
+      total = props.total,
+      totalRender = props.totalRender,
+      pageSize = props.pageSize,
+      current = props.current,
+      pageSizeList = props.pageSizeList,
+      pageSizeSelector = props.pageSizeSelector,
+      type = props.type,
+      onPageSizeChange = props.onPageSizeChange,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var _useResponsiveProps = useResponsiveProps([480, 580, 680], ['mini', 'small', 'simple', 'normal']),
+      responsiveProps = _useResponsiveProps.responsiveProps,
+      paginationWrapperRef = _useResponsiveProps.ref;
+
+  var commonPaginationProps = {
+    className: className,
+    onChange: onChange,
+    total: total,
+    pageSize: pageSize,
+    current: current,
+    shape: 'arrow-only',
+    pageSizeList: pageSizeList,
+    pageSizeSelector: pageSizeSelector,
+    pageSizePosition: 'end',
+    onPageSizeChange: onPageSizeChange
+  };
+
+  var renderPagination = function renderPagination() {
+    switch (responsiveProps) {
+      case 'normal':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+
+      case 'simple':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3
+        }, otherProps));
+
+      case 'small':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "simple"
+        }, otherProps));
+
+      case 'mini':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "mini"
+        }, otherProps));
+
+      default:
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+    }
+  };
+
+  return (
+    /*#__PURE__*/
+    // 用于获取翻页器响应式 ref
+    React.createElement("div", {
+      ref: paginationWrapperRef,
+      className: "pagination-wrapper"
+    }, renderPagination())
+  );
+});

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

@@ -54,7 +54,8 @@ var processColumns = function processColumns(columns) {
 var FilterColumnIcon = function FilterColumnIcon(props) {
   var _props$columns = props.columns,
       columns = _props$columns === void 0 ? [] : _props$columns,
-      actionRef = props.actionRef;
+      actionRef = props.actionRef,
+      filterColumnType = props.filterColumnType;
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -241,7 +242,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       align: "tr br"
     }, /*#__PURE__*/React.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(CheckboxItem, {
+    }, /*#__PURE__*/React.createElement(Menu, {
+      className: cls('all-select')
+    }, /*#__PURE__*/React.createElement(CheckboxItem, {
       indeterminate: indeterminate,
       checked: allVisible,
       onChange: onChangeAllColumns
@@ -254,7 +257,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, getMessage('reset'))), /*#__PURE__*/React.createElement(Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref9, index) {
+    })), /*#__PURE__*/React.createElement(Menu, {
+      className: cls('checkbox-group')
+    }, newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
       var dataIndex = _ref9.dataIndex,
@@ -344,12 +349,20 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/React.createElement(Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };
 
-  if (newColumns.length > 10) {
+  if (filterColumnType === 'dialog') {
+    return renderDialog();
+  }
+
+  if (filterColumnType === 'dropdown') {
+    return renderDropdown();
+  }
+
+  if (newColumns.length >= 20) {
     return renderDialog();
   }
 

package/es/table/components/ToolBar/index.scss

@@ -18,8 +18,6 @@
 // FilterColumn
 .teamix-pro-table-toolbar-filter-column {
   min-width: 180px;
-  max-height: 350px;
-  overflow: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
   background: var(--menu-background);
   &-reset {
@@ -76,6 +74,14 @@
     align-items: center;
   }
 }
+.teamix-pro-table-toolbar-filter-column-all-select.teamix-pro-table-toolbar-filter-column-all-select {
+  padding-bottom: 0;
+}
+.teamix-pro-table-toolbar-filter-column-checkbox-group.teamix-pro-table-toolbar-filter-column-checkbox-group {
+  padding-top: 0;
+  max-height: 310px;
+  overflow: auto;
+}
 
 // fullscreen
 .teamix-pro-table-full-screen {

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -33,7 +33,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import React, { useState, useEffect, useRef, useMemo } from 'react';
-import { Table, Pagination, Checkbox } from '@alicloudfe/components';
+import { Table, Checkbox, Pagination } from '@alicloudfe/components'; // import Pagination from './components/Pagination';
+
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
@@ -59,10 +60,36 @@ var toJS = formilyReactive.toJS;
  * @returns
  */
 
-var processColumns = function processColumns(columns) {
-  return columns.filter(function (item) {
+var processColumns = function processColumns(columns, initialColumns) {
+  var filterColumns = columns.filter(function (item) {
     return item.columnFilters !== false;
-  });
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
+
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
+
+      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
+
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else {
+      var _initialColumns$, _initialColumns$2;
+
+      if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
+        filterColumns[0].width = initialColumns[0].width;
+      }
+
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
+    }
+  }
+
+  return filterColumns;
 };
 /** 默认请求翻页参数 */
 
@@ -132,6 +159,8 @@ var ProTable = function ProTable(props) {
     return false;
   } : _props$autoRefresh,
       customRequest = props.customRequest,
+      _props$filterColumnTy = props.filterColumnType,
+      filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -163,7 +192,7 @@ var ProTable = function ProTable(props) {
       sort = _useState10[0],
       setSort = _useState10[1];
 
-  var _useState11 = useState(requestWhenMount && propsShowSkeleton),
+  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton),
       _useState12 = _slicedToArray(_useState11, 2),
       showSkeleton = _useState12[0],
       setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -180,7 +209,7 @@ var ProTable = function ProTable(props) {
   var tableRef = useRef(null);
   var actionRef = useRef(); // 传给 table 的过滤后的 columns
 
-  var _useState15 = useState(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [])),
+  var _useState15 = useState(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
       _useState16 = _slicedToArray(_useState15, 2),
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
@@ -351,10 +380,16 @@ var ProTable = function ProTable(props) {
   useEffect(function () {
     var _actionRef$current, _actionRef$current$se;
 
-    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
-  }, [propsColumns]); // 绑定 Actions
+  }, [propsColumns]); // dataSource 受控
+
+  useEffect(function () {
+    if (propsDataSource) {
+      setData(propsDataSource);
+    }
+  }, [propsDataSource]); // 绑定 Actions
 
   useActionType(actionRef, {
     fullScreen: function fullScreen() {
@@ -369,7 +404,7 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
-      var columns = processColumns(newColumns);
+      var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
     },
@@ -381,6 +416,15 @@ var ProTable = function ProTable(props) {
     },
     request: function request(params) {
       if (dataFilterForm.validate()) {
+        // 如果请求中还有翻页相关信息，需要自动设置到指定页
+        if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
+          setCurrentPage(params[targetPageKey]);
+        }
+
+        if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
+          setPageSize(params[targetPageSizeKey]);
+        }
+
         _request(params);
       }
     },
@@ -411,6 +455,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -609,10 +654,11 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
-        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
-        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
-        // if (mode === 'inline') {
-        // }
+        var _actionRef$current6, _actionRef$current6$c;
+
+        // 搜索变化时，暂时先清空选择
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+        setCurrentPage(1);
 
         _request(_defineProperty({}, targetPageKey, 1));
       }
@@ -647,7 +693,8 @@ var ProTable = function ProTable(props) {
         columns: propsColumns,
         dataFilter: dataFilter,
         dataFilterForm: dataFilterForm,
-        rowSelection: rowSelection
+        rowSelection: rowSelection,
+        filterColumnType: filterColumnType
       }), /*#__PURE__*/React.createElement(Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -705,15 +752,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
+      var _actionRef$current7, _actionRef$current7$c;
+
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      // 翻页暂时先清空选择
+      (_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(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
+      // 翻页暂时先清空选择
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -753,6 +806,8 @@ var ProTable = function ProTable(props) {
           return onChangePagination(number);
         },
         total: total,
+        shape: "arrow-only",
+        pageSizePosition: "end",
         totalRender: function totalRender(total) {
           return getMessage('total', {
             total: total
@@ -760,10 +815,8 @@ var ProTable = function ProTable(props) {
         },
         pageSize: pageSize,
         current: currentPage,
-        shape: "arrow-only",
         pageSizeList: pageSizeList,
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
-        pageSizePosition: "end",
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);

package/es/table/index.scss

@@ -32,12 +32,18 @@ $fullscreenPadding: 24px;
   }
   &-footer-left-wrapper {
     display: flex;
-    flex: 1;
+    flex-shrink: 0;
     align-items: center;
   }
   &-footer-right-wrapper {
     display: flex;
     justify-content: flex-end;
+    width: 100%;
+  }
+  .pagination-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
   }
   &-footer-action {
     margin-left: 16px;