@teamix/pro 1.2.19 → 1.2.23

package/lib/table/index.js

@@ -10,6 +10,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _components = require("@alicloudfe/components");
 
+var _Pagination = _interopRequireDefault(require("./components/Pagination"));
+
 var _genProColumnToColumn = _interopRequireDefault(require("./utils/genProColumnToColumn"));
 
 var _utils = require("@teamix/utils");
@@ -55,7 +57,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-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", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -108,25 +110,29 @@ var processColumns = function processColumns(columns, initialColumns) {
     return item.columnFilters !== false;
   }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
-  if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) && (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
-    var _filterColumns$, _filterColumns$2;
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
 
-    if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
-      delete filterColumns[0].width;
-    }
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
 
-    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 ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
 
-    if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
-      filterColumns[0].width = initialColumns[0].width;
-    }
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
+      var _initialColumns$2, _initialColumns$3;
+
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.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;
+      if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
     }
   }
 
@@ -185,6 +191,7 @@ var ProTable = function ProTable(props) {
       showPagination = _props$showPagination === void 0 ? true : _props$showPagination,
       _props$pageSizeList = props.pageSizeList,
       pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
+      responsivePaginationType = props.responsivePaginationType,
       _props$showSkeleton = props.showSkeleton,
       propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
       _props$skeletonSize = props.skeletonSize,
@@ -200,6 +207,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;
@@ -243,8 +252,10 @@ var ProTable = function ProTable(props) {
   var _useState13 = (0, _react.useState)(true),
       _useState14 = _slicedToArray(_useState13, 2),
       customTableLoading = _useState14[0],
-      setCustomTableLoading = _useState14[1];
+      setCustomTableLoading = _useState14[1]; // 用于存放 Search 组件之前值的 ref
 
+
+  var searchValueRef = (0, _react.useRef)('');
   var tableRef = (0, _react.useRef)(null);
   var actionRef = (0, _react.useRef)(); // 传给 table 的过滤后的 columns
 
@@ -443,9 +454,14 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
+      var update = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       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);
+
+      if (update) {
+        (0, _utils2.emit)('refreshFilterState', newColumns);
+      }
     },
     setSize: function setSize(mode) {
       _setSize(mode);
@@ -649,10 +665,8 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
-    var _actionRef$current5, _actionRef$current5$i;
-
-    // 初始化 state 状态
-    actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
+    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
+    (0, _utils2.initActionRef)(); // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -666,6 +680,14 @@ var ProTable = function ProTable(props) {
       _request();
     }
 
