@teamix/pro 1.5.9 → 1.5.10-release.1

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.
@@ -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
  });
@@ -18,13 +18,12 @@ var _getTableProps = _interopRequireDefault(require("./utils/getTableProps"));
18
18
  var _getTableSortIcons = _interopRequireDefault(require("./utils/getTableSortIcons"));
19
19
  var _useTableSelection = _interopRequireDefault(require("./utils/useTableSelection"));
20
20
  var _Fullscreen = _interopRequireDefault(require("./components/ToolBar/Fullscreen"));
21
- var _EmptyContent = _interopRequireDefault(require("./components/EmptyContent"));
21
+ var _proField = require("@teamix/pro-field");
22
22
  var _actions = require("../actions");
23
23
  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;
@@ -37,7 +36,7 @@ Object.keys(_typing).forEach(function (key) {
37
36
  }
38
37
  });
39
38
  });
40
- 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", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView"],
39
+ 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", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps"],
41
40
  _excluded2 = ["onChange"];
42
41
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
43
42
  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); }
@@ -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) {
@@ -178,6 +177,7 @@ var ProTable = function ProTable(props) {
178
177
  cardViewProps = props.cardViewProps,
179
178
  _props$defaultView = props.defaultView,
180
179
  defaultView = _props$defaultView === void 0 ? 'table' : _props$defaultView,
180
+ emptyProps = props.emptyProps,
181
181
  otherProps = _objectWithoutProperties(props, _excluded);
182
182
  var targetPageKey = pageKey || globalPageKey;
183
183
  var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
@@ -694,6 +694,10 @@ var ProTable = function ProTable(props) {
694
694
  data: (0, _utils.getDeepValue)(formatResult.data, result) || [],
695
695
  total: isNaN(dataTotal) ? 0 : Number(dataTotal)
696
696
  };
697
+ } else if (typeof formatResult === 'string') {
698
+ nextData = (0, _utils.getTargetValue)(formatResult, {
699
+ res: result
700
+ });
697
701
  }
698
702
  }
699
703
  if (nextData instanceof Promise) {
@@ -746,7 +750,15 @@ var ProTable = function ProTable(props) {
746
750
  // 列过滤请求参数
747
751
  var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
748
752
  // 格式化后的请求参数
749
- 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));
753
+ var requestData = {};
754
+ 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);
755
+ if (typeof formatParams === 'string') {
756
+ requestData = (0, _utils.getTargetValue)(formatParams, {
757
+ params: preParams
758
+ });
759
+ } else {
760
+ requestData = formatParams(preParams);
761
+ }
750
762
  if (requestData) {
751
763
  if (autoRefreshTimerRef.current) {
752
764
  clearTimeout(autoRefreshTimerRef.current);
@@ -897,7 +909,7 @@ var ProTable = function ProTable(props) {
897
909
  sort: sort,
898
910
  primaryKey: primaryKey,
899
911
  rowSelection: rowSelection,
900
- emptyContent: /*#__PURE__*/_react.default.createElement(_EmptyContent.default, null),
912
+ emptyContent: /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps)),
901
913
  sortIcons: (0, _getTableSortIcons.default)(),
902
914
  fixedHeader: fullscreenState || fixedTableBody,
903
915
  maxBodyHeight: "calc(100vh - ".concat(headerHeight, "px)")
@@ -89,6 +89,14 @@ $fullscreenPadding: 24px;
89
89
  color: var(--table-sort-color-current, #0064c8);
90
90
  }
91
91
  }
92
+ .next-table-empty {
93
+ padding: 0;
94
+ }
95
+ .next-table-wrap-empty {
96
+ .next-table-body tr td{
97
+ border-bottom: 0;
98
+ }
99
+ }
92
100
  }
93
101
 
94
102
  .teamix-pro-table-footer-suction {
@@ -2,7 +2,7 @@
2
2
  * ProTable 类型定义
3
3
  */
4
4
  import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
5
- import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
5
+ import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem, EmptyContentProps } from '../field';
6
6
  import { QueryFilterProps, ProFormType } from '../form';
7
7
  import { ProActionGroupProps, ProActionButtonProps } from '../actions';
8
8
  import { PaginationProps } from '@alicloudfe/components/types/pagination';
@@ -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
  /** 是否第一次加载时就发起请求 */
