@teamix/pro 1.5.11-beta.2 → 1.5.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/index.d.ts CHANGED
@@ -28,5 +28,5 @@ export * from './table';
28
28
  export * from './sidebar';
29
29
  export * from './utils';
30
30
  export * from './timeline';
31
- declare const version = "1.5.11-beta.2";
31
+ declare const version = "1.5.11";
32
32
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };
package/es/index.js CHANGED
@@ -35,7 +35,7 @@ export * from './table';
35
35
  export * from './sidebar';
36
36
  export * from './utils';
37
37
  export * from './timeline';
38
- var version = '1.5.11-beta.2';
38
+ var version = '1.5.11';
39
39
  // By TeamixTest
40
40
  window.postMessage({
41
41
  source: 'teamix-test-devtools',
@@ -18,7 +18,7 @@ import { Button, Dropdown, Menu, Dialog, Grid, Checkbox } from '@alicloudfe/comp
18
18
  import TeamixIcon from '@teamix/icon';
19
19
  import { usePrefixCls, getMessage, getGlobalConfig } from '@teamix/utils';
20
20
  import React, { useState, useEffect } from 'react';
21
- import { cloneDeep, off, on } from '../../utils';
21
+ import { off, on } from '../../utils';
22
22
  import { Ellipsis } from '../../../field';
23
23
  import './index.scss';
24
24
  var CheckboxItem = Menu.CheckboxItem;
@@ -80,9 +80,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
80
80
  var showDataIndex = stateFilterColumns.map(function (item) {
81
81
  return item.dataIndex;
82
82
  });
83
- var stateColumns = cloneDeep(processColumns(columns)).map(function (item) {
83
+ var stateColumns = processColumns(columns).map(function (item) {
84
84
  if (!showDataIndex.includes(item.dataIndex)) {
85
- item.columnFilters = false;
85
+ return _objectSpread(_objectSpread({}, item), {}, {
86
+ columnFilters: false
87
+ });
86
88
  }
87
89
  return item;
88
90
  });
@@ -103,11 +105,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
103
105
  // 全选
104
106
  var onChangeAllColumns = function onChangeAllColumns(check) {
105
107
  setAllVisible(check);
106
- var keyNewColumns = cloneDeep(newColumns);
107
- keyNewColumns.map(function (item) {
108
+ var keyNewColumns = newColumns.map(function (item) {
108
109
  var _item$columnFiltersDi;
109
- item.columnFilters = (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check;
110
- return item;
110
+ return _objectSpread(_objectSpread({}, item), {}, {
111
+ columnFilters: (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check
112
+ });
111
113
  });
112
114
  notifyTableRender(keyNewColumns);
113
115
  };
@@ -119,10 +121,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
119
121
  };
120
122
  // 修改
121
123
  var onChangeColumns = function onChangeColumns(check, dataIndex) {
122
- var keyNewColumns = cloneDeep(newColumns);
123
- keyNewColumns.map(function (item) {
124
+ var keyNewColumns = newColumns.map(function (item) {
124
125
  if (item.dataIndex === dataIndex) {
125
126
  item.columnFilters = check;
127
+ return _objectSpread(_objectSpread({}, item), {}, {
128
+ columnFilters: check
129
+ });
126
130
  }
127
131
  return item;
128
132
  });
@@ -130,26 +134,25 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
130
134
  };
131
135
  // 修改:dialog
132
136
  var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
133
- var keyNewColumns = cloneDeep(newColumns);
134
- notifyTableRender(keyNewColumns);
137
+ notifyTableRender(newColumns);
135
138
  setDropdownVisible(false);
136
139
  };
137
140
  // 向上
138
141
  var moveUp = function moveUp(e, dataIndex) {
139
142
  var _newColumns$filter, _newColumns$filter2;
140
143
  e.stopPropagation();
141
- var keyNewColumns = cloneDeep(newColumns).filter(function (_ref) {
144
+ var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref) {
142
145
  var lock = _ref.lock;
143
146
  return !lock;
144
147
  });
145
- var headLock = cloneDeep((_newColumns$filter = newColumns.filter(function (_ref2) {
148
+ var headLock = (_newColumns$filter = newColumns.filter(function (_ref2) {
146
149
  var lock = _ref2.lock;
147
150
  return lock === true || lock === 'left';
148
- })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
149
- var tailLock = cloneDeep((_newColumns$filter2 = newColumns.filter(function (_ref3) {
151
+ })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : [];
152
+ var tailLock = (_newColumns$filter2 = newColumns.filter(function (_ref3) {
150
153
  var lock = _ref3.lock;
151
154
  return lock === 'right';
152
- })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
155
+ })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : [];
153
156
  var index = keyNewColumns.findIndex(function (_ref4) {
154
157
  var index = _ref4.dataIndex;
155
158
  return index === dataIndex;
@@ -165,18 +168,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
165
168
  var moveDown = function moveDown(e, dataIndex) {
166
169
  var _newColumns$filter3, _newColumns$filter4;
167
170
  e.stopPropagation();
168
- var keyNewColumns = cloneDeep(newColumns).filter(function (_ref5) {
171
+ var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref5) {
169
172
  var lock = _ref5.lock;
170
173
  return !lock;
171
174
  });
172
- var headLock = cloneDeep((_newColumns$filter3 = newColumns.filter(function (_ref6) {
175
+ var headLock = (_newColumns$filter3 = newColumns.filter(function (_ref6) {
173
176
  var lock = _ref6.lock;
174
177
  return lock === true || lock === 'left';
175
- })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
176
- var tailLock = cloneDeep((_newColumns$filter4 = newColumns.filter(function (_ref7) {
178
+ })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : [];
179
+ var tailLock = (_newColumns$filter4 = newColumns.filter(function (_ref7) {
177
180
  var lock = _ref7.lock;
178
181
  return lock === 'right';
179
- })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
182
+ })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : [];
180
183
  var index = keyNewColumns.findIndex(function (_ref8) {
181
184
  var index = _ref8.dataIndex;
182
185
  return index === dataIndex;
@@ -329,9 +332,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
329
332
  return key === dataIndex;
330
333
  })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
331
334
  onChange: function onChange(check) {
332
- var columnsList = cloneDeep(newColumns).map(function (item) {
335
+ var columnsList = newColumns.map(function (item) {
333
336
  if (item.dataIndex === dataIndex) {
334
- item.columnFilters = check;
337
+ return _objectSpread(_objectSpread({}, item), {}, {
338
+ columnFilters: check
339
+ });
335
340
  }
336
341
  return item;
337
342
  });
@@ -106,13 +106,13 @@ var LayoutIcon = function LayoutIcon(props) {
106
106
  };
107
107
  // 渲染刷新图标
108
108
  var renderRefreshIcon = function renderRefreshIcon() {
109
- if (!!autoRefresh && autoRefreshVisible) {
109
+ if (!!autoRefresh && autoRefreshVisible && typeof autoRefresh !== 'function') {
110
110
  return /*#__PURE__*/React.createElement(TeamixIcon, {
111
111
  size: "small",
112
112
  type: "auto-refresh-on-line"
113
113
  });
114
114
  }
115
- if (!!autoRefresh && !autoRefreshVisible) {
115
+ if (!!autoRefresh && !autoRefreshVisible && typeof autoRefresh !== 'function') {
116
116
  return /*#__PURE__*/React.createElement(TeamixIcon, {
117
117
  size: "small",
118
118
  type: "auto-refresh-off-line"
@@ -136,7 +136,7 @@ var LayoutIcon = function LayoutIcon(props) {
136
136
  }
137
137
  }, item.label);
138
138
  });
139
- if (autoRefresh) {
139
+ if (autoRefresh && typeof autoRefresh !== 'function') {
140
140
  return /*#__PURE__*/React.createElement(Dropdown, {
141
141
  trigger: /*#__PURE__*/React.createElement(Button, {
142
142
  iconSize: "small",
package/es/table/index.js CHANGED
@@ -5,9 +5,6 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
5
5
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
6
6
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
7
7
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
8
- 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; }
9
- 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; }
10
- 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; }
11
8
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
12
9
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
13
10
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -16,11 +13,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
16
13
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
14
  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; }
18
15
  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; }
16
+ 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; }
17
+ 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; }
18
+ 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; }
19
19
  import React, { useState, useEffect, useRef, useMemo } from 'react';
20
20
  import { Table, Checkbox } from '@alicloudfe/components';
21
21
  import Pagination from './components/Pagination';
22
22
  import genProColumnToColumn from './utils/genProColumnToColumn';
23
- import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTestRequestData, getTestRequestParams } from '@teamix/utils';
23
+ import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTestRequestData, getTestRequestParams, getTargetValue } from '@teamix/utils';
24
24
  import { ProSkeletonRaw as Skeleton } from '../skeleton';
25
25
  import './index.scss';
26
26
  import Layout from './components/Layout';
@@ -35,7 +35,6 @@ import classNames from 'classnames';
35
35
  import ProPageContainer from '../page-container';
36
36
  import debounce from 'lodash.debounce';
37
37
  import CardView from './components/CardView';
38
- import cloneDeep from 'lodash.clonedeep';
39
38
  export * from './typing';
40
39
  var cls = usePrefixCls('teamix-pro-table');
41
40
  /**
@@ -46,8 +45,8 @@ var cls = usePrefixCls('teamix-pro-table');
46
45
  var processColumns = function processColumns(columns, initialColumns) {
47
46
  var _getGlobalConfig;
48
47
  var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
49
- var filterColumns = cloneDeep(columns).filter(function (item) {
50
- return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
48
+ var filterColumns = columns.filter(function (item) {
49
+ return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
51
50
  });
52
51
  // 处理只剩一列批量选择的情况下宽度错乱问题
53
52
  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
@@ -693,6 +692,10 @@ var ProTable = function ProTable(props) {
693
692
  data: getDeepValue(formatResult.data, result) || [],
694
693
  total: isNaN(dataTotal) ? 0 : Number(dataTotal)
695
694
  };
695
+ } else if (typeof formatResult === 'string') {
696
+ nextData = getTargetValue(formatResult, {
697
+ res: result
698
+ });
696
699
  }
697
700
  }
698
701
  if (nextData instanceof Promise) {
@@ -745,7 +748,15 @@ var ProTable = function ProTable(props) {
745
748
  // 列过滤请求参数
746
749
  var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
747
750
  // 格式化后的请求参数
748
- var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
751
+ var requestData = {};
752
+ var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params);
753
+ if (typeof formatParams === 'string') {
754
+ requestData = getTargetValue(formatParams, {
755
+ params: preParams
756
+ });
757
+ } else {
758
+ requestData = formatParams(preParams);
759
+ }
749
760
  if (requestData) {
750
761
  if (autoRefreshTimerRef.current) {
751
762
  clearTimeout(autoRefreshTimerRef.current);
@@ -78,9 +78,9 @@ export declare type ProTableProps = {
78
78
  /** sort 排序请求参数处理函数 */
79
79
  formatSort?: (sort: object) => object;
80
80
  /** 如需自定义调用参数格式,则可以设定此值在请求前对 params 进行自定义,如果返回false则可以阻止请求 */
81
- formatParams?: (params: any) => typeof params;
81
+ formatParams?: ((params: any) => typeof params) | string;
82
82
  /** 对返回值的 data,total 进行映射处理 */
83
- formatResult?: TDataService | ((res: any) => TDataService);
83
+ formatResult?: TDataService | ((res: any) => TDataService) | string;
84
84
  /** 请求成功后经过 formatResult 转换后的回调 */
85
85
  onFormatResult?: (data: any[]) => void;
86
86
  /** 是否第一次加载时就发起请求 */
package/lib/index.d.ts CHANGED
@@ -28,5 +28,5 @@ export * from './table';
28
28
  export * from './sidebar';
29
29
  export * from './utils';
30
30
  export * from './timeline';
31
- declare const version = "1.5.11-beta.2";
31
+ declare const version = "1.5.11";
32
32
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -280,7 +280,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
280
280
  if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
281
281
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
282
282
  }
283
- var version = '1.5.11-beta.2';
283
+ var version = '1.5.11';
284
284
  // By TeamixTest
285
285
  exports.version = version;
286
286
  window.postMessage({
@@ -87,9 +87,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
87
87
  var showDataIndex = stateFilterColumns.map(function (item) {
88
88
  return item.dataIndex;
89
89
  });
90
- var stateColumns = (0, _utils2.cloneDeep)(processColumns(columns)).map(function (item) {
90
+ var stateColumns = processColumns(columns).map(function (item) {
91
91
  if (!showDataIndex.includes(item.dataIndex)) {
92
- item.columnFilters = false;
92
+ return _objectSpread(_objectSpread({}, item), {}, {
93
+ columnFilters: false
94
+ });
93
95
  }
94
96
  return item;
95
97
  });
@@ -110,11 +112,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
110
112
  // 全选
111
113
  var onChangeAllColumns = function onChangeAllColumns(check) {
112
114
  setAllVisible(check);
113
- var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
114
- keyNewColumns.map(function (item) {
115
+ var keyNewColumns = newColumns.map(function (item) {
115
116
  var _item$columnFiltersDi;
116
- item.columnFilters = (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check;
117
- return item;
117
+ return _objectSpread(_objectSpread({}, item), {}, {
118
+ columnFilters: (_item$columnFiltersDi = item.columnFiltersDisabled) !== null && _item$columnFiltersDi !== void 0 ? _item$columnFiltersDi : check
119
+ });
118
120
  });
119
121
  notifyTableRender(keyNewColumns);
120
122
  };
@@ -126,10 +128,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
126
128
  };
127
129
  // 修改
128
130
  var onChangeColumns = function onChangeColumns(check, dataIndex) {
129
- var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
130
- keyNewColumns.map(function (item) {
131
+ var keyNewColumns = newColumns.map(function (item) {
131
132
  if (item.dataIndex === dataIndex) {
132
133
  item.columnFilters = check;
134
+ return _objectSpread(_objectSpread({}, item), {}, {
135
+ columnFilters: check
136
+ });
133
137
  }
134
138
  return item;
135
139
  });
@@ -137,26 +141,25 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
137
141
  };
138
142
  // 修改:dialog
139
143
  var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
140
- var keyNewColumns = (0, _utils2.cloneDeep)(newColumns);
141
- notifyTableRender(keyNewColumns);
144
+ notifyTableRender(newColumns);
142
145
  setDropdownVisible(false);
143
146
  };
144
147
  // 向上
145
148
  var moveUp = function moveUp(e, dataIndex) {
146
149
  var _newColumns$filter, _newColumns$filter2;
147
150
  e.stopPropagation();
148
- var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref) {
151
+ var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref) {
149
152
  var lock = _ref.lock;
150
153
  return !lock;
151
154
  });
152
- var headLock = (0, _utils2.cloneDeep)((_newColumns$filter = newColumns.filter(function (_ref2) {
155
+ var headLock = (_newColumns$filter = newColumns.filter(function (_ref2) {
153
156
  var lock = _ref2.lock;
154
157
  return lock === true || lock === 'left';
155
- })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
156
- var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter2 = newColumns.filter(function (_ref3) {
158
+ })) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : [];
159
+ var tailLock = (_newColumns$filter2 = newColumns.filter(function (_ref3) {
157
160
  var lock = _ref3.lock;
158
161
  return lock === 'right';
159
- })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
162
+ })) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : [];
160
163
  var index = keyNewColumns.findIndex(function (_ref4) {
161
164
  var index = _ref4.dataIndex;
162
165
  return index === dataIndex;
@@ -172,18 +175,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
172
175
  var moveDown = function moveDown(e, dataIndex) {
173
176
  var _newColumns$filter3, _newColumns$filter4;
174
177
  e.stopPropagation();
175
- var keyNewColumns = (0, _utils2.cloneDeep)(newColumns).filter(function (_ref5) {
178
+ var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref5) {
176
179
  var lock = _ref5.lock;
177
180
  return !lock;
178
181
  });
179
- var headLock = (0, _utils2.cloneDeep)((_newColumns$filter3 = newColumns.filter(function (_ref6) {
182
+ var headLock = (_newColumns$filter3 = newColumns.filter(function (_ref6) {
180
183
  var lock = _ref6.lock;
181
184
  return lock === true || lock === 'left';
182
- })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
183
- var tailLock = (0, _utils2.cloneDeep)((_newColumns$filter4 = newColumns.filter(function (_ref7) {
185
+ })) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : [];
186
+ var tailLock = (_newColumns$filter4 = newColumns.filter(function (_ref7) {
184
187
  var lock = _ref7.lock;
185
188
  return lock === 'right';
186
- })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
189
+ })) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : [];
187
190
  var index = keyNewColumns.findIndex(function (_ref8) {
188
191
  var index = _ref8.dataIndex;
189
192
  return index === dataIndex;
@@ -336,9 +339,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
336
339
  return key === dataIndex;
337
340
  })) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
338
341
  onChange: function onChange(check) {
339
- var columnsList = (0, _utils2.cloneDeep)(newColumns).map(function (item) {
342
+ var columnsList = newColumns.map(function (item) {
340
343
  if (item.dataIndex === dataIndex) {
341
- item.columnFilters = check;
344
+ return _objectSpread(_objectSpread({}, item), {}, {
345
+ columnFilters: check
346
+ });
342
347
  }
343
348
  return item;
344
349
  });
@@ -113,13 +113,13 @@ var LayoutIcon = function LayoutIcon(props) {
113
113
  };
114
114
  // 渲染刷新图标
115
115
  var renderRefreshIcon = function renderRefreshIcon() {
116
- if (!!autoRefresh && autoRefreshVisible) {
116
+ if (!!autoRefresh && autoRefreshVisible && typeof autoRefresh !== 'function') {
117
117
  return /*#__PURE__*/_react.default.createElement(_icon.default, {
118
118
  size: "small",
119
119
  type: "auto-refresh-on-line"
120
120
  });
121
121
  }
122
- if (!!autoRefresh && !autoRefreshVisible) {
122
+ if (!!autoRefresh && !autoRefreshVisible && typeof autoRefresh !== 'function') {
123
123
  return /*#__PURE__*/_react.default.createElement(_icon.default, {
124
124
  size: "small",
125
125
  type: "auto-refresh-off-line"
@@ -143,7 +143,7 @@ var LayoutIcon = function LayoutIcon(props) {
143
143
  }
144
144
  }, item.label);
145
145
  });
146
- if (autoRefresh) {
146
+ if (autoRefresh && typeof autoRefresh !== 'function') {
147
147
  return /*#__PURE__*/_react.default.createElement(_components.Dropdown, {
148
148
  trigger: /*#__PURE__*/_react.default.createElement(_components.Button, {
149
149
  iconSize: "small",
@@ -24,7 +24,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
24
24
  var _pageContainer = _interopRequireDefault(require("../page-container"));
25
25
  var _lodash = _interopRequireDefault(require("lodash.debounce"));
26
26
  var _CardView = _interopRequireDefault(require("./components/CardView"));
27
- var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
28
27
  var _typing = require("./typing");
29
28
  Object.keys(_typing).forEach(function (key) {
30
29
  if (key === "default" || key === "__esModule") return;
@@ -47,9 +46,6 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
47
46
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
48
47
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
49
48
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
50
- 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; }
51
- 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; }
52
- 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; }
53
49
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
54
50
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
55
51
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -58,6 +54,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
58
54
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
59
55
  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; }
60
56
  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; }
57
+ 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; }
58
+ 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; }
59
+ 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; }
61
60
  var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
62
61
  /**
63
62
  * 处理原生传入的 columns 以便于 选择列 方便处理
@@ -67,8 +66,8 @@ var cls = (0, _utils.usePrefixCls)('teamix-pro-table');
67
66
  var processColumns = function processColumns(columns, initialColumns) {
68
67
  var _getGlobalConfig;
69
68
  var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
70
- var filterColumns = (0, _lodash2.default)(columns).filter(function (item) {
71
- return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
69
+ var filterColumns = columns.filter(function (item) {
70
+ return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
72
71
  });
73
72
  // 处理只剩一列批量选择的情况下宽度错乱问题
74
73
  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
@@ -714,6 +713,10 @@ var ProTable = function ProTable(props) {
714
713
  data: (0, _utils.getDeepValue)(formatResult.data, result) || [],
715
714
  total: isNaN(dataTotal) ? 0 : Number(dataTotal)
716
715
  };
716
+ } else if (typeof formatResult === 'string') {
717
+ nextData = (0, _utils.getTargetValue)(formatResult, {
718
+ res: result
719
+ });
717
720
  }
718
721
  }
719
722
  if (nextData instanceof Promise) {
@@ -766,7 +769,15 @@ var ProTable = function ProTable(props) {
766
769
  // 列过滤请求参数
767
770
  var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$g = _actionRef$current6.getFilterRules) === null || _actionRef$current6$g === void 0 ? void 0 : _actionRef$current6$g.call(_actionRef$current6)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
768
771
  // 格式化后的请求参数
769
- var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
772
+ var requestData = {};
773
+ var preParams = _objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread3 = {}, _defineProperty(_objectSpread3, targetPageKey, currentPage), _defineProperty(_objectSpread3, targetPageSizeKey, pageSize), _objectSpread3), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params);
774
+ if (typeof formatParams === 'string') {
775
+ requestData = (0, _utils.getTargetValue)(formatParams, {
776
+ params: preParams
777
+ });
778
+ } else {
779
+ requestData = formatParams(preParams);
780
+ }
770
781
  if (requestData) {
771
782
  if (autoRefreshTimerRef.current) {
772
783
  clearTimeout(autoRefreshTimerRef.current);
@@ -78,9 +78,9 @@ export declare type ProTableProps = {
78
78
  /** sort 排序请求参数处理函数 */
79
79
  formatSort?: (sort: object) => object;
80
80
  /** 如需自定义调用参数格式,则可以设定此值在请求前对 params 进行自定义,如果返回false则可以阻止请求 */
81
- formatParams?: (params: any) => typeof params;
81
+ formatParams?: ((params: any) => typeof params) | string;
82
82
  /** 对返回值的 data,total 进行映射处理 */
83
- formatResult?: TDataService | ((res: any) => TDataService);
83
+ formatResult?: TDataService | ((res: any) => TDataService) | string;
84
84
  /** 请求成功后经过 formatResult 转换后的回调 */
85
85
  onFormatResult?: (data: any[]) => void;
86
86
  /** 是否第一次加载时就发起请求 */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.5.11-beta.2",
3
+ "version": "1.5.11",
4
4
  "description": "TeamixPro大包",
5
5
  "keywords": [
6
6
  "aliyun",
@@ -1,28 +0,0 @@
1
- /**
2
- * lodash (Custom Build) <https://lodash.com/>
3
- * Build: `lodash modularize exports="npm" -o ./`
4
- * Copyright jQuery Foundation and other contributors <https://jquery.org/>
5
- * Released under MIT license <https://lodash.com/license>
6
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
7
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
8
- */
9
- /**
10
- * This method is like `_.clone` except that it recursively clones `value`.
11
- *
12
- * @static
13
- * @memberOf _
14
- * @since 1.0.0
15
- * @category Lang
16
- * @param {*} value The value to recursively clone.
17
- * @returns {*} Returns the deep cloned value.
18
- * @see _.clone
19
- * @example
20
- *
21
- * var objects = [{ 'a': 1 }, { 'b': 2 }];
22
- *
23
- * var deep = _.cloneDeep(objects);
24
- * console.log(deep[0] === objects[0]);
25
- * // => false
26
- */
27
- declare function cloneDeep(value: any): any;
28
- export default cloneDeep;