@zat-design/sisyphus-react 3.9.0-beta.5 → 3.9.0-beta.7
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/index.esm.css +10 -0
- package/dist/less.esm.css +10 -0
- package/es/ProTable/components/FormatColumn/index.d.ts +1 -2
- package/es/ProTable/components/FormatColumn/index.js +10 -21
- package/es/ProTable/components/RenderColumn/index.d.ts +0 -1
- package/es/ProTable/components/RenderColumn/index.js +2 -3
- package/es/ProTable/index.d.ts +6 -5
- package/es/ProTable/index.js +3 -5
- package/es/ProTable/propsType.d.ts +1 -1
- package/es/ProTable/style/index.less +10 -1
- package/es/ProTable/utils/index.js +2 -2
- package/es/ProTree/components/ProTreeSelect/index.js +32 -13
- package/lib/ProTable/components/FormatColumn/index.d.ts +1 -2
- package/lib/ProTable/components/FormatColumn/index.js +10 -21
- package/lib/ProTable/components/RenderColumn/index.d.ts +0 -1
- package/lib/ProTable/components/RenderColumn/index.js +2 -3
- package/lib/ProTable/index.d.ts +6 -5
- package/lib/ProTable/index.js +3 -5
- package/lib/ProTable/propsType.d.ts +1 -1
- package/lib/ProTable/style/index.less +10 -1
- package/lib/ProTable/utils/index.js +2 -2
- package/lib/ProTree/components/ProTreeSelect/index.js +31 -12
- package/package.json +1 -1
package/dist/index.esm.css
CHANGED
@@ -1908,6 +1908,16 @@
|
|
1908
1908
|
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1909
1909
|
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1910
1910
|
}
|
1911
|
+
.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
|
1912
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1913
|
+
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1914
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1915
|
+
}
|
1916
|
+
.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
|
1917
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1918
|
+
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1919
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1920
|
+
}
|
1911
1921
|
.pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
|
1912
1922
|
margin-left: -8px;
|
1913
1923
|
padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
|
package/dist/less.esm.css
CHANGED
@@ -1908,6 +1908,16 @@
|
|
1908
1908
|
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1909
1909
|
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1910
1910
|
}
|
1911
|
+
.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
|
1912
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1913
|
+
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1914
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1915
|
+
}
|
1916
|
+
.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
|
1917
|
+
background: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1918
|
+
background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
|
1919
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
1920
|
+
}
|
1911
1921
|
.pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
|
1912
1922
|
margin-left: -8px;
|
1913
1923
|
padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
|
@@ -1,9 +1,8 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { ProTableColumn } from '../../propsType';
|
3
|
-
export declare const formatColumn: ({ column, originalObj,
|
3
|
+
export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
|
4
4
|
column: ProTableColumn;
|
5
5
|
originalObj: any;
|
6
|
-
dataSourceObj: any;
|
7
6
|
rowKey: any;
|
8
7
|
diffToolTip?: boolean;
|
9
8
|
wrapToolTipProps?: any;
|
@@ -49,7 +49,6 @@ var calcMinWidth = function calcMinWidth(_ref) {
|
|
49
49
|
export var formatColumn = function formatColumn(_ref2) {
|
50
50
|
var column = _ref2.column,
|
51
51
|
originalObj = _ref2.originalObj,
|
52
|
-
dataSourceObj = _ref2.dataSourceObj,
|
53
52
|
rowKey = _ref2.rowKey,
|
54
53
|
diffToolTip = _ref2.diffToolTip,
|
55
54
|
wrapToolTipProps = _ref2.wrapToolTipProps,
|
@@ -120,34 +119,24 @@ export var formatColumn = function formatColumn(_ref2) {
|
|
120
119
|
var originalRender = column.render; // 保存原始的 render 方法
|
121
120
|
// 自定义render 手动重载下
|
122
121
|
column.render = function (value, record, index) {
|
123
|
-
var _originalObj$record$r;
|
124
122
|
var isFn = isFunction(originalRender);
|
125
123
|
var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
|
126
124
|
var originalValue = getOriginalValue(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
|
127
|
-
var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : null;
|
128
125
|
var isInNewRowFlag = isInNewRow(record);
|
129
|
-
var extraDiffFlag = false;
|
130
|
-
// 把比对结果告诉我
|
131
|
-
if (onDiff) {
|
132
|
-
var isDiff = onDiff({
|
133
|
-
value: record,
|
134
|
-
originValue: originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]
|
135
|
-
});
|
136
|
-
if (!isDiff) {
|
137
|
-
originalValue = null;
|
138
|
-
} else {
|
139
|
-
originalValue = true;
|
140
|
-
extraDiffFlag = true;
|
141
|
-
}
|
142
|
-
}
|
143
126
|
// 存在比对
|
144
|
-
if (
|
145
|
-
var _originalObj$record$
|
146
|
-
|
127
|
+
if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
128
|
+
var _originalObj$record$r;
|
129
|
+
originalValue = otherProps.viewRender({
|
130
|
+
originalValue: originalValue,
|
131
|
+
originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
|
132
|
+
value: value,
|
133
|
+
record: record,
|
134
|
+
index: index
|
135
|
+
});
|
147
136
|
}
|
148
137
|
return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
|
149
138
|
valueType: valueType,
|
150
|
-
originalValue: isEmpty(originalValue) ? null :
|
139
|
+
originalValue: isEmpty(originalValue) ? null : originalValue,
|
151
140
|
ellipsis: ellipsis,
|
152
141
|
width: width,
|
153
142
|
value: _value,
|
@@ -13,7 +13,6 @@ interface Props {
|
|
13
13
|
toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
|
14
14
|
minWidth?: number;
|
15
15
|
isInNewRowFlag?: boolean;
|
16
|
-
viewRender?: (value: any, record: any, index: number) => any;
|
17
16
|
}
|
18
17
|
declare const RenderColumn: FC<Props>;
|
19
18
|
export default RenderColumn;
|
@@ -28,8 +28,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
28
28
|
_props$toolTipProps = props.toolTipProps,
|
29
29
|
toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
|
30
30
|
minWidth = props.minWidth,
|
31
|
-
isInNewRowFlag = props.isInNewRowFlag
|
32
|
-
viewRender = props.viewRender;
|
31
|
+
isInNewRowFlag = props.isInNewRowFlag;
|
33
32
|
var _useSetState = useSetState({
|
34
33
|
tooltip: false
|
35
34
|
}),
|
@@ -65,7 +64,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
65
64
|
children: [_jsxs(_Space, {
|
66
65
|
align: "start",
|
67
66
|
className: "original-value-container",
|
68
|
-
children: ["\u521D\u59CB\u503C\uFF1A",
|
67
|
+
children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
|
69
68
|
}), _jsx(_Space, {
|
70
69
|
className: "current-value-container",
|
71
70
|
children: ellipsis ? _jsxs(_Space, {
|
package/es/ProTable/index.d.ts
CHANGED
@@ -1,19 +1,20 @@
|
|
1
1
|
/// <reference types="react" />
|
2
2
|
import { ProTableProps } from './propsType';
|
3
|
+
import useAntdTable from './hooks/useAntdTable';
|
3
4
|
export declare const TableContext: import("react").Context<{}>;
|
4
5
|
export declare const defaultPage: {
|
5
6
|
pageNum: number;
|
6
7
|
pageSize: number;
|
7
8
|
};
|
8
|
-
declare
|
9
|
-
|
10
|
-
|
9
|
+
declare const ProTable: {
|
10
|
+
(props: ProTableProps): import("react/jsx-runtime").JSX.Element;
|
11
|
+
defaultProps: {
|
11
12
|
quickConfig: boolean;
|
12
13
|
stripe: boolean;
|
13
14
|
draggable: boolean;
|
14
15
|
disabled: boolean;
|
15
16
|
isView: boolean;
|
16
17
|
};
|
17
|
-
|
18
|
-
}
|
18
|
+
useAntdTable: typeof useAntdTable;
|
19
|
+
};
|
19
20
|
export default ProTable;
|
package/es/ProTable/index.js
CHANGED
@@ -29,7 +29,7 @@ export var defaultPage = {
|
|
29
29
|
pageNum: 1,
|
30
30
|
pageSize: 10
|
31
31
|
};
|
32
|
-
function ProTable(props) {
|
32
|
+
var ProTable = function ProTable(props) {
|
33
33
|
var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
|
34
34
|
var _ref = useProConfig('globalConfig') || {},
|
35
35
|
configStorage = _ref.storage; // 获取全局缓存位置配置
|
@@ -114,7 +114,6 @@ function ProTable(props) {
|
|
114
114
|
});
|
115
115
|
});
|
116
116
|
var originalObj = _originalDataSource ? keyBy(_originalDataSource, 'rowKey') : undefined;
|
117
|
-
var dataSourceObj = _dataSource ? keyBy(_dataSource, 'rowKey') : {};
|
118
117
|
var propsColumnObj = useMemo(function () {
|
119
118
|
return propsColumns.reduce(function (acc, cur) {
|
120
119
|
// @ts-ignore
|
@@ -213,8 +212,7 @@ function ProTable(props) {
|
|
213
212
|
formatColumn({
|
214
213
|
column: item,
|
215
214
|
originalObj: originalObj,
|
216
|
-
|
217
|
-
rowKey: 'rowKey',
|
215
|
+
rowKey: props.rowKey,
|
218
216
|
diffToolTip: toolTip,
|
219
217
|
wrapToolTipProps: wrapToolTipProps,
|
220
218
|
scroll: _scroll,
|
@@ -447,7 +445,7 @@ function ProTable(props) {
|
|
447
445
|
})]
|
448
446
|
})
|
449
447
|
});
|
450
|
-
}
|
448
|
+
};
|
451
449
|
ProTable.defaultProps = {
|
452
450
|
quickConfig: false,
|
453
451
|
stripe: true,
|
@@ -45,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
|
|
45
45
|
value: any;
|
46
46
|
originValue: any;
|
47
47
|
}) => boolean;
|
48
|
-
viewRender?: (value
|
48
|
+
viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
|
49
49
|
}
|
50
50
|
export interface CreateTreeFromArrayOptions {
|
51
51
|
itemKey?: string;
|
@@ -261,11 +261,20 @@
|
|
261
261
|
tr.@{ant-prefix}-table-row.new-cell {
|
262
262
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
263
263
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
264
|
-
|
265
264
|
td.@{ant-prefix}-table-cell {
|
266
265
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
267
266
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
268
267
|
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
268
|
+
&.@{ant-prefix}-table-cell-fix-right {
|
269
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
270
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
271
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
272
|
+
}
|
273
|
+
&.@{ant-prefix}-table-cell-fix-left {
|
274
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
275
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
276
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
277
|
+
}
|
269
278
|
}
|
270
279
|
}
|
271
280
|
|
@@ -20,14 +20,14 @@ export var getDecimalDigits = function getDecimalDigits() {
|
|
20
20
|
*/
|
21
21
|
export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
|
22
22
|
if (!originalObj) {
|
23
|
-
return
|
23
|
+
return null;
|
24
24
|
}
|
25
25
|
var originalRecord = get(originalObj, get(record, rowKey));
|
26
26
|
var originalValue = get(originalRecord, dataIndex);
|
27
27
|
if (!isEqual(originalValue, value)) {
|
28
28
|
return originalValue;
|
29
29
|
}
|
30
|
-
return
|
30
|
+
return null;
|
31
31
|
};
|
32
32
|
export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
|
33
33
|
return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
|
@@ -1,6 +1,8 @@
|
|
1
1
|
import "antd/es/tooltip/style";
|
2
2
|
import _Tooltip from "antd/es/tooltip";
|
3
3
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
4
|
+
import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
|
5
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
4
6
|
import "antd/es/input/style";
|
5
7
|
import _Input from "antd/es/input";
|
6
8
|
import "antd/es/message/style";
|
@@ -18,7 +20,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
18
20
|
import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
|
19
21
|
import classnames from 'classnames';
|
20
22
|
import { useImperativeHandle, forwardRef } from 'react';
|
21
|
-
import { cloneDeep } from 'lodash';
|
23
|
+
import { cloneDeep, debounce } from 'lodash';
|
22
24
|
import { useProConfig } from '../../../ProConfigProvider';
|
23
25
|
import Container from '../../../ProForm/components/Container';
|
24
26
|
import AdaptiveTooltip from '../AdaptiveTooltip';
|
@@ -398,18 +400,35 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
398
400
|
sourceList = _filterData(sourceList);
|
399
401
|
return sourceList;
|
400
402
|
}
|
401
|
-
var searchTreeEvent = function
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
403
|
+
var searchTreeEvent = debounce(/*#__PURE__*/function () {
|
404
|
+
var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
|
405
|
+
var result;
|
406
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
407
|
+
while (1) switch (_context.prev = _context.next) {
|
408
|
+
case 0:
|
409
|
+
if (searchVal) {
|
410
|
+
_context.next = 3;
|
411
|
+
break;
|
412
|
+
}
|
413
|
+
setState({
|
414
|
+
selectList: cloneDeep(origDataSource || [])
|
415
|
+
});
|
416
|
+
return _context.abrupt("return", null);
|
417
|
+
case 3:
|
418
|
+
result = filterTree(cloneDeep(origDataSource || []), searchVal);
|
419
|
+
setState({
|
420
|
+
selectList: result || []
|
421
|
+
});
|
422
|
+
case 5:
|
423
|
+
case "end":
|
424
|
+
return _context.stop();
|
425
|
+
}
|
426
|
+
}, _callee);
|
427
|
+
}));
|
428
|
+
return function (_x) {
|
429
|
+
return _ref5.apply(this, arguments);
|
430
|
+
};
|
431
|
+
}(), 500);
|
413
432
|
function findTreeNode(treeList, nodeValue) {
|
414
433
|
var result = {};
|
415
434
|
var _filterData2 = function filterData(data) {
|
@@ -1,9 +1,8 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { ProTableColumn } from '../../propsType';
|
3
|
-
export declare const formatColumn: ({ column, originalObj,
|
3
|
+
export declare const formatColumn: ({ column, originalObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
|
4
4
|
column: ProTableColumn;
|
5
5
|
originalObj: any;
|
6
|
-
dataSourceObj: any;
|
7
6
|
rowKey: any;
|
8
7
|
diffToolTip?: boolean;
|
9
8
|
wrapToolTipProps?: any;
|
@@ -55,7 +55,6 @@ var calcMinWidth = function calcMinWidth(_ref) {
|
|
55
55
|
var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
56
56
|
var column = _ref2.column,
|
57
57
|
originalObj = _ref2.originalObj,
|
58
|
-
dataSourceObj = _ref2.dataSourceObj,
|
59
58
|
rowKey = _ref2.rowKey,
|
60
59
|
diffToolTip = _ref2.diffToolTip,
|
61
60
|
wrapToolTipProps = _ref2.wrapToolTipProps,
|
@@ -126,34 +125,24 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
|
|
126
125
|
var originalRender = column.render; // 保存原始的 render 方法
|
127
126
|
// 自定义render 手动重载下
|
128
127
|
column.render = function (value, record, index) {
|
129
|
-
var _originalObj$record$r;
|
130
128
|
var isFn = (0, _lodash.isFunction)(originalRender);
|
131
129
|
var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
|
132
130
|
var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
|
133
|
-
var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {}, index) : null;
|
134
131
|
var isInNewRowFlag = isInNewRow(record);
|
135
|
-
var extraDiffFlag = false;
|
136
|
-
// 把比对结果告诉我
|
137
|
-
if (onDiff) {
|
138
|
-
var isDiff = onDiff({
|
139
|
-
value: record,
|
140
|
-
originValue: originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]
|
141
|
-
});
|
142
|
-
if (!isDiff) {
|
143
|
-
originalValue = null;
|
144
|
-
} else {
|
145
|
-
originalValue = true;
|
146
|
-
extraDiffFlag = true;
|
147
|
-
}
|
148
|
-
}
|
149
132
|
// 存在比对
|
150
|
-
if (
|
151
|
-
var _originalObj$record$
|
152
|
-
|
133
|
+
if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
|
134
|
+
var _originalObj$record$r;
|
135
|
+
originalValue = otherProps.viewRender({
|
136
|
+
originalValue: originalValue,
|
137
|
+
originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
|
138
|
+
value: value,
|
139
|
+
record: record,
|
140
|
+
index: index
|
141
|
+
});
|
153
142
|
}
|
154
143
|
return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
|
155
144
|
valueType: valueType,
|
156
|
-
originalValue: (0, _utils3.isEmpty)(originalValue) ? null :
|
145
|
+
originalValue: (0, _utils3.isEmpty)(originalValue) ? null : originalValue,
|
157
146
|
ellipsis: ellipsis,
|
158
147
|
width: width,
|
159
148
|
value: _value,
|
@@ -13,7 +13,6 @@ interface Props {
|
|
13
13
|
toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
|
14
14
|
minWidth?: number;
|
15
15
|
isInNewRowFlag?: boolean;
|
16
|
-
viewRender?: (value: any, record: any, index: number) => any;
|
17
16
|
}
|
18
17
|
declare const RenderColumn: FC<Props>;
|
19
18
|
export default RenderColumn;
|
@@ -30,8 +30,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
30
30
|
_props$toolTipProps = props.toolTipProps,
|
31
31
|
toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
|
32
32
|
minWidth = props.minWidth,
|
33
|
-
isInNewRowFlag = props.isInNewRowFlag
|
34
|
-
viewRender = props.viewRender;
|
33
|
+
isInNewRowFlag = props.isInNewRowFlag;
|
35
34
|
var _useSetState = (0, _ahooks.useSetState)({
|
36
35
|
tooltip: false
|
37
36
|
}),
|
@@ -67,7 +66,7 @@ var RenderColumn = function RenderColumn(props) {
|
|
67
66
|
children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
|
68
67
|
align: "start",
|
69
68
|
className: "original-value-container",
|
70
|
-
children: ["\u521D\u59CB\u503C\uFF1A",
|
69
|
+
children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
|
71
70
|
}), (0, _jsxRuntime.jsx)(_antd.Space, {
|
72
71
|
className: "current-value-container",
|
73
72
|
children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
|
package/lib/ProTable/index.d.ts
CHANGED
@@ -1,19 +1,20 @@
|
|
1
1
|
/// <reference types="react" />
|
2
2
|
import { ProTableProps } from './propsType';
|
3
|
+
import useAntdTable from './hooks/useAntdTable';
|
3
4
|
export declare const TableContext: import("react").Context<{}>;
|
4
5
|
export declare const defaultPage: {
|
5
6
|
pageNum: number;
|
6
7
|
pageSize: number;
|
7
8
|
};
|
8
|
-
declare
|
9
|
-
|
10
|
-
|
9
|
+
declare const ProTable: {
|
10
|
+
(props: ProTableProps): import("react/jsx-runtime").JSX.Element;
|
11
|
+
defaultProps: {
|
11
12
|
quickConfig: boolean;
|
12
13
|
stripe: boolean;
|
13
14
|
draggable: boolean;
|
14
15
|
disabled: boolean;
|
15
16
|
isView: boolean;
|
16
17
|
};
|
17
|
-
|
18
|
-
}
|
18
|
+
useAntdTable: typeof useAntdTable;
|
19
|
+
};
|
19
20
|
export default ProTable;
|
package/lib/ProTable/index.js
CHANGED
@@ -36,7 +36,7 @@ var defaultPage = exports.defaultPage = {
|
|
36
36
|
pageNum: 1,
|
37
37
|
pageSize: 10
|
38
38
|
};
|
39
|
-
function ProTable(props) {
|
39
|
+
var ProTable = function ProTable(props) {
|
40
40
|
var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
|
41
41
|
var _ref = (0, _index.useProConfig)('globalConfig') || {},
|
42
42
|
configStorage = _ref.storage; // 获取全局缓存位置配置
|
@@ -121,7 +121,6 @@ function ProTable(props) {
|
|
121
121
|
});
|
122
122
|
});
|
123
123
|
var originalObj = _originalDataSource ? (0, _lodash.keyBy)(_originalDataSource, 'rowKey') : undefined;
|
124
|
-
var dataSourceObj = _dataSource ? (0, _lodash.keyBy)(_dataSource, 'rowKey') : {};
|
125
124
|
var propsColumnObj = (0, _react.useMemo)(function () {
|
126
125
|
return propsColumns.reduce(function (acc, cur) {
|
127
126
|
// @ts-ignore
|
@@ -220,8 +219,7 @@ function ProTable(props) {
|
|
220
219
|
(0, _FormatColumn.formatColumn)({
|
221
220
|
column: item,
|
222
221
|
originalObj: originalObj,
|
223
|
-
|
224
|
-
rowKey: 'rowKey',
|
222
|
+
rowKey: props.rowKey,
|
225
223
|
diffToolTip: toolTip,
|
226
224
|
wrapToolTipProps: wrapToolTipProps,
|
227
225
|
scroll: _scroll,
|
@@ -454,7 +452,7 @@ function ProTable(props) {
|
|
454
452
|
})]
|
455
453
|
})
|
456
454
|
});
|
457
|
-
}
|
455
|
+
};
|
458
456
|
ProTable.defaultProps = {
|
459
457
|
quickConfig: false,
|
460
458
|
stripe: true,
|
@@ -45,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
|
|
45
45
|
value: any;
|
46
46
|
originValue: any;
|
47
47
|
}) => boolean;
|
48
|
-
viewRender?: (value
|
48
|
+
viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
|
49
49
|
}
|
50
50
|
export interface CreateTreeFromArrayOptions {
|
51
51
|
itemKey?: string;
|
@@ -261,11 +261,20 @@
|
|
261
261
|
tr.@{ant-prefix}-table-row.new-cell {
|
262
262
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
263
263
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
264
|
-
|
265
264
|
td.@{ant-prefix}-table-cell {
|
266
265
|
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
267
266
|
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
268
267
|
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
268
|
+
&.@{ant-prefix}-table-cell-fix-right {
|
269
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
270
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
271
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
272
|
+
}
|
273
|
+
&.@{ant-prefix}-table-cell-fix-left {
|
274
|
+
background: var(--zaui-contract-bg-add; #d2fff4) !important;
|
275
|
+
background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
|
276
|
+
border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
|
277
|
+
}
|
269
278
|
}
|
270
279
|
}
|
271
280
|
|
@@ -26,14 +26,14 @@ var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits() {
|
|
26
26
|
*/
|
27
27
|
var getOriginalValue = exports.getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
|
28
28
|
if (!originalObj) {
|
29
|
-
return
|
29
|
+
return null;
|
30
30
|
}
|
31
31
|
var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
|
32
32
|
var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
|
33
33
|
if (!(0, _lodash.isEqual)(originalValue, value)) {
|
34
34
|
return originalValue;
|
35
35
|
}
|
36
|
-
return
|
36
|
+
return null;
|
37
37
|
};
|
38
38
|
var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {
|
39
39
|
return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
});
|
7
7
|
exports.default = exports.ProTreeSelect = void 0;
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
9
|
+
var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
|
10
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
9
11
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
10
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
13
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
@@ -398,18 +400,35 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
398
400
|
sourceList = _filterData(sourceList);
|
399
401
|
return sourceList;
|
400
402
|
}
|
401
|
-
var searchTreeEvent = function
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
403
|
+
var searchTreeEvent = (0, _lodash.debounce)(/*#__PURE__*/function () {
|
404
|
+
var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
|
405
|
+
var result;
|
406
|
+
return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
|
407
|
+
while (1) switch (_context.prev = _context.next) {
|
408
|
+
case 0:
|
409
|
+
if (searchVal) {
|
410
|
+
_context.next = 3;
|
411
|
+
break;
|
412
|
+
}
|
413
|
+
setState({
|
414
|
+
selectList: (0, _lodash.cloneDeep)(origDataSource || [])
|
415
|
+
});
|
416
|
+
return _context.abrupt("return", null);
|
417
|
+
case 3:
|
418
|
+
result = filterTree((0, _lodash.cloneDeep)(origDataSource || []), searchVal);
|
419
|
+
setState({
|
420
|
+
selectList: result || []
|
421
|
+
});
|
422
|
+
case 5:
|
423
|
+
case "end":
|
424
|
+
return _context.stop();
|
425
|
+
}
|
426
|
+
}, _callee);
|
427
|
+
}));
|
428
|
+
return function (_x) {
|
429
|
+
return _ref5.apply(this, arguments);
|
430
|
+
};
|
431
|
+
}(), 500);
|
413
432
|
function findTreeNode(treeList, nodeValue) {
|
414
433
|
var result = {};
|
415
434
|
var _filterData2 = function filterData(data) {
|