@@ -158,6 +158,8 @@ export declare type ProTableProps = {
158
158
  cardViewProps?: ProTableCardProps;
159
159
  /** 默认展示维度 **/
160
160
  defaultView?: 'table' | 'card';
161
+ /** 空状态配置 **/
162
+ emptyProps?: EmptyContentProps;
161
163
  } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
162
164
  export declare type rowSelectionType = {
163
165
  getProps?: (record: any, index: number) => any;
@@ -68,7 +68,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
68
68
  };
69
69
  /** 对枚举参数进行处理 */
70
70
  var formatTime = function formatTime(time) {
71
- if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY-MM-DD hh:mm:ss');
71
+ if (typeof time === 'string') return (0, _utils.dateFormat)(time, '', 'YYYY-MM-DD HH:mm:ss');
72
72
  return time;
73
73
  };
74
74
  var formatShape = function formatShape() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.5.9",
3
+ "version": "1.5.10-release.1",
4
4
  "description": "TeamixPro大包",
5
5
  "keywords": [
6
6
  "aliyun",
@@ -49,7 +49,6 @@
49
49
  "lodash.clonedeep": "^4.5.0",
50
50
  "lodash.debounce": "^4.0.8",
51
51
  "lodash.isempty": "^4.4.0",
52
- "path-browserify": "^1.0.1",
53
52
  "react-helmet": "^6.1.0"
54
53
  },
55
54
  "devDependencies": {
@@ -1,8 +0,0 @@
1
- declare global {
2
- interface Window {
3
- HistoryLibrary: any;
4
- ICESTARK: any;
5
- }
6
- }
7
- declare const useRealHistory: () => any;
8
- export default useRealHistory;
@@ -1,40 +0,0 @@
1
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
- 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."); }
3
- 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); }
4
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
5
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
6
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
- // 兼容 react-router-dom v5&v6,拿到真正的 history
8
- import { useEffect, useState } from 'react';
9
- // import path from 'path';
10
- import { useHistory } from 'react-router-dom';
11
- var path = require('path-browserify');
12
- var useRealHistory = function useRealHistory() {
13
- var history;
14
- if (useHistory) {
15
- history = useHistory();
16
- }
17
- var _useState = useState(history),
18
- _useState2 = _slicedToArray(_useState, 2),
19
- realHistory = _useState2[0],
20
- setRealHistory = _useState2[1];
21
- useEffect(function () {
22
- if (window.HistoryLibrary) {
23
- history = window.HistoryLibrary.createBrowserHistory();
24
- var oldPush = history.push;
25
- history.push = function (p) {
26
- if (typeof p === 'string') {
27
- var _window$ICESTARK;
28
- oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
29
- } else {
30
- var _window$ICESTARK2;
31
- p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) === null || _window$ICESTARK2 === void 0 ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
32
- oldPush(p);
33
- }
34
- };
35
- setRealHistory(history);
36
- }
37
- }, []);
38
- return realHistory;
39
- };
40
- export default useRealHistory;
@@ -1,8 +0,0 @@
1
- declare global {
2
- interface Window {
3
- HistoryLibrary: any;
4
- ICESTARK: any;
5
- }
6
- }
7
- declare const useRealHistory: () => any;
8
- export default useRealHistory;
@@ -1,45 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
- var _react = require("react");
8
- var _reactRouterDom = require("react-router-dom");
9
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
- 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."); }
11
- 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); }
12
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
13
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
14
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
- var path = require('path-browserify');
16
- var useRealHistory = function useRealHistory() {
17
- var history;
18
- if (_reactRouterDom.useHistory) {
19
- history = (0, _reactRouterDom.useHistory)();
20
- }
21
- var _useState = (0, _react.useState)(history),
22
- _useState2 = _slicedToArray(_useState, 2),
23
- realHistory = _useState2[0],
24
- setRealHistory = _useState2[1];
25
- (0, _react.useEffect)(function () {
26
- if (window.HistoryLibrary) {
27
- history = window.HistoryLibrary.createBrowserHistory();
28
- var oldPush = history.push;
29
- history.push = function (p) {
30
- if (typeof p === 'string') {
31
- var _window$ICESTARK;
32
- oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
33
- } else {
34
- var _window$ICESTARK2;
35
- p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) === null || _window$ICESTARK2 === void 0 ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
36
- oldPush(p);
37
- }
38
- };
39
- setRealHistory(history);
40
- }
41
- }, []);
42
- return realHistory;
43
- };
44
- var _default = useRealHistory;
45
- exports.default = _default;