+    var searchName = getSearchName();
+
+    if (searchName) {
+      // 如果有初始值，需要赋值
+      var initialValues = toJS(dataFilterForm.initialValues);
+      searchValueRef.current = initialValues[searchName][1];
+    }
+
     return function () {
       if (autoRefreshTimerRef.current) {
         clearTimeout(autoRefreshTimerRef.current);
@@ -685,18 +707,54 @@ var ProTable = function ProTable(props) {
     setSort(nextSort);
 
     _request(targetFormatSort(nextSort));
-  } // 处理 dataFilter 中的 onFilter、onReset
+  } // 找到 Search 组件对应的 name
 
 
-  var dataFilter = _objectSpread(_objectSpread({}, propsDataFilter), {}, {
-    onFilter: (0, _lodash.default)(function () {
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
+  var getSearchName = function getSearchName() {
+    var _dataFilter$schema;
+
+    if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) && ((_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) > 0) {
+      var searchSchema = dataFilter.schema.find(function (item) {
+        return item.component === 'Search';
+      });
+
+      if (searchSchema) {
+        var searchName = searchSchema.name;
+        return searchName;
+      }
+    }
+  }; // 处理 dataFilter 中的 onFilter、onReset
+
+
+  var dataFilter = _objectSpread(_objectSpread({
+    mode: 'inline'
+  }, propsDataFilter), {}, {
+    onFilter: (0, _lodash.default)(function (values) {
+      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(values));
 
       if (dataFilterForm.validate()) {
-        var _actionRef$current6, _actionRef$current6$c;
+        var _actionRef$current5, _actionRef$current5$c;
+
+        /**
+         * 针对 inline 模式下的 Search 组件做特殊处理
+         * 当切换条件且输入内容为空的时候，类似[a, ''] => [b, ''] 不触发请求
+         */
+        if (dataFilter.mode === 'inline') {
+          var searchName = getSearchName();
+
+          if (searchName) {
+            var searchValue = values[searchName][1];
 
-        // 搜索变化时，暂时先清空选择
-        (_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);
+            if (searchValue === (searchValueRef === null || searchValueRef === void 0 ? void 0 : searchValueRef.current)) {
+              return;
+            }
+
+            searchValueRef.current = searchValue;
+          }
+        } // 搜索变化时，暂时先清空选择
+
+
+        (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$c = _actionRef$current5.clearRowSelection) === null || _actionRef$current5$c === void 0 ? void 0 : _actionRef$current5$c.call(_actionRef$current5);
         setCurrentPage(1);
 
         _request(_defineProperty({}, targetPageKey, 1));
@@ -732,7 +790,8 @@ var ProTable = function ProTable(props) {
         columns: propsColumns,
         dataFilter: dataFilter,
         dataFilterForm: dataFilterForm,
-        rowSelection: rowSelection
+        rowSelection: rowSelection,
+        filterColumnType: filterColumnType
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -790,21 +849,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
-      var _actionRef$current7, _actionRef$current7$c;
+      var _actionRef$current6, _actionRef$current6$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);
+      (_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(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _actionRef$current8$c, _request5;
+      var _actionRef$current7, _actionRef$current7$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);
+      (_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);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -838,12 +897,15 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread({
+      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_Pagination.default, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number) {
           return onChangePagination(number);
         },
         total: total,
+        responsivePaginationType: responsivePaginationType,
+        // shape="arrow-only"
+        // pageSizePosition="end"
         totalRender: function totalRender(total) {
           return (0, _utils.getMessage)('total', {
             total: total
@@ -851,10 +913,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/lib/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%;
+  }
+  .teamix-pro-pagination-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
   }
   &-footer-action {
     margin-left: 16px;

package/lib/table/typing.d.ts

@@ -12,7 +12,7 @@ import React from 'react';
 import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
-declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
+declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
 declare type ITableCellRender = {
     [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
@@ -22,6 +22,7 @@ declare type TDataService = {
     /** 表格数据 */
     data?: any;
 };
+export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
     /**
      * 会在 title 之后展示一个 icon，hover 之后提示一些信息
@@ -92,6 +93,8 @@ export declare type ProTableProps = {
     paginationProps?: PaginationProps;
     /** 是否显示翻页器  */
     showPagination?: boolean;
+    /** 手动指定响应式翻页器的 type */
+    responsivePaginationType?: responsivePaginationType;
     /** 是否使用内置的 rowSelection */
     useRowSelection?: boolean;
     /** 内置 rowSelection 变化时的回调 */
@@ -146,7 +149,7 @@ export declare type ProTableActionType = {
     /** 全屏展示 */
     fullScreen?: () => boolean;
     /** 设置显示列 */
-    setColumn?: (newColumns: ProColumnProps[]) => void;
+    setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -220,6 +223,8 @@ export declare type ProTableDataFilterProps = {
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
+    /** 自定义内容 */
+    content?: React.ReactNode;
 } & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
@@ -235,6 +240,8 @@ export declare type ProTableTopAreaProps = {
     dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
+    /** 排序、筛选列展示状态 */
+    filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };
 /** 单个工具栏 */
 export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';

package/lib/table/utils/columnRender.js

@@ -220,7 +220,8 @@ var processRenderFunction = function processRenderFunction() {
   var value = arguments.length > 1 ? arguments[1] : undefined;
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
-  var external = ['linkOnClick', 'link', 'value'];
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

package/lib/table/utils/index.d.ts

@@ -1,4 +1,11 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+export declare function initActionRef(): void;
+/** table 组件内监听 不对外暴露 */
+export declare function on(fun: any, key: string): void;
+/** table 组件内销毁监听 不对外暴露 */
+export declare function off(key: string): void;
+/** table 组件内触发事件 不对外暴露 */
+export declare function emit(key: string, ...args: any): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;

package/lib/table/utils/index.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cloneDeep = cloneDeep;
+exports.emit = emit;
+exports.initActionRef = initActionRef;
+exports.off = off;
+exports.on = on;
 exports.useActionType = useActionType;
 
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
@@ -28,19 +32,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// 组件内全局状态
+// 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
 var state = {
   fullScreenState: false,
   filterRules: {},
   filterColumns: []
 };
 
-var _initState = (0, _lodash.default)(state); // 组件内全局监听事件
+var _initState = (0, _lodash.default)(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
 
 
 var callback = {
   fullScreenState: {}
-}; // 组件内对全局状态的更改
+};
+var initCallback = (0, _lodash.default)(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内监听事件
+// 组件内对全局状态的更改
 
 var mutations = {
   getState: function getState() {
@@ -140,7 +148,41 @@ var useOn = function useOn(state) {
       }
     });
   }
-};
+}; // 初始化 actionRef
+
+
+function initActionRef() {
+  state = (0, _lodash.default)(_initState);
+  callback = (0, _lodash.default)(initCallback);
+}
+/** table 组件内监听 不对外暴露 */
+
+
+function on(fun, key) {
+  tableCallback[key] = fun;
+}
+/** table 组件内销毁监听 不对外暴露 */
+
+
+function off(key) {
+  if (tableCallback[key]) {
+    delete tableCallback[key];
+  }
+}
+/** table 组件内触发事件 不对外暴露 */
+
+
+function emit(key) {
+  var fun = tableCallback[key];
+
+  if (fun) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
+    }
+
+    fun.apply(void 0, args);
+  }
+}
 
 function useActionType(ref, action) {
   // 合并自定义事件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.19",
+  "version": "1.2.23",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@formily/core": "2.0.5",
     "@formily/react": "2.0.5",
-    "@teamix/formily": "2.0.5-1",
+    "@teamix/formily": "2.0.5-2",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",