@teamix/pro 1.5.9 → 1.5.10

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.
@@ -17,7 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
17
17
  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; }
18
18
  import React, { useState, useEffect, createRef, useMemo } from 'react';
19
19
  // import { useHistory } from 'react-router-dom';
20
- import useRealHistory from '../utils/useRealHistory';
20
+ import { useRealHistory } from '@teamix/utils';
21
21
  import { Loading } from '@alicloudfe/components';
22
22
  import ProForm, { createForm, formilyReactive } from '../form';
23
23
  import { getTargetValue, resolveMaybePromiseMethod } from '@teamix/utils';
@@ -18,7 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
18
18
  import React, { useState, useEffect, useMemo, useRef } from 'react';
19
19
  import classnames from 'classnames';
20
20
  // import { useHistory } from 'react-router-dom';
21
- import useRealHistory from '../utils/useRealHistory';
21
+ import { useRealHistory } from '@teamix/utils';
22
22
  import { Dialog, Drawer } from '@alicloudfe/components';
23
23
  import PopConfirm from '@teamix/pop-confirm';
24
24
  import { getTargetValue, getMessage } from '@teamix/utils';
@@ -3,7 +3,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
3
3
  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; }
4
4
  import { getTargetValue, goToLink } from '@teamix/utils';
5
5
  // import { useHistory } from 'react-router-dom';
6
- import useRealHistory from '../utils/useRealHistory';
6
+ import { useRealHistory } from '@teamix/utils';
7
7
  import { eventHandler } from './base';
8
8
  export function useLinkAction(action, actionContext) {
9
9
  var history = useRealHistory();
@@ -13,7 +13,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
13
13
  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; }
14
14
  import { useState } from 'react';
15
15
  // import { useHistory } from 'react-router-dom';
16
- import useRealHistory from '../utils/useRealHistory';
16
+ import { useRealHistory } from '@teamix/utils';
17
17
  import { doCommonRequest } from '@teamix/utils';
18
18
  import { eventHandler } from './base';
19
19
  // action 里的数据请求都默认是 post 类型
@@ -222,6 +222,17 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
222
222
  };
223
223
  }();
224
224
  }
225
+ // 自定义updateDataSource
226
+ if (!formRef.current.updateDataSource) {
227
+ formRef.current.updateDataSource = function (query, params) {
228
+ [simpleForm, lightForm, advancedForm].forEach(function (f) {
229
+ var $query = f.query(query).take();
230
+ if ($query) {
231
+ $query.data.refresh = params;
232
+ }
233
+ });
234
+ };
235
+ }
225
236
  }
226
237
  };
227
238
  // 创建简单筛选表单实例
@@ -2,7 +2,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
2
2
  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; }
3
3
  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; }
4
4
  // import { useHistory } from 'react-router-dom';
5
- import useRealHistory from '../../utils/useRealHistory';
5
+ import { useRealHistory } from '@teamix/utils';
6
6
  import { doCommonRequest, isObj } from '@teamix/utils';
7
7
  var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
8
8
  if (isObj(onSubmit)) {
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.9";
31
+ declare const version = "1.5.10";
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,17 @@ export * from './table';
35
35
  export * from './sidebar';
36
36
  export * from './utils';
37
37
  export * from './timeline';
38
- var version = '1.5.9';
38
+ var version = '1.5.10';
39
+ // By TeamixTest
40
+ window.postMessage({
41
+ source: 'teamix-test-devtools',
42
+ url: window.location.href,
43
+ event: 'getModuleInfo',
44
+ moduleName: '@teamix/pro',
45
+ moduleVersion: version,
46
+ moduleType: 'TeamixPro',
47
+ componentName: 'TeamixPro'
48
+ }, '*');
39
49
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
40
50
  // ProLayout,
41
51
  ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };
@@ -8,7 +8,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
8
8
  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; }
9
9
  import React from 'react';
10
10
  // import { useHistory } from 'react-router-dom';
11
- import useRealHistory from '../utils/useRealHistory';
11
+ import { useRealHistory } from '@teamix/utils';
12
12
  import classnames from 'classnames';
13
13
  import TeamixIcon from '@teamix/icon';
14
14
  import { Breadcrumb, Balloon } from '@alicloudfe/components';
@@ -154,7 +154,7 @@ var ProPageHeader = function ProPageHeader(props) {
154
154
  return;
155
155
  }
156
156
  if (goback === true) {
157
- history.go(-1);
157
+ history && history.go && history.go(-1);
158
158
  return;
159
159
  }
160
160
  goToLink(goback, history);
package/es/table/index.js CHANGED
@@ -1,4 +1,4 @@
1
- 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"],
1
+ 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"],
2
2
  _excluded2 = ["onChange"];
3
3
  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); }
