@teamix/pro 1.5.11-beta.2 → 1.5.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/pro.css +1 -1
- package/dist/pro.js +53 -38
- package/dist/pro.min.css +1 -1
- package/dist/pro.min.js +1 -1
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/table/components/ToolBar/FilterColumnIcon.js +28 -23
- package/es/table/components/ToolBar/RefreshIcon.js +3 -3
- package/es/table/index.js +19 -8
- package/es/table/typing.d.ts +2 -2
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/table/components/ToolBar/FilterColumnIcon.js +27 -22
- package/lib/table/components/ToolBar/RefreshIcon.js +3 -3
- package/lib/table/index.js +18 -7
- package/lib/table/typing.d.ts +2 -2
- package/package.json +1 -1
- package/es/table/utils/cloneDeep.d.ts +0 -28
- package/es/table/utils/cloneDeep.js +0 -1578
- package/lib/table/utils/cloneDeep.d.ts +0 -28
- package/lib/table/utils/cloneDeep.js +0 -1585
package/dist/pro.js
CHANGED
@@ -94957,7 +94957,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
|
|
94957
94957
|
|
94958
94958
|
|
94959
94959
|
|
94960
|
-
var version = '1.5.11
|
94960
|
+
var version = '1.5.11';
|
94961
94961
|
|
94962
94962
|
// By TeamixTest
|
94963
94963
|
window.postMessage({
|
@@ -100942,9 +100942,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
100942
100942
|
var showDataIndex = stateFilterColumns.map(function (item) {
|
100943
100943
|
return item.dataIndex;
|
100944
100944
|
});
|
100945
|
-
var stateColumns =
|
100945
|
+
var stateColumns = processColumns(columns).map(function (item) {
|
100946
100946
|
if (!showDataIndex.includes(item.dataIndex)) {
|
100947
|
-
item
|
100947
|
+
return _extends({}, item, {
|
100948
|
+
columnFilters: false
|
100949
|
+
});
|
100948
100950
|
}
|
100949
100951
|
return item;
|
100950
100952
|
});
|
@@ -100966,11 +100968,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
100966
100968
|
// 全选
|
100967
100969
|
var onChangeAllColumns = function onChangeAllColumns(check) {
|
100968
100970
|
setAllVisible(check);
|
100969
|
-
var keyNewColumns = (
|
100970
|
-
keyNewColumns.map(function (item) {
|
100971
|
+
var keyNewColumns = newColumns.map(function (item) {
|
100971
100972
|
var _item$columnFiltersDi;
|
100972
|
-
|
100973
|
-
|
100973
|
+
return _extends({}, item, {
|
100974
|
+
columnFilters: (_item$columnFiltersDi = item.columnFiltersDisabled) != null ? _item$columnFiltersDi : check
|
100975
|
+
});
|
100974
100976
|
});
|
100975
100977
|
notifyTableRender(keyNewColumns);
|
100976
100978
|
};
|
@@ -100984,10 +100986,12 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
100984
100986
|
|
100985
100987
|
// 修改
|
100986
100988
|
var onChangeColumns = function onChangeColumns(check, dataIndex) {
|
100987
|
-
var keyNewColumns = (
|
100988
|
-
keyNewColumns.map(function (item) {
|
100989
|
+
var keyNewColumns = newColumns.map(function (item) {
|
100989
100990
|
if (item.dataIndex === dataIndex) {
|
100990
100991
|
item.columnFilters = check;
|
100992
|
+
return _extends({}, item, {
|
100993
|
+
columnFilters: check
|
100994
|
+
});
|
100991
100995
|
}
|
100992
100996
|
return item;
|
100993
100997
|
});
|
@@ -100996,8 +101000,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
100996
101000
|
|
100997
101001
|
// 修改:dialog
|
100998
101002
|
var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
|
100999
|
-
|
101000
|
-
notifyTableRender(keyNewColumns);
|
101003
|
+
notifyTableRender(newColumns);
|
101001
101004
|
setDropdownVisible(false);
|
101002
101005
|
};
|
101003
101006
|
|
@@ -101005,18 +101008,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
101005
101008
|
var moveUp = function moveUp(e, dataIndex) {
|
101006
101009
|
var _newColumns$filter, _newColumns$filter2;
|
101007
101010
|
e.stopPropagation();
|
101008
|
-
var keyNewColumns = (
|
101011
|
+
var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref) {
|
101009
101012
|
var lock = _ref.lock;
|
101010
101013
|
return !lock;
|
101011
101014
|
});
|
101012
|
-
var headLock = (
|
101015
|
+
var headLock = (_newColumns$filter = newColumns.filter(function (_ref2) {
|
101013
101016
|
var lock = _ref2.lock;
|
101014
101017
|
return lock === true || lock === 'left';
|
101015
|
-
})) != null ? _newColumns$filter : []
|
101016
|
-
var tailLock = (
|
101018
|
+
})) != null ? _newColumns$filter : [];
|
101019
|
+
var tailLock = (_newColumns$filter2 = newColumns.filter(function (_ref3) {
|
101017
101020
|
var lock = _ref3.lock;
|
101018
101021
|
return lock === 'right';
|
101019
|
-
})) != null ? _newColumns$filter2 : []
|
101022
|
+
})) != null ? _newColumns$filter2 : [];
|
101020
101023
|
var index = keyNewColumns.findIndex(function (_ref4) {
|
101021
101024
|
var index = _ref4.dataIndex;
|
101022
101025
|
return index === dataIndex;
|
@@ -101033,18 +101036,18 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
101033
101036
|
var moveDown = function moveDown(e, dataIndex) {
|
101034
101037
|
var _newColumns$filter3, _newColumns$filter4;
|
101035
101038
|
e.stopPropagation();
|
101036
|
-
var keyNewColumns = (
|
101039
|
+
var keyNewColumns = _toConsumableArray(newColumns).filter(function (_ref5) {
|
101037
101040
|
var lock = _ref5.lock;
|
101038
101041
|
return !lock;
|
101039
101042
|
});
|
101040
|
-
var headLock = (
|
101043
|
+
var headLock = (_newColumns$filter3 = newColumns.filter(function (_ref6) {
|
101041
101044
|
var lock = _ref6.lock;
|
101042
101045
|
return lock === true || lock === 'left';
|
101043
|
-
})) != null ? _newColumns$filter3 : []
|
101044
|
-
var tailLock = (
|
101046
|
+
})) != null ? _newColumns$filter3 : [];
|
101047
|
+
var tailLock = (_newColumns$filter4 = newColumns.filter(function (_ref7) {
|
101045
101048
|
var lock = _ref7.lock;
|
101046
101049
|
return lock === 'right';
|
101047
|
-
})) != null ? _newColumns$filter4 : []
|
101050
|
+
})) != null ? _newColumns$filter4 : [];
|
101048
101051
|
var index = keyNewColumns.findIndex(function (_ref8) {
|
101049
101052
|
var index = _ref8.dataIndex;
|
101050
101053
|
return index === dataIndex;
|
@@ -101199,9 +101202,11 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
|
|
101199
101202
|
return key === dataIndex;
|
101200
101203
|
})) == null ? void 0 : _newColumns$find2.columnFilters,
|
101201
101204
|
onChange: function onChange(check) {
|
101202
|
-
var columnsList =
|
101205
|
+
var columnsList = newColumns.map(function (item) {
|
101203
101206
|
if (item.dataIndex === dataIndex) {
|
101204
|
-
item
|
101207
|
+
return _extends({}, item, {
|
101208
|
+
columnFilters: check
|
101209
|
+
});
|
101205
101210
|
}
|
101206
101211
|
return item;
|
101207
101212
|
});
|
@@ -101514,13 +101519,13 @@ var LayoutIcon = function LayoutIcon(props) {
|
|
101514
101519
|
|
101515
101520
|
// 渲染刷新图标
|
101516
101521
|
var renderRefreshIcon = function renderRefreshIcon() {
|
101517
|
-
if (!!autoRefresh && autoRefreshVisible) {
|
101522
|
+
if (!!autoRefresh && autoRefreshVisible && typeof autoRefresh !== 'function') {
|
101518
101523
|
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z, {
|
101519
101524
|
size: "small",
|
101520
101525
|
type: "auto-refresh-on-line"
|
101521
101526
|
});
|
101522
101527
|
}
|
101523
|
-
if (!!autoRefresh && !autoRefreshVisible) {
|
101528
|
+
if (!!autoRefresh && !autoRefreshVisible && typeof autoRefresh !== 'function') {
|
101524
101529
|
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z, {
|
101525
101530
|
size: "small",
|
101526
101531
|
type: "auto-refresh-off-line"
|
@@ -101545,7 +101550,7 @@ var LayoutIcon = function LayoutIcon(props) {
|
|
101545
101550
|
}
|
101546
101551
|
}, item.label);
|
101547
101552
|
});
|
101548
|
-
if (autoRefresh) {
|
101553
|
+
if (autoRefresh && typeof autoRefresh !== 'function') {
|
101549
101554
|
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Dropdown, {
|
101550
101555
|
trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Button, {
|
101551
101556
|
iconSize: "small",
|
@@ -101797,7 +101802,7 @@ var ToolBar = function ToolBar(props) {
|
|
101797
101802
|
/* harmony import */ var _skeleton__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53277);
|
101798
101803
|
/* harmony import */ var _components_Layout__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9458);
|
101799
101804
|
/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(90450);
|
101800
|
-
/* harmony import */ var
|
101805
|
+
/* harmony import */ var _utils_getTableProps__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(78964);
|
101801
101806
|
/* harmony import */ var _utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(98806);
|
101802
101807
|
/* harmony import */ var _utils_useTableSelection__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(23779);
|
101803
101808
|
/* harmony import */ var _components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(21630);
|
@@ -101809,8 +101814,6 @@ var ToolBar = function ToolBar(props) {
|
|
101809
101814
|
/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39339);
|
101810
101815
|
/* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_15__);
|
101811
101816
|
/* harmony import */ var _components_CardView__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(9285);
|
101812
|
-
/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(52308);
|
101813
|
-
/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_17__);
|
101814
101817
|
var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps"],
|
101815
101818
|
_excluded2 = ["onChange"];
|
101816
101819
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
@@ -101819,9 +101822,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
101819
101822
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
101820
101823
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
101821
101824
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
101822
|
-
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
101823
101825
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
101824
|
-
|
101826
|
+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
101825
101827
|
|
101826
101828
|
|
101827
101829
|
|
@@ -101852,8 +101854,8 @@ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.usePrefixCls)('teamix-pr
|
|
101852
101854
|
var processColumns = function processColumns(columns, initialColumns) {
|
101853
101855
|
var _getGlobalConfig;
|
101854
101856
|
var globalFilterColumns = (_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig.filterColumns;
|
101855
|
-
var filterColumns =
|
101856
|
-
return item.columnFilters !== false && (item == null ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(item));
|
101857
|
+
var filterColumns = columns.filter(function (item) {
|
101858
|
+
return item.columnFilters !== false && (item == null ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_extends({}, item)));
|
101857
101859
|
});
|
101858
101860
|
// 处理只剩一列批量选择的情况下宽度错乱问题
|
101859
101861
|
if (filterColumns != null && filterColumns.length) {
|
@@ -102512,6 +102514,10 @@ var ProTable = function ProTable(props) {
|
|
102512
102514
|
data: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getDeepValue)(formatResult.data, result) || [],
|
102513
102515
|
total: isNaN(dataTotal) ? 0 : Number(dataTotal)
|
102514
102516
|
};
|
102517
|
+
} else if (typeof formatResult === 'string') {
|
102518
|
+
nextData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(formatResult, {
|
102519
|
+
res: result
|
102520
|
+
});
|
102515
102521
|
}
|
102516
102522
|
}
|
102517
102523
|
if (nextData instanceof Promise) {
|
@@ -102566,7 +102572,15 @@ var ProTable = function ProTable(props) {
|
|
102566
102572
|
var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.getFilterRules == null ? void 0 : _actionRef$current6.getFilterRules()) != null ? _actionRef$current$ge : {};
|
102567
102573
|
|
102568
102574
|
// 格式化后的请求参数
|
102569
|
-
var requestData =
|
102575
|
+
var requestData = {};
|
102576
|
+
var preParams = _extends({}, !showPagination ? _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams) : _extends((_extends3 = {}, _extends3[targetPageKey] = currentPage, _extends3[targetPageSizeKey] = pageSize, _extends3), dataFilterParams, propsParams, sortParams, columnsFilterParams), params);
|
102577
|
+
if (typeof formatParams === 'string') {
|
102578
|
+
requestData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(formatParams, {
|
102579
|
+
params: preParams
|
102580
|
+
});
|
102581
|
+
} else {
|
102582
|
+
requestData = formatParams(preParams);
|
102583
|
+
}
|
102570
102584
|
if (requestData) {
|
102571
102585
|
if (autoRefreshTimerRef.current) {
|
102572
102586
|
clearTimeout(autoRefreshTimerRef.current);
|
@@ -102734,7 +102748,7 @@ var ProTable = function ProTable(props) {
|
|
102734
102748
|
fixedHeader: fullscreenState || fixedTableBody,
|
102735
102749
|
maxBodyHeight: "calc(100vh - " + headerHeight + "px)"
|
102736
102750
|
// 过滤出可以传到 Table 的 Props
|
102737
|
-
}, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,
|
102751
|
+
}, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(), otherProps))), switchViewState === 'card' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_CardView__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {
|
102738
102752
|
dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
|
102739
102753
|
showSkeleton: showSkeleton,
|
102740
102754
|
loading: getTableLoading(),
|
@@ -102749,7 +102763,7 @@ var ProTable = function ProTable(props) {
|
|
102749
102763
|
// 不传 columns 直接返回原始 Table
|
102750
102764
|
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Table, _extends({
|
102751
102765
|
className: cls()
|
102752
|
-
}, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,
|
102766
|
+
}, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(), otherProps)));
|
102753
102767
|
}
|
102754
102768
|
};
|
102755
102769
|
var renderFooterAction = function renderFooterAction() {
|
@@ -103285,13 +103299,13 @@ dataTeamixSpm) {
|
|
103285
103299
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
103286
103300
|
/* harmony export */ "S1": () => (/* binding */ off),
|
103287
103301
|
/* harmony export */ "So": () => (/* binding */ actionRefUseStateOn),
|
103288
|
-
/* harmony export */ "Xh": () => (/* binding */ cloneDeep),
|
103289
103302
|
/* harmony export */ "aP": () => (/* binding */ processDefaultFilter),
|
103290
103303
|
/* harmony export */ "j8": () => (/* binding */ emit),
|
103291
103304
|
/* harmony export */ "on": () => (/* binding */ on),
|
103292
103305
|
/* harmony export */ "rf": () => (/* binding */ initActionRef),
|
103293
103306
|
/* harmony export */ "tx": () => (/* binding */ useActionType)
|
103294
103307
|
/* harmony export */ });
|
103308
|
+
/* unused harmony export cloneDeep */
|
103295
103309
|
/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(52308);
|
103296
103310
|
/* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0__);
|
103297
103311
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
@@ -103386,7 +103400,7 @@ function useActionType(ref, action) {
|
|
103386
103400
|
ref.current = _extends({}, ref.current, action);
|
103387
103401
|
}
|
103388
103402
|
function cloneDeep(obj) {
|
103389
|
-
return
|
103403
|
+
return cloneDeepLodash(obj);
|
103390
103404
|
}
|
103391
103405
|
|
103392
103406
|
/**
|
@@ -106529,6 +106543,7 @@ var getMessage = function getMessage(id, data) {
|
|
106529
106543
|
p1Emergency: 'P1 紧急',
|
106530
106544
|
p2Important: 'P2 重要',
|
106531
106545
|
p3Secondary: 'P3 次要',
|
106546
|
+
p4Reminder: 'P4 提醒',
|
106532
106547
|
autoRefresh: '自动刷新',
|
106533
106548
|
manualRefresh: '手动刷新'
|
106534
106549
|
});
|