@teamix/pro 1.4.0 → 1.4.3

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

@@ -50,7 +50,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var CheckboxItem = _components.Menu.CheckboxItem;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter');
 var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {

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

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../../../field");
+
 var _actions = require("../../../actions");
 
 var _form = require("../../../form");
@@ -19,7 +21,7 @@ var _QuickAction = _interopRequireDefault(require("../QuickAction"));
 
 require("./index.scss");
 
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,7 +41,7 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table-layout');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-layout');
 
 var Layout = function Layout(props) {
   var header = props.header,
@@ -48,6 +50,7 @@ var Layout = function Layout(props) {
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
       dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
@@ -119,7 +122,7 @@ var Layout = function Layout(props) {
           addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
-        return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
@@ -136,7 +139,9 @@ var Layout = function Layout(props) {
           },
           addonBefore: renderMainAction(),
           addonAfter: renderAddonAfter()
-        }, dataFilter));
+        }, dataFilter)), afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
@@ -158,7 +163,7 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_field.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,
@@ -172,7 +177,7 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_field.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,

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

@@ -45,8 +45,6 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-pagination');
-
 var _default = function _default(props) {
   var className = props.className,
       propsOnChange = props.onChange,
@@ -60,6 +58,11 @@ var _default = function _default(props) {
       responsivePaginationType = props.responsivePaginationType,
       otherProps = _objectWithoutProperties(props, _excluded);
 
+  var basePrefix = (0, _utils.usePrefixCls)('', {
+    base: true
+  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-pagination');
+
   var _useResponsiveProps = (0, _hooks.useResponsiveProps)([480, 590, 700], ['mini', 'small', 'simple', 'normal']),
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
@@ -115,11 +118,11 @@ var _default = function _default(props) {
         total: total
       }))
     }, /*#__PURE__*/_react.default.createElement("div", {
-      className: cls('custom-total-content')
+      className: prefixCls('custom-total-content')
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "title"
     }, (0, _utils.getMessage)('pageSize')), /*#__PURE__*/_react.default.createElement(_components.Select, {
-      className: cls('custom-page-size-selector'),
+      className: prefixCls('custom-page-size-selector'),
       dataSource: pageSizeList,
       defaultValue: pageSize,
       followTrigger: true,
@@ -176,9 +179,9 @@ var _default = function _default(props) {
     };
 
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: cls('custom-jumper')
+      className: prefixCls('custom-jumper')
     }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
+      className: basePrefix('prev', 'pagination-item'),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +203,7 @@ var _default = function _default(props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
+      className: basePrefix('next', 'pagination-item'),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +221,7 @@ var _default = function _default(props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  ").concat((0, _utils.usePrefixCls)(), "pagination")
+          className: (0, _utils.cls)(basePrefix('pagination'), prefixCls('custom-mini-pagination'))
         }, customTotalRender(total), customJumpRender());
       }
     }
@@ -267,7 +270,7 @@ var _default = function _default(props) {
     // 用于获取翻页器响应式 ref
     _react.default.createElement("div", {
       ref: paginationWrapperRef,
-      className: cls('wrapper')
+      className: prefixCls('wrapper')
     }, renderPagination())
   );
 };

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

@@ -36,7 +36,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var RadioItem = _components.Menu.RadioItem;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
   var _actionRef$current;

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

@@ -17,6 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _utils2 = require("../../utils");
 
+var _field = require("../../../field");
+
 require("./index.scss");
 
 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); }
@@ -54,21 +56,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var CheckboxItem = _components.Menu.CheckboxItem;
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
-
-var isRoot = (0, _utils.getCookie)('organizationId') === '1';
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter-column');
 
 var processColumns = function processColumns(columns) {
-  if (isRoot) {
-    // root 组织下不显示标签管理
-    columns = columns.filter(function (item) {
-      return item.valueType !== 'selectGroup';
-    });
-  } // hidden 为 true 时不展示
+  var _getGlobalConfig;
 
+  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns; // hidden 为 true 时不展示
 
   columns = columns.filter(function (item) {
-    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
   });
   return columns.map(function (item) {
     if (item.columnFilters === false) {
@@ -399,7 +395,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           setNewColumns(columnsList);
         },
         disabled: columnFiltersDisabled
-      }, /*#__PURE__*/_react.default.createElement(_utils.Ellipsis, {
+      }, /*#__PURE__*/_react.default.createElement(_field.Ellipsis, {
         tooltip: title
       }, title)));
     }))));

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

