@teamix/pro 1.2.10 → 1.2.14
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 +2892 -2305
- package/dist/pro.min.css +1 -1
- package/dist/pro.min.js +1 -1
- package/es/actions/base.d.ts +16 -6
- package/es/actions/base.js +66 -12
- package/es/actions/confirm.d.ts +1 -1
- package/es/actions/danger-confirm.d.ts +1 -1
- package/es/actions/dialog-component.d.ts +1 -1
- package/es/actions/dialog-component.js +2 -2
- package/es/actions/dialog-form.d.ts +1 -1
- package/es/actions/dialog-form.js +4 -4
- package/es/actions/dialog-info.d.ts +1 -1
- package/es/actions/dialog-table.d.ts +1 -1
- package/es/actions/dialog.d.ts +6 -2
- package/es/actions/dialog.js +5 -5
- package/es/actions/drawer-form.d.ts +1 -1
- package/es/actions/drawer-info.d.ts +1 -1
- package/es/actions/drawer-table.d.ts +1 -1
- package/es/actions/drawer.d.ts +1 -1
- package/es/actions/error.d.ts +1 -1
- package/es/actions/index.js +11 -7
- package/es/actions/index.scss +14 -0
- package/es/actions/link.d.ts +2 -2
- package/es/actions/link.js +4 -4
- package/es/actions/notice.d.ts +1 -1
- package/es/actions/request.d.ts +1 -1
- package/es/actions/request.js +4 -4
- 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 +9 -0
- package/es/card/index.js +21 -7
- package/es/card/index.scss +19 -0
- package/es/card/selectable.js +2 -2
- package/es/card/tab.d.ts +6 -0
- package/es/card/tab.js +27 -0
- 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 +46 -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.d.ts +2 -5
- package/es/form/Filter/index.js +5 -46
- package/es/form/Filter/index.scss +25 -0
- package/es/form/Filter/index2.d.ts +8 -0
- package/es/form/Filter/index2.js +370 -0
- package/es/form/Filter/index2.scss +73 -0
- package/es/form/ProForm/index.js +5 -25
- package/es/form/ProForm/index.scss +10 -28
- package/es/form/ProForm/useAutoSubmit.js +2 -2
- package/es/form/ProForm/useFieldRequest.js +2 -2
- package/es/form/ProForm/useFormDisplayValues.d.ts +3 -5
- package/es/form/ProForm/useFormDisplayValues.js +79 -42
- package/es/form/ProForm/useInitialRequest.js +2 -2
- package/es/form/SchemaForm/adapterType.js +1 -0
- package/es/form/SchemaForm/index.js +11 -10
- 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 +2 -2
- package/es/form/fieldTypeMap.js +1 -0
- package/es/form/global.scss +1 -0
- package/es/form/index.d.ts +2 -1
- package/es/form/index.js +5 -4
- package/es/form/typing.d.ts +3 -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 +19 -11
- package/es/page-header/index.js +24 -49
- package/es/page-header/index.scss +0 -11
- 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 +13 -11
- package/es/table/components/Filter/index.scss +7 -3
- package/es/table/components/Layout/index.js +13 -4
- package/es/table/components/QuickAction/index.js +3 -3
- package/es/table/components/ToolBar/FilterColumnIcon.js +2 -2
- package/es/table/components/ToolBar/index.js +2 -2
- package/es/table/index.js +24 -14
- package/es/table/typing.d.ts +6 -0
- package/es/table/utils/columnRender.js +40 -3
- package/es/table/utils/genProColumnToColumn.js +2 -2
- package/es/table/utils/index.js +17 -3
- package/es/table/utils/useTableSelection.js +2 -2
- package/es/templates/List/index.js +2 -2
- package/es/utils/message.js +2 -2
- package/lib/actions/base.d.ts +16 -6
- package/lib/actions/base.js +67 -12
- package/lib/actions/confirm.d.ts +1 -1
- package/lib/actions/danger-confirm.d.ts +1 -1
- package/lib/actions/dialog-component.d.ts +1 -1
- package/lib/actions/dialog-component.js +2 -2
- package/lib/actions/dialog-form.d.ts +1 -1
- package/lib/actions/dialog-form.js +5 -5
- package/lib/actions/dialog-info.d.ts +1 -1
- package/lib/actions/dialog-table.d.ts +1 -1
- package/lib/actions/dialog.d.ts +6 -2
- package/lib/actions/dialog.js +6 -6
- package/lib/actions/drawer-form.d.ts +1 -1
- package/lib/actions/drawer-info.d.ts +1 -1
- package/lib/actions/drawer-table.d.ts +1 -1
- package/lib/actions/drawer.d.ts +1 -1
- package/lib/actions/error.d.ts +1 -1
- package/lib/actions/index.js +11 -7
- package/lib/actions/index.scss +14 -0
- package/lib/actions/link.d.ts +2 -2
- package/lib/actions/link.js +4 -4
- package/lib/actions/notice.d.ts +1 -1
- package/lib/actions/request.d.ts +1 -1
- package/lib/actions/request.js +4 -4
- 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 +9 -0
- package/lib/card/index.js +22 -6
- package/lib/card/index.scss +19 -0
- package/lib/card/selectable.js +2 -2
- package/lib/card/tab.d.ts +6 -0
- package/lib/card/tab.js +39 -0
- 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 +51 -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.d.ts +2 -5
- package/lib/form/Filter/index.js +7 -48
- package/lib/form/Filter/index.scss +25 -0
- package/lib/form/Filter/index2.d.ts +8 -0
- package/lib/form/Filter/index2.js +396 -0
- package/lib/form/Filter/index2.scss +73 -0
- package/lib/form/ProForm/index.js +6 -26
- package/lib/form/ProForm/index.scss +10 -28
- package/lib/form/ProForm/useAutoSubmit.js +2 -2
- package/lib/form/ProForm/useFieldRequest.js +2 -2
- package/lib/form/ProForm/useFormDisplayValues.d.ts +3 -5
- package/lib/form/ProForm/useFormDisplayValues.js +83 -44
- package/lib/form/ProForm/useInitialRequest.js +2 -2
- package/lib/form/SchemaForm/adapterType.js +1 -0
- package/lib/form/SchemaForm/index.js +12 -11
- 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 +2 -2
- package/lib/form/fieldTypeMap.js +1 -0
- package/lib/form/global.scss +1 -0
- package/lib/form/index.d.ts +2 -1
- package/lib/form/index.js +8 -6
- package/lib/form/typing.d.ts +3 -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 +19 -11
- package/lib/page-header/index.js +22 -47
- package/lib/page-header/index.scss +0 -11
- 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 +13 -11
- package/lib/table/components/Filter/index.scss +7 -3
- package/lib/table/components/Layout/index.js +13 -4
- 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 +3 -3
- 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/index.js +23 -13
- package/lib/table/typing.d.ts +6 -0
- package/lib/table/utils/columnRender.js +40 -3
- package/lib/table/utils/genProColumnToColumn.js +2 -2
- package/lib/table/utils/index.js +17 -3
- 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.js +2 -2
- package/package.json +4 -4
- 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/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
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -31,9 +31,9 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
|
|
31
31
|
|
32
32
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
33
33
|
|
34
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
34
|
+
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; }
|
35
35
|
|
36
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
36
|
+
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; }
|
37
37
|
|
38
38
|
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; }
|
39
39
|
|
@@ -191,7 +191,7 @@ var Filter = function Filter(props) {
|
|
191
191
|
btn: true
|
192
192
|
}),
|
193
193
|
onClick: function onClick() {
|
194
|
-
var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r;
|
194
|
+
var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
|
195
195
|
|
196
196
|
(_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
|
197
197
|
|
@@ -234,27 +234,29 @@ var Filter = function Filter(props) {
|
|
234
234
|
}))); // 发送请求
|
235
235
|
|
236
236
|
(_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
|
237
|
-
(_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7);
|
237
|
+
(_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
|
238
|
+
|
239
|
+
(_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
|
238
240
|
setVisible(false);
|
239
241
|
}
|
240
|
-
},
|
242
|
+
}, (0, _utils.getMessage)('ok')), /*#__PURE__*/_react.default.createElement(_components.Button, {
|
241
243
|
type: "normal",
|
242
244
|
size: "small",
|
243
245
|
className: cls({
|
244
246
|
btn: true
|
245
247
|
}),
|
246
248
|
onClick: function onClick() {
|
247
|
-
var _actionRef$current$ge6, _actionRef$
|
249
|
+
var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
|
248
250
|
|
249
251
|
setSelected([]);
|
250
|
-
var rules = (_actionRef$current$ge6 = (_actionRef$
|
251
|
-
(_actionRef$
|
252
|
+
var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
|
253
|
+
(_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
|
252
254
|
rules: [],
|
253
255
|
params: ''
|
254
256
|
})));
|
255
|
-
(_actionRef$
|
257
|
+
(_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
|
256
258
|
}
|
257
|
-
},
|
259
|
+
}, (0, _utils.getMessage)('reset'))))));
|
258
260
|
};
|
259
261
|
|
260
262
|
var _default = Filter;
|
@@ -12,12 +12,16 @@
|
|
12
12
|
}
|
13
13
|
.teamix-pro-table-toolbar-filter-btn-box {
|
14
14
|
display: flex;
|
15
|
-
justify-content:
|
15
|
+
justify-content: center;
|
16
16
|
margin-top: 10px;
|
17
17
|
padding-bottom: 5px;
|
18
|
+
padding-left: 4px;
|
19
|
+
padding-right: 4px;
|
18
20
|
}
|
19
21
|
.teamix-pro-table-toolbar-filter-btn.teamix-pro-table-toolbar-filter-btn {
|
20
|
-
width: 48px !important;
|
21
|
-
|
22
|
+
min-width: 48px !important;
|
23
|
+
&:first-child {
|
24
|
+
margin-right: 8px;
|
25
|
+
}
|
22
26
|
}
|
23
27
|
}
|
@@ -33,13 +33,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
33
33
|
|
34
34
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
35
35
|
|
36
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
36
|
+
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; }
|
37
37
|
|
38
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
38
|
+
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; }
|
39
39
|
|
40
40
|
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; }
|
41
41
|
|
42
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
42
|
+
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); }
|
43
43
|
|
44
44
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
45
45
|
|
@@ -92,7 +92,16 @@ var Layout = function Layout(props) {
|
|
92
92
|
var _mainAction$actions;
|
93
93
|
|
94
94
|
if (_typeof(mainAction) === 'object' && (mainAction === null || mainAction === void 0 ? void 0 : (_mainAction$actions = mainAction.actions) === null || _mainAction$actions === void 0 ? void 0 : _mainAction$actions.length) > 0) {
|
95
|
-
//
|
95
|
+
// 判断 actions 是否 visible 都为 false,是的话也不渲染
|
96
|
+
var isEmptyActions = mainAction === null || mainAction === void 0 ? void 0 : mainAction.actions.every(function (action) {
|
97
|
+
return (action === null || action === void 0 ? void 0 : action.visible) === false;
|
98
|
+
});
|
99
|
+
|
100
|
+
if (isEmptyActions) {
|
101
|
+
return;
|
102
|
+
} // 默认 context
|
103
|
+
|
104
|
+
|
96
105
|
var defaultContext = {
|
97
106
|
action: actionRef.current,
|
98
107
|
rowSelection: rowSelection
|
@@ -13,13 +13,13 @@ var _actions = _interopRequireDefault(require("../../../actions"));
|
|
13
13
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
15
15
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
16
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
17
17
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
18
|
+
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; }
|
19
19
|
|
20
20
|
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; }
|
21
21
|
|
22
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
22
|
+
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); }
|
23
23
|
|
24
24
|
var QuickAction = function QuickAction(props) {
|
25
25
|
var quickAction = props.quickAction,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -37,9 +37,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
37
37
|
|
38
38
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
39
39
|
|
40
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
40
|
+
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; }
|
41
41
|
|
42
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
42
|
+
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; }
|
43
43
|
|
44
44
|
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; }
|
45
45
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -21,9 +21,9 @@ require("./index.scss");
|
|
21
21
|
|
22
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
23
23
|
|
24
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
24
|
+
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; }
|
25
25
|
|
26
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
26
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
27
27
|
|
28
28
|
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; }
|
29
29
|
|
package/lib/table/index.js
CHANGED
@@ -63,7 +63,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
63
63
|
|
64
64
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
65
65
|
|
66
|
-
function _typeof(obj) { "@babel/helpers - typeof";
|
66
|
+
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); }
|
67
67
|
|
68
68
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
69
69
|
|
@@ -73,9 +73,9 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
|
|
73
73
|
|
74
74
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
75
75
|
|
76
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
76
|
+
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; }
|
77
77
|
|
78
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
78
|
+
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; }
|
79
79
|
|
80
80
|
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; }
|
81
81
|
|
@@ -393,7 +393,11 @@ var ProTable = function ProTable(props) {
|
|
393
393
|
}
|
394
394
|
}, [propsActionRef]);
|
395
395
|
(0, _react.useEffect)(function () {
|
396
|
-
|
396
|
+
var _actionRef$current, _actionRef$current$se;
|
397
|
+
|
398
|
+
var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
|
399
|
+
setFilteredColumns(columns);
|
400
|
+
(_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);
|
397
401
|
}, [propsColumns]); // 绑定 Actions
|
398
402
|
|
399
403
|
(0, _utils2.useActionType)(actionRef, {
|
@@ -407,7 +411,11 @@ var ProTable = function ProTable(props) {
|
|
407
411
|
return state;
|
408
412
|
},
|
409
413
|
setColumn: function setColumn(newColumns) {
|
410
|
-
|
414
|
+
var _actionRef$current2, _actionRef$current2$s;
|
415
|
+
|
416
|
+
var columns = processColumns(newColumns);
|
417
|
+
setFilteredColumns(columns);
|
418
|
+
(_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);
|
411
419
|
},
|
412
420
|
setSize: function setSize(mode) {
|
413
421
|
_setSize(mode);
|
@@ -421,11 +429,11 @@ var ProTable = function ProTable(props) {
|
|
421
429
|
}
|
422
430
|
},
|
423
431
|
reset: function reset() {
|
424
|
-
var _actionRef$
|
432
|
+
var _actionRef$current3, _actionRef$current3$s;
|
425
433
|
|
426
434
|
(propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
|
427
435
|
|
428
|
-
(_actionRef$
|
436
|
+
(_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, {});
|
429
437
|
dataFilterForm.reset();
|
430
438
|
setCurrentPage(1);
|
431
439
|
|
@@ -525,8 +533,7 @@ var ProTable = function ProTable(props) {
|
|
525
533
|
|
526
534
|
if (props.onError) {
|
527
535
|
props.onError(error);
|
528
|
-
} else {
|
529
|
-
_components.Message.error(error.toString());
|
536
|
+
} else {// Message.error(error.toString());
|
530
537
|
} // 重新计算是否需要吸底
|
531
538
|
|
532
539
|
|
@@ -537,7 +544,7 @@ var ProTable = function ProTable(props) {
|
|
537
544
|
}); // 请求函数
|
538
545
|
|
539
546
|
function _request(params, noLoading) {
|
540
|
-
var _actionRef$current$ge, _actionRef$
|
547
|
+
var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
|
541
548
|
|
542
549
|
// 如果没有传 url 且没有 customRequest,直接返回
|
543
550
|
if (!url && !customRequest) {
|
@@ -552,7 +559,7 @@ var ProTable = function ProTable(props) {
|
|
552
559
|
|
553
560
|
var dataFilterParams = toJS(dataFilterForm.values); // 列过滤请求参数
|
554
561
|
|
555
|
-
var columnsFilterParams = (_actionRef$current$ge = (_actionRef$
|
562
|
+
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 : {}; // 格式化后的请求参数
|
556
563
|
|
557
564
|
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));
|
558
565
|
|
@@ -639,7 +646,10 @@ var ProTable = function ProTable(props) {
|
|
639
646
|
(propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
|
640
647
|
|
641
648
|
if (dataFilterForm.validate()) {
|
642
|
-
setCurrentPage(1);
|
649
|
+
setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
|
650
|
+
// TODO: 针对 inline 模式下的 search 组件做一下处理,如果空值切换下拉的时候不触发请求
|
651
|
+
// if (mode === 'inline') {
|
652
|
+
// }
|
643
653
|
|
644
654
|
_request(_defineProperty({}, targetPageKey, 1));
|
645
655
|
}
|
@@ -817,7 +827,7 @@ var ProTable = function ProTable(props) {
|
|
817
827
|
|
818
828
|
}),
|
819
829
|
ref: tableRef
|
820
|
-
}, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
|
830
|
+
}, renderTable(), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter()));
|
821
831
|
};
|
822
832
|
|
823
833
|
var _default = ProTable;
|
package/lib/table/typing.d.ts
CHANGED
@@ -180,6 +180,8 @@ export declare type ProTableActionType = {
|
|
180
180
|
export declare type ProTableActionTypeMutations = {
|
181
181
|
/** 获取state状态 */
|
182
182
|
getState?: () => ProTableActionTypeState;
|
183
|
+
/** 设置state状态 */
|
184
|
+
setState?: (key: string, value: any) => void;
|
183
185
|
/** 设置全屏状态 */
|
184
186
|
setFullScreenState?: (state: boolean) => void;
|
185
187
|
/** 绑定state监听事件 */
|
@@ -192,11 +194,15 @@ export declare type ProTableActionTypeMutations = {
|
|
192
194
|
getFilterRules?: () => object;
|
193
195
|
/** 重新计算表格maxHeight高度 */
|
194
196
|
resetTableMaxBodyHeight?: () => void;
|
197
|
+
/** 列筛选规则 */
|
198
|
+
filterColumns?: any[];
|
195
199
|
};
|
196
200
|
/** action Mutations 定义 */
|
197
201
|
export declare type ProTableActionTypeState = {
|
198
202
|
fullScreenState: boolean;
|
199
203
|
filterRules: ProTableColumnsFilterRulesItem;
|
204
|
+
filterColumns: ProTableColumnProps[];
|
205
|
+
[key: string]: any;
|
200
206
|
};
|
201
207
|
export declare type ProTableDataFilterProps = {
|
202
208
|
/** 展示形式 */
|
@@ -37,9 +37,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
37
37
|
|
38
38
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
39
39
|
|
40
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
40
|
+
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; }
|
41
41
|
|
42
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
42
|
+
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; }
|
43
43
|
|
44
44
|
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; }
|
45
45
|
|
@@ -47,8 +47,45 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
47
47
|
* 增加了 icon 的功能 render title
|
48
48
|
*/
|
49
49
|
var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
|
50
|
+
var filterMode = item.filterMode,
|
51
|
+
filters = item.filters,
|
52
|
+
dataIndex = item.dataIndex,
|
53
|
+
dataSource = item.dataSource;
|
54
|
+
|
55
|
+
var getItemLable = function getItemLable() {
|
56
|
+
if (filterMode !== 'multiple') {
|
57
|
+
var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2;
|
58
|
+
|
59
|
+
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 : {};
|
60
|
+
|
61
|
+
if (Object.keys(selectedItem).length > 0) {
|
62
|
+
var _selectedItem$dataInd;
|
63
|
+
|
64
|
+
if ((_selectedItem$dataInd = selectedItem[dataIndex]) === null || _selectedItem$dataInd === void 0 ? void 0 : _selectedItem$dataInd.params) {
|
65
|
+
var _targetFilters$find;
|
66
|
+
|
67
|
+
// 找到对应的 label
|
68
|
+
var targetFilters = filters !== null && filters !== void 0 ? filters : [];
|
69
|
+
|
70
|
+
if (filters === true) {
|
71
|
+
targetFilters = dataSource !== null && dataSource !== void 0 ? dataSource : [];
|
72
|
+
}
|
73
|
+
|
74
|
+
var label = (_targetFilters$find = targetFilters.find(function (item) {
|
75
|
+
var _selectedItem$dataInd2;
|
76
|
+
|
77
|
+
return item.value === ((_selectedItem$dataInd2 = selectedItem[dataIndex]) === null || _selectedItem$dataInd2 === void 0 ? void 0 : _selectedItem$dataInd2.params);
|
78
|
+
})) === null || _targetFilters$find === void 0 ? void 0 : _targetFilters$find.label;
|
79
|
+
return "".concat(item.title, " (").concat(label, ")");
|
80
|
+
}
|
81
|
+
}
|
82
|
+
}
|
83
|
+
|
84
|
+
return item.title;
|
85
|
+
};
|
86
|
+
|
50
87
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_utils.LabelIconTip, {
|
51
|
-
label:
|
88
|
+
label: getItemLable(),
|
52
89
|
tooltip: item.tooltip,
|
53
90
|
icon: item.tooltipIcon
|
54
91
|
}), item.filters && /*#__PURE__*/_react.default.createElement(_Filter.default, {
|
@@ -15,9 +15,9 @@ var _excluded = ["filters", "dataIndex"];
|
|
15
15
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
17
17
|
|
18
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
18
|
+
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; }
|
19
19
|
|
20
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
20
|
+
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; }
|
21
21
|
|
22
22
|
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; }
|
23
23
|
|
package/lib/table/utils/index.js
CHANGED
@@ -10,9 +10,9 @@ var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
|
|
10
10
|
|
11
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
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
|
|
@@ -31,7 +31,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
31
31
|
// 组件内全局状态
|
32
32
|
var state = {
|
33
33
|
fullScreenState: false,
|
34
|
-
filterRules: {}
|
34
|
+
filterRules: {},
|
35
|
+
filterColumns: []
|
35
36
|
}; // 组件内全局监听事件
|
36
37
|
|
37
38
|
var callback = {
|
@@ -42,6 +43,15 @@ var mutations = {
|
|
42
43
|
getState: function getState() {
|
43
44
|
return state;
|
44
45
|
},
|
46
|
+
setState: function setState(key, value) {
|
47
|
+
state[key] = value;
|
48
|
+
useOn(key, value);
|
49
|
+
|
50
|
+
if (mutations.hasOwnProperty(key)) {
|
51
|
+
mutations[key] = value;
|
52
|
+
}
|
53
|
+
},
|
54
|
+
filterColumns: state.filterColumns,
|
45
55
|
setFullScreenState: function setFullScreenState(fullScreenState) {
|
46
56
|
state.fullScreenState = fullScreenState;
|
47
57
|
useOn('fullScreenState', fullScreenState);
|
@@ -85,6 +95,10 @@ var mutations = {
|
|
85
95
|
* @param name 监听名(作为销毁唯一id使用)
|
86
96
|
*/
|
87
97
|
on: function on(fun, state, name) {
|
98
|
+
if (!callback[state]) {
|
99
|
+
callback[state] = {};
|
100
|
+
}
|
101
|
+
|
88
102
|
callback[state][name] = fun;
|
89
103
|
},
|
90
104
|
off: function off(name) {
|
@@ -9,9 +9,9 @@ var _react = require("react");
|
|
9
9
|
|
10
10
|
var _utils = require("@teamix/utils");
|
11
11
|
|
12
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
12
|
+
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
13
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
14
|
+
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; }
|
15
15
|
|
16
16
|
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; }
|
17
17
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
@@ -23,9 +23,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
23
23
|
|
24
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
25
25
|
|
26
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
26
|
+
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; }
|
27
27
|
|
28
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
28
|
+
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; }
|
29
29
|
|
30
30
|
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; }
|
31
31
|
|
package/lib/utils/index.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
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
|
Object.defineProperty(exports, "__esModule", {
|
6
6
|
value: true
|
package/lib/utils/message.js
CHANGED
@@ -11,9 +11,9 @@ var _components = require("@alicloudfe/components");
|
|
11
11
|
|
12
12
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
13
13
|
|
14
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
14
|
+
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; }
|
15
15
|
|
16
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
16
|
+
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; }
|
17
17
|
|
18
18
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
19
19
|
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teamix/pro",
|
3
|
-
"version": "1.2.
|
3
|
+
"version": "1.2.14",
|
4
4
|
"description": "TeamixPro大包",
|
5
5
|
"repository": "http://gitlab.alibaba-inc.com/teamix/pro",
|
6
6
|
"author": "Velociraptor(迅猛龙)",
|
@@ -22,9 +22,9 @@
|
|
22
22
|
],
|
23
23
|
"private": false,
|
24
24
|
"dependencies": {
|
25
|
-
"@formily/core": "2.0.
|
26
|
-
"@formily/react": "2.0.
|
27
|
-
"@teamix/formily": "2.0.
|
25
|
+
"@formily/core": "2.0.5",
|
26
|
+
"@formily/react": "2.0.5",
|
27
|
+
"@teamix/formily": "2.0.5-1",
|
28
28
|
"@teamix/hooks": "^0.1.0",
|
29
29
|
"@teamix/pop-confirm": "^1.2.2",
|
30
30
|
"@teamix/pro-field": "^1.0.0",
|