4
4
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -29,7 +29,7 @@ import getTableProps from './utils/getTableProps';
29
29
  import getTableSortIcons from './utils/getTableSortIcons';
30
30
  import useTableSelection from './utils/useTableSelection';
31
31
  import FullScreen from './components/ToolBar/Fullscreen';
32
- import EmptyContent from './components/EmptyContent';
32
+ import { EmptyContent } from '@teamix/pro-field';
33
33
  import { ProActionGroup } from '../actions';
34
34
  import classNames from 'classnames';
35
35
  import ProPageContainer from '../page-container';
@@ -157,6 +157,7 @@ var ProTable = function ProTable(props) {
157
157
  cardViewProps = props.cardViewProps,
158
158
  _props$defaultView = props.defaultView,
159
159
  defaultView = _props$defaultView === void 0 ? 'table' : _props$defaultView,
160
+ emptyProps = props.emptyProps,
160
161
  otherProps = _objectWithoutProperties(props, _excluded);
161
162
  var targetPageKey = pageKey || globalPageKey;
162
163
  var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
@@ -876,7 +877,7 @@ var ProTable = function ProTable(props) {
876
877
  sort: sort,
877
878
  primaryKey: primaryKey,
878
879
  rowSelection: rowSelection,
879
- emptyContent: /*#__PURE__*/React.createElement(EmptyContent, null),
880
+ emptyContent: /*#__PURE__*/React.createElement(EmptyContent, _objectSpread({}, emptyProps)),
880
881
  sortIcons: getTableSortIcons(),
881
882
  fixedHeader: fullscreenState || fixedTableBody,
882
883
  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';
@@ -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;
@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  exports.useDialogFormAction = useDialogFormAction;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
- var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
9
+ var _utils = require("@teamix/utils");
10
10
  var _components = require("@alicloudfe/components");
11
11
  var _form = _interopRequireWildcard(require("../form"));
12
- var _utils = require("@teamix/utils");
13
12
  var _request = require("./request");
14
13
  var _dialog = _interopRequireDefault(require("./dialog"));
15
14
  var _utils2 = require("./utils");
@@ -101,7 +100,7 @@ var DialogForm = function DialogForm(props) {
101
100
  _useState2 = _slicedToArray(_useState, 2),
102
101
  loading = _useState2[0],
103
102
  setLoading = _useState2[1];
104
- var history = (0, _useRealHistory.default)();
103
+ var history = (0, _utils.useRealHistory)();
105
104
  (0, _react.useEffect)(function () {
106
105
  if (formRef) {
107
106
  formRef.current = form;
@@ -8,10 +8,9 @@ exports.default = void 0;
8
8
  exports.useDialogAction = useDialogAction;
9
9
  var _react = _interopRequireWildcard(require("react"));
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
- var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
11
+ var _utils = require("@teamix/utils");
12
12
  var _components = require("@alicloudfe/components");
13
13
  var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
14
- var _utils = require("@teamix/utils");
15
14
  var _form = _interopRequireWildcard(require("../form"));
16
15
  var _message = require("../utils/message");
17
16
  var _base = require("./base");
@@ -72,7 +71,7 @@ function useDialogAction(action, actionContext, hasForm) {
72
71
  loading = _useState2[0],
73
72
  setLoading = _useState2[1];
74
73
  var footerDescriptionRef = (0, _react.useRef)();
75
- var history = (0, _useRealHistory.default)();
74
+ var history = (0, _utils.useRealHistory)();
76
75
  var onActionStart = function onActionStart(context, e) {
77
76
  var _objectSpread2;
78
77
  var trigger = action.trigger,
@@ -6,14 +6,12 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  exports.useLinkAction = useLinkAction;
8
8
  var _utils = require("@teamix/utils");
9
- var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
10
9
  var _base = require("./base");
11
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
10
  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; }
13
11
  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; }
14
12
  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; }
15
13
  function useLinkAction(action, actionContext) {
16
- var history = (0, _useRealHistory.default)();
14
+ var history = (0, _utils.useRealHistory)();
17
15
  return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
18
16
  var linkAction = (0, _utils.getTargetValue)(action, context);
19
17
  (0, _utils.goToLink)(linkAction, history);
@@ -7,12 +7,10 @@ exports.default = void 0;
7
7
  exports.doRequest = doRequest;
8
8
  exports.useRequestAction = useRequestAction;
9
9
  var _react = require("react");
10
- var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
11
10
  var _utils = require("@teamix/utils");
12
11
  var _base = require("./base");
13
12
  var _excluded = ["method"],
14
13
  _excluded2 = ["onFinish"];
15
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
16
14
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
17
15
  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."); }
18
16
  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); }
@@ -38,7 +36,7 @@ function useRequestAction(action, actionContext) {
38
36
  _useState2 = _slicedToArray(_useState, 2),
39
37
  loading = _useState2[0],
40
38
  setLoading = _useState2[1];
41
- var history = (0, _useRealHistory.default)();
39
+ var history = (0, _utils.useRealHistory)();
42
40
  var onFinish = action.onFinish,
43
41
  others = _objectWithoutProperties(action, _excluded2);
44
42
  return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
@@ -237,6 +237,17 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
237
237
  };
238
238
  }();
239
239
  }
240
+ // 自定义updateDataSource
241
+ if (!formRef.current.updateDataSource) {
242
+ formRef.current.updateDataSource = function (query, params) {
243
+ [simpleForm, lightForm, advancedForm].forEach(function (f) {
244
+ var $query = f.query(query).take();
245
+ if ($query) {
246
+ $query.data.refresh = params;
247
+ }
248
+ });
249
+ };
250
+ }
240
251
  }
241
252
  };
