@teamix/pro 1.5.8 → 1.5.9

package/es/index.d.ts

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

package/es/index.js

@@ -35,7 +35,7 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.8';
+var version = '1.5.9';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
 // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/table/index.js

@@ -35,6 +35,7 @@ import classNames from 'classnames';
 import ProPageContainer from '../page-container';
 import debounce from 'lodash.debounce';
 import CardView from './components/CardView';
+import cloneDeep from 'lodash.clonedeep';
 export * from './typing';
 var cls = usePrefixCls('teamix-pro-table');
 /**
@@ -45,7 +46,7 @@ var cls = usePrefixCls('teamix-pro-table');
 var processColumns = function processColumns(columns, initialColumns) {
   var _getGlobalConfig;
   var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
-  var filterColumns = columns.filter(function (item) {
+  var filterColumns = cloneDeep(columns).filter(function (item) {
     return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
   });
   // 处理只剩一列批量选择的情况下宽度错乱问题

package/es/table/typing.d.ts

@@ -58,9 +58,11 @@ export declare type ProTableColumnProps = {
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
+    /** 多级表头 **/
+    children?: ProTableColumnProps[];
     /** ProField 其他配置项 */
     props?: any;
-} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
+} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode' | 'children'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */

package/es/table/utils/genProColumnToColumn.js

@@ -1,4 +1,4 @@
-var _excluded = ["filters", "dataIndex"];
+var _excluded = ["filters", "dataIndex", "children"];
 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; }
@@ -20,6 +20,7 @@ showSkeleton, actionRef) {
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
       dataIndex = columnProps.dataIndex,
+      children = columnProps.children,
       others = _objectWithoutProperties(columnProps, _excluded);
     if (showSkeleton) {
       return _objectSpread(_objectSpread({}, others), {}, {
@@ -37,6 +38,7 @@ showSkeleton, actionRef) {
       align: columnProps.valueType === 'money' ? 'right' : 'left',
       wordBreak: getLanguage() === 'en-us' ? 'word' : 'all'
     }, others), {}, {
+      children: children ? genProColumnToColumn(children, showSkeleton, actionRef, context) : undefined,
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: renderColumnsTitle(columnProps, actionRef),
       cell: function cell(value, index, record) {

package/lib/index.d.ts

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

package/lib/index.js

@@ -280,5 +280,5 @@ 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.8';
+var version = '1.5.9';
 exports.version = version;

package/lib/table/index.js

@@ -24,6 +24,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _pageContainer = _interopRequireDefault(require("../page-container"));
 var _lodash = _interopRequireDefault(require("lodash.debounce"));
 var _CardView = _interopRequireDefault(require("./components/CardView"));
+var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
 var _typing = require("./typing");
 Object.keys(_typing).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -66,7 +67,7 @@ var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
 var processColumns = function processColumns(columns, initialColumns) {
   var _getGlobalConfig;
   var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
-  var filterColumns = columns.filter(function (item) {
+  var filterColumns = (0, _lodash2.default)(columns).filter(function (item) {
     return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
   });
   // 处理只剩一列批量选择的情况下宽度错乱问题

package/lib/table/typing.d.ts

@@ -58,9 +58,11 @@ export declare type ProTableColumnProps = {
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
     format?: string;
+    /** 多级表头 **/
+    children?: ProTableColumnProps[];
     /** ProField 其他配置项 */
     props?: any;
-} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
+} & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode' | 'children'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */

package/lib/table/utils/genProColumnToColumn.js

@@ -8,7 +8,7 @@ var _react = _interopRequireDefault(require("react"));
 var _columnRender = require("./columnRender");
 var _skeleton = require("../../skeleton");
 var _utils = require("@teamix/utils");
-var _excluded = ["filters", "dataIndex"];
+var _excluded = ["filters", "dataIndex", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -27,6 +27,7 @@ showSkeleton, actionRef) {
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
       dataIndex = columnProps.dataIndex,
+      children = columnProps.children,
       others = _objectWithoutProperties(columnProps, _excluded);
     if (showSkeleton) {
       return _objectSpread(_objectSpread({}, others), {}, {
@@ -44,6 +45,7 @@ showSkeleton, actionRef) {
       align: columnProps.valueType === 'money' ? 'right' : 'left',
       wordBreak: (0, _utils.getLanguage)() === 'en-us' ? 'word' : 'all'
     }, others), {}, {
+      children: children ? genProColumnToColumn(children, showSkeleton, actionRef, context) : undefined,
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef),
       cell: function cell(value, index, record) {

package/package.json

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