@teamix/pro 1.2.12 → 1.2.16
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/dist/212.js +798 -766
- package/dist/pro.css +1 -1
- package/dist/pro.js +1851 -1863
- package/dist/pro.min.css +1 -1
- package/dist/pro.min.js +1 -1
- package/es/actions/dialog-component.js +2 -2
- package/es/actions/dialog-form.js +2 -2
- package/es/actions/dialog.js +5 -3
- package/es/actions/index.js +11 -7
- package/es/actions/link.js +2 -2
- package/es/actions/request.js +2 -2
- package/es/actions/utils.js +2 -2
- package/es/card/card-container.js +2 -2
- package/es/card/divider.js +2 -2
- package/es/card/index.d.ts +6 -3
- package/es/card/index.js +11 -6
- package/es/card/index.scss +4 -0
- package/es/card/selectable.js +2 -2
- package/es/card/tab.js +2 -2
- package/es/form/Components/Editable/index.js +2 -2
- package/es/form/Components/FormGroup/index.js +2 -2
- package/es/form/Components/LightFilter/componentMap.d.ts +2 -0
- package/es/form/Components/LightFilter/componentMap.js +5 -0
- package/es/form/Components/LightFilter/index.d.ts +15 -0
- package/es/form/Components/{QueryFilter → LightFilter}/index.js +45 -44
- package/es/form/Components/LightFilter/index.scss +74 -0
- package/es/form/Components/ProField/index.js +2 -2
- package/es/form/Components/Text/index.js +2 -2
- package/es/form/Filter/index.js +4 -4
- package/es/form/Filter/index.scss +0 -46
- package/es/form/Filter/index2.d.ts +1 -1
- package/es/form/Filter/index2.js +163 -115
- package/es/form/Filter/index2.scss +73 -0
- package/es/form/ProForm/index.js +3 -2
- package/es/form/ProForm/index.scss +9 -9
- package/es/form/ProForm/useAutoSubmit.js +2 -2
- package/es/form/ProForm/useFieldRequest.js +2 -2
- package/es/form/ProForm/useFormDisplayValues.js +46 -15
- package/es/form/ProForm/useInitialRequest.js +2 -2
- package/es/form/SchemaForm/adapterType.js +1 -0
- package/es/form/SchemaForm/index.js +5 -5
- package/es/form/SchemaForm/initializeArrayCards.js +2 -2
- package/es/form/SchemaForm/initializeArrayCollapse.js +2 -2
- package/es/form/SchemaForm/initializeArrayItems.js +2 -2
- package/es/form/SchemaForm/initializeArrayTable.js +2 -2
- package/es/form/SchemaForm/initializeFormButton.js +2 -2
- package/es/form/SchemaForm/initializeFormCollapse.js +2 -2
- package/es/form/SchemaForm/initializeFormGroup.js +2 -2
- package/es/form/SchemaForm/initializeFormStep.js +2 -2
- package/es/form/SchemaForm/initializeFormTab.js +2 -2
- package/es/form/SchemaForm/initializeReactions.js +2 -2
- package/es/form/SchemaForm/initializeRules.js +2 -2
- package/es/form/SchemaForm/reactions.js +4 -8
- package/es/form/fieldTypeMap.js +1 -0
- package/es/form/global.scss +1 -0
- package/es/form/index.js +2 -2
- package/es/form/typing.d.ts +6 -0
- package/es/form/utils.js +2 -2
- package/es/form/warning.js +2 -2
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/info/components/InfoGroup/index.js +2 -2
- package/es/info/components/InfoValueItem/index.js +2 -2
- package/es/info/components/ProInfoItem/index.js +3 -1
- package/es/info/components/tableInfo/index.js +2 -2
- package/es/info/index.js +2 -2
- package/es/info/utils/index.js +2 -2
- package/es/nocode/pages/playground.js +2 -2
- package/es/nocode/pages/renderer.d.ts +2 -2
- package/es/nocode/pages/renderer.js +5 -5
- package/es/nocode/playground.js +2 -2
- package/es/page-header/index.d.ts +1 -2
- package/es/page-header/index.js +4 -14
- package/es/sidebar/components/sidebar-container/index.js +2 -2
- package/es/sidebar/components/tree/index.js +2 -2
- package/es/sidebar/index.js +2 -2
- package/es/table/components/Filter/index.js +2 -2
- package/es/table/components/Layout/index.js +3 -3
- package/es/table/components/QuickAction/index.js +3 -3
- package/es/table/components/ToolBar/FilterColumnIcon.js +54 -19
- package/es/table/components/ToolBar/index.js +2 -2
- package/es/table/components/ToolBar/index.scss +1 -0
- package/es/table/index.js +29 -11
- package/es/table/typing.d.ts +11 -1
- package/es/table/utils/columnRender.js +61 -3
- package/es/table/utils/genProColumnToColumn.js +2 -2
- package/es/table/utils/index.js +24 -4
- package/es/table/utils/useTableSelection.js +2 -2
- package/es/templates/List/index.js +2 -2
- package/es/utils/message.d.ts +1 -1
- package/es/utils/message.js +9 -9
- package/lib/actions/dialog-component.js +2 -2
- package/lib/actions/dialog-form.js +3 -3
- package/lib/actions/dialog.js +6 -4
- package/lib/actions/index.js +11 -7
- package/lib/actions/link.js +2 -2
- package/lib/actions/request.js +2 -2
- package/lib/actions/utils.js +2 -2
- package/lib/card/card-container.js +2 -2
- package/lib/card/divider.js +2 -2
- package/lib/card/index.d.ts +6 -3
- package/lib/card/index.js +11 -6
- package/lib/card/index.scss +4 -0
- package/lib/card/selectable.js +2 -2
- package/lib/card/tab.js +2 -2
- package/lib/field/index.js +1 -1
- package/lib/form/Components/Editable/index.js +3 -3
- package/lib/form/Components/FormGroup/index.js +2 -2
- package/lib/form/Components/LightFilter/componentMap.d.ts +2 -0
- package/lib/form/Components/LightFilter/componentMap.js +12 -0
- package/lib/form/Components/LightFilter/index.d.ts +15 -0
- package/lib/form/Components/{QueryFilter → LightFilter}/index.js +50 -44
- package/lib/form/Components/LightFilter/index.scss +74 -0
- package/lib/form/Components/ProField/index.js +2 -2
- package/lib/form/Components/Text/index.js +2 -2
- package/lib/form/Filter/index.js +5 -5
- package/lib/form/Filter/index.scss +0 -46
- package/lib/form/Filter/index2.d.ts +1 -1
- package/lib/form/Filter/index2.js +165 -115
- package/lib/form/Filter/index2.scss +73 -0
- package/lib/form/ProForm/index.js +4 -3
- package/lib/form/ProForm/index.scss +9 -9
- package/lib/form/ProForm/useAutoSubmit.js +2 -2
- package/lib/form/ProForm/useFieldRequest.js +2 -2
- package/lib/form/ProForm/useFormDisplayValues.js +47 -15
- package/lib/form/ProForm/useInitialRequest.js +2 -2
- package/lib/form/SchemaForm/adapterType.js +1 -0
- package/lib/form/SchemaForm/index.js +6 -6
- package/lib/form/SchemaForm/initializeArrayCards.js +2 -2
- package/lib/form/SchemaForm/initializeArrayCollapse.js +2 -2
- package/lib/form/SchemaForm/initializeArrayItems.js +2 -2
- package/lib/form/SchemaForm/initializeArrayTable.js +2 -2
- package/lib/form/SchemaForm/initializeFormButton.js +2 -2
- package/lib/form/SchemaForm/initializeFormCollapse.js +2 -2
- package/lib/form/SchemaForm/initializeFormGroup.js +2 -2
- package/lib/form/SchemaForm/initializeFormStep.js +2 -2
- package/lib/form/SchemaForm/initializeFormTab.js +2 -2
- package/lib/form/SchemaForm/initializeReactions.js +2 -2
- package/lib/form/SchemaForm/initializeRules.js +2 -2
- package/lib/form/SchemaForm/reactions.js +3 -7
- package/lib/form/fieldTypeMap.js +1 -0
- package/lib/form/global.scss +1 -0
- package/lib/form/index.js +3 -3
- package/lib/form/typing.d.ts +6 -0
- package/lib/form/utils.js +2 -2
- package/lib/form/warning.js +2 -2
- package/lib/hooks/index.js +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/info/components/InfoGroup/index.js +3 -3
- package/lib/info/components/InfoValueItem/index.js +3 -3
- package/lib/info/components/ProInfoItem/index.js +3 -1
- package/lib/info/components/tableInfo/index.js +3 -3
- package/lib/info/index.js +3 -3
- package/lib/info/utils/index.js +2 -2
- package/lib/nocode/configurators/index.js +1 -1
- package/lib/nocode/pages/playground.js +3 -3
- package/lib/nocode/pages/renderer.d.ts +2 -2
- package/lib/nocode/pages/renderer.js +5 -5
- package/lib/nocode/playground.js +3 -3
- package/lib/page-container/index.js +1 -1
- package/lib/page-header/index.d.ts +1 -2
- package/lib/page-header/index.js +6 -17
- package/lib/sidebar/components/sidebar-container/index.js +2 -2
- package/lib/sidebar/components/tree/index.js +3 -3
- package/lib/sidebar/index.js +3 -3
- package/lib/skeleton/index.js +1 -1
- package/lib/table/components/Filter/index.js +3 -3
- package/lib/table/components/Layout/index.js +3 -3
- package/lib/table/components/QuickAction/index.js +3 -3
- package/lib/table/components/ToolBar/DensityIcon.js +1 -1
- package/lib/table/components/ToolBar/FilterColumnIcon.js +55 -20
- package/lib/table/components/ToolBar/FullScreenIcon.js +1 -1
- package/lib/table/components/ToolBar/Fullscreen.js +1 -1
- package/lib/table/components/ToolBar/index.js +2 -2
- package/lib/table/components/ToolBar/index.scss +1 -0
- package/lib/table/index.js +29 -11
- package/lib/table/typing.d.ts +11 -1
- package/lib/table/utils/columnRender.js +61 -3
- package/lib/table/utils/genProColumnToColumn.js +2 -2
- package/lib/table/utils/index.js +24 -4
- package/lib/table/utils/useTableSelection.js +2 -2
- package/lib/templates/List/index.js +3 -3
- package/lib/utils/index.js +1 -1
- package/lib/utils/message.d.ts +1 -1
- package/lib/utils/message.js +9 -9
- package/package.json +2 -2
- package/es/form/Components/Query/index.d.ts +0 -4
- package/es/form/Components/Query/index.js +0 -70
- package/es/form/Components/Query/index.scss +0 -85
- package/es/form/Components/QueryFilter/index.d.ts +0 -3
- package/es/utils/components/tags/index.d.ts +0 -11
- package/es/utils/components/tags/index.js +0 -50
- package/es/utils/components/tags/index.scss +0 -12
- package/lib/form/Components/Query/index.d.ts +0 -4
- package/lib/form/Components/Query/index.js +0 -91
- package/lib/form/Components/Query/index.scss +0 -85
- package/lib/form/Components/QueryFilter/index.d.ts +0 -3
- package/lib/utils/components/tags/index.d.ts +0 -11
- package/lib/utils/components/tags/index.js +0 -66
- package/lib/utils/components/tags/index.scss +0 -12
@@ -1,4 +1,4 @@
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
1
|
+
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); }
|
2
2
|
|
3
3
|
var _excluded = ["type", "loading", "pageProps", "error", "title", "pageMap"];
|
4
4
|
|
@@ -10,9 +10,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
10
10
|
|
11
11
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
|
12
12
|
|
13
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
|
13
|
+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
14
14
|
|
15
|
-
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass
|
15
|
+
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
|
16
16
|
|
17
17
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
18
18
|
|
@@ -26,9 +26,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
|
|
26
26
|
|
27
27
|
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
28
28
|
|
29
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
29
|
+
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; }
|
30
30
|
|
31
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
31
|
+
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; }
|
32
32
|
|
33
33
|
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; }
|
34
34
|
|
package/es/nocode/playground.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
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; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
|
3
|
-
import { LinkPath } from '@teamix/utils';
|
4
|
-
import { ProTagItem } from '../utils/components/tags';
|
3
|
+
import { LinkPath, ProTagItem } from '@teamix/utils';
|
5
4
|
import { ProActionGroupProps } from '../actions';
|
6
5
|
import { ProInfoProps } from '../info';
|
7
6
|
import './index.scss';
|
package/es/page-header/index.js
CHANGED
@@ -2,9 +2,9 @@ var _excluded = ["text", "children"],
|
|
2
2
|
_excluded2 = ["color", "title", "num", "className"],
|
3
3
|
_excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
|
4
4
|
|
5
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
5
|
+
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; }
|
6
6
|
|
7
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
7
|
+
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; }
|
8
8
|
|
9
9
|
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; }
|
10
10
|
|
@@ -17,8 +17,7 @@ import { useHistory } from 'react-router-dom';
|
|
17
17
|
import classnames from 'classnames';
|
18
18
|
import TeamixIcon from '@teamix/icon';
|
19
19
|
import { Breadcrumb } from '@alicloudfe/components';
|
20
|
-
import { baseClass, goToLink } from '@teamix/utils';
|
21
|
-
import { renderTags } from '../utils/components/tags';
|
20
|
+
import { baseClass, goToLink, renderTags, isPresetColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
|
22
21
|
import { ProActionGroup } from '../actions';
|
23
22
|
import { ProSkeletonRaw } from '../skeleton';
|
24
23
|
import ProInfo from '../info';
|
@@ -64,21 +63,12 @@ var renderActionGroup = function renderActionGroup(group, defaultProps) {
|
|
64
63
|
return group;
|
65
64
|
};
|
66
65
|
|
67
|
-
var isPresetColor = function isPresetColor(color) {
|
68
|
-
if (!color) {
|
69
|
-
return false;
|
70
|
-
}
|
71
|
-
|
72
|
-
var PRESET_COLOR_REG = /blue|green|orange|red|yellow/;
|
73
|
-
return PRESET_COLOR_REG.test(color);
|
74
|
-
};
|
75
|
-
|
76
66
|
var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgroundType) {
|
77
67
|
var _classnames;
|
78
68
|
|
79
69
|
var isColorPresetColor = isPresetColor(color);
|
80
70
|
var isBgColorPresetColor = isPresetColor(backgroundColor);
|
81
|
-
var className = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(
|
71
|
+
var className = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(getColorClassName(color)), isColorPresetColor), _defineProperty(_classnames, "".concat(getBackgroundColorClassName(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
|
82
72
|
var styleColor = isColorPresetColor ? undefined : color;
|
83
73
|
var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
|
84
74
|
var style = {
|
@@ -1,8 +1,8 @@
|
|
1
1
|
var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage"];
|
2
2
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
3
|
+
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; }
|
4
4
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
5
|
+
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; }
|
6
6
|
|
7
7
|
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; }
|
8
8
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
var _excluded = ["dataSource", "searchKey", "onSelect"];
|
2
2
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
3
|
+
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; }
|
4
4
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
5
|
+
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; }
|
6
6
|
|
7
7
|
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; }
|
8
8
|
|
package/es/sidebar/index.js
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
var _excluded = ["dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "treeProps", "cardProps"];
|
2
2
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
3
|
+
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; }
|
4
4
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
5
|
+
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; }
|
6
6
|
|
7
7
|
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; }
|
8
8
|
|
@@ -6,9 +6,9 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
|
|
6
6
|
|
7
7
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
8
8
|
|
9
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
9
|
+
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; }
|
10
10
|
|
11
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
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; }
|
12
12
|
|
13
13
|
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; }
|
14
14
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterForm", "rowSelection"];
|
2
2
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
3
|
+
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; }
|
4
4
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
5
|
+
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; }
|
6
6
|
|
7
7
|
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; }
|
8
8
|
|
9
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
9
|
+
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); }
|
10
10
|
|
11
11
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
12
12
|
|
@@ -1,10 +1,10 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
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; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
7
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
7
|
+
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); }
|
8
8
|
|
9
9
|
import React from 'react';
|
10
10
|
import { Box } from '@alicloudfe/components';
|
@@ -1,3 +1,11 @@
|
|
1
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
2
|
+
|
3
|
+
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."); }
|
4
|
+
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
6
|
+
|
7
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
8
|
+
|
1
9
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
2
10
|
|
3
11
|
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."); }
|
@@ -10,9 +18,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
10
18
|
|
11
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
12
20
|
|
13
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
21
|
+
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; }
|
14
22
|
|
15
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
23
|
+
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; }
|
16
24
|
|
17
25
|
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
26
|
|
@@ -121,10 +129,23 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
121
129
|
|
122
130
|
|
123
131
|
var moveUp = function moveUp(e, dataIndex) {
|
132
|
+
var _newColumns$filter, _newColumns$filter2;
|
133
|
+
|
124
134
|
e.stopPropagation();
|
125
|
-
var keyNewColumns = cloneDeep(newColumns)
|
126
|
-
|
127
|
-
|
135
|
+
var keyNewColumns = cloneDeep(newColumns).filter(function (_ref) {
|
136
|
+
var lock = _ref.lock;
|
137
|
+
return !lock;
|
138
|
+
});
|
139
|
+
var headLock = cloneDeep((_newColumns$filter = newColumns.filter(function (_ref2) {
|
140
|
+
var lock = _ref2.lock;
|
141
|
+
return lock === true || lock === 'left';
|
142
|
+
})) !== null && _newColumns$filter !== void 0 ? _newColumns$filter : []);
|
143
|
+
var tailLock = cloneDeep((_newColumns$filter2 = newColumns.filter(function (_ref3) {
|
144
|
+
var lock = _ref3.lock;
|
145
|
+
return lock === 'right';
|
146
|
+
})) !== null && _newColumns$filter2 !== void 0 ? _newColumns$filter2 : []);
|
147
|
+
var index = keyNewColumns.findIndex(function (_ref4) {
|
148
|
+
var index = _ref4.dataIndex;
|
128
149
|
return index === dataIndex;
|
129
150
|
});
|
130
151
|
|
@@ -134,15 +155,28 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
134
155
|
keyNewColumns.push(keyNewColumns.shift());
|
135
156
|
}
|
136
157
|
|
137
|
-
notifyTableRender(keyNewColumns);
|
158
|
+
notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
|
138
159
|
}; // 向下
|
139
160
|
|
140
161
|
|
141
162
|
var moveDown = function moveDown(e, dataIndex) {
|
163
|
+
var _newColumns$filter3, _newColumns$filter4;
|
164
|
+
|
142
165
|
e.stopPropagation();
|
143
|
-
var keyNewColumns = cloneDeep(newColumns)
|
144
|
-
|
145
|
-
|
166
|
+
var keyNewColumns = cloneDeep(newColumns).filter(function (_ref5) {
|
167
|
+
var lock = _ref5.lock;
|
168
|
+
return !lock;
|
169
|
+
});
|
170
|
+
var headLock = cloneDeep((_newColumns$filter3 = newColumns.filter(function (_ref6) {
|
171
|
+
var lock = _ref6.lock;
|
172
|
+
return lock === true || lock === 'left';
|
173
|
+
})) !== null && _newColumns$filter3 !== void 0 ? _newColumns$filter3 : []);
|
174
|
+
var tailLock = cloneDeep((_newColumns$filter4 = newColumns.filter(function (_ref7) {
|
175
|
+
var lock = _ref7.lock;
|
176
|
+
return lock === 'right';
|
177
|
+
})) !== null && _newColumns$filter4 !== void 0 ? _newColumns$filter4 : []);
|
178
|
+
var index = keyNewColumns.findIndex(function (_ref8) {
|
179
|
+
var index = _ref8.dataIndex;
|
146
180
|
return index === dataIndex;
|
147
181
|
});
|
148
182
|
|
@@ -152,7 +186,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
152
186
|
keyNewColumns.unshift(keyNewColumns.splice(index, 1)[0]);
|
153
187
|
}
|
154
188
|
|
155
|
-
notifyTableRender(keyNewColumns);
|
189
|
+
notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
|
156
190
|
}; // 通知表格渲染
|
157
191
|
|
158
192
|
|
@@ -220,23 +254,24 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
220
254
|
type: "primary"
|
221
255
|
}, getMessage('reset'))), /*#__PURE__*/React.createElement(Menu.Divider, {
|
222
256
|
key: "divider"
|
223
|
-
}), newColumns.map(function (
|
257
|
+
}), newColumns.map(function (_ref9, index) {
|
224
258
|
var _newColumns$find;
|
225
259
|
|
226
|
-
var dataIndex =
|
227
|
-
title =
|
228
|
-
columnFiltersDisabled =
|
260
|
+
var dataIndex = _ref9.dataIndex,
|
261
|
+
title = _ref9.title,
|
262
|
+
columnFiltersDisabled = _ref9.columnFiltersDisabled,
|
263
|
+
lock = _ref9.lock;
|
229
264
|
return /*#__PURE__*/React.createElement(CheckboxItem, {
|
230
265
|
key: index,
|
231
|
-
checked: (_newColumns$find = newColumns.find(function (
|
232
|
-
var key =
|
266
|
+
checked: (_newColumns$find = newColumns.find(function (_ref10) {
|
267
|
+
var key = _ref10.dataIndex;
|
233
268
|
return key === dataIndex;
|
234
269
|
})) === null || _newColumns$find === void 0 ? void 0 : _newColumns$find.columnFilters,
|
235
270
|
onChange: function onChange(check) {
|
236
271
|
return onChangeColumns(check, dataIndex);
|
237
272
|
},
|
238
273
|
disabled: columnFiltersDisabled
|
239
|
-
}, title, /*#__PURE__*/React.createElement("div", {
|
274
|
+
}, title, !lock && /*#__PURE__*/React.createElement("div", {
|
240
275
|
className: cls({
|
241
276
|
sort: true
|
242
277
|
})
|
@@ -293,8 +328,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
293
328
|
key: index,
|
294
329
|
className: cls('col')
|
295
330
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
296
|
-
checked: (_newColumns$find2 = newColumns.find(function (
|
297
|
-
var key =
|
331
|
+
checked: (_newColumns$find2 = newColumns.find(function (_ref11) {
|
332
|
+
var key = _ref11.dataIndex;
|
298
333
|
return key === dataIndex;
|
299
334
|
})) === null || _newColumns$find2 === void 0 ? void 0 : _newColumns$find2.columnFilters,
|
300
335
|
onChange: function onChange(check) {
|
@@ -1,6 +1,6 @@
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
1
|
+
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; }
|
2
2
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
3
|
+
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; }
|
4
4
|
|
5
5
|
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; }
|
6
6
|
|
package/es/table/index.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
|
2
2
|
|
3
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
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
|
|
5
5
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
6
6
|
|
@@ -10,9 +10,9 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
|
|
10
10
|
|
11
11
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
12
12
|
|
13
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
13
|
+
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; }
|
14
14
|
|
15
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
15
|
+
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; }
|
16
16
|
|
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
|
|
@@ -349,7 +349,11 @@ var ProTable = function ProTable(props) {
|
|
349
349
|
}
|
350
350
|
}, [propsActionRef]);
|
351
351
|
useEffect(function () {
|
352
|
-
|
352
|
+
var _actionRef$current, _actionRef$current$se;
|
353
|
+
|
354
|
+
var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
|
355
|
+
setFilteredColumns(columns);
|
356
|
+
(_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
|
353
357
|
}, [propsColumns]); // 绑定 Actions
|
354
358
|
|
355
359
|
useActionType(actionRef, {
|
@@ -363,7 +367,11 @@ var ProTable = function ProTable(props) {
|
|
363
367
|
return state;
|
364
368
|
},
|
365
369
|
setColumn: function setColumn(newColumns) {
|
366
|
-
|
370
|
+
var _actionRef$current2, _actionRef$current2$s;
|
371
|
+
|
372
|
+
var columns = processColumns(newColumns);
|
373
|
+
setFilteredColumns(columns);
|
374
|
+
(_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
|
367
375
|
},
|
368
376
|
setSize: function setSize(mode) {
|
369
377
|
_setSize(mode);
|
@@ -377,11 +385,11 @@ var ProTable = function ProTable(props) {
|
|
377
385
|
}
|
378
386
|
},
|
379
387
|
reset: function reset() {
|
380
|
-
var _actionRef$
|
388
|
+
var _actionRef$current3, _actionRef$current3$s;
|
381
389
|
|
382
390
|
(propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
|
383
391
|
|
384
|
-
(_actionRef$
|
392
|
+
(_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
|
385
393
|
dataFilterForm.reset();
|
386
394
|
setCurrentPage(1);
|
387
395
|
|
@@ -390,6 +398,7 @@ var ProTable = function ProTable(props) {
|
|
390
398
|
resetPage: function resetPage() {
|
391
399
|
setCurrentPage(1);
|
392
400
|
},
|
401
|
+
rowSelection: rowSelection,
|
393
402
|
clearRowSelection: function clearRowSelection() {
|
394
403
|
rowSelectionHook.setSelectedRowKeys([]);
|
395
404
|
rowSelectionHook.setSelectedRecords([]);
|
@@ -492,7 +501,7 @@ var ProTable = function ProTable(props) {
|
|
492
501
|
}); // 请求函数
|
493
502
|
|
494
503
|
function _request(params, noLoading) {
|
495
|
-
var _actionRef$current$ge, _actionRef$
|
504
|
+
var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
|
496
505
|
|
497
506
|
// 如果没有传 url 且没有 customRequest,直接返回
|
498
507
|
if (!url && !customRequest) {
|
@@ -507,7 +516,7 @@ var ProTable = function ProTable(props) {
|
|
507
516
|
|
508
517
|
var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
|
509
518
|
|
510
|
-
var columnsFilterParams = (_actionRef$current$ge = (_actionRef$
|
519
|
+
var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
|
511
520
|
|
512
521
|
var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, targetPageKey, currentPage), _defineProperty(_objectSpread2, targetPageSizeKey, pageSize), _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
|
513
522
|
|
@@ -556,7 +565,11 @@ var ProTable = function ProTable(props) {
|
|
556
565
|
}
|
557
566
|
|
558
567
|
useEffect(function () {
|
559
|
-
|
568
|
+
var _actionRef$current5, _actionRef$current5$i;
|
569
|
+
|
570
|
+
// 初始化 state 状态
|
571
|
+
actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$i = _actionRef$current5.initState) === null || _actionRef$current5$i === void 0 ? void 0 : _actionRef$current5$i.call(_actionRef$current5); // 监听 浏览器变化 更吸底状态
|
572
|
+
|
560
573
|
if (footerSuction) {
|
561
574
|
getFooterSuctionState();
|
562
575
|
|
@@ -577,6 +590,8 @@ var ProTable = function ProTable(props) {
|
|
577
590
|
if (window.onresize) {
|
578
591
|
window.onresize = null;
|
579
592
|
}
|
593
|
+
|
594
|
+
actionRef.current = undefined;
|
580
595
|
};
|
581
596
|
}, []);
|
582
597
|
|
@@ -594,7 +609,10 @@ var ProTable = function ProTable(props) {
|
|
594
609
|
(propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
|
595
610
|
|
596
611
|
if (dataFilterForm.validate()) {
|
597
|
-
setCurrentPage(1);
|
612
|
+
setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
|
613
|
+
// TODO: 针对 inline 模式下的 search 组件做一下处理,如果空值切换下拉的时候不触发请求
|
614
|
+
// if (mode === 'inline') {
|
615
|
+
// }
|
598
616
|
|
599
617
|
_request(_defineProperty({}, targetPageKey, 1));
|
600
618
|
}
|
package/es/table/typing.d.ts
CHANGED
@@ -154,6 +154,8 @@ export declare type ProTableActionType = {
|
|
154
154
|
request?: (params?: any) => void;
|
155
155
|
/** 重置表格 */
|
156
156
|
reset?: () => void;
|
157
|
+
/** 表格选择相关属性 */
|
158
|
+
rowSelection?: innerRowSelectionType | rowSelectionType;
|
157
159
|
/** 清空表格选择 */
|
158
160
|
clearRowSelection?: () => void;
|
159
161
|
/** 过滤 DataSource */
|
@@ -178,8 +180,12 @@ export declare type ProTableActionType = {
|
|
178
180
|
} & ProTableActionTypeMutations;
|
179
181
|
/** action State 定义 */
|
180
182
|
export declare type ProTableActionTypeMutations = {
|
181
|
-
/** 获取state状态 */
|
183
|
+
/** 获取state 状态 */
|
182
184
|
getState?: () => ProTableActionTypeState;
|
185
|
+
/** 设置state 状态 */
|
186
|
+
setState?: (key: string, value: any) => void;
|
187
|
+
/** 初始化 state 状态 */
|
188
|
+
initState?: () => void;
|
183
189
|
/** 设置全屏状态 */
|
184
190
|
setFullScreenState?: (state: boolean) => void;
|
185
191
|
/** 绑定state监听事件 */
|
@@ -192,11 +198,15 @@ export declare type ProTableActionTypeMutations = {
|
|
192
198
|
getFilterRules?: () => object;
|
193
199
|
/** 重新计算表格maxHeight高度 */
|
194
200
|
resetTableMaxBodyHeight?: () => void;
|
201
|
+
/** 列筛选规则 */
|
202
|
+
filterColumns?: any[];
|
195
203
|
};
|
196
204
|
/** action Mutations 定义 */
|
197
205
|
export declare type ProTableActionTypeState = {
|
198
206
|
fullScreenState: boolean;
|
199
207
|
filterRules: ProTableColumnsFilterRulesItem;
|
208
|
+
filterColumns: ProTableColumnProps[];
|
209
|
+
[key: string]: any;
|
200
210
|
};
|
201
211
|
export declare type ProTableDataFilterProps = {
|
202
212
|
/** 展示形式 */
|
@@ -18,9 +18,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
18
18
|
|
19
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
20
20
|
|
21
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
21
|
+
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; }
|
22
22
|
|
23
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
23
|
+
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; }
|
24
24
|
|
25
25
|
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; }
|
26
26
|
|
@@ -37,8 +37,66 @@ import Filter from '../components/Filter';
|
|
37
37
|
*/
|
38
38
|
|
39
39
|
export var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
|
40
|
+
var filterMode = item.filterMode,
|
41
|
+
filters = item.filters,
|
42
|
+
dataIndex = item.dataIndex,
|
43
|
+
dataSource = item.dataSource; // 为列过滤添加状态标题
|
44
|
+
|
45
|
+
var getItemLabel = function getItemLabel() {
|
46
|
+
if (filters && filterMode !== 'multiple') {
|
47
|
+
var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2;
|
48
|
+
|
49
|
+
var selectedItem = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : _actionRef$current$ge2.call(_actionRef$current).filterRules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {};
|
50
|
+
|
51
|
+
if (Object.keys(selectedItem).length > 0) {
|
52
|
+
var _selectedItem$dataInd;
|
53
|
+
|
54
|
+
if ((_selectedItem$dataInd = selectedItem[dataIndex]) === null || _selectedItem$dataInd === void 0 ? void 0 : _selectedItem$dataInd.params) {
|
55
|
+
var _targetFilters$find;
|
56
|
+
|
57
|
+
// 找到对应的 label
|
58
|
+
var targetFilters = filters !== null && filters !== void 0 ? filters : [];
|
59
|
+
|
60
|
+
if (filters === true) {
|
61
|
+
targetFilters = dataSource !== null && dataSource !== void 0 ? dataSource : [];
|
62
|
+
}
|
63
|
+
|
64
|
+
var label = (_targetFilters$find = targetFilters.find(function (item) {
|
65
|
+
var _selectedItem$dataInd2;
|
66
|
+
|
67
|
+
return item.value === ((_selectedItem$dataInd2 = selectedItem[dataIndex]) === null || _selectedItem$dataInd2 === void 0 ? void 0 : _selectedItem$dataInd2.params);
|
68
|
+
})) === null || _targetFilters$find === void 0 ? void 0 : _targetFilters$find.label;
|
69
|
+
var value = "".concat(item.title, " (").concat(label, ")");
|
70
|
+
return /*#__PURE__*/React.createElement(ProField, {
|
71
|
+
style: {
|
72
|
+
display: 'inline-flex'
|
73
|
+
},
|
74
|
+
value: value,
|
75
|
+
type: "text",
|
76
|
+
render: {
|
77
|
+
ellipsis: true,
|
78
|
+
color: 'var(--table-th-color,#848484)'
|
79
|
+
}
|
80
|
+
});
|
81
|
+
}
|
82
|
+
}
|
83
|
+
}
|
84
|
+
|
85
|
+
return /*#__PURE__*/React.createElement(ProField, {
|
86
|
+
style: {
|
87
|
+
display: 'inline-flex'
|
88
|
+
},
|
89
|
+
value: item.title,
|
90
|
+
type: "text",
|
91
|
+
render: {
|
92
|
+
ellipsis: true,
|
93
|
+
color: 'var(--table-th-color,#848484)'
|
94
|
+
}
|
95
|
+
});
|
96
|
+
};
|
97
|
+
|
40
98
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
|
41
|
-
label:
|
99
|
+
label: getItemLabel(),
|
42
100
|
tooltip: item.tooltip,
|
43
101
|
icon: item.tooltipIcon
|
44
102
|
}), item.filters && /*#__PURE__*/React.createElement(Filter, {
|