242
253
  // 创建简单筛选表单实例
@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
- var _useRealHistory = _interopRequireDefault(require("../../utils/useRealHistory"));
8
7
  var _utils = require("@teamix/utils");
9
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10
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; }
11
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; }
12
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; }
13
11
  var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
14
12
  if ((0, _utils.isObj)(onSubmit)) {
15
- var history = (0, _useRealHistory.default)();
13
+ var history = (0, _utils.useRealHistory)();
16
14
  var submitConfig = onSubmit;
17
15
  return function (values) {
18
16
  return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({
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.9";
31
+ declare const version = "1.5.10";
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,5 +280,15 @@ 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.9';
284
- exports.version = version;
283
+ var version = '1.5.10';
284
+ // By TeamixTest
285
+ exports.version = version;
286
+ window.postMessage({
287
+ source: 'teamix-test-devtools',
288
+ url: window.location.href,
289
+ event: 'getModuleInfo',
290
+ moduleName: '@teamix/pro',
291
+ moduleVersion: version,
292
+ moduleType: 'TeamixPro',
293
+ componentName: 'TeamixPro'
294
+ }, '*');
@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
- var _useRealHistory = _interopRequireDefault(require("../utils/useRealHistory"));
8
+ var _utils = require("@teamix/utils");
9
9
  var _classnames2 = _interopRequireDefault(require("classnames"));
10
10
  var _icon = _interopRequireDefault(require("@teamix/icon"));
11
11
  var _components = require("@alicloudfe/components");
12
- var _utils = require("@teamix/utils");
13
12
  var _field = require("../field");
14
13
  var _actions = require("../actions");
15
14
  var _skeleton = require("../skeleton");
@@ -138,7 +137,7 @@ var ProPageHeader = function ProPageHeader(props) {
138
137
  style = props.style,
139
138
  tabs = props.tabs,
140
139
  others = _objectWithoutProperties(props, _excluded3);
141
- var history = (0, _useRealHistory.default)();
140
+ var history = (0, _utils.useRealHistory)();
142
141
  var backgroundImage = image ? "url('".concat(image, "')") : undefined;
143
142
  var showList = function showList(list) {
144
143
  var _list$actions;
@@ -160,7 +159,7 @@ var ProPageHeader = function ProPageHeader(props) {
160
159
  return;
161
160
  }
162
161
  if (goback === true) {
163
- history.go(-1);
162
+ history && history.go && history.go(-1);
164
163
  return;
165
164
  }
166
165
  (0, _utils.goToLink)(goback, history);
@@ -18,7 +18,7 @@ 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"));
@@ -37,7 +37,7 @@ Object.keys(_typing).forEach(function (key) {
37
37
  }
38
38
  });
39
39
  });
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"],
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", "emptyProps"],
41
41
  _excluded2 = ["onChange"];
42
42
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
43
43
  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); }
@@ -178,6 +178,7 @@ var ProTable = function ProTable(props) {
178
178
  cardViewProps = props.cardViewProps,
179
179
  _props$defaultView = props.defaultView,
180
180
  defaultView = _props$defaultView === void 0 ? 'table' : _props$defaultView,
181
+ emptyProps = props.emptyProps,
181
182
  otherProps = _objectWithoutProperties(props, _excluded);
182
183
  var targetPageKey = pageKey || globalPageKey;
183
184
  var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
@@ -897,7 +898,7 @@ var ProTable = function ProTable(props) {
897
898
  sort: sort,
898
899
  primaryKey: primaryKey,
899
900
  rowSelection: rowSelection,
900
- emptyContent: /*#__PURE__*/_react.default.createElement(_EmptyContent.default, null),
901
+ emptyContent: /*#__PURE__*/_react.default.createElement(_proField.EmptyContent, _objectSpread({}, emptyProps)),
901
902
  sortIcons: (0, _getTableSortIcons.default)(),
902
903
  fixedHeader: fullscreenState || fixedTableBody,
903
904
  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';
@@ -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;
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",
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;