@@ -35,7 +35,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 
 var FullScreenIcon = function FullScreenIcon(props) {
   var _actionRef$current3, _actionRef$current3$o;

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

@@ -20,7 +20,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * 刷新
  */
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
 
 var LayoutIcon = function LayoutIcon(props) {
   var actionRef = props.actionRef; // const [fullscreen, setFullscreen] = useState<boolean>(false);

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

@@ -27,7 +27,7 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar');
 var presetToolBarMap = {
   refresh: _RefreshIcon.default,
   density: _DensityIcon.default,

package/lib/table/index.js

@@ -34,8 +34,6 @@ var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscree
 
 var _EmptyContent = _interopRequireDefault(require("./components/EmptyContent"));
 
-var _form = require("../form");
-
 var _actions = require("../actions");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -55,7 +53,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", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "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", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -95,10 +93,7 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-table');
-var toJS = _form.formilyReactive.toJS; // 判断是否是 root 组织
-
-var isRoot = (0, _utils.getCookie)('organizationId') === '1';
+var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
 /**
  * 处理原生传入的 columns 以便于 选择列 方便处理
  * @param columns 原生传入的 columns
@@ -106,24 +101,17 @@ var isRoot = (0, _utils.getCookie)('organizationId') === '1';
  */
 
 var processColumns = function processColumns(columns, initialColumns) {
-  var _filterColumns;
+  var _getGlobalConfig;
 
+  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
-  });
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
-  if (isRoot) {
-    // root 组织下不显示标签管理
-    filterColumns = filterColumns.filter(function (item) {
-      return item.valueType !== 'selectGroup';
-    });
-  } // 处理只剩一列批量选择的情况下宽度错乱问题
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
 
-
-  if ((_filterColumns = filterColumns) === null || _filterColumns === void 0 ? void 0 : _filterColumns.length) {
-    var _filterColumns2, _initialColumns$;
-
-    if (((_filterColumns2 = filterColumns) === null || _filterColumns2 === void 0 ? void 0 : _filterColumns2.length) === 1) {
+    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) {
@@ -173,6 +161,7 @@ var ProTable = function ProTable(props) {
       mainAction = props.mainAction,
       extra = props.extra,
       propsDataFilter = props.dataFilter,
+      afterDataFilter = props.afterDataFilter,
       toolBar = props.toolBar,
       propsColumns = props.columns,
       useRowSelection = props.useRowSelection,
@@ -225,6 +214,7 @@ var ProTable = function ProTable(props) {
       _props$size = props.size,
       propsSize = _props$size === void 0 ? 'medium' : _props$size,
       disableSelectAll = props.disableSelectAll,
+      context = props.context,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -313,7 +303,10 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var basePrefix = (0, _utils.usePrefixCls)('', {
+      base: true
+    });
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -857,13 +850,14 @@ var ProTable = function ProTable(props) {
         actionRef: actionRef,
         columns: propsColumns,
         dataFilter: dataFilter,
+        afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
         filterColumnType: filterColumnType
       }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
-        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef),
+        columns: (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context),
         loading: getTableLoading(),
         className: (0, _classnames.default)('teamix-pro-table', tableClassName, {
           'with-row-select': rowSelection

package/lib/table/index.scss

@@ -134,4 +134,11 @@ $fullscreenPadding: 24px;
       color: var(--table-row-hover-color);
     }
   }
+}
+
+// 排序icon hover 颜色跟随主题
+.next-table-sort.next-table-header-icon {
+  a:hover {
+    color: var(--color-brand1-5);
+  }
 }

package/lib/table/typing.d.ts

@@ -6,7 +6,7 @@ import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../fi
 import { QueryFilterProps, ProFormType } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
-import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
+import { HeaderProps as ProTableHeaderProps } from '../field';
 import { Method } from 'axios';
 import React from 'react';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
@@ -139,6 +139,8 @@ export declare type ProTableProps = {
     };
     /** 禁用掉批量选择中的全选 */
     disableSelectAll?: boolean;
+    /** 接收外部传来的 context，eg: dialog-table */
+    context?: any;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -254,6 +256,8 @@ export declare type ProTableTopAreaProps = {
     extra?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     /** 数据过滤区 */
     dataFilter?: ProTableDataFilterProps;
+    /** 数据过滤区下方自定义区域 */
+    afterDataFilter?: React.ReactNode;
     /** 传给 QueryFilter 的 formRef */
     dataFilterFormRef?: any;
     /** 排序、筛选列展示状态 */

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

@@ -10,4 +10,4 @@ export declare const renderColumnsTitle: (item: ProTableColumnProps, actionRef:
 /**
  * 负责单元格的具体渲染
  */
-export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>) => JSX.Element;
+export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any) => JSX.Element;

package/lib/table/utils/columnRender.js

@@ -1,5 +1,7 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,10 +13,14 @@ var _utils = require("@teamix/utils");
 
 var _actions = require("../../actions");
 
-var _field = _interopRequireDefault(require("../../field"));
+var _field = _interopRequireWildcard(require("../../field"));
 
 var _Filter = _interopRequireDefault(require("../components/Filter"));
 
+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; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -105,7 +111,7 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
     });
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
     label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
@@ -121,7 +127,9 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
 
 exports.renderColumnsTitle = renderColumnsTitle;
 
-var renderCell = function renderCell(value, item, index, record, actionRef) {
+var renderCell = function renderCell(value, item, index, record, actionRef,
+/** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+context) {
   var _actionSchema$actions;
 
   var _item$valueType = item.valueType,
@@ -182,12 +190,13 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
 
   if (actionSchema && ((_actionSchema$actions = actionSchema.actions) === null || _actionSchema$actions === void 0 ? void 0 : _actionSchema$actions.length)) {
     // 默认 context
-    var defaultContext = {
+    var defaultContext = _objectSpread({
       value: value,
       index: index,
       record: record,
       action: actionRef.current
-    };
+    }, context);
+
     return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, _objectSpread(_objectSpread({
       type: "text"
     }, actionSchema), {}, {

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

@@ -6,4 +6,4 @@ import { ColumnProps } from '@alicloudfe/components/types/table';
  */
 export default function genProColumnToColumn(columns: ProTableColumnProps[], 
 /** 是否渲染骨架屏 */
-showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>): ColumnProps[];
+showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any): ColumnProps[];

package/lib/table/utils/genProColumnToColumn.js

@@ -31,6 +31,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function genProColumnToColumn(columns,
 /** 是否渲染骨架屏 */
 showSkeleton, actionRef) {
+  var context = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
         dataIndex = columnProps.dataIndex,
@@ -55,7 +56,7 @@ showSkeleton, actionRef) {
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef),
       cell: function cell(value, index, record) {
-        return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef);
+        return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef, context);
       }
     });
   });

package/lib/table/utils/pureColumnRender.js

@@ -1,5 +1,7 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +11,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _utils = require("@teamix/utils");
 
-var _field = _interopRequireDefault(require("../../field"));
+var _field = _interopRequireWildcard(require("../../field"));
+
+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; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -43,7 +49,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 增加了 icon 的功能 render title
  */
 var renderColumnsTitle = function renderColumnsTitle(item) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
     label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon

package/lib/timeline/ProTimeLineItem/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../../field");
+
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "time", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
@@ -50,7 +52,7 @@ 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; }
 
 var TimelineItem = _components.Timeline.Item;
-var cls = (0, _utils.baseClass)('teamix-pro-timeline');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-timeline');
 
 var ProTimeLineItem = function ProTimeLineItem(props) {
   var _props$_comment = props._comment,
@@ -138,7 +140,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
 
   var renderTag = function renderTag() {
     if (_typeof(tags) === 'object') {
-      return (0, _utils.renderTags)(tags, 'small');
+      return (0, _field.renderTags)(tags, 'small');
     }
 
     return tags;

package/lib/timeline/index.js

@@ -43,7 +43,7 @@ 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; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-timeline');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-timeline');
 
 var ProTimeline = function ProTimeline(props) {
   var items = props.items,

package/lib/timeline/typing.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { ProTagItem } from '@teamix/utils';
+import { ProTagItem } from '../field';
 export declare type ProTimeLineItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
 export declare type FoldProps = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",

package/es/form/ProForm/useFieldSchema.d.ts

@@ -1,7 +0,0 @@
-declare const _default: ({ children, schema }: any) => any;
-/**
- * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
- * @param props ProForm 组件的 props
- * @returns schema 配置
- */
-export default _default;